aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Araujo <araujo@FreeBSD.org>2008-04-17 14:30:31 +0000
committerMarcelo Araujo <araujo@FreeBSD.org>2008-04-17 14:30:31 +0000
commit4aaab89f578233fc117be25797258ca7e2ed882d (patch)
tree0e38664987475f8c5017d144d57d775931da51c7
parent6a99e7a1383fbd4f6eafdfdda68243ae93057e20 (diff)
downloadports-4aaab89f578233fc117be25797258ca7e2ed882d.tar.gz
ports-4aaab89f578233fc117be25797258ca7e2ed882d.zip
Notes
-rw-r--r--archivers/p5-Archive-Extract/Makefile3
-rw-r--r--archivers/p5-Compress-Bzip2/Makefile3
-rw-r--r--archivers/p5-Compress-LZW/Makefile3
-rw-r--r--archivers/p5-PerlIO-gzip/Makefile3
-rw-r--r--archivers/p5-PerlIO-via-Bzip2/Makefile3
-rw-r--r--astro/p5-Astro-Catalog/Makefile3
-rw-r--r--astro/p5-Astro-MoonPhase/Makefile3
-rw-r--r--astro/p5-Astro-Sunrise/Makefile3
-rw-r--r--astro/p5-GPS/Makefile3
-rw-r--r--audio/p5-Audio-Beep/Makefile3
-rw-r--r--audio/p5-Audio-CD/Makefile3
-rw-r--r--audio/p5-Audio-Scrobbler/Makefile3
-rw-r--r--audio/p5-Audio-TagLib/Makefile3
-rw-r--r--audio/p5-Audio-WMA/Makefile3
-rw-r--r--audio/p5-Audio-Wav/Makefile3
-rw-r--r--audio/p5-Audio/Makefile3
-rw-r--r--audio/p5-CDDB/Makefile3
-rw-r--r--audio/p5-CDDB_get/Makefile2
-rw-r--r--audio/p5-Filesys-Virtual-DAAP/Makefile3
-rw-r--r--audio/p5-MIDI/Makefile3
-rw-r--r--audio/p5-MP3-ID3v1Tag/Makefile3
-rw-r--r--audio/p5-MP3-Info/Makefile3
-rw-r--r--audio/p5-MP3-Tag/Makefile3
-rw-r--r--audio/p5-MusicBrainz-Client/Makefile3
-rw-r--r--audio/p5-MusicBrainz-Queries/Makefile3
-rw-r--r--audio/p5-MusicBrainz-TRM/Makefile3
-rw-r--r--audio/p5-Net-DAAP-Client/Makefile3
-rw-r--r--audio/p5-Net-DAAP-DMAP/Makefile3
-rw-r--r--audio/p5-Net-FreeDB/Makefile3
-rw-r--r--audio/p5-Ogg-Vorbis-Header/Makefile3
-rw-r--r--audio/p5-Xmms/Makefile3
-rw-r--r--audio/p5-libvorbis/Makefile4
-rw-r--r--biology/p5-AcePerl/Makefile2
-rw-r--r--biology/p5-Bio-ASN1-EntrezGene/Makefile3
-rw-r--r--biology/p5-Bio-Das/Makefile3
-rw-r--r--biology/p5-Bio-Phylo/Makefile3
-rw-r--r--biology/p5-bioperl-run/Makefile2
-rw-r--r--biology/p5-bioperl/Makefile3
-rw-r--r--cad/p5-GDS2/Makefile3
-rw-r--r--chinese/p5-Date-Chinese/Makefile2
-rw-r--r--chinese/p5-Encode-HanConvert/Makefile3
-rw-r--r--chinese/p5-Encode-HanExtra/Makefile3
-rw-r--r--chinese/p5-Lingua-ZH-BPMFConvert/Makefile3
-rw-r--r--chinese/p5-Lingua-ZH-HanDetect/Makefile3
-rw-r--r--chinese/p5-Lingua-ZH-Keywords/Makefile3
-rw-r--r--chinese/p5-Lingua-ZH-Numbers/Makefile3
-rw-r--r--chinese/p5-Lingua-ZH-Summarize/Makefile3
-rw-r--r--chinese/p5-Lingua-ZH-TaBE/Makefile3
-rw-r--r--chinese/p5-Lingua-ZH-Toke/Makefile3
-rw-r--r--chinese/p5-Lingua-ZH-Wrap/Makefile3
-rw-r--r--comms/o2sms/Makefile2
-rw-r--r--comms/p5-Device-Gsm/Makefile3
-rw-r--r--comms/p5-Device-Modem/Makefile3
-rw-r--r--comms/p5-Device-SerialPort/Makefile3
-rw-r--r--comms/p5-Fax-Hylafax-Client/Makefile3
-rw-r--r--comms/p5-SMS-Send-DeviceGsm/Makefile2
-rw-r--r--comms/p5-SMS-Send-TW-PChome/Makefile3
-rw-r--r--comms/p5-SMS-Send-TW-emome/Makefile3
-rw-r--r--converters/p5-Boulder/Makefile3
-rw-r--r--converters/p5-Convert-ASCII-Armour/Makefile3
-rw-r--r--converters/p5-Convert-ASN1/Makefile3
-rw-r--r--converters/p5-Convert-BER/Makefile3
-rw-r--r--converters/p5-Convert-Bencode/Makefile3
-rw-r--r--converters/p5-Convert-Bencode_XS/Makefile3
-rw-r--r--converters/p5-Convert-BinHex/Makefile3
-rw-r--r--converters/p5-Convert-Binary-C/Makefile3
-rw-r--r--converters/p5-Convert-Morse/Makefile3
-rw-r--r--converters/p5-Convert-PEM/Makefile3
-rw-r--r--converters/p5-Convert-Recode/Makefile3
-rw-r--r--converters/p5-Convert-TNEF/Makefile3
-rw-r--r--converters/p5-Convert-UU/Makefile3
-rw-r--r--converters/p5-Convert-UUlib/Makefile3
-rw-r--r--converters/p5-Cstools/Makefile2
-rw-r--r--converters/p5-Encode-JIS2K/Makefile3
-rw-r--r--converters/p5-Encode-compat/Makefile3
-rw-r--r--converters/p5-Encode/Makefile3
-rw-r--r--converters/p5-JSON-DWIW/Makefile3
-rw-r--r--converters/p5-MIME-Base32/Makefile3
-rw-r--r--converters/p5-MIME-Base64/Makefile3
-rw-r--r--converters/p5-Number-Nary/Makefile3
-rw-r--r--converters/p5-Number-RecordLocator/Makefile3
-rw-r--r--converters/p5-String-Multibyte/Makefile3
-rw-r--r--converters/p5-Text-Iconv/Makefile3
-rw-r--r--converters/p5-Text-Unidecode/Makefile3
-rw-r--r--converters/p5-Unicode-IMAPUtf7/Makefile3
-rw-r--r--converters/p5-Unicode-Lite/Makefile3
-rw-r--r--converters/p5-Unicode-Map/Makefile3
-rw-r--r--converters/p5-Unicode-Map8/Makefile3
-rw-r--r--converters/p5-Unicode-MapUTF8/Makefile3
-rw-r--r--converters/p5-Unicode-RecursiveDowngrade/Makefile3
-rw-r--r--converters/p5-Unicode-String/Makefile3
-rw-r--r--converters/p5-Unicode-UTF8simple/Makefile3
-rw-r--r--converters/p5-XML-WBXML/Makefile3
-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
-rw-r--r--deskutils/p5-Data-ICal/Makefile3
-rw-r--r--deskutils/p5-Goo/Makefile3
-rw-r--r--devel/activitymail/Makefile2
-rw-r--r--devel/autodia/Makefile2
-rw-r--r--devel/cpan-upload/Makefile4
-rw-r--r--devel/p5-AI-Pathfinding-AStar/Makefile3
-rw-r--r--devel/p5-Acme-MetaSyntactic/Makefile3
-rw-r--r--devel/p5-Agent/Makefile3
-rw-r--r--devel/p5-Algorithm-Accounting/Makefile3
-rw-r--r--devel/p5-Algorithm-Annotate/Makefile3
-rw-r--r--devel/p5-Algorithm-Bucketizer/Makefile3
-rw-r--r--devel/p5-Algorithm-C3/Makefile3
-rw-r--r--devel/p5-Algorithm-ChooseSubsets/Makefile3
-rw-r--r--devel/p5-Algorithm-Dependency-Objects/Makefile3
-rw-r--r--devel/p5-Algorithm-Dependency/Makefile3
-rw-r--r--devel/p5-Algorithm-Diff/Makefile3
-rw-r--r--devel/p5-Algorithm-IncludeExclude/Makefile3
-rw-r--r--devel/p5-Algorithm-Interval2Prefix/Makefile3
-rw-r--r--devel/p5-Algorithm-LCS/Makefile2
-rw-r--r--devel/p5-Algorithm-LUHN/Makefile3
-rw-r--r--devel/p5-Algorithm-MDiff/Makefile3
-rw-r--r--devel/p5-Algorithm-MinMax/Makefile3
-rw-r--r--devel/p5-Algorithm-NaiveBayes/Makefile3
-rw-r--r--devel/p5-Algorithm-Networksort/Makefile3
-rw-r--r--devel/p5-Algorithm-Numerical-Shuffle/Makefile3
-rw-r--r--devel/p5-Algorithm-Permute/Makefile3
-rw-r--r--devel/p5-Alias/Makefile3
-rw-r--r--devel/p5-App-CLI/Makefile3
-rw-r--r--devel/p5-App-Cache/Makefile3
-rw-r--r--devel/p5-App-Control/Makefile3
-rw-r--r--devel/p5-App-Options/Makefile3
-rw-r--r--devel/p5-App-Trace/Makefile3
-rw-r--r--devel/p5-AppConfig-Std/Makefile3
-rw-r--r--devel/p5-Array-Group/Makefile3
-rw-r--r--devel/p5-Array-Iterator/Makefile3
-rw-r--r--devel/p5-Array-Window/Makefile2
-rw-r--r--devel/p5-AtExit/Makefile3
-rw-r--r--devel/p5-Attribute-Handlers/Makefile3
-rw-r--r--devel/p5-AutoLoader/Makefile3
-rw-r--r--devel/p5-B-Generate/Makefile3
-rw-r--r--devel/p5-B-Graph/Makefile3
-rw-r--r--devel/p5-B-Size/Makefile3
-rw-r--r--devel/p5-B-Utils/Makefile3
-rw-r--r--devel/p5-BFD/Makefile2
-rw-r--r--devel/p5-BSD-Resource/Makefile3
-rw-r--r--devel/p5-BSD-stat/Makefile3
-rw-r--r--devel/p5-Best/Makefile2
-rw-r--r--devel/p5-Bundle-Perl6/Makefile3
-rw-r--r--devel/p5-C-Scan/Makefile3
-rw-r--r--devel/p5-CPAN-DistnameInfo/Makefile3
-rw-r--r--devel/p5-CPAN-Mini/Makefile3
-rw-r--r--devel/p5-CPANPLUS/Makefile3
-rw-r--r--devel/p5-Cache-Cache/Makefile3
-rw-r--r--devel/p5-Cache-FastMmap/Makefile3
-rw-r--r--devel/p5-Cache-Mmap/Makefile3
-rw-r--r--devel/p5-Cache-Simple-TimedExpiry/Makefile3
-rw-r--r--devel/p5-Cache/Makefile3
-rw-r--r--devel/p5-Calendar-Simple/Makefile3
-rw-r--r--devel/p5-Carp-Assert-More/Makefile3
-rw-r--r--devel/p5-Carp-Assert/Makefile3
-rw-r--r--devel/p5-Carp-Datum/Makefile3
-rw-r--r--devel/p5-Class-Accessor-Lvalue/Makefile3
-rw-r--r--devel/p5-Class-Accessor-Named/Makefile3
-rw-r--r--devel/p5-Class-Accessor/Makefile3
-rw-r--r--devel/p5-Class-ArrayObjects/Makefile3
-rw-r--r--devel/p5-Class-AutoClass/Makefile3
-rw-r--r--devel/p5-Class-Autouse/Makefile3
-rw-r--r--devel/p5-Class-Base/Makefile3
-rw-r--r--devel/p5-Class-BlackHole/Makefile3
-rw-r--r--devel/p5-Class-C3-XS/Makefile3
-rw-r--r--devel/p5-Class-C3/Makefile3
-rw-r--r--devel/p5-Class-Closure/Makefile3
-rw-r--r--devel/p5-Class-CodeStyler/Makefile3
-rw-r--r--devel/p5-Class-Constant/Makefile3
-rw-r--r--devel/p5-Class-Container/Makefile3
-rw-r--r--devel/p5-Class-Contract/Makefile3
-rw-r--r--devel/p5-Class-Data-Inheritable/Makefile3
-rw-r--r--devel/p5-Class-Date/Makefile3
-rw-r--r--devel/p5-Class-Default/Makefile3
-rw-r--r--devel/p5-Class-Delegation/Makefile2
-rw-r--r--devel/p5-Class-ErrorHandler/Makefile3
-rw-r--r--devel/p5-Class-Factory-Util/Makefile3
-rw-r--r--devel/p5-Class-Factory/Makefile3
-rw-r--r--devel/p5-Class-Fields/Makefile3
-rw-r--r--devel/p5-Class-Generate/Makefile3
-rw-r--r--devel/p5-Class-Handle/Makefile3
-rw-r--r--devel/p5-Class-ISA/Makefile3
-rw-r--r--devel/p5-Class-Inner/Makefile3
-rw-r--r--devel/p5-Class-Interfaces/Makefile3
-rw-r--r--devel/p5-Class-Loader/Makefile3
-rw-r--r--devel/p5-Class-MakeMethods/Makefile3
-rw-r--r--devel/p5-Class-MethodMapper/Makefile3
-rw-r--r--devel/p5-Class-MixinFactory/Makefile3
-rw-r--r--devel/p5-Class-Multimethods-Pure/Makefile3
-rw-r--r--devel/p5-Class-Multimethods/Makefile3
-rw-r--r--devel/p5-Class-NamedParms/Makefile3
-rw-r--r--devel/p5-Class-OOorNO/Makefile3
-rw-r--r--devel/p5-Class-Observable/Makefile3
-rw-r--r--devel/p5-Class-ParmList/Makefile3
-rw-r--r--devel/p5-Class-Prototyped/Makefile3
-rw-r--r--devel/p5-Class-ReturnValue/Makefile3
-rw-r--r--devel/p5-Class-Roles/Makefile3
-rw-r--r--devel/p5-Class-STL-Containers/Makefile3
-rw-r--r--devel/p5-Class-Spiffy/Makefile3
-rw-r--r--devel/p5-Class-StateMachine/Makefile3
-rw-r--r--devel/p5-Class-StrongSingleton/Makefile3
-rw-r--r--devel/p5-Class-Tangram/Makefile3
-rw-r--r--devel/p5-Class-Throwable/Makefile3
-rw-r--r--devel/p5-Class-Tom/Makefile3
-rw-r--r--devel/p5-Class-Trigger/Makefile3
-rw-r--r--devel/p5-Class-Virtual/Makefile3
-rw-r--r--devel/p5-Class-WhiteHole/Makefile3
-rw-r--r--devel/p5-Class-Workflow/Makefile3
-rw-r--r--devel/p5-Class-XPath/Makefile3
-rw-r--r--devel/p5-Clone-More/Makefile3
-rw-r--r--devel/p5-Clone-PP/Makefile3
-rw-r--r--devel/p5-Clone/Makefile3
-rw-r--r--devel/p5-Code-Perl/Makefile2
-rw-r--r--devel/p5-Commands-Guarded/Makefile3
-rw-r--r--devel/p5-CommitBit/Makefile2
-rw-r--r--devel/p5-Config-ApacheFormat/Makefile3
-rw-r--r--devel/p5-Config-Fast/Makefile3
-rw-r--r--devel/p5-Config-INI-Simple/Makefile3
-rw-r--r--devel/p5-Config-IniFiles/Makefile2
-rw-r--r--devel/p5-Config-Objective/Makefile3
-rw-r--r--devel/p5-Config-Properties/Makefile3
-rw-r--r--devel/p5-Config-Record/Makefile3
-rw-r--r--devel/p5-Config-Simple/Makefile3
-rw-r--r--devel/p5-Config-Tiny/Makefile3
-rw-r--r--devel/p5-ConfigReader-Simple/Makefile2
-rw-r--r--devel/p5-ConfigReader/Makefile3
-rw-r--r--devel/p5-Contextual-Return/Makefile2
-rw-r--r--devel/p5-Curses-Application/Makefile3
-rw-r--r--devel/p5-Curses-Forms/Makefile3
-rw-r--r--devel/p5-Curses-UI/Makefile3
-rw-r--r--devel/p5-Curses-Widgets/Makefile3
-rw-r--r--devel/p5-Cvs/Makefile4
-rw-r--r--devel/p5-DB_File-Lock/Makefile3
-rw-r--r--devel/p5-Danga-Socket/Makefile3
-rw-r--r--devel/p5-Data-ACL/Makefile3
-rw-r--r--devel/p5-Data-Bind/Makefile3
-rw-r--r--devel/p5-Data-Compare/Makefile3
-rw-r--r--devel/p5-Data-DumpXML/Makefile3
-rw-r--r--devel/p5-Data-Dumper-Simple/Makefile3
-rw-r--r--devel/p5-Data-Flow/Makefile3
-rw-r--r--devel/p5-Data-GUID/Makefile3
-rw-r--r--devel/p5-Data-HexDump/Makefile3
-rw-r--r--devel/p5-Data-Hierarchy/Makefile3
-rw-r--r--devel/p5-Data-Lazy/Makefile3
-rw-r--r--devel/p5-Data-OptList/Makefile3
-rw-r--r--devel/p5-Data-Postponed/Makefile3
-rw-r--r--devel/p5-Data-Properties/Makefile3
-rw-r--r--devel/p5-Data-Random/Makefile3
-rw-r--r--devel/p5-Data-RoundRobin/Makefile3
-rw-r--r--devel/p5-Data-Serializer/Makefile3
-rw-r--r--devel/p5-Data-ShowTable/Makefile3
-rw-r--r--devel/p5-Data-Stag/Makefile3
-rw-r--r--devel/p5-Data-Structure-Util/Makefile3
-rw-r--r--devel/p5-Data-Table/Makefile3
-rw-r--r--devel/p5-Data-Taxonomy-Tags/Makefile3
-rw-r--r--devel/p5-Data-TemporaryBag/Makefile3
-rw-r--r--devel/p5-Data-TreeDumper/Makefile3
-rw-r--r--devel/p5-Data-Types/Makefile3
-rw-r--r--devel/p5-Data-UUID/Makefile3
-rw-r--r--devel/p5-Data-Validate/Makefile3
-rw-r--r--devel/p5-Date-Calc/Makefile2
-rw-r--r--devel/p5-Date-DayOfWeek/Makefile3
-rw-r--r--devel/p5-Date-Easter/Makefile3
-rw-r--r--devel/p5-Date-EzDate/Makefile3
-rw-r--r--devel/p5-Date-Holidays-DK/Makefile3
-rw-r--r--devel/p5-Date-ISO/Makefile3
-rw-r--r--devel/p5-Date-Manip/Makefile3
-rw-r--r--devel/p5-Date-Pcalc/Makefile3
-rw-r--r--devel/p5-Date-Range/Makefile3
-rw-r--r--devel/p5-Date-Roman/Makefile3
-rw-r--r--devel/p5-Date-Set/Makefile3
-rw-r--r--devel/p5-Date-Simple/Makefile3
-rw-r--r--devel/p5-DateConvert/Makefile3
-rw-r--r--devel/p5-DateTime-Calendar-Discordian/Makefile3
-rw-r--r--devel/p5-DateTime-Event-Recurrence/Makefile3
-rw-r--r--devel/p5-DateTime-Set/Makefile3
-rw-r--r--devel/p5-DateTime-Util-Astro/Makefile3
-rw-r--r--devel/p5-DateTime-Util-Calc/Makefile3
-rw-r--r--devel/p5-Decision-ACL/Makefile3
-rw-r--r--devel/p5-Devel-Arena/Makefile3
-rw-r--r--devel/p5-Devel-Constants/Makefile3
-rw-r--r--devel/p5-Devel-CoreStack/Makefile3
-rw-r--r--devel/p5-Devel-Cycle/Makefile3
-rw-r--r--devel/p5-Devel-DProfPP/Makefile3
-rw-r--r--devel/p5-Devel-Diagram/Makefile3
-rw-r--r--devel/p5-Devel-Leak-Object/Makefile3
-rw-r--r--devel/p5-Devel-Leak/Makefile3
-rw-r--r--devel/p5-Devel-LeakTrace/Makefile3
-rw-r--r--devel/p5-Devel-LexAlias/Makefile3
-rw-r--r--devel/p5-Devel-Messenger/Makefile3
-rw-r--r--devel/p5-Devel-Modlist/Makefile3
-rw-r--r--devel/p5-Devel-ObjectTracker/Makefile3
-rw-r--r--devel/p5-Devel-PPPort/Makefile3
-rw-r--r--devel/p5-Devel-Pointer/Makefile3
-rw-r--r--devel/p5-Devel-Profiler/Makefile3
-rw-r--r--devel/p5-Devel-Required/Makefile3
-rw-r--r--devel/p5-Devel-RingBuffer/Makefile3
-rw-r--r--devel/p5-Devel-STrace/Makefile3
-rw-r--r--devel/p5-Devel-SmallProf/Makefile3
-rw-r--r--devel/p5-Devel-StackTrace/Makefile3
-rw-r--r--devel/p5-Devel-StealthDebug/Makefile3
-rw-r--r--devel/p5-Devel-Timer/Makefile3
-rw-r--r--devel/p5-Devel-TraceCalls/Makefile3
-rw-r--r--devel/p5-Devel-TraceUse/Makefile3
-rw-r--r--devel/p5-Devel-ptkdb/Makefile3
-rw-r--r--devel/p5-Dialog/Makefile3
-rw-r--r--devel/p5-Digest-TransformPath/Makefile3
-rw-r--r--devel/p5-Dir-Project/Makefile3
-rw-r--r--devel/p5-Directory-Scratch/Makefile3
-rw-r--r--devel/p5-Env-PS1/Makefile3
-rw-r--r--devel/p5-Env-Path/Makefile3
-rw-r--r--devel/p5-Errno/Makefile3
-rw-r--r--devel/p5-Event-ExecFlow/Makefile3
-rw-r--r--devel/p5-Event-Lib/Makefile3
-rw-r--r--devel/p5-Event-RPC/Makefile3
-rw-r--r--devel/p5-Event/Makefile3
-rw-r--r--devel/p5-Exception-Class/Makefile3
-rw-r--r--devel/p5-Exception-Handler/Makefile3
-rw-r--r--devel/p5-Expect-Simple/Makefile3
-rw-r--r--devel/p5-Exporter-Tidy/Makefile3
-rw-r--r--devel/p5-ExtUtils-AutoInstall/Makefile3
-rw-r--r--devel/p5-ExtUtils-Command/Makefile3
-rw-r--r--devel/p5-ExtUtils-Constant/Makefile3
-rw-r--r--devel/p5-ExtUtils-Depends/Makefile3
-rw-r--r--devel/p5-ExtUtils-MakeMaker-Coverage/Makefile3
-rw-r--r--devel/p5-ExtUtils-PkgConfig/Makefile3
-rw-r--r--devel/p5-ExtUtils-XSBuilder/Makefile3
-rw-r--r--devel/p5-FSA-Rules/Makefile2
-rw-r--r--devel/p5-File-Append-TempFile/Makefile3
-rw-r--r--devel/p5-File-Attributes-Recursive/Makefile3
-rw-r--r--devel/p5-File-Attributes/Makefile3
-rw-r--r--devel/p5-File-BaseDir/Makefile3
-rw-r--r--devel/p5-File-BasicFlock/Makefile3
-rw-r--r--devel/p5-File-Cache/Makefile3
-rw-r--r--devel/p5-File-Cat/Makefile3
-rw-r--r--devel/p5-File-CreationTime/Makefile3
-rw-r--r--devel/p5-File-DesktopEntry/Makefile3
-rw-r--r--devel/p5-File-FTS/Makefile3
-rw-r--r--devel/p5-File-Find-Rule-Filesys-Virtual/Makefile3
-rw-r--r--devel/p5-File-Find-Rule/Makefile3
-rw-r--r--devel/p5-File-Flat/Makefile3
-rw-r--r--devel/p5-File-Flock/Makefile3
-rw-r--r--devel/p5-File-FnMatch/Makefile3
-rw-r--r--devel/p5-File-Grep/Makefile3
-rw-r--r--devel/p5-File-HomeDir/Makefile3
-rw-r--r--devel/p5-File-Lock/Makefile3
-rw-r--r--devel/p5-File-MMagic-XS/Makefile3
-rw-r--r--devel/p5-File-MMagic/Makefile3
-rw-r--r--devel/p5-File-Modified/Makefile3
-rw-r--r--devel/p5-File-Monitor/Makefile3
-rw-r--r--devel/p5-File-NCopy/Makefile2
-rw-r--r--devel/p5-File-NFSLock/Makefile3
-rw-r--r--devel/p5-File-Path-Expand/Makefile3
-rw-r--r--devel/p5-File-PathConvert/Makefile3
-rw-r--r--devel/p5-File-Pid/Makefile3
-rw-r--r--devel/p5-File-Random/Makefile3
-rw-r--r--devel/p5-File-ReadBackwards/Makefile3
-rw-r--r--devel/p5-File-ShareDir/Makefile3
-rw-r--r--devel/p5-File-Slurp-Tree/Makefile3
-rw-r--r--devel/p5-File-Sync/Makefile3
-rw-r--r--devel/p5-File-Tail/Makefile3
-rw-r--r--devel/p5-File-Temp/Makefile3
-rw-r--r--devel/p5-File-Tempdir/Makefile3
-rw-r--r--devel/p5-File-Type/Makefile3
-rw-r--r--devel/p5-File-chdir/Makefile3
-rw-r--r--devel/p5-File-chmod/Makefile3
-rw-r--r--devel/p5-File-pushd/Makefile3
-rw-r--r--devel/p5-FileHandle-Fmode/Makefile3
-rw-r--r--devel/p5-FileHandle-Unget/Makefile3
-rw-r--r--devel/p5-Filter-Template/Makefile3
-rw-r--r--devel/p5-Filter/Makefile3
-rw-r--r--devel/p5-FreezeThaw/Makefile3
-rw-r--r--devel/p5-Gearman-Client-Async/Makefile2
-rw-r--r--devel/p5-Gearman-Server/Makefile2
-rw-r--r--devel/p5-Gearman/Makefile2
-rw-r--r--devel/p5-Getopt-ArgvFile/Makefile3
-rw-r--r--devel/p5-Getopt-Declare/Makefile3
-rw-r--r--devel/p5-Getopt-Long/Makefile3
-rw-r--r--devel/p5-Getopt-Mixed/Makefile3
-rw-r--r--devel/p5-Getopt-Popt/Makefile3
-rw-r--r--devel/p5-Hash-WithDefaults/Makefile3
-rw-r--r--devel/p5-Heap-Simple-Perl/Makefile3
-rw-r--r--devel/p5-Heap-Simple-XS/Makefile3
-rw-r--r--devel/p5-Heap-Simple/Makefile3
-rw-r--r--devel/p5-Heap/Makefile3
-rw-r--r--devel/p5-Hook-LexWrap/Makefile3
-rw-r--r--devel/p5-IO-All/Makefile3
-rw-r--r--devel/p5-IO-Capture/Makefile3
-rw-r--r--devel/p5-IO-Digest/Makefile3
-rw-r--r--devel/p5-IO-KQueue/Makefile3
-rw-r--r--devel/p5-IO-LockedFile/Makefile3
-rw-r--r--devel/p5-IO-Multiplex/Makefile3
-rw-r--r--devel/p5-IO-NestedCapture/Makefile3
-rw-r--r--devel/p5-IO-Null/Makefile3
-rw-r--r--devel/p5-IO-Pager/Makefile3
-rw-r--r--devel/p5-IO-Prompt/Makefile3
-rw-r--r--devel/p5-IO-String/Makefile3
-rw-r--r--devel/p5-IO-Tee/Makefile3
-rw-r--r--devel/p5-IO-Toolkit/Makefile3
-rw-r--r--devel/p5-IO-Tty/Makefile3
-rw-r--r--devel/p5-IO-Util/Makefile3
-rw-r--r--devel/p5-IO-YAML/Makefile3
-rw-r--r--devel/p5-IO-stringy/Makefile3
-rw-r--r--devel/p5-IO/Makefile3
-rw-r--r--devel/p5-IOC/Makefile2
-rw-r--r--devel/p5-IPC-Cache/Makefile3
-rw-r--r--devel/p5-IPC-Cmd/Makefile3
-rw-r--r--devel/p5-IPC-DirQueue/Makefile3
-rw-r--r--devel/p5-IPC-Locker/Makefile3
-rw-r--r--devel/p5-IPC-MM/Makefile3
-rw-r--r--devel/p5-IPC-Mmap-Share/Makefile3
-rw-r--r--devel/p5-IPC-Open3-Simple/Makefile3
-rw-r--r--devel/p5-IPC-PubSub/Makefile3
-rw-r--r--devel/p5-IPC-Run/Makefile3
-rw-r--r--devel/p5-IPC-SharedCache/Makefile3
-rw-r--r--devel/p5-IPC-Signal/Makefile3
-rw-r--r--devel/p5-Include/Makefile3
-rw-r--r--devel/p5-Inline-ASM/Makefile3
-rw-r--r--devel/p5-Inline-CPP/Makefile3
-rw-r--r--devel/p5-Inline-Files/Makefile3
-rw-r--r--devel/p5-Inline-Filters/Makefile3
-rw-r--r--devel/p5-Inline-Java/Makefile3
-rw-r--r--devel/p5-Inline-Tcl/Makefile3
-rw-r--r--devel/p5-Inline/Makefile3
-rw-r--r--devel/p5-Ioctl/Makefile3
-rw-r--r--devel/p5-Iterator-IO/Makefile3
-rw-r--r--devel/p5-Iterator-Misc/Makefile3
-rw-r--r--devel/p5-Iterator-Util/Makefile3
-rw-r--r--devel/p5-Iterator/Makefile3
-rw-r--r--devel/p5-Java/Makefile3
-rw-r--r--devel/p5-Lexical-Alias/Makefile3
-rw-r--r--devel/p5-Lexical-Persistence/Makefile3
-rw-r--r--devel/p5-List-Cycle/Makefile3
-rw-r--r--devel/p5-List-Group/Makefile3
-rw-r--r--devel/p5-Locale-Maketext-Fuzzy/Makefile3
-rw-r--r--devel/p5-Locale-Maketext-Simple/Makefile3
-rw-r--r--devel/p5-Locale-PGetText/Makefile3
-rw-r--r--devel/p5-Locale-gettext/Makefile3
-rw-r--r--devel/p5-Locale-libintl/Makefile3
-rw-r--r--devel/p5-LockFile-Simple/Makefile3
-rw-r--r--devel/p5-Log-Accounting-SVK/Makefile3
-rw-r--r--devel/p5-Log-Accounting-SVN/Makefile3
-rw-r--r--devel/p5-Log-Agent-Logger/Makefile2
-rw-r--r--devel/p5-Log-Agent/Makefile3
-rw-r--r--devel/p5-Log-Dispatch-FileRotate/Makefile3
-rw-r--r--devel/p5-Log-Dispatch-FileShared/Makefile3
-rw-r--r--devel/p5-Log-Dispatch-Perl/Makefile3
-rw-r--r--devel/p5-Log-Message-Simple/Makefile3
-rw-r--r--devel/p5-Log-Message/Makefile3
-rw-r--r--devel/p5-Log-Report/Makefile3
-rw-r--r--devel/p5-Log-Simple/Makefile3
-rw-r--r--devel/p5-Log-TraceMessages/Makefile3
-rw-r--r--devel/p5-Luka/Makefile2
-rw-r--r--devel/p5-Mac-FileSpec-Unixish/Makefile3
-rw-r--r--devel/p5-Make-Cache/Makefile3
-rw-r--r--devel/p5-Make/Makefile3
-rw-r--r--devel/p5-Memoize-ExpireLRU/Makefile3
-rw-r--r--devel/p5-Memoize/Makefile3
-rw-r--r--devel/p5-Mknod/Makefile2
-rw-r--r--devel/p5-Module-Compile/Makefile3
-rw-r--r--devel/p5-Module-Dependency/Makefile3
-rw-r--r--devel/p5-Module-Info/Makefile3
-rw-r--r--devel/p5-Module-Pluggable-Fast/Makefile3
-rw-r--r--devel/p5-Module-Release/Makefile3
-rw-r--r--devel/p5-Module-Reload-Sel/Makefile3
-rw-r--r--devel/p5-Module-Reload/Makefile3
-rw-r--r--devel/p5-Module-Starter-PBP/Makefile3
-rw-r--r--devel/p5-Module-Versions-Report/Makefile3
-rw-r--r--devel/p5-Moose-Policy/Makefile2
-rw-r--r--devel/p5-MooseX-IOC/Makefile3
-rw-r--r--devel/p5-MooseX-Policy-SemiAffordanceAccessor/Makefile3
-rw-r--r--devel/p5-Net-DBus/Makefile3
-rw-r--r--devel/p5-Number-Bytes-Human/Makefile3
-rw-r--r--devel/p5-OLE-Storage_Lite/Makefile3
-rw-r--r--devel/p5-OOTools/Makefile2
-rw-r--r--devel/p5-ORBit/Makefile3
-rw-r--r--devel/p5-Object-Accessor/Makefile3
-rw-r--r--devel/p5-Object-Array/Makefile3
-rw-r--r--devel/p5-Object-Declare/Makefile3
-rw-r--r--devel/p5-Object-Enum/Makefile3
-rw-r--r--devel/p5-Object-MultiType/Makefile3
-rw-r--r--devel/p5-Object-Signature/Makefile3
-rw-r--r--devel/p5-P4-Client/Makefile3
-rw-r--r--devel/p5-P4/Makefile3
-rw-r--r--devel/p5-PAR-Dist/Makefile3
-rw-r--r--devel/p5-PAR-Packer/Makefile3
-rw-r--r--devel/p5-PAR/Makefile3
-rw-r--r--devel/p5-POE-API-Hooks/Makefile3
-rw-r--r--devel/p5-POE-API-Peek/Makefile3
-rw-r--r--devel/p5-POE-Component-Child/Makefile3
-rw-r--r--devel/p5-POE-Component-Daemon/Makefile3
-rw-r--r--devel/p5-POE-Component-DebugShell/Makefile3
-rw-r--r--devel/p5-POE-Component-DirWatch/Makefile3
-rw-r--r--devel/p5-POE-Component-IKC/Makefile3
-rw-r--r--devel/p5-POE-Component-JobQueue/Makefile3
-rw-r--r--devel/p5-POE-Component-Logger/Makefile3
-rw-r--r--devel/p5-POE-Component-RSS/Makefile3
-rw-r--r--devel/p5-POE-Component-RSSAggregator/Makefile3
-rw-r--r--devel/p5-POE-Component-Server-XMLRPC/Makefile3
-rw-r--r--devel/p5-POE-Component-TSTP/Makefile3
-rw-r--r--devel/p5-POE-Devel-Profiler/Makefile3
-rw-r--r--devel/p5-POE-Exceptions/Makefile3
-rw-r--r--devel/p5-POE-Session-MultiDispatch/Makefile3
-rw-r--r--devel/p5-POE-Stage/Makefile3
-rw-r--r--devel/p5-POE/Makefile3
-rw-r--r--devel/p5-POSIX-strptime/Makefile3
-rw-r--r--devel/p5-PPerl/Makefile2
-rw-r--r--devel/p5-PV/Makefile3
-rw-r--r--devel/p5-Package-Constants/Makefile3
-rw-r--r--devel/p5-PadWalker/Makefile2
-rw-r--r--devel/p5-Parallel-ForkManager/Makefile3
-rw-r--r--devel/p5-Params-CallbackRequest/Makefile3
-rw-r--r--devel/p5-Params-Coerce/Makefile3
-rw-r--r--devel/p5-Params-Validate/Makefile3
-rw-r--r--devel/p5-Parse-PerlConfig/Makefile3
-rw-r--r--devel/p5-Parse-RecDescent/Makefile2
-rw-r--r--devel/p5-Parse-Yapp/Makefile3
-rw-r--r--devel/p5-ParseLex/Makefile3
-rw-r--r--devel/p5-PatchReader/Makefile2
-rw-r--r--devel/p5-Path-Class/Makefile4
-rw-r--r--devel/p5-Penguin-Easy/Makefile3
-rw-r--r--devel/p5-Penguin/Makefile3
-rw-r--r--devel/p5-Perl6-Builtins/Makefile3
-rw-r--r--devel/p5-Perl6-Export-Attrs/Makefile3
-rw-r--r--devel/p5-Perl6-Export/Makefile3
-rw-r--r--devel/p5-Perl6-Form/Makefile3
-rw-r--r--devel/p5-Perl6-Rules/Makefile3
-rw-r--r--devel/p5-PerlIO-eol/Makefile3
-rw-r--r--devel/p5-PerlIO-via-MD5/Makefile3
-rw-r--r--devel/p5-PerlIO-via-dynamic/Makefile3
-rw-r--r--devel/p5-PerlIO-via-symlink/Makefile3
-rw-r--r--devel/p5-PerlMenu/Makefile2
-rw-r--r--devel/p5-Pipeline/Makefile2
-rw-r--r--devel/p5-Pod-Tests/Makefile3
-rw-r--r--devel/p5-Proc-Background/Makefile3
-rw-r--r--devel/p5-Proc-Daemon/Makefile3
-rw-r--r--devel/p5-Proc-Fork/Makefile3
-rw-r--r--devel/p5-Proc-PID-File/Makefile3
-rw-r--r--devel/p5-Proc-PIDFile/Makefile3
-rw-r--r--devel/p5-Proc-ProcessTable/Makefile3
-rw-r--r--devel/p5-Proc-Queue/Makefile3
-rw-r--r--devel/p5-Proc-Reliable/Makefile3
-rw-r--r--devel/p5-Project-Gantt/Makefile3
-rw-r--r--devel/p5-RRDTool-OO/Makefile3
-rw-r--r--devel/p5-Rcs/Makefile3
-rw-r--r--devel/p5-ReadLine-Gnu/Makefile3
-rw-r--r--devel/p5-ReadLine-Perl/Makefile3
-rw-r--r--devel/p5-Readonly/Makefile3
-rw-r--r--devel/p5-Regexp-Assemble/Makefile3
-rw-r--r--devel/p5-Regexp-Bind/Makefile3
-rw-r--r--devel/p5-Regexp-Shellish/Makefile3
-rw-r--r--devel/p5-Religion/Makefile3
-rw-r--r--devel/p5-ResourcePool/Makefile2
-rw-r--r--devel/p5-Resources/Makefile3
-rw-r--r--devel/p5-Return-Value/Makefile2
-rw-r--r--devel/p5-Rose-DateTime/Makefile3
-rw-r--r--devel/p5-Rose-Object/Makefile3
-rw-r--r--devel/p5-RunApp/Makefile2
-rw-r--r--devel/p5-SNMP-Persist/Makefile3
-rw-r--r--devel/p5-SPOPS/Makefile2
-rw-r--r--devel/p5-SVN-ACL/Makefile3
-rw-r--r--devel/p5-SVN-Access/Makefile3
-rw-r--r--devel/p5-SVN-Agent/Makefile3
-rw-r--r--devel/p5-SVN-Log/Makefile3
-rw-r--r--devel/p5-SVN-Mirror/Makefile3
-rw-r--r--devel/p5-SVN-S4/Makefile3
-rw-r--r--devel/p5-SVN-Simple/Makefile3
-rw-r--r--devel/p5-SVN-Statistics/Makefile3
-rw-r--r--devel/p5-SVN-Web/Makefile3
-rw-r--r--devel/p5-Scalar-Listify/Makefile3
-rw-r--r--devel/p5-Scalar-Util-Clone/Makefile3
-rw-r--r--devel/p5-Scope-Guard/Makefile5
-rw-r--r--devel/p5-Search-Binary/Makefile3
-rw-r--r--devel/p5-Set-Array/Makefile3
-rw-r--r--devel/p5-Set-NestedGroups/Makefile3
-rw-r--r--devel/p5-Set-Scalar/Makefile3
-rw-r--r--devel/p5-Shell-Base/Makefile3
-rw-r--r--devel/p5-Shell-EnvImporter/Makefile3
-rw-r--r--devel/p5-Shell-Parser/Makefile3
-rw-r--r--devel/p5-Shell-Source/Makefile3
-rw-r--r--devel/p5-Smart-Comments/Makefile2
-rw-r--r--devel/p5-Sort-Array/Makefile3
-rw-r--r--devel/p5-Sort-ArrayOfArrays/Makefile3
-rw-r--r--devel/p5-Sort-Key-DateTime/Makefile3
-rw-r--r--devel/p5-Sort-Key/Makefile3
-rw-r--r--devel/p5-Sort-Tree/Makefile3
-rw-r--r--devel/p5-Sort-Versions/Makefile3
-rw-r--r--devel/p5-Spiffy/Makefile4
-rw-r--r--devel/p5-Spoon/Makefile4
-rw-r--r--devel/p5-Storable/Makefile3
-rw-r--r--devel/p5-Stream/Makefile3
-rw-r--r--devel/p5-String-Approx/Makefile3
-rw-r--r--devel/p5-String-CRC32/Makefile3
-rw-r--r--devel/p5-String-Checker/Makefile3
-rw-r--r--devel/p5-String-LRC/Makefile3
-rw-r--r--devel/p5-String-Parity/Makefile3
-rw-r--r--devel/p5-String-Random/Makefile3
-rw-r--r--devel/p5-String-RexxParse/Makefile3
-rw-r--r--devel/p5-String-Similarity/Makefile3
-rw-r--r--devel/p5-Sub-Installer/Makefile3
-rw-r--r--devel/p5-Sub-Name/Makefile3
-rw-r--r--devel/p5-Sub-Override/Makefile3
-rw-r--r--devel/p5-Sub-WrapPackages/Makefile3
-rw-r--r--devel/p5-Sys-Mmap/Makefile3
-rw-r--r--devel/p5-Sys-Sig/Makefile3
-rw-r--r--devel/p5-Sys-SigAction/Makefile3
-rw-r--r--devel/p5-System2/Makefile3
-rw-r--r--devel/p5-Taint-Runtime/Makefile3
-rw-r--r--devel/p5-Term-ANSIColor/Makefile3
-rw-r--r--devel/p5-Term-ANSIScreen/Makefile3
-rw-r--r--devel/p5-Term-Animation/Makefile3
-rw-r--r--devel/p5-Term-CallEditor/Makefile3
-rw-r--r--devel/p5-Term-Encoding/Makefile3
-rw-r--r--devel/p5-Term-ProgressBar/Makefile3
-rw-r--r--devel/p5-Term-Prompt/Makefile3
-rw-r--r--devel/p5-Term-Query/Makefile3
-rw-r--r--devel/p5-Term-ReadKey/Makefile3
-rw-r--r--devel/p5-Term-ReadLine-Zoid/Makefile3
-rw-r--r--devel/p5-Term-Screen/Makefile3
-rw-r--r--devel/p5-Term-Shell/Makefile3
-rw-r--r--devel/p5-Term-Size/Makefile3
-rw-r--r--devel/p5-Term-UI/Makefile3
-rw-r--r--devel/p5-Test-Benchmark/Makefile3
-rw-r--r--devel/p5-Test-Differences/Makefile3
-rw-r--r--devel/p5-Test-Expect/Makefile3
-rw-r--r--devel/p5-Test-File-Contents/Makefile3
-rw-r--r--devel/p5-Test-HTML-Tidy/Makefile3
-rw-r--r--devel/p5-Test-HasVersion/Makefile3
-rw-r--r--devel/p5-Test-Inline/Makefile3
-rw-r--r--devel/p5-Test-LongString/Makefile3
-rw-r--r--devel/p5-Test-MockModule/Makefile3
-rw-r--r--devel/p5-Test-MockObject/Makefile3
-rw-r--r--devel/p5-Test-MockTime/Makefile3
-rw-r--r--devel/p5-Test-NoWarnings/Makefile3
-rw-r--r--devel/p5-Test-Number-Delta/Makefile3
-rw-r--r--devel/p5-Test-Output/Makefile3
-rw-r--r--devel/p5-Test-Pod-Coverage/Makefile3
-rw-r--r--devel/p5-Test-Pod/Makefile3
-rw-r--r--devel/p5-Test-RandomResults/Makefile3
-rw-r--r--devel/p5-Test-Singleton/Makefile2
-rw-r--r--devel/p5-Test-Strict/Makefile3
-rw-r--r--devel/p5-Test-TAP-HTMLMatrix/Makefile3
-rw-r--r--devel/p5-Test-TAP-Model/Makefile3
-rw-r--r--devel/p5-Test-Unit/Makefile3
-rw-r--r--devel/p5-Test-Warn/Makefile3
-rw-r--r--devel/p5-Test-XML/Makefile3
-rw-r--r--devel/p5-Test-use-ok/Makefile3
-rw-r--r--devel/p5-Text-LevenshteinXS/Makefile3
-rw-r--r--devel/p5-Text-vFile-asData/Makefile3
-rw-r--r--devel/p5-Thread-Apartment/Makefile3
-rw-r--r--devel/p5-Thread-Pool-Simple/Makefile3
-rw-r--r--devel/p5-Thread-Queue-Duplex/Makefile3
-rw-r--r--devel/p5-Tie-Array-Pack/Makefile3
-rw-r--r--devel/p5-Tie-Array-Sorted/Makefile3
-rw-r--r--devel/p5-Tie-CPHash/Makefile3
-rw-r--r--devel/p5-Tie-Cache/Makefile3
-rw-r--r--devel/p5-Tie-DB_File-SplitHash/Makefile3
-rw-r--r--devel/p5-Tie-DB_FileLock/Makefile3
-rw-r--r--devel/p5-Tie-FileLRUCache/Makefile3
-rw-r--r--devel/p5-Tie-Hash-Indexed/Makefile3
-rw-r--r--devel/p5-Tie-Hash-Regex/Makefile3
-rw-r--r--devel/p5-Tie-Hash-Sorted/Makefile3
-rw-r--r--devel/p5-Tie-Hash-TwoWay/Makefile3
-rw-r--r--devel/p5-Tie-IxHash/Makefile3
-rw-r--r--devel/p5-Tie-Restore/Makefile3
-rw-r--r--devel/p5-Tie-ShareLite/Makefile3
-rw-r--r--devel/p5-Tie-Simple/Makefile3
-rw-r--r--devel/p5-Time-Clock/Makefile3
-rw-r--r--devel/p5-Time-Duration/Makefile3
-rw-r--r--devel/p5-Time-HiRes/Makefile3
-rw-r--r--devel/p5-Time-Interval/Makefile3
-rw-r--r--devel/p5-Time-Object/Makefile3
-rw-r--r--devel/p5-Time-Period/Makefile3
-rw-r--r--devel/p5-Time-Piece-Range/Makefile3
-rw-r--r--devel/p5-Time-Piece/Makefile3
-rw-r--r--devel/p5-Time-Progress/Makefile3
-rw-r--r--devel/p5-Time-Stopwatch/Makefile3
-rw-r--r--devel/p5-Time-modules/Makefile3
-rw-r--r--devel/p5-TimeDate/Makefile3
-rw-r--r--devel/p5-TraceFuncs/Makefile3
-rw-r--r--devel/p5-Tree-Binary-Dictionary/Makefile3
-rw-r--r--devel/p5-Tree-Binary/Makefile3
-rw-r--r--devel/p5-Tree-Node/Makefile3
-rw-r--r--devel/p5-Tree-Parser/Makefile3
-rw-r--r--devel/p5-Tree-Simple-View/Makefile3
-rw-r--r--devel/p5-Tree-Simple-VisitorFactory/Makefile3
-rw-r--r--devel/p5-Tree-Simple/Makefile3
-rw-r--r--devel/p5-UI-Dialog/Makefile2
-rw-r--r--devel/p5-UNIVERSAL-can/Makefile3
-rw-r--r--devel/p5-UNIVERSAL-isa/Makefile3
-rw-r--r--devel/p5-UNIVERSAL-moniker/Makefile3
-rw-r--r--devel/p5-UNIVERSAL-require/Makefile3
-rw-r--r--devel/p5-UNIVERSAL-which/Makefile3
-rw-r--r--devel/p5-Unix-Statgrab/Makefile3
-rw-r--r--devel/p5-VCP-Dest-svk/Makefile2
-rw-r--r--devel/p5-VCP-Source-cvsbk/Makefile2
-rw-r--r--devel/p5-VCP-autrijus/Makefile2
-rw-r--r--devel/p5-VCS/Makefile3
-rw-r--r--devel/p5-Want/Makefile2
-rw-r--r--devel/p5-WeakRef/Makefile4
-rw-r--r--devel/p5-Workflow/Makefile3
-rw-r--r--devel/p5-XSLoader/Makefile2
-rw-r--r--devel/p5-Yada-Yada-Yada/Makefile2
-rw-r--r--devel/p5-accessors/Makefile2
-rw-r--r--devel/p5-base/Makefile2
-rw-r--r--devel/p5-capitalization/Makefile2
-rw-r--r--devel/p5-enum/Makefile3
-rw-r--r--devel/p5-iCal-Parser/Makefile3
-rw-r--r--devel/p5-mixin/Makefile2
-rw-r--r--devel/p5-orz/Makefile3
-rw-r--r--devel/p5-parent/Makefile2
-rw-r--r--devel/p5-prefork/Makefile2
-rw-r--r--devel/p5-reaper/Makefile2
-rw-r--r--devel/p5-rpm-build-perl/Makefile2
-rw-r--r--devel/p5-threads-shared/Makefile3
-rw-r--r--devel/p5-threads/Makefile2
-rw-r--r--devel/pushmi/Makefile2
-rw-r--r--devel/svk/Makefile2
-rw-r--r--dns/p5-BIND-Conf_Parser/Makefile2
-rw-r--r--dns/p5-DNS-Config/Makefile3
-rw-r--r--dns/p5-DNS-EasyDNS/Makefile3
-rw-r--r--dns/p5-DNS-Zone/Makefile3
-rw-r--r--dns/p5-Data-Validate-Domain/Makefile3
-rw-r--r--dns/p5-Net-DNS-Codes/Makefile3
-rw-r--r--dns/p5-Net-DNS-Resolver-Programmable/Makefile3
-rw-r--r--dns/p5-Net-DNS-SEC/Makefile3
-rw-r--r--dns/p5-Net-DNS-ZoneCheck/Makefile3
-rw-r--r--dns/p5-Net-DNS-ZoneFile/Makefile3
-rw-r--r--dns/p5-Net-LibIDN/Makefile3
-rw-r--r--dns/p5-Net-RBLClient/Makefile3
-rw-r--r--dns/p5-POE-Component-Client-DNS/Makefile3
-rw-r--r--finance/p5-Business-CreditCard/Makefile3
-rw-r--r--finance/p5-Business-OCV/Makefile2
-rw-r--r--finance/p5-Business-OnlinePayment-2CheckOut/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-Beanstream/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-Cardstream/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-Jettis/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-LinkPoint/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-Network1Financial/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-OCV/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-PayConnect/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-PayflowPro/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-SurePay/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-TCLink/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-VirtualNet/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-eSec/Makefile3
-rw-r--r--finance/p5-Business-OnlinePayment-iAuthorizer/Makefile3
-rw-r--r--finance/p5-Business-PayPal-IPN/Makefile3
-rw-r--r--finance/p5-Business-WorldPay-Junior/Makefile3
-rw-r--r--finance/p5-Finance-Currency-Convert-WebserviceX/Makefile3
-rw-r--r--finance/p5-Finance-Quote/Makefile3
-rw-r--r--finance/p5-Finance-QuoteHist/Makefile3
-rw-r--r--finance/p5-Math-Financial/Makefile3
-rw-r--r--ftp/p5-Net-FTP-Common/Makefile3
-rw-r--r--ftp/p5-Net-FTPServer/Makefile3
-rw-r--r--ftp/p5-POE-Component-Client-FTP/Makefile3
-rw-r--r--games/lm-solve/Makefile3
-rw-r--r--games/p5-Algorithm-Pair-Best/Makefile3
-rw-r--r--games/p5-Algorithm-Pair-Swiss/Makefile3
-rw-r--r--games/p5-Baseball-Sabermetrics/Makefile3
-rw-r--r--games/p5-Games-Alak/Makefile3
-rw-r--r--games/p5-Games-AlphaBeta/Makefile3
-rw-r--r--games/p5-Games-Bingo-Bot/Makefile3
-rw-r--r--games/p5-Games-Bingo-Print/Makefile3
-rw-r--r--games/p5-Games-Dice/Makefile3
-rw-r--r--games/p5-Games-GuessWord/Makefile3
-rw-r--r--games/p5-Games-Tournament-RoundRobin/Makefile3
-rw-r--r--graphics/eps2png/Makefile4
-rw-r--r--graphics/p5-Acme-Steganography-Image-Png/Makefile3
-rw-r--r--graphics/p5-CAD-Drawing-Template/Makefile3
-rw-r--r--graphics/p5-CAD-Drawing/Makefile3
-rw-r--r--graphics/p5-Captcha-reCAPTCHA/Makefile2
-rw-r--r--graphics/p5-Chart-Graph/Makefile3
-rw-r--r--graphics/p5-Chart-PNGgraph/Makefile3
-rw-r--r--graphics/p5-Color-Rgb/Makefile3
-rw-r--r--graphics/p5-GD-Arrow/Makefile3
-rw-r--r--graphics/p5-GD-Barcode/Makefile3
-rw-r--r--graphics/p5-GD-Graph3d/Makefile3
-rw-r--r--graphics/p5-GD-SVG/Makefile3
-rw-r--r--graphics/p5-GD-TextUtil/Makefile3
-rw-r--r--graphics/p5-GD-Thumbnail/Makefile3
-rw-r--r--graphics/p5-GD/Makefile3
-rw-r--r--graphics/p5-Graph-Easy/Makefile3
-rw-r--r--graphics/p5-Graph-ReadWrite/Makefile3
-rw-r--r--graphics/p5-Graph-SocialMap/Makefile3
-rw-r--r--graphics/p5-Graph-Writer-GraphViz/Makefile3
-rw-r--r--graphics/p5-GraphViz-Traverse/Makefile3
-rw-r--r--graphics/p5-Image-Caa/Makefile3
-rw-r--r--graphics/p5-Image-ExifTool-devel/Makefile3
-rw-r--r--graphics/p5-Image-ExifTool/Makefile3
-rw-r--r--graphics/p5-Image-Grab/Makefile3
-rw-r--r--graphics/p5-Image-IPTCInfo/Makefile3
-rw-r--r--graphics/p5-Image-Imlib2/Makefile3
-rw-r--r--graphics/p5-Image-Info/Makefile3
-rw-r--r--graphics/p5-Image-Math-Constrain/Makefile3
-rw-r--r--graphics/p5-Image-MetaData-GQview/Makefile3
-rw-r--r--graphics/p5-Image-MetaData-JPEG/Makefile3
-rw-r--r--graphics/p5-Image-Pngslimmer/Makefile3
-rw-r--r--graphics/p5-Image-Size/Makefile3
-rw-r--r--graphics/p5-Imager-Graph/Makefile3
-rw-r--r--graphics/p5-Imager-Plot/Makefile3
-rw-r--r--graphics/p5-Imager-QRCode/Makefile3
-rw-r--r--graphics/p5-Imager/Makefile3
-rw-r--r--graphics/p5-OpenGL/Makefile2
-rw-r--r--graphics/p5-PGPLOT/Makefile3
-rw-r--r--graphics/p5-SVG-DOM2/Makefile3
-rw-r--r--graphics/p5-SVG-Graph/Makefile3
-rw-r--r--graphics/p5-SVG-Metadata/Makefile3
-rw-r--r--graphics/p5-SWF-Builder/Makefile3
-rw-r--r--graphics/p5-SWF-File/Makefile3
-rw-r--r--graphics/p5-SpringGraph/Makefile3
-rw-r--r--graphics/p5-Tk-JPEG-Lite/Makefile3
-rw-r--r--graphics/p5-VCG/Makefile2
-rw-r--r--graphics/p5-Visio/Makefile3
-rw-r--r--graphics/pgperl/Makefile3
-rw-r--r--irc/p5-Bot-BasicBot/Makefile2
-rw-r--r--irc/p5-IRC-Bot-Hangman/Makefile2
-rw-r--r--irc/p5-IRC/Makefile3
-rw-r--r--irc/p5-POE-Component-IRC-Object/Makefile3
-rw-r--r--japanese/p5-Acme-Lou/Makefile3
-rw-r--r--japanese/p5-Date-Japanese-Era/Makefile3
-rw-r--r--japanese/p5-Date-Japanese-Holiday/Makefile3
-rw-r--r--japanese/p5-DateTime-Calendar-Japanese-Era/Makefile3
-rw-r--r--japanese/p5-Encode-EUCJPMS/Makefile3
-rw-r--r--japanese/p5-FormValidator-Simple-Plugin-Number-Phone-JP/Makefile3
-rw-r--r--japanese/p5-Jcode/Makefile3
-rw-r--r--japanese/p5-Lingua-JA-Numbers/Makefile3
-rw-r--r--japanese/p5-Lingua-JA-Summarize-Extract/Makefile3
-rw-r--r--japanese/p5-Number-Phone-JP/Makefile3
-rw-r--r--japanese/p5-Text-MeCab/Makefile3
-rw-r--r--japanese/p5-Unicode-Japanese/Makefile3
-rw-r--r--japanese/p5-WWW-2ch/Makefile3
-rw-r--r--lang/p5-Data-JavaScript/Makefile3
-rw-r--r--lang/p5-ExtUtils-F77/Makefile3
-rw-r--r--lang/p5-F77/Makefile3
-rw-r--r--lang/p5-Interpolation/Makefile2
-rw-r--r--lang/p5-JSAN/Makefile2
-rw-r--r--lang/p5-JavaScript-Squish/Makefile3
-rw-r--r--lang/p5-JavaScript/Makefile3
-rw-r--r--lang/p5-List-MoreUtils/Makefile2
-rw-r--r--lang/p5-Perl6-Subs/Makefile3
-rw-r--r--lang/p5-Quantum-Superpositions/Makefile3
-rw-r--r--lang/p5-Scalar-List-Utils/Makefile3
-rw-r--r--lang/p5-Switch/Makefile4
-rw-r--r--lang/p5-Tcl/Makefile3
-rw-r--r--lang/parrot/Makefile3
-rw-r--r--lang/perl5.10/Makefile2
-rw-r--r--lang/perl5.12/Makefile2
-rw-r--r--lang/perl5.14/Makefile2
-rw-r--r--lang/perl5.16/Makefile2
-rw-r--r--lang/perl5.6/Makefile2
-rw-r--r--lang/perl5.8/Makefile2
-rw-r--r--lang/perl5/Makefile2
-rw-r--r--lang/pugs/Makefile3
-rw-r--r--mail/mailagent/Makefile2
-rw-r--r--mail/p5-Email-Filter/Makefile3
-rw-r--r--mail/p5-Email-Find/Makefile3
-rw-r--r--mail/p5-Email-LocalDelivery-Ezmlm/Makefile3
-rw-r--r--mail/p5-Email-LocalDelivery/Makefile3
-rw-r--r--mail/p5-Email-MessageID/Makefile3
-rw-r--r--mail/p5-Email-Reply/Makefile3
-rw-r--r--mail/p5-Email-Send/Makefile3
-rw-r--r--mail/p5-Email-Simple-Creator/Makefile3
-rw-r--r--mail/p5-Email-Simple/Makefile3
-rw-r--r--mail/p5-Email-Valid-Loose/Makefile3
-rw-r--r--mail/p5-Email-Valid/Makefile3
-rw-r--r--mail/p5-GMail-IMAPD/Makefile3
-rw-r--r--mail/p5-IMAP-Admin/Makefile3
-rw-r--r--mail/p5-IMAP-Client/Makefile3
-rw-r--r--mail/p5-MIME-Charset/Makefile3
-rw-r--r--mail/p5-MIME-EncWords/Makefile3
-rw-r--r--mail/p5-MIME-Explode/Makefile3
-rw-r--r--mail/p5-MIME-Fast/Makefile3
-rw-r--r--mail/p5-MIME-Lite-HTML/Makefile3
-rw-r--r--mail/p5-MIME-Types/Makefile3
-rw-r--r--mail/p5-Mail-Address-MobileJp/Makefile3
-rw-r--r--mail/p5-Mail-Alias/Makefile3
-rw-r--r--mail/p5-Mail-Audit-Attach/Makefile3
-rw-r--r--mail/p5-Mail-Box-Parser-C/Makefile3
-rw-r--r--mail/p5-Mail-Box/Makefile3
-rw-r--r--mail/p5-Mail-Bulkmail/Makefile3
-rw-r--r--mail/p5-Mail-CClient/Makefile3
-rw-r--r--mail/p5-Mail-CheckUser/Makefile3
-rw-r--r--mail/p5-Mail-ClamAV/Makefile3
-rw-r--r--mail/p5-Mail-DKIM/Makefile3
-rw-r--r--mail/p5-Mail-DomainKeys/Makefile3
-rw-r--r--mail/p5-Mail-Ezmlm/Makefile3
-rw-r--r--mail/p5-Mail-Field-Received/Makefile3
-rw-r--r--mail/p5-Mail-FilterXML/Makefile3
-rw-r--r--mail/p5-Mail-Folder/Makefile3
-rw-r--r--mail/p5-Mail-Freshmeat/Makefile3
-rw-r--r--mail/p5-Mail-Graph/Makefile3
-rw-r--r--mail/p5-Mail-IMAPTalk/Makefile3
-rw-r--r--mail/p5-Mail-ListDetector/Makefile3
-rw-r--r--mail/p5-Mail-MailStats/Makefile3
-rw-r--r--mail/p5-Mail-Mbox-MessageParser/Makefile3
-rw-r--r--mail/p5-Mail-MboxParser/Makefile3
-rw-r--r--mail/p5-Mail-OpenRelay-Simple/Makefile3
-rw-r--r--mail/p5-Mail-POP3Client/Makefile3
-rw-r--r--mail/p5-Mail-Procmailrc/Makefile3
-rw-r--r--mail/p5-Mail-QuoteWrap/Makefile3
-rw-r--r--mail/p5-Mail-RBL/Makefile3
-rw-r--r--mail/p5-Mail-RFC822-Address/Makefile3
-rw-r--r--mail/p5-Mail-SPF-Query/Makefile3
-rw-r--r--mail/p5-Mail-SRS/Makefile3
-rw-r--r--mail/p5-Mail-SendEasy/Makefile3
-rw-r--r--mail/p5-Mail-Sender/Makefile3
-rw-r--r--mail/p5-Mail-Sendmail/Makefile3
-rw-r--r--mail/p5-Mail-Spool/Makefile3
-rw-r--r--mail/p5-Mail-Transport-Dbx/Makefile3
-rw-r--r--mail/p5-Mail-Verify/Makefile3
-rw-r--r--mail/p5-Mail-Webmail-Gmail/Makefile3
-rw-r--r--mail/p5-Net-IMAP-Simple-SSL/Makefile3
-rw-r--r--mail/p5-Net-IMAP-Simple/Makefile2
-rw-r--r--mail/p5-Net-QMTP/Makefile3
-rw-r--r--mail/p5-Net-SMTP-Server/Makefile3
-rw-r--r--mail/p5-Net-SMTP-TLS/Makefile3
-rw-r--r--mail/p5-Net-SMTP_auth/Makefile3
-rw-r--r--mail/p5-POE-Component-Client-POP3/Makefile3
-rw-r--r--mail/p5-POE-Component-Client-SMTP/Makefile3
-rw-r--r--mail/p5-POE-Component-SMTP/Makefile3
-rw-r--r--mail/p5-Parse-Syslog-Mail/Makefile3
-rw-r--r--mail/p5-Qmail-Envelope/Makefile2
-rw-r--r--mail/p5-Sendmail-AccessDB/Makefile3
-rw-r--r--mail/p5-Sendmail-Milter/Makefile3
-rw-r--r--mail/p5-URI-imap/Makefile3
-rw-r--r--mail/p5-URI-imaps/Makefile3
-rw-r--r--mail/p5-WWW-GMail/Makefile3
-rw-r--r--mail/p5-WWW-Hotmail/Makefile3
-rw-r--r--math/p5-AI-DecisionTree/Makefile3
-rw-r--r--math/p5-AI-Genetic/Makefile3
-rw-r--r--math/p5-AI-NeuralNet-BackProp/Makefile3
-rw-r--r--math/p5-AI-Perceptron/Makefile3
-rw-r--r--math/p5-Algorithm-Combinatorics/Makefile3
-rw-r--r--math/p5-Bit-ShiftReg/Makefile3
-rw-r--r--math/p5-Bit-Vector-Minimal/Makefile3
-rw-r--r--math/p5-Bit-Vector/Makefile3
-rw-r--r--math/p5-CAD-Calc/Makefile3
-rw-r--r--math/p5-Date-Handler/Makefile3
-rw-r--r--math/p5-Geo-Distance/Makefile3
-rw-r--r--math/p5-Graph/Makefile3
-rw-r--r--math/p5-Math-Algebra-Symbols/Makefile3
-rw-r--r--math/p5-Math-Base85/Makefile3
-rw-r--r--math/p5-Math-BaseCalc/Makefile3
-rw-r--r--math/p5-Math-Bezier-Convert/Makefile3
-rw-r--r--math/p5-Math-Bezier/Makefile3
-rw-r--r--math/p5-Math-BigInt-GMP/Makefile3
-rw-r--r--math/p5-Math-BigInt/Makefile3
-rw-r--r--math/p5-Math-BigRat/Makefile3
-rw-r--r--math/p5-Math-Calc-Units/Makefile3
-rw-r--r--math/p5-Math-Cephes/Makefile3
-rw-r--r--math/p5-Math-Combinatorics/Makefile3
-rw-r--r--math/p5-Math-ConvexHull/Makefile3
-rw-r--r--math/p5-Math-Derivative/Makefile3
-rw-r--r--math/p5-Math-Expr/Makefile3
-rw-r--r--math/p5-Math-FFT/Makefile3
-rw-r--r--math/p5-Math-GSL/Makefile3
-rw-r--r--math/p5-Math-Geometry-Planar-GPC/Makefile3
-rw-r--r--math/p5-Math-Geometry-Planar-Offset/Makefile3
-rw-r--r--math/p5-Math-Geometry-Planar/Makefile3
-rw-r--r--math/p5-Math-Geometry/Makefile3
-rw-r--r--math/p5-Math-Interpolate/Makefile3
-rw-r--r--math/p5-Math-Intersection-StraightLine/Makefile3
-rw-r--r--math/p5-Math-LinearCombination/Makefile3
-rw-r--r--math/p5-Math-Logic/Makefile3
-rw-r--r--math/p5-Math-Matrix/Makefile3
-rw-r--r--math/p5-Math-NumberCruncher/Makefile3
-rw-r--r--math/p5-Math-Pari/Makefile3
-rw-r--r--math/p5-Math-Random-MT/Makefile3
-rw-r--r--math/p5-Math-Random-OO/Makefile3
-rw-r--r--math/p5-Math-Random/Makefile3
-rw-r--r--math/p5-Math-RandomOrg/Makefile3
-rw-r--r--math/p5-Math-Round-Var/Makefile3
-rw-r--r--math/p5-Math-Round/Makefile3
-rw-r--r--math/p5-Math-Sequence/Makefile3
-rw-r--r--math/p5-Math-Series/Makefile3
-rw-r--r--math/p5-Math-SimpleVariable/Makefile3
-rw-r--r--math/p5-Math-Spline/Makefile3
-rw-r--r--math/p5-Math-Symbolic-Custom-Contains/Makefile3
-rw-r--r--math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile3
-rw-r--r--math/p5-Math-Symbolic-Custom-Simplification/Makefile3
-rw-r--r--math/p5-Math-Symbolic-Custom-Transformation/Makefile3
-rw-r--r--math/p5-Math-Symbolic/Makefile3
-rw-r--r--math/p5-Math-SymbolicX-BigNum/Makefile3
-rw-r--r--math/p5-Math-SymbolicX-Complex/Makefile3
-rw-r--r--math/p5-Math-SymbolicX-Error/Makefile3
-rw-r--r--math/p5-Math-SymbolicX-Inline/Makefile3
-rw-r--r--math/p5-Math-SymbolicX-NoSimplification/Makefile3
-rw-r--r--math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile3
-rw-r--r--math/p5-Math-SymbolicX-Statistics-Distributions/Makefile3
-rw-r--r--math/p5-Math-TrulyRandom/Makefile3
-rw-r--r--math/p5-Math-Units/Makefile3
-rw-r--r--math/p5-Math-Vec/Makefile3
-rw-r--r--math/p5-Math-VecStat/Makefile3
-rw-r--r--math/p5-Number-Compare/Makefile3
-rw-r--r--math/p5-Number-WithError-LaTeX/Makefile3
-rw-r--r--math/p5-Number-WithError/Makefile3
-rw-r--r--math/p5-Set-IntSpan-Fast/Makefile3
-rw-r--r--math/p5-Set-IntSpan/Makefile3
-rw-r--r--math/p5-Set-Partition/Makefile3
-rw-r--r--math/p5-Set-Window/Makefile3
-rw-r--r--math/p5-Statistics-ChiSquare/Makefile3
-rw-r--r--math/p5-Statistics-Contingency/Makefile3
-rw-r--r--math/p5-Statistics-Descriptive-Discrete/Makefile3
-rw-r--r--math/p5-Statistics-Descriptive/Makefile3
-rw-r--r--math/p5-Statistics-Distributions/Makefile3
-rw-r--r--math/p5-Statistics-LTU/Makefile3
-rw-r--r--math/p5-Statistics-OLS/Makefile3
-rw-r--r--math/p5-Statistics-Regression/Makefile3
-rw-r--r--misc/p5-Acme-ButFirst/Makefile3
-rw-r--r--misc/p5-Array-IntSpan/Makefile3
-rw-r--r--misc/p5-Array-PrintCols/Makefile3
-rw-r--r--misc/p5-Array-RefElem/Makefile3
-rw-r--r--misc/p5-Business-ISBN-Data/Makefile3
-rw-r--r--misc/p5-Business-ISIN/Makefile3
-rw-r--r--misc/p5-Business-ISSN/Makefile3
-rw-r--r--misc/p5-Business-UPS/Makefile2
-rw-r--r--misc/p5-Chatbot-Eliza/Makefile3
-rw-r--r--misc/p5-Data-Buffer/Makefile3
-rw-r--r--misc/p5-File-CounterFile/Makefile3
-rw-r--r--misc/p5-File-Sort/Makefile3
-rw-r--r--misc/p5-Geo-Cache/Makefile3
-rw-r--r--misc/p5-Geo-Postcodes-DK/Makefile3
-rw-r--r--misc/p5-Geo-Postcodes-NO/Makefile3
-rw-r--r--misc/p5-Geo-Postcodes/Makefile3
-rw-r--r--misc/p5-Geo-Weather/Makefile3
-rw-r--r--misc/p5-Geography-Countries/Makefile3
-rw-r--r--misc/p5-Geography-NationalGrid/Makefile3
-rw-r--r--misc/p5-I18N-LangTags/Makefile3
-rw-r--r--misc/p5-LEGO-RCX/Makefile3
-rw-r--r--misc/p5-List-Compare/Makefile3
-rw-r--r--misc/p5-Locale-Codes/Makefile3
-rw-r--r--misc/p5-Locale-Msgcat/Makefile3
-rw-r--r--misc/p5-Norge/Makefile3
-rw-r--r--misc/p5-Test-Dir/Makefile3
-rw-r--r--misc/p5-Text-FIGlet/Makefile3
-rw-r--r--misc/p5-Tie-DxHash/Makefile3
-rw-r--r--misc/p5-Zen-Koans/Makefile2
-rw-r--r--multimedia/dvdrip/Makefile3
-rw-r--r--multimedia/p5-FFmpeg-Command/Makefile2
-rw-r--r--multimedia/p5-FLV-Info/Makefile2
-rw-r--r--multimedia/p5-MP4-Info/Makefile3
-rw-r--r--multimedia/p5-Video-Info/Makefile3
-rw-r--r--multimedia/p5-Video-OpenQuicktime/Makefile3
-rw-r--r--net-im/p5-DJabberd/Makefile2
-rw-r--r--net-im/p5-Jabber-SimpleSend/Makefile3
-rw-r--r--net-im/p5-Net-AIM/Makefile3
-rw-r--r--net-im/p5-Net-AOLIM/Makefile3
-rw-r--r--net-im/p5-Net-Jabber/Makefile3
-rw-r--r--net-im/p5-Net-MSN/Makefile3
-rw-r--r--net-im/p5-Net-NetSend/Makefile3
-rw-r--r--net-im/p5-Net-OSCAR/Makefile3
-rw-r--r--net-im/p5-Net-Stomp/Makefile3
-rw-r--r--net-im/p5-POE-Component-Client-MSN/Makefile3
-rw-r--r--net-mgmt/p5-Cisco-Reconfig/Makefile3
-rw-r--r--net-mgmt/p5-Mon/Makefile3
-rw-r--r--net-mgmt/p5-NSNMP/Makefile2
-rw-r--r--net-mgmt/p5-Net-ACL/Makefile3
-rw-r--r--net-mgmt/p5-Net-CIDR/Makefile3
-rw-r--r--net-mgmt/p5-Net-IP-Match-XS/Makefile3
-rw-r--r--net-mgmt/p5-Net-IP-Resolver/Makefile3
-rw-r--r--net-mgmt/p5-Net-IP/Makefile3
-rw-r--r--net-mgmt/p5-Net-IPv4Addr/Makefile3
-rw-r--r--net-mgmt/p5-Net-IPv6Addr/Makefile3
-rw-r--r--net-mgmt/p5-Net-Netmask/Makefile3
-rw-r--r--net-mgmt/p5-Net-SNMP/Makefile3
-rw-r--r--net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile3
-rw-r--r--net-mgmt/p5-NetAddr-IP-Lite/Makefile3
-rw-r--r--net-mgmt/p5-NetAddr-IP/Makefile3
-rw-r--r--net-mgmt/p5-POE-Component-SNMP/Makefile3
-rw-r--r--net-mgmt/p5-SNMP-MIB-Compiler/Makefile3
-rw-r--r--net-mgmt/p5-SNMP-Util/Makefile3
-rw-r--r--net-mgmt/p5-Tie-NetAddr-IP/Makefile3
-rw-r--r--net-p2p/p5-Net-BitTorrent-File/Makefile3
-rw-r--r--net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile3
-rw-r--r--net-p2p/p5-WWW-BitTorrent/Makefile3
-rw-r--r--net/ldapsh/Makefile4
-rw-r--r--net/p5-AddressBook/Makefile4
-rw-r--r--net/p5-BBS-UserInfo-Maple3/Makefile2
-rw-r--r--net/p5-BBS-UserInfo-Maple3itoc/Makefile2
-rw-r--r--net/p5-BBS-UserInfo-Ptt/Makefile2
-rw-r--r--net/p5-BBS-UserInfo-SOB/Makefile2
-rw-r--r--net/p5-BBS-UserInfo-Wretch/Makefile2
-rw-r--r--net/p5-BBS-UserInfo/Makefile2
-rw-r--r--net/p5-Cisco-IPPhone/Makefile3
-rw-r--r--net/p5-EasyTCP/Makefile3
-rw-r--r--net/p5-File-Rsync/Makefile3
-rw-r--r--net/p5-Filesys-SmbClient/Makefile3
-rw-r--r--net/p5-Frontier-RPC/Makefile3
-rw-r--r--net/p5-Geo-IPfree/Makefile3
-rw-r--r--net/p5-Gopher-Server/Makefile2
-rw-r--r--net/p5-IO-Socket-Multicast/Makefile3
-rw-r--r--net/p5-IO-Socket-Multicast6/Makefile3
-rw-r--r--net/p5-IP-Country/Makefile3
-rw-r--r--net/p5-JavaScript-RPC/Makefile3
-rw-r--r--net/p5-Net-ARP/Makefile3
-rw-r--r--net/p5-Net-Address-IPv4-Local/Makefile3
-rw-r--r--net/p5-Net-Analysis/Makefile3
-rw-r--r--net/p5-Net-BGP/Makefile3
-rw-r--r--net/p5-Net-Blogger/Makefile3
-rw-r--r--net/p5-Net-CIDR-Lite/Makefile3
-rw-r--r--net/p5-Net-DAV-Server/Makefile3
-rw-r--r--net/p5-Net-DHCP/Makefile3
-rw-r--r--net/p5-Net-DHCPClient/Makefile3
-rw-r--r--net/p5-Net-DLookup/Makefile3
-rw-r--r--net/p5-Net-Daemon/Makefile3
-rw-r--r--net/p5-Net-Dict/Makefile3
-rw-r--r--net/p5-Net-Divert/Makefile3
-rw-r--r--net/p5-Net-EPP-Client/Makefile3
-rw-r--r--net/p5-Net-EPP-Frame/Makefile3
-rw-r--r--net/p5-Net-EPP-Proxy/Makefile3
-rw-r--r--net/p5-Net-EPP/Makefile3
-rw-r--r--net/p5-Net-FS-Flickr/Makefile3
-rw-r--r--net/p5-Net-FS-Gmail/Makefile3
-rw-r--r--net/p5-Net-FTP-File/Makefile3
-rw-r--r--net/p5-Net-Finger/Makefile3
-rw-r--r--net/p5-Net-Frame/Makefile3
-rw-r--r--net/p5-Net-Google-Calendar/Makefile3
-rw-r--r--net/p5-Net-Google/Makefile3
-rw-r--r--net/p5-Net-Gopher/Makefile3
-rw-r--r--net/p5-Net-Growl/Makefile3
-rw-r--r--net/p5-Net-IPTrie/Makefile3
-rw-r--r--net/p5-Net-Ident/Makefile3
-rw-r--r--net/p5-Net-Interface/Makefile3
-rw-r--r--net/p5-Net-LDAP-LDAPhash/Makefile1
-rw-r--r--net/p5-Net-MAC-Vendor/Makefile3
-rw-r--r--net/p5-Net-MovableType/Makefile3
-rw-r--r--net/p5-Net-NBName/Makefile3
-rw-r--r--net/p5-Net-NBsocket/Makefile3
-rw-r--r--net/p5-Net-NIS-Listgroup/Makefile3
-rw-r--r--net/p5-Net-OpenDHT/Makefile3
-rw-r--r--net/p5-Net-ParseWhois/Makefile3
-rw-r--r--net/p5-Net-Patricia/Makefile3
-rw-r--r--net/p5-Net-PcapUtils/Makefile3
-rw-r--r--net/p5-Net-Ping-External/Makefile3
-rw-r--r--net/p5-Net-RTP/Makefile3
-rw-r--r--net/p5-Net-Radius/Makefile3
-rw-r--r--net/p5-Net-Random/Makefile3
-rw-r--r--net/p5-Net-RawIP/Makefile3
-rw-r--r--net/p5-Net-Rendezvous/Makefile3
-rw-r--r--net/p5-Net-Rsh/Makefile3
-rw-r--r--net/p5-Net-SAP/Makefile3
-rw-r--r--net/p5-Net-SCP-Expect/Makefile3
-rw-r--r--net/p5-Net-SDP/Makefile3
-rw-r--r--net/p5-Net-SFTP/Makefile3
-rw-r--r--net/p5-Net-SMPP/Makefile3
-rw-r--r--net/p5-Net-SMS-PChome/Makefile3
-rw-r--r--net/p5-Net-SNPP/Makefile3
-rw-r--r--net/p5-Net-SSH-Expect/Makefile3
-rw-r--r--net/p5-Net-SSH-Perl/Makefile3
-rw-r--r--net/p5-Net-SSH/Makefile3
-rw-r--r--net/p5-Net-SSH2/Makefile3
-rw-r--r--net/p5-Net-Server/Makefile3
-rw-r--r--net/p5-Net-Services/Makefile2
-rw-r--r--net/p5-Net-TCLink/Makefile3
-rw-r--r--net/p5-Net-Telnet-Netscreen/Makefile3
-rw-r--r--net/p5-Net-Telnet/Makefile3
-rw-r--r--net/p5-Net-TiVo/Makefile3
-rw-r--r--net/p5-Net-Traceroute/Makefile3
-rw-r--r--net/p5-Net-Traceroute6/Makefile3
-rw-r--r--net/p5-Net-Wake/Makefile3
-rw-r--r--net/p5-Net-Whois-ARIN/Makefile3
-rw-r--r--net/p5-Net-Whois-IP/Makefile3
-rw-r--r--net/p5-Net-Whois-RIPE/Makefile2
-rw-r--r--net/p5-Net-Whois/Makefile3
-rw-r--r--net/p5-Net-XWhois/Makefile3
-rw-r--r--net/p5-Net-Z3950-ZOOM/Makefile3
-rw-r--r--net/p5-Net-ext/Makefile3
-rw-r--r--net/p5-NetAddr-IP-Count/Makefile3
-rw-r--r--net/p5-NetPacket/Makefile3
-rw-r--r--net/p5-OurNet-BBS/Makefile3
-rw-r--r--net/p5-OurNet-BBSAgent/Makefile3
-rw-r--r--net/p5-POE-Component-Client-Keepalive/Makefile3
-rw-r--r--net/p5-POE-Component-Client-Ping/Makefile3
-rw-r--r--net/p5-POE-Component-Client-Telnet/Makefile3
-rw-r--r--net/p5-POE-Component-Client-Traceroute/Makefile3
-rw-r--r--net/p5-POE-Component-ControlPort/Makefile3
-rw-r--r--net/p5-POE-Component-Pcap/Makefile3
-rw-r--r--net/p5-POE-Component-Spread/Makefile3
-rw-r--r--net/p5-Parallel-MPI/Makefile3
-rw-r--r--net/p5-Parallel-Pvm/Makefile3
-rw-r--r--net/p5-PlRPC/Makefile3
-rw-r--r--net/p5-REST-Application/Makefile4
-rw-r--r--net/p5-RPC-Simple/Makefile3
-rw-r--r--net/p5-RPC-XML/Makefile3
-rw-r--r--net/p5-ResourcePool-Resource-Net-LDAP/Makefile2
-rw-r--r--net/p5-ResourcePool-Resource-SOAP-Lite/Makefile2
-rw-r--r--net/p5-SOAP-Data-Builder/Makefile3
-rw-r--r--net/p5-SOAP-Lite-060/Makefile3
-rw-r--r--net/p5-SOAP-Lite/Makefile3
-rw-r--r--net/p5-SOAP/Makefile3
-rw-r--r--net/p5-Socket-Multicast6/Makefile3
-rw-r--r--net/p5-Socket6/Makefile3
-rw-r--r--net/p5-Socks/Makefile3
-rw-r--r--net/p5-Spread-Message/Makefile2
-rw-r--r--net/p5-Spread-Session/Makefile2
-rw-r--r--net/p5-URI-OpenURL/Makefile3
-rw-r--r--net/p5-URI/Makefile3
-rw-r--r--net/p5-Validate-Net/Makefile2
-rw-r--r--net/p5-What/Makefile2
-rw-r--r--net/p5-X500-DN/Makefile3
-rw-r--r--net/p5-XPC/Makefile2
-rw-r--r--news/p5-Gateway/Makefile3
-rw-r--r--news/p5-NNML/Makefile3
-rw-r--r--news/p5-NNTPClient/Makefile3
-rw-r--r--news/p5-News-Article-NoCeM/Makefile3
-rw-r--r--news/p5-News-Article/Makefile3
-rw-r--r--news/p5-News-Newsrc/Makefile3
-rw-r--r--news/p5-NewsLib/Makefile3
-rw-r--r--news/p5-POE-Component-Client-NNTP/Makefile3
-rw-r--r--palm/p5-Palm-PalmDoc/Makefile3
-rw-r--r--print/axpoint/Makefile3
-rw-r--r--print/p5-Net-Printer/Makefile3
-rw-r--r--print/p5-PDF-Template/Makefile3
-rw-r--r--print/p5-PDFLib/Makefile3
-rw-r--r--print/p5-PostScript-Simple/Makefile3
-rw-r--r--print/p5-Text-PDF/Makefile3
-rw-r--r--print/p5-XML-ApacheFOP/Makefile3
-rw-r--r--russian/p5-Lingua-RU-Charset/Makefile3
-rw-r--r--russian/p5-cyrillic/Makefile3
-rw-r--r--science/p5-Algorithm-SVMLight/Makefile3
-rw-r--r--science/p5-Chemistry-Elements/Makefile3
-rw-r--r--security/p5-Authen-Bitcard/Makefile3
-rw-r--r--security/p5-Authen-Captcha/Makefile3
-rw-r--r--security/p5-Authen-CyrusSASL/Makefile3
-rw-r--r--security/p5-Authen-Htpasswd/Makefile3
-rw-r--r--security/p5-Authen-Krb5/Makefile3
-rw-r--r--security/p5-Authen-Libwrap/Makefile3
-rw-r--r--security/p5-Authen-NTLM/Makefile3
-rw-r--r--security/p5-Authen-PAAS/Makefile3
-rw-r--r--security/p5-Authen-PAM/Makefile3
-rw-r--r--security/p5-Authen-PluggableCaptcha/Makefile3
-rw-r--r--security/p5-Authen-Radius/Makefile3
-rw-r--r--security/p5-Authen-SASL-Cyrus/Makefile3
-rw-r--r--security/p5-Authen-SASL/Makefile3
-rw-r--r--security/p5-Authen-Simple-DBI/Makefile3
-rw-r--r--security/p5-Authen-Simple-DBM/Makefile3
-rw-r--r--security/p5-Authen-Simple-HTTP/Makefile3
-rw-r--r--security/p5-Authen-Simple-LDAP/Makefile3
-rw-r--r--security/p5-Authen-Simple-Net/Makefile3
-rw-r--r--security/p5-Authen-Simple-PAM/Makefile3
-rw-r--r--security/p5-Authen-Simple-Passwd/Makefile3
-rw-r--r--security/p5-Authen-Simple-RADIUS/Makefile3
-rw-r--r--security/p5-Authen-Simple-SMB/Makefile3
-rw-r--r--security/p5-Authen-Simple-SSH/Makefile3
-rw-r--r--security/p5-Authen-Simple/Makefile3
-rw-r--r--security/p5-Authen-Smb/Makefile3
-rw-r--r--security/p5-Authen-TacacsPlus/Makefile3
-rw-r--r--security/p5-Authen-Ticket/Makefile3
-rw-r--r--security/p5-Authen-TypeKey/Makefile3
-rw-r--r--security/p5-Crypt-Anubis/Makefile3
-rw-r--r--security/p5-Crypt-AppleTwoFish/Makefile3
-rw-r--r--security/p5-Crypt-Blowfish/Makefile3
-rw-r--r--security/p5-Crypt-Blowfish_PP/Makefile3
-rw-r--r--security/p5-Crypt-CAST5_PP/Makefile3
-rw-r--r--security/p5-Crypt-CFB/Makefile3
-rw-r--r--security/p5-Crypt-Caesar/Makefile3
-rw-r--r--security/p5-Crypt-Camellia_PP/Makefile3
-rw-r--r--security/p5-Crypt-Chimera/Makefile3
-rw-r--r--security/p5-Crypt-CipherSaber/Makefile3
-rw-r--r--security/p5-Crypt-Cracklib/Makefile3
-rw-r--r--security/p5-Crypt-Ctr/Makefile3
-rw-r--r--security/p5-Crypt-DES/Makefile3
-rw-r--r--security/p5-Crypt-DES_EDE3/Makefile3
-rw-r--r--security/p5-Crypt-DES_PP/Makefile3
-rw-r--r--security/p5-Crypt-DH/Makefile3
-rw-r--r--security/p5-Crypt-DSA/Makefile3
-rw-r--r--security/p5-Crypt-Dining/Makefile3
-rw-r--r--security/p5-Crypt-ECB/Makefile3
-rw-r--r--security/p5-Crypt-Enigma/Makefile3
-rw-r--r--security/p5-Crypt-GOST/Makefile3
-rw-r--r--security/p5-Crypt-GOST_PP/Makefile3
-rw-r--r--security/p5-Crypt-GPG/Makefile3
-rw-r--r--security/p5-Crypt-GeneratePassword/Makefile3
-rw-r--r--security/p5-Crypt-HCE_MD5/Makefile3
-rw-r--r--security/p5-Crypt-HCE_SHA/Makefile3
-rw-r--r--security/p5-Crypt-Imail/Makefile3
-rw-r--r--security/p5-Crypt-Khazad/Makefile3
-rw-r--r--security/p5-Crypt-License/Makefile3
-rw-r--r--security/p5-Crypt-Lite/Makefile3
-rw-r--r--security/p5-Crypt-Loki97/Makefile3
-rw-r--r--security/p5-Crypt-MySQL/Makefile3
-rw-r--r--security/p5-Crypt-NULL/Makefile3
-rw-r--r--security/p5-Crypt-OFB/Makefile3
-rw-r--r--security/p5-Crypt-OICQ/Makefile3
-rw-r--r--security/p5-Crypt-OTP/Makefile3
-rw-r--r--security/p5-Crypt-OpenPGP/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-Bignum/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-DSA/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-RSA/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-Random/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-X509/Makefile3
-rw-r--r--security/p5-Crypt-PGPSimple/Makefile3
-rw-r--r--security/p5-Crypt-PassGen/Makefile3
-rw-r--r--security/p5-Crypt-PasswdMD5/Makefile3
-rw-r--r--security/p5-Crypt-Primes/Makefile3
-rw-r--r--security/p5-Crypt-RC4/Makefile3
-rw-r--r--security/p5-Crypt-RC5/Makefile3
-rw-r--r--security/p5-Crypt-RC6/Makefile3
-rw-r--r--security/p5-Crypt-RIPEMD160/Makefile3
-rw-r--r--security/p5-Crypt-RSA/Makefile3
-rw-r--r--security/p5-Crypt-Rabbit/Makefile3
-rw-r--r--security/p5-Crypt-RandPasswd/Makefile3
-rw-r--r--security/p5-Crypt-Random/Makefile3
-rw-r--r--security/p5-Crypt-Rijndael_PP/Makefile3
-rw-r--r--security/p5-Crypt-SKey/Makefile3
-rw-r--r--security/p5-Crypt-SSLeay/Makefile3
-rw-r--r--security/p5-Crypt-Salt/Makefile3
-rw-r--r--security/p5-Crypt-SaltedHash/Makefile3
-rw-r--r--security/p5-Crypt-Serpent/Makefile3
-rw-r--r--security/p5-Crypt-Shark/Makefile3
-rw-r--r--security/p5-Crypt-SmbHash/Makefile3
-rw-r--r--security/p5-Crypt-Solitaire/Makefile3
-rw-r--r--security/p5-Crypt-TEA/Makefile3
-rw-r--r--security/p5-Crypt-TripleDES/Makefile3
-rw-r--r--security/p5-Crypt-Twofish/Makefile3
-rw-r--r--security/p5-Crypt-Twofish2/Makefile3
-rw-r--r--security/p5-Crypt-UnixCrypt/Makefile3
-rw-r--r--security/p5-Crypt-X509/Makefile3
-rw-r--r--security/p5-Data-Entropy/Makefile3
-rw-r--r--security/p5-Data-Password/Makefile3
-rw-r--r--security/p5-Digest-Adler32/Makefile3
-rw-r--r--security/p5-Digest-BubbleBabble/Makefile3
-rw-r--r--security/p5-Digest-CRC/Makefile3
-rw-r--r--security/p5-Digest-Crc32/Makefile3
-rw-r--r--security/p5-Digest-DJB/Makefile3
-rw-r--r--security/p5-Digest-DMAC/Makefile3
-rw-r--r--security/p5-Digest-EMAC/Makefile3
-rw-r--r--security/p5-Digest-Elf/Makefile3
-rw-r--r--security/p5-Digest-FNV/Makefile3
-rw-r--r--security/p5-Digest-HMAC/Makefile3
-rw-r--r--security/p5-Digest-Hashcash/Makefile2
-rw-r--r--security/p5-Digest-Haval256/Makefile3
-rw-r--r--security/p5-Digest-JHash/Makefile3
-rw-r--r--security/p5-Digest-MD2/Makefile3
-rw-r--r--security/p5-Digest-MD5-File/Makefile3
-rw-r--r--security/p5-Digest-MD5-M4p/Makefile3
-rw-r--r--security/p5-Digest-MD5/Makefile3
-rw-r--r--security/p5-Digest-ManberHash/Makefile3
-rw-r--r--security/p5-Digest-Nilsimsa/Makefile3
-rw-r--r--security/p5-Digest-Pearson-PurePerl/Makefile3
-rw-r--r--security/p5-Digest-Pearson/Makefile3
-rw-r--r--security/p5-Digest-Perl-MD4/Makefile3
-rw-r--r--security/p5-Digest-Perl-MD5/Makefile3
-rw-r--r--security/p5-Digest-SHA-PurePerl/Makefile3
-rw-r--r--security/p5-Digest-SHA1/Makefile3
-rw-r--r--security/p5-Digest-SHA256/Makefile3
-rw-r--r--security/p5-Digest-SV1/Makefile3
-rw-r--r--security/p5-Digest-Tiger/Makefile3
-rw-r--r--security/p5-Digest-Whirlpool/Makefile3
-rw-r--r--security/p5-Digest/Makefile3
-rw-r--r--security/p5-Email-Obfuscate/Makefile3
-rw-r--r--security/p5-File-Scan-ClamAV/Makefile3
-rw-r--r--security/p5-File-Scan/Makefile3
-rw-r--r--security/p5-Filter-CBC/Makefile3
-rw-r--r--security/p5-Filter-Crypto/Makefile3
-rw-r--r--security/p5-GD-SecurityImage/Makefile3
-rw-r--r--security/p5-GSSAPI/Makefile2
-rw-r--r--security/p5-HTML-Email-Obfuscate/Makefile3
-rw-r--r--security/p5-Module-Signature/Makefile3
-rw-r--r--security/p5-Net-Daemon-SSL/Makefile3
-rw-r--r--security/p5-Net-OpenID-JanRain/Makefile3
-rw-r--r--security/p5-Net-SSLeay/Makefile3
-rw-r--r--security/p5-Nmap-Scanner/Makefile3
-rw-r--r--security/p5-OpenCA-CRL/Makefile3
-rw-r--r--security/p5-OpenCA-CRR/Makefile3
-rw-r--r--security/p5-OpenCA-PKCS7/Makefile3
-rw-r--r--security/p5-OpenCA-REQ/Makefile3
-rw-r--r--security/p5-PGP-Sign/Makefile3
-rw-r--r--security/p5-PGP/Makefile3
-rw-r--r--security/p5-POE-Component-SSLify/Makefile3
-rw-r--r--security/p5-PerlCryptLib/Makefile2
-rw-r--r--security/p5-SHA/Makefile4
-rw-r--r--security/p5-Safe-Hole/Makefile3
-rw-r--r--security/p5-Snort-Rule/Makefile4
-rw-r--r--security/p5-Text-Password-Pronounceable/Makefile3
-rw-r--r--security/p5-Tie-EncryptedHash/Makefile3
-rw-r--r--security/p5-Tree-Authz/Makefile3
-rw-r--r--shells/p5-Term-ShellUI/Makefile3
-rw-r--r--shells/psh/Makefile2
-rw-r--r--shells/zoidberg/Makefile3
-rw-r--r--sysutils/p5-BSD-Jail-Object/Makefile3
-rw-r--r--sysutils/p5-BSD-Sysctl/Makefile3
-rw-r--r--sysutils/p5-Dir-Purge/Makefile3
-rw-r--r--sysutils/p5-File-Next/Makefile3
-rw-r--r--sysutils/p5-File-Which/Makefile3
-rw-r--r--sysutils/p5-Filesys-Df/Makefile3
-rw-r--r--sysutils/p5-Filesys-DiskFree/Makefile3
-rw-r--r--sysutils/p5-Filesys-DiskSpace/Makefile3
-rw-r--r--sysutils/p5-Filesys-DiskUsage/Makefile3
-rw-r--r--sysutils/p5-Filesys-Statvfs/Makefile3
-rw-r--r--sysutils/p5-Fuse-Simple/Makefile4
-rw-r--r--sysutils/p5-Fuse/Makefile2
-rw-r--r--sysutils/p5-Proc-PidUtil/Makefile3
-rw-r--r--sysutils/p5-Quota/Makefile3
-rw-r--r--sysutils/p5-Schedule-At/Makefile3
-rw-r--r--sysutils/p5-Schedule-Cron/Makefile3
-rw-r--r--sysutils/p5-Schedule-Load/Makefile3
-rw-r--r--sysutils/p5-Schedule-Match/Makefile3
-rw-r--r--sysutils/p5-Stat-lsMode/Makefile3
-rw-r--r--sysutils/p5-Sys-CpuLoad/Makefile3
-rw-r--r--sysutils/p5-Sys-Gamin/Makefile3
-rw-r--r--sysutils/p5-Sys-Hostname-FQDN/Makefile3
-rw-r--r--sysutils/p5-Sys-Hostname-Long/Makefile3
-rw-r--r--sysutils/p5-Sys-Utmp/Makefile3
-rw-r--r--sysutils/p5-Sysadm-Install/Makefile2
-rw-r--r--sysutils/p5-SyslogScan/Makefile3
-rw-r--r--sysutils/p5-Tie-Syslog/Makefile3
-rw-r--r--sysutils/p5-Unix-ConfigFile/Makefile3
-rw-r--r--sysutils/p5-Unix-Mknod/Makefile3
-rw-r--r--sysutils/p5-Unix-Processors/Makefile3
-rw-r--r--sysutils/p5-Unix-Syslog/Makefile3
-rw-r--r--sysutils/p5-User/Makefile3
-rw-r--r--sysutils/savelogs/Makefile4
-rw-r--r--textproc/btparse/Makefile2
-rw-r--r--textproc/makepatch/Makefile2
-rw-r--r--textproc/p5-AI-Categorizer/Makefile3
-rw-r--r--textproc/p5-Algorithm-RabinKarp/Makefile2
-rw-r--r--textproc/p5-Apache-ParseLog/Makefile3
-rw-r--r--textproc/p5-Apache-XBEL/Makefile3
-rw-r--r--textproc/p5-Bloom-Filter/Makefile2
-rw-r--r--textproc/p5-CAM-PDF/Makefile2
-rw-r--r--textproc/p5-CQL-Parser/Makefile2
-rw-r--r--textproc/p5-CSS-SAC/Makefile3
-rw-r--r--textproc/p5-CSS-Squish/Makefile3
-rw-r--r--textproc/p5-CSS/Makefile3
-rw-r--r--textproc/p5-Chess-PGN-Parse/Makefile2
-rw-r--r--textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile2
-rw-r--r--textproc/p5-Data-Report/Makefile3
-rw-r--r--textproc/p5-Data-SpreadPagination/Makefile3
-rw-r--r--textproc/p5-Devel-TraceSAX/Makefile3
-rw-r--r--textproc/p5-Filter-Simple/Makefile3
-rw-r--r--textproc/p5-FormValidator-Simple/Makefile2
-rw-r--r--textproc/p5-Games-Dissociate/Makefile2
-rw-r--r--textproc/p5-Google-Data-JSON/Makefile2
-rw-r--r--textproc/p5-HTML-Copy/Makefile3
-rw-r--r--textproc/p5-HTML-Entities-ImodePictogram/Makefile3
-rw-r--r--textproc/p5-HTML-Entities-Numbered/Makefile3
-rw-r--r--textproc/p5-HTML-EscapeEvil/Makefile3
-rw-r--r--textproc/p5-HTML-Format/Makefile3
-rw-r--r--textproc/p5-HTML-FormatText-WithLinks/Makefile3
-rw-r--r--textproc/p5-HTML-Fraction/Makefile3
-rw-r--r--textproc/p5-HTML-SBC/Makefile3
-rw-r--r--textproc/p5-HTML-TagFilter/Makefile3
-rw-r--r--textproc/p5-HTML-Tiny/Makefile2
-rw-r--r--textproc/p5-HTML-Truncate/Makefile3
-rw-r--r--textproc/p5-Hash-Merge/Makefile3
-rw-r--r--textproc/p5-Hatena-Keyword/Makefile2
-rw-r--r--textproc/p5-IDNA-Punycode/Makefile2
-rw-r--r--textproc/p5-IO-CSVHeaderFile/Makefile3
-rw-r--r--textproc/p5-KinoSearch/Makefile2
-rw-r--r--textproc/p5-Lingua-Conjunction/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-AddressParse/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Fathom/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Gender/Makefile2
-rw-r--r--textproc/p5-Lingua-EN-Infinitive/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Inflect-Number/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Inflect/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-MatchNames/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-NameCase/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-NameParse/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-NamedEntity/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Nickname/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Numbers-Easy/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Numbers/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Squeeze/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Summarize/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Syllable/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Tagger/Makefile3
-rw-r--r--textproc/p5-Lingua-Ident/Makefile2
-rw-r--r--textproc/p5-Lingua-Identify/Makefile3
-rw-r--r--textproc/p5-Lingua-Ispell/Makefile3
-rw-r--r--textproc/p5-Lingua-PT-Stemmer/Makefile3
-rw-r--r--textproc/p5-Lingua-Preferred/Makefile2
-rw-r--r--textproc/p5-Lingua-Stem-Fr/Makefile3
-rw-r--r--textproc/p5-Lingua-Stem-It/Makefile3
-rw-r--r--textproc/p5-Lingua-Stem-Ru/Makefile3
-rw-r--r--textproc/p5-Lingua-Stem-Snowball-Da/Makefile3
-rw-r--r--textproc/p5-Lingua-Stem-Snowball-No/Makefile2
-rw-r--r--textproc/p5-Lingua-Stem-Snowball-Se/Makefile2
-rw-r--r--textproc/p5-Lingua-Stem-Snowball/Makefile3
-rw-r--r--textproc/p5-Lingua-Stem/Makefile3
-rw-r--r--textproc/p5-Lingua-StopWords/Makefile3
-rw-r--r--textproc/p5-MARC-Lint/Makefile3
-rw-r--r--textproc/p5-MARC-Record/Makefile3
-rw-r--r--textproc/p5-MARC/Makefile3
-rw-r--r--textproc/p5-MKDoc-XML/Makefile2
-rw-r--r--textproc/p5-Makefile-Parser/Makefile2
-rw-r--r--textproc/p5-MathML-Entities/Makefile3
-rw-r--r--textproc/p5-NetAddr-IP-Find/Makefile3
-rw-r--r--textproc/p5-Number-Format/Makefile3
-rw-r--r--textproc/p5-Number-Spell/Makefile3
-rw-r--r--textproc/p5-PDF-API2/Makefile3
-rw-r--r--textproc/p5-PDF-API3/Makefile3
-rw-r--r--textproc/p5-PDF-Create/Makefile3
-rw-r--r--textproc/p5-PDF-FromHTML/Makefile3
-rw-r--r--textproc/p5-PDF-Writer/Makefile3
-rw-r--r--textproc/p5-POE-Filter-XML/Makefile3
-rw-r--r--textproc/p5-POSIX-Regex/Makefile3
-rw-r--r--textproc/p5-PPI-HTML/Makefile2
-rw-r--r--textproc/p5-PPI/Makefile2
-rw-r--r--textproc/p5-Parse-CSV/Makefile3
-rw-r--r--textproc/p5-Parse-FixedLength/Makefile3
-rw-r--r--textproc/p5-Parse-Flex/Makefile3
-rw-r--r--textproc/p5-Parse-PhoneNumber/Makefile3
-rw-r--r--textproc/p5-Parse-Syslog/Makefile3
-rw-r--r--textproc/p5-Petal-CodePerl/Makefile2
-rw-r--r--textproc/p5-Petal-Mail/Makefile2
-rw-r--r--textproc/p5-Petal-Utils/Makefile2
-rw-r--r--textproc/p5-Petal/Makefile2
-rw-r--r--textproc/p5-Plagger/Makefile2
-rw-r--r--textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile2
-rw-r--r--textproc/p5-Plucene/Makefile2
-rw-r--r--textproc/p5-Pod-Constants/Makefile2
-rw-r--r--textproc/p5-Pod-DocBook/Makefile2
-rw-r--r--textproc/p5-Pod-POM-View-HTML-Filter/Makefile3
-rw-r--r--textproc/p5-Pod-POM/Makefile3
-rw-r--r--textproc/p5-Pod-Parser/Makefile3
-rw-r--r--textproc/p5-Pod-ProjectDocs/Makefile3
-rw-r--r--textproc/p5-Pod-Stripper/Makefile3
-rw-r--r--textproc/p5-Pod-Tree/Makefile3
-rw-r--r--textproc/p5-Pod-WSDL/Makefile3
-rw-r--r--textproc/p5-Pod-XML/Makefile3
-rw-r--r--textproc/p5-RADIUS-UserFile/Makefile3
-rw-r--r--textproc/p5-RDF-Core/Makefile3
-rw-r--r--textproc/p5-RDF-Notation3/Makefile3
-rw-r--r--textproc/p5-RDF-Simple/Makefile3
-rw-r--r--textproc/p5-RDFStore/Makefile3
-rw-r--r--textproc/p5-RTF-Parser/Makefile3
-rw-r--r--textproc/p5-RTF-Tokenizer/Makefile3
-rw-r--r--textproc/p5-RTF-Writer/Makefile3
-rw-r--r--textproc/p5-Regex-PreSuf/Makefile3
-rw-r--r--textproc/p5-Regexp-Common-profanity_us/Makefile3
-rw-r--r--textproc/p5-Regexp-Common/Makefile3
-rw-r--r--textproc/p5-Regexp-Copy/Makefile2
-rw-r--r--textproc/p5-Regexp-DefaultFlags/Makefile3
-rw-r--r--textproc/p5-Regexp-Log-Common/Makefile3
-rw-r--r--textproc/p5-Regexp-Log/Makefile3
-rw-r--r--textproc/p5-SGML-DTDParse/Makefile3
-rw-r--r--textproc/p5-SGML-Parser-OpenSP/Makefile3
-rw-r--r--textproc/p5-SGMLSpm/Makefile3
-rw-r--r--textproc/p5-SVG/Makefile3
-rw-r--r--textproc/p5-Search-VectorSpace/Makefile3
-rw-r--r--textproc/p5-Senna/Makefile2
-rw-r--r--textproc/p5-Sort-ArbBiLex/Makefile3
-rw-r--r--textproc/p5-Sort-Fields/Makefile3
-rw-r--r--textproc/p5-Sort-Naturally/Makefile3
-rw-r--r--textproc/p5-Spork/Makefile2
-rw-r--r--textproc/p5-Spreadsheet-ParseExcel/Makefile3
-rw-r--r--textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile3
-rw-r--r--textproc/p5-Spreadsheet-WriteExcel/Makefile3
-rw-r--r--textproc/p5-Spreadsheet-WriteExcelXML/Makefile3
-rw-r--r--textproc/p5-String-Divert/Makefile3
-rw-r--r--textproc/p5-String-Format/Makefile3
-rw-r--r--textproc/p5-String-Fraction/Makefile3
-rw-r--r--textproc/p5-String-Koremutake/Makefile3
-rw-r--r--textproc/p5-String-Scanf/Makefile3
-rw-r--r--textproc/p5-String-ShellQuote/Makefile3
-rw-r--r--textproc/p5-String-Strip/Makefile3
-rw-r--r--textproc/p5-String-Tokenizer/Makefile3
-rw-r--r--textproc/p5-Syntax-Highlight-Engine-Kate/Makefile3
-rw-r--r--textproc/p5-Syntax-Highlight-Perl-Improved/Makefile2
-rw-r--r--textproc/p5-TeX-Encode/Makefile2
-rw-r--r--textproc/p5-TeX-Hyphen/Makefile3
-rw-r--r--textproc/p5-Template-Declare/Makefile3
-rw-r--r--textproc/p5-Template-Extract/Makefile3
-rw-r--r--textproc/p5-Template-Magic/Makefile3
-rw-r--r--textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile3
-rw-r--r--textproc/p5-Test-Perl-Critic/Makefile3
-rw-r--r--textproc/p5-Text-ASCIITable/Makefile3
-rw-r--r--textproc/p5-Text-Affixes/Makefile3
-rw-r--r--textproc/p5-Text-Aligner/Makefile3
-rw-r--r--textproc/p5-Text-Autoformat/Makefile3
-rw-r--r--textproc/p5-Text-Balanced/Makefile3
-rw-r--r--textproc/p5-Text-Bind/Makefile3
-rw-r--r--textproc/p5-Text-CSV-Simple/Makefile3
-rw-r--r--textproc/p5-Text-CSV_PP/Makefile3
-rw-r--r--textproc/p5-Text-Capitalize/Makefile3
-rw-r--r--textproc/p5-Text-Chomp/Makefile3
-rw-r--r--textproc/p5-Text-Context-EitherSide/Makefile3
-rw-r--r--textproc/p5-Text-Decorator/Makefile3
-rw-r--r--textproc/p5-Text-Delimited/Makefile3
-rw-r--r--textproc/p5-Text-Diff-HTML/Makefile3
-rw-r--r--textproc/p5-Text-Diff/Makefile3
-rw-r--r--textproc/p5-Text-Diff3/Makefile3
-rw-r--r--textproc/p5-Text-DoubleMetaphone/Makefile3
-rw-r--r--textproc/p5-Text-Emoticon-GoogleTalk/Makefile3
-rw-r--r--textproc/p5-Text-Emoticon/Makefile3
-rw-r--r--textproc/p5-Text-EtText/Makefile3
-rw-r--r--textproc/p5-Text-ExtractWords/Makefile3
-rw-r--r--textproc/p5-Text-FillIn/Makefile3
-rw-r--r--textproc/p5-Text-Filter-Chain/Makefile3
-rw-r--r--textproc/p5-Text-Filter/Makefile3
-rw-r--r--textproc/p5-Text-FixedLength-Extra/Makefile3
-rw-r--r--textproc/p5-Text-FixedLength/Makefile3
-rw-r--r--textproc/p5-Text-Flowchart/Makefile3
-rw-r--r--textproc/p5-Text-Format+NWrap/Makefile3
-rw-r--r--textproc/p5-Text-Format/Makefile3
-rw-r--r--textproc/p5-Text-FormatTable/Makefile3
-rw-r--r--textproc/p5-Text-German/Makefile2
-rw-r--r--textproc/p5-Text-Glob/Makefile3
-rw-r--r--textproc/p5-Text-Graphics/Makefile3
-rw-r--r--textproc/p5-Text-Hatena/Makefile3
-rw-r--r--textproc/p5-Text-Highlight/Makefile2
-rw-r--r--textproc/p5-Text-Language-Guess/Makefile2
-rw-r--r--textproc/p5-Text-Metaphone/Makefile3
-rw-r--r--textproc/p5-Text-NeatTemplate/Makefile3
-rw-r--r--textproc/p5-Text-Netstring/Makefile3
-rw-r--r--textproc/p5-Text-Ngram/Makefile3
-rw-r--r--textproc/p5-Text-Ngrams/Makefile3
-rw-r--r--textproc/p5-Text-Original/Makefile4
-rw-r--r--textproc/p5-Text-ParagraphDiff/Makefile3
-rw-r--r--textproc/p5-Text-Query/Makefile3
-rw-r--r--textproc/p5-Text-Quoted/Makefile3
-rw-r--r--textproc/p5-Text-RecordParser/Makefile3
-rw-r--r--textproc/p5-Text-Report/Makefile3
-rw-r--r--textproc/p5-Text-Repository/Makefile3
-rw-r--r--textproc/p5-Text-Shellwords/Makefile3
-rw-r--r--textproc/p5-Text-SimpleTable/Makefile2
-rw-r--r--textproc/p5-Text-SimpleTemplate/Makefile3
-rw-r--r--textproc/p5-Text-Striphigh/Makefile3
-rw-r--r--textproc/p5-Text-Table/Makefile3
-rw-r--r--textproc/p5-Text-Tabs+Wrap/Makefile3
-rw-r--r--textproc/p5-Text-TabularDisplay/Makefile3
-rw-r--r--textproc/p5-Text-Tags/Makefile3
-rw-r--r--textproc/p5-Text-Template/Makefile3
-rw-r--r--textproc/p5-Text-Textile/Makefile3
-rw-r--r--textproc/p5-Text-Tmpl/Makefile3
-rw-r--r--textproc/p5-Text-Unaccent/Makefile3
-rw-r--r--textproc/p5-Text-VimColor/Makefile2
-rw-r--r--textproc/p5-Text-WikiFormat/Makefile3
-rw-r--r--textproc/p5-Text-WordDiff/Makefile3
-rw-r--r--textproc/p5-Text-Wrapper/Makefile3
-rw-r--r--textproc/p5-Text-vCard/Makefile3
-rw-r--r--textproc/p5-Time-Human/Makefile3
-rw-r--r--textproc/p5-Tk-XMLViewer/Makefile3
-rw-r--r--textproc/p5-Tree-Nary/Makefile3
-rw-r--r--textproc/p5-UML-State/Makefile3
-rw-r--r--textproc/p5-URI-Find/Makefile3
-rw-r--r--textproc/p5-Unicode-Normalize/Makefile3
-rw-r--r--textproc/p5-WDDX/Makefile2
-rw-r--r--textproc/p5-WWW-Google-SiteMap/Makefile3
-rw-r--r--textproc/p5-XML-Atom-Filter/Makefile3
-rw-r--r--textproc/p5-XML-Atom-SimpleFeed/Makefile3
-rw-r--r--textproc/p5-XML-Atom-Stream/Makefile3
-rw-r--r--textproc/p5-XML-AutoWriter/Makefile3
-rw-r--r--textproc/p5-XML-Catalog/Makefile3
-rw-r--r--textproc/p5-XML-Clean/Makefile3
-rw-r--r--textproc/p5-XML-DOM-Lite/Makefile3
-rw-r--r--textproc/p5-XML-DOM-XPath/Makefile3
-rw-r--r--textproc/p5-XML-DOM/Makefile3
-rw-r--r--textproc/p5-XML-DT/Makefile3
-rw-r--r--textproc/p5-XML-DifferenceMarkup/Makefile3
-rw-r--r--textproc/p5-XML-Directory/Makefile3
-rw-r--r--textproc/p5-XML-Driver-HTML/Makefile3
-rw-r--r--textproc/p5-XML-Dumper/Makefile3
-rw-r--r--textproc/p5-XML-Encoding/Makefile3
-rw-r--r--textproc/p5-XML-FOAF/Makefile2
-rw-r--r--textproc/p5-XML-Feed/Makefile3
-rw-r--r--textproc/p5-XML-Filter-BufferText/Makefile3
-rw-r--r--textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile3
-rw-r--r--textproc/p5-XML-Filter-DetectWS/Makefile3
-rw-r--r--textproc/p5-XML-Filter-Reindent/Makefile3
-rw-r--r--textproc/p5-XML-Filter-SAX1toSAX2/Makefile3
-rw-r--r--textproc/p5-XML-Filter-SAXT/Makefile3
-rw-r--r--textproc/p5-XML-Filter-XInclude/Makefile3
-rw-r--r--textproc/p5-XML-Filter-XSLT/Makefile3
-rw-r--r--textproc/p5-XML-GDOME/Makefile3
-rw-r--r--textproc/p5-XML-Generator-DBI/Makefile3
-rw-r--r--textproc/p5-XML-Grove/Makefile3
-rw-r--r--textproc/p5-XML-Hadler-HTMLWriter/Makefile3
-rw-r--r--textproc/p5-XML-Handler-Dtd2DocBook/Makefile3
-rw-r--r--textproc/p5-XML-Handler-Dtd2Html/Makefile3
-rw-r--r--textproc/p5-XML-Handler-Trees/Makefile3
-rw-r--r--textproc/p5-XML-Handler-YAWriter/Makefile3
-rw-r--r--textproc/p5-XML-LibRSVG/Makefile3
-rw-r--r--textproc/p5-XML-LibXML-Common/Makefile3
-rw-r--r--textproc/p5-XML-LibXML/Makefile3
-rw-r--r--textproc/p5-XML-LibXSLT/Makefile3
-rw-r--r--textproc/p5-XML-Liberal/Makefile3
-rw-r--r--textproc/p5-XML-Literal/Makefile3
-rw-r--r--textproc/p5-XML-NamespaceSupport/Makefile3
-rw-r--r--textproc/p5-XML-Node/Makefile3
-rw-r--r--textproc/p5-XML-OPML/Makefile3
-rw-r--r--textproc/p5-XML-Parser-EasyTree/Makefile3
-rw-r--r--textproc/p5-XML-Parser-Lite-Tree/Makefile3
-rw-r--r--textproc/p5-XML-Parser-Style-Elemental/Makefile3
-rw-r--r--textproc/p5-XML-Quote/Makefile3
-rw-r--r--textproc/p5-XML-RAI/Makefile3
-rw-r--r--textproc/p5-XML-RSS-Feed/Makefile3
-rw-r--r--textproc/p5-XML-RSS-JavaScript/Makefile3
-rw-r--r--textproc/p5-XML-RSS-Liberal/Makefile3
-rw-r--r--textproc/p5-XML-RSS-SimpleGen/Makefile3
-rw-r--r--textproc/p5-XML-RegExp/Makefile3
-rw-r--r--textproc/p5-XML-SAX-Expat/Makefile3
-rw-r--r--textproc/p5-XML-SAX-ExpatXS/Makefile3
-rw-r--r--textproc/p5-XML-SAX-Machines/Makefile3
-rw-r--r--textproc/p5-XML-SAX-Simple/Makefile3
-rw-r--r--textproc/p5-XML-SAX-Writer/Makefile3
-rw-r--r--textproc/p5-XML-SAX/Makefile3
-rw-r--r--textproc/p5-XML-SAXDriver-CSV/Makefile3
-rw-r--r--textproc/p5-XML-SAXDriver-Excel/Makefile3
-rw-r--r--textproc/p5-XML-SAXDriver-Sablotron/Makefile3
-rw-r--r--textproc/p5-XML-STX/Makefile3
-rw-r--r--textproc/p5-XML-Schematron/Makefile3
-rw-r--r--textproc/p5-XML-SimpleObject-LibXML/Makefile3
-rw-r--r--textproc/p5-XML-SimpleObject/Makefile3
-rw-r--r--textproc/p5-XML-Stream/Makefile3
-rw-r--r--textproc/p5-XML-TreeBuilder/Makefile3
-rw-r--r--textproc/p5-XML-XBEL/Makefile3
-rw-r--r--textproc/p5-XML-XPath/Makefile3
-rw-r--r--textproc/p5-XML-XQL/Makefile3
-rw-r--r--textproc/p5-XML-XSLT/Makefile3
-rw-r--r--textproc/p5-XML-XUpdate-LibXML/Makefile3
-rw-r--r--textproc/p5-XML-Xerces/Makefile3
-rw-r--r--textproc/p5-YAML-Syck/Makefile3
-rw-r--r--textproc/p5-YAML/Makefile3
-rw-r--r--textproc/p5-YAPE-HTML/Makefile2
-rw-r--r--textproc/p5-YAPE-Regex-Explain/Makefile2
-rw-r--r--textproc/p5-YAPE-Regex/Makefile2
-rw-r--r--textproc/p5-ack/Makefile2
-rw-r--r--textproc/p5-dTemplate/Makefile3
-rw-r--r--textproc/p5-libxml/Makefile3
-rw-r--r--textproc/p5-podlators/Makefile3
-rw-r--r--textproc/sdf/Makefile3
-rw-r--r--www/mod_perl/Makefile3
-rw-r--r--www/p5-AMF-Perl/Makefile2
-rw-r--r--www/p5-Acme-Monta/Makefile3
-rw-r--r--www/p5-Apache-ASP/Makefile3
-rw-r--r--www/p5-Apache-AddHostPath/Makefile3
-rw-r--r--www/p5-Apache-Admin-Config/Makefile3
-rw-r--r--www/p5-Apache-AntiSpam/Makefile3
-rw-r--r--www/p5-Apache-Archive/Makefile3
-rw-r--r--www/p5-Apache-AuthTicket/Makefile3
-rw-r--r--www/p5-Apache-AuthenCache/Makefile2
-rw-r--r--www/p5-Apache-AuthenURL/Makefile3
-rw-r--r--www/p5-Apache-AutoIndex/Makefile3
-rw-r--r--www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/Makefile2
-rw-r--r--www/p5-Apache-Clean/Makefile2
-rw-r--r--www/p5-Apache-Clean2/Makefile2
-rw-r--r--www/p5-Apache-Compress/Makefile3
-rw-r--r--www/p5-Apache-CompressClientFixup/Makefile3
-rw-r--r--www/p5-Apache-ConfigFile/Makefile2
-rw-r--r--www/p5-Apache-ConfigParser/Makefile3
-rw-r--r--www/p5-Apache-DB/Makefile3
-rw-r--r--www/p5-Apache-DBI/Makefile3
-rw-r--r--www/p5-Apache-DebugInfo/Makefile3
-rw-r--r--www/p5-Apache-DumpHeaders/Makefile3
-rw-r--r--www/p5-Apache-Filter/Makefile3
-rw-r--r--www/p5-Apache-Gallery/Makefile3
-rw-r--r--www/p5-Apache-GopherHandler/Makefile3
-rw-r--r--www/p5-Apache-Icon/Makefile3
-rw-r--r--www/p5-Apache-Language/Makefile3
-rw-r--r--www/p5-Apache-MP3/Makefile3
-rw-r--r--www/p5-Apache-NNTPGateway/Makefile3
-rw-r--r--www/p5-Apache-PageKit/Makefile3
-rw-r--r--www/p5-Apache-ParseFormData/Makefile3
-rw-r--r--www/p5-Apache-Peek/Makefile2
-rw-r--r--www/p5-Apache-Profiler/Makefile3
-rw-r--r--www/p5-Apache-Radius/Makefile3
-rw-r--r--www/p5-Apache-Reload/Makefile3
-rw-r--r--www/p5-Apache-SSI/Makefile3
-rw-r--r--www/p5-Apache-Scoreboard/Makefile4
-rw-r--r--www/p5-Apache-Session-SQLite3/Makefile3
-rw-r--r--www/p5-Apache-Session-SharedMem/Makefile3
-rw-r--r--www/p5-Apache-Session/Makefile3
-rw-r--r--www/p5-Apache-SessionX/Makefile3
-rw-r--r--www/p5-Apache-Singleton/Makefile3
-rw-r--r--www/p5-Apache-SubProcess/Makefile3
-rw-r--r--www/p5-Apache-Template/Makefile3
-rw-r--r--www/p5-Apache2-Scoreboard/Makefile3
-rw-r--r--www/p5-ApacheBench/Makefile2
-rw-r--r--www/p5-B-LexInfo/Makefile3
-rw-r--r--www/p5-Bundle-Slash/Makefile3
-rw-r--r--www/p5-Bundle-Sledge/Makefile3
-rw-r--r--www/p5-Business-PayPal/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-AnyTemplate/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-AutoRunmode/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-DBH/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-DebugScreen/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-Forward/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-HTDot/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-LogDispatch/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-MessageStack/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-Redirect/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-Session/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-Stream/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-TT/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-ValidateRM/Makefile3
-rw-r--r--www/p5-CGI-Application-Plugin-ViewCode/Makefile3
-rw-r--r--www/p5-CGI-ArgChecker/Makefile3
-rw-r--r--www/p5-CGI-Builder-TT2/Makefile2
-rw-r--r--www/p5-CGI-Builder/Makefile3
-rw-r--r--www/p5-CGI-Cache/Makefile3
-rw-r--r--www/p5-CGI-Expand/Makefile3
-rw-r--r--www/p5-CGI-FCKeditor/Makefile3
-rw-r--r--www/p5-CGI-FastTemplate/Makefile3
-rw-r--r--www/p5-CGI-FormBuilder/Makefile2
-rw-r--r--www/p5-CGI-Kwiki/Makefile3
-rw-r--r--www/p5-CGI-Prototype/Makefile3
-rw-r--r--www/p5-CGI-Response/Makefile3
-rw-r--r--www/p5-CGI-SSI/Makefile3
-rw-r--r--www/p5-CGI-Session/Makefile2
-rw-r--r--www/p5-CGI-Simple/Makefile2
-rw-r--r--www/p5-CGI-SpeedyCGI/Makefile3
-rw-r--r--www/p5-CGI-Untaint-date/Makefile3
-rw-r--r--www/p5-CGI-Untaint-email/Makefile3
-rw-r--r--www/p5-CGI-XMLApplication/Makefile3
-rw-r--r--www/p5-CGI.pm/Makefile2
-rw-r--r--www/p5-CGI_Lite/Makefile3
-rw-r--r--www/p5-Catalyst-Action-REST/Makefile3
-rw-r--r--www/p5-Catalyst-Authentication-Store-LDAP/Makefile3
-rw-r--r--www/p5-Catalyst-Controller-BindLex/Makefile2
-rw-r--r--www/p5-Catalyst-Controller-FormBuilder/Makefile3
-rw-r--r--www/p5-Catalyst-Controller-HTML-FormFu/Makefile2
-rw-r--r--www/p5-Catalyst-Enzyme/Makefile3
-rw-r--r--www/p5-Catalyst-Helper-Controller-Scaffold/Makefile3
-rw-r--r--www/p5-Catalyst-Log-Log4perl/Makefile3
-rw-r--r--www/p5-Catalyst-Model-CDBI-Plain/Makefile3
-rw-r--r--www/p5-Catalyst-Model-CDBI-Sweet/Makefile2
-rw-r--r--www/p5-Catalyst-Model-CDBI/Makefile2
-rw-r--r--www/p5-Catalyst-Model-DBIC-Plain/Makefile2
-rw-r--r--www/p5-Catalyst-Model-DBIC-Schema/Makefile3
-rw-r--r--www/p5-Catalyst-Model-Oryx/Makefile3
-rw-r--r--www/p5-Catalyst-Model-XML-Feed/Makefile3
-rw-r--r--www/p5-Catalyst-Model-Xapian/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-Authentication-Store-DBIx-Class/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-Authorization-ACL/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Authorization-Roles/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-C3/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Cache-FileCache/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Cache-Memcached/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Cache-Store-FastMmap/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Cache/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Captcha/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-DefaultEnd/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-FormValidator-Simple/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-FormValidator/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-HTML-Widget/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-LogWarnings/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Params-Nested/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Pluggable/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-Prototype/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-Server/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Session-FastMmap/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-Session-State-URI/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Setenv/Makefile3
-rw-r--r--www/p5-Catalyst-Plugin-Singleton/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-Static/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-Textile/Makefile2
-rw-r--r--www/p5-Catalyst-Plugin-XMLRPC/Makefile2
-rw-r--r--www/p5-Catalyst-View-ClearSilver/Makefile2
-rw-r--r--www/p5-Catalyst-View-GraphViz/Makefile3
-rw-r--r--www/p5-Catalyst-View-HTML-Template-Compiled/Makefile3
-rw-r--r--www/p5-Catalyst-View-TT-ControllerLocal/Makefile3
-rw-r--r--www/p5-Catalyst-View-Templated/Makefile2
-rw-r--r--www/p5-Catalyst-View-XSLT/Makefile2
-rw-r--r--www/p5-Class-DBI-FromForm/Makefile2
-rw-r--r--www/p5-Compress-LeadingBlankSpaces/Makefile3
-rw-r--r--www/p5-Data-TreeDumper-Renderer-DHTML/Makefile3
-rw-r--r--www/p5-FAQ-OMatic/Makefile3
-rw-r--r--www/p5-FEAR-API/Makefile2
-rw-r--r--www/p5-FastCGI/Makefile2
-rw-r--r--www/p5-Feed-Find/Makefile2
-rw-r--r--www/p5-Flickr-API/Makefile3
-rw-r--r--www/p5-Geo-Caching/Makefile3
-rw-r--r--www/p5-HTML-CalendarMonthSimple/Makefile3
-rw-r--r--www/p5-HTML-Chunks/Makefile3
-rw-r--r--www/p5-HTML-Clean/Makefile3
-rw-r--r--www/p5-HTML-Diff/Makefile3
-rw-r--r--www/p5-HTML-Display/Makefile3
-rw-r--r--www/p5-HTML-Element-Extended/Makefile3
-rw-r--r--www/p5-HTML-Element-Library/Makefile3
-rw-r--r--www/p5-HTML-Embperl/Makefile3
-rw-r--r--www/p5-HTML-FillInForm-ForceUTF8/Makefile3
-rw-r--r--www/p5-HTML-FillInForm/Makefile3
-rw-r--r--www/p5-HTML-FormFu/Makefile2
-rw-r--r--www/p5-HTML-FromText/Makefile3
-rw-r--r--www/p5-HTML-LinkExtractor/Makefile3
-rw-r--r--www/p5-HTML-Lint/Makefile3
-rw-r--r--www/p5-HTML-Location/Makefile3
-rw-r--r--www/p5-HTML-Mason/Makefile3
-rw-r--r--www/p5-HTML-Pager/Makefile3
-rw-r--r--www/p5-HTML-PrettyPrinter/Makefile3
-rw-r--r--www/p5-HTML-Prototype/Makefile3
-rw-r--r--www/p5-HTML-QuickCheck/Makefile3
-rw-r--r--www/p5-HTML-RSSAutodiscovery/Makefile3
-rw-r--r--www/p5-HTML-ResolveLink/Makefile3
-rw-r--r--www/p5-HTML-RobotsMETA/Makefile2
-rw-r--r--www/p5-HTML-Scrubber/Makefile3
-rw-r--r--www/p5-HTML-SimpleLinkExtor/Makefile3
-rw-r--r--www/p5-HTML-SimpleParse/Makefile3
-rw-r--r--www/p5-HTML-StickyQuery/Makefile3
-rw-r--r--www/p5-HTML-Stream/Makefile3
-rw-r--r--www/p5-HTML-Strip/Makefile3
-rw-r--r--www/p5-HTML-Summary/Makefile3
-rw-r--r--www/p5-HTML-TableExtract/Makefile3
-rw-r--r--www/p5-HTML-TableLayout/Makefile3
-rw-r--r--www/p5-HTML-TableTiler/Makefile3
-rw-r--r--www/p5-HTML-TagCloud-Extended/Makefile3
-rw-r--r--www/p5-HTML-TagCloud/Makefile3
-rw-r--r--www/p5-HTML-TagParser/Makefile3
-rw-r--r--www/p5-HTML-Tagset/Makefile3
-rw-r--r--www/p5-HTML-Template-Associate/Makefile2
-rw-r--r--www/p5-HTML-Template-Compiled/Makefile3
-rw-r--r--www/p5-HTML-Template-Expr/Makefile3
-rw-r--r--www/p5-HTML-Template-HashWrapper/Makefile3
-rw-r--r--www/p5-HTML-Template/Makefile3
-rw-r--r--www/p5-HTML-TokeParser-Simple/Makefile3
-rw-r--r--www/p5-HTML-Tree/Makefile3
-rw-r--r--www/p5-HTML-TreeBuilder-XPath/Makefile3
-rw-r--r--www/p5-HTML-Widget-DBIC/Makefile3
-rw-r--r--www/p5-HTML-Widget/Makefile3
-rw-r--r--www/p5-HTML-Widgets-SelectLayers/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-DokuWiki/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-Markdown/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-MediaWiki/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-MoinMoin/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-Oddmuse/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-PbWiki/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-PhpWiki/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-PmWiki/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-SnipSnap/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-Socialtext/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-TikiWiki/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-UseMod/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-WakkaWiki/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter-WikkaWiki/Makefile3
-rw-r--r--www/p5-HTML-WikiConverter/Makefile3
-rw-r--r--www/p5-HTTP-BrowserDetect/Makefile2
-rw-r--r--www/p5-HTTP-Cache-Transparent/Makefile3
-rw-r--r--www/p5-HTTP-Cookies-Mozilla/Makefile3
-rw-r--r--www/p5-HTTP-Cookies-iCab/Makefile3
-rw-r--r--www/p5-HTTP-Cookies-w3m/Makefile3
-rw-r--r--www/p5-HTTP-DAV/Makefile3
-rw-r--r--www/p5-HTTP-GHTTP/Makefile3
-rw-r--r--www/p5-HTTP-Lite/Makefile3
-rw-r--r--www/p5-HTTP-MHTTP/Makefile3
-rw-r--r--www/p5-HTTP-Recorder/Makefile2
-rw-r--r--www/p5-HTTP-Request-AsCGI/Makefile3
-rw-r--r--www/p5-HTTP-Request-Params/Makefile3
-rw-r--r--www/p5-HTTP-Server-Simple-Mason/Makefile3
-rw-r--r--www/p5-HTTP-Server-Simple-Recorder/Makefile3
-rw-r--r--www/p5-HTTP-SimpleLinkChecker/Makefile3
-rw-r--r--www/p5-HTTP-Size/Makefile3
-rw-r--r--www/p5-HTTP-WebTest/Makefile3
-rw-r--r--www/p5-HTTPD-Log-Filter/Makefile2
-rw-r--r--www/p5-HTTPD-User-Manage/Makefile3
-rw-r--r--www/p5-Handel/Makefile3
-rw-r--r--www/p5-IMDB-Movie/Makefile2
-rw-r--r--www/p5-Jifty/Makefile3
-rw-r--r--www/p5-LWP-Authen-Wsse/Makefile3
-rw-r--r--www/p5-MasonX-Interp-WithCallbacks/Makefile3
-rw-r--r--www/p5-MasonX-Request-WithApacheSession/Makefile3
-rw-r--r--www/p5-MasonX-WebApp/Makefile3
-rw-r--r--www/p5-Maypole-Authentication-UserSessionCookie/Makefile2
-rw-r--r--www/p5-Maypole-Component/Makefile2
-rw-r--r--www/p5-Maypole/Makefile2
-rw-r--r--www/p5-Net-Akismet/Makefile3
-rw-r--r--www/p5-Net-Flickr-API/Makefile3
-rw-r--r--www/p5-Net-Flickr-Backup/Makefile3
-rw-r--r--www/p5-Net-eBay/Makefile3
-rw-r--r--www/p5-Newsletter/Makefile2
-rw-r--r--www/p5-POE-Component-Client-HTTP/Makefile3
-rw-r--r--www/p5-POE-Component-Client-UserAgent/Makefile2
-rw-r--r--www/p5-POE-Component-Server-HTTP/Makefile3
-rw-r--r--www/p5-POE-Component-Server-HTTPServer/Makefile3
-rw-r--r--www/p5-ParallelUA/Makefile2
-rw-r--r--www/p5-PodToHTML/Makefile2
-rw-r--r--www/p5-SCGI/Makefile2
-rw-r--r--www/p5-SRU/Makefile2
-rw-r--r--www/p5-SWF-Chart/Makefile2
-rw-r--r--www/p5-Syntax-Highlight-HTML/Makefile3
-rw-r--r--www/p5-Syntax-Highlight-Shell/Makefile3
-rw-r--r--www/p5-Template-GD/Makefile3
-rw-r--r--www/p5-Template-Multilingual/Makefile3
-rw-r--r--www/p5-Template-Plugin-Class/Makefile3
-rw-r--r--www/p5-Template-Plugin-Clickable-Email/Makefile3
-rw-r--r--www/p5-Template-Plugin-Clickable/Makefile3
-rw-r--r--www/p5-Template-Plugin-Comma/Makefile3
-rw-r--r--www/p5-Template-Plugin-JSON/Makefile3
-rw-r--r--www/p5-Template-Plugin-JavaScript/Makefile3
-rw-r--r--www/p5-Template-Plugin-MP3/Makefile3
-rw-r--r--www/p5-Template-Plugin-Markdown/Makefile3
-rw-r--r--www/p5-Template-Plugin-Monta/Makefile3
-rw-r--r--www/p5-Template-Plugin-Subst/Makefile3
-rw-r--r--www/p5-Template-Plugin-VMethods/Makefile3
-rw-r--r--www/p5-Template-Provider-Encoding/Makefile3
-rw-r--r--www/p5-Template-Timer/Makefile3
-rw-r--r--www/p5-Template-Toolkit/Makefile3
-rw-r--r--www/p5-Test-HTTP-Server-Simple/Makefile3
-rw-r--r--www/p5-TestGen4Web-Runner/Makefile2
-rw-r--r--www/p5-Text-Markdown-ApacheHandler/Makefile3
-rw-r--r--www/p5-URI-Fetch/Makefile3
-rw-r--r--www/p5-URI-Sequin/Makefile2
-rw-r--r--www/p5-URI-ToDisk/Makefile3
-rw-r--r--www/p5-W3C-LinkChecker/Makefile2
-rw-r--r--www/p5-W3C-LogValidator/Makefile3
-rw-r--r--www/p5-WWW-Babelfish/Makefile3
-rw-r--r--www/p5-WWW-Baseball-NPB/Makefile3
-rw-r--r--www/p5-WWW-Comic/Makefile3
-rw-r--r--www/p5-WWW-Curl/Makefile3
-rw-r--r--www/p5-WWW-Dilbert/Makefile3
-rw-r--r--www/p5-WWW-Google-Calculator/Makefile3
-rw-r--r--www/p5-WWW-Google-News/Makefile3
-rw-r--r--www/p5-WWW-Google-Notebook/Makefile3
-rw-r--r--www/p5-WWW-Google-Video/Makefile3
-rw-r--r--www/p5-WWW-Link/Makefile3
-rw-r--r--www/p5-WWW-Mechanize-DecodedContent/Makefile2
-rw-r--r--www/p5-WWW-Mechanize-Pluggable/Makefile3
-rw-r--r--www/p5-WWW-Mechanize-Plugin-phpBB/Makefile3
-rw-r--r--www/p5-WWW-Mechanize-Shell/Makefile3
-rw-r--r--www/p5-WWW-Mixi/Makefile3
-rw-r--r--www/p5-WWW-OpenSVN/Makefile3
-rw-r--r--www/p5-WWW-OpenSearch/Makefile3
-rw-r--r--www/p5-WWW-Robot/Makefile3
-rw-r--r--www/p5-WWW-Scraper-ISBN-Driver/Makefile3
-rw-r--r--www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile3
-rw-r--r--www/p5-WWW-Scraper-ISBN-Record/Makefile3
-rw-r--r--www/p5-WWW-Scraper-ISBN/Makefile3
-rw-r--r--www/p5-WWW-Search-Google/Makefile3
-rw-r--r--www/p5-WWW-Search-MSN/Makefile3
-rw-r--r--www/p5-WWW-Shorten-0rz/Makefile3
-rw-r--r--www/p5-WWW-Shorten-KUSO/Makefile3
-rw-r--r--www/p5-WWW-Shorten/Makefile3
-rw-r--r--www/p5-WWW-SourceForge/Makefile2
-rw-r--r--www/p5-WWW-TV/Makefile3
-rw-r--r--www/p5-WWW-TWSMS/Makefile3
-rw-r--r--www/p5-WWW-VenusEnvy/Makefile3
-rw-r--r--www/p5-WWW-WebArchive/Makefile3
-rw-r--r--www/p5-WebService-Basecamp/Makefile3
-rw-r--r--www/p5-WebService-Bloglines/Makefile3
-rw-r--r--www/p5-WebService-NoPaste/Makefile3
-rw-r--r--www/p5-WebService-Technorati/Makefile3
-rw-r--r--www/p5-Xango/Makefile2
-rw-r--r--www/p5-Yahoo-Lifestyle/Makefile3
-rw-r--r--www/p5-Yahoo-Search/Makefile3
-rw-r--r--www/p5-chklinks/Makefile2
-rw-r--r--www/p5-libapreq/Makefile2
-rw-r--r--www/p5-libwww/Makefile2
-rw-r--r--www/p5-webservice-validator-css-w3c/Makefile3
-rw-r--r--www/p5-webservice-validator-html-w3c/Makefile3
-rw-r--r--www/weblint++/Makefile2
-rw-r--r--www/weblint/Makefile2
-rw-r--r--x11-fonts/p5-Font-AFM/Makefile3
-rw-r--r--x11-fonts/p5-Font-TTF/Makefile3
-rw-r--r--x11-fonts/p5-Font-TTFMetrics/Makefile3
-rw-r--r--x11-toolkits/p5-GdkImlib/Makefile3
-rw-r--r--x11-toolkits/p5-GdkPixbuf/Makefile3
-rw-r--r--x11-toolkits/p5-Glade2/Makefile2
-rw-r--r--x11-toolkits/p5-Gnome/Makefile3
-rw-r--r--x11-toolkits/p5-Gtk/Makefile3
-rw-r--r--x11-toolkits/p5-Gtk2-TrayIcon/Makefile2
-rw-r--r--x11-toolkits/p5-GtkXmHTML/Makefile3
-rw-r--r--x11-toolkits/p5-Prima/Makefile3
-rw-r--r--x11-toolkits/p5-Tcl-Tk/Makefile3
-rw-r--r--x11-toolkits/p5-TclTk/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-Autoscroll/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-ColourChooser/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-Date/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-Enscript/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-FileDialog/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-GBARR/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-Getopt/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-HistEntry/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-ResizeButton/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-Splashscreen/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-TableMatrix/Makefile3
-rw-r--r--x11-toolkits/p5-Tk/Makefile3
-rw-r--r--x11/p5-Clipboard/Makefile4
-rw-r--r--x11/p5-X11-IdleTime/Makefile3
-rw-r--r--x11/p5-X11-Protocol/Makefile3
2179 files changed, 2198 insertions, 4124 deletions
diff --git a/archivers/p5-Archive-Extract/Makefile b/archivers/p5-Archive-Extract/Makefile
index e078d17aed96..ec37926ed098 100644
--- a/archivers/p5-Archive-Extract/Makefile
+++ b/archivers/p5-Archive-Extract/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Archive-Extract
PORTVERSION= 0.26
CATEGORIES= archivers perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Archive
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/archivers/p5-Compress-Bzip2/Makefile b/archivers/p5-Compress-Bzip2/Makefile
index 4615a585dead..9392f0c99fc0 100644
--- a/archivers/p5-Compress-Bzip2/Makefile
+++ b/archivers/p5-Compress-Bzip2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Compress-Bzip2
PORTVERSION= 2.09
CATEGORIES= archivers perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/A/AR/ARJAY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/archivers/p5-Compress-LZW/Makefile b/archivers/p5-Compress-LZW/Makefile
index a8a5fca9cbf0..9ba4be056427 100644
--- a/archivers/p5-Compress-LZW/Makefile
+++ b/archivers/p5-Compress-LZW/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Compress-LZW
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= archivers perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Compress
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/archivers/p5-PerlIO-gzip/Makefile b/archivers/p5-PerlIO-gzip/Makefile
index a1b2de1f8524..70e878ead3a1 100644
--- a/archivers/p5-PerlIO-gzip/Makefile
+++ b/archivers/p5-PerlIO-gzip/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PerlIO-gzip
PORTVERSION= 0.18
CATEGORIES= archivers perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PerlIO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/archivers/p5-PerlIO-via-Bzip2/Makefile b/archivers/p5-PerlIO-via-Bzip2/Makefile
index 89aae5e2ef19..94aed788c7fc 100644
--- a/archivers/p5-PerlIO-via-Bzip2/Makefile
+++ b/archivers/p5-PerlIO-via-Bzip2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PerlIO-via-Bzip2
PORTVERSION= 0.02
CATEGORIES= archivers perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PerlIO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/astro/p5-Astro-Catalog/Makefile b/astro/p5-Astro-Catalog/Makefile
index 84f583b0021a..954aca653bc8 100644
--- a/astro/p5-Astro-Catalog/Makefile
+++ b/astro/p5-Astro-Catalog/Makefile
@@ -9,9 +9,8 @@
PORTNAME= Astro-Catalog
PORTVERSION= 4.1.0
CATEGORIES= astro perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://www.estar.org.uk/software/
-MASTER_SITE_SUBDIR= Astro
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/p5-Astro-MoonPhase/Makefile b/astro/p5-Astro-MoonPhase/Makefile
index 324988f95a07..c600d5dffa2b 100644
--- a/astro/p5-Astro-MoonPhase/Makefile
+++ b/astro/p5-Astro-MoonPhase/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Astro-MoonPhase
PORTVERSION= 0.60
CATEGORIES= astro perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Astro
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/p5-Astro-Sunrise/Makefile b/astro/p5-Astro-Sunrise/Makefile
index 378b8a02aa3d..654b99b14da0 100644
--- a/astro/p5-Astro-Sunrise/Makefile
+++ b/astro/p5-Astro-Sunrise/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Astro-Sunrise
PORTVERSION= 0.91
CATEGORIES= astro perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Astro
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/astro/p5-GPS/Makefile b/astro/p5-GPS/Makefile
index 98e4d20d3b80..e920126995d9 100644
--- a/astro/p5-GPS/Makefile
+++ b/astro/p5-GPS/Makefile
@@ -7,8 +7,7 @@
PORTNAME= GPS
PORTVERSION= 0.15
CATEGORIES= astro perl5 geography
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GPS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= perl-GPS-${PORTVERSION}
diff --git a/audio/p5-Audio-Beep/Makefile b/audio/p5-Audio-Beep/Makefile
index cec4d3a14bb9..549aeeef01e4 100644
--- a/audio/p5-Audio-Beep/Makefile
+++ b/audio/p5-Audio-Beep/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Audio-Beep
PORTVERSION= 0.11
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Audio
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/audio/p5-Audio-CD/Makefile b/audio/p5-Audio-CD/Makefile
index 8f3a767ae6d4..da7caf0f977f 100644
--- a/audio/p5-Audio-CD/Makefile
+++ b/audio/p5-Audio-CD/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Audio-CD
PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Audio
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/p5-Audio-Scrobbler/Makefile b/audio/p5-Audio-Scrobbler/Makefile
index 1d13952a83ef..58893ed491b9 100644
--- a/audio/p5-Audio-Scrobbler/Makefile
+++ b/audio/p5-Audio-Scrobbler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Audio-Scrobbler
PORTVERSION= 0.01
CATEGORIES= audio net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Audio
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= roam@FreeBSD.org
diff --git a/audio/p5-Audio-TagLib/Makefile b/audio/p5-Audio-TagLib/Makefile
index e8fc202cef9d..8823f71d800a 100644
--- a/audio/p5-Audio-TagLib/Makefile
+++ b/audio/p5-Audio-TagLib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Audio-TagLib
PORTVERSION= 1.43
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Audio
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/audio/p5-Audio-WMA/Makefile b/audio/p5-Audio-WMA/Makefile
index 6173c4fc7cf3..fce10f80478f 100644
--- a/audio/p5-Audio-WMA/Makefile
+++ b/audio/p5-Audio-WMA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Audio-WMA
PORTVERSION= 1.1
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Audio
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= barner@FreeBSD.org
diff --git a/audio/p5-Audio-Wav/Makefile b/audio/p5-Audio-Wav/Makefile
index ea389b645202..ec6ce9d17084 100644
--- a/audio/p5-Audio-Wav/Makefile
+++ b/audio/p5-Audio-Wav/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Audio-Wav
PORTVERSION= 0.06
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Audio
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/p5-Audio/Makefile b/audio/p5-Audio/Makefile
index fd6462434dea..c89ac50f87ad 100644
--- a/audio/p5-Audio/Makefile
+++ b/audio/p5-Audio/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Audio
PORTVERSION= 1.029
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Audio
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/p5-CDDB/Makefile b/audio/p5-CDDB/Makefile
index 08d5a83e16fb..4b6810e07afe 100644
--- a/audio/p5-CDDB/Makefile
+++ b/audio/p5-CDDB/Makefile
@@ -8,8 +8,7 @@
PORTNAME= CDDB
PORTVERSION= 1.17
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CDDB
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@freebsd.org
diff --git a/audio/p5-CDDB_get/Makefile b/audio/p5-CDDB_get/Makefile
index a8a977017ff0..80012efe3bf0 100644
--- a/audio/p5-CDDB_get/Makefile
+++ b/audio/p5-CDDB_get/Makefile
@@ -9,7 +9,7 @@ PORTNAME= CDDB_get
PORTVERSION= 2.27
PORTEPOCH= 1
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/F/FO/FONKIE
PKGNAMEPREFIX= p5-
diff --git a/audio/p5-Filesys-Virtual-DAAP/Makefile b/audio/p5-Filesys-Virtual-DAAP/Makefile
index f4a075fb6e0c..7a827f9265cd 100644
--- a/audio/p5-Filesys-Virtual-DAAP/Makefile
+++ b/audio/p5-Filesys-Virtual-DAAP/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Filesys-Virtual-DAAP
PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filesys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/audio/p5-MIDI/Makefile b/audio/p5-MIDI/Makefile
index f711865a711e..a9ed7b89cef6 100644
--- a/audio/p5-MIDI/Makefile
+++ b/audio/p5-MIDI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MIDI
PORTVERSION= 0.81
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MIDI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= MIDI-Perl-${PORTVERSION}
diff --git a/audio/p5-MP3-ID3v1Tag/Makefile b/audio/p5-MP3-ID3v1Tag/Makefile
index 876e1d1d4834..c41982f8e67b 100644
--- a/audio/p5-MP3-ID3v1Tag/Makefile
+++ b/audio/p5-MP3-ID3v1Tag/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MP3-ID3v1Tag
PORTVERSION= 1.11
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=MP3
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/p5-MP3-Info/Makefile b/audio/p5-MP3-Info/Makefile
index 1bf4d1f9a5fe..8b97a34894c6 100644
--- a/audio/p5-MP3-Info/Makefile
+++ b/audio/p5-MP3-Info/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MP3-Info
PORTVERSION= 1.23
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=MP3
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/audio/p5-MP3-Tag/Makefile b/audio/p5-MP3-Tag/Makefile
index 5d1a0d7cc13c..61e7359484b0 100644
--- a/audio/p5-MP3-Tag/Makefile
+++ b/audio/p5-MP3-Tag/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MP3-Tag
PORTVERSION= 0.9710
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=MP3
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= novel@FreeBSD.org
diff --git a/audio/p5-MusicBrainz-Client/Makefile b/audio/p5-MusicBrainz-Client/Makefile
index d9ce205ca0ae..3c270c1bfd3e 100644
--- a/audio/p5-MusicBrainz-Client/Makefile
+++ b/audio/p5-MusicBrainz-Client/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MusicBrainz-Client
PORTVERSION= 0.11
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SV/SVANZOEST
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/audio/p5-MusicBrainz-Queries/Makefile b/audio/p5-MusicBrainz-Queries/Makefile
index eeb723820064..372310477bd0 100644
--- a/audio/p5-MusicBrainz-Queries/Makefile
+++ b/audio/p5-MusicBrainz-Queries/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MusicBrainz-Queries
PORTVERSION= 0.11
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SV/SVANZOEST
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/audio/p5-MusicBrainz-TRM/Makefile b/audio/p5-MusicBrainz-TRM/Makefile
index d154de53155b..8a1e7fadcfcb 100644
--- a/audio/p5-MusicBrainz-TRM/Makefile
+++ b/audio/p5-MusicBrainz-TRM/Makefile
@@ -9,8 +9,7 @@ PORTNAME= MusicBrainz-TRM
PORTVERSION= 0.02
PORTREVISION= 0
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SV/SVANZOEST
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/audio/p5-Net-DAAP-Client/Makefile b/audio/p5-Net-DAAP-Client/Makefile
index 4894e3030794..288d075158aa 100644
--- a/audio/p5-Net-DAAP-Client/Makefile
+++ b/audio/p5-Net-DAAP-Client/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Net-DAAP-Client
PORTVERSION= 0.42
PORTREVISION= 1
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/audio/p5-Net-DAAP-DMAP/Makefile b/audio/p5-Net-DAAP-DMAP/Makefile
index b30ae30ca711..7093171d1389 100644
--- a/audio/p5-Net-DAAP-DMAP/Makefile
+++ b/audio/p5-Net-DAAP-DMAP/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Net-DAAP-DMAP
PORTVERSION= 1.26
PORTREVISION= 1
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/audio/p5-Net-FreeDB/Makefile b/audio/p5-Net-FreeDB/Makefile
index 3a9f40be0ba2..b9dd570f1822 100644
--- a/audio/p5-Net-FreeDB/Makefile
+++ b/audio/p5-Net-FreeDB/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-FreeDB
PORTVERSION= 0.08
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROAM
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= roam@FreeBSD.org
diff --git a/audio/p5-Ogg-Vorbis-Header/Makefile b/audio/p5-Ogg-Vorbis-Header/Makefile
index ce7d9be26868..b224baf5c29a 100644
--- a/audio/p5-Ogg-Vorbis-Header/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Ogg-Vorbis-Header
PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Ogg
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= barner@FreeBSD.org
diff --git a/audio/p5-Xmms/Makefile b/audio/p5-Xmms/Makefile
index 88199eda0ffe..3b067314001e 100644
--- a/audio/p5-Xmms/Makefile
+++ b/audio/p5-Xmms/Makefile
@@ -8,8 +8,7 @@ PORTNAME= Xmms
PORTVERSION= 0.12
PORTREVISION= 3
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Xmms
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-Perl-${PORTVERSION}
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index 6baca42aed72..088d2c0df920 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -9,8 +9,8 @@ PORTNAME= libvorbis
PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=../by-authors/id/F/FO/FOOF
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../by-authors/id/F/FO/FOOF
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-perl-${PORTVERSION}
diff --git a/biology/p5-AcePerl/Makefile b/biology/p5-AcePerl/Makefile
index cd7718c87767..de6f4c5c3940 100644
--- a/biology/p5-AcePerl/Makefile
+++ b/biology/p5-AcePerl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= AcePerl
PORTVERSION= 1.91
CATEGORIES= biology databases perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Ace
PKGNAMEPREFIX= p5-
diff --git a/biology/p5-Bio-ASN1-EntrezGene/Makefile b/biology/p5-Bio-ASN1-EntrezGene/Makefile
index 091bca071b2d..bd91a167633c 100644
--- a/biology/p5-Bio-ASN1-EntrezGene/Makefile
+++ b/biology/p5-Bio-ASN1-EntrezGene/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Bio-ASN1-EntrezGene
PORTVERSION= 1.091
CATEGORIES= biology perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Bio
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/biology/p5-Bio-Das/Makefile b/biology/p5-Bio-Das/Makefile
index e2c7ed607983..f1c3b162b2ff 100644
--- a/biology/p5-Bio-Das/Makefile
+++ b/biology/p5-Bio-Das/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Bio-Das
PORTVERSION= 1.07
CATEGORIES= biology
MASTER_SITES= http://www.biodas.org/download/Bio::Das/ \
- ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Bio
+ CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/biology/p5-Bio-Phylo/Makefile b/biology/p5-Bio-Phylo/Makefile
index 5193815577d5..816f41232f7f 100644
--- a/biology/p5-Bio-Phylo/Makefile
+++ b/biology/p5-Bio-Phylo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Bio-Phylo
PORTVERSION= 0.16
CATEGORIES= biology perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Bio
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/biology/p5-bioperl-run/Makefile b/biology/p5-bioperl-run/Makefile
index 87d32563475a..ffd52df8f367 100644
--- a/biology/p5-bioperl-run/Makefile
+++ b/biology/p5-bioperl-run/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= biology perl5
MASTER_SITES= http://bioperl.org/DIST/ \
- ${MASTER_SITE_PERL_CPAN}
+ CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mauricio@arareko.net
diff --git a/biology/p5-bioperl/Makefile b/biology/p5-bioperl/Makefile
index 4c805319150b..cb58ecd710f6 100644
--- a/biology/p5-bioperl/Makefile
+++ b/biology/p5-bioperl/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= biology perl5
MASTER_SITES= http://bioperl.org/DIST/ \
- ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Bio
+ CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fernan@iib.unsam.edu.ar
diff --git a/cad/p5-GDS2/Makefile b/cad/p5-GDS2/Makefile
index cda991d5fcf4..c6e1711e8bdb 100644
--- a/cad/p5-GDS2/Makefile
+++ b/cad/p5-GDS2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= GDS2
PORTVERSION= 2.09.a
CATEGORIES= cad perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GDS2
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:S,.a$,a,}
diff --git a/chinese/p5-Date-Chinese/Makefile b/chinese/p5-Date-Chinese/Makefile
index c1066f76042c..ed82b1098104 100644
--- a/chinese/p5-Date-Chinese/Makefile
+++ b/chinese/p5-Date-Chinese/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Date-Chinese
PORTVERSION= 1.10
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/R/RB/RBOW
PKGNAMEPREFIX= p5-
diff --git a/chinese/p5-Encode-HanConvert/Makefile b/chinese/p5-Encode-HanConvert/Makefile
index ac09a49c61a4..b8e12d6a3ab5 100644
--- a/chinese/p5-Encode-HanConvert/Makefile
+++ b/chinese/p5-Encode-HanConvert/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Encode-HanConvert
PORTVERSION= 0.34
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Encode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/chinese/p5-Encode-HanExtra/Makefile b/chinese/p5-Encode-HanExtra/Makefile
index 81b98bf9a689..4b2279353c04 100644
--- a/chinese/p5-Encode-HanExtra/Makefile
+++ b/chinese/p5-Encode-HanExtra/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Encode-HanExtra
PORTVERSION= 0.23
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Encode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-BPMFConvert/Makefile b/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
index 3525ec7e59b8..5b1e2f3fca60 100644
--- a/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
+++ b/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-ZH-BPMFConvert
PORTVERSION= 0.01
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-HanDetect/Makefile b/chinese/p5-Lingua-ZH-HanDetect/Makefile
index 7ffa0178a7a3..9f88a50d9913 100644
--- a/chinese/p5-Lingua-ZH-HanDetect/Makefile
+++ b/chinese/p5-Lingua-ZH-HanDetect/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-ZH-HanDetect
PORTVERSION= 0.04
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/chinese/p5-Lingua-ZH-Keywords/Makefile b/chinese/p5-Lingua-ZH-Keywords/Makefile
index 4bafb1705dd8..c9fb9024ed60 100644
--- a/chinese/p5-Lingua-ZH-Keywords/Makefile
+++ b/chinese/p5-Lingua-ZH-Keywords/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Lingua-ZH-Keywords
PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-Numbers/Makefile b/chinese/p5-Lingua-ZH-Numbers/Makefile
index 4523793dbb7c..8887cff4601a 100644
--- a/chinese/p5-Lingua-ZH-Numbers/Makefile
+++ b/chinese/p5-Lingua-ZH-Numbers/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Lingua-ZH-Numbers
PORTVERSION= 0.04
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-Summarize/Makefile b/chinese/p5-Lingua-ZH-Summarize/Makefile
index 3c8191193237..f2c96684d172 100644
--- a/chinese/p5-Lingua-ZH-Summarize/Makefile
+++ b/chinese/p5-Lingua-ZH-Summarize/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Lingua-ZH-Summarize
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-TaBE/Makefile b/chinese/p5-Lingua-ZH-TaBE/Makefile
index 64d092407f34..357ee2609507 100644
--- a/chinese/p5-Lingua-ZH-TaBE/Makefile
+++ b/chinese/p5-Lingua-ZH-TaBE/Makefile
@@ -10,8 +10,7 @@ PORTNAME= Lingua-ZH-TaBE
PORTVERSION= 0.07
PORTREVISION= 2
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-Toke/Makefile b/chinese/p5-Lingua-ZH-Toke/Makefile
index 74d278d063fe..c71baf0ab916 100644
--- a/chinese/p5-Lingua-ZH-Toke/Makefile
+++ b/chinese/p5-Lingua-ZH-Toke/Makefile
@@ -8,8 +8,7 @@ PORTNAME= Lingua-ZH-Toke
PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-Wrap/Makefile b/chinese/p5-Lingua-ZH-Wrap/Makefile
index e022e14b997e..e7fea8e75cd5 100644
--- a/chinese/p5-Lingua-ZH-Wrap/Makefile
+++ b/chinese/p5-Lingua-ZH-Wrap/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Lingua-ZH-Wrap
PORTVERSION= 0.03
CATEGORIES= chinese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/comms/o2sms/Makefile b/comms/o2sms/Makefile
index 8e05f2f82201..27517642c28a 100644
--- a/comms/o2sms/Makefile
+++ b/comms/o2sms/Makefile
@@ -8,7 +8,7 @@
PORTNAME= o2sms
PORTVERSION= 3.27
CATEGORIES= comms perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://www.mackers.com/projects/o2sms/releases/
MASTER_SITE_SUBDIR= WWW/MACKERS
diff --git a/comms/p5-Device-Gsm/Makefile b/comms/p5-Device-Gsm/Makefile
index f5de22c87559..655f8ed024fe 100644
--- a/comms/p5-Device-Gsm/Makefile
+++ b/comms/p5-Device-Gsm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Device-Gsm
PORTVERSION= 1.48
PORTREVISION= 1
CATEGORIES= comms perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Device
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= anders@FreeBSD.org
diff --git a/comms/p5-Device-Modem/Makefile b/comms/p5-Device-Modem/Makefile
index f95dc506e4da..04df2d5e7278 100644
--- a/comms/p5-Device-Modem/Makefile
+++ b/comms/p5-Device-Modem/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Device-Modem
PORTVERSION= 1.48
CATEGORIES= comms perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Device
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/comms/p5-Device-SerialPort/Makefile b/comms/p5-Device-SerialPort/Makefile
index 9021b2cc1515..c702e21ac429 100644
--- a/comms/p5-Device-SerialPort/Makefile
+++ b/comms/p5-Device-SerialPort/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Device-SerialPort
PORTVERSION= 1.003001
CATEGORIES= comms perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Device
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/comms/p5-Fax-Hylafax-Client/Makefile b/comms/p5-Fax-Hylafax-Client/Makefile
index 4b378f8c8781..ef9cb594674f 100644
--- a/comms/p5-Fax-Hylafax-Client/Makefile
+++ b/comms/p5-Fax-Hylafax-Client/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Fax-Hylafax-Client
PORTVERSION= 1.02
CATEGORIES= comms perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Fax
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/comms/p5-SMS-Send-DeviceGsm/Makefile b/comms/p5-SMS-Send-DeviceGsm/Makefile
index 2559754f073e..375190b68bf3 100644
--- a/comms/p5-SMS-Send-DeviceGsm/Makefile
+++ b/comms/p5-SMS-Send-DeviceGsm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= SMS-Send-DeviceGsm
PORTVERSION= 1.00
CATEGORIES= comms perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= SMS
PKGNAMEPREFIX= p5-
diff --git a/comms/p5-SMS-Send-TW-PChome/Makefile b/comms/p5-SMS-Send-TW-PChome/Makefile
index a03cb3892b4a..9e5706388c2a 100644
--- a/comms/p5-SMS-Send-TW-PChome/Makefile
+++ b/comms/p5-SMS-Send-TW-PChome/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SMS-Send-TW-PChome
PORTVERSION= 0.02
CATEGORIES= comms perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SMS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/comms/p5-SMS-Send-TW-emome/Makefile b/comms/p5-SMS-Send-TW-emome/Makefile
index dd8f458ee935..6e26b4877e71 100644
--- a/comms/p5-SMS-Send-TW-emome/Makefile
+++ b/comms/p5-SMS-Send-TW-emome/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SMS-Send-TW-emome
PORTVERSION= 0.01
CATEGORIES= comms perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SMS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/converters/p5-Boulder/Makefile b/converters/p5-Boulder/Makefile
index 548acd0d72d7..5f281b61f783 100644
--- a/converters/p5-Boulder/Makefile
+++ b/converters/p5-Boulder/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Boulder
PORTVERSION= 1.30
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Boulder
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/converters/p5-Convert-ASCII-Armour/Makefile b/converters/p5-Convert-ASCII-Armour/Makefile
index 12385e974c68..21898a4a3c27 100644
--- a/converters/p5-Convert-ASCII-Armour/Makefile
+++ b/converters/p5-Convert-ASCII-Armour/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Convert-ASCII-Armour
PORTVERSION= 1.4
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/converters/p5-Convert-ASN1/Makefile b/converters/p5-Convert-ASN1/Makefile
index 1896ec1e96ff..dc1b21ec6c0a 100644
--- a/converters/p5-Convert-ASN1/Makefile
+++ b/converters/p5-Convert-ASN1/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Convert-ASN1
PORTVERSION= 0.21
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= scrappy@FreeBSD.org
diff --git a/converters/p5-Convert-BER/Makefile b/converters/p5-Convert-BER/Makefile
index 5cd306ce600f..e69158419dad 100644
--- a/converters/p5-Convert-BER/Makefile
+++ b/converters/p5-Convert-BER/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Convert-BER
PORTVERSION= 1.31.01
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
diff --git a/converters/p5-Convert-Bencode/Makefile b/converters/p5-Convert-Bencode/Makefile
index 6715041a4a32..0b947fc003c6 100644
--- a/converters/p5-Convert-Bencode/Makefile
+++ b/converters/p5-Convert-Bencode/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Convert-Bencode
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mor@WhiteLuna.com
diff --git a/converters/p5-Convert-Bencode_XS/Makefile b/converters/p5-Convert-Bencode_XS/Makefile
index a2997ca2cc48..354a04a8fa67 100644
--- a/converters/p5-Convert-Bencode_XS/Makefile
+++ b/converters/p5-Convert-Bencode_XS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Convert-Bencode_XS
PORTVERSION= 0.06
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/converters/p5-Convert-BinHex/Makefile b/converters/p5-Convert-BinHex/Makefile
index 16f55dd9f406..ed9cf36dddc7 100644
--- a/converters/p5-Convert-BinHex/Makefile
+++ b/converters/p5-Convert-BinHex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Convert-BinHex
PORTVERSION= 1.119
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= j.koopmann@seceidos.de
diff --git a/converters/p5-Convert-Binary-C/Makefile b/converters/p5-Convert-Binary-C/Makefile
index dc0f4057b9f9..8c0831b771f4 100644
--- a/converters/p5-Convert-Binary-C/Makefile
+++ b/converters/p5-Convert-Binary-C/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Convert-Binary-C
PORTVERSION= 0.70
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/converters/p5-Convert-Morse/Makefile b/converters/p5-Convert-Morse/Makefile
index 01fdc465e948..5ae9df7b32d0 100644
--- a/converters/p5-Convert-Morse/Makefile
+++ b/converters/p5-Convert-Morse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Convert-Morse
PORTVERSION= 0.06
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/converters/p5-Convert-PEM/Makefile b/converters/p5-Convert-PEM/Makefile
index 1105c82c5389..4a452cf3f363 100644
--- a/converters/p5-Convert-PEM/Makefile
+++ b/converters/p5-Convert-PEM/Makefile
@@ -10,8 +10,7 @@ PORTNAME= Convert-PEM
PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/converters/p5-Convert-Recode/Makefile b/converters/p5-Convert-Recode/Makefile
index e0c775cc769a..5b693f85e929 100644
--- a/converters/p5-Convert-Recode/Makefile
+++ b/converters/p5-Convert-Recode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Convert-Recode
PORTVERSION= 1.04
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index 3be95edcfc84..a8fdfa820e5f 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Convert-TNEF
PORTVERSION= 0.17
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tabthorpe@FreeBSD.org
diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile
index bbf07d343b54..ce2691becf4f 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Convert-UU
PORTVERSION= 0.52
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/converters/p5-Convert-UUlib/Makefile b/converters/p5-Convert-UUlib/Makefile
index 019fadd99e69..c687785e72ad 100644
--- a/converters/p5-Convert-UUlib/Makefile
+++ b/converters/p5-Convert-UUlib/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Convert-UUlib
PORTVERSION= 1.09
PORTEPOCH= 1
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Convert
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
diff --git a/converters/p5-Cstools/Makefile b/converters/p5-Cstools/Makefile
index 0850a35e98cc..a0a29d179ada 100644
--- a/converters/p5-Cstools/Makefile
+++ b/converters/p5-Cstools/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Cstools
PORTVERSION= 3.42
CATEGORIES= converters perl5
MASTER_SITES= http://www.fi.muni.cz/~adelton/perl/ \
- ${MASTER_SITE_PERL_CPAN}
+ CPAN
MASTER_SITE_SUBDIR= Cz
PKGNAMEPREFIX= p5-
diff --git a/converters/p5-Encode-JIS2K/Makefile b/converters/p5-Encode-JIS2K/Makefile
index c05108f11e71..a211814620ec 100644
--- a/converters/p5-Encode-JIS2K/Makefile
+++ b/converters/p5-Encode-JIS2K/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Encode-JIS2K
PORTVERSION= 0.02
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Encode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/converters/p5-Encode-compat/Makefile b/converters/p5-Encode-compat/Makefile
index 2a3dd6218cb5..553e8a50b5c7 100644
--- a/converters/p5-Encode-compat/Makefile
+++ b/converters/p5-Encode-compat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Encode-compat
PORTVERSION= 0.07
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Encode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/converters/p5-Encode/Makefile b/converters/p5-Encode/Makefile
index cc5027c82d91..1ac4143eaeeb 100644
--- a/converters/p5-Encode/Makefile
+++ b/converters/p5-Encode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Encode
PORTVERSION= 2.24
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Encode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/converters/p5-JSON-DWIW/Makefile b/converters/p5-JSON-DWIW/Makefile
index 7f463535b09e..c43ffd23168d 100644
--- a/converters/p5-JSON-DWIW/Makefile
+++ b/converters/p5-JSON-DWIW/Makefile
@@ -8,8 +8,7 @@
PORTNAME= JSON-DWIW
PORTVERSION= 0.23
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Apache/DOWENS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/converters/p5-MIME-Base32/Makefile b/converters/p5-MIME-Base32/Makefile
index 0224b4e687ca..29f2c1a108e5 100644
--- a/converters/p5-MIME-Base32/Makefile
+++ b/converters/p5-MIME-Base32/Makefile
@@ -9,8 +9,7 @@ PORTNAME= MIME-Base32
PORTVERSION= 1.01
PORTREVISION= 1
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MIME
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= nork@FreeBSD.org
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index 02a173c3e4c8..5156b7bb6cfd 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MIME-Base64
PORTVERSION= 3.07
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MIME
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/converters/p5-Number-Nary/Makefile b/converters/p5-Number-Nary/Makefile
index f03432d7a2b4..3a9f5d42aadf 100644
--- a/converters/p5-Number-Nary/Makefile
+++ b/converters/p5-Number-Nary/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Number-Nary
PORTVERSION= 0.102
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Number
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/converters/p5-Number-RecordLocator/Makefile b/converters/p5-Number-RecordLocator/Makefile
index 82c2e3f8a076..16b24c4493d8 100644
--- a/converters/p5-Number-RecordLocator/Makefile
+++ b/converters/p5-Number-RecordLocator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Number-RecordLocator
PORTVERSION= 0.003
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Number
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/converters/p5-String-Multibyte/Makefile b/converters/p5-String-Multibyte/Makefile
index ac9181401ae4..5202050f9781 100644
--- a/converters/p5-String-Multibyte/Makefile
+++ b/converters/p5-String-Multibyte/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Multibyte
PORTVERSION= 1.05
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile
index 166f209fc188..63f452341e7f 100644
--- a/converters/p5-Text-Iconv/Makefile
+++ b/converters/p5-Text-Iconv/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Iconv
PORTVERSION= 1.7
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/converters/p5-Text-Unidecode/Makefile b/converters/p5-Text-Unidecode/Makefile
index fa605a14cd89..359417e70244 100644
--- a/converters/p5-Text-Unidecode/Makefile
+++ b/converters/p5-Text-Unidecode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Unidecode
PORTVERSION= 0.04
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/converters/p5-Unicode-IMAPUtf7/Makefile b/converters/p5-Unicode-IMAPUtf7/Makefile
index 04aa632dd5ae..5fb85718f00d 100644
--- a/converters/p5-Unicode-IMAPUtf7/Makefile
+++ b/converters/p5-Unicode-IMAPUtf7/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Unicode-IMAPUtf7
PORTVERSION= 2.01
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unicode/FABPOT
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/p5-Unicode-Lite/Makefile b/converters/p5-Unicode-Lite/Makefile
index 2a0a80408adb..525418eccff8 100644
--- a/converters/p5-Unicode-Lite/Makefile
+++ b/converters/p5-Unicode-Lite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Unicode-Lite
PORTVERSION= 0.12
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unicode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/p5-Unicode-Map/Makefile b/converters/p5-Unicode-Map/Makefile
index 9034757d1159..01b8d042713c 100644
--- a/converters/p5-Unicode-Map/Makefile
+++ b/converters/p5-Unicode-Map/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Unicode-Map
PORTVERSION= 0.112
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unicode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/p5-Unicode-Map8/Makefile b/converters/p5-Unicode-Map8/Makefile
index c7b4734f7e14..cd30208baf8f 100644
--- a/converters/p5-Unicode-Map8/Makefile
+++ b/converters/p5-Unicode-Map8/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Unicode-Map8
PORTVERSION= 0.12
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unicode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/p5-Unicode-MapUTF8/Makefile b/converters/p5-Unicode-MapUTF8/Makefile
index a3200dd6abf7..4931287abee3 100644
--- a/converters/p5-Unicode-MapUTF8/Makefile
+++ b/converters/p5-Unicode-MapUTF8/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Unicode-MapUTF8
PORTVERSION= 1.11
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unicode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/p5-Unicode-RecursiveDowngrade/Makefile b/converters/p5-Unicode-RecursiveDowngrade/Makefile
index c34e01c1d468..57ace0d2b566 100644
--- a/converters/p5-Unicode-RecursiveDowngrade/Makefile
+++ b/converters/p5-Unicode-RecursiveDowngrade/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Unicode-RecursiveDowngrade
PORTVERSION= 0.03
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/T/TA/TANIGUCHI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/converters/p5-Unicode-String/Makefile b/converters/p5-Unicode-String/Makefile
index e2f61372747e..4393faea4a7e 100644
--- a/converters/p5-Unicode-String/Makefile
+++ b/converters/p5-Unicode-String/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Unicode-String
PORTVERSION= 2.09
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unicode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/converters/p5-Unicode-UTF8simple/Makefile b/converters/p5-Unicode-UTF8simple/Makefile
index 60156f78e7f7..655d6e53ec2b 100644
--- a/converters/p5-Unicode-UTF8simple/Makefile
+++ b/converters/p5-Unicode-UTF8simple/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Unicode-UTF8simple
PORTVERSION= 1.06
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unicode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/p5-XML-WBXML/Makefile b/converters/p5-XML-WBXML/Makefile
index 83f535aae907..e435c42f4dc7 100644
--- a/converters/p5-XML-WBXML/Makefile
+++ b/converters/p5-XML-WBXML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-WBXML
PORTVERSION= 0.03
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
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
diff --git a/deskutils/p5-Data-ICal/Makefile b/deskutils/p5-Data-ICal/Makefile
index 1b71b56f599e..7c4f59455cbf 100644
--- a/deskutils/p5-Data-ICal/Makefile
+++ b/deskutils/p5-Data-ICal/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-ICal
PORTVERSION= 0.13
CATEGORIES= deskutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/deskutils/p5-Goo/Makefile b/deskutils/p5-Goo/Makefile
index 81c1e083f765..87c0bfa43953 100644
--- a/deskutils/p5-Goo/Makefile
+++ b/deskutils/p5-Goo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Goo
PORTVERSION= 0.09
CATEGORIES= deskutils sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/N/NI/NIGE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/activitymail/Makefile b/devel/activitymail/Makefile
index 9ed7c2618103..b8fb41fef05a 100644
--- a/devel/activitymail/Makefile
+++ b/devel/activitymail/Makefile
@@ -8,7 +8,7 @@
PORTNAME= activitymail
PORTVERSION= 1.24
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DW/DWHEELER/activitymail
MAINTAINER= joseph@randomnetworks.com
diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index 851e766e58c6..ac26c7c2e58d 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -10,7 +10,7 @@ PORTNAME= autodia
PORTVERSION= 2.03
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Tree/TEEJAY
DISTNAME= Autodia-${PORTVERSION}
diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile
index 9c91f71a47a5..4da8f8970c4b 100644
--- a/devel/cpan-upload/Makefile
+++ b/devel/cpan-upload/Makefile
@@ -8,8 +8,8 @@
PORTNAME= cpan-upload
PORTVERSION= 2.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/N/NE/NEILB/scripts/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../by-authors/id/N/NE/NEILB/scripts
MAINTAINER= lth@FreeBSD.org
COMMENT= Script for uploading distributions to CPAN
diff --git a/devel/p5-AI-Pathfinding-AStar/Makefile b/devel/p5-AI-Pathfinding-AStar/Makefile
index bf1f864dc599..086f11805870 100644
--- a/devel/p5-AI-Pathfinding-AStar/Makefile
+++ b/devel/p5-AI-Pathfinding-AStar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AI-Pathfinding-AStar
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= AI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Acme-MetaSyntactic/Makefile b/devel/p5-Acme-MetaSyntactic/Makefile
index 23f918cf8172..58372d20ad5c 100644
--- a/devel/p5-Acme-MetaSyntactic/Makefile
+++ b/devel/p5-Acme-MetaSyntactic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Acme-MetaSyntactic
PORTVERSION= 0.99
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Acme
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Agent/Makefile b/devel/p5-Agent/Makefile
index 22793d80823b..ef4ee92848da 100644
--- a/devel/p5-Agent/Makefile
+++ b/devel/p5-Agent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Agent
PORTVERSION= 3.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Agent
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Algorithm-Accounting/Makefile b/devel/p5-Algorithm-Accounting/Makefile
index 91676a9c906c..10f15a6583f4 100644
--- a/devel/p5-Algorithm-Accounting/Makefile
+++ b/devel/p5-Algorithm-Accounting/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Algorithm-Accounting
PORTVERSION= 0.08
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/G/GU/GUGOD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-Algorithm-Annotate/Makefile b/devel/p5-Algorithm-Annotate/Makefile
index 05dad8212823..383322e34d20 100644
--- a/devel/p5-Algorithm-Annotate/Makefile
+++ b/devel/p5-Algorithm-Annotate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Annotate
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Algorithm-Bucketizer/Makefile b/devel/p5-Algorithm-Bucketizer/Makefile
index 8d8bf8cd2755..94473e38aeac 100644
--- a/devel/p5-Algorithm-Bucketizer/Makefile
+++ b/devel/p5-Algorithm-Bucketizer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Bucketizer
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= boumenot@gmail.com
diff --git a/devel/p5-Algorithm-C3/Makefile b/devel/p5-Algorithm-C3/Makefile
index 85b22832240f..874a414981cf 100644
--- a/devel/p5-Algorithm-C3/Makefile
+++ b/devel/p5-Algorithm-C3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-C3
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Algorithm-ChooseSubsets/Makefile b/devel/p5-Algorithm-ChooseSubsets/Makefile
index aad0aaa220ca..9cde2846c36e 100644
--- a/devel/p5-Algorithm-ChooseSubsets/Makefile
+++ b/devel/p5-Algorithm-ChooseSubsets/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-ChooseSubsets
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lars.eggert@gmx.net
diff --git a/devel/p5-Algorithm-Dependency-Objects/Makefile b/devel/p5-Algorithm-Dependency-Objects/Makefile
index 9668174aa200..011a1a63b483 100644
--- a/devel/p5-Algorithm-Dependency-Objects/Makefile
+++ b/devel/p5-Algorithm-Dependency-Objects/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Dependency-Objects
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Algorithm-Dependency/Makefile b/devel/p5-Algorithm-Dependency/Makefile
index ed9cfc240b11..e5eb5ff68bfb 100644
--- a/devel/p5-Algorithm-Dependency/Makefile
+++ b/devel/p5-Algorithm-Dependency/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Dependency
PORTVERSION= 1.106
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Algorithm-Diff/Makefile b/devel/p5-Algorithm-Diff/Makefile
index e244a850e5bf..79ff313cb4bf 100644
--- a/devel/p5-Algorithm-Diff/Makefile
+++ b/devel/p5-Algorithm-Diff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Diff
PORTVERSION= 1.1902
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Algorithm-IncludeExclude/Makefile b/devel/p5-Algorithm-IncludeExclude/Makefile
index 5c18d885521f..f51ad32b4770 100644
--- a/devel/p5-Algorithm-IncludeExclude/Makefile
+++ b/devel/p5-Algorithm-IncludeExclude/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-IncludeExclude
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Algorithm-Interval2Prefix/Makefile b/devel/p5-Algorithm-Interval2Prefix/Makefile
index 961182e808db..db81b8a1542e 100644
--- a/devel/p5-Algorithm-Interval2Prefix/Makefile
+++ b/devel/p5-Algorithm-Interval2Prefix/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Algorithm-Interval2Prefix
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Algorithm-LCS/Makefile b/devel/p5-Algorithm-LCS/Makefile
index 9283e980a00c..45bf4367f8bf 100644
--- a/devel/p5-Algorithm-LCS/Makefile
+++ b/devel/p5-Algorithm-LCS/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Algorithm-LCS
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/J/JO/JOESUF
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Algorithm-LUHN/Makefile b/devel/p5-Algorithm-LUHN/Makefile
index 14cd6deb9b3b..80ef01fe5512 100644
--- a/devel/p5-Algorithm-LUHN/Makefile
+++ b/devel/p5-Algorithm-LUHN/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-LUHN
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/T/TA/TAYERS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Algorithm-MDiff/Makefile b/devel/p5-Algorithm-MDiff/Makefile
index 615fd3adfeab..2a7983b7146d 100644
--- a/devel/p5-Algorithm-MDiff/Makefile
+++ b/devel/p5-Algorithm-MDiff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-MDiff
PORTVERSION= 0.94
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Algorithm-MinMax/Makefile b/devel/p5-Algorithm-MinMax/Makefile
index d5d929179089..951115076636 100644
--- a/devel/p5-Algorithm-MinMax/Makefile
+++ b/devel/p5-Algorithm-MinMax/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-MinMax
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Algorithm-NaiveBayes/Makefile b/devel/p5-Algorithm-NaiveBayes/Makefile
index 132a690aca54..d85eb07c066b 100644
--- a/devel/p5-Algorithm-NaiveBayes/Makefile
+++ b/devel/p5-Algorithm-NaiveBayes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-NaiveBayes
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Algorithm-Networksort/Makefile b/devel/p5-Algorithm-Networksort/Makefile
index d41e595ef6b8..c7de884531a9 100644
--- a/devel/p5-Algorithm-Networksort/Makefile
+++ b/devel/p5-Algorithm-Networksort/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Networksort
PORTVERSION= 1.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Algorithm-Numerical-Shuffle/Makefile b/devel/p5-Algorithm-Numerical-Shuffle/Makefile
index 9f61d50aebcd..65e6d7abbc24 100644
--- a/devel/p5-Algorithm-Numerical-Shuffle/Makefile
+++ b/devel/p5-Algorithm-Numerical-Shuffle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Numerical-Shuffle
PORTVERSION= 1.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/A/AB/ABIGAIL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Shuffle-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/devel/p5-Algorithm-Permute/Makefile b/devel/p5-Algorithm-Permute/Makefile
index 6005ec80b6f8..3691091547c9 100644
--- a/devel/p5-Algorithm-Permute/Makefile
+++ b/devel/p5-Algorithm-Permute/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Permute
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Alias/Makefile b/devel/p5-Alias/Makefile
index ed4b5d06be2f..fbb41196eb8b 100644
--- a/devel/p5-Alias/Makefile
+++ b/devel/p5-Alias/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Alias
PORTVERSION= 2.32
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Alias
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-App-CLI/Makefile b/devel/p5-App-CLI/Makefile
index a43f6c08bb39..4f580ee46dd6 100644
--- a/devel/p5-App-CLI/Makefile
+++ b/devel/p5-App-CLI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= App-CLI
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= App
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-App-Cache/Makefile b/devel/p5-App-Cache/Makefile
index 7e11695617a6..235b09ff2034 100644
--- a/devel/p5-App-Cache/Makefile
+++ b/devel/p5-App-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= App-Cache
PORTVERSION= 0.33
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= App
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-App-Control/Makefile b/devel/p5-App-Control/Makefile
index b63c3d34febc..be7a86edea00 100644
--- a/devel/p5-App-Control/Makefile
+++ b/devel/p5-App-Control/Makefile
@@ -8,8 +8,7 @@
PORTNAME= App-Control
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= App
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-App-Options/Makefile b/devel/p5-App-Options/Makefile
index dc7c91fb5980..b8daf9740df1 100644
--- a/devel/p5-App-Options/Makefile
+++ b/devel/p5-App-Options/Makefile
@@ -8,8 +8,7 @@
PORTNAME= App-Options
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= App
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-App-Trace/Makefile b/devel/p5-App-Trace/Makefile
index 39efcb849ac3..06ab37c3db27 100644
--- a/devel/p5-App-Trace/Makefile
+++ b/devel/p5-App-Trace/Makefile
@@ -8,8 +8,7 @@
PORTNAME= App-Trace
PORTVERSION= 0.50
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= App
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-AppConfig-Std/Makefile b/devel/p5-AppConfig-Std/Makefile
index 72e9798f64e7..86700e23a474 100644
--- a/devel/p5-AppConfig-Std/Makefile
+++ b/devel/p5-AppConfig-Std/Makefile
@@ -9,8 +9,7 @@ PORTNAME= AppConfig-Std
PORTVERSION= 1.07
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= AppConfig
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Array-Group/Makefile b/devel/p5-Array-Group/Makefile
index 8be20464e50b..24ac544334a7 100644
--- a/devel/p5-Array-Group/Makefile
+++ b/devel/p5-Array-Group/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Array-Group
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Array
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Array-Iterator/Makefile b/devel/p5-Array-Iterator/Makefile
index 846a75539940..87d926cf0cc6 100644
--- a/devel/p5-Array-Iterator/Makefile
+++ b/devel/p5-Array-Iterator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Array-Iterator
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Array
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Array-Window/Makefile b/devel/p5-Array-Window/Makefile
index 08b1c2622d33..b9353c02841f 100644
--- a/devel/p5-Array-Window/Makefile
+++ b/devel/p5-Array-Window/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Array-Window
PORTVERSION= 1.00
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AD/ADAMK
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 6280f29b1a1a..891be7a714a0 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AtExit
PORTVERSION= 2.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/B/BR/BRADAPP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Attribute-Handlers/Makefile b/devel/p5-Attribute-Handlers/Makefile
index fa7635925f55..11770dbdfe47 100644
--- a/devel/p5-Attribute-Handlers/Makefile
+++ b/devel/p5-Attribute-Handlers/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Attribute-Handlers
PORTVERSION= 0.78
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Attribute
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-AutoLoader/Makefile b/devel/p5-AutoLoader/Makefile
index af552f37e44a..d653415e8cfe 100644
--- a/devel/p5-AutoLoader/Makefile
+++ b/devel/p5-AutoLoader/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AutoLoader
PORTVERSION= 5.64
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-B-Generate/Makefile b/devel/p5-B-Generate/Makefile
index 9262985f3836..6473189e2246 100644
--- a/devel/p5-B-Generate/Makefile
+++ b/devel/p5-B-Generate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= B-Generate
PORTVERSION= 1.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= B
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-B-Graph/Makefile b/devel/p5-B-Graph/Makefile
index cff8ad7a76a6..fdecf3a077b2 100644
--- a/devel/p5-B-Graph/Makefile
+++ b/devel/p5-B-Graph/Makefile
@@ -8,8 +8,7 @@
PORTNAME= B-Graph
PORTVERSION= 0.51
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=B
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-B-Size/Makefile b/devel/p5-B-Size/Makefile
index 3805bdfa7199..5e0f67dae2ac 100644
--- a/devel/p5-B-Size/Makefile
+++ b/devel/p5-B-Size/Makefile
@@ -8,8 +8,7 @@
PORTNAME= B-Size
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= B
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pgollucci@p6m7g8.com
diff --git a/devel/p5-B-Utils/Makefile b/devel/p5-B-Utils/Makefile
index c5cdf2cd9301..ea2cd61066c7 100644
--- a/devel/p5-B-Utils/Makefile
+++ b/devel/p5-B-Utils/Makefile
@@ -8,8 +8,7 @@
PORTNAME= B-Utils
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= B
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-BFD/Makefile b/devel/p5-BFD/Makefile
index 6bee06810819..143e8b6ec769 100644
--- a/devel/p5-BFD/Makefile
+++ b/devel/p5-BFD/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BFD
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RB/RBS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index 9ff225047a93..150cadb4fe6f 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -8,8 +8,7 @@
PORTNAME= BSD-Resource
PORTVERSION= 1.2901
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= BSD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-BSD-stat/Makefile b/devel/p5-BSD-stat/Makefile
index ab6e83bea6f0..3ecd940e4d55 100644
--- a/devel/p5-BSD-stat/Makefile
+++ b/devel/p5-BSD-stat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= BSD-stat
PORTVERSION= 1.21
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= BSD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Best/Makefile b/devel/p5-Best/Makefile
index 419390ccdb78..e3887f538755 100644
--- a/devel/p5-Best/Makefile
+++ b/devel/p5-Best/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Best
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GA/GAAL
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Bundle-Perl6/Makefile b/devel/p5-Bundle-Perl6/Makefile
index 752c2da5a86f..721d9c881289 100644
--- a/devel/p5-Bundle-Perl6/Makefile
+++ b/devel/p5-Bundle-Perl6/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Bundle-Perl6
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/M/MA/MARCEL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index a06d4ec813fd..c187f0f50cba 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -8,8 +8,7 @@
PORTNAME= C-Scan
PORTVERSION= 0.74
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= C
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-CPAN-DistnameInfo/Makefile b/devel/p5-CPAN-DistnameInfo/Makefile
index 737709c5d76b..7dded8919436 100644
--- a/devel/p5-CPAN-DistnameInfo/Makefile
+++ b/devel/p5-CPAN-DistnameInfo/Makefile
@@ -7,8 +7,7 @@
PORTNAME= CPAN-DistnameInfo
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CPAN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-CPAN-Mini/Makefile b/devel/p5-CPAN-Mini/Makefile
index d7547301eb37..4d575e06c8ae 100644
--- a/devel/p5-CPAN-Mini/Makefile
+++ b/devel/p5-CPAN-Mini/Makefile
@@ -8,8 +8,7 @@
PORTNAME= CPAN-Mini
PORTVERSION= 0.566
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CPAN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index bb22d46b949c..d6f726a676cc 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= CPANPLUS
PORTVERSION= 0.0760
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/K/KA/KANE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-0.076
diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile
index 452a14826cdb..dc68bc8caa08 100644
--- a/devel/p5-Cache-Cache/Makefile
+++ b/devel/p5-Cache-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cache-Cache
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Cache-FastMmap/Makefile b/devel/p5-Cache-FastMmap/Makefile
index 0a5fee6b7a1c..69b263a391c0 100644
--- a/devel/p5-Cache-FastMmap/Makefile
+++ b/devel/p5-Cache-FastMmap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cache-FastMmap
PORTVERSION= 1.25
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Cache-Mmap/Makefile b/devel/p5-Cache-Mmap/Makefile
index 1f6c0530d256..92d2d2e11f0f 100644
--- a/devel/p5-Cache-Mmap/Makefile
+++ b/devel/p5-Cache-Mmap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cache-Mmap
PORTVERSION= 0.090
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-0.09
diff --git a/devel/p5-Cache-Simple-TimedExpiry/Makefile b/devel/p5-Cache-Simple-TimedExpiry/Makefile
index 3b97c2c31474..51c3152cadf4 100644
--- a/devel/p5-Cache-Simple-TimedExpiry/Makefile
+++ b/devel/p5-Cache-Simple-TimedExpiry/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cache-Simple-TimedExpiry
PORTVERSION= 0.27
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= girgen@FreeBSD.org
diff --git a/devel/p5-Cache/Makefile b/devel/p5-Cache/Makefile
index 05b6df2ada24..e2898d7ca8ae 100644
--- a/devel/p5-Cache/Makefile
+++ b/devel/p5-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cache
PORTVERSION= 2.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Calendar-Simple/Makefile b/devel/p5-Calendar-Simple/Makefile
index aaa1703bd76d..b07f8bfbfede 100644
--- a/devel/p5-Calendar-Simple/Makefile
+++ b/devel/p5-Calendar-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Calendar-Simple
PORTVERSION= 1.17
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Calendar
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Carp-Assert-More/Makefile b/devel/p5-Carp-Assert-More/Makefile
index fe8c08a9bde0..80ac58645bf7 100644
--- a/devel/p5-Carp-Assert-More/Makefile
+++ b/devel/p5-Carp-Assert-More/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Carp-Assert-More
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Carp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Carp-Assert/Makefile b/devel/p5-Carp-Assert/Makefile
index 099fed5ca1bd..f914cf13cad3 100644
--- a/devel/p5-Carp-Assert/Makefile
+++ b/devel/p5-Carp-Assert/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Carp-Assert
PORTVERSION= 0.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Carp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Carp-Datum/Makefile b/devel/p5-Carp-Datum/Makefile
index c0228408520b..98bc876ac7c7 100644
--- a/devel/p5-Carp-Datum/Makefile
+++ b/devel/p5-Carp-Datum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Carp-Datum
PORTVERSION= 0.1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Carp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Class-Accessor-Lvalue/Makefile b/devel/p5-Class-Accessor-Lvalue/Makefile
index 3ff1590df3ab..266aa1113cec 100644
--- a/devel/p5-Class-Accessor-Lvalue/Makefile
+++ b/devel/p5-Class-Accessor-Lvalue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Accessor-Lvalue
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Class-Accessor-Named/Makefile b/devel/p5-Class-Accessor-Named/Makefile
index 57261242cf60..fc6a517c1953 100644
--- a/devel/p5-Class-Accessor-Named/Makefile
+++ b/devel/p5-Class-Accessor-Named/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Accessor-Named
PORTVERSION= 0.008
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Accessor/Makefile b/devel/p5-Class-Accessor/Makefile
index 35960f7b5af1..8831a67046e8 100644
--- a/devel/p5-Class-Accessor/Makefile
+++ b/devel/p5-Class-Accessor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Accessor
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-ArrayObjects/Makefile b/devel/p5-Class-ArrayObjects/Makefile
index 39f10d171da8..5b77d46a6958 100644
--- a/devel/p5-Class-ArrayObjects/Makefile
+++ b/devel/p5-Class-ArrayObjects/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-ArrayObjects
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-AutoClass/Makefile b/devel/p5-Class-AutoClass/Makefile
index e0c7629ca14d..fdad9f9b97f1 100644
--- a/devel/p5-Class-AutoClass/Makefile
+++ b/devel/p5-Class-AutoClass/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Class-AutoClass
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class/CCAVNOR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= autoclass_v${PORTVERSION:S/./_/}
EXTRACT_SUFX= .tgz
diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile
index d553bbc21577..be488ece6044 100644
--- a/devel/p5-Class-Autouse/Makefile
+++ b/devel/p5-Class-Autouse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Autouse
PORTVERSION= 1.29
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Base/Makefile b/devel/p5-Class-Base/Makefile
index 1dd5f0c5273d..ef4625f31508 100644
--- a/devel/p5-Class-Base/Makefile
+++ b/devel/p5-Class-Base/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Class-Base
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Class-BlackHole/Makefile b/devel/p5-Class-BlackHole/Makefile
index 73721e2d60e5..0676fe1ea1c8 100644
--- a/devel/p5-Class-BlackHole/Makefile
+++ b/devel/p5-Class-BlackHole/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-BlackHole
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-C3-XS/Makefile b/devel/p5-Class-C3-XS/Makefile
index 9853cd756945..ca11e2c7cfe1 100644
--- a/devel/p5-Class-C3-XS/Makefile
+++ b/devel/p5-Class-C3-XS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-C3-XS
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Class-C3/Makefile b/devel/p5-Class-C3/Makefile
index d94ac8394e02..bcb7e93c6d4d 100644
--- a/devel/p5-Class-C3/Makefile
+++ b/devel/p5-Class-C3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-C3
PORTVERSION= 0.19
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Class-Closure/Makefile b/devel/p5-Class-Closure/Makefile
index aa72855826f8..9da2a3e94347 100644
--- a/devel/p5-Class-Closure/Makefile
+++ b/devel/p5-Class-Closure/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Closure
PORTVERSION= 0.21
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-CodeStyler/Makefile b/devel/p5-Class-CodeStyler/Makefile
index 9c57b362c450..843c2d45d4fd 100644
--- a/devel/p5-Class-CodeStyler/Makefile
+++ b/devel/p5-Class-CodeStyler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-CodeStyler
PORTVERSION= 0.27
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Class-Constant/Makefile b/devel/p5-Class-Constant/Makefile
index faacaf47926a..4dac54436a72 100644
--- a/devel/p5-Class-Constant/Makefile
+++ b/devel/p5-Class-Constant/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Constant
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Class-Container/Makefile b/devel/p5-Class-Container/Makefile
index 25fec803b87e..b3b1c63eed2e 100644
--- a/devel/p5-Class-Container/Makefile
+++ b/devel/p5-Class-Container/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Container
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= dsh@vlink.ru
diff --git a/devel/p5-Class-Contract/Makefile b/devel/p5-Class-Contract/Makefile
index d0e0544a7a36..d20e2fedb69e 100644
--- a/devel/p5-Class-Contract/Makefile
+++ b/devel/p5-Class-Contract/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Contract
PORTVERSION= 1.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Data-Inheritable/Makefile b/devel/p5-Class-Data-Inheritable/Makefile
index 21e8a32b7a3c..516196011aa9 100644
--- a/devel/p5-Class-Data-Inheritable/Makefile
+++ b/devel/p5-Class-Data-Inheritable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Data-Inheritable
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Date/Makefile b/devel/p5-Class-Date/Makefile
index 16db981e71e9..160bb26627ad 100644
--- a/devel/p5-Class-Date/Makefile
+++ b/devel/p5-Class-Date/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Date
PORTVERSION= 1.1.9
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Class-Default/Makefile b/devel/p5-Class-Default/Makefile
index b92391fe0019..cfe3abed4366 100644
--- a/devel/p5-Class-Default/Makefile
+++ b/devel/p5-Class-Default/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Default
PORTVERSION= 1.50
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Delegation/Makefile b/devel/p5-Class-Delegation/Makefile
index ea7edf645dfd..3052feb08a88 100644
--- a/devel/p5-Class-Delegation/Makefile
+++ b/devel/p5-Class-Delegation/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Class-Delegation
PORTVERSION= 1.7.1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/devel/p5-Class-ErrorHandler/Makefile b/devel/p5-Class-ErrorHandler/Makefile
index c6411bf79070..d4cad5382011 100644
--- a/devel/p5-Class-ErrorHandler/Makefile
+++ b/devel/p5-Class-ErrorHandler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-ErrorHandler
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Class-Factory-Util/Makefile b/devel/p5-Class-Factory-Util/Makefile
index 0916cb574290..f369c3fcfb8b 100644
--- a/devel/p5-Class-Factory-Util/Makefile
+++ b/devel/p5-Class-Factory-Util/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Factory-Util
PORTVERSION= 1.7
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Factory/Makefile b/devel/p5-Class-Factory/Makefile
index c316a90b11a8..8687e2bb888a 100644
--- a/devel/p5-Class-Factory/Makefile
+++ b/devel/p5-Class-Factory/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Factory
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Fields/Makefile b/devel/p5-Class-Fields/Makefile
index 9253440fdb20..51f830f9bc61 100644
--- a/devel/p5-Class-Fields/Makefile
+++ b/devel/p5-Class-Fields/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Fields
PORTVERSION= 0.203
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Generate/Makefile b/devel/p5-Class-Generate/Makefile
index 4e4c1faaa463..6a35be31b183 100644
--- a/devel/p5-Class-Generate/Makefile
+++ b/devel/p5-Class-Generate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Generate
PORTVERSION= 1.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Handle/Makefile b/devel/p5-Class-Handle/Makefile
index 6c70da1cbcf9..139bb9712d28 100644
--- a/devel/p5-Class-Handle/Makefile
+++ b/devel/p5-Class-Handle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Handle
PORTVERSION= 1.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-ISA/Makefile b/devel/p5-Class-ISA/Makefile
index bafe6b83591b..5b13a6f1c7fa 100644
--- a/devel/p5-Class-ISA/Makefile
+++ b/devel/p5-Class-ISA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-ISA
PORTVERSION= 0.33
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Inner/Makefile b/devel/p5-Class-Inner/Makefile
index 9e09120e9b0c..c5a205c5d252 100644
--- a/devel/p5-Class-Inner/Makefile
+++ b/devel/p5-Class-Inner/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Inner
PORTVERSION= 0.1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Interfaces/Makefile b/devel/p5-Class-Interfaces/Makefile
index 3dc66e0d9722..e98fc70204e7 100644
--- a/devel/p5-Class-Interfaces/Makefile
+++ b/devel/p5-Class-Interfaces/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Interfaces
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Loader/Makefile b/devel/p5-Class-Loader/Makefile
index 5043846801df..dc45813abf96 100644
--- a/devel/p5-Class-Loader/Makefile
+++ b/devel/p5-Class-Loader/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Loader
PORTVERSION= 2.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-MakeMethods/Makefile b/devel/p5-Class-MakeMethods/Makefile
index 6354cf8cd711..bb42d9cec1ed 100644
--- a/devel/p5-Class-MakeMethods/Makefile
+++ b/devel/p5-Class-MakeMethods/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-MakeMethods
PORTVERSION= 1.010
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/.$//}
diff --git a/devel/p5-Class-MethodMapper/Makefile b/devel/p5-Class-MethodMapper/Makefile
index 169d9b88e9c2..45664abc06a9 100644
--- a/devel/p5-Class-MethodMapper/Makefile
+++ b/devel/p5-Class-MethodMapper/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-MethodMapper
PORTVERSION= 1.0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Class-MixinFactory/Makefile b/devel/p5-Class-MixinFactory/Makefile
index acee590d68d4..b877313023a3 100644
--- a/devel/p5-Class-MixinFactory/Makefile
+++ b/devel/p5-Class-MixinFactory/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-MixinFactory
PORTVERSION= 0.92
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Class-Multimethods-Pure/Makefile b/devel/p5-Class-Multimethods-Pure/Makefile
index 17da3c95b979..6680e5b9f1c3 100644
--- a/devel/p5-Class-Multimethods-Pure/Makefile
+++ b/devel/p5-Class-Multimethods-Pure/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Multimethods-Pure
PORTVERSION= 0.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Multimethods/Makefile b/devel/p5-Class-Multimethods/Makefile
index 0b73bd575100..ad99750891de 100644
--- a/devel/p5-Class-Multimethods/Makefile
+++ b/devel/p5-Class-Multimethods/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Multimethods
PORTVERSION= 1.70
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Class-NamedParms/Makefile b/devel/p5-Class-NamedParms/Makefile
index 111af43db8b4..9b4b593987b2 100644
--- a/devel/p5-Class-NamedParms/Makefile
+++ b/devel/p5-Class-NamedParms/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-NamedParms
PORTVERSION= 1.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Class-OOorNO/Makefile b/devel/p5-Class-OOorNO/Makefile
index bcc5b79070b8..e26802b69248 100644
--- a/devel/p5-Class-OOorNO/Makefile
+++ b/devel/p5-Class-OOorNO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-OOorNO
PORTVERSION= 0.011
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/devel/p5-Class-Observable/Makefile b/devel/p5-Class-Observable/Makefile
index 4f283b7d174f..8484b841577b 100644
--- a/devel/p5-Class-Observable/Makefile
+++ b/devel/p5-Class-Observable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Observable
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hcoyote@ghostar.org
diff --git a/devel/p5-Class-ParmList/Makefile b/devel/p5-Class-ParmList/Makefile
index 2f3fd9117f09..95c1c03ea6ba 100644
--- a/devel/p5-Class-ParmList/Makefile
+++ b/devel/p5-Class-ParmList/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-ParmList
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Class-Prototyped/Makefile b/devel/p5-Class-Prototyped/Makefile
index 98ec3e233306..1930c16af656 100644
--- a/devel/p5-Class-Prototyped/Makefile
+++ b/devel/p5-Class-Prototyped/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Prototyped
PORTVERSION= 1.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-ReturnValue/Makefile b/devel/p5-Class-ReturnValue/Makefile
index 5c1e04f34da6..51f961f2656a 100644
--- a/devel/p5-Class-ReturnValue/Makefile
+++ b/devel/p5-Class-ReturnValue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-ReturnValue
PORTVERSION= 0.55
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-Roles/Makefile b/devel/p5-Class-Roles/Makefile
index 98927842ef8f..86796c7bdb34 100644
--- a/devel/p5-Class-Roles/Makefile
+++ b/devel/p5-Class-Roles/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Roles
PORTVERSION= 0.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Class-STL-Containers/Makefile b/devel/p5-Class-STL-Containers/Makefile
index 2e24fb5bfe59..1c02cf636d1b 100644
--- a/devel/p5-Class-STL-Containers/Makefile
+++ b/devel/p5-Class-STL-Containers/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-STL-Containers
PORTVERSION= 0.35
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Class-Spiffy/Makefile b/devel/p5-Class-Spiffy/Makefile
index ece7e6bea15e..c9215bbaa327 100644
--- a/devel/p5-Class-Spiffy/Makefile
+++ b/devel/p5-Class-Spiffy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Spiffy
PORTVERSION= 0.15
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-StateMachine/Makefile b/devel/p5-Class-StateMachine/Makefile
index 099ec825b1b7..15472b0d5095 100644
--- a/devel/p5-Class-StateMachine/Makefile
+++ b/devel/p5-Class-StateMachine/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-StateMachine
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-StrongSingleton/Makefile b/devel/p5-Class-StrongSingleton/Makefile
index b33694291386..b9b145bf7b7d 100644
--- a/devel/p5-Class-StrongSingleton/Makefile
+++ b/devel/p5-Class-StrongSingleton/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-StrongSingleton
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Tangram/Makefile b/devel/p5-Class-Tangram/Makefile
index 00131da5ad4e..b1e4871542f2 100644
--- a/devel/p5-Class-Tangram/Makefile
+++ b/devel/p5-Class-Tangram/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Tangram
PORTVERSION= 1.57
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Throwable/Makefile b/devel/p5-Class-Throwable/Makefile
index e08429759312..8dc25afdf4cd 100644
--- a/devel/p5-Class-Throwable/Makefile
+++ b/devel/p5-Class-Throwable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Throwable
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index 7aa40d3adf4e..6a704b6a6293 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Tom
PORTVERSION= 3.02
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-Trigger/Makefile b/devel/p5-Class-Trigger/Makefile
index 576e04bb83c3..759fcdfb3971 100644
--- a/devel/p5-Class-Trigger/Makefile
+++ b/devel/p5-Class-Trigger/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Trigger
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Virtual/Makefile b/devel/p5-Class-Virtual/Makefile
index e77f3fbcff0d..a0ebdddbc527 100644
--- a/devel/p5-Class-Virtual/Makefile
+++ b/devel/p5-Class-Virtual/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Virtual
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-WhiteHole/Makefile b/devel/p5-Class-WhiteHole/Makefile
index d3ac9e92fd0b..9511ede5b7a9 100644
--- a/devel/p5-Class-WhiteHole/Makefile
+++ b/devel/p5-Class-WhiteHole/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-WhiteHole
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Workflow/Makefile b/devel/p5-Class-Workflow/Makefile
index 2137769535a1..fc3c7b0c9ed1 100644
--- a/devel/p5-Class-Workflow/Makefile
+++ b/devel/p5-Class-Workflow/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Workflow
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/N/NU/NUFFIN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-XPath/Makefile b/devel/p5-Class-XPath/Makefile
index 156d64b2fcb1..7f315f721650 100644
--- a/devel/p5-Class-XPath/Makefile
+++ b/devel/p5-Class-XPath/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-XPath
PORTVERSION= 1.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Clone-More/Makefile b/devel/p5-Clone-More/Makefile
index 28e88695e6ed..cfbdcc91d9e8 100644
--- a/devel/p5-Clone-More/Makefile
+++ b/devel/p5-Clone-More/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Clone-More
PORTVERSION= 0.90.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Clone
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Clone-PP/Makefile b/devel/p5-Clone-PP/Makefile
index 8dfdb8efdf63..f969a4c552c0 100644
--- a/devel/p5-Clone-PP/Makefile
+++ b/devel/p5-Clone-PP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Clone-PP
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Clone
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Clone/Makefile b/devel/p5-Clone/Makefile
index 982b6ebb9100..43733582eaa4 100644
--- a/devel/p5-Clone/Makefile
+++ b/devel/p5-Clone/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Clone
PORTVERSION= 0.28
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Clone
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Code-Perl/Makefile b/devel/p5-Code-Perl/Makefile
index 7699d0cf0e6e..ca46c43678df 100644
--- a/devel/p5-Code-Perl/Makefile
+++ b/devel/p5-Code-Perl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Code-Perl
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/F/FD/FDALY
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Commands-Guarded/Makefile b/devel/p5-Commands-Guarded/Makefile
index e7591ae14f61..8c0426cca112 100644
--- a/devel/p5-Commands-Guarded/Makefile
+++ b/devel/p5-Commands-Guarded/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Commands-Guarded
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/T/TR/TREY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-CommitBit/Makefile b/devel/p5-CommitBit/Makefile
index eb28ca83105e..5d046aaf9871 100644
--- a/devel/p5-CommitBit/Makefile
+++ b/devel/p5-CommitBit/Makefile
@@ -8,7 +8,7 @@
PORTNAME= CommitBit
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/J/JE/JESSE
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Config-ApacheFormat/Makefile b/devel/p5-Config-ApacheFormat/Makefile
index 66bf321d3c17..20a5cc95ecde 100644
--- a/devel/p5-Config-ApacheFormat/Makefile
+++ b/devel/p5-Config-ApacheFormat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-ApacheFormat
PORTVERSION= 1.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= carpetsmoker@xs4all.nl
diff --git a/devel/p5-Config-Fast/Makefile b/devel/p5-Config-Fast/Makefile
index b37249d5c1e8..2d41f99d0446 100644
--- a/devel/p5-Config-Fast/Makefile
+++ b/devel/p5-Config-Fast/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-Fast
PORTVERSION= 1.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kiwi@oav.net
diff --git a/devel/p5-Config-INI-Simple/Makefile b/devel/p5-Config-INI-Simple/Makefile
index 5e15b7b8c22f..fad158282a3a 100644
--- a/devel/p5-Config-INI-Simple/Makefile
+++ b/devel/p5-Config-INI-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-INI-Simple
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index b125e405c537..2381a3834ff0 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Config-IniFiles
PORTVERSION= 2.39
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/G/GC/GCARLS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Config-Objective/Makefile b/devel/p5-Config-Objective/Makefile
index 192b9afec293..5c2e8e93861f 100644
--- a/devel/p5-Config-Objective/Makefile
+++ b/devel/p5-Config-Objective/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Config-Objective
PORTVERSION= 0.9.1
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@uiuc.edu
diff --git a/devel/p5-Config-Properties/Makefile b/devel/p5-Config-Properties/Makefile
index 5af63653333d..d992b9800103 100644
--- a/devel/p5-Config-Properties/Makefile
+++ b/devel/p5-Config-Properties/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-Properties
PORTVERSION= 1.68
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= cmanley@xs4all.nl
diff --git a/devel/p5-Config-Record/Makefile b/devel/p5-Config-Record/Makefile
index 754341d0b7d2..e17825edb9f6 100644
--- a/devel/p5-Config-Record/Makefile
+++ b/devel/p5-Config-Record/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-Record
PORTVERSION= 1.1.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Config-Simple/Makefile b/devel/p5-Config-Simple/Makefile
index 23a8c64bdd22..5ac77dd05f3a 100644
--- a/devel/p5-Config-Simple/Makefile
+++ b/devel/p5-Config-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-Simple
PORTVERSION= 4.59
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config/SHERZODR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Config-Tiny/Makefile b/devel/p5-Config-Tiny/Makefile
index 5f53a59a87c5..c974d5013817 100644
--- a/devel/p5-Config-Tiny/Makefile
+++ b/devel/p5-Config-Tiny/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-Tiny
PORTVERSION= 2.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-ConfigReader-Simple/Makefile b/devel/p5-ConfigReader-Simple/Makefile
index ef62513050e5..c3f848451a22 100644
--- a/devel/p5-ConfigReader-Simple/Makefile
+++ b/devel/p5-ConfigReader-Simple/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ConfigReader-Simple
PORTVERSION= 1.25
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/B/BD/BDFOY
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-ConfigReader/Makefile b/devel/p5-ConfigReader/Makefile
index 1f15b6b5b66a..32c42a7e20ea 100644
--- a/devel/p5-ConfigReader/Makefile
+++ b/devel/p5-ConfigReader/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ConfigReader
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ConfigReader
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Contextual-Return/Makefile b/devel/p5-Contextual-Return/Makefile
index a97dcc199499..b09e7e8a98c8 100644
--- a/devel/p5-Contextual-Return/Makefile
+++ b/devel/p5-Contextual-Return/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Contextual-Return
PORTVERSION= 0.2.1
DISTVERSIONPREFIX= v
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Curses-Application/Makefile b/devel/p5-Curses-Application/Makefile
index 1d2d78e9507c..836093b4a47b 100644
--- a/devel/p5-Curses-Application/Makefile
+++ b/devel/p5-Curses-Application/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Curses-Application
PORTVERSION= 0.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Curses
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= CursesApplication-${PORTVERSION}
diff --git a/devel/p5-Curses-Forms/Makefile b/devel/p5-Curses-Forms/Makefile
index 3046825c7bf6..5d78e0174f21 100644
--- a/devel/p5-Curses-Forms/Makefile
+++ b/devel/p5-Curses-Forms/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Curses-Forms
PORTVERSION= 1.997
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Curses
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= CursesForms-${PORTVERSION}
diff --git a/devel/p5-Curses-UI/Makefile b/devel/p5-Curses-UI/Makefile
index b36aaae838d2..0802786ce2aa 100644
--- a/devel/p5-Curses-UI/Makefile
+++ b/devel/p5-Curses-UI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Curses-UI
PORTVERSION= 0.9603
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Curses
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Curses-Widgets/Makefile b/devel/p5-Curses-Widgets/Makefile
index f72a25123de3..bb2bca344849 100644
--- a/devel/p5-Curses-Widgets/Makefile
+++ b/devel/p5-Curses-Widgets/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Curses-Widgets
PORTVERSION= 1.997
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Curses
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= CursesWidgets-${PORTVERSION}
diff --git a/devel/p5-Cvs/Makefile b/devel/p5-Cvs/Makefile
index fde1a5560689..0f9a8f0e796f 100644
--- a/devel/p5-Cvs/Makefile
+++ b/devel/p5-Cvs/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Cvs
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RS/RSOLIV
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/R/RS/RSOLIV
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-DB_File-Lock/Makefile b/devel/p5-DB_File-Lock/Makefile
index b6f9a7f61a16..a571ab0e88ea 100644
--- a/devel/p5-DB_File-Lock/Makefile
+++ b/devel/p5-DB_File-Lock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DB_File-Lock
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DB_File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Danga-Socket/Makefile b/devel/p5-Danga-Socket/Makefile
index 4523e82b3dce..49ac776b0505 100644
--- a/devel/p5-Danga-Socket/Makefile
+++ b/devel/p5-Danga-Socket/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Danga-Socket
PORTVERSION= 1.57
CATEGORIES= devel net
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Danga
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-ACL/Makefile b/devel/p5-Data-ACL/Makefile
index 67991c319f2f..3b843a7f1250 100644
--- a/devel/p5-Data-ACL/Makefile
+++ b/devel/p5-Data-ACL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-ACL
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Data-Bind/Makefile b/devel/p5-Data-Bind/Makefile
index 9219c46a69bc..680a1e332c64 100644
--- a/devel/p5-Data-Bind/Makefile
+++ b/devel/p5-Data-Bind/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Data-Bind
PORTVERSION= 0.28
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= yinjieh@csie.nctu.edu.tw
diff --git a/devel/p5-Data-Compare/Makefile b/devel/p5-Data-Compare/Makefile
index 3dee7817b5bd..4a9265d96224 100644
--- a/devel/p5-Data-Compare/Makefile
+++ b/devel/p5-Data-Compare/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Compare
PORTVERSION= 1.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Data-DumpXML/Makefile b/devel/p5-Data-DumpXML/Makefile
index 1ccfb3feb4e4..1b579dde7bd1 100644
--- a/devel/p5-Data-DumpXML/Makefile
+++ b/devel/p5-Data-DumpXML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-DumpXML
PORTVERSION= 1.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Data-Dumper-Simple/Makefile b/devel/p5-Data-Dumper-Simple/Makefile
index 871155b07a98..bb0b8c2936ec 100644
--- a/devel/p5-Data-Dumper-Simple/Makefile
+++ b/devel/p5-Data-Dumper-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Dumper-Simple
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Data-Flow/Makefile b/devel/p5-Data-Flow/Makefile
index adb460811564..78a872d5ae4e 100644
--- a/devel/p5-Data-Flow/Makefile
+++ b/devel/p5-Data-Flow/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Flow
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Data-GUID/Makefile b/devel/p5-Data-GUID/Makefile
index 51bd79e70735..fa9d60fd26a3 100644
--- a/devel/p5-Data-GUID/Makefile
+++ b/devel/p5-Data-GUID/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-GUID
PORTVERSION= 0.043
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Data-HexDump/Makefile b/devel/p5-Data-HexDump/Makefile
index de7804646b51..674554180551 100644
--- a/devel/p5-Data-HexDump/Makefile
+++ b/devel/p5-Data-HexDump/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-HexDump
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-Hierarchy/Makefile b/devel/p5-Data-Hierarchy/Makefile
index cd78c28ad846..ef1f3ab2f9a7 100644
--- a/devel/p5-Data-Hierarchy/Makefile
+++ b/devel/p5-Data-Hierarchy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Hierarchy
PORTVERSION= 0.34
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-Data-Lazy/Makefile b/devel/p5-Data-Lazy/Makefile
index 2955e26fb37d..62485927a80d 100644
--- a/devel/p5-Data-Lazy/Makefile
+++ b/devel/p5-Data-Lazy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Lazy
PORTVERSION= 0.6
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SAMV
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-OptList/Makefile b/devel/p5-Data-OptList/Makefile
index 12aeb6698414..c41cdd5e295e 100644
--- a/devel/p5-Data-OptList/Makefile
+++ b/devel/p5-Data-OptList/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-OptList
PORTVERSION= 0.103
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Data-Postponed/Makefile b/devel/p5-Data-Postponed/Makefile
index f2b78cdbe807..f5841cb38b84 100644
--- a/devel/p5-Data-Postponed/Makefile
+++ b/devel/p5-Data-Postponed/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Postponed
PORTVERSION= 0.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Data-Properties/Makefile b/devel/p5-Data-Properties/Makefile
index 16e723d3565f..5a73adbc5553 100644
--- a/devel/p5-Data-Properties/Makefile
+++ b/devel/p5-Data-Properties/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Properties
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Data-Random/Makefile b/devel/p5-Data-Random/Makefile
index e39b3338abdf..ad5d8eefa660 100644
--- a/devel/p5-Data-Random/Makefile
+++ b/devel/p5-Data-Random/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Data-Random
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Data-RoundRobin/Makefile b/devel/p5-Data-RoundRobin/Makefile
index 2726014b9f03..f6eff04d725e 100644
--- a/devel/p5-Data-RoundRobin/Makefile
+++ b/devel/p5-Data-RoundRobin/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-RoundRobin
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lwhsu@FreeBSD.org
diff --git a/devel/p5-Data-Serializer/Makefile b/devel/p5-Data-Serializer/Makefile
index 4024788e7c63..410d2dbf8d66 100644
--- a/devel/p5-Data-Serializer/Makefile
+++ b/devel/p5-Data-Serializer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Serializer
PORTVERSION= 0.41
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index abafb7d901e2..32cdd7409859 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-ShowTable
PORTVERSION= 3.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Data-Stag/Makefile b/devel/p5-Data-Stag/Makefile
index 94609f6eab95..638b43c09f03 100644
--- a/devel/p5-Data-Stag/Makefile
+++ b/devel/p5-Data-Stag/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Data-Stag
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fernan@iib.unsam.edu.ar
diff --git a/devel/p5-Data-Structure-Util/Makefile b/devel/p5-Data-Structure-Util/Makefile
index 0f296246cf07..0f06a2a5a47e 100644
--- a/devel/p5-Data-Structure-Util/Makefile
+++ b/devel/p5-Data-Structure-Util/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Structure-Util
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= nistor@snickers.org
diff --git a/devel/p5-Data-Table/Makefile b/devel/p5-Data-Table/Makefile
index 49072a73f899..359b441eea09 100644
--- a/devel/p5-Data-Table/Makefile
+++ b/devel/p5-Data-Table/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Table
PORTVERSION= 1.52
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Data-Taxonomy-Tags/Makefile b/devel/p5-Data-Taxonomy-Tags/Makefile
index 6a3e382a0851..6f7a48350648 100644
--- a/devel/p5-Data-Taxonomy-Tags/Makefile
+++ b/devel/p5-Data-Taxonomy-Tags/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Taxonomy-Tags
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Data-TemporaryBag/Makefile b/devel/p5-Data-TemporaryBag/Makefile
index 0734d718aaf4..66ccc8e7b672 100644
--- a/devel/p5-Data-TemporaryBag/Makefile
+++ b/devel/p5-Data-TemporaryBag/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-TemporaryBag
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-TreeDumper/Makefile b/devel/p5-Data-TreeDumper/Makefile
index be31c6d80415..380c910becb3 100644
--- a/devel/p5-Data-TreeDumper/Makefile
+++ b/devel/p5-Data-TreeDumper/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-TreeDumper
PORTVERSION= 0.33
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Data-Types/Makefile b/devel/p5-Data-Types/Makefile
index 00df1880a349..5a0c067aa54c 100644
--- a/devel/p5-Data-Types/Makefile
+++ b/devel/p5-Data-Types/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Types
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Data-UUID/Makefile b/devel/p5-Data-UUID/Makefile
index d324fdf762b2..f2aae9c69b39 100644
--- a/devel/p5-Data-UUID/Makefile
+++ b/devel/p5-Data-UUID/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-UUID
PORTVERSION= 1.148
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-Validate/Makefile b/devel/p5-Data-Validate/Makefile
index 5892f91e9b6c..e8aa8f8452fe 100644
--- a/devel/p5-Data-Validate/Makefile
+++ b/devel/p5-Data-Validate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Validate
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index f97923759650..0d6c634e2922 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Date-Calc
PORTVERSION= 5.5.1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TC/TCHATZI
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Date-DayOfWeek/Makefile b/devel/p5-Date-DayOfWeek/Makefile
index d0f00e2d342a..c4ef97a6bf7f 100644
--- a/devel/p5-Date-DayOfWeek/Makefile
+++ b/devel/p5-Date-DayOfWeek/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Date-DayOfWeek
PORTVERSION= 1.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Date-Easter/Makefile b/devel/p5-Date-Easter/Makefile
index d5d08d1ab14e..ae44b1b6e500 100644
--- a/devel/p5-Date-Easter/Makefile
+++ b/devel/p5-Date-Easter/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Date-Easter
PORTVERSION= 1.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Date-EzDate/Makefile b/devel/p5-Date-EzDate/Makefile
index de8e835cf7a3..f48867a5f023 100644
--- a/devel/p5-Date-EzDate/Makefile
+++ b/devel/p5-Date-EzDate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-EzDate
PORTVERSION= 1.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Date-Holidays-DK/Makefile b/devel/p5-Date-Holidays-DK/Makefile
index e358b3ab9cf8..2302b6e21eb2 100644
--- a/devel/p5-Date-Holidays-DK/Makefile
+++ b/devel/p5-Date-Holidays-DK/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Holidays-DK
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Date-ISO/Makefile b/devel/p5-Date-ISO/Makefile
index edcf5c9e2e9c..c971d4e6adff 100644
--- a/devel/p5-Date-ISO/Makefile
+++ b/devel/p5-Date-ISO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-ISO
PORTVERSION= 1.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 3b6ec8b9ec75..824c27a71b29 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Manip
PORTVERSION= 5.44
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= DateManip-${PORTVERSION}
diff --git a/devel/p5-Date-Pcalc/Makefile b/devel/p5-Date-Pcalc/Makefile
index 8eebd48145f9..690e632cd281 100644
--- a/devel/p5-Date-Pcalc/Makefile
+++ b/devel/p5-Date-Pcalc/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.2
CATEGORIES= devel perl5
MASTER_SITES= ftp://catcode.com/pub/date/ \
http://www.engelschall.com/u/sb/download/pkg/ \
- ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+ CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Date-Range/Makefile b/devel/p5-Date-Range/Makefile
index 20aaaff4f0c3..54e121fe0a8e 100644
--- a/devel/p5-Date-Range/Makefile
+++ b/devel/p5-Date-Range/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Range
PORTVERSION= 1.40
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Date-Roman/Makefile b/devel/p5-Date-Roman/Makefile
index 549ffc759df0..4af023b16e24 100644
--- a/devel/p5-Date-Roman/Makefile
+++ b/devel/p5-Date-Roman/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Roman
PORTVERSION= 1.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= philip@FreeBSD.org
diff --git a/devel/p5-Date-Set/Makefile b/devel/p5-Date-Set/Makefile
index 931b1d0db2ee..36d258894ec0 100644
--- a/devel/p5-Date-Set/Makefile
+++ b/devel/p5-Date-Set/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Set
PORTVERSION= 1.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Date-Simple/Makefile b/devel/p5-Date-Simple/Makefile
index 9723f98fc8c5..0839b95df63e 100644
--- a/devel/p5-Date-Simple/Makefile
+++ b/devel/p5-Date-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Simple
PORTVERSION= 3.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/Y/YV/YVES/
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-DateConvert/Makefile b/devel/p5-DateConvert/Makefile
index 2e6d2150460a..fdaeb898225f 100644
--- a/devel/p5-DateConvert/Makefile
+++ b/devel/p5-DateConvert/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateConvert
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-DateTime-Calendar-Discordian/Makefile b/devel/p5-DateTime-Calendar-Discordian/Makefile
index a1246a15fc16..edf00cc01321 100644
--- a/devel/p5-DateTime-Calendar-Discordian/Makefile
+++ b/devel/p5-DateTime-Calendar-Discordian/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Calendar-Discordian
PORTVERSION= 0.9.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DateTime
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= philip@FreeBSD.org
diff --git a/devel/p5-DateTime-Event-Recurrence/Makefile b/devel/p5-DateTime-Event-Recurrence/Makefile
index 1d60d1567b63..169b09749c47 100644
--- a/devel/p5-DateTime-Event-Recurrence/Makefile
+++ b/devel/p5-DateTime-Event-Recurrence/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Event-Recurrence
DISTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DateTime DateTime/FGLOCK
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Set/Makefile b/devel/p5-DateTime-Set/Makefile
index d962fb8585f8..d5b205ff6f11 100644
--- a/devel/p5-DateTime-Set/Makefile
+++ b/devel/p5-DateTime-Set/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Set
DISTVERSION= 0.25
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DateTime DateTime/FGLOCK
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Util-Astro/Makefile b/devel/p5-DateTime-Util-Astro/Makefile
index 0487fca75086..8160261e5c21 100644
--- a/devel/p5-DateTime-Util-Astro/Makefile
+++ b/devel/p5-DateTime-Util-Astro/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Util-Astro
PORTVERSION= 0.11001
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DM/DMAKI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/devel/p5-DateTime-Util-Calc/Makefile b/devel/p5-DateTime-Util-Calc/Makefile
index 11790128810f..a008be48df06 100644
--- a/devel/p5-DateTime-Util-Calc/Makefile
+++ b/devel/p5-DateTime-Util-Calc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Util-Calc
PORTVERSION= 0.13002
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DateTime
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/devel/p5-Decision-ACL/Makefile b/devel/p5-Decision-ACL/Makefile
index 391be23a2d75..a2853a51a9e3 100644
--- a/devel/p5-Decision-ACL/Makefile
+++ b/devel/p5-Decision-ACL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Decision-ACL
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Decision
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Devel-Arena/Makefile b/devel/p5-Devel-Arena/Makefile
index 1510e8da34f2..4c711499b7a4 100644
--- a/devel/p5-Devel-Arena/Makefile
+++ b/devel/p5-Devel-Arena/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Arena
PORTVERSION= 0.23
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Constants/Makefile b/devel/p5-Devel-Constants/Makefile
index 693b52b944f6..bd7c767de791 100644
--- a/devel/p5-Devel-Constants/Makefile
+++ b/devel/p5-Devel-Constants/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Constants
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Devel-CoreStack/Makefile b/devel/p5-Devel-CoreStack/Makefile
index 72b098c1a8fa..b864e1eb85e3 100644
--- a/devel/p5-Devel-CoreStack/Makefile
+++ b/devel/p5-Devel-CoreStack/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-CoreStack
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Devel-Cycle/Makefile b/devel/p5-Devel-Cycle/Makefile
index 1539f2189544..b134d7cb114b 100644
--- a/devel/p5-Devel-Cycle/Makefile
+++ b/devel/p5-Devel-Cycle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Cycle
PORTVERSION= 1.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-DProfPP/Makefile b/devel/p5-Devel-DProfPP/Makefile
index b415d5def5f4..9583ad9d1ff3 100644
--- a/devel/p5-Devel-DProfPP/Makefile
+++ b/devel/p5-Devel-DProfPP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-DProfPP
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Diagram/Makefile b/devel/p5-Devel-Diagram/Makefile
index 9da354db61c4..73409b435b34 100644
--- a/devel/p5-Devel-Diagram/Makefile
+++ b/devel/p5-Devel-Diagram/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Diagram
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Leak-Object/Makefile b/devel/p5-Devel-Leak-Object/Makefile
index c5777afa7c20..288a245403bb 100644
--- a/devel/p5-Devel-Leak-Object/Makefile
+++ b/devel/p5-Devel-Leak-Object/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Leak-Object
PORTVERSION= 0.91
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/A/AD/ADAMK
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Leak/Makefile b/devel/p5-Devel-Leak/Makefile
index 29de2fce778f..0b0b57d6ff23 100644
--- a/devel/p5-Devel-Leak/Makefile
+++ b/devel/p5-Devel-Leak/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Leak
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-LeakTrace/Makefile b/devel/p5-Devel-LeakTrace/Makefile
index 834402ae255b..e9e3565911b0 100644
--- a/devel/p5-Devel-LeakTrace/Makefile
+++ b/devel/p5-Devel-LeakTrace/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Devel-LeakTrace
PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-LexAlias/Makefile b/devel/p5-Devel-LexAlias/Makefile
index 00b3e2f1de4e..dd93c0b47f3c 100644
--- a/devel/p5-Devel-LexAlias/Makefile
+++ b/devel/p5-Devel-LexAlias/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Devel-LexAlias
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= yinjieh@csie.nctu.edu.tw
diff --git a/devel/p5-Devel-Messenger/Makefile b/devel/p5-Devel-Messenger/Makefile
index 35fd51ed663d..b75937d34d83 100644
--- a/devel/p5-Devel-Messenger/Makefile
+++ b/devel/p5-Devel-Messenger/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Messenger
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Devel-Modlist/Makefile b/devel/p5-Devel-Modlist/Makefile
index fff99336ab6e..026541d6e40f 100644
--- a/devel/p5-Devel-Modlist/Makefile
+++ b/devel/p5-Devel-Modlist/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Modlist
PORTVERSION= 0.71
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Devel-ObjectTracker/Makefile b/devel/p5-Devel-ObjectTracker/Makefile
index 59c6d23cdd20..5032da6e7072 100644
--- a/devel/p5-Devel-ObjectTracker/Makefile
+++ b/devel/p5-Devel-ObjectTracker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-ObjectTracker
PORTVERSION= 0.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-PPPort/Makefile b/devel/p5-Devel-PPPort/Makefile
index 8e6c3beeb584..9db8cb34393a 100644
--- a/devel/p5-Devel-PPPort/Makefile
+++ b/devel/p5-Devel-PPPort/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-PPPort
PORTVERSION= 3.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
#DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(..)$/_\1/}
diff --git a/devel/p5-Devel-Pointer/Makefile b/devel/p5-Devel-Pointer/Makefile
index eefd7728611a..1b9630bb7f36 100644
--- a/devel/p5-Devel-Pointer/Makefile
+++ b/devel/p5-Devel-Pointer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Pointer
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Profiler/Makefile b/devel/p5-Devel-Profiler/Makefile
index 6876c65394c7..37cc447f7e5e 100644
--- a/devel/p5-Devel-Profiler/Makefile
+++ b/devel/p5-Devel-Profiler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Profiler
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Required/Makefile b/devel/p5-Devel-Required/Makefile
index 0e78aaf248db..2316af7496eb 100644
--- a/devel/p5-Devel-Required/Makefile
+++ b/devel/p5-Devel-Required/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Required
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Devel-RingBuffer/Makefile b/devel/p5-Devel-RingBuffer/Makefile
index c5786ad8d9a0..89287ac6cfeb 100644
--- a/devel/p5-Devel-RingBuffer/Makefile
+++ b/devel/p5-Devel-RingBuffer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-RingBuffer
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-STrace/Makefile b/devel/p5-Devel-STrace/Makefile
index dac24ed9538f..4be23cc90f45 100644
--- a/devel/p5-Devel-STrace/Makefile
+++ b/devel/p5-Devel-STrace/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-STrace
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index ebadb19afa2c..444df03b8f38 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-SmallProf
PORTVERSION= 2.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SALVA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-StackTrace/Makefile b/devel/p5-Devel-StackTrace/Makefile
index c24ff8d8a370..1a530e6138f7 100644
--- a/devel/p5-Devel-StackTrace/Makefile
+++ b/devel/p5-Devel-StackTrace/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Devel-StackTrace
PORTVERSION= 1.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Devel-StealthDebug/Makefile b/devel/p5-Devel-StealthDebug/Makefile
index 9b93f178ecd5..4df57f7bce45 100644
--- a/devel/p5-Devel-StealthDebug/Makefile
+++ b/devel/p5-Devel-StealthDebug/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-StealthDebug
PORTVERSION= 1.008
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Devel-Timer/Makefile b/devel/p5-Devel-Timer/Makefile
index 17fd3435d0e7..c946e0c42d22 100644
--- a/devel/p5-Devel-Timer/Makefile
+++ b/devel/p5-Devel-Timer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Timer
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
diff --git a/devel/p5-Devel-TraceCalls/Makefile b/devel/p5-Devel-TraceCalls/Makefile
index 585e1c29b739..851b9c00d1e8 100644
--- a/devel/p5-Devel-TraceCalls/Makefile
+++ b/devel/p5-Devel-TraceCalls/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-TraceCalls
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Devel-TraceUse/Makefile b/devel/p5-Devel-TraceUse/Makefile
index 4e25a2330b15..2a257f1486de 100644
--- a/devel/p5-Devel-TraceUse/Makefile
+++ b/devel/p5-Devel-TraceUse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-TraceUse
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mauricio@arareko.net
diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile
index 93b1adc8b0a5..0422d6acc3b0 100644
--- a/devel/p5-Devel-ptkdb/Makefile
+++ b/devel/p5-Devel-ptkdb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Devel-ptkdb
PORTVERSION= 1.1091
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Dialog/Makefile b/devel/p5-Dialog/Makefile
index b53d04709406..ee93c00153ba 100644
--- a/devel/p5-Dialog/Makefile
+++ b/devel/p5-Dialog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Dialog
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Dialog
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/devel/p5-Digest-TransformPath/Makefile b/devel/p5-Digest-TransformPath/Makefile
index 6dc8edd8958b..883cd92a04f3 100644
--- a/devel/p5-Digest-TransformPath/Makefile
+++ b/devel/p5-Digest-TransformPath/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-TransformPath
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
diff --git a/devel/p5-Dir-Project/Makefile b/devel/p5-Dir-Project/Makefile
index 8e474d944f30..e2b9ccdc5a14 100644
--- a/devel/p5-Dir-Project/Makefile
+++ b/devel/p5-Dir-Project/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Dir-Project
PORTVERSION= 3.011
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Dir
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Directory-Scratch/Makefile b/devel/p5-Directory-Scratch/Makefile
index 3ff13bc23075..0c237241504e 100644
--- a/devel/p5-Directory-Scratch/Makefile
+++ b/devel/p5-Directory-Scratch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Directory-Scratch
PORTVERSION= 0.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Directory
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Env-PS1/Makefile b/devel/p5-Env-PS1/Makefile
index 968b2143b11f..35613abe397f 100644
--- a/devel/p5-Env-PS1/Makefile
+++ b/devel/p5-Env-PS1/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Env-PS1
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Env
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Env-Path/Makefile b/devel/p5-Env-Path/Makefile
index 9a852fa5f978..f1cffe437d43 100644
--- a/devel/p5-Env-Path/Makefile
+++ b/devel/p5-Env-Path/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Env-Path
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Env
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Errno/Makefile b/devel/p5-Errno/Makefile
index c8fae903db7e..dbf7ce96a99e 100644
--- a/devel/p5-Errno/Makefile
+++ b/devel/p5-Errno/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Errno
PORTVERSION= 1.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Errno
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-Event-ExecFlow/Makefile b/devel/p5-Event-ExecFlow/Makefile
index dd8eb238e459..473e1475632a 100644
--- a/devel/p5-Event-ExecFlow/Makefile
+++ b/devel/p5-Event-ExecFlow/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Event-ExecFlow
PORTVERSION= 0.63
CATEGORIES= devel net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Event
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Event-Lib/Makefile b/devel/p5-Event-Lib/Makefile
index 749d28e2e2f9..d5f71781a365 100644
--- a/devel/p5-Event-Lib/Makefile
+++ b/devel/p5-Event-Lib/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Event-Lib
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Event
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fk@fabiankeil.de
diff --git a/devel/p5-Event-RPC/Makefile b/devel/p5-Event-RPC/Makefile
index af72b2fdf0d3..04d126297403 100644
--- a/devel/p5-Event-RPC/Makefile
+++ b/devel/p5-Event-RPC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Event-RPC
PORTVERSION= 0.90
CATEGORIES= devel net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Event
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= vivek@khera.org
diff --git a/devel/p5-Event/Makefile b/devel/p5-Event/Makefile
index 22c39a848a44..232512f56c88 100644
--- a/devel/p5-Event/Makefile
+++ b/devel/p5-Event/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Event
PORTVERSION= 1.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Event
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Exception-Class/Makefile b/devel/p5-Exception-Class/Makefile
index c9319f537354..0e689d053964 100644
--- a/devel/p5-Exception-Class/Makefile
+++ b/devel/p5-Exception-Class/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Exception-Class
PORTVERSION= 1.24
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Exception
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Exception-Handler/Makefile b/devel/p5-Exception-Handler/Makefile
index 86b598d14291..0f69f8383cc2 100644
--- a/devel/p5-Exception-Handler/Makefile
+++ b/devel/p5-Exception-Handler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Exception-Handler
PORTVERSION= 1.004
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Exception
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/devel/p5-Expect-Simple/Makefile b/devel/p5-Expect-Simple/Makefile
index edb50ff26616..e4dbfe25f698 100644
--- a/devel/p5-Expect-Simple/Makefile
+++ b/devel/p5-Expect-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Expect-Simple
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DJ/DJERIUS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Exporter-Tidy/Makefile b/devel/p5-Exporter-Tidy/Makefile
index af69cb3b47c3..a62e01be8bd2 100644
--- a/devel/p5-Exporter-Tidy/Makefile
+++ b/devel/p5-Exporter-Tidy/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Exporter-Tidy
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Exporter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-ExtUtils-AutoInstall/Makefile b/devel/p5-ExtUtils-AutoInstall/Makefile
index cccc2cc2c69c..9865ae65c5cc 100644
--- a/devel/p5-ExtUtils-AutoInstall/Makefile
+++ b/devel/p5-ExtUtils-AutoInstall/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-AutoInstall
PORTVERSION= 0.63
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-ExtUtils-Command/Makefile b/devel/p5-ExtUtils-Command/Makefile
index 32b9645efae5..bf9198a4ce91 100644
--- a/devel/p5-ExtUtils-Command/Makefile
+++ b/devel/p5-ExtUtils-Command/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-Command
PORTVERSION= 1.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-ExtUtils-Constant/Makefile b/devel/p5-ExtUtils-Constant/Makefile
index bb92af781395..1e5b875b3636 100644
--- a/devel/p5-ExtUtils-Constant/Makefile
+++ b/devel/p5-ExtUtils-Constant/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-Constant
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-ExtUtils-Depends/Makefile b/devel/p5-ExtUtils-Depends/Makefile
index 158c3ea17894..94e72854c4e7 100644
--- a/devel/p5-ExtUtils-Depends/Makefile
+++ b/devel/p5-ExtUtils-Depends/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-Depends
PORTVERSION= 0.205
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
index 734af032429f..96eed323aa3f 100644
--- a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-MakeMaker-Coverage
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-ExtUtils-PkgConfig/Makefile b/devel/p5-ExtUtils-PkgConfig/Makefile
index 4c4fdac71fe2..1fc9e450ccb2 100644
--- a/devel/p5-ExtUtils-PkgConfig/Makefile
+++ b/devel/p5-ExtUtils-PkgConfig/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-PkgConfig
PORTVERSION= 1.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-ExtUtils-XSBuilder/Makefile b/devel/p5-ExtUtils-XSBuilder/Makefile
index f71a56a1d8f5..efe768e3988f 100644
--- a/devel/p5-ExtUtils-XSBuilder/Makefile
+++ b/devel/p5-ExtUtils-XSBuilder/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-XSBuilder
PORTVERSION= 0.28
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-FSA-Rules/Makefile b/devel/p5-FSA-Rules/Makefile
index d18402afb6de..96f6f68c2bd0 100644
--- a/devel/p5-FSA-Rules/Makefile
+++ b/devel/p5-FSA-Rules/Makefile
@@ -9,7 +9,7 @@ PORTNAME= FSA-Rules
PORTVERSION= 0.26
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DW/DWHEELER
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-File-Append-TempFile/Makefile b/devel/p5-File-Append-TempFile/Makefile
index d0ede958bbb7..18d53f7a99ad 100644
--- a/devel/p5-File-Append-TempFile/Makefile
+++ b/devel/p5-File-Append-TempFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Append-TempFile
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= roam@FreeBSD.org
diff --git a/devel/p5-File-Attributes-Recursive/Makefile b/devel/p5-File-Attributes-Recursive/Makefile
index 319b3a0cf21e..c2e464dbff50 100644
--- a/devel/p5-File-Attributes-Recursive/Makefile
+++ b/devel/p5-File-Attributes-Recursive/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Attributes-Recursive
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-File-Attributes/Makefile b/devel/p5-File-Attributes/Makefile
index dcef3c83b715..474f9493b578 100644
--- a/devel/p5-File-Attributes/Makefile
+++ b/devel/p5-File-Attributes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Attributes
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-File-BaseDir/Makefile b/devel/p5-File-BaseDir/Makefile
index 49a9a571dfc4..bc45d198524f 100644
--- a/devel/p5-File-BaseDir/Makefile
+++ b/devel/p5-File-BaseDir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-BaseDir
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-File-BasicFlock/Makefile b/devel/p5-File-BasicFlock/Makefile
index a705710e6acf..6831b494bc0f 100644
--- a/devel/p5-File-BasicFlock/Makefile
+++ b/devel/p5-File-BasicFlock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-BasicFlock
PORTVERSION= 98.1202
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-File-Cache/Makefile b/devel/p5-File-Cache/Makefile
index ffb2b78c1feb..b7dc58bceda3 100644
--- a/devel/p5-File-Cache/Makefile
+++ b/devel/p5-File-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Cache
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-File-Cat/Makefile b/devel/p5-File-Cat/Makefile
index 13ba1b0a22d5..0d69c5a86feb 100644
--- a/devel/p5-File-Cat/Makefile
+++ b/devel/p5-File-Cat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Cat
PORTVERSION= 1.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-CreationTime/Makefile b/devel/p5-File-CreationTime/Makefile
index 629739ac4906..5e83c1a5d2bb 100644
--- a/devel/p5-File-CreationTime/Makefile
+++ b/devel/p5-File-CreationTime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-CreationTime
PORTVERSION= 2.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-File-DesktopEntry/Makefile b/devel/p5-File-DesktopEntry/Makefile
index 481c5af3024c..50b63b65211e 100644
--- a/devel/p5-File-DesktopEntry/Makefile
+++ b/devel/p5-File-DesktopEntry/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-DesktopEntry
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/P/PA/PARDUS/${PORTNAME}
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= acm@FreeBSD.org
diff --git a/devel/p5-File-FTS/Makefile b/devel/p5-File-FTS/Makefile
index 7708db9d8c8e..3d00291294cd 100644
--- a/devel/p5-File-FTS/Makefile
+++ b/devel/p5-File-FTS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-FTS
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
index 60c7a5068a1b..32b62e5f7ed0 100644
--- a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
+++ b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Find-Rule-Filesys-Virtual
PORTVERSION= 1.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-File-Find-Rule/Makefile b/devel/p5-File-Find-Rule/Makefile
index 0bbd2accc98b..9b2949d8fdcf 100644
--- a/devel/p5-File-Find-Rule/Makefile
+++ b/devel/p5-File-Find-Rule/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Find-Rule
PORTVERSION= 0.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-File-Flat/Makefile b/devel/p5-File-Flat/Makefile
index 02ec0926922e..81ad77982b41 100644
--- a/devel/p5-File-Flat/Makefile
+++ b/devel/p5-File-Flat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Flat
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-File-Flock/Makefile b/devel/p5-File-Flock/Makefile
index 6e7c84aede5a..a6906b1c66d6 100644
--- a/devel/p5-File-Flock/Makefile
+++ b/devel/p5-File-Flock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Flock
PORTVERSION= 104.111901
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-FnMatch/Makefile b/devel/p5-File-FnMatch/Makefile
index 754f32b19e23..097ee59ff031 100644
--- a/devel/p5-File-FnMatch/Makefile
+++ b/devel/p5-File-FnMatch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-FnMatch
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-File-Grep/Makefile b/devel/p5-File-Grep/Makefile
index 51b91675cc8a..66fd55730048 100644
--- a/devel/p5-File-Grep/Makefile
+++ b/devel/p5-File-Grep/Makefile
@@ -7,8 +7,7 @@
PORTNAME= File-Grep
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kiwi@oav.net
diff --git a/devel/p5-File-HomeDir/Makefile b/devel/p5-File-HomeDir/Makefile
index 9845ddbdafa9..938c9de770c7 100644
--- a/devel/p5-File-HomeDir/Makefile
+++ b/devel/p5-File-HomeDir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-HomeDir
PORTVERSION= 0.69
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/devel/p5-File-Lock/Makefile b/devel/p5-File-Lock/Makefile
index 77081021a61a..01824d886d41 100644
--- a/devel/p5-File-Lock/Makefile
+++ b/devel/p5-File-Lock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Lock
PORTVERSION= 0.9
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-File-MMagic-XS/Makefile b/devel/p5-File-MMagic-XS/Makefile
index 774f4939547c..c0bc209e0088 100644
--- a/devel/p5-File-MMagic-XS/Makefile
+++ b/devel/p5-File-MMagic-XS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-MMagic-XS
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-File-MMagic/Makefile b/devel/p5-File-MMagic/Makefile
index 661cf3394518..213a2d13a3ca 100644
--- a/devel/p5-File-MMagic/Makefile
+++ b/devel/p5-File-MMagic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-MMagic
PORTVERSION= 1.27
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-Modified/Makefile b/devel/p5-File-Modified/Makefile
index 1b7217b0b7aa..9e7f90f58eaf 100644
--- a/devel/p5-File-Modified/Makefile
+++ b/devel/p5-File-Modified/Makefile
@@ -7,8 +7,7 @@ PORTNAME= File-Modified
PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-Monitor/Makefile b/devel/p5-File-Monitor/Makefile
index 0301ce5d0395..52f8a272e810 100644
--- a/devel/p5-File-Monitor/Makefile
+++ b/devel/p5-File-Monitor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Monitor
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/A/AN/ANDYA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/devel/p5-File-NCopy/Makefile b/devel/p5-File-NCopy/Makefile
index 85e02c0bb985..eea1e4ee9a08 100644
--- a/devel/p5-File-NCopy/Makefile
+++ b/devel/p5-File-NCopy/Makefile
@@ -9,7 +9,7 @@ PORTNAME= File-NCopy
PORTVERSION= 0.34
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/M/MZ/MZSANFORD
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-File-NFSLock/Makefile b/devel/p5-File-NFSLock/Makefile
index 39947f5ddf16..fef5e0708385 100644
--- a/devel/p5-File-NFSLock/Makefile
+++ b/devel/p5-File-NFSLock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-NFSLock
PORTVERSION= 1.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-File-Path-Expand/Makefile b/devel/p5-File-Path-Expand/Makefile
index 0a6b427661f3..9f7244561a79 100644
--- a/devel/p5-File-Path-Expand/Makefile
+++ b/devel/p5-File-Path-Expand/Makefile
@@ -7,8 +7,7 @@
PORTNAME= File-Path-Expand
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-File-PathConvert/Makefile b/devel/p5-File-PathConvert/Makefile
index 9633658135b5..0c3950636788 100644
--- a/devel/p5-File-PathConvert/Makefile
+++ b/devel/p5-File-PathConvert/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-PathConvert
PORTVERSION= 0.9
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-Pid/Makefile b/devel/p5-File-Pid/Makefile
index 63f1180a059c..d205e98e9cc2 100644
--- a/devel/p5-File-Pid/Makefile
+++ b/devel/p5-File-Pid/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Pid
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-File-Random/Makefile b/devel/p5-File-Random/Makefile
index db06d76bac71..66e4ed2d38f1 100644
--- a/devel/p5-File-Random/Makefile
+++ b/devel/p5-File-Random/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Random
PORTVERSION= 0.17
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-File-ReadBackwards/Makefile b/devel/p5-File-ReadBackwards/Makefile
index 81eb5000649f..a0fa9672e6b9 100644
--- a/devel/p5-File-ReadBackwards/Makefile
+++ b/devel/p5-File-ReadBackwards/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-ReadBackwards
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-File-ShareDir/Makefile b/devel/p5-File-ShareDir/Makefile
index 6ff0f9a0240b..c71a55ea69c0 100644
--- a/devel/p5-File-ShareDir/Makefile
+++ b/devel/p5-File-ShareDir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-ShareDir
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-Slurp-Tree/Makefile b/devel/p5-File-Slurp-Tree/Makefile
index 8ced9e7f3529..86ffc078721a 100644
--- a/devel/p5-File-Slurp-Tree/Makefile
+++ b/devel/p5-File-Slurp-Tree/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Slurp-Tree
PORTVERSION= 1.24
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-File-Sync/Makefile b/devel/p5-File-Sync/Makefile
index 03d881459d48..46536b471a09 100644
--- a/devel/p5-File-Sync/Makefile
+++ b/devel/p5-File-Sync/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Sync
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-File-Tail/Makefile b/devel/p5-File-Tail/Makefile
index 402e02748dea..6b0b849cac90 100644
--- a/devel/p5-File-Tail/Makefile
+++ b/devel/p5-File-Tail/Makefile
@@ -7,8 +7,7 @@
PORTNAME= File-Tail
PORTVERSION= 0.99.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= shaun@FreeBSD.org
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index deff754a543d..44c5bac9d4a9 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Temp
PORTVERSION= 0.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/devel/p5-File-Tempdir/Makefile b/devel/p5-File-Tempdir/Makefile
index 106c55d7f0c9..09105bbaf074 100644
--- a/devel/p5-File-Tempdir/Makefile
+++ b/devel/p5-File-Tempdir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Tempdir
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= loader@freebsdmall.com
diff --git a/devel/p5-File-Type/Makefile b/devel/p5-File-Type/Makefile
index 7008bd559c2c..a9d94d2160fd 100644
--- a/devel/p5-File-Type/Makefile
+++ b/devel/p5-File-Type/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Type
PORTVERSION= 0.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ahze@FreeBSD.org
diff --git a/devel/p5-File-chdir/Makefile b/devel/p5-File-chdir/Makefile
index e68dbc8c8625..219be419cf63 100644
--- a/devel/p5-File-chdir/Makefile
+++ b/devel/p5-File-chdir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-chdir
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-File-chmod/Makefile b/devel/p5-File-chmod/Makefile
index 018a4526a0e0..b684e57408bd 100644
--- a/devel/p5-File-chmod/Makefile
+++ b/devel/p5-File-chmod/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-chmod
PORTVERSION= 0.32
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= smatsui@karashi.org
diff --git a/devel/p5-File-pushd/Makefile b/devel/p5-File-pushd/Makefile
index d09af9071f06..65aa4ea1dae3 100644
--- a/devel/p5-File-pushd/Makefile
+++ b/devel/p5-File-pushd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-pushd
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-FileHandle-Fmode/Makefile b/devel/p5-FileHandle-Fmode/Makefile
index 6e96b41083ec..b9c2a0b22907 100644
--- a/devel/p5-FileHandle-Fmode/Makefile
+++ b/devel/p5-FileHandle-Fmode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= FileHandle-Fmode
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= FileHandle
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/devel/p5-FileHandle-Unget/Makefile b/devel/p5-FileHandle-Unget/Makefile
index 875140ba979d..a49f1f373fa3 100644
--- a/devel/p5-FileHandle-Unget/Makefile
+++ b/devel/p5-FileHandle-Unget/Makefile
@@ -8,8 +8,7 @@
PORTNAME= FileHandle-Unget
PORTVERSION= 0.1621
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= FileHandle
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Filter-Template/Makefile b/devel/p5-Filter-Template/Makefile
index ed608ded0ba6..c1c9a39bb8fe 100644
--- a/devel/p5-Filter-Template/Makefile
+++ b/devel/p5-Filter-Template/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filter-Template
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Filter/Makefile b/devel/p5-Filter/Makefile
index d50026cc2381..56f94a75a5e7 100644
--- a/devel/p5-Filter/Makefile
+++ b/devel/p5-Filter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filter
PORTVERSION= 1.34
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-FreezeThaw/Makefile b/devel/p5-FreezeThaw/Makefile
index e8c46307eddb..be434eb30b6b 100644
--- a/devel/p5-FreezeThaw/Makefile
+++ b/devel/p5-FreezeThaw/Makefile
@@ -8,8 +8,7 @@
PORTNAME= FreezeThaw
PORTVERSION= 0.43
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= FreezeThaw
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Gearman-Client-Async/Makefile b/devel/p5-Gearman-Client-Async/Makefile
index ef3f7a833b44..1b7014b78d91 100644
--- a/devel/p5-Gearman-Client-Async/Makefile
+++ b/devel/p5-Gearman-Client-Async/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gearman-Client-Async
PORTVERSION= 0.94
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/B/BR/BRADFITZ
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Gearman-Server/Makefile b/devel/p5-Gearman-Server/Makefile
index dfbbd100d5b1..e978b2ed084c 100644
--- a/devel/p5-Gearman-Server/Makefile
+++ b/devel/p5-Gearman-Server/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gearman-Server
PORTVERSION= 1.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/B/BR/BRADFITZ
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Gearman/Makefile b/devel/p5-Gearman/Makefile
index d58b05037d51..23cd93cc006a 100644
--- a/devel/p5-Gearman/Makefile
+++ b/devel/p5-Gearman/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gearman
PORTVERSION= 1.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/B/BR/BRADFITZ
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Getopt-ArgvFile/Makefile b/devel/p5-Getopt-ArgvFile/Makefile
index 6d6c0fb617da..d1f9acf5e61a 100644
--- a/devel/p5-Getopt-ArgvFile/Makefile
+++ b/devel/p5-Getopt-ArgvFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Getopt-ArgvFile
PORTVERSION= 1.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Getopt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Getopt-Declare/Makefile b/devel/p5-Getopt-Declare/Makefile
index 4e7b78cc7910..5b72307843f0 100644
--- a/devel/p5-Getopt-Declare/Makefile
+++ b/devel/p5-Getopt-Declare/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Getopt-Declare
PORTVERSION= 1.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Getopt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Getopt-Long/Makefile b/devel/p5-Getopt-Long/Makefile
index adc79572496a..9c5de50d3af5 100644
--- a/devel/p5-Getopt-Long/Makefile
+++ b/devel/p5-Getopt-Long/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Getopt-Long
PORTVERSION= 2.37
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Getopt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Getopt-Mixed/Makefile b/devel/p5-Getopt-Mixed/Makefile
index c16a4fa7dc4e..05128d347564 100644
--- a/devel/p5-Getopt-Mixed/Makefile
+++ b/devel/p5-Getopt-Mixed/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Getopt-Mixed
PORTVERSION= 1.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Getopt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Getopt-Popt/Makefile b/devel/p5-Getopt-Popt/Makefile
index 0756f127e20b..a3796541be21 100644
--- a/devel/p5-Getopt-Popt/Makefile
+++ b/devel/p5-Getopt-Popt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Getopt-Popt
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Getopt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Hash-WithDefaults/Makefile b/devel/p5-Hash-WithDefaults/Makefile
index f394752dc792..2be050cfb756 100644
--- a/devel/p5-Hash-WithDefaults/Makefile
+++ b/devel/p5-Hash-WithDefaults/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Hash-WithDefaults
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Hash
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Heap-Simple-Perl/Makefile b/devel/p5-Heap-Simple-Perl/Makefile
index fa1147c2670e..54445093917b 100644
--- a/devel/p5-Heap-Simple-Perl/Makefile
+++ b/devel/p5-Heap-Simple-Perl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Heap-Simple-Perl
PORTVERSION= 0.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Heap
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Heap-Simple-XS/Makefile b/devel/p5-Heap-Simple-XS/Makefile
index 8eb8f9d6b7db..ef3307d3bb6b 100644
--- a/devel/p5-Heap-Simple-XS/Makefile
+++ b/devel/p5-Heap-Simple-XS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Heap-Simple-XS
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Heap
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Heap-Simple/Makefile b/devel/p5-Heap-Simple/Makefile
index c2dc6ed5a926..523d5d03f156 100644
--- a/devel/p5-Heap-Simple/Makefile
+++ b/devel/p5-Heap-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Heap-Simple
PORTVERSION= 0.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Heap
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Heap/Makefile b/devel/p5-Heap/Makefile
index 6152716eafbc..c412b329fc25 100644
--- a/devel/p5-Heap/Makefile
+++ b/devel/p5-Heap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Heap
PORTVERSION= 0.80
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Heap
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tolid@plab.ku.dk
diff --git a/devel/p5-Hook-LexWrap/Makefile b/devel/p5-Hook-LexWrap/Makefile
index 7a4b0e5fa6d5..8f6d4301e799 100644
--- a/devel/p5-Hook-LexWrap/Makefile
+++ b/devel/p5-Hook-LexWrap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Hook-LexWrap
PORTVERSION= 0.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Hook
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO-All/Makefile b/devel/p5-IO-All/Makefile
index 475e93343e08..577d9131b5fe 100644
--- a/devel/p5-IO-All/Makefile
+++ b/devel/p5-IO-All/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-All
PORTVERSION= 0.38
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO-Capture/Makefile b/devel/p5-IO-Capture/Makefile
index f8ae4246a475..dc766237bd4f 100644
--- a/devel/p5-IO-Capture/Makefile
+++ b/devel/p5-IO-Capture/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Capture
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-IO-Digest/Makefile b/devel/p5-IO-Digest/Makefile
index ae7172144b1f..8748989d1029 100644
--- a/devel/p5-IO-Digest/Makefile
+++ b/devel/p5-IO-Digest/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Digest
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-IO-KQueue/Makefile b/devel/p5-IO-KQueue/Makefile
index 632862f36542..1399e1be1db3 100644
--- a/devel/p5-IO-KQueue/Makefile
+++ b/devel/p5-IO-KQueue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-KQueue
PORTVERSION= 0.32
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-IO-LockedFile/Makefile b/devel/p5-IO-LockedFile/Makefile
index a466d8dadceb..81a8be06e0b6 100644
--- a/devel/p5-IO-LockedFile/Makefile
+++ b/devel/p5-IO-LockedFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-LockedFile
PORTVERSION= 0.23
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-IO-Multiplex/Makefile b/devel/p5-IO-Multiplex/Makefile
index a3dbfe8291a6..1f7188579296 100644
--- a/devel/p5-IO-Multiplex/Makefile
+++ b/devel/p5-IO-Multiplex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Multiplex
PORTVERSION= 1.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-IO-NestedCapture/Makefile b/devel/p5-IO-NestedCapture/Makefile
index 40f6b044ee39..47f29212f0dc 100644
--- a/devel/p5-IO-NestedCapture/Makefile
+++ b/devel/p5-IO-NestedCapture/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-NestedCapture
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO-Null/Makefile b/devel/p5-IO-Null/Makefile
index c778e3c5a677..b56f442346b5 100644
--- a/devel/p5-IO-Null/Makefile
+++ b/devel/p5-IO-Null/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Null
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rouslan@rshell.net
diff --git a/devel/p5-IO-Pager/Makefile b/devel/p5-IO-Pager/Makefile
index 2955097a0318..663e51aa5e21 100644
--- a/devel/p5-IO-Pager/Makefile
+++ b/devel/p5-IO-Pager/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Pager
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/devel/p5-IO-Prompt/Makefile b/devel/p5-IO-Prompt/Makefile
index 53ba56e78ad0..738d3482a410 100644
--- a/devel/p5-IO-Prompt/Makefile
+++ b/devel/p5-IO-Prompt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= IO-Prompt
PORTVERSION= 0.99.4
DISTVERSIONPREFIX= v
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/D/DC/DCONWAY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-IO-String/Makefile b/devel/p5-IO-String/Makefile
index e377a81efcd3..91db21e1c36f 100644
--- a/devel/p5-IO-String/Makefile
+++ b/devel/p5-IO-String/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-String
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-IO-Tee/Makefile b/devel/p5-IO-Tee/Makefile
index 3bd9e66e0dc0..597dc4c4d57d 100644
--- a/devel/p5-IO-Tee/Makefile
+++ b/devel/p5-IO-Tee/Makefile
@@ -9,8 +9,7 @@ PORTNAME= IO-Tee
PORTVERSION= 0.64
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-IO-Toolkit/Makefile b/devel/p5-IO-Toolkit/Makefile
index da142d19bd51..f580a062e079 100644
--- a/devel/p5-IO-Toolkit/Makefile
+++ b/devel/p5-IO-Toolkit/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Toolkit
PORTVERSION= 1.008
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index e035776b0fb6..f65f4f8e9a67 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Tty
PORTVERSION= 1.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-IO-Util/Makefile b/devel/p5-IO-Util/Makefile
index f5150b874be5..787b8aa93308 100644
--- a/devel/p5-IO-Util/Makefile
+++ b/devel/p5-IO-Util/Makefile
@@ -9,8 +9,7 @@ PORTNAME= IO-Util
PORTVERSION= 1.5
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO-YAML/Makefile b/devel/p5-IO-YAML/Makefile
index a47224005284..a7e86cb67b2f 100644
--- a/devel/p5-IO-YAML/Makefile
+++ b/devel/p5-IO-YAML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-YAML
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 417c483cadbf..78d356919f25 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-stringy
PORTVERSION= 2.110
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO/Makefile b/devel/p5-IO/Makefile
index db41e29d9a0f..1b5455c68b9a 100644
--- a/devel/p5-IO/Makefile
+++ b/devel/p5-IO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO
PORTVERSION= 1.2301
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-IOC/Makefile b/devel/p5-IOC/Makefile
index a934154fe084..232b4d9038b8 100644
--- a/devel/p5-IOC/Makefile
+++ b/devel/p5-IOC/Makefile
@@ -8,7 +8,7 @@
PORTNAME= IOC
PORTVERSION= 0.29
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-IPC-Cache/Makefile b/devel/p5-IPC-Cache/Makefile
index 9d72d9df9905..018f9960b7fd 100644
--- a/devel/p5-IPC-Cache/Makefile
+++ b/devel/p5-IPC-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Cache
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-IPC-Cmd/Makefile b/devel/p5-IPC-Cmd/Makefile
index 74fef7cb3309..df7b538661dc 100644
--- a/devel/p5-IPC-Cmd/Makefile
+++ b/devel/p5-IPC-Cmd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Cmd
PORTVERSION= 0.40
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-IPC-DirQueue/Makefile b/devel/p5-IPC-DirQueue/Makefile
index df62d15c7021..2137b53aa19e 100644
--- a/devel/p5-IPC-DirQueue/Makefile
+++ b/devel/p5-IPC-DirQueue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-DirQueue
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-IPC-Locker/Makefile b/devel/p5-IPC-Locker/Makefile
index 6e7f8596139b..51af43c57659 100644
--- a/devel/p5-IPC-Locker/Makefile
+++ b/devel/p5-IPC-Locker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Locker
PORTVERSION= 1.481
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IPC-MM/Makefile b/devel/p5-IPC-MM/Makefile
index 9c333a8e3a0d..f37555779dcd 100644
--- a/devel/p5-IPC-MM/Makefile
+++ b/devel/p5-IPC-MM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-MM
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-IPC-Mmap-Share/Makefile b/devel/p5-IPC-Mmap-Share/Makefile
index 1c14f4c64d6c..c54590a846a8 100644
--- a/devel/p5-IPC-Mmap-Share/Makefile
+++ b/devel/p5-IPC-Mmap-Share/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Mmap-Share
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-IPC-Open3-Simple/Makefile b/devel/p5-IPC-Open3-Simple/Makefile
index 53e554f9c3e4..08a86502a223 100644
--- a/devel/p5-IPC-Open3-Simple/Makefile
+++ b/devel/p5-IPC-Open3-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Open3-Simple
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-IPC-PubSub/Makefile b/devel/p5-IPC-PubSub/Makefile
index c8e87fd343c3..990d18dbfe66 100644
--- a/devel/p5-IPC-PubSub/Makefile
+++ b/devel/p5-IPC-PubSub/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-PubSub
PORTVERSION= 0.27
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-IPC-Run/Makefile b/devel/p5-IPC-Run/Makefile
index 6c68477e06ee..67fc2b908f14 100644
--- a/devel/p5-IPC-Run/Makefile
+++ b/devel/p5-IPC-Run/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Run
PORTVERSION= 0.80
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IPC-SharedCache/Makefile b/devel/p5-IPC-SharedCache/Makefile
index 4900b37dc05e..dd7baa09bf81 100644
--- a/devel/p5-IPC-SharedCache/Makefile
+++ b/devel/p5-IPC-SharedCache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-SharedCache
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IPC-Signal/Makefile b/devel/p5-IPC-Signal/Makefile
index 9739e6a83ea0..d25ff726ae69 100644
--- a/devel/p5-IPC-Signal/Makefile
+++ b/devel/p5-IPC-Signal/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Signal
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rouslan@rshell.net
diff --git a/devel/p5-Include/Makefile b/devel/p5-Include/Makefile
index 4c62902ea496..6bcf14afb3b6 100644
--- a/devel/p5-Include/Makefile
+++ b/devel/p5-Include/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Include
PORTVERSION= 1.02a
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Include
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Inline-ASM/Makefile b/devel/p5-Inline-ASM/Makefile
index 47fd88ea60c3..da949799d2ec 100644
--- a/devel/p5-Inline-ASM/Makefile
+++ b/devel/p5-Inline-ASM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Inline-ASM
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Inline-CPP/Makefile b/devel/p5-Inline-CPP/Makefile
index 0fc7aaecd558..73cba5d3c894 100644
--- a/devel/p5-Inline-CPP/Makefile
+++ b/devel/p5-Inline-CPP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Inline-CPP
PORTVERSION= 0.25
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Inline-Files/Makefile b/devel/p5-Inline-Files/Makefile
index af8e19f046b3..c203866b7462 100644
--- a/devel/p5-Inline-Files/Makefile
+++ b/devel/p5-Inline-Files/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Inline-Files
PORTVERSION= 0.62
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Inline-Filters/Makefile b/devel/p5-Inline-Filters/Makefile
index 827c096c8b58..67b68f18c499 100644
--- a/devel/p5-Inline-Filters/Makefile
+++ b/devel/p5-Inline-Filters/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Inline-Filters
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index 37f7cc55dce9..6d69d5ef174a 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -10,8 +10,7 @@ PORTNAME= Inline-Java
PORTVERSION= 0.52
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/P/PA/PATL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Inline-Tcl/Makefile b/devel/p5-Inline-Tcl/Makefile
index d9d4b0119929..9e684aca881e 100644
--- a/devel/p5-Inline-Tcl/Makefile
+++ b/devel/p5-Inline-Tcl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Inline-Tcl
PORTVERSION= 0.09
CATEGORIES= devel perl5 tcl
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile
index 4bd59b7893a9..9f05e942a5ed 100644
--- a/devel/p5-Inline/Makefile
+++ b/devel/p5-Inline/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Inline
PORTVERSION= 0.44
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Ioctl/Makefile b/devel/p5-Ioctl/Makefile
index ade01da02d39..6a7d320a225f 100644
--- a/devel/p5-Ioctl/Makefile
+++ b/devel/p5-Ioctl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Ioctl
PORTVERSION= 0.81
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Ioctl/JPRIT
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Iterator-IO/Makefile b/devel/p5-Iterator-IO/Makefile
index eff167da11d6..d2923fc7ed40 100644
--- a/devel/p5-Iterator-IO/Makefile
+++ b/devel/p5-Iterator-IO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Iterator-IO
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Iterator
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Iterator-Misc/Makefile b/devel/p5-Iterator-Misc/Makefile
index d4d9a5db5b85..ebdffa475fd9 100644
--- a/devel/p5-Iterator-Misc/Makefile
+++ b/devel/p5-Iterator-Misc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Iterator-Misc
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Iterator
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Iterator-Util/Makefile b/devel/p5-Iterator-Util/Makefile
index 75d28a1133eb..2eada05f872a 100644
--- a/devel/p5-Iterator-Util/Makefile
+++ b/devel/p5-Iterator-Util/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Iterator-Util
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Iterator
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Iterator/Makefile b/devel/p5-Iterator/Makefile
index c2cfb39628c7..c8ca2d3fa750 100644
--- a/devel/p5-Iterator/Makefile
+++ b/devel/p5-Iterator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Iterator
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROODE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Java/Makefile b/devel/p5-Java/Makefile
index f39ebf5f4f85..d5c56c333468 100644
--- a/devel/p5-Java/Makefile
+++ b/devel/p5-Java/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Java
PORTVERSION= 4.7
PORTREVISION= 2
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Java
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= numisemis@yahoo.com
diff --git a/devel/p5-Lexical-Alias/Makefile b/devel/p5-Lexical-Alias/Makefile
index 3b98319a9827..3b4c6bcd2ef0 100644
--- a/devel/p5-Lexical-Alias/Makefile
+++ b/devel/p5-Lexical-Alias/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lexical-Alias
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lexical
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Lexical-Persistence/Makefile b/devel/p5-Lexical-Persistence/Makefile
index fc5aeb15dcde..f5b9670b5111 100644
--- a/devel/p5-Lexical-Persistence/Makefile
+++ b/devel/p5-Lexical-Persistence/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lexical-Persistence
PORTVERSION= 0.97
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lexical
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-List-Cycle/Makefile b/devel/p5-List-Cycle/Makefile
index 318978a297ff..ac86bb8888c8 100644
--- a/devel/p5-List-Cycle/Makefile
+++ b/devel/p5-List-Cycle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= List-Cycle
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= List
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-List-Group/Makefile b/devel/p5-List-Group/Makefile
index 719c9a1defdc..79f0adb5dbd4 100644
--- a/devel/p5-List-Group/Makefile
+++ b/devel/p5-List-Group/Makefile
@@ -8,8 +8,7 @@
PORTNAME= List-Group
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= List
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tillman@seekingfire.com
diff --git a/devel/p5-Locale-Maketext-Fuzzy/Makefile b/devel/p5-Locale-Maketext-Fuzzy/Makefile
index e8e0b3990e04..7e690537dc83 100644
--- a/devel/p5-Locale-Maketext-Fuzzy/Makefile
+++ b/devel/p5-Locale-Maketext-Fuzzy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Locale-Maketext-Fuzzy
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Locale-Maketext-Simple/Makefile b/devel/p5-Locale-Maketext-Simple/Makefile
index 60a27a6c3231..79c28fd2e276 100644
--- a/devel/p5-Locale-Maketext-Simple/Makefile
+++ b/devel/p5-Locale-Maketext-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Locale-Maketext-Simple
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-Locale-PGetText/Makefile b/devel/p5-Locale-PGetText/Makefile
index 58b39c8b964f..8b6f6861614c 100644
--- a/devel/p5-Locale-PGetText/Makefile
+++ b/devel/p5-Locale-PGetText/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Locale-PGetText
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index 23a5936ce93b..bef81bbca7e8 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gettext
PORTVERSION= 1.05
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile
index 1daea0c822ff..b83698b598f9 100644
--- a/devel/p5-Locale-libintl/Makefile
+++ b/devel/p5-Locale-libintl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Locale-libintl
PORTVERSION= 1.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= libintl-perl-${PORTVERSION}
diff --git a/devel/p5-LockFile-Simple/Makefile b/devel/p5-LockFile-Simple/Makefile
index 6c4204a954ac..7e86e7d35c4f 100644
--- a/devel/p5-LockFile-Simple/Makefile
+++ b/devel/p5-LockFile-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= LockFile-Simple
PORTVERSION= 0.2.6
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= LockFile
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:R}0${PORTVERSION:E}
diff --git a/devel/p5-Log-Accounting-SVK/Makefile b/devel/p5-Log-Accounting-SVK/Makefile
index 9855e88b0635..fff539509ffc 100644
--- a/devel/p5-Log-Accounting-SVK/Makefile
+++ b/devel/p5-Log-Accounting-SVK/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Log-Accounting-SVK
PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/G/GU/GUGOD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-Log-Accounting-SVN/Makefile b/devel/p5-Log-Accounting-SVN/Makefile
index 3b3491abc884..23a7ee97973f 100644
--- a/devel/p5-Log-Accounting-SVN/Makefile
+++ b/devel/p5-Log-Accounting-SVN/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Log-Accounting-SVN
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-Log-Agent-Logger/Makefile b/devel/p5-Log-Agent-Logger/Makefile
index 210d58af24ce..399eb53d76df 100644
--- a/devel/p5-Log-Agent-Logger/Makefile
+++ b/devel/p5-Log-Agent-Logger/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Log-Agent-Logger
PORTVERSION= 0.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/T/TB/TBONE
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Log-Agent/Makefile b/devel/p5-Log-Agent/Makefile
index 74fa6532affa..5acb4fed81a3 100644
--- a/devel/p5-Log-Agent/Makefile
+++ b/devel/p5-Log-Agent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Agent
PORTVERSION= 0.307
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Log-Dispatch-FileRotate/Makefile b/devel/p5-Log-Dispatch-FileRotate/Makefile
index 45e6036db1c3..b00ce2078b97 100644
--- a/devel/p5-Log-Dispatch-FileRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileRotate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Dispatch-FileRotate
PORTVERSION= 1.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Log-Dispatch-FileShared/Makefile b/devel/p5-Log-Dispatch-FileShared/Makefile
index bdd8341faeb5..888b6a44dee2 100644
--- a/devel/p5-Log-Dispatch-FileShared/Makefile
+++ b/devel/p5-Log-Dispatch-FileShared/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Dispatch-FileShared
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Log-Dispatch-Perl/Makefile b/devel/p5-Log-Dispatch-Perl/Makefile
index e3aac766887c..f3a32cf44c7a 100644
--- a/devel/p5-Log-Dispatch-Perl/Makefile
+++ b/devel/p5-Log-Dispatch-Perl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Dispatch-Perl
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Log-Message-Simple/Makefile b/devel/p5-Log-Message-Simple/Makefile
index 883452d2c465..7202691cf4d5 100644
--- a/devel/p5-Log-Message-Simple/Makefile
+++ b/devel/p5-Log-Message-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Message-Simple
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Log-Message/Makefile b/devel/p5-Log-Message/Makefile
index 5ca7867e5e3c..ee89cc9634c6 100644
--- a/devel/p5-Log-Message/Makefile
+++ b/devel/p5-Log-Message/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Message
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Log-Report/Makefile b/devel/p5-Log-Report/Makefile
index 612289ba3641..3856d4e2b89b 100644
--- a/devel/p5-Log-Report/Makefile
+++ b/devel/p5-Log-Report/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Report
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Log-Simple/Makefile b/devel/p5-Log-Simple/Makefile
index 75b7ca42bf22..a6b7f71d67b6 100644
--- a/devel/p5-Log-Simple/Makefile
+++ b/devel/p5-Log-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Simple
PORTVERSION= 1.8
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Log-TraceMessages/Makefile b/devel/p5-Log-TraceMessages/Makefile
index 8533c4412441..6074c70eeff4 100644
--- a/devel/p5-Log-TraceMessages/Makefile
+++ b/devel/p5-Log-TraceMessages/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-TraceMessages
PORTVERSION= 1.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/E/ED/EDAVIS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Luka/Makefile b/devel/p5-Luka/Makefile
index 545b90f0413e..74aa44c1a6f1 100644
--- a/devel/p5-Luka/Makefile
+++ b/devel/p5-Luka/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Luka
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TP/TPG
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Mac-FileSpec-Unixish/Makefile b/devel/p5-Mac-FileSpec-Unixish/Makefile
index 359e43df6681..c5131f75e9f6 100644
--- a/devel/p5-Mac-FileSpec-Unixish/Makefile
+++ b/devel/p5-Mac-FileSpec-Unixish/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mac-FileSpec-Unixish
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mac
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Make-Cache/Makefile b/devel/p5-Make-Cache/Makefile
index df2285d50445..76b019dc220a 100644
--- a/devel/p5-Make-Cache/Makefile
+++ b/devel/p5-Make-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Make-Cache
PORTVERSION= 1.043
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Make
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Make/Makefile b/devel/p5-Make/Makefile
index 91d68c2cec2f..f99305c71d7a 100644
--- a/devel/p5-Make/Makefile
+++ b/devel/p5-Make/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Make
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Make
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Memoize-ExpireLRU/Makefile b/devel/p5-Memoize-ExpireLRU/Makefile
index d1aa094f0d41..681416b777cd 100644
--- a/devel/p5-Memoize-ExpireLRU/Makefile
+++ b/devel/p5-Memoize-ExpireLRU/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Memoize-ExpireLRU
PORTVERSION= 0.55
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Memoize
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Memoize/Makefile b/devel/p5-Memoize/Makefile
index 80035fd00a92..7aad1d31ca71 100644
--- a/devel/p5-Memoize/Makefile
+++ b/devel/p5-Memoize/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Memoize
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Memoize
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Mknod/Makefile b/devel/p5-Mknod/Makefile
index ee53766ed45e..56a199925d2a 100644
--- a/devel/p5-Mknod/Makefile
+++ b/devel/p5-Mknod/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Mknod
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RL/RLZWART
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Module-Compile/Makefile b/devel/p5-Module-Compile/Makefile
index 33e8b6155925..15953de81cf5 100644
--- a/devel/p5-Module-Compile/Makefile
+++ b/devel/p5-Module-Compile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Compile
PORTVERSION= 0.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/devel/p5-Module-Dependency/Makefile b/devel/p5-Module-Dependency/Makefile
index deb82edf4d6b..120625324c45 100644
--- a/devel/p5-Module-Dependency/Makefile
+++ b/devel/p5-Module-Dependency/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Dependency
PORTVERSION= 1.86
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Module-Info/Makefile b/devel/p5-Module-Info/Makefile
index a97edf2a0a34..1ba2ce8bc331 100644
--- a/devel/p5-Module-Info/Makefile
+++ b/devel/p5-Module-Info/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Info
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/M/MB/MBARBON
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-Module-Pluggable-Fast/Makefile b/devel/p5-Module-Pluggable-Fast/Makefile
index a2ad9d1db6be..ae44d3773fc0 100644
--- a/devel/p5-Module-Pluggable-Fast/Makefile
+++ b/devel/p5-Module-Pluggable-Fast/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Module-Pluggable-Fast
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Module-Release/Makefile b/devel/p5-Module-Release/Makefile
index b0c7cc54374a..593a22fdb8c6 100644
--- a/devel/p5-Module-Release/Makefile
+++ b/devel/p5-Module-Release/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Release
PORTVERSION= 1.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/B/BD/BDFOY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Module-Reload-Sel/Makefile b/devel/p5-Module-Reload-Sel/Makefile
index 4d6420fab1a3..d98c2efdbf59 100644
--- a/devel/p5-Module-Reload-Sel/Makefile
+++ b/devel/p5-Module-Reload-Sel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Reload-Sel
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= simond@irrelevant.org
diff --git a/devel/p5-Module-Reload/Makefile b/devel/p5-Module-Reload/Makefile
index 67da59badc86..644aedd09f57 100644
--- a/devel/p5-Module-Reload/Makefile
+++ b/devel/p5-Module-Reload/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Reload
PORTVERSION= 1.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= andrew@scoop.co.nz
diff --git a/devel/p5-Module-Starter-PBP/Makefile b/devel/p5-Module-Starter-PBP/Makefile
index d2922f0c843d..48063509227f 100644
--- a/devel/p5-Module-Starter-PBP/Makefile
+++ b/devel/p5-Module-Starter-PBP/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Module-Starter-PBP
PORTVERSION= 0.0.3
DISTVERSIONPREFIX= v
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Module-Versions-Report/Makefile b/devel/p5-Module-Versions-Report/Makefile
index a58309872b20..ed47e56ce6a7 100644
--- a/devel/p5-Module-Versions-Report/Makefile
+++ b/devel/p5-Module-Versions-Report/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Versions-Report
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Moose-Policy/Makefile b/devel/p5-Moose-Policy/Makefile
index cfece2c63fa0..e8b6708a0b6d 100644
--- a/devel/p5-Moose-Policy/Makefile
+++ b/devel/p5-Moose-Policy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Moose-Policy
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-MooseX-IOC/Makefile b/devel/p5-MooseX-IOC/Makefile
index 0e8b9a683c95..8fda4cbf0682 100644
--- a/devel/p5-MooseX-IOC/Makefile
+++ b/devel/p5-MooseX-IOC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MooseX-IOC
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-MooseX-Policy-SemiAffordanceAccessor/Makefile b/devel/p5-MooseX-Policy-SemiAffordanceAccessor/Makefile
index 6502e668771e..ab3255d3d371 100644
--- a/devel/p5-MooseX-Policy-SemiAffordanceAccessor/Makefile
+++ b/devel/p5-MooseX-Policy-SemiAffordanceAccessor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MooseX-Policy-SemiAffordanceAccessor
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DR/DROLSKY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Net-DBus/Makefile b/devel/p5-Net-DBus/Makefile
index d5f63d6ff0b9..49f18cd48d91 100644
--- a/devel/p5-Net-DBus/Makefile
+++ b/devel/p5-Net-DBus/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-DBus
PORTVERSION= 0.33.6
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= novel@FreeBSD.org
diff --git a/devel/p5-Number-Bytes-Human/Makefile b/devel/p5-Number-Bytes-Human/Makefile
index 5ae32465f57b..3eebf84b9afc 100644
--- a/devel/p5-Number-Bytes-Human/Makefile
+++ b/devel/p5-Number-Bytes-Human/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Number-Bytes-Human
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Number
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= madis555@hot.ee
diff --git a/devel/p5-OLE-Storage_Lite/Makefile b/devel/p5-OLE-Storage_Lite/Makefile
index 3aa18d6ccb9a..dc659a4a9dec 100644
--- a/devel/p5-OLE-Storage_Lite/Makefile
+++ b/devel/p5-OLE-Storage_Lite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OLE-Storage_Lite
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OLE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-OOTools/Makefile b/devel/p5-OOTools/Makefile
index 6bba20b0e5a3..c7eb4357cd55 100644
--- a/devel/p5-OOTools/Makefile
+++ b/devel/p5-OOTools/Makefile
@@ -8,7 +8,7 @@
PORTNAME= OOTools
PORTVERSION= 2.21
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DO/DOMIZIO
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-ORBit/Makefile b/devel/p5-ORBit/Makefile
index a73575d8a540..6eef5bd0329d 100644
--- a/devel/p5-ORBit/Makefile
+++ b/devel/p5-ORBit/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ORBit
PORTVERSION= 0.4.7
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/H/HR/HROGERS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= CORBA-ORBit-${PORTVERSION}
diff --git a/devel/p5-Object-Accessor/Makefile b/devel/p5-Object-Accessor/Makefile
index d444ce110cb7..1dd2b98ff057 100644
--- a/devel/p5-Object-Accessor/Makefile
+++ b/devel/p5-Object-Accessor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Object-Accessor
PORTVERSION= 0.32
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Object-Array/Makefile b/devel/p5-Object-Array/Makefile
index df1a498edb8f..de8866b5d397 100644
--- a/devel/p5-Object-Array/Makefile
+++ b/devel/p5-Object-Array/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Object-Array
PORTVERSION= 0.060
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Object-Declare/Makefile b/devel/p5-Object-Declare/Makefile
index da07d0ae75c6..724414e77fc6 100644
--- a/devel/p5-Object-Declare/Makefile
+++ b/devel/p5-Object-Declare/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Object-Declare
PORTVERSION= 0.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Object-Enum/Makefile b/devel/p5-Object-Enum/Makefile
index dcc6645f236f..96e7604d695c 100644
--- a/devel/p5-Object-Enum/Makefile
+++ b/devel/p5-Object-Enum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Object-Enum
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION}0
diff --git a/devel/p5-Object-MultiType/Makefile b/devel/p5-Object-MultiType/Makefile
index 953eb28e0ec7..e2e5f2a96d61 100644
--- a/devel/p5-Object-MultiType/Makefile
+++ b/devel/p5-Object-MultiType/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Object-MultiType
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Object-Signature/Makefile b/devel/p5-Object-Signature/Makefile
index e7856dd39431..c43bf98d1cc2 100644
--- a/devel/p5-Object-Signature/Makefile
+++ b/devel/p5-Object-Signature/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Object-Signature
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-P4-Client/Makefile b/devel/p5-P4-Client/Makefile
index c60b011005ee..60873dd32c8c 100644
--- a/devel/p5-P4-Client/Makefile
+++ b/devel/p5-P4-Client/Makefile
@@ -8,8 +8,7 @@
PORTNAME= P4-Client
PORTVERSION= 2.4319
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= P4
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-P4/Makefile b/devel/p5-P4/Makefile
index e7c64cd03aeb..ebc8519b1234 100644
--- a/devel/p5-P4/Makefile
+++ b/devel/p5-P4/Makefile
@@ -8,8 +8,7 @@
PORTNAME= P4
PORTVERSION= 1.4320
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= P4
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-PAR-Dist/Makefile b/devel/p5-PAR-Dist/Makefile
index e8041e31e8cd..08e49a6b9879 100644
--- a/devel/p5-PAR-Dist/Makefile
+++ b/devel/p5-PAR-Dist/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PAR-Dist
PORTVERSION= 0.29
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PAR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-PAR-Packer/Makefile b/devel/p5-PAR-Packer/Makefile
index b41de1d51848..b73f1e88cd95 100644
--- a/devel/p5-PAR-Packer/Makefile
+++ b/devel/p5-PAR-Packer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PAR-Packer
PORTVERSION= 0.97.8
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PAR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/.([0-9])$/\1/}
diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile
index 12859a73f8b2..9c2ccd16304d 100644
--- a/devel/p5-PAR/Makefile
+++ b/devel/p5-PAR/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PAR
PORTVERSION= 0.97.7
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PAR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/.([0-9])$/\1/}
diff --git a/devel/p5-POE-API-Hooks/Makefile b/devel/p5-POE-API-Hooks/Makefile
index 22100d77b8bb..6539694de868 100644
--- a/devel/p5-POE-API-Hooks/Makefile
+++ b/devel/p5-POE-API-Hooks/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-API-Hooks
PORTVERSION= 1.0500
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SU/SUNGO
+MASTER_SITES= CPAN
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-POE-API-Peek/Makefile b/devel/p5-POE-API-Peek/Makefile
index b9b2d52d0e1e..d9aa7151def7 100644
--- a/devel/p5-POE-API-Peek/Makefile
+++ b/devel/p5-POE-API-Peek/Makefile
@@ -9,8 +9,7 @@ PORTNAME= POE-API-Peek
PORTVERSION= 1.0802
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SU/SUNGO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/devel/p5-POE-Component-Child/Makefile b/devel/p5-POE-Component-Child/Makefile
index 0bd923baf0c9..7decfbd8ba3d 100644
--- a/devel/p5-POE-Component-Child/Makefile
+++ b/devel/p5-POE-Component-Child/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Child
PORTVERSION= 1.39
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-POE-Component-Daemon/Makefile b/devel/p5-POE-Component-Daemon/Makefile
index 3ff052637d7f..def5801f616a 100644
--- a/devel/p5-POE-Component-Daemon/Makefile
+++ b/devel/p5-POE-Component-Daemon/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Daemon
PORTVERSION= 0.1006
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-POE-Component-DebugShell/Makefile b/devel/p5-POE-Component-DebugShell/Makefile
index 3a71e411bc08..2b3e54d086eb 100644
--- a/devel/p5-POE-Component-DebugShell/Makefile
+++ b/devel/p5-POE-Component-DebugShell/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-DebugShell
PORTVERSION= 1.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-DirWatch/Makefile b/devel/p5-POE-Component-DirWatch/Makefile
index ca7ad1c4776d..66e1be9d0cb3 100644
--- a/devel/p5-POE-Component-DirWatch/Makefile
+++ b/devel/p5-POE-Component-DirWatch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-DirWatch
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-IKC/Makefile b/devel/p5-POE-Component-IKC/Makefile
index cdb380b91209..6e6e6e89da29 100644
--- a/devel/p5-POE-Component-IKC/Makefile
+++ b/devel/p5-POE-Component-IKC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-IKC
PORTVERSION= 0.1904
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/devel/p5-POE-Component-JobQueue/Makefile b/devel/p5-POE-Component-JobQueue/Makefile
index 191c169f7984..aa294caa5ce6 100644
--- a/devel/p5-POE-Component-JobQueue/Makefile
+++ b/devel/p5-POE-Component-JobQueue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-JobQueue
PORTVERSION= 0.5500
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/devel/p5-POE-Component-Logger/Makefile b/devel/p5-POE-Component-Logger/Makefile
index e9fb1bddac60..70454518b622 100644
--- a/devel/p5-POE-Component-Logger/Makefile
+++ b/devel/p5-POE-Component-Logger/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Logger
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-RSS/Makefile b/devel/p5-POE-Component-RSS/Makefile
index 3a25e765f2cf..cabc758b1968 100644
--- a/devel/p5-POE-Component-RSS/Makefile
+++ b/devel/p5-POE-Component-RSS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-RSS
PORTVERSION= 0.08
CATEGORIES= devel perl5 textproc
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-RSSAggregator/Makefile b/devel/p5-POE-Component-RSSAggregator/Makefile
index 5342e9155ccb..3fc9a0ae305a 100644
--- a/devel/p5-POE-Component-RSSAggregator/Makefile
+++ b/devel/p5-POE-Component-RSSAggregator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-RSSAggregator
PORTVERSION= 1.02.2
CATEGORIES= devel perl5 textproc
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
diff --git a/devel/p5-POE-Component-Server-XMLRPC/Makefile b/devel/p5-POE-Component-Server-XMLRPC/Makefile
index b7c3b46ab0ae..367263e23276 100644
--- a/devel/p5-POE-Component-Server-XMLRPC/Makefile
+++ b/devel/p5-POE-Component-Server-XMLRPC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Server-XMLRPC
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jesper@jdn.dk
diff --git a/devel/p5-POE-Component-TSTP/Makefile b/devel/p5-POE-Component-TSTP/Makefile
index ccd488286263..af485c830934 100644
--- a/devel/p5-POE-Component-TSTP/Makefile
+++ b/devel/p5-POE-Component-TSTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-TSTP
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-POE-Devel-Profiler/Makefile b/devel/p5-POE-Devel-Profiler/Makefile
index edf73b58bf07..dc5215d14044 100644
--- a/devel/p5-POE-Devel-Profiler/Makefile
+++ b/devel/p5-POE-Devel-Profiler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Devel-Profiler
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Exceptions/Makefile b/devel/p5-POE-Exceptions/Makefile
index d52d53a262d6..50ba0cef4fc0 100644
--- a/devel/p5-POE-Exceptions/Makefile
+++ b/devel/p5-POE-Exceptions/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Exceptions
PORTVERSION= 0.0502
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Session-MultiDispatch/Makefile b/devel/p5-POE-Session-MultiDispatch/Makefile
index cf89e8dad1e9..72c2dd56cf8b 100644
--- a/devel/p5-POE-Session-MultiDispatch/Makefile
+++ b/devel/p5-POE-Session-MultiDispatch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Session-MultiDispatch
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Stage/Makefile b/devel/p5-POE-Stage/Makefile
index 6e5570645645..e9b87092bf48 100644
--- a/devel/p5-POE-Stage/Makefile
+++ b/devel/p5-POE-Stage/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Stage
PORTVERSION= 0.0300
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RC/RCAPUTO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-0.03
diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index ddaab9af3357..952b3c917c98 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE
PORTVERSION= 0.9999
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POSIX-strptime/Makefile b/devel/p5-POSIX-strptime/Makefile
index 0230b6c6fbff..1ba5235668ba 100644
--- a/devel/p5-POSIX-strptime/Makefile
+++ b/devel/p5-POSIX-strptime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POSIX-strptime
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POSIX
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= douglas@douglasthrift.net
diff --git a/devel/p5-PPerl/Makefile b/devel/p5-PPerl/Makefile
index 5fd9b33fbbd1..e229e829d313 100644
--- a/devel/p5-PPerl/Makefile
+++ b/devel/p5-PPerl/Makefile
@@ -10,7 +10,7 @@ PORTNAME= PPerl
PORTVERSION= 0.25
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/M/MS/MSERGEANT
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 18fae9d182b6..e2641a984d53 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PV
PORTVERSION= 1.5
CATEGORIES= devel net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PV
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= PerlVision-${PORTVERSION}
diff --git a/devel/p5-Package-Constants/Makefile b/devel/p5-Package-Constants/Makefile
index e3e6e09efb8a..63b12902121a 100644
--- a/devel/p5-Package-Constants/Makefile
+++ b/devel/p5-Package-Constants/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Package-Constants
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/K/KA/KANE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-PadWalker/Makefile b/devel/p5-PadWalker/Makefile
index dcdd05b77b96..7f972ff60551 100644
--- a/devel/p5-PadWalker/Makefile
+++ b/devel/p5-PadWalker/Makefile
@@ -8,7 +8,7 @@
PORTNAME= PadWalker
PORTVERSION= 1.7
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROBIN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Parallel-ForkManager/Makefile b/devel/p5-Parallel-ForkManager/Makefile
index 4436a2c6a02f..37c20f4fed64 100644
--- a/devel/p5-Parallel-ForkManager/Makefile
+++ b/devel/p5-Parallel-ForkManager/Makefile
@@ -7,9 +7,8 @@
PORTNAME= Parallel-ForkManager
PORTVERSION= 0.7.5
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://hacks.dlux.hu/Parallel-ForkManager/download/
-MASTER_SITE_SUBDIR= Parallel
PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
diff --git a/devel/p5-Params-CallbackRequest/Makefile b/devel/p5-Params-CallbackRequest/Makefile
index d95374039d28..57280c66f7b5 100644
--- a/devel/p5-Params-CallbackRequest/Makefile
+++ b/devel/p5-Params-CallbackRequest/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Params-CallbackRequest
PORTVERSION= 1.17
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Params/DWHEELER
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Params-Coerce/Makefile b/devel/p5-Params-Coerce/Makefile
index f4d3ad7eb5f9..36d1c7045422 100644
--- a/devel/p5-Params-Coerce/Makefile
+++ b/devel/p5-Params-Coerce/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Params-Coerce
PORTVERSION= 0.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Params
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
diff --git a/devel/p5-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile
index 64e01b04ba6b..6cf6089be662 100644
--- a/devel/p5-Params-Validate/Makefile
+++ b/devel/p5-Params-Validate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Params-Validate
PORTVERSION= 0.89
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel/DROLSKY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= dsh@vlink.ru
diff --git a/devel/p5-Parse-PerlConfig/Makefile b/devel/p5-Parse-PerlConfig/Makefile
index 414080c52f61..0311bf9299e3 100644
--- a/devel/p5-Parse-PerlConfig/Makefile
+++ b/devel/p5-Parse-PerlConfig/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Parse-PerlConfig
PORTVERSION= 0.05
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pedersen@meridian-enviro.com
diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index fb60785b4f2c..9e15d05efa20 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Parse-RecDescent
PORTVERSION= 1.95.1
DISTVERSIONPREFIX= v
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Parse-Yapp/Makefile b/devel/p5-Parse-Yapp/Makefile
index 44170984e8c3..40dbf3e16d73 100644
--- a/devel/p5-Parse-Yapp/Makefile
+++ b/devel/p5-Parse-Yapp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Parse-Yapp
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lyngbol@wheel.dk
diff --git a/devel/p5-ParseLex/Makefile b/devel/p5-ParseLex/Makefile
index 7ddffa368e51..b71384bb3e9e 100644
--- a/devel/p5-ParseLex/Makefile
+++ b/devel/p5-ParseLex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ParseLex
PORTVERSION= 2.15
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@freebsd.org
diff --git a/devel/p5-PatchReader/Makefile b/devel/p5-PatchReader/Makefile
index d897b56a6f39..3ff90378da96 100644
--- a/devel/p5-PatchReader/Makefile
+++ b/devel/p5-PatchReader/Makefile
@@ -8,7 +8,7 @@
PORTNAME= PatchReader
PORTVERSION= 0.9.5
CATEGORIES= devel perl5
-MASTER_SITES=${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/J/JK/JKEISER
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Path-Class/Makefile b/devel/p5-Path-Class/Makefile
index c33f52c0ae12..9f3f43f54867 100644
--- a/devel/p5-Path-Class/Makefile
+++ b/devel/p5-Path-Class/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Path-Class
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/K/KW/KWILLIAMS/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/K/KW/KWILLIAMS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Penguin-Easy/Makefile b/devel/p5-Penguin-Easy/Makefile
index fad365b65cf7..a207b7583291 100644
--- a/devel/p5-Penguin-Easy/Makefile
+++ b/devel/p5-Penguin-Easy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Penguin-Easy
PORTVERSION= 1.1
CATEGORIES= devel security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Penguin
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Penguin/Makefile b/devel/p5-Penguin/Makefile
index 8ec19966aecc..f05ae5d3a63f 100644
--- a/devel/p5-Penguin/Makefile
+++ b/devel/p5-Penguin/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Penguin
PORTVERSION= 3.00
CATEGORIES= devel security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Penguin
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Perl6-Builtins/Makefile b/devel/p5-Perl6-Builtins/Makefile
index 222dd931d05a..00dffcc14ee2 100644
--- a/devel/p5-Perl6-Builtins/Makefile
+++ b/devel/p5-Perl6-Builtins/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Builtins
PORTVERSION= 0.0.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Perl6
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Perl6-Export-Attrs/Makefile b/devel/p5-Perl6-Export-Attrs/Makefile
index 336711d1294c..041109fe2fb7 100644
--- a/devel/p5-Perl6-Export-Attrs/Makefile
+++ b/devel/p5-Perl6-Export-Attrs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Export-Attrs
PORTVERSION= 0.0.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Perl6
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Perl6-Export/Makefile b/devel/p5-Perl6-Export/Makefile
index 1a0c22d16618..79ec28d49775 100644
--- a/devel/p5-Perl6-Export/Makefile
+++ b/devel/p5-Perl6-Export/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Export
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-Perl6-Form/Makefile b/devel/p5-Perl6-Form/Makefile
index 4ef582812cec..790d5c127d1a 100644
--- a/devel/p5-Perl6-Form/Makefile
+++ b/devel/p5-Perl6-Form/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Form
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-Perl6-Rules/Makefile b/devel/p5-Perl6-Rules/Makefile
index 551f82785c2a..c56bbfad2cb9 100644
--- a/devel/p5-Perl6-Rules/Makefile
+++ b/devel/p5-Perl6-Rules/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Rules
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Perl6
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-PerlIO-eol/Makefile b/devel/p5-PerlIO-eol/Makefile
index a7e507ae065b..847f96953695 100644
--- a/devel/p5-PerlIO-eol/Makefile
+++ b/devel/p5-PerlIO-eol/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PerlIO-eol
PORTVERSION= 0.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PerlIO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-PerlIO-via-MD5/Makefile b/devel/p5-PerlIO-via-MD5/Makefile
index 0dd91567941c..e0e894d9bdeb 100644
--- a/devel/p5-PerlIO-via-MD5/Makefile
+++ b/devel/p5-PerlIO-via-MD5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PerlIO-via-MD5
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PerlIO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-PerlIO-via-dynamic/Makefile b/devel/p5-PerlIO-via-dynamic/Makefile
index 4620e0beeb65..0c24c6cb73fb 100644
--- a/devel/p5-PerlIO-via-dynamic/Makefile
+++ b/devel/p5-PerlIO-via-dynamic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PerlIO-via-dynamic
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PerlIO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-PerlIO-via-symlink/Makefile b/devel/p5-PerlIO-via-symlink/Makefile
index 5e8f9b520f91..b426cccae9b8 100644
--- a/devel/p5-PerlIO-via-symlink/Makefile
+++ b/devel/p5-PerlIO-via-symlink/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PerlIO-via-symlink
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PerlIO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-PerlMenu/Makefile b/devel/p5-PerlMenu/Makefile
index c90228eb3bda..1a724b1dd3cb 100644
--- a/devel/p5-PerlMenu/Makefile
+++ b/devel/p5-PerlMenu/Makefile
@@ -8,7 +8,7 @@
PORTNAME= PerlMenu
PORTVERSION= 4.0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/S/SK/SKUNZ
PKGNAMEPREFIX= p5-
DISTNAME= perlmenu.v4.0
diff --git a/devel/p5-Pipeline/Makefile b/devel/p5-Pipeline/Makefile
index a0a6e866f8c0..7cd77b838bdf 100644
--- a/devel/p5-Pipeline/Makefile
+++ b/devel/p5-Pipeline/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Pipeline
PORTVERSION= 3.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RC/RCLAMP
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Pod-Tests/Makefile b/devel/p5-Pod-Tests/Makefile
index e5d0c271b317..dbb29788275c 100644
--- a/devel/p5-Pod-Tests/Makefile
+++ b/devel/p5-Pod-Tests/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Pod-Tests
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Proc-Background/Makefile b/devel/p5-Proc-Background/Makefile
index f7ab8ce9538e..f72eaedf8e28 100644
--- a/devel/p5-Proc-Background/Makefile
+++ b/devel/p5-Proc-Background/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-Background
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index f4f0efaaf880..5ff245b8cdb1 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-Daemon
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Proc-Fork/Makefile b/devel/p5-Proc-Fork/Makefile
index 3bd2491ca525..ccb1d1f09c50 100644
--- a/devel/p5-Proc-Fork/Makefile
+++ b/devel/p5-Proc-Fork/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-Fork
PORTVERSION= 0.61
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0$//}
diff --git a/devel/p5-Proc-PID-File/Makefile b/devel/p5-Proc-PID-File/Makefile
index 5fcf48541567..3147fc7db7ea 100644
--- a/devel/p5-Proc-PID-File/Makefile
+++ b/devel/p5-Proc-PID-File/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Proc-PID-File
PORTVERSION= 1.24
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Proc-PIDFile/Makefile b/devel/p5-Proc-PIDFile/Makefile
index 3ae11f143621..952375b4f6b0 100644
--- a/devel/p5-Proc-PIDFile/Makefile
+++ b/devel/p5-Proc-PIDFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-PIDFile
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Proc-PID_File-${PORTVERSION}
diff --git a/devel/p5-Proc-ProcessTable/Makefile b/devel/p5-Proc-ProcessTable/Makefile
index 2e005816556d..bd34073efc0d 100644
--- a/devel/p5-Proc-ProcessTable/Makefile
+++ b/devel/p5-Proc-ProcessTable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-ProcessTable
PORTVERSION= 0.42
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Proc-Queue/Makefile b/devel/p5-Proc-Queue/Makefile
index 7445be7e8fb9..e526a4788686 100644
--- a/devel/p5-Proc-Queue/Makefile
+++ b/devel/p5-Proc-Queue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-Queue
PORTVERSION= 1.23
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Proc-Reliable/Makefile b/devel/p5-Proc-Reliable/Makefile
index 3ba94e8ba672..2bf496208a59 100644
--- a/devel/p5-Proc-Reliable/Makefile
+++ b/devel/p5-Proc-Reliable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-Reliable
PORTVERSION= 1.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile
index f9b98536fb4b..628f1489a87a 100644
--- a/devel/p5-Project-Gantt/Makefile
+++ b/devel/p5-Project-Gantt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Project-Gantt
PORTVERSION= 1.03
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/A/AW/AWESTHOLM
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-RRDTool-OO/Makefile b/devel/p5-RRDTool-OO/Makefile
index f4899baa2762..2746707b1575 100644
--- a/devel/p5-RRDTool-OO/Makefile
+++ b/devel/p5-RRDTool-OO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RRDTool-OO
PORTVERSION= 0.21
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/M/MS/MSCHILLI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= stefan@fh-mainz.de
diff --git a/devel/p5-Rcs/Makefile b/devel/p5-Rcs/Makefile
index a1bfbf31fd46..6769c9ba45ea 100644
--- a/devel/p5-Rcs/Makefile
+++ b/devel/p5-Rcs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Rcs
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Rcs
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index ed2d6c683922..d53ec404af30 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ReadLine-Gnu
PORTVERSION= 1.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Term-${PORTNAME}-${PORTVERSION}
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
index b32cfbfdaf6c..05f7286e96ac 100644
--- a/devel/p5-ReadLine-Perl/Makefile
+++ b/devel/p5-ReadLine-Perl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ReadLine-Perl
PORTVERSION= 1.0302
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Term-${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/devel/p5-Readonly/Makefile b/devel/p5-Readonly/Makefile
index 52cdfa26bc3f..f209bda91ac1 100644
--- a/devel/p5-Readonly/Makefile
+++ b/devel/p5-Readonly/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Readonly
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROODE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-XS-${PORTVERSION_XS}${EXTRACT_SUFX}
diff --git a/devel/p5-Regexp-Assemble/Makefile b/devel/p5-Regexp-Assemble/Makefile
index ef69152ee299..8df274e9ccc8 100644
--- a/devel/p5-Regexp-Assemble/Makefile
+++ b/devel/p5-Regexp-Assemble/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Regexp-Assemble
PORTVERSION= 0.32
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Regexp-Bind/Makefile b/devel/p5-Regexp-Bind/Makefile
index 38192e622d8c..4150d51deb43 100644
--- a/devel/p5-Regexp-Bind/Makefile
+++ b/devel/p5-Regexp-Bind/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Regexp-Bind
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Regexp-Shellish/Makefile b/devel/p5-Regexp-Shellish/Makefile
index a38577b9b494..a2de15e6537f 100644
--- a/devel/p5-Regexp-Shellish/Makefile
+++ b/devel/p5-Regexp-Shellish/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Regexp-Shellish
PORTVERSION= 0.93
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Religion/Makefile b/devel/p5-Religion/Makefile
index 417d5ee60aa5..1625917b6526 100644
--- a/devel/p5-Religion/Makefile
+++ b/devel/p5-Religion/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Religion
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Religion
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-ResourcePool/Makefile b/devel/p5-ResourcePool/Makefile
index ae853ba95c4e..428b9e8f66d7 100644
--- a/devel/p5-ResourcePool/Makefile
+++ b/devel/p5-ResourcePool/Makefile
@@ -9,7 +9,7 @@
PORTNAME= ResourcePool
PORTVERSION= 1.0104
CATEGORIES= devel 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/devel/p5-Resources/Makefile b/devel/p5-Resources/Makefile
index aacdbd97d711..898adf140b70 100644
--- a/devel/p5-Resources/Makefile
+++ b/devel/p5-Resources/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Resources
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Resources
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-Return-Value/Makefile b/devel/p5-Return-Value/Makefile
index 61e3de9b5fea..1128fb209c49 100644
--- a/devel/p5-Return-Value/Makefile
+++ b/devel/p5-Return-Value/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Return-Value
PORTVERSION= 1.302
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RJ/RJBS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Rose-DateTime/Makefile b/devel/p5-Rose-DateTime/Makefile
index 89f02c8b3e1c..9ecf8a79d665 100644
--- a/devel/p5-Rose-DateTime/Makefile
+++ b/devel/p5-Rose-DateTime/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Rose-DateTime
PORTVERSION= 0.532
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Rose
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Rose-Object/Makefile b/devel/p5-Rose-Object/Makefile
index dd9adf5f7e90..c0fca9c0693c 100644
--- a/devel/p5-Rose-Object/Makefile
+++ b/devel/p5-Rose-Object/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Rose-Object
PORTVERSION= 0.840
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Rose
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/devel/p5-RunApp/Makefile b/devel/p5-RunApp/Makefile
index ad9073f1285b..9e28a0ce1a56 100644
--- a/devel/p5-RunApp/Makefile
+++ b/devel/p5-RunApp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= RunApp
PORTVERSION= 0.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-SNMP-Persist/Makefile b/devel/p5-SNMP-Persist/Makefile
index 4984e87c9bac..9b4df4d4481f 100644
--- a/devel/p5-SNMP-Persist/Makefile
+++ b/devel/p5-SNMP-Persist/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SNMP-Persist
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SNMP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jadawin@FreeBSD.org
diff --git a/devel/p5-SPOPS/Makefile b/devel/p5-SPOPS/Makefile
index 21df3c08990c..6469b6799b13 100644
--- a/devel/p5-SPOPS/Makefile
+++ b/devel/p5-SPOPS/Makefile
@@ -8,7 +8,7 @@
PORTNAME= SPOPS
PORTVERSION= 0.87
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/C/CW/CWINTERS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-SVN-ACL/Makefile b/devel/p5-SVN-ACL/Makefile
index c359b643099f..8971bd58c244 100644
--- a/devel/p5-SVN-ACL/Makefile
+++ b/devel/p5-SVN-ACL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-ACL
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/devel/p5-SVN-Access/Makefile b/devel/p5-SVN-Access/Makefile
index bca5d0184182..a705aa157468 100644
--- a/devel/p5-SVN-Access/Makefile
+++ b/devel/p5-SVN-Access/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Access
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= glarkin@sourcehosting.net
diff --git a/devel/p5-SVN-Agent/Makefile b/devel/p5-SVN-Agent/Makefile
index 8a4e9e4a2a57..591b3f0d55bc 100644
--- a/devel/p5-SVN-Agent/Makefile
+++ b/devel/p5-SVN-Agent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Agent
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-SVN-Log/Makefile b/devel/p5-SVN-Log/Makefile
index 17235a35a98c..f8cf95174fa5 100644
--- a/devel/p5-SVN-Log/Makefile
+++ b/devel/p5-SVN-Log/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Log
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-SVN-Mirror/Makefile b/devel/p5-SVN-Mirror/Makefile
index bacf124993f3..df00c47fecb5 100644
--- a/devel/p5-SVN-Mirror/Makefile
+++ b/devel/p5-SVN-Mirror/Makefile
@@ -9,8 +9,7 @@ PORTNAME= SVN-Mirror
PORTVERSION= 0.73
PORTREVISION= 0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-SVN-S4/Makefile b/devel/p5-SVN-S4/Makefile
index 1d5c9fac2cfa..164caf3211ff 100644
--- a/devel/p5-SVN-S4/Makefile
+++ b/devel/p5-SVN-S4/Makefile
@@ -9,8 +9,7 @@ PORTNAME= SVN-S4
PORTVERSION= 1.022
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-SVN-Simple/Makefile b/devel/p5-SVN-Simple/Makefile
index 7698ba7a46a9..277a7e86c6cd 100644
--- a/devel/p5-SVN-Simple/Makefile
+++ b/devel/p5-SVN-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Simple
PORTVERSION= 0.27
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-SVN-Statistics/Makefile b/devel/p5-SVN-Statistics/Makefile
index b7596b824d84..ea70425ad930 100644
--- a/devel/p5-SVN-Statistics/Makefile
+++ b/devel/p5-SVN-Statistics/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Statistics
PORTVERSION= 0.041
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-SVN-Web/Makefile b/devel/p5-SVN-Web/Makefile
index edc27fe15370..2728126c9307 100644
--- a/devel/p5-SVN-Web/Makefile
+++ b/devel/p5-SVN-Web/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Web
PORTVERSION= 0.53
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0$//}
diff --git a/devel/p5-Scalar-Listify/Makefile b/devel/p5-Scalar-Listify/Makefile
index fd2f2e526794..78fcb398fd0e 100644
--- a/devel/p5-Scalar-Listify/Makefile
+++ b/devel/p5-Scalar-Listify/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Scalar-Listify
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Scalar
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Scalar-Util-Clone/Makefile b/devel/p5-Scalar-Util-Clone/Makefile
index e628afeca8b5..d8aea7563db5 100644
--- a/devel/p5-Scalar-Util-Clone/Makefile
+++ b/devel/p5-Scalar-Util-Clone/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Scalar-Util-Clone
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Scalar
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Scope-Guard/Makefile b/devel/p5-Scope-Guard/Makefile
index 11aa8d5ed0d9..59cbe3361220 100644
--- a/devel/p5-Scope-Guard/Makefile
+++ b/devel/p5-Scope-Guard/Makefile
@@ -8,9 +8,8 @@
PORTNAME= Scope-Guard
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-#MASTER_SITE_SUBDIR= Scope
-MASTER_SITE_SUBDIR= ../by-authors/id/C/CH/CHOCOLATE
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../by-authors/id/C/CH/CHOCOLATE
PKGNAMEPREFIX= p5-
MAINTAINER= cmanley@xs4all.nl
diff --git a/devel/p5-Search-Binary/Makefile b/devel/p5-Search-Binary/Makefile
index 0577e385e2bd..f2709e7c238b 100644
--- a/devel/p5-Search-Binary/Makefile
+++ b/devel/p5-Search-Binary/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Search-Binary
PORTVERSION= 0.95
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Search
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Set-Array/Makefile b/devel/p5-Set-Array/Makefile
index 28d07b8b5788..9c57c398e3bf 100644
--- a/devel/p5-Set-Array/Makefile
+++ b/devel/p5-Set-Array/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Set-Array
PORTVERSION= 0.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RS/RSAVAGE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/devel/p5-Set-NestedGroups/Makefile b/devel/p5-Set-NestedGroups/Makefile
index 9b82e467b10a..f6d9c07b491a 100644
--- a/devel/p5-Set-NestedGroups/Makefile
+++ b/devel/p5-Set-NestedGroups/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Set-NestedGroups
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Set
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Set-Scalar/Makefile b/devel/p5-Set-Scalar/Makefile
index d4a2d17aa338..f675214fa847 100644
--- a/devel/p5-Set-Scalar/Makefile
+++ b/devel/p5-Set-Scalar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Set-Scalar
PORTVERSION= 1.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Set
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Shell-Base/Makefile b/devel/p5-Shell-Base/Makefile
index 7d08c268e44c..4f70009764cb 100644
--- a/devel/p5-Shell-Base/Makefile
+++ b/devel/p5-Shell-Base/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Shell-Base
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Shell
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= boumenot@gmail.com
diff --git a/devel/p5-Shell-EnvImporter/Makefile b/devel/p5-Shell-EnvImporter/Makefile
index 7bda753d45c9..affcd6a11138 100644
--- a/devel/p5-Shell-EnvImporter/Makefile
+++ b/devel/p5-Shell-EnvImporter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Shell-EnvImporter
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Shell
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mhjacks@swbell.net
diff --git a/devel/p5-Shell-Parser/Makefile b/devel/p5-Shell-Parser/Makefile
index 1817dadf5ee3..9d9f4e1efbc5 100644
--- a/devel/p5-Shell-Parser/Makefile
+++ b/devel/p5-Shell-Parser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Shell-Parser
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Shell
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Shell-Source/Makefile b/devel/p5-Shell-Source/Makefile
index e5529713e5be..bef33c5f47a9 100644
--- a/devel/p5-Shell-Source/Makefile
+++ b/devel/p5-Shell-Source/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Shell-Source
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Shell
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= timur@FreeBSD.org
diff --git a/devel/p5-Smart-Comments/Makefile b/devel/p5-Smart-Comments/Makefile
index 27dd7bb5b53e..0f8546539d33 100644
--- a/devel/p5-Smart-Comments/Makefile
+++ b/devel/p5-Smart-Comments/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Smart-Comments
PORTVERSION= 1.0.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/devel/p5-Sort-Array/Makefile b/devel/p5-Sort-Array/Makefile
index 4f850bea669e..aff046950e6c 100644
--- a/devel/p5-Sort-Array/Makefile
+++ b/devel/p5-Sort-Array/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Array
DISTVERSION= 0.26
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/devel/p5-Sort-ArrayOfArrays/Makefile b/devel/p5-Sort-ArrayOfArrays/Makefile
index 22edf8008046..15968a2486e9 100644
--- a/devel/p5-Sort-ArrayOfArrays/Makefile
+++ b/devel/p5-Sort-ArrayOfArrays/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-ArrayOfArrays
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Sort-Key-DateTime/Makefile b/devel/p5-Sort-Key-DateTime/Makefile
index eb63733ff32e..8ff0f2799c9c 100644
--- a/devel/p5-Sort-Key-DateTime/Makefile
+++ b/devel/p5-Sort-Key-DateTime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Key-DateTime
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Sort-Key/Makefile b/devel/p5-Sort-Key/Makefile
index d5a652774bdd..998ceee9f05d 100644
--- a/devel/p5-Sort-Key/Makefile
+++ b/devel/p5-Sort-Key/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Key
PORTVERSION= 1.28
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Sort-Tree/Makefile b/devel/p5-Sort-Tree/Makefile
index e3b52aedad71..de63857f7ebb 100644
--- a/devel/p5-Sort-Tree/Makefile
+++ b/devel/p5-Sort-Tree/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Tree
PORTVERSION= 1.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Sort-Versions/Makefile b/devel/p5-Sort-Versions/Makefile
index e1e168c013ba..1d5f0bab9ace 100644
--- a/devel/p5-Sort-Versions/Makefile
+++ b/devel/p5-Sort-Versions/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Versions
PORTVERSION= 1.5
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Spiffy/Makefile b/devel/p5-Spiffy/Makefile
index dc4cb8cf0416..71cd6d848640 100644
--- a/devel/p5-Spiffy/Makefile
+++ b/devel/p5-Spiffy/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Spiffy
PORTVERSION= 0.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Spoon/Makefile b/devel/p5-Spoon/Makefile
index 0f9f2b68fab5..378b8641d57c 100644
--- a/devel/p5-Spoon/Makefile
+++ b/devel/p5-Spoon/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Spoon
PORTVERSION= 0.24
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 6aba0b477146..6b5a4063542a 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Storable
PORTVERSION= 2.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Storable
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Stream/Makefile b/devel/p5-Stream/Makefile
index 51ed9268953e..115519fdcd57 100644
--- a/devel/p5-Stream/Makefile
+++ b/devel/p5-Stream/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Stream
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/G/GA/GARY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-String-Approx/Makefile b/devel/p5-String-Approx/Makefile
index 8f7b091bcd50..ebd89a8ae20a 100644
--- a/devel/p5-String-Approx/Makefile
+++ b/devel/p5-String-Approx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= String-Approx
PORTVERSION= 3.26
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-String-CRC32/Makefile b/devel/p5-String-CRC32/Makefile
index 30bd26f64e8a..ef387383777f 100644
--- a/devel/p5-String-CRC32/Makefile
+++ b/devel/p5-String-CRC32/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-CRC32
PORTVERSION= 1.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-String-Checker/Makefile b/devel/p5-String-Checker/Makefile
index 10b9b4f85981..fb058d1c2ca3 100644
--- a/devel/p5-String-Checker/Makefile
+++ b/devel/p5-String-Checker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Checker
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-String-LRC/Makefile b/devel/p5-String-LRC/Makefile
index 4996948e9f06..809e3b376ffb 100644
--- a/devel/p5-String-LRC/Makefile
+++ b/devel/p5-String-LRC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-LRC
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-String-Parity/Makefile b/devel/p5-String-Parity/Makefile
index 8362c7cf3d6e..5b7b3b9ee5d1 100644
--- a/devel/p5-String-Parity/Makefile
+++ b/devel/p5-String-Parity/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Parity
PORTVERSION= 1.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-String-Random/Makefile b/devel/p5-String-Random/Makefile
index 11640f50af01..807f20d8e6c2 100644
--- a/devel/p5-String-Random/Makefile
+++ b/devel/p5-String-Random/Makefile
@@ -9,8 +9,7 @@ PORTNAME= String-Random
PORTVERSION= 0.22
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-String-RexxParse/Makefile b/devel/p5-String-RexxParse/Makefile
index c81d21400ddf..718549fd7889 100644
--- a/devel/p5-String-RexxParse/Makefile
+++ b/devel/p5-String-RexxParse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-RexxParse
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-String-Similarity/Makefile b/devel/p5-String-Similarity/Makefile
index ca19e3c4e503..17052f3ed9a6 100644
--- a/devel/p5-String-Similarity/Makefile
+++ b/devel/p5-String-Similarity/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Similarity
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kevlo@FreeBSD.org
diff --git a/devel/p5-Sub-Installer/Makefile b/devel/p5-Sub-Installer/Makefile
index ca6d1bcfa706..76cd636edf5a 100644
--- a/devel/p5-Sub-Installer/Makefile
+++ b/devel/p5-Sub-Installer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sub-Installer
PORTVERSION= 0.0.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sub
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/devel/p5-Sub-Name/Makefile b/devel/p5-Sub-Name/Makefile
index 3e05d9f90640..9533a905a101 100644
--- a/devel/p5-Sub-Name/Makefile
+++ b/devel/p5-Sub-Name/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sub-Name
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sub
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Sub-Override/Makefile b/devel/p5-Sub-Override/Makefile
index b881f4e40eac..d5264e9d6ffa 100644
--- a/devel/p5-Sub-Override/Makefile
+++ b/devel/p5-Sub-Override/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sub-Override
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sub
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lars.eggert@gmx.net
diff --git a/devel/p5-Sub-WrapPackages/Makefile b/devel/p5-Sub-WrapPackages/Makefile
index b62382401d7d..323cca195e6b 100644
--- a/devel/p5-Sub-WrapPackages/Makefile
+++ b/devel/p5-Sub-WrapPackages/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sub-WrapPackages
PORTVERSION= 1.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sub
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hartzell@alerce.com
diff --git a/devel/p5-Sys-Mmap/Makefile b/devel/p5-Sys-Mmap/Makefile
index f1416af938d6..09a66846dbda 100644
--- a/devel/p5-Sys-Mmap/Makefile
+++ b/devel/p5-Sys-Mmap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-Mmap
PORTVERSION= 0.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Sys-Sig/Makefile b/devel/p5-Sys-Sig/Makefile
index db73ccfe7f39..3cf5311214c9 100644
--- a/devel/p5-Sys-Sig/Makefile
+++ b/devel/p5-Sys-Sig/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-Sig
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Sys-SigAction/Makefile b/devel/p5-Sys-SigAction/Makefile
index 021e0a85c80f..2d8afe819ff1 100644
--- a/devel/p5-Sys-SigAction/Makefile
+++ b/devel/p5-Sys-SigAction/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-SigAction
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= svysh@cryptocom.ru
diff --git a/devel/p5-System2/Makefile b/devel/p5-System2/Makefile
index 83ceb8eba385..4b01a980f529 100644
--- a/devel/p5-System2/Makefile
+++ b/devel/p5-System2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= System2
PORTVERSION= 0.84
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= System2
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Taint-Runtime/Makefile b/devel/p5-Taint-Runtime/Makefile
index 651e550db052..19bf6094a4f3 100644
--- a/devel/p5-Taint-Runtime/Makefile
+++ b/devel/p5-Taint-Runtime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Taint-Runtime
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Taint
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-ANSIColor/Makefile b/devel/p5-Term-ANSIColor/Makefile
index dfb30bb70475..1d0c6118ad02 100644
--- a/devel/p5-Term-ANSIColor/Makefile
+++ b/devel/p5-Term-ANSIColor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-ANSIColor
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ANSIColor-${PORTVERSION}
diff --git a/devel/p5-Term-ANSIScreen/Makefile b/devel/p5-Term-ANSIScreen/Makefile
index 9c3f4b805614..73b54e4e84d6 100644
--- a/devel/p5-Term-ANSIScreen/Makefile
+++ b/devel/p5-Term-ANSIScreen/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-ANSIScreen
PORTVERSION= 1.42
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Term-Animation/Makefile b/devel/p5-Term-Animation/Makefile
index f00afe919229..d318d4c7552f 100644
--- a/devel/p5-Term-Animation/Makefile
+++ b/devel/p5-Term-Animation/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Animation
PORTVERSION= 2.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fjoe@FreeBSD.org
diff --git a/devel/p5-Term-CallEditor/Makefile b/devel/p5-Term-CallEditor/Makefile
index 2934ece00840..c3092608e44d 100644
--- a/devel/p5-Term-CallEditor/Makefile
+++ b/devel/p5-Term-CallEditor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-CallEditor
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-Encoding/Makefile b/devel/p5-Term-Encoding/Makefile
index 64221ad36384..ef7559515ab6 100644
--- a/devel/p5-Term-Encoding/Makefile
+++ b/devel/p5-Term-Encoding/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Encoding
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Term-ProgressBar/Makefile b/devel/p5-Term-ProgressBar/Makefile
index 8f295f91c6dd..cb8c3391b1ce 100644
--- a/devel/p5-Term-ProgressBar/Makefile
+++ b/devel/p5-Term-ProgressBar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-ProgressBar
PORTVERSION= 2.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/F/FL/FLUFFY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-Prompt/Makefile b/devel/p5-Term-Prompt/Makefile
index 5254d3c28226..6f03a428232d 100644
--- a/devel/p5-Term-Prompt/Makefile
+++ b/devel/p5-Term-Prompt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Prompt
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index a9a45ed964bb..6a3167e7f29d 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Query
PORTVERSION= 2.0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index a09e14d16641..87a422a3af42 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-ReadKey
PORTVERSION= 2.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= TermReadKey-${PORTVERSION}
diff --git a/devel/p5-Term-ReadLine-Zoid/Makefile b/devel/p5-Term-ReadLine-Zoid/Makefile
index 60b7fc1f9e34..2ec244f7d949 100644
--- a/devel/p5-Term-ReadLine-Zoid/Makefile
+++ b/devel/p5-Term-ReadLine-Zoid/Makefile
@@ -9,9 +9,8 @@
PORTNAME= Term-ReadLine-Zoid
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://zoidberg.student.utwente.nl/downloads/Term-ReadLine-Zoid/
-MASTER_SITE_SUBDIR= Term
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-Screen/Makefile b/devel/p5-Term-Screen/Makefile
index af1ea209a56d..da947eb49f33 100644
--- a/devel/p5-Term-Screen/Makefile
+++ b/devel/p5-Term-Screen/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Screen
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Term-Shell/Makefile b/devel/p5-Term-Shell/Makefile
index c49f3abe7bde..6eb649e45e59 100644
--- a/devel/p5-Term-Shell/Makefile
+++ b/devel/p5-Term-Shell/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Term-Shell
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-Size/Makefile b/devel/p5-Term-Size/Makefile
index e81aa2841ef9..4c2207e69259 100644
--- a/devel/p5-Term-Size/Makefile
+++ b/devel/p5-Term-Size/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Size
PORTVERSION= 0.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= brad@kazrak.com
diff --git a/devel/p5-Term-UI/Makefile b/devel/p5-Term-UI/Makefile
index 9d2dba1339cf..b7c1df3c6b7e 100644
--- a/devel/p5-Term-UI/Makefile
+++ b/devel/p5-Term-UI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-UI
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Test-Benchmark/Makefile b/devel/p5-Test-Benchmark/Makefile
index 8f0c07bb5372..13f8752afda6 100644
--- a/devel/p5-Test-Benchmark/Makefile
+++ b/devel/p5-Test-Benchmark/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Benchmark
PORTVERSION= 0.004
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Test-Differences/Makefile b/devel/p5-Test-Differences/Makefile
index ab29f035e466..69b8ec5f89d0 100644
--- a/devel/p5-Test-Differences/Makefile
+++ b/devel/p5-Test-Differences/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Differences
PORTVERSION= 0.47
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Test-Expect/Makefile b/devel/p5-Test-Expect/Makefile
index 148d93d5f4b7..727c7e548edd 100644
--- a/devel/p5-Test-Expect/Makefile
+++ b/devel/p5-Test-Expect/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Expect
PORTVERSION= 0.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Test-File-Contents/Makefile b/devel/p5-Test-File-Contents/Makefile
index bb78a77e27c7..45947f955e5e 100644
--- a/devel/p5-Test-File-Contents/Makefile
+++ b/devel/p5-Test-File-Contents/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-File-Contents
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-HTML-Tidy/Makefile b/devel/p5-Test-HTML-Tidy/Makefile
index 05fac48bfbdb..f0f564a9af74 100644
--- a/devel/p5-Test-HTML-Tidy/Makefile
+++ b/devel/p5-Test-HTML-Tidy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-HTML-Tidy
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-Test-HasVersion/Makefile b/devel/p5-Test-HasVersion/Makefile
index 214b0f6f928f..7e989c72a242 100644
--- a/devel/p5-Test-HasVersion/Makefile
+++ b/devel/p5-Test-HasVersion/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-HasVersion
PORTVERSION= 0.01.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/F/FE/FERREIRA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-0.012
diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile
index 8e5212e31c07..38c1ac7f0527 100644
--- a/devel/p5-Test-Inline/Makefile
+++ b/devel/p5-Test-Inline/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Inline
PORTVERSION= 2.208
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Test-LongString/Makefile b/devel/p5-Test-LongString/Makefile
index f9ce8f3b6e4d..1a025ac53044 100644
--- a/devel/p5-Test-LongString/Makefile
+++ b/devel/p5-Test-LongString/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-LongString
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fbsdports@commit.it
diff --git a/devel/p5-Test-MockModule/Makefile b/devel/p5-Test-MockModule/Makefile
index 34ef6329de1f..3603539dfefa 100644
--- a/devel/p5-Test-MockModule/Makefile
+++ b/devel/p5-Test-MockModule/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-MockModule
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-MockObject/Makefile b/devel/p5-Test-MockObject/Makefile
index 73f37c50d4d4..e581b7eec8dc 100644
--- a/devel/p5-Test-MockObject/Makefile
+++ b/devel/p5-Test-MockObject/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-MockObject
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Test-MockTime/Makefile b/devel/p5-Test-MockTime/Makefile
index 582880c369c7..7c18fa55d4db 100644
--- a/devel/p5-Test-MockTime/Makefile
+++ b/devel/p5-Test-MockTime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-MockTime
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= timur@FreeBSD.org
diff --git a/devel/p5-Test-NoWarnings/Makefile b/devel/p5-Test-NoWarnings/Makefile
index 74da915b4fe5..3c42744e0458 100644
--- a/devel/p5-Test-NoWarnings/Makefile
+++ b/devel/p5-Test-NoWarnings/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-NoWarnings
PORTVERSION= 0.083
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= alex@kapranoff.ru
diff --git a/devel/p5-Test-Number-Delta/Makefile b/devel/p5-Test-Number-Delta/Makefile
index 32cb02b728ea..26423853d586 100644
--- a/devel/p5-Test-Number-Delta/Makefile
+++ b/devel/p5-Test-Number-Delta/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Number-Delta
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/devel/p5-Test-Output/Makefile b/devel/p5-Test-Output/Makefile
index ed101e9fddb9..0bc834b63363 100644
--- a/devel/p5-Test-Output/Makefile
+++ b/devel/p5-Test-Output/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Output
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Test-Pod-Coverage/Makefile b/devel/p5-Test-Pod-Coverage/Makefile
index b0e07fffcce6..2a72b6e17a96 100644
--- a/devel/p5-Test-Pod-Coverage/Makefile
+++ b/devel/p5-Test-Pod-Coverage/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Pod-Coverage
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-Pod/Makefile b/devel/p5-Test-Pod/Makefile
index cd539b86e211..0931e7f0c18f 100644
--- a/devel/p5-Test-Pod/Makefile
+++ b/devel/p5-Test-Pod/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Pod
PORTVERSION= 1.26
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-RandomResults/Makefile b/devel/p5-Test-RandomResults/Makefile
index ad95b3f670ec..4ef09bac96f3 100644
--- a/devel/p5-Test-RandomResults/Makefile
+++ b/devel/p5-Test-RandomResults/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-RandomResults
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Test-Singleton/Makefile b/devel/p5-Test-Singleton/Makefile
index a34e35e281ff..c35f02b5a1b3 100644
--- a/devel/p5-Test-Singleton/Makefile
+++ b/devel/p5-Test-Singleton/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Test-Singleton
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TP/TPG
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Test-Strict/Makefile b/devel/p5-Test-Strict/Makefile
index a0783804cf7e..9f9aade9aae2 100644
--- a/devel/p5-Test-Strict/Makefile
+++ b/devel/p5-Test-Strict/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Strict
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Test-TAP-HTMLMatrix/Makefile b/devel/p5-Test-TAP-HTMLMatrix/Makefile
index f2efc6b73db0..658c33207785 100644
--- a/devel/p5-Test-TAP-HTMLMatrix/Makefile
+++ b/devel/p5-Test-TAP-HTMLMatrix/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-TAP-HTMLMatrix
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Test-TAP-Model/Makefile b/devel/p5-Test-TAP-Model/Makefile
index f4a4f9dc3aed..ce9500842b04 100644
--- a/devel/p5-Test-TAP-Model/Makefile
+++ b/devel/p5-Test-TAP-Model/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-TAP-Model
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Test-Unit/Makefile b/devel/p5-Test-Unit/Makefile
index 5968be4e98cb..d7be2191f5d8 100644
--- a/devel/p5-Test-Unit/Makefile
+++ b/devel/p5-Test-Unit/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Unit
PORTVERSION= 0.25
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Test-Warn/Makefile b/devel/p5-Test-Warn/Makefile
index 1ad08b2d70f7..b4fc04d54d08 100644
--- a/devel/p5-Test-Warn/Makefile
+++ b/devel/p5-Test-Warn/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Warn
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-XML/Makefile b/devel/p5-Test-XML/Makefile
index 49454a5e618f..bbeb7ca86150 100644
--- a/devel/p5-Test-XML/Makefile
+++ b/devel/p5-Test-XML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-XML
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-use-ok/Makefile b/devel/p5-Test-use-ok/Makefile
index 5e5d9ad11fa4..5bd16661b19c 100644
--- a/devel/p5-Test-use-ok/Makefile
+++ b/devel/p5-Test-use-ok/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-use-ok
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Text-LevenshteinXS/Makefile b/devel/p5-Text-LevenshteinXS/Makefile
index 14bc646fefb0..03ee9dd65232 100644
--- a/devel/p5-Text-LevenshteinXS/Makefile
+++ b/devel/p5-Text-LevenshteinXS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-LevenshteinXS
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= christian@karg.org
diff --git a/devel/p5-Text-vFile-asData/Makefile b/devel/p5-Text-vFile-asData/Makefile
index 6f51416ea1e6..5f73d4e42bf6 100644
--- a/devel/p5-Text-vFile-asData/Makefile
+++ b/devel/p5-Text-vFile-asData/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Text-vFile-asData
PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RC/RCLAMP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Thread-Apartment/Makefile b/devel/p5-Thread-Apartment/Makefile
index 8a8f48107ca1..74740a2f35c9 100644
--- a/devel/p5-Thread-Apartment/Makefile
+++ b/devel/p5-Thread-Apartment/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Thread-Apartment
PORTVERSION= 0.51
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Thread
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/devel/p5-Thread-Pool-Simple/Makefile b/devel/p5-Thread-Pool-Simple/Makefile
index ace29019ea1b..5e0c2b35708f 100644
--- a/devel/p5-Thread-Pool-Simple/Makefile
+++ b/devel/p5-Thread-Pool-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Thread-Pool-Simple
PORTVERSION= 0.23
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Thread
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Thread-Queue-Duplex/Makefile b/devel/p5-Thread-Queue-Duplex/Makefile
index 91676d74dc9d..bfa5aa015cbf 100644
--- a/devel/p5-Thread-Queue-Duplex/Makefile
+++ b/devel/p5-Thread-Queue-Duplex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Thread-Queue-Duplex
PORTVERSION= 0.92
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Thread
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/devel/p5-Tie-Array-Pack/Makefile b/devel/p5-Tie-Array-Pack/Makefile
index d67a3171bc81..b394bbbf2994 100644
--- a/devel/p5-Tie-Array-Pack/Makefile
+++ b/devel/p5-Tie-Array-Pack/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Array-Pack
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kaoru@kaisei.org
diff --git a/devel/p5-Tie-Array-Sorted/Makefile b/devel/p5-Tie-Array-Sorted/Makefile
index a03191cb82c8..3cd7fb24c33d 100644
--- a/devel/p5-Tie-Array-Sorted/Makefile
+++ b/devel/p5-Tie-Array-Sorted/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Array-Sorted
PORTVERSION= 1.4.1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
diff --git a/devel/p5-Tie-CPHash/Makefile b/devel/p5-Tie-CPHash/Makefile
index 5d6a2018f7d7..44a790c2db54 100644
--- a/devel/p5-Tie-CPHash/Makefile
+++ b/devel/p5-Tie-CPHash/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tie-CPHash
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= direct@klatha.com
diff --git a/devel/p5-Tie-Cache/Makefile b/devel/p5-Tie-Cache/Makefile
index 0f7a219158ca..a20767d792f8 100644
--- a/devel/p5-Tie-Cache/Makefile
+++ b/devel/p5-Tie-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Cache
PORTVERSION= 0.17
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Tie-DB_File-SplitHash/Makefile b/devel/p5-Tie-DB_File-SplitHash/Makefile
index 2379430121bc..886d553aacfd 100644
--- a/devel/p5-Tie-DB_File-SplitHash/Makefile
+++ b/devel/p5-Tie-DB_File-SplitHash/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-DB_File-SplitHash
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Tie-DB_FileLock/Makefile b/devel/p5-Tie-DB_FileLock/Makefile
index f309f6ac6dbc..a7c4c8a5e2b1 100644
--- a/devel/p5-Tie-DB_FileLock/Makefile
+++ b/devel/p5-Tie-DB_FileLock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-DB_FileLock
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= josh@zipperup.org
diff --git a/devel/p5-Tie-FileLRUCache/Makefile b/devel/p5-Tie-FileLRUCache/Makefile
index c6199a30f79d..e452343535be 100644
--- a/devel/p5-Tie-FileLRUCache/Makefile
+++ b/devel/p5-Tie-FileLRUCache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-FileLRUCache
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Tie-Hash-Indexed/Makefile b/devel/p5-Tie-Hash-Indexed/Makefile
index 3ff60a0722c3..e9ceae63a8f9 100644
--- a/devel/p5-Tie-Hash-Indexed/Makefile
+++ b/devel/p5-Tie-Hash-Indexed/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Hash-Indexed
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Tie-Hash-Regex/Makefile b/devel/p5-Tie-Hash-Regex/Makefile
index eef417650937..538aebc2a331 100644
--- a/devel/p5-Tie-Hash-Regex/Makefile
+++ b/devel/p5-Tie-Hash-Regex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Hash-Regex
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tie-Hash-Sorted/Makefile b/devel/p5-Tie-Hash-Sorted/Makefile
index 6cb369e8ad8d..26af7c16582e 100644
--- a/devel/p5-Tie-Hash-Sorted/Makefile
+++ b/devel/p5-Tie-Hash-Sorted/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Hash-Sorted
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Tie-Hash-TwoWay/Makefile b/devel/p5-Tie-Hash-TwoWay/Makefile
index 49b59ac460f5..3d8020115e1e 100644
--- a/devel/p5-Tie-Hash-TwoWay/Makefile
+++ b/devel/p5-Tie-Hash-TwoWay/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Hash-TwoWay
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Tie-IxHash/Makefile b/devel/p5-Tie-IxHash/Makefile
index 2385ea3f69a7..39352d486681 100644
--- a/devel/p5-Tie-IxHash/Makefile
+++ b/devel/p5-Tie-IxHash/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-IxHash
PORTVERSION= 1.21
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Tie-Restore/Makefile b/devel/p5-Tie-Restore/Makefile
index d3ce9fe84f90..00e6917626ac 100644
--- a/devel/p5-Tie-Restore/Makefile
+++ b/devel/p5-Tie-Restore/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Restore
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/devel/p5-Tie-ShareLite/Makefile b/devel/p5-Tie-ShareLite/Makefile
index 27f433124486..a9b499545ff5 100644
--- a/devel/p5-Tie-ShareLite/Makefile
+++ b/devel/p5-Tie-ShareLite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-ShareLite
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jnlin@csie.nctu.edu.tw
diff --git a/devel/p5-Tie-Simple/Makefile b/devel/p5-Tie-Simple/Makefile
index 5c28f999b91b..e6e750900958 100644
--- a/devel/p5-Tie-Simple/Makefile
+++ b/devel/p5-Tie-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Simple
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Time-Clock/Makefile b/devel/p5-Time-Clock/Makefile
index 6b5076ec8b5a..5a2d8402dd51 100644
--- a/devel/p5-Time-Clock/Makefile
+++ b/devel/p5-Time-Clock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Clock
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Time-Duration/Makefile b/devel/p5-Time-Duration/Makefile
index c85a29d26822..9a6c5863ef20 100644
--- a/devel/p5-Time-Duration/Makefile
+++ b/devel/p5-Time-Duration/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Duration
PORTVERSION= 1.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 1489f2f1345f..adf9b89396ce 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Time-HiRes
PORTVERSION= 1.9712
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Time-Interval/Makefile b/devel/p5-Time-Interval/Makefile
index a0dbad2a8142..bb0e95e5f170 100644
--- a/devel/p5-Time-Interval/Makefile
+++ b/devel/p5-Time-Interval/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Interval
PORTVERSION= 1.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Time-Object/Makefile b/devel/p5-Time-Object/Makefile
index 9281208c1714..d6f6f79f35d8 100644
--- a/devel/p5-Time-Object/Makefile
+++ b/devel/p5-Time-Object/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Time-Object
PORTVERSION= 1.00
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Time-Period/Makefile b/devel/p5-Time-Period/Makefile
index 2a718a626f96..fa208eaccd2e 100644
--- a/devel/p5-Time-Period/Makefile
+++ b/devel/p5-Time-Period/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Period
PORTVERSION= 1.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Period-${PORTVERSION}
diff --git a/devel/p5-Time-Piece-Range/Makefile b/devel/p5-Time-Piece-Range/Makefile
index 205dcdc39ef4..2f949746128e 100644
--- a/devel/p5-Time-Piece-Range/Makefile
+++ b/devel/p5-Time-Piece-Range/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Piece-Range
PORTVERSION= 1.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Time-Piece/Makefile b/devel/p5-Time-Piece/Makefile
index 4d06533400ac..0679570b05d1 100644
--- a/devel/p5-Time-Piece/Makefile
+++ b/devel/p5-Time-Piece/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Piece
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Time-Progress/Makefile b/devel/p5-Time-Progress/Makefile
index 2573724fb37e..110245292c9a 100644
--- a/devel/p5-Time-Progress/Makefile
+++ b/devel/p5-Time-Progress/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Progress
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Time-Stopwatch/Makefile b/devel/p5-Time-Stopwatch/Makefile
index b649d3c22ac4..8968fe0d0694 100644
--- a/devel/p5-Time-Stopwatch/Makefile
+++ b/devel/p5-Time-Stopwatch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Stopwatch
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= madis555@hot.ee
diff --git a/devel/p5-Time-modules/Makefile b/devel/p5-Time-modules/Makefile
index db4e78ef421c..bfcec7b7bffe 100644
--- a/devel/p5-Time-modules/Makefile
+++ b/devel/p5-Time-modules/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-modules
PORTVERSION= 2006.0814
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index bb09c17cb2e7..e9b052908bc7 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -9,8 +9,7 @@ PORTNAME= TimeDate
PORTVERSION= 1.16
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-TraceFuncs/Makefile b/devel/p5-TraceFuncs/Makefile
index 19a74ff4ac6a..f8bd4f9907d8 100644
--- a/devel/p5-TraceFuncs/Makefile
+++ b/devel/p5-TraceFuncs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= TraceFuncs
PORTVERSION= 0.1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= traceFunc-${PORTVERSION}
diff --git a/devel/p5-Tree-Binary-Dictionary/Makefile b/devel/p5-Tree-Binary-Dictionary/Makefile
index b35c3dd14b11..a80e8d9a17c9 100644
--- a/devel/p5-Tree-Binary-Dictionary/Makefile
+++ b/devel/p5-Tree-Binary-Dictionary/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Binary-Dictionary
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Binary/Makefile b/devel/p5-Tree-Binary/Makefile
index 50e6b3747847..5b71a8155578 100644
--- a/devel/p5-Tree-Binary/Makefile
+++ b/devel/p5-Tree-Binary/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Binary
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Node/Makefile b/devel/p5-Tree-Node/Makefile
index 4b18ac29fc57..4e04f6b350a0 100644
--- a/devel/p5-Tree-Node/Makefile
+++ b/devel/p5-Tree-Node/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Node
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Parser/Makefile b/devel/p5-Tree-Parser/Makefile
index a70509a34f92..0f33c07479fe 100644
--- a/devel/p5-Tree-Parser/Makefile
+++ b/devel/p5-Tree-Parser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Parser
PORTVERSION= 0.15
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Simple-View/Makefile b/devel/p5-Tree-Simple-View/Makefile
index edf6925261e5..7c6b92fe75b0 100644
--- a/devel/p5-Tree-Simple-View/Makefile
+++ b/devel/p5-Tree-Simple-View/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Simple-View
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Simple-VisitorFactory/Makefile b/devel/p5-Tree-Simple-VisitorFactory/Makefile
index 33b1449ed25e..a8ac323b73b1 100644
--- a/devel/p5-Tree-Simple-VisitorFactory/Makefile
+++ b/devel/p5-Tree-Simple-VisitorFactory/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Simple-VisitorFactory
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Simple/Makefile b/devel/p5-Tree-Simple/Makefile
index b0b1316a54b6..2ac8a3d65ad1 100644
--- a/devel/p5-Tree-Simple/Makefile
+++ b/devel/p5-Tree-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Simple
PORTVERSION= 1.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-UI-Dialog/Makefile b/devel/p5-UI-Dialog/Makefile
index a74083a7be7e..642da90cf39a 100644
--- a/devel/p5-UI-Dialog/Makefile
+++ b/devel/p5-UI-Dialog/Makefile
@@ -8,7 +8,7 @@
PORTNAME= UI-Dialog
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/K/KC/KCK
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-UNIVERSAL-can/Makefile b/devel/p5-UNIVERSAL-can/Makefile
index 0da04b798fb4..241ed5c045d8 100644
--- a/devel/p5-UNIVERSAL-can/Makefile
+++ b/devel/p5-UNIVERSAL-can/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UNIVERSAL-can
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/C/CH/CHROMATIC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-UNIVERSAL-isa/Makefile b/devel/p5-UNIVERSAL-isa/Makefile
index dc185bdf2dd1..e35c39281422 100644
--- a/devel/p5-UNIVERSAL-isa/Makefile
+++ b/devel/p5-UNIVERSAL-isa/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UNIVERSAL-isa
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/C/CH/CHROMATIC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-UNIVERSAL-moniker/Makefile b/devel/p5-UNIVERSAL-moniker/Makefile
index f3026a322843..93b7ac7c103b 100644
--- a/devel/p5-UNIVERSAL-moniker/Makefile
+++ b/devel/p5-UNIVERSAL-moniker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UNIVERSAL-moniker
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= UNIVERSAL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-UNIVERSAL-require/Makefile b/devel/p5-UNIVERSAL-require/Makefile
index 488d05247ccd..fd163d46e1bc 100644
--- a/devel/p5-UNIVERSAL-require/Makefile
+++ b/devel/p5-UNIVERSAL-require/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UNIVERSAL-require
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/M/MS/MSCHWERN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-UNIVERSAL-which/Makefile b/devel/p5-UNIVERSAL-which/Makefile
index f6d058da9e60..fc7bfd9a7055 100644
--- a/devel/p5-UNIVERSAL-which/Makefile
+++ b/devel/p5-UNIVERSAL-which/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UNIVERSAL-which
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= UNIVERSAL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Unix-Statgrab/Makefile b/devel/p5-Unix-Statgrab/Makefile
index 7b8ebd2fead9..0809fa969ddb 100644
--- a/devel/p5-Unix-Statgrab/Makefile
+++ b/devel/p5-Unix-Statgrab/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Unix-Statgrab
PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unix
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tdb@FreeBSD.org
diff --git a/devel/p5-VCP-Dest-svk/Makefile b/devel/p5-VCP-Dest-svk/Makefile
index 32db078ca56d..e3b860d8141d 100644
--- a/devel/p5-VCP-Dest-svk/Makefile
+++ b/devel/p5-VCP-Dest-svk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= VCP-Dest-svk
PORTVERSION= 0.29
PORTREVISION= 0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-VCP-Source-cvsbk/Makefile b/devel/p5-VCP-Source-cvsbk/Makefile
index f64aded53dc0..7c26d72d6d12 100644
--- a/devel/p5-VCP-Source-cvsbk/Makefile
+++ b/devel/p5-VCP-Source-cvsbk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= VCP-Source-cvsbk
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-VCP-autrijus/Makefile b/devel/p5-VCP-autrijus/Makefile
index 86300c056780..ec7246171459 100644
--- a/devel/p5-VCP-autrijus/Makefile
+++ b/devel/p5-VCP-autrijus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= VCP
PORTVERSION= 0.9.20050110
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AU/AUTRIJUS
PKGNAMEPREFIX= p5-
PKGNAMESUFFIX= -autrijus
diff --git a/devel/p5-VCS/Makefile b/devel/p5-VCS/Makefile
index 04406064b1b4..00cca7c4cd51 100644
--- a/devel/p5-VCS/Makefile
+++ b/devel/p5-VCS/Makefile
@@ -9,8 +9,7 @@ PORTNAME= VCS
PORTVERSION= 0.14
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= VCS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Want/Makefile b/devel/p5-Want/Makefile
index f820f6c3fd4b..8a7d0210fa8e 100644
--- a/devel/p5-Want/Makefile
+++ b/devel/p5-Want/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Want
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROBIN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-WeakRef/Makefile b/devel/p5-WeakRef/Makefile
index 2f110643aeec..99162d5bf9ec 100644
--- a/devel/p5-WeakRef/Makefile
+++ b/devel/p5-WeakRef/Makefile
@@ -8,8 +8,8 @@
PORTNAME= WeakRef
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/L/LU/LUKKA/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/L/LU/LUKKA
PKGNAMEPREFIX= p5-
MAINTAINER= amdmi3@amdmi3.ru
diff --git a/devel/p5-Workflow/Makefile b/devel/p5-Workflow/Makefile
index b0a812217dfe..6a6134b07604 100644
--- a/devel/p5-Workflow/Makefile
+++ b/devel/p5-Workflow/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Workflow
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Workflow
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= svysh@pn.sinp.msu.ru
diff --git a/devel/p5-XSLoader/Makefile b/devel/p5-XSLoader/Makefile
index 0d5dff43e189..48aa2a82d134 100644
--- a/devel/p5-XSLoader/Makefile
+++ b/devel/p5-XSLoader/Makefile
@@ -8,7 +8,7 @@
PORTNAME= XSLoader
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SAPER
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Yada-Yada-Yada/Makefile b/devel/p5-Yada-Yada-Yada/Makefile
index a420651f968d..42e79485208d 100644
--- a/devel/p5-Yada-Yada-Yada/Makefile
+++ b/devel/p5-Yada-Yada-Yada/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Yada-Yada-Yada
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TM/TMTM
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-accessors/Makefile b/devel/p5-accessors/Makefile
index 66cf00d50ea2..09a3b7f368d9 100644
--- a/devel/p5-accessors/Makefile
+++ b/devel/p5-accessors/Makefile
@@ -8,7 +8,7 @@
PORTNAME= accessors
PORTVERSION= 1.00
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/S/SP/SPURKIS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-base/Makefile b/devel/p5-base/Makefile
index 3342932e06d3..f129db69c67b 100644
--- a/devel/p5-base/Makefile
+++ b/devel/p5-base/Makefile
@@ -8,7 +8,7 @@
PORTNAME= base
PORTVERSION= 2.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RG/RGARCIA
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-capitalization/Makefile b/devel/p5-capitalization/Makefile
index 48d0cae18799..14bf124fa281 100644
--- a/devel/p5-capitalization/Makefile
+++ b/devel/p5-capitalization/Makefile
@@ -8,7 +8,7 @@
PORTNAME= capitalization
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/M/MI/MIYAGAWA
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-enum/Makefile b/devel/p5-enum/Makefile
index 18d0aa945a47..8fa32c18d323 100644
--- a/devel/p5-enum/Makefile
+++ b/devel/p5-enum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= enum
PORTVERSION= 1.016
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= enum
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-iCal-Parser/Makefile b/devel/p5-iCal-Parser/Makefile
index 62786903e0b6..bb6e5c1d4fe9 100644
--- a/devel/p5-iCal-Parser/Makefile
+++ b/devel/p5-iCal-Parser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= iCal-Parser
PORTVERSION= 1.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RF/RFRANKEL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-mixin/Makefile b/devel/p5-mixin/Makefile
index 0c5cfc82b08a..3357c27d088c 100644
--- a/devel/p5-mixin/Makefile
+++ b/devel/p5-mixin/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mixin
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/M/MS/MSCHWERN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-orz/Makefile b/devel/p5-orz/Makefile
index 395b497ab848..c8eba37d4ae3 100644
--- a/devel/p5-orz/Makefile
+++ b/devel/p5-orz/Makefile
@@ -8,8 +8,7 @@
PORTNAME= orz
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CPAN/INGY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/devel/p5-parent/Makefile b/devel/p5-parent/Makefile
index 8d775b3aaaad..96df5c7eca2d 100644
--- a/devel/p5-parent/Makefile
+++ b/devel/p5-parent/Makefile
@@ -8,7 +8,7 @@
PORTNAME= parent
PORTVERSION= 0.221
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CO/CORION
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-prefork/Makefile b/devel/p5-prefork/Makefile
index d81229f5f5f9..300758535515 100644
--- a/devel/p5-prefork/Makefile
+++ b/devel/p5-prefork/Makefile
@@ -8,7 +8,7 @@
PORTNAME= prefork
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AD/ADAMK
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-reaper/Makefile b/devel/p5-reaper/Makefile
index b37393fffcb9..27f057f9ed3b 100644
--- a/devel/p5-reaper/Makefile
+++ b/devel/p5-reaper/Makefile
@@ -8,7 +8,7 @@
PORTNAME= reaper
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/J/JG/JGS/reaper
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-rpm-build-perl/Makefile b/devel/p5-rpm-build-perl/Makefile
index 16f61a69a5b4..41ecd3bf4663 100644
--- a/devel/p5-rpm-build-perl/Makefile
+++ b/devel/p5-rpm-build-perl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rpm-build-perl
PORTVERSION= 0.6.7
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AT/ATOURBIN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-threads-shared/Makefile b/devel/p5-threads-shared/Makefile
index e41f59d5e541..bc1e67b7185a 100644
--- a/devel/p5-threads-shared/Makefile
+++ b/devel/p5-threads-shared/Makefile
@@ -8,8 +8,7 @@
PORTNAME= threads-shared
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/J/JD/JDHEDDEN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ruben@verweg.com
diff --git a/devel/p5-threads/Makefile b/devel/p5-threads/Makefile
index 07e0768f1ffe..dd0e8ae5d190 100644
--- a/devel/p5-threads/Makefile
+++ b/devel/p5-threads/Makefile
@@ -8,7 +8,7 @@
PORTNAME= threads
PORTVERSION= 1.67
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/J/JD/JDHEDDEN
PKGNAMEPREFIX= p5-
diff --git a/devel/pushmi/Makefile b/devel/pushmi/Makefile
index 7c9d36c01a15..58fa15fb171c 100644
--- a/devel/pushmi/Makefile
+++ b/devel/pushmi/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pushmi
PORTVERSION= 1.0.0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
DISTNAME= Pushmi-v${PORTVERSION}
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index a46cf0c8a4ed..cc1dd76772f9 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= svk
PORTVERSION= 2.0.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
DISTNAME= SVK-v${PORTVERSION}
diff --git a/dns/p5-BIND-Conf_Parser/Makefile b/dns/p5-BIND-Conf_Parser/Makefile
index 95ef3ac48113..5547e8086a42 100644
--- a/dns/p5-BIND-Conf_Parser/Makefile
+++ b/dns/p5-BIND-Conf_Parser/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BIND-Conf_Parser
PORTVERSION= 0.95
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/P/PG/PGUEN
PKGNAMEPREFIX= p5-
diff --git a/dns/p5-DNS-Config/Makefile b/dns/p5-DNS-Config/Makefile
index 11773af7c278..de41ea548f7a 100644
--- a/dns/p5-DNS-Config/Makefile
+++ b/dns/p5-DNS-Config/Makefile
@@ -9,8 +9,7 @@ PORTNAME= DNS-Config
PORTVERSION= 0.66
PORTREVISION= 0
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DNS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/dns/p5-DNS-EasyDNS/Makefile b/dns/p5-DNS-EasyDNS/Makefile
index d6b75cc9f7bc..d83f2cf4c781 100644
--- a/dns/p5-DNS-EasyDNS/Makefile
+++ b/dns/p5-DNS-EasyDNS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DNS-EasyDNS
PORTVERSION= 0.04
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DNS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/dns/p5-DNS-Zone/Makefile b/dns/p5-DNS-Zone/Makefile
index a0e1864bc05c..ff1f25f4f423 100644
--- a/dns/p5-DNS-Zone/Makefile
+++ b/dns/p5-DNS-Zone/Makefile
@@ -9,8 +9,7 @@ PORTNAME= DNS-Zone
PORTVERSION= 0.85
PORTREVISION= 0
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DNS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/dns/p5-Data-Validate-Domain/Makefile b/dns/p5-Data-Validate-Domain/Makefile
index a3005e4bdb97..b0c72d7aef98 100644
--- a/dns/p5-Data-Validate-Domain/Makefile
+++ b/dns/p5-Data-Validate-Domain/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Validate-Domain
PORTVERSION= 0.08
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/dns/p5-Net-DNS-Codes/Makefile b/dns/p5-Net-DNS-Codes/Makefile
index 8ebd66f366c7..2ced75c42df2 100644
--- a/dns/p5-Net-DNS-Codes/Makefile
+++ b/dns/p5-Net-DNS-Codes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-DNS-Codes
PORTVERSION= 0.09
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/dns/p5-Net-DNS-Resolver-Programmable/Makefile b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
index 87b3c7f1f943..531a4943d947 100644
--- a/dns/p5-Net-DNS-Resolver-Programmable/Makefile
+++ b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-DNS-Resolver-Programmable
PORTVERSION= 0.003
CATEGORIES= dns net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/dns/p5-Net-DNS-SEC/Makefile b/dns/p5-Net-DNS-SEC/Makefile
index e27407fae9bf..beecaf13dbb0 100644
--- a/dns/p5-Net-DNS-SEC/Makefile
+++ b/dns/p5-Net-DNS-SEC/Makefile
@@ -9,9 +9,8 @@ PORTNAME= Net-DNS-SEC
PORTVERSION= 0.14
PORTREVISION= 1
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://www.ripe.net/ripencc/pub-services/np/DISI/SRC/
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/dns/p5-Net-DNS-ZoneCheck/Makefile b/dns/p5-Net-DNS-ZoneCheck/Makefile
index b64bfa94c353..cc38d0f36418 100644
--- a/dns/p5-Net-DNS-ZoneCheck/Makefile
+++ b/dns/p5-Net-DNS-ZoneCheck/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-DNS-ZoneCheck
PORTVERSION= 0.01
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/dns/p5-Net-DNS-ZoneFile/Makefile b/dns/p5-Net-DNS-ZoneFile/Makefile
index a1c90a75b2da..fdc927d1941f 100644
--- a/dns/p5-Net-DNS-ZoneFile/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-DNS-ZoneFile
PORTVERSION= 1.04
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/dns/p5-Net-LibIDN/Makefile b/dns/p5-Net-LibIDN/Makefile
index 5c0f2eb8f2ca..3d0df7a8c553 100644
--- a/dns/p5-Net-LibIDN/Makefile
+++ b/dns/p5-Net-LibIDN/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-LibIDN
PORTVERSION= 0.10
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= domi@nonsensss.de
diff --git a/dns/p5-Net-RBLClient/Makefile b/dns/p5-Net-RBLClient/Makefile
index 5a3a91a81014..c937f4f8814f 100644
--- a/dns/p5-Net-RBLClient/Makefile
+++ b/dns/p5-Net-RBLClient/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-RBLClient
PORTVERSION= 0.5
CATEGORIES= dns perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/dns/p5-POE-Component-Client-DNS/Makefile b/dns/p5-POE-Component-Client-DNS/Makefile
index f21a89e260cd..78f5ea3bb92d 100644
--- a/dns/p5-POE-Component-Client-DNS/Makefile
+++ b/dns/p5-POE-Component-Client-DNS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Client-DNS
PORTVERSION= 1.0000
CATEGORIES= dns perl5 devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/00$//}
diff --git a/finance/p5-Business-CreditCard/Makefile b/finance/p5-Business-CreditCard/Makefile
index f5fa34452e5a..a741ad2fecdb 100644
--- a/finance/p5-Business-CreditCard/Makefile
+++ b/finance/p5-Business-CreditCard/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Business-CreditCard
PORTVERSION= 0.30
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/finance/p5-Business-OCV/Makefile b/finance/p5-Business-OCV/Makefile
index 831bfbd0b4d8..5366d5f0f151 100644
--- a/finance/p5-Business-OCV/Makefile
+++ b/finance/p5-Business-OCV/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Business-OCV
PORTVERSION= 0.1
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/B/BE/BENL
PKGNAMEPREFIX= p5-
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
index f5e9d93724ca..911d399dbb82 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-2CheckOut
PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile b/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
index c12fc9b01c59..185c8599d016 100644
--- a/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
+++ b/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Business-OnlinePayment-AuthorizeNet
PORTVERSION= 3.17
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile b/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
index 8b91c1616612..e2867149d288 100644
--- a/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
+++ b/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-BankOfAmerica
PORTVERSION= 1.02
PORTREVISION= 1
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-Beanstream/Makefile b/finance/p5-Business-OnlinePayment-Beanstream/Makefile
index 3fea1ce771db..8cc4b34a79c3 100644
--- a/finance/p5-Business-OnlinePayment-Beanstream/Makefile
+++ b/finance/p5-Business-OnlinePayment-Beanstream/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-Beanstream
PORTVERSION= 0.01
PORTREVISION= 2
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-Cardstream/Makefile b/finance/p5-Business-OnlinePayment-Cardstream/Makefile
index 9c93f64a1272..3b1a7b68f8ba 100644
--- a/finance/p5-Business-OnlinePayment-Cardstream/Makefile
+++ b/finance/p5-Business-OnlinePayment-Cardstream/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-Cardstream
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-Jettis/Makefile b/finance/p5-Business-OnlinePayment-Jettis/Makefile
index 969223ba99d0..f0a54be05178 100644
--- a/finance/p5-Business-OnlinePayment-Jettis/Makefile
+++ b/finance/p5-Business-OnlinePayment-Jettis/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-Jettis
PORTVERSION= 0.01
PORTREVISION= 2
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
index a99cdd25b030..1cdf96f865f8 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Business-OnlinePayment-LinkPoint
PORTVERSION= 0.09
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
index 68e812dace76..d53ce2b83e45 100644
--- a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
+++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-MerchantCommerce
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-Network1Financial/Makefile b/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
index 436263f023cf..b2fa27841f37 100644
--- a/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
+++ b/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-Network1Financial
PORTVERSION= 0.02
PORTREVISION= 2
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-OCV/Makefile b/finance/p5-Business-OnlinePayment-OCV/Makefile
index 1e270e12848f..066686ebdb12 100644
--- a/finance/p5-Business-OnlinePayment-OCV/Makefile
+++ b/finance/p5-Business-OnlinePayment-OCV/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-OCV
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-PayConnect/Makefile b/finance/p5-Business-OnlinePayment-PayConnect/Makefile
index d09da33ef8e3..037b31fa31ba 100644
--- a/finance/p5-Business-OnlinePayment-PayConnect/Makefile
+++ b/finance/p5-Business-OnlinePayment-PayConnect/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-PayConnect
PORTVERSION= 0.02
PORTREVISION= 2
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-PayflowPro/Makefile b/finance/p5-Business-OnlinePayment-PayflowPro/Makefile
index a3ffc48b7afe..f9802cd03efa 100644
--- a/finance/p5-Business-OnlinePayment-PayflowPro/Makefile
+++ b/finance/p5-Business-OnlinePayment-PayflowPro/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Business-OnlinePayment-PayflowPro
PORTVERSION= 0.03
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= never@nevermind.kiev.ua
diff --git a/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile b/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
index 8ae1d1adf948..100074d94ffb 100644
--- a/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
+++ b/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-PaymentsGateway
PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-SurePay/Makefile b/finance/p5-Business-OnlinePayment-SurePay/Makefile
index e4a306bef3d4..7dbe3855cabf 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/Makefile
+++ b/finance/p5-Business-OnlinePayment-SurePay/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Business-OnlinePayment-SurePay
PORTVERSION= 0.01
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-TCLink/Makefile b/finance/p5-Business-OnlinePayment-TCLink/Makefile
index ac83083d6ead..c1fb201989ab 100644
--- a/finance/p5-Business-OnlinePayment-TCLink/Makefile
+++ b/finance/p5-Business-OnlinePayment-TCLink/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-TCLink
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-VirtualNet/Makefile b/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
index aacf460bd752..47aa10d1bbab 100644
--- a/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
+++ b/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-VirtualNet
PORTVERSION= 0.02
PORTREVISION= 2
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-eSec/Makefile b/finance/p5-Business-OnlinePayment-eSec/Makefile
index ba2882593610..e9efd6bf260c 100644
--- a/finance/p5-Business-OnlinePayment-eSec/Makefile
+++ b/finance/p5-Business-OnlinePayment-eSec/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-eSec
PORTVERSION= 0.02
PORTREVISION= 2
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
index 72888c95de57..d460f60493fd 100644
--- a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
+++ b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Business-OnlinePayment-iAuthorizer
PORTVERSION= 0.2.1
PORTREVISION= 1
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/finance/p5-Business-PayPal-IPN/Makefile b/finance/p5-Business-PayPal-IPN/Makefile
index 4db4f261dfb3..8628af259048 100644
--- a/finance/p5-Business-PayPal-IPN/Makefile
+++ b/finance/p5-Business-PayPal-IPN/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Business-PayPal-IPN
PORTVERSION= 1.94
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
diff --git a/finance/p5-Business-WorldPay-Junior/Makefile b/finance/p5-Business-WorldPay-Junior/Makefile
index 40693b709ff1..b9a8ae145c45 100644
--- a/finance/p5-Business-WorldPay-Junior/Makefile
+++ b/finance/p5-Business-WorldPay-Junior/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Business-WorldPay-Junior
PORTVERSION= 1.07
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
index bb01f2e7c657..372874c554a8 100644
--- a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
+++ b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Finance-Currency-Convert-WebserviceX
PORTVERSION= 0.06002
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Finance
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/finance/p5-Finance-Quote/Makefile b/finance/p5-Finance-Quote/Makefile
index 8e2460f04f09..cb7b2e6ba6a2 100644
--- a/finance/p5-Finance-Quote/Makefile
+++ b/finance/p5-Finance-Quote/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Finance-Quote
PORTVERSION= 1.13
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Finance
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/finance/p5-Finance-QuoteHist/Makefile b/finance/p5-Finance-QuoteHist/Makefile
index 9e5a7cec1647..b34d2d1153c3 100644
--- a/finance/p5-Finance-QuoteHist/Makefile
+++ b/finance/p5-Finance-QuoteHist/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Finance-QuoteHist
PORTVERSION= 1.11
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Finance
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/finance/p5-Math-Financial/Makefile b/finance/p5-Math-Financial/Makefile
index 2c25cc74437a..a32d93bd032d 100644
--- a/finance/p5-Math-Financial/Makefile
+++ b/finance/p5-Math-Financial/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Financial
PORTVERSION= 0.76
CATEGORIES= finance math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/ftp/p5-Net-FTP-Common/Makefile b/ftp/p5-Net-FTP-Common/Makefile
index 1a873936c217..419f8db0af4e 100644
--- a/ftp/p5-Net-FTP-Common/Makefile
+++ b/ftp/p5-Net-FTP-Common/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-FTP-Common
PORTVERSION= 5.32
CATEGORIES= ftp perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index 73495673ecd7..7b898740bc28 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Net-FTPServer
PORTVERSION= 1.122
CATEGORIES= ftp perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/ftp/p5-POE-Component-Client-FTP/Makefile b/ftp/p5-POE-Component-Client-FTP/Makefile
index 99c247c26b41..12b773878845 100644
--- a/ftp/p5-POE-Component-Client-FTP/Makefile
+++ b/ftp/p5-POE-Component-Client-FTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Client-FTP
PORTVERSION= 0.14
CATEGORIES= ftp perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/games/lm-solve/Makefile b/games/lm-solve/Makefile
index 67a27863c5d8..24535e47ed70 100644
--- a/games/lm-solve/Makefile
+++ b/games/lm-solve/Makefile
@@ -9,8 +9,7 @@
PORTNAME= lm-solve
PORTVERSION= 0.8.3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Games
+MASTER_SITES= CPAN
DISTNAME= Games-LMSolve-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/p5-Algorithm-Pair-Best/Makefile b/games/p5-Algorithm-Pair-Best/Makefile
index 523e884932a9..feabee89b844 100644
--- a/games/p5-Algorithm-Pair-Best/Makefile
+++ b/games/p5-Algorithm-Pair-Best/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Pair-Best
PORTVERSION= 1.010
CATEGORIES= games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/games/p5-Algorithm-Pair-Swiss/Makefile b/games/p5-Algorithm-Pair-Swiss/Makefile
index e184eae95bd3..bd3bf0db5967 100644
--- a/games/p5-Algorithm-Pair-Swiss/Makefile
+++ b/games/p5-Algorithm-Pair-Swiss/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Pair-Swiss
PORTVERSION= 0.14
CATEGORIES= games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/games/p5-Baseball-Sabermetrics/Makefile b/games/p5-Baseball-Sabermetrics/Makefile
index 84b24b48b43a..8b2fc53bdb83 100644
--- a/games/p5-Baseball-Sabermetrics/Makefile
+++ b/games/p5-Baseball-Sabermetrics/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Baseball-Sabermetrics
PORTVERSION= 0.03
CATEGORIES= games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Baseball/VICTOR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/games/p5-Games-Alak/Makefile b/games/p5-Games-Alak/Makefile
index e0123ad09102..9a91aabb09dc 100644
--- a/games/p5-Games-Alak/Makefile
+++ b/games/p5-Games-Alak/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Games-Alak
PORTVERSION= 0.19
CATEGORIES= games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/A/AV/AVIF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/games/p5-Games-AlphaBeta/Makefile b/games/p5-Games-AlphaBeta/Makefile
index 944b5bf04962..e2b0abf4f0a9 100644
--- a/games/p5-Games-AlphaBeta/Makefile
+++ b/games/p5-Games-AlphaBeta/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Games-AlphaBeta
PORTVERSION= 0.4.6
CATEGORIES= games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Games
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/games/p5-Games-Bingo-Bot/Makefile b/games/p5-Games-Bingo-Bot/Makefile
index bec900109652..260201ffee42 100644
--- a/games/p5-Games-Bingo-Bot/Makefile
+++ b/games/p5-Games-Bingo-Bot/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Games-Bingo-Bot
PORTVERSION= 0.01
CATEGORIES= games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Games
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/games/p5-Games-Bingo-Print/Makefile b/games/p5-Games-Bingo-Print/Makefile
index 5cb80d117626..8a57e0fbe2c1 100644
--- a/games/p5-Games-Bingo-Print/Makefile
+++ b/games/p5-Games-Bingo-Print/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Games-Bingo-Print
PORTVERSION= 0.02
CATEGORIES= games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Games
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/games/p5-Games-Dice/Makefile b/games/p5-Games-Dice/Makefile
index c9bedf039581..00e34f243d08 100644
--- a/games/p5-Games-Dice/Makefile
+++ b/games/p5-Games-Dice/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Games-Dice
PORTVERSION= 0.02
CATEGORIES= games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Games
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/games/p5-Games-GuessWord/Makefile b/games/p5-Games-GuessWord/Makefile
index cf6a5f2e91c5..2fe6785b5ae9 100644
--- a/games/p5-Games-GuessWord/Makefile
+++ b/games/p5-Games-GuessWord/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Games-GuessWord
PORTVERSION= 0.15
CATEGORIES= games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Games
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/games/p5-Games-Tournament-RoundRobin/Makefile b/games/p5-Games-Tournament-RoundRobin/Makefile
index d342616e0650..2ed3a9c3f539 100644
--- a/games/p5-Games-Tournament-RoundRobin/Makefile
+++ b/games/p5-Games-Tournament-RoundRobin/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Games-Tournament-RoundRobin
PORTVERSION= 0.01
CATEGORIES= games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Games
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/graphics/eps2png/Makefile b/graphics/eps2png/Makefile
index 4f32d23f50ea..e7f52a6d5ff5 100644
--- a/graphics/eps2png/Makefile
+++ b/graphics/eps2png/Makefile
@@ -8,8 +8,8 @@
PORTNAME= eps2png
PORTVERSION= 2.6
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/J/JV/JV/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/J/JV/JV
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts EPS images to PNG
diff --git a/graphics/p5-Acme-Steganography-Image-Png/Makefile b/graphics/p5-Acme-Steganography-Image-Png/Makefile
index 5e9f4fe7d8c1..d97cbbd3c3e5 100644
--- a/graphics/p5-Acme-Steganography-Image-Png/Makefile
+++ b/graphics/p5-Acme-Steganography-Image-Png/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Acme-Steganography-Image-Png
PORTVERSION= 0.06
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Acme
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/graphics/p5-CAD-Drawing-Template/Makefile b/graphics/p5-CAD-Drawing-Template/Makefile
index a5cd0624ee64..463b5ba08b4b 100644
--- a/graphics/p5-CAD-Drawing-Template/Makefile
+++ b/graphics/p5-CAD-Drawing-Template/Makefile
@@ -9,8 +9,7 @@ PORTNAME= CAD-Drawing-Template
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CAD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile
index b98e43e5f036..8efbe65e2840 100644
--- a/graphics/p5-CAD-Drawing/Makefile
+++ b/graphics/p5-CAD-Drawing/Makefile
@@ -9,8 +9,7 @@ PORTNAME= CAD-Drawing
PORTVERSION= 0.26
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CAD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/graphics/p5-Captcha-reCAPTCHA/Makefile b/graphics/p5-Captcha-reCAPTCHA/Makefile
index 5854793c7588..db65e3d9fdaf 100644
--- a/graphics/p5-Captcha-reCAPTCHA/Makefile
+++ b/graphics/p5-Captcha-reCAPTCHA/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Captcha-reCAPTCHA
PORTVERSION= 0.92
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/A/AN/ANDYA
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Chart-Graph/Makefile b/graphics/p5-Chart-Graph/Makefile
index 7f2267c80975..c0bb1945aca8 100644
--- a/graphics/p5-Chart-Graph/Makefile
+++ b/graphics/p5-Chart-Graph/Makefile
@@ -10,8 +10,7 @@ PORTNAME= Chart-Graph
PORTVERSION= 3.2
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Chart
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/p5-Chart-PNGgraph/Makefile b/graphics/p5-Chart-PNGgraph/Makefile
index f0a7c7f03c86..997faeceb343 100644
--- a/graphics/p5-Chart-PNGgraph/Makefile
+++ b/graphics/p5-Chart-PNGgraph/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Chart-PNGgraph
PORTVERSION= 1.21
PORTREVISION= 3
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Chart
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/p5-Color-Rgb/Makefile b/graphics/p5-Color-Rgb/Makefile
index 3bdee761179d..dffe3bf4124d 100644
--- a/graphics/p5-Color-Rgb/Makefile
+++ b/graphics/p5-Color-Rgb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Color-Rgb
PORTVERSION= 1.4
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Color
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/graphics/p5-GD-Arrow/Makefile b/graphics/p5-GD-Arrow/Makefile
index d908b32832f4..c12e98141543 100644
--- a/graphics/p5-GD-Arrow/Makefile
+++ b/graphics/p5-GD-Arrow/Makefile
@@ -10,8 +10,7 @@ PORTNAME= GD-Arrow
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/T/TC/TCAINE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/p5-GD-Barcode/Makefile b/graphics/p5-GD-Barcode/Makefile
index de07e1515b9c..8b771a6a541c 100644
--- a/graphics/p5-GD-Barcode/Makefile
+++ b/graphics/p5-GD-Barcode/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GD-Barcode
PORTVERSION= 1.15
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/p5-GD-Graph3d/Makefile b/graphics/p5-GD-Graph3d/Makefile
index 83fdf8b74568..a0262069ff6b 100644
--- a/graphics/p5-GD-Graph3d/Makefile
+++ b/graphics/p5-GD-Graph3d/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GD-Graph3d
PORTVERSION= 0.63
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/graphics/p5-GD-SVG/Makefile b/graphics/p5-GD-SVG/Makefile
index a53691bf4089..e3ab0e4f2e1a 100644
--- a/graphics/p5-GD-SVG/Makefile
+++ b/graphics/p5-GD-SVG/Makefile
@@ -10,8 +10,7 @@ PORTNAME= GD-SVG
PORTVERSION= 0.28
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fernan@iib.unsam.edu.ar
diff --git a/graphics/p5-GD-TextUtil/Makefile b/graphics/p5-GD-TextUtil/Makefile
index 3de696a64381..ebd225df2c8a 100644
--- a/graphics/p5-GD-TextUtil/Makefile
+++ b/graphics/p5-GD-TextUtil/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GD-TextUtil
PORTVERSION= 0.86
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= GDTextUtil-${PORTVERSION}
diff --git a/graphics/p5-GD-Thumbnail/Makefile b/graphics/p5-GD-Thumbnail/Makefile
index 459dbda8f045..6678510deb3a 100644
--- a/graphics/p5-GD-Thumbnail/Makefile
+++ b/graphics/p5-GD-Thumbnail/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GD-Thumbnail
PORTVERSION= 1.10
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 658a80128394..cfcf61379a7f 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GD
PORTVERSION= 2.35
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= GD-${PORTVERSION}
diff --git a/graphics/p5-Graph-Easy/Makefile b/graphics/p5-Graph-Easy/Makefile
index ce42c840473f..416f6dc79ca5 100644
--- a/graphics/p5-Graph-Easy/Makefile
+++ b/graphics/p5-Graph-Easy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Graph-Easy
PORTVERSION= 0.60
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Graph
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/graphics/p5-Graph-ReadWrite/Makefile b/graphics/p5-Graph-ReadWrite/Makefile
index d780f8814427..88c4de8cac66 100644
--- a/graphics/p5-Graph-ReadWrite/Makefile
+++ b/graphics/p5-Graph-ReadWrite/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Graph-ReadWrite
PORTVERSION= 2.00
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Graph
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/p5-Graph-SocialMap/Makefile b/graphics/p5-Graph-SocialMap/Makefile
index 29d643d3fdb0..d4474d160d2a 100644
--- a/graphics/p5-Graph-SocialMap/Makefile
+++ b/graphics/p5-Graph-SocialMap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Graph-SocialMap
PORTVERSION= 0.12
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Graph
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/graphics/p5-Graph-Writer-GraphViz/Makefile b/graphics/p5-Graph-Writer-GraphViz/Makefile
index 80d99395577a..90549b96cfb1 100644
--- a/graphics/p5-Graph-Writer-GraphViz/Makefile
+++ b/graphics/p5-Graph-Writer-GraphViz/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Graph-Writer-GraphViz
PORTVERSION= 0.10
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Graph
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/graphics/p5-GraphViz-Traverse/Makefile b/graphics/p5-GraphViz-Traverse/Makefile
index 9d3c48105e10..06c5f41c145d 100644
--- a/graphics/p5-GraphViz-Traverse/Makefile
+++ b/graphics/p5-GraphViz-Traverse/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GraphViz-Traverse
PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GraphViz
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/graphics/p5-Image-Caa/Makefile b/graphics/p5-Image-Caa/Makefile
index dacfe5786982..f64cff77a5ee 100644
--- a/graphics/p5-Image-Caa/Makefile
+++ b/graphics/p5-Image-Caa/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Image-Caa
PORTVERSION= 1.01
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Image
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/graphics/p5-Image-ExifTool-devel/Makefile b/graphics/p5-Image-ExifTool-devel/Makefile
index e78e08572b4f..d6de99d8164b 100644
--- a/graphics/p5-Image-ExifTool-devel/Makefile
+++ b/graphics/p5-Image-ExifTool-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Image-ExifTool
PORTVERSION= 7.00
CATEGORIES= graphics perl5
MASTER_SITES= http://www.sno.phy.queensu.ca/~phil/exiftool/ \
- ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Image
+ CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= devin@spamcop.net
diff --git a/graphics/p5-Image-ExifTool/Makefile b/graphics/p5-Image-ExifTool/Makefile
index e78e08572b4f..d6de99d8164b 100644
--- a/graphics/p5-Image-ExifTool/Makefile
+++ b/graphics/p5-Image-ExifTool/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Image-ExifTool
PORTVERSION= 7.00
CATEGORIES= graphics perl5
MASTER_SITES= http://www.sno.phy.queensu.ca/~phil/exiftool/ \
- ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Image
+ CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= devin@spamcop.net
diff --git a/graphics/p5-Image-Grab/Makefile b/graphics/p5-Image-Grab/Makefile
index b7050863d1df..88493c8f6dd7 100644
--- a/graphics/p5-Image-Grab/Makefile
+++ b/graphics/p5-Image-Grab/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Image-Grab
PORTVERSION= 1.4.2
PORTREVISION= 2
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Image
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tolid@plab.ku.dk
diff --git a/graphics/p5-Image-IPTCInfo/Makefile b/graphics/p5-Image-IPTCInfo/Makefile
index 855dafd45c17..150c3c96a69a 100644
--- a/graphics/p5-Image-IPTCInfo/Makefile
+++ b/graphics/p5-Image-IPTCInfo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Image-IPTCInfo
PORTVERSION= 1.95
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Image
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 48abbe1c2c1e..395fcc3f398b 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Image-Imlib2
PORTVERSION= 2.00
PORTREVISION= 3
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Image
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/graphics/p5-Image-Info/Makefile b/graphics/p5-Image-Info/Makefile
index e01e5a10e919..9999c897267c 100644
--- a/graphics/p5-Image-Info/Makefile
+++ b/graphics/p5-Image-Info/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Image-Info
PORTVERSION= 1.28
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Image
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/graphics/p5-Image-Math-Constrain/Makefile b/graphics/p5-Image-Math-Constrain/Makefile
index 4ada1f52a306..3b9e9720d9b0 100644
--- a/graphics/p5-Image-Math-Constrain/Makefile
+++ b/graphics/p5-Image-Math-Constrain/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Image-Math-Constrain
PORTVERSION= 1.01
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Image
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
diff --git a/graphics/p5-Image-MetaData-GQview/Makefile b/graphics/p5-Image-MetaData-GQview/Makefile
index 1f378d66fd5c..101498f5dcca 100644
--- a/graphics/p5-Image-MetaData-GQview/Makefile
+++ b/graphics/p5-Image-MetaData-GQview/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Image-MetaData-GQview
PORTVERSION= 1.9
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Image
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/graphics/p5-Image-MetaData-JPEG/Makefile b/graphics/p5-Image-MetaData-JPEG/Makefile
index 7e9c576a328e..f82fdc978048 100644
--- a/graphics/p5-Image-MetaData-JPEG/Makefile
+++ b/graphics/p5-Image-MetaData-JPEG/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Image-MetaData-JPEG
PORTVERSION= 0.15
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Image
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/graphics/p5-Image-Pngslimmer/Makefile b/graphics/p5-Image-Pngslimmer/Makefile
index b5867f81de41..faf3e47de8cf 100644
--- a/graphics/p5-Image-Pngslimmer/Makefile
+++ b/graphics/p5-Image-Pngslimmer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Image-Pngslimmer
PORTVERSION= 0.22
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Image
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/graphics/p5-Image-Size/Makefile b/graphics/p5-Image-Size/Makefile
index 5b7d71437b2e..4c46dff1bf0c 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Image-Size
PORTVERSION= 3.01
CATEGORIES= graphics www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Image
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tolid@plab.ku.dk
diff --git a/graphics/p5-Imager-Graph/Makefile b/graphics/p5-Imager-Graph/Makefile
index 8b5e72c9dea6..ca8e28960095 100644
--- a/graphics/p5-Imager-Graph/Makefile
+++ b/graphics/p5-Imager-Graph/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Imager-Graph
PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/T/TO/TONYC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/graphics/p5-Imager-Plot/Makefile b/graphics/p5-Imager-Plot/Makefile
index b267d8c90c88..eb41103c6bb0 100644
--- a/graphics/p5-Imager-Plot/Makefile
+++ b/graphics/p5-Imager-Plot/Makefile
@@ -10,8 +10,7 @@ PORTNAME= Imager-Plot
PORTVERSION= 0.09
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Imager
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/p5-Imager-QRCode/Makefile b/graphics/p5-Imager-QRCode/Makefile
index 3fb909f1a48a..5aa8de1ed1ab 100644
--- a/graphics/p5-Imager-QRCode/Makefile
+++ b/graphics/p5-Imager-QRCode/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Imager-QRCode
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Imager
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile
index 8a3ac4cf4972..d4ec1485fa70 100644
--- a/graphics/p5-Imager/Makefile
+++ b/graphics/p5-Imager/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Imager
PORTVERSION= 0.60
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/graphics/p5-OpenGL/Makefile b/graphics/p5-OpenGL/Makefile
index 5fd923757cfd..5738a36ba587 100644
--- a/graphics/p5-OpenGL/Makefile
+++ b/graphics/p5-OpenGL/Makefile
@@ -10,7 +10,7 @@ PORTNAME= OpenGL
PORTVERSION= 0.54
PORTREVISION= 2
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/I/IL/ILYAZ/modules
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 0468667d754f..1ab704d78e14 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pgperl
PORTVERSION= 2.19
PORTREVISION= 4
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PGPLOT
+MASTER_SITES= CPAN
DISTNAME= PGPLOT-${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
diff --git a/graphics/p5-SVG-DOM2/Makefile b/graphics/p5-SVG-DOM2/Makefile
index c9def834d125..66110363876f 100644
--- a/graphics/p5-SVG-DOM2/Makefile
+++ b/graphics/p5-SVG-DOM2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVG-DOM2
PORTVERSION= 1.00
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVG
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/graphics/p5-SVG-Graph/Makefile b/graphics/p5-SVG-Graph/Makefile
index fbd3ef35a374..a24a15038265 100644
--- a/graphics/p5-SVG-Graph/Makefile
+++ b/graphics/p5-SVG-Graph/Makefile
@@ -9,8 +9,7 @@
PORTNAME= SVG-Graph
PORTVERSION= 0.01
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVG
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fernan@iib.unsam.edu.ar
diff --git a/graphics/p5-SVG-Metadata/Makefile b/graphics/p5-SVG-Metadata/Makefile
index 68ea43d580dc..3c0d92b20095 100644
--- a/graphics/p5-SVG-Metadata/Makefile
+++ b/graphics/p5-SVG-Metadata/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVG-Metadata
PORTVERSION= 0.28
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVG
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ahze@FreeBSD.org
diff --git a/graphics/p5-SWF-Builder/Makefile b/graphics/p5-SWF-Builder/Makefile
index b23fb2368504..a80098a090ce 100644
--- a/graphics/p5-SWF-Builder/Makefile
+++ b/graphics/p5-SWF-Builder/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SWF-Builder
PORTVERSION= 0.16
CATEGORIES= graphics www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/Y/YS/YSAS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/graphics/p5-SWF-File/Makefile b/graphics/p5-SWF-File/Makefile
index 25ecf0e3f9de..1093783d0bee 100644
--- a/graphics/p5-SWF-File/Makefile
+++ b/graphics/p5-SWF-File/Makefile
@@ -9,8 +9,7 @@ PORTNAME= SWF-File
PORTVERSION= 0.42
PORTEPOCH= 1
CATEGORIES= graphics www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/Y/YS/YSAS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/graphics/p5-SpringGraph/Makefile b/graphics/p5-SpringGraph/Makefile
index deb95e57bd6c..8ca312d19583 100644
--- a/graphics/p5-SpringGraph/Makefile
+++ b/graphics/p5-SpringGraph/Makefile
@@ -10,8 +10,7 @@ PORTNAME= SpringGraph
PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GraphViz/TEEJAY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fernan@iib.unsam.edu.ar
diff --git a/graphics/p5-Tk-JPEG-Lite/Makefile b/graphics/p5-Tk-JPEG-Lite/Makefile
index 226ef1ed415d..da8da4451785 100644
--- a/graphics/p5-Tk-JPEG-Lite/Makefile
+++ b/graphics/p5-Tk-JPEG-Lite/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tk-JPEG-Lite
PORTVERSION= 2.01403
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/p5-VCG/Makefile b/graphics/p5-VCG/Makefile
index f4ee13274f87..fe46f7e23727 100644
--- a/graphics/p5-VCG/Makefile
+++ b/graphics/p5-VCG/Makefile
@@ -10,7 +10,7 @@ PORTNAME= VCG
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/T/TE/TEEJAY
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Visio/Makefile b/graphics/p5-Visio/Makefile
index 17fd2e63647c..03c62311df62 100644
--- a/graphics/p5-Visio/Makefile
+++ b/graphics/p5-Visio/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Visio
PORTVERSION= 1.010
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Visio
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/graphics/pgperl/Makefile b/graphics/pgperl/Makefile
index 0468667d754f..1ab704d78e14 100644
--- a/graphics/pgperl/Makefile
+++ b/graphics/pgperl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pgperl
PORTVERSION= 2.19
PORTREVISION= 4
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PGPLOT
+MASTER_SITES= CPAN
DISTNAME= PGPLOT-${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
diff --git a/irc/p5-Bot-BasicBot/Makefile b/irc/p5-Bot-BasicBot/Makefile
index eaec9b09006a..4664f9acaba9 100644
--- a/irc/p5-Bot-BasicBot/Makefile
+++ b/irc/p5-Bot-BasicBot/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Bot-BasicBot
PORTVERSION= 0.7
CATEGORIES= irc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TO/TOMI
PKGNAMEPREFIX= p5-
diff --git a/irc/p5-IRC-Bot-Hangman/Makefile b/irc/p5-IRC-Bot-Hangman/Makefile
index 69a94eb2d475..a8d8a80f0ec8 100644
--- a/irc/p5-IRC-Bot-Hangman/Makefile
+++ b/irc/p5-IRC-Bot-Hangman/Makefile
@@ -8,7 +8,7 @@
PORTNAME= IRC-Bot-Hangman
PORTVERSION= 0.1
CATEGORIES= irc games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/P/PD/PDENIS
PKGNAMEPREFIX= p5-
diff --git a/irc/p5-IRC/Makefile b/irc/p5-IRC/Makefile
index ef0f89daefbb..c66cf20558b9 100644
--- a/irc/p5-IRC/Makefile
+++ b/irc/p5-IRC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-IRC
PORTVERSION= 0.75
CATEGORIES= irc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net/JMUHLICH
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/irc/p5-POE-Component-IRC-Object/Makefile b/irc/p5-POE-Component-IRC-Object/Makefile
index af2f995ae6d5..1d5a791d66bc 100644
--- a/irc/p5-POE-Component-IRC-Object/Makefile
+++ b/irc/p5-POE-Component-IRC-Object/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-IRC-Object
PORTVERSION= 0.02
CATEGORIES= irc perl5 devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/japanese/p5-Acme-Lou/Makefile b/japanese/p5-Acme-Lou/Makefile
index 9e30e5191c6d..84b6d6feddb8 100644
--- a/japanese/p5-Acme-Lou/Makefile
+++ b/japanese/p5-Acme-Lou/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Acme-Lou
PORTVERSION= 0.03
CATEGORIES= japanese textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/T/TO/TOMITA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= ja-p5-
MAINTAINER= markun@onohara.to
diff --git a/japanese/p5-Date-Japanese-Era/Makefile b/japanese/p5-Date-Japanese-Era/Makefile
index 7f5a2499edd0..9b1a7d9e377e 100644
--- a/japanese/p5-Date-Japanese-Era/Makefile
+++ b/japanese/p5-Date-Japanese-Era/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Japanese-Era
PORTVERSION= 0.06
CATEGORIES= japanese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
MAINTAINER= ports@FreeBSD.org
COMMENT= Conversion between Japanese Era / Gregorian calendar
diff --git a/japanese/p5-Date-Japanese-Holiday/Makefile b/japanese/p5-Date-Japanese-Holiday/Makefile
index db39e8d17fa1..76bae71b1c50 100644
--- a/japanese/p5-Date-Japanese-Holiday/Makefile
+++ b/japanese/p5-Date-Japanese-Holiday/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Japanese-Holiday
PORTVERSION= 0.05
CATEGORIES= japanese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl module for Calculate Japanese Holiday
diff --git a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
index faed3c203b00..d7bd3f707571 100644
--- a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
+++ b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Calendar-Japanese-Era
PORTVERSION= 0.07
CATEGORIES= japanese devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DM/DMAKI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= ja-p5-
MAINTAINER= markun@onohara.to
diff --git a/japanese/p5-Encode-EUCJPMS/Makefile b/japanese/p5-Encode-EUCJPMS/Makefile
index 61177e74d88f..333eb82b8d19 100644
--- a/japanese/p5-Encode-EUCJPMS/Makefile
+++ b/japanese/p5-Encode-EUCJPMS/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Encode-EUCJPMS
PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= japanese converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/N/NA/NARUSE
+MASTER_SITES= CPAN
MAINTAINER= knu@FreeBSD.org
COMMENT= A Perl5 module defining Microsoft compatible encodings for Japanese
diff --git a/japanese/p5-FormValidator-Simple-Plugin-Number-Phone-JP/Makefile b/japanese/p5-FormValidator-Simple-Plugin-Number-Phone-JP/Makefile
index 9b9f447261ac..460fce464cd2 100644
--- a/japanese/p5-FormValidator-Simple-Plugin-Number-Phone-JP/Makefile
+++ b/japanese/p5-FormValidator-Simple-Plugin-Number-Phone-JP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= FormValidator-Simple-Plugin-Number-Phone-JP
PORTVERSION= 0.02
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/M/MI/MIZZY
+MASTER_SITES= CPAN
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl module for Japanese phone number validation
diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index 37d467165ca0..1f199b14ee23 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Jcode
PORTVERSION= 2.06
CATEGORIES= japanese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DA/DANKOGAI
+MASTER_SITES= CPAN
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl extension interface to convert Japanese text
diff --git a/japanese/p5-Lingua-JA-Numbers/Makefile b/japanese/p5-Lingua-JA-Numbers/Makefile
index 2b420ebe7897..ed2ab52b8e52 100644
--- a/japanese/p5-Lingua-JA-Numbers/Makefile
+++ b/japanese/p5-Lingua-JA-Numbers/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-JA-Numbers
PORTVERSION= 0.04
CATEGORIES= japanese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
index d1e6c94acb1b..2d440ae0291d 100644
--- a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
+++ b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-JA-Summarize-Extract
PORTVERSION= 0.01
CATEGORIES= japanese textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/Y/YA/YAPPO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= ja-p5-
MAINTAINER= markun@onohara.to
diff --git a/japanese/p5-Number-Phone-JP/Makefile b/japanese/p5-Number-Phone-JP/Makefile
index d36209580002..f6203b6dcd79 100644
--- a/japanese/p5-Number-Phone-JP/Makefile
+++ b/japanese/p5-Number-Phone-JP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Number-Phone-JP
PORTVERSION= 0.03
CATEGORIES= japanese perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/T/TA/TANIGUCHI/
+MASTER_SITES= CPAN
PKGNAMEPREFIX= ja-p5-
MAINTAINER= nork@FreeBSD.org
diff --git a/japanese/p5-Text-MeCab/Makefile b/japanese/p5-Text-MeCab/Makefile
index e5b9aa3cc3e0..49a6d98d4815 100644
--- a/japanese/p5-Text-MeCab/Makefile
+++ b/japanese/p5-Text-MeCab/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-MeCab
PORTVERSION= 0.20007
CATEGORIES= japanese textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
MAINTAINER= fmysh@iijmio-mail.jp
COMMENT= Alternate Interface To libmecab
diff --git a/japanese/p5-Unicode-Japanese/Makefile b/japanese/p5-Unicode-Japanese/Makefile
index 3f2068b6db76..23366aae8f4b 100644
--- a/japanese/p5-Unicode-Japanese/Makefile
+++ b/japanese/p5-Unicode-Japanese/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Unicode-Japanese
PORTVERSION= 0.37
CATEGORIES= japanese converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/H/HI/HIO
+MASTER_SITES= CPAN
MAINTAINER= knu@FreeBSD.org
COMMENT= A Perl5 module to handle Japanese character encodings
diff --git a/japanese/p5-WWW-2ch/Makefile b/japanese/p5-WWW-2ch/Makefile
index 32f44c0f987f..4b9322b26595 100644
--- a/japanese/p5-WWW-2ch/Makefile
+++ b/japanese/p5-WWW-2ch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= WWW-2ch
PORTVERSION= 0.07
CATEGORIES= japanese www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= WWW
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kaoru@kaisei.org
diff --git a/lang/p5-Data-JavaScript/Makefile b/lang/p5-Data-JavaScript/Makefile
index efb63828031b..04788125ca35 100644
--- a/lang/p5-Data-JavaScript/Makefile
+++ b/lang/p5-Data-JavaScript/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-JavaScript
PORTVERSION= 1.11
CATEGORIES= lang www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g}
EXTRACT_SUFX= .tgz
diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile
index 7d0e6a25f728..a6205dfc390a 100644
--- a/lang/p5-ExtUtils-F77/Makefile
+++ b/lang/p5-ExtUtils-F77/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ExtUtils-F77
PORTVERSION= 1.15
PORTREVISION= 2
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jmz@FreeBSD.org
diff --git a/lang/p5-F77/Makefile b/lang/p5-F77/Makefile
index 7d0e6a25f728..a6205dfc390a 100644
--- a/lang/p5-F77/Makefile
+++ b/lang/p5-F77/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ExtUtils-F77
PORTVERSION= 1.15
PORTREVISION= 2
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jmz@FreeBSD.org
diff --git a/lang/p5-Interpolation/Makefile b/lang/p5-Interpolation/Makefile
index 60d2c7e89038..e3b26dbff800 100644
--- a/lang/p5-Interpolation/Makefile
+++ b/lang/p5-Interpolation/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Interpolation
PORTVERSION= 0.71
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/J/JE/JENDA
PKGNAMEPREFIX= p5-
diff --git a/lang/p5-JSAN/Makefile b/lang/p5-JSAN/Makefile
index 73a144295934..e95a35d0e573 100644
--- a/lang/p5-JSAN/Makefile
+++ b/lang/p5-JSAN/Makefile
@@ -9,7 +9,7 @@ PORTNAME= JSAN
PORTVERSION= 0.07
PORTREVISION= 2
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CW/CWEST
PKGNAMEPREFIX= p5-
diff --git a/lang/p5-JavaScript-Squish/Makefile b/lang/p5-JavaScript-Squish/Makefile
index f9d16c2ced3f..37e7de281896 100644
--- a/lang/p5-JavaScript-Squish/Makefile
+++ b/lang/p5-JavaScript-Squish/Makefile
@@ -8,8 +8,7 @@
PORTNAME= JavaScript-Squish
PORTVERSION= 0.07
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= JavaScript
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/lang/p5-JavaScript/Makefile b/lang/p5-JavaScript/Makefile
index c4612fdc05b0..5ece5d04aee8 100644
--- a/lang/p5-JavaScript/Makefile
+++ b/lang/p5-JavaScript/Makefile
@@ -9,8 +9,7 @@ PORTNAME= JavaScript
PORTVERSION= 0.55
PORTREVISION= 1
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= JavaScript
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/lang/p5-List-MoreUtils/Makefile b/lang/p5-List-MoreUtils/Makefile
index 7a52be6f8900..6915f86523cb 100644
--- a/lang/p5-List-MoreUtils/Makefile
+++ b/lang/p5-List-MoreUtils/Makefile
@@ -8,7 +8,7 @@
PORTNAME= List-MoreUtils
PORTVERSION= 0.22
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/V/VP/VPARSEVAL
PKGNAMEPREFIX= p5-
diff --git a/lang/p5-Perl6-Subs/Makefile b/lang/p5-Perl6-Subs/Makefile
index f2940f493256..c404a48776ec 100644
--- a/lang/p5-Perl6-Subs/Makefile
+++ b/lang/p5-Perl6-Subs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Subs
PORTVERSION= 0.05
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Perl6
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/lang/p5-Quantum-Superpositions/Makefile b/lang/p5-Quantum-Superpositions/Makefile
index 559abb86733c..9d2fa2817445 100644
--- a/lang/p5-Quantum-Superpositions/Makefile
+++ b/lang/p5-Quantum-Superpositions/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Quantum-Superpositions
PORTVERSION= 2.02
CATEGORIES= lang science perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Quantum
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/lang/p5-Scalar-List-Utils/Makefile b/lang/p5-Scalar-List-Utils/Makefile
index 25b6f30fdc71..0cdd7e862dbe 100644
--- a/lang/p5-Scalar-List-Utils/Makefile
+++ b/lang/p5-Scalar-List-Utils/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Scalar-List-Utils
PORTVERSION= 1.19
PORTEPOCH= 1
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Scalar
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/lang/p5-Switch/Makefile b/lang/p5-Switch/Makefile
index 9be25af2b2c8..cac4a06864eb 100644
--- a/lang/p5-Switch/Makefile
+++ b/lang/p5-Switch/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Switch
PORTVERSION= 2.13
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/R/RG/RGARCIA
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/R/RG/RGARCIA
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index f87ca773ac3f..210ff2408e2b 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tcl
PORTVERSION= 0.95
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tcl
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 24fbd934cfe4..f9e732c84f67 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -8,8 +8,7 @@
PORTNAME= parrot
PORTVERSION= 0.6.0
CATEGORIES= lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/B/BS/BSCHMAL/
+MASTER_SITES= CPAN
MAINTAINER= skv@FreeBSD.org
COMMENT= Parrot - virtual machine for dynamic languages
diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index 3c607d2a42a9..00fdf85e2c6c 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -9,7 +9,7 @@ PORTNAME= perl
PORTVERSION= ${PERL_VER}
PORTREVISION= 1
CATEGORIES= lang devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
http://www.tobez.org/download/port-mirrors/lang/perl58/:local
MASTER_SITE_SUBDIR= ../../src \
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index 3c607d2a42a9..00fdf85e2c6c 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -9,7 +9,7 @@ PORTNAME= perl
PORTVERSION= ${PERL_VER}
PORTREVISION= 1
CATEGORIES= lang devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
http://www.tobez.org/download/port-mirrors/lang/perl58/:local
MASTER_SITE_SUBDIR= ../../src \
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 3c607d2a42a9..00fdf85e2c6c 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -9,7 +9,7 @@ PORTNAME= perl
PORTVERSION= ${PERL_VER}
PORTREVISION= 1
CATEGORIES= lang devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
http://www.tobez.org/download/port-mirrors/lang/perl58/:local
MASTER_SITE_SUBDIR= ../../src \
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 3c607d2a42a9..00fdf85e2c6c 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -9,7 +9,7 @@ PORTNAME= perl
PORTVERSION= ${PERL_VER}
PORTREVISION= 1
CATEGORIES= lang devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
http://www.tobez.org/download/port-mirrors/lang/perl58/:local
MASTER_SITE_SUBDIR= ../../src \
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index 1c9a50d93d6e..539542be4baf 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -9,7 +9,7 @@ PORTNAME= perl
PORTVERSION= ${PERL_VER}
PORTREVISION= 2
CATEGORIES= lang devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
http://www.tobez.org/download/port-mirrors/lang/perl56/:local
MASTER_SITE_SUBDIR= ../../src \
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index 3c607d2a42a9..00fdf85e2c6c 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -9,7 +9,7 @@ PORTNAME= perl
PORTVERSION= ${PERL_VER}
PORTREVISION= 1
CATEGORIES= lang devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
http://www.tobez.org/download/port-mirrors/lang/perl58/:local
MASTER_SITE_SUBDIR= ../../src \
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 1c9a50d93d6e..539542be4baf 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -9,7 +9,7 @@ PORTNAME= perl
PORTVERSION= ${PERL_VER}
PORTREVISION= 2
CATEGORIES= lang devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
http://www.tobez.org/download/port-mirrors/lang/perl56/:local
MASTER_SITE_SUBDIR= ../../src \
diff --git a/lang/pugs/Makefile b/lang/pugs/Makefile
index ee7a36021a76..84f329938e2c 100644
--- a/lang/pugs/Makefile
+++ b/lang/pugs/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pugs
PORTVERSION= 6.2.13
PORTREVISION= 1
CATEGORIES= lang devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Perl6
+MASTER_SITES= CPAN
DISTNAME= Perl6-Pugs-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 03af3a37e071..0a01484fcc38 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mailagent
PORTVERSION= 3.0.73
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/RAM
MAINTAINER= max@FreeBSD.org
diff --git a/mail/p5-Email-Filter/Makefile b/mail/p5-Email-Filter/Makefile
index c6dc94b01522..3081ce5538e3 100644
--- a/mail/p5-Email-Filter/Makefile
+++ b/mail/p5-Email-Filter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-Filter
PORTVERSION= 1.03.1
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 5c920e3e67e2..0b4e643b7543 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-Find
PORTVERSION= 0.10
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
index d83c6a52822e..c92e2cc8b59f 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-LocalDelivery-Ezmlm
PORTVERSION= 0.10
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/mail/p5-Email-LocalDelivery/Makefile b/mail/p5-Email-LocalDelivery/Makefile
index 015f319426b0..b1230ebb4e81 100644
--- a/mail/p5-Email-LocalDelivery/Makefile
+++ b/mail/p5-Email-LocalDelivery/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Email-LocalDelivery
PORTVERSION= 0.21.7
DISTVERSION= ${PORTVERSION:C/\.(.)$/\1/}
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/mail/p5-Email-MessageID/Makefile b/mail/p5-Email-MessageID/Makefile
index 5682ea4640df..b2110edf0091 100644
--- a/mail/p5-Email-MessageID/Makefile
+++ b/mail/p5-Email-MessageID/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-MessageID
PORTVERSION= 1.351
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/mail/p5-Email-Reply/Makefile b/mail/p5-Email-Reply/Makefile
index fb6331b1a6c0..8d275bb426c4 100644
--- a/mail/p5-Email-Reply/Makefile
+++ b/mail/p5-Email-Reply/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-Reply
PORTVERSION= 1.202
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kay.abendroth@raxion.net
diff --git a/mail/p5-Email-Send/Makefile b/mail/p5-Email-Send/Makefile
index ce0198c0ee1c..4e967bb66714 100644
--- a/mail/p5-Email-Send/Makefile
+++ b/mail/p5-Email-Send/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-Send
PORTVERSION= 2.192
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/mail/p5-Email-Simple-Creator/Makefile b/mail/p5-Email-Simple-Creator/Makefile
index df09e5f2375d..f5c70410f432 100644
--- a/mail/p5-Email-Simple-Creator/Makefile
+++ b/mail/p5-Email-Simple-Creator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-Simple-Creator
PORTVERSION= 1.424
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile
index 1b1854cb34be..dcc910e4cba4 100644
--- a/mail/p5-Email-Simple/Makefile
+++ b/mail/p5-Email-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-Simple
PORTVERSION= 2.00.3
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C|\.([0-9])$|\1|}
diff --git a/mail/p5-Email-Valid-Loose/Makefile b/mail/p5-Email-Valid-Loose/Makefile
index 914f9fbe0f2d..1d554e8e1a34 100644
--- a/mail/p5-Email-Valid-Loose/Makefile
+++ b/mail/p5-Email-Valid-Loose/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-Valid-Loose
PORTVERSION= 0.05
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index dc735c70aef3..9c147d6c4bcf 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-Valid
PORTVERSION= 0.179
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/mail/p5-GMail-IMAPD/Makefile b/mail/p5-GMail-IMAPD/Makefile
index fcae6204e1ba..7ad37036ecc1 100644
--- a/mail/p5-GMail-IMAPD/Makefile
+++ b/mail/p5-GMail-IMAPD/Makefile
@@ -8,8 +8,7 @@
PORTNAME= GMail-IMAPD
PORTVERSION= 0.94
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GMail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mashtizadeh@gmail.com
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index 1aee494361e7..1447fa131daf 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IMAP-Admin
PORTVERSION= 1.6.4
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IMAP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/p5-IMAP-Client/Makefile b/mail/p5-IMAP-Client/Makefile
index 48fa68791752..a2bd353efdd4 100644
--- a/mail/p5-IMAP-Client/Makefile
+++ b/mail/p5-IMAP-Client/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IMAP-Client
PORTVERSION= 0.13
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IMAP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/mail/p5-MIME-Charset/Makefile b/mail/p5-MIME-Charset/Makefile
index 4705f7779fbb..ea09687a3272 100644
--- a/mail/p5-MIME-Charset/Makefile
+++ b/mail/p5-MIME-Charset/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MIME-Charset
PORTVERSION= 0.044
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MIME
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= Olivier.Girard@univ-angers.fr
diff --git a/mail/p5-MIME-EncWords/Makefile b/mail/p5-MIME-EncWords/Makefile
index a718300c685a..f85c42859145 100644
--- a/mail/p5-MIME-EncWords/Makefile
+++ b/mail/p5-MIME-EncWords/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MIME-EncWords
PORTVERSION= 0.040
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MIME
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= Olivier.Girard@univ-angers.fr
diff --git a/mail/p5-MIME-Explode/Makefile b/mail/p5-MIME-Explode/Makefile
index 59a9002f8548..91826767966b 100644
--- a/mail/p5-MIME-Explode/Makefile
+++ b/mail/p5-MIME-Explode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MIME-Explode
PORTVERSION= 0.38
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MIME
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile
index d3a063e7f99f..2c46c3f47ffd 100644
--- a/mail/p5-MIME-Fast/Makefile
+++ b/mail/p5-MIME-Fast/Makefile
@@ -9,8 +9,7 @@ PORTNAME= MIME-Fast
PORTVERSION= 1.6
PORTREVISION= 4
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MIME
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/mail/p5-MIME-Lite-HTML/Makefile b/mail/p5-MIME-Lite-HTML/Makefile
index 156c891ee115..b75023c8aa37 100644
--- a/mail/p5-MIME-Lite-HTML/Makefile
+++ b/mail/p5-MIME-Lite-HTML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MIME-Lite-HTML
PORTVERSION= 1.22
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MIME
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jb.quenot@caraldi.com
diff --git a/mail/p5-MIME-Types/Makefile b/mail/p5-MIME-Types/Makefile
index 0f345157daca..7aa0a58d535a 100644
--- a/mail/p5-MIME-Types/Makefile
+++ b/mail/p5-MIME-Types/Makefile
@@ -7,8 +7,7 @@
PORTNAME= MIME-Types
PORTVERSION= 1.23
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MIME
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/mail/p5-Mail-Address-MobileJp/Makefile b/mail/p5-Mail-Address-MobileJp/Makefile
index cb15a5d8d5d0..c35ac8101b8f 100644
--- a/mail/p5-Mail-Address-MobileJp/Makefile
+++ b/mail/p5-Mail-Address-MobileJp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Address-MobileJp
PORTVERSION= 0.08
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/mail/p5-Mail-Alias/Makefile b/mail/p5-Mail-Alias/Makefile
index 9594e5e3be09..0bf61ba64291 100644
--- a/mail/p5-Mail-Alias/Makefile
+++ b/mail/p5-Mail-Alias/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Alias
PORTVERSION= 1.12
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/p5-Mail-Audit-Attach/Makefile b/mail/p5-Mail-Audit-Attach/Makefile
index f56f9228367d..b835b2ff34bc 100644
--- a/mail/p5-Mail-Audit-Attach/Makefile
+++ b/mail/p5-Mail-Audit-Attach/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Audit-Attach
PORTVERSION= 0.94
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/mail/p5-Mail-Box-Parser-C/Makefile b/mail/p5-Mail-Box-Parser-C/Makefile
index dbbaf7a8a6dd..463a9efc1f13 100644
--- a/mail/p5-Mail-Box-Parser-C/Makefile
+++ b/mail/p5-Mail-Box-Parser-C/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Box-Parser-C
PORTVERSION= 3.006
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index e4c6c43cbed0..d624c31b17d8 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Box
PORTVERSION= 2.080
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/mail/p5-Mail-Bulkmail/Makefile b/mail/p5-Mail-Bulkmail/Makefile
index 266d5a25ac4a..1b9376b410c3 100644
--- a/mail/p5-Mail-Bulkmail/Makefile
+++ b/mail/p5-Mail-Bulkmail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Bulkmail
PORTVERSION= 3.12
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/mail/p5-Mail-CClient/Makefile b/mail/p5-Mail-CClient/Makefile
index b4896ccf2a31..b21d20d4a876 100644
--- a/mail/p5-Mail-CClient/Makefile
+++ b/mail/p5-Mail-CClient/Makefile
@@ -9,8 +9,7 @@ PORTNAME= CClient
PORTVERSION= 1.12
PORTREVISION= 1
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail/HDIAS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Mail-Cclient-${PORTVERSION}
diff --git a/mail/p5-Mail-CheckUser/Makefile b/mail/p5-Mail-CheckUser/Makefile
index 027260656a91..2908c3d7946b 100644
--- a/mail/p5-Mail-CheckUser/Makefile
+++ b/mail/p5-Mail-CheckUser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-CheckUser
PORTVERSION= 1.21
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= bra@fsn.hu
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index 35ffaedd0170..3f45548f1372 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Mail-ClamAV
PORTVERSION= 0.20
PORTREVISION= 2
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= j.koopmann@seceidos.de
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index 04745f2a4488..9abfd2fad0d9 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-DKIM
PORTVERSION= 0.30.1
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= yanagisawa@csg.is.titech.ac.jp
diff --git a/mail/p5-Mail-DomainKeys/Makefile b/mail/p5-Mail-DomainKeys/Makefile
index 855fdc72efd0..c0affec5af6a 100644
--- a/mail/p5-Mail-DomainKeys/Makefile
+++ b/mail/p5-Mail-DomainKeys/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-DomainKeys
PORTVERSION= 1.0
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index 8f6311c758d3..ec7662928467 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -8,9 +8,8 @@
PORTNAME= Mail-Ezmlm
PORTVERSION= 0.07.2
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
ftp://ftp.rucus.ru.ac.za/users/guy/ezmlm/
-MASTER_SITE_SUBDIR= Mail
PKGNAMEPREFIX= p5-
DISTNAME= Ezmlm-${PORTVERSION}
diff --git a/mail/p5-Mail-Field-Received/Makefile b/mail/p5-Mail-Field-Received/Makefile
index fdf0a0950945..fd724f72d1e2 100644
--- a/mail/p5-Mail-Field-Received/Makefile
+++ b/mail/p5-Mail-Field-Received/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Field-Received
PORTVERSION= 0.24
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= freebsd@netfence.it
diff --git a/mail/p5-Mail-FilterXML/Makefile b/mail/p5-Mail-FilterXML/Makefile
index 805168e46579..28d107b91ac8 100644
--- a/mail/p5-Mail-FilterXML/Makefile
+++ b/mail/p5-Mail-FilterXML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-FilterXML
PORTVERSION= 0.3
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index a99a62983ae4..76b8b3d6a2e9 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Folder
PORTVERSION= 0.07
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= MailFolder-${PORTVERSION}
diff --git a/mail/p5-Mail-Freshmeat/Makefile b/mail/p5-Mail-Freshmeat/Makefile
index 606af9cedd2b..25e06f06a6a8 100644
--- a/mail/p5-Mail-Freshmeat/Makefile
+++ b/mail/p5-Mail-Freshmeat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Freshmeat
PORTVERSION= 1.20
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/mail/p5-Mail-Graph/Makefile b/mail/p5-Mail-Graph/Makefile
index 67cf15909391..e6d97b1da2a6 100644
--- a/mail/p5-Mail-Graph/Makefile
+++ b/mail/p5-Mail-Graph/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Mail-Graph
PORTVERSION= 0.14
PORTREVISION= 1
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/mail/p5-Mail-IMAPTalk/Makefile b/mail/p5-Mail-IMAPTalk/Makefile
index 5d927f2f8dd8..c8b408b2086d 100644
--- a/mail/p5-Mail-IMAPTalk/Makefile
+++ b/mail/p5-Mail-IMAPTalk/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-IMAPTalk
PORTVERSION= 1.03
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/mail/p5-Mail-ListDetector/Makefile b/mail/p5-Mail-ListDetector/Makefile
index 7cf8c0807e3d..704d622e4083 100644
--- a/mail/p5-Mail-ListDetector/Makefile
+++ b/mail/p5-Mail-ListDetector/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-ListDetector
PORTVERSION= 1.01
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index 2cc2139348e6..be3b4f95085f 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MailStats
PORTVERSION= 0.02
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile
index 210d0b1fa75c..d39e5c5bfc2a 100644
--- a/mail/p5-Mail-Mbox-MessageParser/Makefile
+++ b/mail/p5-Mail-Mbox-MessageParser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Mbox-MessageParser
PORTVERSION= 1.5000
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/mail/p5-Mail-MboxParser/Makefile b/mail/p5-Mail-MboxParser/Makefile
index 9c952166ea46..f2abe093fbc0 100644
--- a/mail/p5-Mail-MboxParser/Makefile
+++ b/mail/p5-Mail-MboxParser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-MboxParser
PORTVERSION= 0.55
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/mail/p5-Mail-OpenRelay-Simple/Makefile b/mail/p5-Mail-OpenRelay-Simple/Makefile
index 3d8eb9b7ff1f..74300f44a547 100644
--- a/mail/p5-Mail-OpenRelay-Simple/Makefile
+++ b/mail/p5-Mail-OpenRelay-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-OpenRelay-Simple
PORTVERSION= 0.02
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index b5860a285bda..1800e1979949 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-POP3Client
PORTVERSION= 2.17
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/mail/p5-Mail-Procmailrc/Makefile b/mail/p5-Mail-Procmailrc/Makefile
index bacbc8991572..46c23d50e5b2 100644
--- a/mail/p5-Mail-Procmailrc/Makefile
+++ b/mail/p5-Mail-Procmailrc/Makefile
@@ -9,9 +9,8 @@
PORTNAME= Mail-Procmailrc
PORTVERSION= 1.09
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://scott.wiersdorf.org/perl/
-MASTER_SITE_SUBDIR= Mail
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/mail/p5-Mail-QuoteWrap/Makefile b/mail/p5-Mail-QuoteWrap/Makefile
index 6b13b7a7a016..0236900fda9d 100644
--- a/mail/p5-Mail-QuoteWrap/Makefile
+++ b/mail/p5-Mail-QuoteWrap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-QuoteWrap
PORTVERSION= 0.01
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= MailQuoteWrap${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/mail/p5-Mail-RBL/Makefile b/mail/p5-Mail-RBL/Makefile
index 561fb787c892..3b997902871f 100644
--- a/mail/p5-Mail-RBL/Makefile
+++ b/mail/p5-Mail-RBL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-RBL
PORTVERSION= 1.10
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/mail/p5-Mail-RFC822-Address/Makefile b/mail/p5-Mail-RFC822-Address/Makefile
index 0f2c909a3a1e..baf21736687d 100644
--- a/mail/p5-Mail-RFC822-Address/Makefile
+++ b/mail/p5-Mail-RFC822-Address/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-RFC822-Address
PORTVERSION= 0.3
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= barner@FreeBSD.org
diff --git a/mail/p5-Mail-SPF-Query/Makefile b/mail/p5-Mail-SPF-Query/Makefile
index de23b9271a4a..d1a066f18385 100644
--- a/mail/p5-Mail-SPF-Query/Makefile
+++ b/mail/p5-Mail-SPF-Query/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-SPF-Query
PORTVERSION= 1.999.1
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile
index af83d5cd84fb..217a4cfaa70b 100644
--- a/mail/p5-Mail-SRS/Makefile
+++ b/mail/p5-Mail-SRS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-SRS
PORTVERSION= 0.31
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/p5-Mail-SendEasy/Makefile b/mail/p5-Mail-SendEasy/Makefile
index 5aa8e2414ed5..53c08dfc9ec7 100644
--- a/mail/p5-Mail-SendEasy/Makefile
+++ b/mail/p5-Mail-SendEasy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-SendEasy
PORTVERSION= 1.2
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/mail/p5-Mail-Sender/Makefile b/mail/p5-Mail-Sender/Makefile
index 564681296901..15fdc97f4e38 100644
--- a/mail/p5-Mail-Sender/Makefile
+++ b/mail/p5-Mail-Sender/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Sender
PORTVERSION= 0.8.13
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/mail/p5-Mail-Sendmail/Makefile b/mail/p5-Mail-Sendmail/Makefile
index 888291efb63f..0c912dace1c4 100644
--- a/mail/p5-Mail-Sendmail/Makefile
+++ b/mail/p5-Mail-Sendmail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Sendmail
PORTVERSION= 0.79
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index adb12745e4c6..d693bb2e5c3f 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Spool
PORTVERSION= 0.50
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/p5-Mail-Transport-Dbx/Makefile b/mail/p5-Mail-Transport-Dbx/Makefile
index 5b212d74d286..27cde1d7c83c 100644
--- a/mail/p5-Mail-Transport-Dbx/Makefile
+++ b/mail/p5-Mail-Transport-Dbx/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Transport-Dbx
PORTVERSION= 0.07
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index 574fe414a88f..ffc790bfb123 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Verify
PORTVERSION= 0.02
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/p5-Mail-Webmail-Gmail/Makefile b/mail/p5-Mail-Webmail-Gmail/Makefile
index b0d29d1ad683..d4c1530b473c 100644
--- a/mail/p5-Mail-Webmail-Gmail/Makefile
+++ b/mail/p5-Mail-Webmail-Gmail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mail-Webmail-Gmail
PORTVERSION= 1.09
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= farrokhi@FreeBSD.org
diff --git a/mail/p5-Net-IMAP-Simple-SSL/Makefile b/mail/p5-Net-IMAP-Simple-SSL/Makefile
index 767c054d85f7..9ef43c80186b 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/Makefile
+++ b/mail/p5-Net-IMAP-Simple-SSL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-IMAP-Simple-SSL
PORTVERSION= 1.3
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/mail/p5-Net-IMAP-Simple/Makefile b/mail/p5-Net-IMAP-Simple/Makefile
index b136aac854b1..d6c0d300bf53 100644
--- a/mail/p5-Net-IMAP-Simple/Makefile
+++ b/mail/p5-Net-IMAP-Simple/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Net-IMAP-Simple
PORTVERSION= 1.17
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/C/CF/CFABER
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-QMTP/Makefile b/mail/p5-Net-QMTP/Makefile
index ebc6d21e0985..eda20cdee0de 100644
--- a/mail/p5-Net-QMTP/Makefile
+++ b/mail/p5-Net-QMTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-QMTP
PORTVERSION= 0.06
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= james@now.ie
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index 3dc0ef7003da..2588013c57eb 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SMTP-Server
PORTVERSION= 1.1
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= SMTP-Server-${PORTVERSION}
diff --git a/mail/p5-Net-SMTP-TLS/Makefile b/mail/p5-Net-SMTP-TLS/Makefile
index 02d8b7b4cb5f..fbb977822b1d 100644
--- a/mail/p5-Net-SMTP-TLS/Makefile
+++ b/mail/p5-Net-SMTP-TLS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SMTP-TLS
PORTVERSION= 0.12
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/mail/p5-Net-SMTP_auth/Makefile b/mail/p5-Net-SMTP_auth/Makefile
index 39619279f586..22f82ff44919 100644
--- a/mail/p5-Net-SMTP_auth/Makefile
+++ b/mail/p5-Net-SMTP_auth/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SMTP_auth
PORTVERSION= 0.08
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index c377a3088e40..5d34d75305b9 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/p5-POE-Component-Client-POP3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Client-POP3
PORTVERSION= 0.02
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/mail/p5-POE-Component-Client-SMTP/Makefile b/mail/p5-POE-Component-Client-SMTP/Makefile
index a4913bf8a6e7..e8cf22c0dd43 100644
--- a/mail/p5-POE-Component-Client-SMTP/Makefile
+++ b/mail/p5-POE-Component-Client-SMTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Client-SMTP
PORTVERSION= 0.18
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/mail/p5-POE-Component-SMTP/Makefile b/mail/p5-POE-Component-SMTP/Makefile
index ccaf946741c3..1cbb4068ad10 100644
--- a/mail/p5-POE-Component-SMTP/Makefile
+++ b/mail/p5-POE-Component-SMTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-SMTP
PORTVERSION= 1.6
CATEGORIES= mail devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/mail/p5-Parse-Syslog-Mail/Makefile b/mail/p5-Parse-Syslog-Mail/Makefile
index 9d687d593d63..ea11d0760ee9 100644
--- a/mail/p5-Parse-Syslog-Mail/Makefile
+++ b/mail/p5-Parse-Syslog-Mail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Parse-Syslog-Mail
PORTVERSION= 0.14
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/mail/p5-Qmail-Envelope/Makefile b/mail/p5-Qmail-Envelope/Makefile
index e520afd87fc8..5c37c3b9fa70 100644
--- a/mail/p5-Qmail-Envelope/Makefile
+++ b/mail/p5-Qmail-Envelope/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Qmail-Envelope
PORTVERSION= 0.53
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/M/MJ/MJA
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
index fd4a7a79d29e..012dfd344fe7 100644
--- a/mail/p5-Sendmail-AccessDB/Makefile
+++ b/mail/p5-Sendmail-AccessDB/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sendmail-AccessDB
PORTVERSION= 0.09
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sendmail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/mail/p5-Sendmail-Milter/Makefile b/mail/p5-Sendmail-Milter/Makefile
index 35e6c04b8dd2..15f2e3c15e0d 100644
--- a/mail/p5-Sendmail-Milter/Makefile
+++ b/mail/p5-Sendmail-Milter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sendmail-Milter
PORTVERSION= 0.18
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sendmail
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= marc@pilgerer.org
diff --git a/mail/p5-URI-imap/Makefile b/mail/p5-URI-imap/Makefile
index 870746dcea07..4bffa4b5836e 100644
--- a/mail/p5-URI-imap/Makefile
+++ b/mail/p5-URI-imap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= URI-imap
PORTVERSION= 1.01
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= URI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/mail/p5-URI-imaps/Makefile b/mail/p5-URI-imaps/Makefile
index c6df028766bf..3ce4a82ad854 100644
--- a/mail/p5-URI-imaps/Makefile
+++ b/mail/p5-URI-imaps/Makefile
@@ -8,8 +8,7 @@
PORTNAME= URI-imaps
PORTVERSION= 1.01
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= URI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/mail/p5-WWW-GMail/Makefile b/mail/p5-WWW-GMail/Makefile
index ef1be894091e..6d13904f4ee8 100644
--- a/mail/p5-WWW-GMail/Makefile
+++ b/mail/p5-WWW-GMail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= WWW-GMail
PORTVERSION= 0.07
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= WWW
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/mail/p5-WWW-Hotmail/Makefile b/mail/p5-WWW-Hotmail/Makefile
index 3b92681bb6df..6e1a5a012837 100644
--- a/mail/p5-WWW-Hotmail/Makefile
+++ b/mail/p5-WWW-Hotmail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= WWW-Hotmail
PORTVERSION= 0.10
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= WWW
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/math/p5-AI-DecisionTree/Makefile b/math/p5-AI-DecisionTree/Makefile
index 83fdaa958e78..eb5cd42f1ef7 100644
--- a/math/p5-AI-DecisionTree/Makefile
+++ b/math/p5-AI-DecisionTree/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AI-DecisionTree
PORTVERSION= 0.08
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= AI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/math/p5-AI-Genetic/Makefile b/math/p5-AI-Genetic/Makefile
index 0001822efa4f..0765d7d5cb04 100644
--- a/math/p5-AI-Genetic/Makefile
+++ b/math/p5-AI-Genetic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AI-Genetic
PORTVERSION= 0.05
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= AI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-AI-NeuralNet-BackProp/Makefile b/math/p5-AI-NeuralNet-BackProp/Makefile
index b8b2f630707b..876f4d2cc413 100644
--- a/math/p5-AI-NeuralNet-BackProp/Makefile
+++ b/math/p5-AI-NeuralNet-BackProp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AI-NeuralNet-BackProp
PORTVERSION= 0.89
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= AI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-AI-Perceptron/Makefile b/math/p5-AI-Perceptron/Makefile
index 3ee00dd6c258..51aa958fb39c 100644
--- a/math/p5-AI-Perceptron/Makefile
+++ b/math/p5-AI-Perceptron/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AI-Perceptron
PORTVERSION= 1.0
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= AI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Algorithm-Combinatorics/Makefile b/math/p5-Algorithm-Combinatorics/Makefile
index c14035820b38..595486e93669 100644
--- a/math/p5-Algorithm-Combinatorics/Makefile
+++ b/math/p5-Algorithm-Combinatorics/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Combinatorics
PORTVERSION= 0.25
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Bit-ShiftReg/Makefile b/math/p5-Bit-ShiftReg/Makefile
index 9bc963e99b6b..1764508d7dbf 100644
--- a/math/p5-Bit-ShiftReg/Makefile
+++ b/math/p5-Bit-ShiftReg/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Bit-ShiftReg
PORTVERSION= 2.0
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Bit
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Bit-Vector-Minimal/Makefile b/math/p5-Bit-Vector-Minimal/Makefile
index 9bf851f6c97a..9a4bb84dd678 100644
--- a/math/p5-Bit-Vector-Minimal/Makefile
+++ b/math/p5-Bit-Vector-Minimal/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Bit-Vector-Minimal
PORTVERSION= 1.3
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Bit
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Bit-Vector/Makefile b/math/p5-Bit-Vector/Makefile
index d4ec36687d25..00c77403c7a7 100644
--- a/math/p5-Bit-Vector/Makefile
+++ b/math/p5-Bit-Vector/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Bit-Vector
PORTVERSION= 6.4
PORTREVISION= 1
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Bit
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-CAD-Calc/Makefile b/math/p5-CAD-Calc/Makefile
index 7f8ee0baeb76..945c8462993b 100644
--- a/math/p5-CAD-Calc/Makefile
+++ b/math/p5-CAD-Calc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= CAD-Calc
PORTVERSION= 0.26
CATEGORIES= math graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CAD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Date-Handler/Makefile b/math/p5-Date-Handler/Makefile
index 35d5532e1c3e..9dac9bc8bb91 100644
--- a/math/p5-Date-Handler/Makefile
+++ b/math/p5-Date-Handler/Makefile
@@ -10,8 +10,7 @@
PORTNAME= Date-Handler
PORTVERSION= 1.2
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Geo-Distance/Makefile b/math/p5-Geo-Distance/Makefile
index da087022962e..eab8375cbfdd 100644
--- a/math/p5-Geo-Distance/Makefile
+++ b/math/p5-Geo-Distance/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Geo-Distance
PORTVERSION= 0.11
CATEGORIES= math perl5 geography
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Geo
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Graph/Makefile b/math/p5-Graph/Makefile
index 7925d952b97e..a24a65dc38e2 100644
--- a/math/p5-Graph/Makefile
+++ b/math/p5-Graph/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Graph
PORTVERSION= 0.84
PORTEPOCH= 1
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Graph
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Math-Algebra-Symbols/Makefile b/math/p5-Math-Algebra-Symbols/Makefile
index 1c988b4b2f38..34d63811b0e2 100644
--- a/math/p5-Math-Algebra-Symbols/Makefile
+++ b/math/p5-Math-Algebra-Symbols/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Algebra-Symbols
PORTVERSION= 1.21
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Base85/Makefile b/math/p5-Math-Base85/Makefile
index 3fe84b92698d..f5e70d255325 100644
--- a/math/p5-Math-Base85/Makefile
+++ b/math/p5-Math-Base85/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Base85
PORTVERSION= 0.2
CATEGORIES= math perl5 converters net
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Math-BaseCalc/Makefile b/math/p5-Math-BaseCalc/Makefile
index 0d8e18a69020..2eecf94fae2a 100644
--- a/math/p5-Math-BaseCalc/Makefile
+++ b/math/p5-Math-BaseCalc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-BaseCalc
PORTVERSION= 1.011
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Math-Bezier-Convert/Makefile b/math/p5-Math-Bezier-Convert/Makefile
index b05951095742..42a267bc9cc3 100644
--- a/math/p5-Math-Bezier-Convert/Makefile
+++ b/math/p5-Math-Bezier-Convert/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Bezier-Convert
PORTVERSION= 0.02
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/Y/YS/YSAS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/math/p5-Math-Bezier/Makefile b/math/p5-Math-Bezier/Makefile
index a8e345349bf0..84f4dbfdd2a0 100644
--- a/math/p5-Math-Bezier/Makefile
+++ b/math/p5-Math-Bezier/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Bezier
PORTVERSION= 0.01
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Math-BigInt-GMP/Makefile b/math/p5-Math-BigInt-GMP/Makefile
index 8a0614f9d21f..77b50763b337 100644
--- a/math/p5-Math-BigInt-GMP/Makefile
+++ b/math/p5-Math-BigInt-GMP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-BigInt-GMP
PORTVERSION= 1.24
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Math-BigInt/Makefile b/math/p5-Math-BigInt/Makefile
index 51189f1df84e..5adc63fc95be 100644
--- a/math/p5-Math-BigInt/Makefile
+++ b/math/p5-Math-BigInt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-BigInt
PORTVERSION= 1.87
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Math-BigRat/Makefile b/math/p5-Math-BigRat/Makefile
index 2051141a93be..de6be7ec1eff 100644
--- a/math/p5-Math-BigRat/Makefile
+++ b/math/p5-Math-BigRat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-BigRat
PORTVERSION= 0.22
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/math/p5-Math-Calc-Units/Makefile b/math/p5-Math-Calc-Units/Makefile
index be4a8fc58eac..8f0ee722c2ee 100644
--- a/math/p5-Math-Calc-Units/Makefile
+++ b/math/p5-Math-Calc-Units/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Calc-Units
PORTVERSION= 1.06
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Math-Cephes/Makefile b/math/p5-Math-Cephes/Makefile
index 5b3268ecde7f..ace94b168c45 100644
--- a/math/p5-Math-Cephes/Makefile
+++ b/math/p5-Math-Cephes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Cephes
PORTVERSION= 0.45
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Combinatorics/Makefile b/math/p5-Math-Combinatorics/Makefile
index 5567fe019894..f2d113d2de55 100644
--- a/math/p5-Math-Combinatorics/Makefile
+++ b/math/p5-Math-Combinatorics/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Combinatorics
PORTVERSION= 0.09
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-ConvexHull/Makefile b/math/p5-Math-ConvexHull/Makefile
index 871a56a3d6c6..8915a3beda03 100644
--- a/math/p5-Math-ConvexHull/Makefile
+++ b/math/p5-Math-ConvexHull/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-ConvexHull
PORTVERSION= 1.02
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Math-Derivative/Makefile b/math/p5-Math-Derivative/Makefile
index 98eb7186501b..ce7623b9f490 100644
--- a/math/p5-Math-Derivative/Makefile
+++ b/math/p5-Math-Derivative/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Math-Derivative
PORTVERSION= 0.01
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fernan@iib.unsam.edu.ar
diff --git a/math/p5-Math-Expr/Makefile b/math/p5-Math-Expr/Makefile
index 60ae7cdbd1f6..307126c22f3e 100644
--- a/math/p5-Math-Expr/Makefile
+++ b/math/p5-Math-Expr/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Expr
PORTVERSION= 0.4
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Math-FFT/Makefile b/math/p5-Math-FFT/Makefile
index 1e77b7125c3d..2fe7c232b1b5 100644
--- a/math/p5-Math-FFT/Makefile
+++ b/math/p5-Math-FFT/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-FFT
PORTVERSION= 1.28
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Math-GSL/Makefile b/math/p5-Math-GSL/Makefile
index 8f27eda320bb..301fb26c7666 100644
--- a/math/p5-Math-GSL/Makefile
+++ b/math/p5-Math-GSL/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Math-GSL
PORTVERSION= 0.01
PORTREVISION= 4
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Math-Geometry-Planar-GPC/Makefile b/math/p5-Math-Geometry-Planar-GPC/Makefile
index 6e13b11080c8..f850ab269d96 100644
--- a/math/p5-Math-Geometry-Planar-GPC/Makefile
+++ b/math/p5-Math-Geometry-Planar-GPC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Geometry-Planar-GPC
PORTVERSION= 1.04
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Geometry-Planar-Offset/Makefile b/math/p5-Math-Geometry-Planar-Offset/Makefile
index df0a330f0422..c7bcecab1dcf 100644
--- a/math/p5-Math-Geometry-Planar-Offset/Makefile
+++ b/math/p5-Math-Geometry-Planar-Offset/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Geometry-Planar-Offset
PORTVERSION= 1.05
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Geometry-Planar/Makefile b/math/p5-Math-Geometry-Planar/Makefile
index ff0fabe556a3..91cad26f2bb5 100644
--- a/math/p5-Math-Geometry-Planar/Makefile
+++ b/math/p5-Math-Geometry-Planar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Geometry-Planar
PORTVERSION= 1.16
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Geometry/Makefile b/math/p5-Math-Geometry/Makefile
index af31df121e46..c1973aff8b16 100644
--- a/math/p5-Math-Geometry/Makefile
+++ b/math/p5-Math-Geometry/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Geometry
PORTVERSION= 0.04
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/math/p5-Math-Interpolate/Makefile b/math/p5-Math-Interpolate/Makefile
index 0c50a4563c3f..746da85716c8 100644
--- a/math/p5-Math-Interpolate/Makefile
+++ b/math/p5-Math-Interpolate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Interpolate
PORTVERSION= 1.05
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Math-Intersection-StraightLine/Makefile b/math/p5-Math-Intersection-StraightLine/Makefile
index ea9155b2c22b..acbdb24270cb 100644
--- a/math/p5-Math-Intersection-StraightLine/Makefile
+++ b/math/p5-Math-Intersection-StraightLine/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Intersection-StraightLine
PORTVERSION= 0.04
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-LinearCombination/Makefile b/math/p5-Math-LinearCombination/Makefile
index 7399fb5faf0e..380ee02d1ac6 100644
--- a/math/p5-Math-LinearCombination/Makefile
+++ b/math/p5-Math-LinearCombination/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-LinearCombination
PORTVERSION= 0.03
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/math/p5-Math-Logic/Makefile b/math/p5-Math-Logic/Makefile
index b5a7eb03810e..63cdedd8db54 100644
--- a/math/p5-Math-Logic/Makefile
+++ b/math/p5-Math-Logic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Logic
PORTVERSION= 1.19
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Math-Matrix/Makefile b/math/p5-Math-Matrix/Makefile
index 95b06c601914..c5d7a1baaf51 100644
--- a/math/p5-Math-Matrix/Makefile
+++ b/math/p5-Math-Matrix/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Matrix
PORTVERSION= 0.5
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Math-NumberCruncher/Makefile b/math/p5-Math-NumberCruncher/Makefile
index aa90d1ce09cf..6470eb0e43b8 100644
--- a/math/p5-Math-NumberCruncher/Makefile
+++ b/math/p5-Math-NumberCruncher/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-NumberCruncher
PORTVERSION= 5.00
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile
index f76c5ee0caf2..9a0a5e16769e 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Pari
PORTVERSION= 2.010709
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/math/p5-Math-Random-MT/Makefile b/math/p5-Math-Random-MT/Makefile
index 19267318ff73..cb4c085df9b1 100644
--- a/math/p5-Math-Random-MT/Makefile
+++ b/math/p5-Math-Random-MT/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Random-MT
PORTVERSION= 1.07
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/math/p5-Math-Random-OO/Makefile b/math/p5-Math-Random-OO/Makefile
index 919330d886d5..d3d55f0f1164 100644
--- a/math/p5-Math-Random-OO/Makefile
+++ b/math/p5-Math-Random-OO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Random-OO
PORTVERSION= 0.19
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/math/p5-Math-Random/Makefile b/math/p5-Math-Random/Makefile
index a3272e2bce29..3f20a9a8206d 100644
--- a/math/p5-Math-Random/Makefile
+++ b/math/p5-Math-Random/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Random
PORTVERSION= 0.69
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/math/p5-Math-RandomOrg/Makefile b/math/p5-Math-RandomOrg/Makefile
index cf3f8db4aec5..eb1a04311634 100644
--- a/math/p5-Math-RandomOrg/Makefile
+++ b/math/p5-Math-RandomOrg/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-RandomOrg
PORTVERSION= 0.04
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Round-Var/Makefile b/math/p5-Math-Round-Var/Makefile
index e7daca3b874f..34e6a2f7991c 100644
--- a/math/p5-Math-Round-Var/Makefile
+++ b/math/p5-Math-Round-Var/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Round-Var
PORTVERSION= 0.03
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Round/Makefile b/math/p5-Math-Round/Makefile
index b8ea723b5b4b..201dc1f3d5c4 100644
--- a/math/p5-Math-Round/Makefile
+++ b/math/p5-Math-Round/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Round
PORTVERSION= 0.06
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Math-Sequence/Makefile b/math/p5-Math-Sequence/Makefile
index c1becbf1ab57..b957039d25ff 100644
--- a/math/p5-Math-Sequence/Makefile
+++ b/math/p5-Math-Sequence/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Sequence
PORTVERSION= 1.00
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Series/Makefile b/math/p5-Math-Series/Makefile
index 8c2c95089a77..8be39f51bb4c 100644
--- a/math/p5-Math-Series/Makefile
+++ b/math/p5-Math-Series/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Series
PORTVERSION= 1.01
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-SimpleVariable/Makefile b/math/p5-Math-SimpleVariable/Makefile
index b5fd3bcf2e71..4d6115d1fb61 100644
--- a/math/p5-Math-SimpleVariable/Makefile
+++ b/math/p5-Math-SimpleVariable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-SimpleVariable
PORTVERSION= 0.03
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/math/p5-Math-Spline/Makefile b/math/p5-Math-Spline/Makefile
index e55d8f9461fc..dbf97273f553 100644
--- a/math/p5-Math-Spline/Makefile
+++ b/math/p5-Math-Spline/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Math-Spline
PORTVERSION= 0.01
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fernan@iib.unsam.edu.ar
diff --git a/math/p5-Math-Symbolic-Custom-Contains/Makefile b/math/p5-Math-Symbolic-Custom-Contains/Makefile
index 9dada5db6d9c..2b81fa396a1f 100644
--- a/math/p5-Math-Symbolic-Custom-Contains/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Contains/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Math-Symbolic-Custom-Contains
PORTVERSION= 1.00
PORTREVISION= 1
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile b/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
index 7161c1f7df9e..b14484a73c8c 100644
--- a/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
+++ b/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Symbolic-Custom-ErrorPropagation
PORTVERSION= 0.10
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Symbolic-Custom-Simplification/Makefile b/math/p5-Math-Symbolic-Custom-Simplification/Makefile
index a0764f03161c..7fccd07f0c19 100644
--- a/math/p5-Math-Symbolic-Custom-Simplification/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Simplification/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Symbolic-Custom-Simplification
PORTVERSION= 1.01
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Symbolic-Custom-Transformation/Makefile b/math/p5-Math-Symbolic-Custom-Transformation/Makefile
index 962e42489a5b..54d803b69766 100644
--- a/math/p5-Math-Symbolic-Custom-Transformation/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Transformation/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Symbolic-Custom-Transformation
PORTVERSION= 2.00
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Symbolic/Makefile b/math/p5-Math-Symbolic/Makefile
index 2e01adb53bad..de5a7d7a3c47 100644
--- a/math/p5-Math-Symbolic/Makefile
+++ b/math/p5-Math-Symbolic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Symbolic
PORTVERSION= 0.510
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-BigNum/Makefile b/math/p5-Math-SymbolicX-BigNum/Makefile
index fc6707dcf32c..9808efd694a5 100644
--- a/math/p5-Math-SymbolicX-BigNum/Makefile
+++ b/math/p5-Math-SymbolicX-BigNum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-SymbolicX-BigNum
PORTVERSION= 0.02
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-Complex/Makefile b/math/p5-Math-SymbolicX-Complex/Makefile
index ae37f2a27aa4..7db42ba20afe 100644
--- a/math/p5-Math-SymbolicX-Complex/Makefile
+++ b/math/p5-Math-SymbolicX-Complex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-SymbolicX-Complex
PORTVERSION= 1.00
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-Error/Makefile b/math/p5-Math-SymbolicX-Error/Makefile
index c593d146ba40..cd0b4fefc99c 100644
--- a/math/p5-Math-SymbolicX-Error/Makefile
+++ b/math/p5-Math-SymbolicX-Error/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-SymbolicX-Error
PORTVERSION= 0.02
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-Inline/Makefile b/math/p5-Math-SymbolicX-Inline/Makefile
index 4e3b86533500..ca9d89603060 100644
--- a/math/p5-Math-SymbolicX-Inline/Makefile
+++ b/math/p5-Math-SymbolicX-Inline/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-SymbolicX-Inline
PORTVERSION= 1.01
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-NoSimplification/Makefile b/math/p5-Math-SymbolicX-NoSimplification/Makefile
index b1dae024a5c1..37dfc158fa1c 100644
--- a/math/p5-Math-SymbolicX-NoSimplification/Makefile
+++ b/math/p5-Math-SymbolicX-NoSimplification/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-SymbolicX-NoSimplification
PORTVERSION= 1.01
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile b/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
index 56a1e14f1447..a6a791dd0922 100644
--- a/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
+++ b/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-SymbolicX-ParserExtensionFactory
PORTVERSION= 2.00
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile b/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
index 266dfc313029..0c2678f65ba1 100644
--- a/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
+++ b/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-SymbolicX-Statistics-Distributions
PORTVERSION= 1.02
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-TrulyRandom/Makefile b/math/p5-Math-TrulyRandom/Makefile
index 874f4d54d7cc..3718efd15660 100644
--- a/math/p5-Math-TrulyRandom/Makefile
+++ b/math/p5-Math-TrulyRandom/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-TrulyRandom
PORTVERSION= 1.0
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= anders@FreeBSD.org
diff --git a/math/p5-Math-Units/Makefile b/math/p5-Math-Units/Makefile
index 37817c0cdb55..e9116bd20bf0 100644
--- a/math/p5-Math-Units/Makefile
+++ b/math/p5-Math-Units/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Units
PORTVERSION= 1.2
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Math-Vec/Makefile b/math/p5-Math-Vec/Makefile
index eedec4eb7e3f..74d517c50a21 100644
--- a/math/p5-Math-Vec/Makefile
+++ b/math/p5-Math-Vec/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Math-Vec
PORTVERSION= 1.01
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/E/EW/EWILHELM
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/math/p5-Math-VecStat/Makefile b/math/p5-Math-VecStat/Makefile
index 61a0166e0e26..3a51200aebf6 100644
--- a/math/p5-Math-VecStat/Makefile
+++ b/math/p5-Math-VecStat/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Math-VecStat
PORTVERSION= 0.08
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Math
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mm@FreeBSD.org
diff --git a/math/p5-Number-Compare/Makefile b/math/p5-Number-Compare/Makefile
index 9cb5cef8a0cd..ac2dd0b4b3b9 100644
--- a/math/p5-Number-Compare/Makefile
+++ b/math/p5-Number-Compare/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Number-Compare
PORTVERSION= 0.01
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Number
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/math/p5-Number-WithError-LaTeX/Makefile b/math/p5-Number-WithError-LaTeX/Makefile
index 85fd4e418d81..0ff8ff2dbc38 100644
--- a/math/p5-Number-WithError-LaTeX/Makefile
+++ b/math/p5-Number-WithError-LaTeX/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Number-WithError-LaTeX
PORTVERSION= 0.06
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Number
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Number-WithError/Makefile b/math/p5-Number-WithError/Makefile
index e0ba9b9fe33b..cb1f1ef8b617 100644
--- a/math/p5-Number-WithError/Makefile
+++ b/math/p5-Number-WithError/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Number-WithError
PORTVERSION= 0.08
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Number
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Set-IntSpan-Fast/Makefile b/math/p5-Set-IntSpan-Fast/Makefile
index db6b4efa275c..ce811092d7ee 100644
--- a/math/p5-Set-IntSpan-Fast/Makefile
+++ b/math/p5-Set-IntSpan-Fast/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Set-IntSpan-Fast
PORTVERSION= 1.11
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Set
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Set-IntSpan/Makefile b/math/p5-Set-IntSpan/Makefile
index d401458d4dd5..4d45aba5eb64 100644
--- a/math/p5-Set-IntSpan/Makefile
+++ b/math/p5-Set-IntSpan/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Set-IntSpan
PORTVERSION= 1.13
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Set
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/math/p5-Set-Partition/Makefile b/math/p5-Set-Partition/Makefile
index 20103cdb3db5..d56c77ae9ba4 100644
--- a/math/p5-Set-Partition/Makefile
+++ b/math/p5-Set-Partition/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Set-Partition
PORTVERSION= 0.03
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Set
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Set-Window/Makefile b/math/p5-Set-Window/Makefile
index d39b1837995b..da2b6cd66d48 100644
--- a/math/p5-Set-Window/Makefile
+++ b/math/p5-Set-Window/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Set-Window
PORTVERSION= 1.01
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Set
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Statistics-ChiSquare/Makefile b/math/p5-Statistics-ChiSquare/Makefile
index 1e5ac28de60b..b89641a92c71 100644
--- a/math/p5-Statistics-ChiSquare/Makefile
+++ b/math/p5-Statistics-ChiSquare/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Statistics-ChiSquare
PORTVERSION= 0.5
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Statistics
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Statistics-Contingency/Makefile b/math/p5-Statistics-Contingency/Makefile
index 826b3c901e73..719194dc0c4f 100644
--- a/math/p5-Statistics-Contingency/Makefile
+++ b/math/p5-Statistics-Contingency/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Statistics-Contingency
PORTVERSION= 0.06
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Statistics
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/math/p5-Statistics-Descriptive-Discrete/Makefile b/math/p5-Statistics-Descriptive-Discrete/Makefile
index 8ef2d0101e39..4ea643e635ed 100644
--- a/math/p5-Statistics-Descriptive-Discrete/Makefile
+++ b/math/p5-Statistics-Descriptive-Discrete/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Statistics-Descriptive-Discrete
PORTVERSION= 0.07
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Statistics
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/math/p5-Statistics-Descriptive/Makefile b/math/p5-Statistics-Descriptive/Makefile
index e325a3e729cd..d8672419c483 100644
--- a/math/p5-Statistics-Descriptive/Makefile
+++ b/math/p5-Statistics-Descriptive/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Statistics-Descriptive
PORTVERSION= 2.6
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Statistics
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Statistics-Distributions/Makefile b/math/p5-Statistics-Distributions/Makefile
index 1a4cca0a8c4b..113337573d5d 100644
--- a/math/p5-Statistics-Distributions/Makefile
+++ b/math/p5-Statistics-Distributions/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Statistics-Distributions
PORTVERSION= 1.02
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Statistics
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Statistics-LTU/Makefile b/math/p5-Statistics-LTU/Makefile
index 58e5f13d6ecb..39429a70555a 100644
--- a/math/p5-Statistics-LTU/Makefile
+++ b/math/p5-Statistics-LTU/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Statistics-LTU
PORTVERSION= 2.8
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Statistics
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Statistics-OLS/Makefile b/math/p5-Statistics-OLS/Makefile
index a6479b9c52d2..288c6ad4145c 100644
--- a/math/p5-Statistics-OLS/Makefile
+++ b/math/p5-Statistics-OLS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Statistics-OLS
PORTVERSION= 0.07
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Statistics
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Statistics-Regression/Makefile b/math/p5-Statistics-Regression/Makefile
index 567fa6da696b..cc2b51b7b1b0 100644
--- a/math/p5-Statistics-Regression/Makefile
+++ b/math/p5-Statistics-Regression/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Statistics-Regression
PORTVERSION= 0.53
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Statistics
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/misc/p5-Acme-ButFirst/Makefile b/misc/p5-Acme-ButFirst/Makefile
index 28b50c337eb3..0a373f8b1075 100644
--- a/misc/p5-Acme-ButFirst/Makefile
+++ b/misc/p5-Acme-ButFirst/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Acme-ButFirst
PORTVERSION= 1.00
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Acme
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/misc/p5-Array-IntSpan/Makefile b/misc/p5-Array-IntSpan/Makefile
index d2d62f661114..59f7923884d8 100644
--- a/misc/p5-Array-IntSpan/Makefile
+++ b/misc/p5-Array-IntSpan/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Array-IntSpan
PORTVERSION= 2.001
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Array
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index e44caa751637..c6f36378b341 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Array-PrintCols
PORTVERSION= 2.1
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Array
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/p5-Array-RefElem/Makefile b/misc/p5-Array-RefElem/Makefile
index 94f8e8ecd0af..1916fe1efeac 100644
--- a/misc/p5-Array-RefElem/Makefile
+++ b/misc/p5-Array-RefElem/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Array-RefElem
PORTVERSION= 1.00
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Array
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/misc/p5-Business-ISBN-Data/Makefile b/misc/p5-Business-ISBN-Data/Makefile
index 2d6ec5175411..8f5989beaa5f 100644
--- a/misc/p5-Business-ISBN-Data/Makefile
+++ b/misc/p5-Business-ISBN-Data/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Business-ISBN-Data
PORTVERSION= 1.17
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/misc/p5-Business-ISIN/Makefile b/misc/p5-Business-ISIN/Makefile
index d015a5ddea90..d351798f0392 100644
--- a/misc/p5-Business-ISIN/Makefile
+++ b/misc/p5-Business-ISIN/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Business-ISIN
PORTVERSION= 0.20
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/misc/p5-Business-ISSN/Makefile b/misc/p5-Business-ISSN/Makefile
index 8fbb41224273..c5778f7fc57c 100644
--- a/misc/p5-Business-ISSN/Makefile
+++ b/misc/p5-Business-ISSN/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Business-ISSN
PORTVERSION= 0.90
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/p5-Business-UPS/Makefile b/misc/p5-Business-UPS/Makefile
index b6bf8d606cf3..180adebb73ce 100644
--- a/misc/p5-Business-UPS/Makefile
+++ b/misc/p5-Business-UPS/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Business-UPS
PORTVERSION= 2.0
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/J/JW/JWHEELER
PKGNAMEPREFIX= p5-
diff --git a/misc/p5-Chatbot-Eliza/Makefile b/misc/p5-Chatbot-Eliza/Makefile
index 6badd08a8f42..fa7873774d10 100644
--- a/misc/p5-Chatbot-Eliza/Makefile
+++ b/misc/p5-Chatbot-Eliza/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Chatbot-Eliza
PORTVERSION= 1.04
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Chatbot
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/p5-Data-Buffer/Makefile b/misc/p5-Data-Buffer/Makefile
index d2a119a62cdc..cd91ccc4e7fa 100644
--- a/misc/p5-Data-Buffer/Makefile
+++ b/misc/p5-Data-Buffer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Buffer
PORTVERSION= 0.04
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/misc/p5-File-CounterFile/Makefile b/misc/p5-File-CounterFile/Makefile
index 3cd08e8f9bc4..8079151c891b 100644
--- a/misc/p5-File-CounterFile/Makefile
+++ b/misc/p5-File-CounterFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-CounterFile
PORTVERSION= 1.04
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/misc/p5-File-Sort/Makefile b/misc/p5-File-Sort/Makefile
index f13aae75df49..b8d6aaabecbc 100644
--- a/misc/p5-File-Sort/Makefile
+++ b/misc/p5-File-Sort/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Sort
PORTVERSION= 1.01
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/p5-Geo-Cache/Makefile b/misc/p5-Geo-Cache/Makefile
index d69fe522df9f..b683ff84f89b 100644
--- a/misc/p5-Geo-Cache/Makefile
+++ b/misc/p5-Geo-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Geo-Cache
PORTVERSION= 0.06
CATEGORIES= misc perl5 geography
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Geo
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/misc/p5-Geo-Postcodes-DK/Makefile b/misc/p5-Geo-Postcodes-DK/Makefile
index d2ba6ccf7ebe..5fe8dafee4a4 100644
--- a/misc/p5-Geo-Postcodes-DK/Makefile
+++ b/misc/p5-Geo-Postcodes-DK/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Geo-Postcodes-DK
PORTVERSION= 0.31
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Geo
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/misc/p5-Geo-Postcodes-NO/Makefile b/misc/p5-Geo-Postcodes-NO/Makefile
index 1f7e7aae8940..054147bd5326 100644
--- a/misc/p5-Geo-Postcodes-NO/Makefile
+++ b/misc/p5-Geo-Postcodes-NO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Geo-Postcodes-NO
PORTVERSION= 0.31
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Geo
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/misc/p5-Geo-Postcodes/Makefile b/misc/p5-Geo-Postcodes/Makefile
index a6712f8abd41..7a543693537a 100644
--- a/misc/p5-Geo-Postcodes/Makefile
+++ b/misc/p5-Geo-Postcodes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Geo-Postcodes
PORTVERSION= 0.320
CATEGORIES= misc perl5 geography
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Geo
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/misc/p5-Geo-Weather/Makefile b/misc/p5-Geo-Weather/Makefile
index 6893b4233def..126bcbdefb00 100644
--- a/misc/p5-Geo-Weather/Makefile
+++ b/misc/p5-Geo-Weather/Makefile
@@ -8,9 +8,8 @@
PORTNAME= Geo-Weather
PORTVERSION= 1.41
CATEGORIES= misc perl5 geography
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
ftp://ftp.innercite.com/pub/perl/
-MASTER_SITE_SUBDIR= Geo
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/p5-Geography-Countries/Makefile b/misc/p5-Geography-Countries/Makefile
index 14542739849b..c26355f9e6ee 100644
--- a/misc/p5-Geography-Countries/Makefile
+++ b/misc/p5-Geography-Countries/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Geography-Countries
PORTVERSION= 1.4
CATEGORIES= misc perl5 geography
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Geography
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= dikshie@lapi.itb.ac.id
diff --git a/misc/p5-Geography-NationalGrid/Makefile b/misc/p5-Geography-NationalGrid/Makefile
index 32705dfd7662..91f907c3fcd1 100644
--- a/misc/p5-Geography-NationalGrid/Makefile
+++ b/misc/p5-Geography-NationalGrid/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Geography-NationalGrid
PORTVERSION= 1.6
CATEGORIES= misc perl5 geography
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Geography
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/misc/p5-I18N-LangTags/Makefile b/misc/p5-I18N-LangTags/Makefile
index 364a967f9733..bfe5a0338f6a 100644
--- a/misc/p5-I18N-LangTags/Makefile
+++ b/misc/p5-I18N-LangTags/Makefile
@@ -8,8 +8,7 @@
PORTNAME= I18N-LangTags
PORTVERSION= 0.35
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= I18N
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/misc/p5-LEGO-RCX/Makefile b/misc/p5-LEGO-RCX/Makefile
index bc624805a808..49628fc494a6 100644
--- a/misc/p5-LEGO-RCX/Makefile
+++ b/misc/p5-LEGO-RCX/Makefile
@@ -8,8 +8,7 @@
PORTNAME= LEGO-RCX
PORTVERSION= 1.01
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= LEGO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/p5-List-Compare/Makefile b/misc/p5-List-Compare/Makefile
index 9eac23cdbee6..2d91206f364c 100644
--- a/misc/p5-List-Compare/Makefile
+++ b/misc/p5-List-Compare/Makefile
@@ -8,8 +8,7 @@
PORTNAME= List-Compare
PORTVERSION= 0.33
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= List
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= marck@FreeBSD.org
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index 36daf5a018f2..a199c7916d3f 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Locale-Codes
PORTVERSION= 2.07
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/misc/p5-Locale-Msgcat/Makefile b/misc/p5-Locale-Msgcat/Makefile
index 8c9af4474718..85514b6cc0d3 100644
--- a/misc/p5-Locale-Msgcat/Makefile
+++ b/misc/p5-Locale-Msgcat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Msgcat
PORTVERSION= 1.03
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/p5-Norge/Makefile b/misc/p5-Norge/Makefile
index dc0476b255e2..5ce67859709c 100644
--- a/misc/p5-Norge/Makefile
+++ b/misc/p5-Norge/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Norge
PORTVERSION= 1.08
CATEGORIES= misc textproc
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= No
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= anders@FreeBSD.org
diff --git a/misc/p5-Test-Dir/Makefile b/misc/p5-Test-Dir/Makefile
index 27924b00f796..4300109636ab 100644
--- a/misc/p5-Test-Dir/Makefile
+++ b/misc/p5-Test-Dir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Dir
PORTVERSION= 1.005
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kiwi@oav.net
diff --git a/misc/p5-Text-FIGlet/Makefile b/misc/p5-Text-FIGlet/Makefile
index b8357946539b..f6174c6f1bf8 100644
--- a/misc/p5-Text-FIGlet/Makefile
+++ b/misc/p5-Text-FIGlet/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Text-FIGlet
PORTVERSION= 1.06
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/p5-Tie-DxHash/Makefile b/misc/p5-Tie-DxHash/Makefile
index d01960e741df..fc32fd6518fa 100644
--- a/misc/p5-Tie-DxHash/Makefile
+++ b/misc/p5-Tie-DxHash/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-DxHash
PORTVERSION= 1.03
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/misc/p5-Zen-Koans/Makefile b/misc/p5-Zen-Koans/Makefile
index 189de583feae..803a5f933c42 100644
--- a/misc/p5-Zen-Koans/Makefile
+++ b/misc/p5-Zen-Koans/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Zen-Koans
PORTVERSION= 0.04
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/L/LU/LUKEC
PKGNAMEPREFIX= p5-
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index b500199a9f5b..d3eadeba09ef 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dvdrip
PORTVERSION= 0.98.8
CATEGORIES= multimedia
MASTER_SITES= http://www.exit1.org/dvdrip/dist/ \
- ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Video/JRED
+ CPAN
MAINTAINER= ports@FreeBSD.org
COMMENT= A Perl Gtk+ based dvd-ripper
diff --git a/multimedia/p5-FFmpeg-Command/Makefile b/multimedia/p5-FFmpeg-Command/Makefile
index 7d1569a1eab2..4154618d23cc 100644
--- a/multimedia/p5-FFmpeg-Command/Makefile
+++ b/multimedia/p5-FFmpeg-Command/Makefile
@@ -8,7 +8,7 @@
PORTNAME= FFmpeg-Command
PORTVERSION= 0.07
CATEGORIES= multimedia perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/M/MI/MIZZY
PKGNAMEPREFIX= p5-
diff --git a/multimedia/p5-FLV-Info/Makefile b/multimedia/p5-FLV-Info/Makefile
index f71647a6c108..4fdedea7a5c8 100644
--- a/multimedia/p5-FLV-Info/Makefile
+++ b/multimedia/p5-FLV-Info/Makefile
@@ -8,7 +8,7 @@
PORTNAME= FLV-Info
PORTVERSION= 0.18
CATEGORIES= multimedia perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CD/CDOLAN
PKGNAMEPREFIX= p5-
diff --git a/multimedia/p5-MP4-Info/Makefile b/multimedia/p5-MP4-Info/Makefile
index d2c0a436cede..eddcbb9520a8 100644
--- a/multimedia/p5-MP4-Info/Makefile
+++ b/multimedia/p5-MP4-Info/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MP4-Info
PORTVERSION= 1.11
CATEGORIES= multimedia perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MP4
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/multimedia/p5-Video-Info/Makefile b/multimedia/p5-Video-Info/Makefile
index 9cef5682834f..db1af9e3f55d 100644
--- a/multimedia/p5-Video-Info/Makefile
+++ b/multimedia/p5-Video-Info/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Video-Info
PORTVERSION= 0.999
PORTREVISION= 2
CATEGORIES= multimedia perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Video
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/multimedia/p5-Video-OpenQuicktime/Makefile b/multimedia/p5-Video-OpenQuicktime/Makefile
index 15bdec97be84..fcbddb431975 100644
--- a/multimedia/p5-Video-OpenQuicktime/Makefile
+++ b/multimedia/p5-Video-OpenQuicktime/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Video-OpenQuicktime
PORTVERSION= 1.02
PORTREVISION= 2
CATEGORIES= multimedia perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Video
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net-im/p5-DJabberd/Makefile b/net-im/p5-DJabberd/Makefile
index 1c9e1a7305b8..ccdf176ccbf1 100644
--- a/net-im/p5-DJabberd/Makefile
+++ b/net-im/p5-DJabberd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= DJabberd
PORTVERSION= 0.83
CATEGORIES= net-im perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/B/BR/BRADFITZ
PKGNAMEPREFIX= p5-
diff --git a/net-im/p5-Jabber-SimpleSend/Makefile b/net-im/p5-Jabber-SimpleSend/Makefile
index 79a20f89fbdc..b3f3c0eaeed5 100644
--- a/net-im/p5-Jabber-SimpleSend/Makefile
+++ b/net-im/p5-Jabber-SimpleSend/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Jabber-SimpleSend
PORTVERSION= 0.02
CATEGORIES= net-im perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Jabber
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net-im/p5-Net-AIM/Makefile b/net-im/p5-Net-AIM/Makefile
index 65f4932fbf28..162681cd5418 100644
--- a/net-im/p5-Net-AIM/Makefile
+++ b/net-im/p5-Net-AIM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-AIM
PORTVERSION= 1.22
CATEGORIES= net-im perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net-im/p5-Net-AOLIM/Makefile b/net-im/p5-Net-AOLIM/Makefile
index 20362bcd00e4..80eea7d5dc7e 100644
--- a/net-im/p5-Net-AOLIM/Makefile
+++ b/net-im/p5-Net-AOLIM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-AOLIM
PORTVERSION= 1.61
CATEGORIES= net-im perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile
index 33c905578950..53cf62163253 100644
--- a/net-im/p5-Net-Jabber/Makefile
+++ b/net-im/p5-Net-Jabber/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Jabber
PORTVERSION= 2.0
CATEGORIES= net-im perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DIST_SUBDIR= jabber
diff --git a/net-im/p5-Net-MSN/Makefile b/net-im/p5-Net-MSN/Makefile
index fad5e7dd998c..f50f426acd79 100644
--- a/net-im/p5-Net-MSN/Makefile
+++ b/net-im/p5-Net-MSN/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Net-MSN
PORTVERSION= 1.022
CATEGORIES= net-im perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net-im/p5-Net-NetSend/Makefile b/net-im/p5-Net-NetSend/Makefile
index 9cd04891877f..0c691249b4bb 100644
--- a/net-im/p5-Net-NetSend/Makefile
+++ b/net-im/p5-Net-NetSend/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-NetSend
PORTVERSION= 0.12
CATEGORIES= net-im perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/net-im/p5-Net-OSCAR/Makefile b/net-im/p5-Net-OSCAR/Makefile
index 57711a5b0306..ca17c68da648 100644
--- a/net-im/p5-Net-OSCAR/Makefile
+++ b/net-im/p5-Net-OSCAR/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-OSCAR
PORTVERSION= 1.925
CATEGORIES= net-im perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net-im/p5-Net-Stomp/Makefile b/net-im/p5-Net-Stomp/Makefile
index 6ea39b0a7e6f..36121021808d 100644
--- a/net-im/p5-Net-Stomp/Makefile
+++ b/net-im/p5-Net-Stomp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Stomp
PORTVERSION= 0.32
CATEGORIES= net-im perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net-im/p5-POE-Component-Client-MSN/Makefile b/net-im/p5-POE-Component-Client-MSN/Makefile
index e6ba37280dda..17af3926afc5 100644
--- a/net-im/p5-POE-Component-Client-MSN/Makefile
+++ b/net-im/p5-POE-Component-Client-MSN/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Client-MSN
PORTVERSION= 0.03
CATEGORIES= net-im perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/net-mgmt/p5-Cisco-Reconfig/Makefile b/net-mgmt/p5-Cisco-Reconfig/Makefile
index e476157b50c9..85349b7eca7c 100644
--- a/net-mgmt/p5-Cisco-Reconfig/Makefile
+++ b/net-mgmt/p5-Cisco-Reconfig/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cisco-Reconfig
PORTVERSION= 0.9
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cisco
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net-mgmt/p5-Mon/Makefile b/net-mgmt/p5-Mon/Makefile
index af739c38ae44..0399f41bb5fa 100644
--- a/net-mgmt/p5-Mon/Makefile
+++ b/net-mgmt/p5-Mon/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mon
PORTVERSION= 0.11
CATEGORIES= net-mgmt sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mon
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Mon-${PORTVERSION}
diff --git a/net-mgmt/p5-NSNMP/Makefile b/net-mgmt/p5-NSNMP/Makefile
index 31441af4b42f..7e9a159f24de 100644
--- a/net-mgmt/p5-NSNMP/Makefile
+++ b/net-mgmt/p5-NSNMP/Makefile
@@ -8,7 +8,7 @@
PORTNAME= NSNMP
PORTVERSION= 0.5
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/K/KR/KRAGEN
PKGNAMEPREFIX= p5-
diff --git a/net-mgmt/p5-Net-ACL/Makefile b/net-mgmt/p5-Net-ACL/Makefile
index cb6002040632..23b73712f41c 100644
--- a/net-mgmt/p5-Net-ACL/Makefile
+++ b/net-mgmt/p5-Net-ACL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-ACL
PORTVERSION= 0.07
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net-mgmt/p5-Net-CIDR/Makefile b/net-mgmt/p5-Net-CIDR/Makefile
index 83bcdd4e06cc..ea1de41bac52 100644
--- a/net-mgmt/p5-Net-CIDR/Makefile
+++ b/net-mgmt/p5-Net-CIDR/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-CIDR
PORTVERSION= 0.11
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tabthorpe@FreeBSD.org
diff --git a/net-mgmt/p5-Net-IP-Match-XS/Makefile b/net-mgmt/p5-Net-IP-Match-XS/Makefile
index 5c0dbffb682e..80db0a79675b 100644
--- a/net-mgmt/p5-Net-IP-Match-XS/Makefile
+++ b/net-mgmt/p5-Net-IP-Match-XS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-IP-Match-XS
PORTVERSION= 0.03
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/net-mgmt/p5-Net-IP-Resolver/Makefile b/net-mgmt/p5-Net-IP-Resolver/Makefile
index cc8e4baf9bf4..c1951125bd6a 100644
--- a/net-mgmt/p5-Net-IP-Resolver/Makefile
+++ b/net-mgmt/p5-Net-IP-Resolver/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-IP-Resolver
PORTVERSION= 0.02
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/net-mgmt/p5-Net-IP/Makefile b/net-mgmt/p5-Net-IP/Makefile
index 07857c045ff5..b44c96a23fc9 100644
--- a/net-mgmt/p5-Net-IP/Makefile
+++ b/net-mgmt/p5-Net-IP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-IP
PORTVERSION= 1.25
CATEGORIES= net-mgmt perl5 ipv6
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/net-mgmt/p5-Net-IPv4Addr/Makefile b/net-mgmt/p5-Net-IPv4Addr/Makefile
index f97941663e69..077e579e9648 100644
--- a/net-mgmt/p5-Net-IPv4Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv4Addr/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-IPv4Addr
PORTVERSION= 0.10
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net-mgmt/p5-Net-IPv6Addr/Makefile b/net-mgmt/p5-Net-IPv6Addr/Makefile
index e05a159d2a10..e965761c7da6 100644
--- a/net-mgmt/p5-Net-IPv6Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv6Addr/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-IPv6Addr
PORTVERSION= 0.2
CATEGORIES= net-mgmt perl5 ipv6
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net-mgmt/p5-Net-Netmask/Makefile b/net-mgmt/p5-Net-Netmask/Makefile
index c81f9ac40504..8cf0d8897c6d 100644
--- a/net-mgmt/p5-Net-Netmask/Makefile
+++ b/net-mgmt/p5-Net-Netmask/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Netmask
PORTVERSION= 1.9015
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile
index f61771091a8f..397e3d256141 100644
--- a/net-mgmt/p5-Net-SNMP/Makefile
+++ b/net-mgmt/p5-Net-SNMP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SNMP
PORTVERSION= 5.2.0
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile b/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
index 74e5c255de70..c7f7eae946e6 100644
--- a/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
+++ b/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Telnet-Cisco-IOS
PORTVERSION= 0.6
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION}beta
diff --git a/net-mgmt/p5-NetAddr-IP-Lite/Makefile b/net-mgmt/p5-NetAddr-IP-Lite/Makefile
index 3e1ad6c026df..88861560b04f 100644
--- a/net-mgmt/p5-NetAddr-IP-Lite/Makefile
+++ b/net-mgmt/p5-NetAddr-IP-Lite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NetAddr-IP-Lite
PORTVERSION= 1.01
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= NetAddr
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/net-mgmt/p5-NetAddr-IP/Makefile b/net-mgmt/p5-NetAddr-IP/Makefile
index 92b66386882a..4b3550f4ac9b 100644
--- a/net-mgmt/p5-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-NetAddr-IP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NetAddr-IP
PORTVERSION= 4.00.7
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= NetAddr
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/.([0-9])$/\1/}
diff --git a/net-mgmt/p5-POE-Component-SNMP/Makefile b/net-mgmt/p5-POE-Component-SNMP/Makefile
index 81f5f391d685..bcbeed859861 100644
--- a/net-mgmt/p5-POE-Component-SNMP/Makefile
+++ b/net-mgmt/p5-POE-Component-SNMP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-SNMP
PORTVERSION= 1.07
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
index f193675faea9..35c401250dfe 100644
--- a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
+++ b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SNMP-MIB-Compiler
PORTVERSION= 0.06
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SNMP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= marcus@FreeBSD.org
diff --git a/net-mgmt/p5-SNMP-Util/Makefile b/net-mgmt/p5-SNMP-Util/Makefile
index 5554d4a7715b..94761302fd58 100644
--- a/net-mgmt/p5-SNMP-Util/Makefile
+++ b/net-mgmt/p5-SNMP-Util/Makefile
@@ -9,8 +9,7 @@ PORTNAME= SNMP-Util
PORTVERSION= 1.8
PORTREVISION= 1
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SNMP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fenner@FreeBSD.org
diff --git a/net-mgmt/p5-Tie-NetAddr-IP/Makefile b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
index 95514212f9ac..51d592fe93f2 100644
--- a/net-mgmt/p5-Tie-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-NetAddr-IP
PORTVERSION= 1.51
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/net-p2p/p5-Net-BitTorrent-File/Makefile b/net-p2p/p5-Net-BitTorrent-File/Makefile
index aa27e0429e4a..ffb3a82d9883 100644
--- a/net-p2p/p5-Net-BitTorrent-File/Makefile
+++ b/net-p2p/p5-Net-BitTorrent-File/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-BitTorrent-File
PORTVERSION= 1.02
CATEGORIES= net-p2p perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION}-fix
diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile b/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
index 6878794c300d..1e19f9096f4c 100644
--- a/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
+++ b/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-BitTorrent-PeerPacket
PORTVERSION= 1.2
CATEGORIES= net-p2p perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net-p2p/p5-WWW-BitTorrent/Makefile b/net-p2p/p5-WWW-BitTorrent/Makefile
index 1701b34564c8..9cbe3e3d705b 100644
--- a/net-p2p/p5-WWW-BitTorrent/Makefile
+++ b/net-p2p/p5-WWW-BitTorrent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= WWW-BitTorrent
PORTVERSION= 0.01
CATEGORIES= net-p2p perl5 www
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= WWW
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index 8099c9b79847..898b3af252b6 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 2.00
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/L/LO/LOOSIFER/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/L/LO/LOOSIFER
MAINTAINER= flz@FreeBSD.org
COMMENT= Interactive shell used to administer ldap directories
diff --git a/net/p5-AddressBook/Makefile b/net/p5-AddressBook/Makefile
index d28b721b7ae2..7b85fde85f9d 100644
--- a/net/p5-AddressBook/Makefile
+++ b/net/p5-AddressBook/Makefile
@@ -8,8 +8,8 @@
PORTNAME= AddressBook
PORTVERSION= 0.16
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DL/DLEIGH/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/D/DL/DLEIGH
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-BBS-UserInfo-Maple3/Makefile b/net/p5-BBS-UserInfo-Maple3/Makefile
index 1d4c1126868e..6a962524916a 100644
--- a/net/p5-BBS-UserInfo-Maple3/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BBS-UserInfo-Maple3
PORTVERSION= 0.01
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
PKGNAMEPREFIX= p5-
diff --git a/net/p5-BBS-UserInfo-Maple3itoc/Makefile b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
index 1a3765f217ca..94e239dc8e7f 100644
--- a/net/p5-BBS-UserInfo-Maple3itoc/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BBS-UserInfo-Maple3itoc
PORTVERSION= 0.01
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
PKGNAMEPREFIX= p5-
diff --git a/net/p5-BBS-UserInfo-Ptt/Makefile b/net/p5-BBS-UserInfo-Ptt/Makefile
index 06c0ed649cb5..d877ca2649fd 100644
--- a/net/p5-BBS-UserInfo-Ptt/Makefile
+++ b/net/p5-BBS-UserInfo-Ptt/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BBS-UserInfo-Ptt
PORTVERSION= 0.06
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
PKGNAMEPREFIX= p5-
diff --git a/net/p5-BBS-UserInfo-SOB/Makefile b/net/p5-BBS-UserInfo-SOB/Makefile
index 0699ff63d6a7..5a3531cd57c2 100644
--- a/net/p5-BBS-UserInfo-SOB/Makefile
+++ b/net/p5-BBS-UserInfo-SOB/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BBS-UserInfo-SOB
PORTVERSION= 0.01
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
PKGNAMEPREFIX= p5-
diff --git a/net/p5-BBS-UserInfo-Wretch/Makefile b/net/p5-BBS-UserInfo-Wretch/Makefile
index 0d4f5dc2e6b5..9574a276aa9b 100644
--- a/net/p5-BBS-UserInfo-Wretch/Makefile
+++ b/net/p5-BBS-UserInfo-Wretch/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BBS-UserInfo-Wretch
PORTVERSION= 0.03
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
PKGNAMEPREFIX= p5-
diff --git a/net/p5-BBS-UserInfo/Makefile b/net/p5-BBS-UserInfo/Makefile
index 7b87e275f2a0..dda0ac1b8b1e 100644
--- a/net/p5-BBS-UserInfo/Makefile
+++ b/net/p5-BBS-UserInfo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BBS-UserInfo
PORTVERSION= 0.01
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
PKGNAMEPREFIX= p5-
diff --git a/net/p5-Cisco-IPPhone/Makefile b/net/p5-Cisco-IPPhone/Makefile
index 279a31aa1e07..917d7ceb8392 100644
--- a/net/p5-Cisco-IPPhone/Makefile
+++ b/net/p5-Cisco-IPPhone/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cisco-IPPhone
PORTVERSION= 0.05
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cisco
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= numisemis@yahoo.com
diff --git a/net/p5-EasyTCP/Makefile b/net/p5-EasyTCP/Makefile
index 17b7b9997150..7641daea246e 100644
--- a/net/p5-EasyTCP/Makefile
+++ b/net/p5-EasyTCP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= EasyTCP
PORTVERSION= 0.26
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-File-Rsync/Makefile b/net/p5-File-Rsync/Makefile
index e706aebaa85a..de116a32c950 100644
--- a/net/p5-File-Rsync/Makefile
+++ b/net/p5-File-Rsync/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Rsync
PORTVERSION= 0.42
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Filesys-SmbClient/Makefile b/net/p5-Filesys-SmbClient/Makefile
index 3b2783423737..93cf00537b17 100644
--- a/net/p5-Filesys-SmbClient/Makefile
+++ b/net/p5-Filesys-SmbClient/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filesys-SmbClient
PORTVERSION= 1.5
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filesys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/net/p5-Frontier-RPC/Makefile b/net/p5-Frontier-RPC/Makefile
index 57057a93ec88..0867544c6fc8 100644
--- a/net/p5-Frontier-RPC/Makefile
+++ b/net/p5-Frontier-RPC/Makefile
@@ -9,9 +9,8 @@
PORTNAME= Frontier-RPC
PORTVERSION= 0.07.b4
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://bitsko.slc.ut.us/~ken/xml-rpc/
-MASTER_SITE_SUBDIR= Frontier
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-0.07b4
diff --git a/net/p5-Geo-IPfree/Makefile b/net/p5-Geo-IPfree/Makefile
index bb0a0d2c2ad8..55d3611c8d81 100644
--- a/net/p5-Geo-IPfree/Makefile
+++ b/net/p5-Geo-IPfree/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Geo-IPfree
PORTVERSION= 0.2
CATEGORIES= net perl5 geography
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Geo
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/net/p5-Gopher-Server/Makefile b/net/p5-Gopher-Server/Makefile
index 0b2cb1789c98..f2ed36c1f7fb 100644
--- a/net/p5-Gopher-Server/Makefile
+++ b/net/p5-Gopher-Server/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gopher-Server
PORTVERSION= 0.1.1
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/T/TM/TMURRAY
PKGNAMEPREFIX= p5-
diff --git a/net/p5-IO-Socket-Multicast/Makefile b/net/p5-IO-Socket-Multicast/Makefile
index ad75f7e9bcc7..408f2f665c49 100644
--- a/net/p5-IO-Socket-Multicast/Makefile
+++ b/net/p5-IO-Socket-Multicast/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Socket-Multicast
PORTVERSION= 1.05
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/net/p5-IO-Socket-Multicast6/Makefile b/net/p5-IO-Socket-Multicast6/Makefile
index 34e003f827ae..f0978fff7814 100644
--- a/net/p5-IO-Socket-Multicast6/Makefile
+++ b/net/p5-IO-Socket-Multicast6/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Socket-Multicast6
PORTVERSION= 0.02
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/net/p5-IP-Country/Makefile b/net/p5-IP-Country/Makefile
index cd1e810029ed..bbde0959a30c 100644
--- a/net/p5-IP-Country/Makefile
+++ b/net/p5-IP-Country/Makefile
@@ -9,8 +9,7 @@ PORTNAME= IP-Country
PORTVERSION= 2.23
PORTREVISION= 1
CATEGORIES= net perl5 geography
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/N/NW/NWETTERS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= dikshie@lapi.itb.ac.id
diff --git a/net/p5-JavaScript-RPC/Makefile b/net/p5-JavaScript-RPC/Makefile
index 88b3e48c5ceb..589a76ad83d7 100644
--- a/net/p5-JavaScript-RPC/Makefile
+++ b/net/p5-JavaScript-RPC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= JavaScript-RPC
PORTVERSION= 0.3
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= JavaScript
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Net-ARP/Makefile b/net/p5-Net-ARP/Makefile
index 7a0e213e86dc..912abcb8d5ea 100644
--- a/net/p5-Net-ARP/Makefile
+++ b/net/p5-Net-ARP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-ARP
PORTVERSION= 1.0.2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/net/p5-Net-Address-IPv4-Local/Makefile b/net/p5-Net-Address-IPv4-Local/Makefile
index c04f3b6b5f90..c7a45aef37b4 100644
--- a/net/p5-Net-Address-IPv4-Local/Makefile
+++ b/net/p5-Net-Address-IPv4-Local/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Address-IPv4-Local
PORTVERSION= 0.12
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-Net-Analysis/Makefile b/net/p5-Net-Analysis/Makefile
index 65b69748b255..31e83f2afea0 100644
--- a/net/p5-Net-Analysis/Makefile
+++ b/net/p5-Net-Analysis/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Analysis
PORTVERSION= 0.40
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= araujo@FreeBSD.org
diff --git a/net/p5-Net-BGP/Makefile b/net/p5-Net-BGP/Makefile
index 23d28a829453..eaf5f21f1a4f 100644
--- a/net/p5-Net-BGP/Makefile
+++ b/net/p5-Net-BGP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-BGP
PORTVERSION= 0.08
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-Net-Blogger/Makefile b/net/p5-Net-Blogger/Makefile
index c9c5b8bb8f85..b238ee6a75f5 100644
--- a/net/p5-Net-Blogger/Makefile
+++ b/net/p5-Net-Blogger/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Net-Blogger
PORTVERSION= 1.02
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-Net-CIDR-Lite/Makefile b/net/p5-Net-CIDR-Lite/Makefile
index f17e9719121e..1df9a140d3bc 100644
--- a/net/p5-Net-CIDR-Lite/Makefile
+++ b/net/p5-Net-CIDR-Lite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-CIDR-Lite
PORTVERSION= 0.20
CATEGORIES= net perl5 ipv6
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Net-DAV-Server/Makefile b/net/p5-Net-DAV-Server/Makefile
index d91797d0b04c..07c94da6e541 100644
--- a/net/p5-Net-DAV-Server/Makefile
+++ b/net/p5-Net-DAV-Server/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-DAV-Server
PORTVERSION= 1.29
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-Net-DHCP/Makefile b/net/p5-Net-DHCP/Makefile
index 07ec36a5cf17..1bd7cb8e0d18 100644
--- a/net/p5-Net-DHCP/Makefile
+++ b/net/p5-Net-DHCP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-DHCP
PORTVERSION= 0.66
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/net/p5-Net-DHCPClient/Makefile b/net/p5-Net-DHCPClient/Makefile
index 55f7bfb98a0f..909563d096ea 100644
--- a/net/p5-Net-DHCPClient/Makefile
+++ b/net/p5-Net-DHCPClient/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-DHCPClient
PORTVERSION= 1.0
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= sem@FreeBSD.org
diff --git a/net/p5-Net-DLookup/Makefile b/net/p5-Net-DLookup/Makefile
index 0d5b71ba075a..7ae5fb1b4da0 100644
--- a/net/p5-Net-DLookup/Makefile
+++ b/net/p5-Net-DLookup/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-DLookup
PORTVERSION= 1.01
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index b3bfb3df4afb..c47213242bdd 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Daemon
PORTVERSION= 0.43
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-Net-Dict/Makefile b/net/p5-Net-Dict/Makefile
index 91e8df8ab0a4..75bfa0f1331d 100644
--- a/net/p5-Net-Dict/Makefile
+++ b/net/p5-Net-Dict/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Dict
PORTVERSION= 2.07
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Net-Divert/Makefile b/net/p5-Net-Divert/Makefile
index 1cf2f73776bb..5448280895f0 100644
--- a/net/p5-Net-Divert/Makefile
+++ b/net/p5-Net-Divert/Makefile
@@ -8,8 +8,7 @@ PORTNAME= Net-Divert
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/net/p5-Net-EPP-Client/Makefile b/net/p5-Net-EPP-Client/Makefile
index 4130182bb6ed..709e15b66082 100644
--- a/net/p5-Net-EPP-Client/Makefile
+++ b/net/p5-Net-EPP-Client/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-EPP-Client
PORTVERSION= 0.06
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-Net-EPP-Frame/Makefile b/net/p5-Net-EPP-Frame/Makefile
index 19d5f269b14c..426aa39b22a9 100644
--- a/net/p5-Net-EPP-Frame/Makefile
+++ b/net/p5-Net-EPP-Frame/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-EPP-Frame
PORTVERSION= 0.07
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-Net-EPP-Proxy/Makefile b/net/p5-Net-EPP-Proxy/Makefile
index 9c8a02733bc3..01b1f71d5047 100644
--- a/net/p5-Net-EPP-Proxy/Makefile
+++ b/net/p5-Net-EPP-Proxy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-EPP-Proxy
PORTVERSION= 0.03
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-Net-EPP/Makefile b/net/p5-Net-EPP/Makefile
index 4130182bb6ed..709e15b66082 100644
--- a/net/p5-Net-EPP/Makefile
+++ b/net/p5-Net-EPP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-EPP-Client
PORTVERSION= 0.06
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-Net-FS-Flickr/Makefile b/net/p5-Net-FS-Flickr/Makefile
index e3954c16285e..da5ce19d4c16 100644
--- a/net/p5-Net-FS-Flickr/Makefile
+++ b/net/p5-Net-FS-Flickr/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Net-FS-Flickr
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/net/p5-Net-FS-Gmail/Makefile b/net/p5-Net-FS-Gmail/Makefile
index 971aa52841e8..f04db21084c2 100644
--- a/net/p5-Net-FS-Gmail/Makefile
+++ b/net/p5-Net-FS-Gmail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-FS-Gmail
PORTVERSION= 0.2
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/net/p5-Net-FTP-File/Makefile b/net/p5-Net-FTP-File/Makefile
index ffb080cdf705..0cd2e6d0f8bc 100644
--- a/net/p5-Net-FTP-File/Makefile
+++ b/net/p5-Net-FTP-File/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-FTP-File
PORTVERSION= 0.05
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-Net-Finger/Makefile b/net/p5-Net-Finger/Makefile
index 3eaf05cfb98d..a30c8a5b3db5 100644
--- a/net/p5-Net-Finger/Makefile
+++ b/net/p5-Net-Finger/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Finger
PORTVERSION= 1.06
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Net-Frame/Makefile b/net/p5-Net-Frame/Makefile
index d3651c2df825..d661feb7dd07 100644
--- a/net/p5-Net-Frame/Makefile
+++ b/net/p5-Net-Frame/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Frame
PORTVERSION= 1.04
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-Net-Google-Calendar/Makefile b/net/p5-Net-Google-Calendar/Makefile
index 4641c394b899..dc98c7ea04c5 100644
--- a/net/p5-Net-Google-Calendar/Makefile
+++ b/net/p5-Net-Google-Calendar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Google-Calendar
DISTVERSION= 0.5
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mhsin@mhsin.org
diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile
index 43c53ca8f570..688144247a28 100644
--- a/net/p5-Net-Google/Makefile
+++ b/net/p5-Net-Google/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Google
PORTVERSION= 1.0.1
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-Net-Gopher/Makefile b/net/p5-Net-Gopher/Makefile
index 4b3305b5deaa..ffe25be6d250 100644
--- a/net/p5-Net-Gopher/Makefile
+++ b/net/p5-Net-Gopher/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Gopher
PORTVERSION= 1.15
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= toni.viemero@iki.fi
diff --git a/net/p5-Net-Growl/Makefile b/net/p5-Net-Growl/Makefile
index 11d26edc8274..471ab0708dba 100644
--- a/net/p5-Net-Growl/Makefile
+++ b/net/p5-Net-Growl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Growl
PORTVERSION= 0.99
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/N/NM/NMCFARL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/net/p5-Net-IPTrie/Makefile b/net/p5-Net-IPTrie/Makefile
index 1ca290c044f0..052a2855b828 100644
--- a/net/p5-Net-IPTrie/Makefile
+++ b/net/p5-Net-IPTrie/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-IPTrie
PORTVERSION= 0.3
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/net/p5-Net-Ident/Makefile b/net/p5-Net-Ident/Makefile
index da6174d0a6ab..96f1c04fca88 100644
--- a/net/p5-Net-Ident/Makefile
+++ b/net/p5-Net-Ident/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Net-Ident
PORTVERSION= 1.20
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kai@xs4all.nl
diff --git a/net/p5-Net-Interface/Makefile b/net/p5-Net-Interface/Makefile
index 8ccb2551c68c..8054ae6c5fff 100644
--- a/net/p5-Net-Interface/Makefile
+++ b/net/p5-Net-Interface/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Interface
PORTVERSION= 0.08
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-Net-LDAP-LDAPhash/Makefile b/net/p5-Net-LDAP-LDAPhash/Makefile
index 9e38be6c3535..3f5305d2ec10 100644
--- a/net/p5-Net-LDAP-LDAPhash/Makefile
+++ b/net/p5-Net-LDAP-LDAPhash/Makefile
@@ -9,6 +9,7 @@ PORTNAME= Net-LDAP-LDAPhash
PORTVERSION= 1.0.1
CATEGORIES= net perl5
MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/V/VV/VVELOX
PKGNAMEPREFIX= p5-
MAINTAINER= vvelox@vvelox.net
diff --git a/net/p5-Net-MAC-Vendor/Makefile b/net/p5-Net-MAC-Vendor/Makefile
index 5252badde30f..8becaaf98e5f 100644
--- a/net/p5-Net-MAC-Vendor/Makefile
+++ b/net/p5-Net-MAC-Vendor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-MAC-Vendor
PORTVERSION= 1.17
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-Net-MovableType/Makefile b/net/p5-Net-MovableType/Makefile
index d173bf991c37..c301af31b213 100644
--- a/net/p5-Net-MovableType/Makefile
+++ b/net/p5-Net-MovableType/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-MovableType
PORTVERSION= 1.74
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-Net-NBName/Makefile b/net/p5-Net-NBName/Makefile
index 739b0c90caa8..e7d6a4b77ae2 100644
--- a/net/p5-Net-NBName/Makefile
+++ b/net/p5-Net-NBName/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Net-NBName
PORTVERSION= 0.26
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fenner@FreeBSD.Org
diff --git a/net/p5-Net-NBsocket/Makefile b/net/p5-Net-NBsocket/Makefile
index 7d8fba324c69..12d56cd4a3d2 100644
--- a/net/p5-Net-NBsocket/Makefile
+++ b/net/p5-Net-NBsocket/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-NBsocket
PORTVERSION= 0.13
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-Net-NIS-Listgroup/Makefile b/net/p5-Net-NIS-Listgroup/Makefile
index 4e7b09fe5cb2..e2e28bc83519 100644
--- a/net/p5-Net-NIS-Listgroup/Makefile
+++ b/net/p5-Net-NIS-Listgroup/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-NIS-Listgroup
PORTVERSION= 1.0.0
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-Net-OpenDHT/Makefile b/net/p5-Net-OpenDHT/Makefile
index a6493968380d..b4671e549a53 100644
--- a/net/p5-Net-OpenDHT/Makefile
+++ b/net/p5-Net-OpenDHT/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-OpenDHT
PORTVERSION= 0.33
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-Net-ParseWhois/Makefile b/net/p5-Net-ParseWhois/Makefile
index 8b1a755f67e2..6ed6134bf4a5 100644
--- a/net/p5-Net-ParseWhois/Makefile
+++ b/net/p5-Net-ParseWhois/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-ParseWhois
PORTVERSION= 0.62
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Net-Patricia/Makefile b/net/p5-Net-Patricia/Makefile
index 9bfe93f2deaa..c25c4614d846 100644
--- a/net/p5-Net-Patricia/Makefile
+++ b/net/p5-Net-Patricia/Makefile
@@ -8,9 +8,8 @@
PORTNAME= Net-Patricia
PORTVERSION= 1.014
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://net.doit.wisc.edu/~plonka/Net-Patricia/
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-Net-PcapUtils/Makefile b/net/p5-Net-PcapUtils/Makefile
index ddbe667667bf..ec7b5ad1ca9d 100644
--- a/net/p5-Net-PcapUtils/Makefile
+++ b/net/p5-Net-PcapUtils/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-PcapUtils
PORTVERSION= 0.01
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-Net-Ping-External/Makefile b/net/p5-Net-Ping-External/Makefile
index 8659ef4b1c84..aa6a781c53b4 100644
--- a/net/p5-Net-Ping-External/Makefile
+++ b/net/p5-Net-Ping-External/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Ping-External
PORTVERSION= 0.12
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= douglas@douglasthrift.net
diff --git a/net/p5-Net-RTP/Makefile b/net/p5-Net-RTP/Makefile
index 7b7e4b39acfc..bffb6b91063a 100644
--- a/net/p5-Net-RTP/Makefile
+++ b/net/p5-Net-RTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-RTP
PORTVERSION= 0.09
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Net-Radius/Makefile b/net/p5-Net-Radius/Makefile
index 22bf0516fb82..4e844955f911 100644
--- a/net/p5-Net-Radius/Makefile
+++ b/net/p5-Net-Radius/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Radius
PORTVERSION= 1.56
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Net-Random/Makefile b/net/p5-Net-Random/Makefile
index e8a8ecff5ee7..bd8f8fbe6374 100644
--- a/net/p5-Net-Random/Makefile
+++ b/net/p5-Net-Random/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Random
PORTVERSION= 2.0
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-Net-RawIP/Makefile b/net/p5-Net-RawIP/Makefile
index 7e1b7d694676..5db2b5da0931 100644
--- a/net/p5-Net-RawIP/Makefile
+++ b/net/p5-Net-RawIP/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Net-RawIP
PORTVERSION= 0.23
PORTEPOCH= 1
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/net/p5-Net-Rendezvous/Makefile b/net/p5-Net-Rendezvous/Makefile
index ec3e30625e2c..6511002916d8 100644
--- a/net/p5-Net-Rendezvous/Makefile
+++ b/net/p5-Net-Rendezvous/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Rendezvous
PORTVERSION= 0.90
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Net-Rsh/Makefile b/net/p5-Net-Rsh/Makefile
index a8b073e9eadd..13ca0736d605 100644
--- a/net/p5-Net-Rsh/Makefile
+++ b/net/p5-Net-Rsh/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Rsh
PORTVERSION= 0.02
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= nistor@snickers.org
diff --git a/net/p5-Net-SAP/Makefile b/net/p5-Net-SAP/Makefile
index 5992b67fbcbc..4f4a843c02c7 100644
--- a/net/p5-Net-SAP/Makefile
+++ b/net/p5-Net-SAP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SAP
PORTVERSION= 0.10
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Net-SCP-Expect/Makefile b/net/p5-Net-SCP-Expect/Makefile
index 09d808322d70..faf71fb1627e 100644
--- a/net/p5-Net-SCP-Expect/Makefile
+++ b/net/p5-Net-SCP-Expect/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SCP-Expect
PORTVERSION= 0.12
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= numisemis@yahoo.com
diff --git a/net/p5-Net-SDP/Makefile b/net/p5-Net-SDP/Makefile
index 31b34c3150c2..2f9a75aa8669 100644
--- a/net/p5-Net-SDP/Makefile
+++ b/net/p5-Net-SDP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SDP
PORTVERSION= 0.07
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-Net-SFTP/Makefile b/net/p5-Net-SFTP/Makefile
index 828c4b643c4a..145f8f9a2b47 100644
--- a/net/p5-Net-SFTP/Makefile
+++ b/net/p5-Net-SFTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SFTP
PORTVERSION= 0.10
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tcornpropst@cox.net
diff --git a/net/p5-Net-SMPP/Makefile b/net/p5-Net-SMPP/Makefile
index 3486a68cde87..ee1962b59277 100644
--- a/net/p5-Net-SMPP/Makefile
+++ b/net/p5-Net-SMPP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SMPP
PORTVERSION= 1.10
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jhay@FreeBSD.org
diff --git a/net/p5-Net-SMS-PChome/Makefile b/net/p5-Net-SMS-PChome/Makefile
index 66d463aaa036..f8f2102bd8bf 100644
--- a/net/p5-Net-SMS-PChome/Makefile
+++ b/net/p5-Net-SMS-PChome/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SMS-PChome
PORTVERSION= 0.11
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/net/p5-Net-SNPP/Makefile b/net/p5-Net-SNPP/Makefile
index 026c291a5d08..0f8bb9868cb6 100644
--- a/net/p5-Net-SNPP/Makefile
+++ b/net/p5-Net-SNPP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SNPP
PORTVERSION= 1.17
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/net/p5-Net-SSH-Expect/Makefile b/net/p5-Net-SSH-Expect/Makefile
index 51d420b12f6d..9b5b70f23631 100644
--- a/net/p5-Net-SSH-Expect/Makefile
+++ b/net/p5-Net-SSH-Expect/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SSH-Expect
PORTVERSION= 1.04
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index 5c2ac285885c..dd583f1973c4 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Net-SSH-Perl
PORTVERSION= 1.30
PORTREVISION= 1
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Net-SSH/Makefile b/net/p5-Net-SSH/Makefile
index 04e98699b7bb..d101987ec1ff 100644
--- a/net/p5-Net-SSH/Makefile
+++ b/net/p5-Net-SSH/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SSH
PORTVERSION= 0.08
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Net-SSH2/Makefile b/net/p5-Net-SSH2/Makefile
index f4866ff8175c..4787d78638f9 100644
--- a/net/p5-Net-SSH2/Makefile
+++ b/net/p5-Net-SSH2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-SSH2
PORTVERSION= 0.18
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile
index 5d7f362d8f21..a4890fe07e45 100644
--- a/net/p5-Net-Server/Makefile
+++ b/net/p5-Net-Server/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Net-Server
PORTVERSION= 0.97
CATEGORIES= net perl5
MASTER_SITES= http://seamons.com/projects/perl/net_server/ \
- ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+ CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-Net-Services/Makefile b/net/p5-Net-Services/Makefile
index 352d721ebfb5..ef8b6f937f86 100644
--- a/net/p5-Net-Services/Makefile
+++ b/net/p5-Net-Services/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Net-Services
PORTVERSION= 1.3
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://freebsd.unixfreunde.de/sources/ \
http://mirror2.unixfreunde.de/
PKGNAMEPREFIX= p5-
diff --git a/net/p5-Net-TCLink/Makefile b/net/p5-Net-TCLink/Makefile
index a6ecaa8d5984..2e6652428d3e 100644
--- a/net/p5-Net-TCLink/Makefile
+++ b/net/p5-Net-TCLink/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-TCLink
PORTVERSION= 3.4
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Net_TCLink.pm-${PORTVERSION}
diff --git a/net/p5-Net-Telnet-Netscreen/Makefile b/net/p5-Net-Telnet-Netscreen/Makefile
index 838a68be6ae0..4f9e63e42aa7 100644
--- a/net/p5-Net-Telnet-Netscreen/Makefile
+++ b/net/p5-Net-Telnet-Netscreen/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Telnet-Netscreen
PORTVERSION= 1.1
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Netscreen-${PORTVERSION}
diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index 3682df84807b..664b2b07bbf4 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Telnet
PORTVERSION= 3.03
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/net/p5-Net-TiVo/Makefile b/net/p5-Net-TiVo/Makefile
index ee78ed0e5401..aaa1140b4dd3 100644
--- a/net/p5-Net-TiVo/Makefile
+++ b/net/p5-Net-TiVo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-TiVo
PORTVERSION= 0.10
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= boumenot@gmail.com
diff --git a/net/p5-Net-Traceroute/Makefile b/net/p5-Net-Traceroute/Makefile
index 33eda5c2d251..52562a5bb1fa 100644
--- a/net/p5-Net-Traceroute/Makefile
+++ b/net/p5-Net-Traceroute/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Traceroute
PORTVERSION= 1.10
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/net/p5-Net-Traceroute6/Makefile b/net/p5-Net-Traceroute6/Makefile
index f4c165b632af..af96580f81f1 100644
--- a/net/p5-Net-Traceroute6/Makefile
+++ b/net/p5-Net-Traceroute6/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Traceroute6
PORTVERSION= 0.03
CATEGORIES= net perl5 ipv6
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Net-Wake/Makefile b/net/p5-Net-Wake/Makefile
index f6b6298fcabc..4204b4687540 100644
--- a/net/p5-Net-Wake/Makefile
+++ b/net/p5-Net-Wake/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Wake
PORTVERSION= 0.02
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mistral@imasy.or.jp
diff --git a/net/p5-Net-Whois-ARIN/Makefile b/net/p5-Net-Whois-ARIN/Makefile
index 710b24c80bd4..2f50ce38311d 100644
--- a/net/p5-Net-Whois-ARIN/Makefile
+++ b/net/p5-Net-Whois-ARIN/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Whois-ARIN
PORTVERSION= 0.11
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-Net-Whois-IP/Makefile b/net/p5-Net-Whois-IP/Makefile
index 45e9c2eba348..ab84f2357125 100644
--- a/net/p5-Net-Whois-IP/Makefile
+++ b/net/p5-Net-Whois-IP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Whois-IP
PORTVERSION= 1.04
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-Net-Whois-RIPE/Makefile b/net/p5-Net-Whois-RIPE/Makefile
index 8f6c9c1fcd02..b6e9d72f5f1f 100644
--- a/net/p5-Net-Whois-RIPE/Makefile
+++ b/net/p5-Net-Whois-RIPE/Makefile
@@ -9,7 +9,7 @@
PORTNAME= Net-Whois-RIPE
PORTVERSION= 1.23
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/P/PA/PAULG
PKGNAMEPREFIX= p5-
diff --git a/net/p5-Net-Whois/Makefile b/net/p5-Net-Whois/Makefile
index 4c7f7f0567ae..2cee72446579 100644
--- a/net/p5-Net-Whois/Makefile
+++ b/net/p5-Net-Whois/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Whois
PORTVERSION= 1.9
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/net/p5-Net-XWhois/Makefile b/net/p5-Net-XWhois/Makefile
index 9504a2cd313f..3e9fb6aa0616 100644
--- a/net/p5-Net-XWhois/Makefile
+++ b/net/p5-Net-XWhois/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Net-XWhois
PORTVERSION= 0.90
PORTREVISION= 4
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Net-Z3950-ZOOM/Makefile b/net/p5-Net-Z3950-ZOOM/Makefile
index 1770172b0216..a71b94df29f2 100644
--- a/net/p5-Net-Z3950-ZOOM/Makefile
+++ b/net/p5-Net-Z3950-ZOOM/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Net-Z3950-ZOOM
PORTVERSION= 1.21
PORTREVISION= 1
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/net/p5-Net-ext/Makefile b/net/p5-Net-ext/Makefile
index e588aaf44044..fceb99459360 100644
--- a/net/p5-Net-ext/Makefile
+++ b/net/p5-Net-ext/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-ext
PORTVERSION= 1.011
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-NetAddr-IP-Count/Makefile b/net/p5-NetAddr-IP-Count/Makefile
index 174a40c9905b..73ccb7fc05a9 100644
--- a/net/p5-NetAddr-IP-Count/Makefile
+++ b/net/p5-NetAddr-IP-Count/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NetAddr-IP-Count
PORTVERSION= 2.01
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= NetAddr
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/net/p5-NetPacket/Makefile b/net/p5-NetPacket/Makefile
index 5ef3bcad5b57..d61a0890827b 100644
--- a/net/p5-NetPacket/Makefile
+++ b/net/p5-NetPacket/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NetPacket
PORTVERSION= 0.04
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= NetPacket
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tolid@plab.ku.dk
diff --git a/net/p5-OurNet-BBS/Makefile b/net/p5-OurNet-BBS/Makefile
index 28db1891bd29..6a3ed5564419 100644
--- a/net/p5-OurNet-BBS/Makefile
+++ b/net/p5-OurNet-BBS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OurNet-BBS
PORTVERSION= 1.66
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OurNet
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-OurNet-BBSAgent/Makefile b/net/p5-OurNet-BBSAgent/Makefile
index 308b5a8dbbb0..62b48b51eb1b 100644
--- a/net/p5-OurNet-BBSAgent/Makefile
+++ b/net/p5-OurNet-BBSAgent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OurNet-BBSAgent
PORTVERSION= 1.61
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OurNet
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-POE-Component-Client-Keepalive/Makefile b/net/p5-POE-Component-Client-Keepalive/Makefile
index 87653630fe7a..f058970ba135 100644
--- a/net/p5-POE-Component-Client-Keepalive/Makefile
+++ b/net/p5-POE-Component-Client-Keepalive/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Client-Keepalive
PORTVERSION= 0.1000
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-POE-Component-Client-Ping/Makefile b/net/p5-POE-Component-Client-Ping/Makefile
index e90e6c4051a7..8b268e4c6da1 100644
--- a/net/p5-POE-Component-Client-Ping/Makefile
+++ b/net/p5-POE-Component-Client-Ping/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Client-Ping
PORTVERSION= 1.13
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-POE-Component-Client-Telnet/Makefile b/net/p5-POE-Component-Client-Telnet/Makefile
index 359433d506be..4e5e5b4dc3df 100644
--- a/net/p5-POE-Component-Client-Telnet/Makefile
+++ b/net/p5-POE-Component-Client-Telnet/Makefile
@@ -9,8 +9,7 @@ PORTNAME= POE-Component-Client-Telnet
PORTVERSION= 0.06
PORTREVISION= 2
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/net/p5-POE-Component-Client-Traceroute/Makefile b/net/p5-POE-Component-Client-Traceroute/Makefile
index a66b8697dc6d..edde64a79d86 100644
--- a/net/p5-POE-Component-Client-Traceroute/Makefile
+++ b/net/p5-POE-Component-Client-Traceroute/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Client-Traceroute
PORTVERSION= 0.21
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/net/p5-POE-Component-ControlPort/Makefile b/net/p5-POE-Component-ControlPort/Makefile
index 7fb9bdb84fb4..4358a526b723 100644
--- a/net/p5-POE-Component-ControlPort/Makefile
+++ b/net/p5-POE-Component-ControlPort/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-ControlPort
PORTVERSION= 0.01
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/net/p5-POE-Component-Pcap/Makefile b/net/p5-POE-Component-Pcap/Makefile
index 4f608c81b838..dbb159579095 100644
--- a/net/p5-POE-Component-Pcap/Makefile
+++ b/net/p5-POE-Component-Pcap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Pcap
PORTVERSION= 0.04
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-POE-Component-Spread/Makefile b/net/p5-POE-Component-Spread/Makefile
index 12aa87038b57..68956b8ba2e1 100644
--- a/net/p5-POE-Component-Spread/Makefile
+++ b/net/p5-POE-Component-Spread/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Spread
PORTVERSION= 0.02
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-Parallel-MPI/Makefile b/net/p5-Parallel-MPI/Makefile
index b480ef72733e..d1251962a580 100644
--- a/net/p5-Parallel-MPI/Makefile
+++ b/net/p5-Parallel-MPI/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Parallel-MPI
PORTVERSION= 0.03
PORTREVISION= 2
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parallel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-Parallel-Pvm/Makefile b/net/p5-Parallel-Pvm/Makefile
index dff84f5da07a..21fc72890fe6 100644
--- a/net/p5-Parallel-Pvm/Makefile
+++ b/net/p5-Parallel-Pvm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Parallel-Pvm
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parallel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index e6a5db2e4053..24584cf5f4e5 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PlRPC
PORTVERSION= 0.2020
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-REST-Application/Makefile b/net/p5-REST-Application/Makefile
index e00ac283a69b..4764de656350 100644
--- a/net/p5-REST-Application/Makefile
+++ b/net/p5-REST-Application/Makefile
@@ -8,8 +8,8 @@
PORTNAME= REST-Application
PORTVERSION= 0.992
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/M/MO/MOCONNOR/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/M/MO/MOCONNOR
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-RPC-Simple/Makefile b/net/p5-RPC-Simple/Makefile
index 2ebfd1cbff4a..c223ad928c44 100644
--- a/net/p5-RPC-Simple/Makefile
+++ b/net/p5-RPC-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RPC-Simple
PORTVERSION= 1.002
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile
index f4e2c8acb954..c4afea59364f 100644
--- a/net/p5-RPC-XML/Makefile
+++ b/net/p5-RPC-XML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RPC-XML
PORTVERSION= 0.59
CATEGORIES= net www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mm@FreeBSD.org
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
index ade5849823a7..f9cb7cc1fc1c 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ResourcePool-Resource-Net-LDAP
PORTVERSION= 1.0002
CATEGORIES= net 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/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
index ea6c3f18473f..bb8f6b8612c3 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ResourcePool-Resource-SOAP-Lite
PORTVERSION= 1.0101
CATEGORIES= net 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/net/p5-SOAP-Data-Builder/Makefile b/net/p5-SOAP-Data-Builder/Makefile
index 798b474ea14c..0d37d0b68351 100644
--- a/net/p5-SOAP-Data-Builder/Makefile
+++ b/net/p5-SOAP-Data-Builder/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SOAP-Data-Builder
PORTVERSION= 0.9
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SOAP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-SOAP-Lite-060/Makefile b/net/p5-SOAP-Lite-060/Makefile
index 80a995abd8ee..4e1669a4a6d6 100644
--- a/net/p5-SOAP-Lite-060/Makefile
+++ b/net/p5-SOAP-Lite-060/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SOAP-Lite
PORTVERSION= 0.60a
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SOAP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index 5a699e7792b2..5a3bd0b901af 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SOAP-Lite
PORTVERSION= 0.69
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SOAP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kappa@freebsd.org.ua
diff --git a/net/p5-SOAP/Makefile b/net/p5-SOAP/Makefile
index 56b9948ddbf2..c09ac117e329 100644
--- a/net/p5-SOAP/Makefile
+++ b/net/p5-SOAP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SOAP
PORTVERSION= 0.28
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SOAP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Socket-Multicast6/Makefile b/net/p5-Socket-Multicast6/Makefile
index 4524638ad917..a2e58b0d89f2 100644
--- a/net/p5-Socket-Multicast6/Makefile
+++ b/net/p5-Socket-Multicast6/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Socket-Multicast6
PORTVERSION= 0.02
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/N/NJ/NJH
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index 439c5a6c4624..e0b384981bb8 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Socket6
PORTVERSION= 0.20
CATEGORIES= net perl5 ipv6
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Socket6
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ume@FreeBSD.org
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 76e15dae5682..502c4fd0b4b8 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SOCKS
PORTVERSION= 0.03
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Spread-Message/Makefile b/net/p5-Spread-Message/Makefile
index ec1721aad2a9..f5a9eb53dd7b 100644
--- a/net/p5-Spread-Message/Makefile
+++ b/net/p5-Spread-Message/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Spread-Message
PORTVERSION= 0.21
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/M/MA/MARKPF
PKGNAMEPREFIX= p5-
diff --git a/net/p5-Spread-Session/Makefile b/net/p5-Spread-Session/Makefile
index 184d9111d163..079b7b7498a0 100644
--- a/net/p5-Spread-Session/Makefile
+++ b/net/p5-Spread-Session/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Spread-Session
PORTVERSION= 0.4
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/J/JM/JMAY
PKGNAMEPREFIX= p5-
diff --git a/net/p5-URI-OpenURL/Makefile b/net/p5-URI-OpenURL/Makefile
index b2514c2ecb3a..2cd9b7b5f74d 100644
--- a/net/p5-URI-OpenURL/Makefile
+++ b/net/p5-URI-OpenURL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= URI-OpenURL
PORTVERSION= 0.4.6
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= URI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index a6fa41b36dbe..e511185258dd 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= URI
PORTVERSION= 1.36
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= URI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/net/p5-Validate-Net/Makefile b/net/p5-Validate-Net/Makefile
index c7aa3c6ad5b6..df1a525bccaa 100644
--- a/net/p5-Validate-Net/Makefile
+++ b/net/p5-Validate-Net/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Validate-Net
PORTVERSION= 0.5
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AD/ADAMK
PKGNAMEPREFIX= p5-
diff --git a/net/p5-What/Makefile b/net/p5-What/Makefile
index d76582e3fa8a..252dcdf8ed46 100644
--- a/net/p5-What/Makefile
+++ b/net/p5-What/Makefile
@@ -8,7 +8,7 @@
PORTNAME= What
PORTVERSION= 1.01
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TP/TPG
PKGNAMEPREFIX= p5-
diff --git a/net/p5-X500-DN/Makefile b/net/p5-X500-DN/Makefile
index 4c67fff43bb7..7ee741928b5c 100644
--- a/net/p5-X500-DN/Makefile
+++ b/net/p5-X500-DN/Makefile
@@ -8,8 +8,7 @@
PORTNAME= X500-DN
PORTVERSION= 0.29
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= X500
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-XPC/Makefile b/net/p5-XPC/Makefile
index 8350bc69b5a5..5782d4eef9eb 100644
--- a/net/p5-XPC/Makefile
+++ b/net/p5-XPC/Makefile
@@ -9,7 +9,7 @@
PORTNAME= XPC
PORTVERSION= 0.2
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GR/GREGOR
PKGNAMEPREFIX= p5-
diff --git a/news/p5-Gateway/Makefile b/news/p5-Gateway/Makefile
index b85da34f554e..d2e91f66cb20 100644
--- a/news/p5-Gateway/Makefile
+++ b/news/p5-Gateway/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Gateway
PORTVERSION= 0.42
PORTREVISION= 1
CATEGORIES= news perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= News
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/news/p5-NNML/Makefile b/news/p5-NNML/Makefile
index 02e44ec6a812..75f96ae6d675 100644
--- a/news/p5-NNML/Makefile
+++ b/news/p5-NNML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NNML
PORTVERSION= 1.14
CATEGORIES= news perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/U/UL/ULPFR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/news/p5-NNTPClient/Makefile b/news/p5-NNTPClient/Makefile
index 50d181bef0c8..a3efb7fb5d27 100644
--- a/news/p5-NNTPClient/Makefile
+++ b/news/p5-NNTPClient/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NNTPClient
PORTVERSION= 0.37
CATEGORIES= news perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= News
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/news/p5-News-Article-NoCeM/Makefile b/news/p5-News-Article-NoCeM/Makefile
index 8a39defa3704..e6afce79da7f 100644
--- a/news/p5-News-Article-NoCeM/Makefile
+++ b/news/p5-News-Article-NoCeM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= News-Article-NoCeM
PORTVERSION= 0.08
CATEGORIES= news perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= News
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index b2f92c787e26..e5d0d89ba80f 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -9,8 +9,7 @@ PORTNAME= News-Article
PORTVERSION= 1.27
PORTREVISION= 2
CATEGORIES= news perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= News
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile
index 9e4bafcaf346..c3c1a18f41ec 100644
--- a/news/p5-News-Newsrc/Makefile
+++ b/news/p5-News-Newsrc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= News-Newsrc
PORTVERSION= 1.09
CATEGORIES= news perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= News
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/news/p5-NewsLib/Makefile b/news/p5-NewsLib/Makefile
index 8e8e10cf4df8..a08306036460 100644
--- a/news/p5-NewsLib/Makefile
+++ b/news/p5-NewsLib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NewsLib
PORTVERSION= 0.84
CATEGORIES= news perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= News
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
diff --git a/news/p5-POE-Component-Client-NNTP/Makefile b/news/p5-POE-Component-Client-NNTP/Makefile
index 699719284b16..d76a1c92b90f 100644
--- a/news/p5-POE-Component-Client-NNTP/Makefile
+++ b/news/p5-POE-Component-Client-NNTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Client-NNTP
PORTVERSION= 2.02
CATEGORIES= news perl5 devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/palm/p5-Palm-PalmDoc/Makefile b/palm/p5-Palm-PalmDoc/Makefile
index 3f723ffd5bc4..a31fa7a4bc64 100644
--- a/palm/p5-Palm-PalmDoc/Makefile
+++ b/palm/p5-Palm-PalmDoc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Palm-PalmDoc
PORTVERSION= 0.13
CATEGORIES= palm perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Palm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= simond@irrelevant.org
diff --git a/print/axpoint/Makefile b/print/axpoint/Makefile
index 830b7b212123..bcd3d50ab2c9 100644
--- a/print/axpoint/Makefile
+++ b/print/axpoint/Makefile
@@ -9,8 +9,7 @@
PORTNAME= axpoint
PORTVERSION= 1.50
CATEGORIES= print perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
DISTNAME= XML-Handler-AxPoint-${PORTVERSION:S/0$//}
MAINTAINER= ports@FreeBSD.org
diff --git a/print/p5-Net-Printer/Makefile b/print/p5-Net-Printer/Makefile
index 66e57fedba48..b67a6c03ed53 100644
--- a/print/p5-Net-Printer/Makefile
+++ b/print/p5-Net-Printer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Printer
PORTVERSION= 1.04
CATEGORIES= print perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= andrew@scoop.co.nz
diff --git a/print/p5-PDF-Template/Makefile b/print/p5-PDF-Template/Makefile
index 9b4dda01be53..188ed71c5d4c 100644
--- a/print/p5-PDF-Template/Makefile
+++ b/print/p5-PDF-Template/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PDF-Template
PORTVERSION= 0.22
CATEGORIES= print perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PDF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= yaizawa@2004.jukuin.keio.ac.jp
diff --git a/print/p5-PDFLib/Makefile b/print/p5-PDFLib/Makefile
index 74c569954569..5d39609a085f 100644
--- a/print/p5-PDFLib/Makefile
+++ b/print/p5-PDFLib/Makefile
@@ -9,8 +9,7 @@
PORTNAME= PDFLib
PORTVERSION= 0.14
CATEGORIES= print perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/M/MS/MSERGEANT
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/print/p5-PostScript-Simple/Makefile b/print/p5-PostScript-Simple/Makefile
index a15b183405f9..63d9a3ebaeac 100644
--- a/print/p5-PostScript-Simple/Makefile
+++ b/print/p5-PostScript-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PostScript-Simple
PORTVERSION= 0.07
CATEGORIES= print perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PostScript
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/print/p5-Text-PDF/Makefile b/print/p5-Text-PDF/Makefile
index 4a878982f8e7..896c0f9358d2 100644
--- a/print/p5-Text-PDF/Makefile
+++ b/print/p5-Text-PDF/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-PDF
PORTVERSION= 0.29a
CATEGORIES= print perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/print/p5-XML-ApacheFOP/Makefile b/print/p5-XML-ApacheFOP/Makefile
index 89487310f04e..ed6e310dea75 100644
--- a/print/p5-XML-ApacheFOP/Makefile
+++ b/print/p5-XML-ApacheFOP/Makefile
@@ -9,8 +9,7 @@ PORTNAME= XML-ApacheFOP
PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= print perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= numisemis@yahoo.com
diff --git a/russian/p5-Lingua-RU-Charset/Makefile b/russian/p5-Lingua-RU-Charset/Makefile
index ea134fa15644..e505c85a583a 100644
--- a/russian/p5-Lingua-RU-Charset/Makefile
+++ b/russian/p5-Lingua-RU-Charset/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-RU-Charset
PORTVERSION= 0.02
CATEGORIES= russian perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/russian/p5-cyrillic/Makefile b/russian/p5-cyrillic/Makefile
index 1c26eb1555cb..5f7a5d30fb3c 100644
--- a/russian/p5-cyrillic/Makefile
+++ b/russian/p5-cyrillic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cyrillic
PORTVERSION= 2.09
CATEGORIES= russian converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unicode/AMICHAUER
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tolid@plab.ku.dk
diff --git a/science/p5-Algorithm-SVMLight/Makefile b/science/p5-Algorithm-SVMLight/Makefile
index d224c8d9ce02..fbcc956dbc08 100644
--- a/science/p5-Algorithm-SVMLight/Makefile
+++ b/science/p5-Algorithm-SVMLight/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-SVMLight
PORTVERSION= 0.07
CATEGORIES= science perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/science/p5-Chemistry-Elements/Makefile b/science/p5-Chemistry-Elements/Makefile
index bed4056e386c..6ae3fb5aec37 100644
--- a/science/p5-Chemistry-Elements/Makefile
+++ b/science/p5-Chemistry-Elements/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Chemistry-Elements
PORTVERSION= 1.05
CATEGORIES= science perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/BDFOY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Authen-Bitcard/Makefile b/security/p5-Authen-Bitcard/Makefile
index 6938fbacdf9e..853894a7c694 100644
--- a/security/p5-Authen-Bitcard/Makefile
+++ b/security/p5-Authen-Bitcard/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Bitcard
PORTVERSION= 0.86
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/security/p5-Authen-Captcha/Makefile b/security/p5-Authen-Captcha/Makefile
index c36826ea7a2c..237037536c2c 100644
--- a/security/p5-Authen-Captcha/Makefile
+++ b/security/p5-Authen-Captcha/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Authen-Captcha
PORTVERSION= 1.023
PORTREVISION= 2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Authen-CyrusSASL/Makefile b/security/p5-Authen-CyrusSASL/Makefile
index 7dc9fbce8d35..5ffce6747fb2 100644
--- a/security/p5-Authen-CyrusSASL/Makefile
+++ b/security/p5-Authen-CyrusSASL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-CyrusSASL
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= bra@fsn.hu
diff --git a/security/p5-Authen-Htpasswd/Makefile b/security/p5-Authen-Htpasswd/Makefile
index 1439d3078b95..4000b637ea25 100644
--- a/security/p5-Authen-Htpasswd/Makefile
+++ b/security/p5-Authen-Htpasswd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Htpasswd
PORTVERSION= 0.16
CATEGORIES= security perl5 www
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/security/p5-Authen-Krb5/Makefile b/security/p5-Authen-Krb5/Makefile
index 8dc1be880902..70c6ac9218d1 100644
--- a/security/p5-Authen-Krb5/Makefile
+++ b/security/p5-Authen-Krb5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Krb5
PORTVERSION= 1.6
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Krb5-${PORTVERSION}
diff --git a/security/p5-Authen-Libwrap/Makefile b/security/p5-Authen-Libwrap/Makefile
index cea1130ccab2..3102e4e9ed99 100644
--- a/security/p5-Authen-Libwrap/Makefile
+++ b/security/p5-Authen-Libwrap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Authen-Libwrap
PORTVERSION= 0.20
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/security/p5-Authen-NTLM/Makefile b/security/p5-Authen-NTLM/Makefile
index 2457d1bced30..526a66d22fa4 100644
--- a/security/p5-Authen-NTLM/Makefile
+++ b/security/p5-Authen-NTLM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NTLM
PORTVERSION= 1.03
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= james@divide.org
diff --git a/security/p5-Authen-PAAS/Makefile b/security/p5-Authen-PAAS/Makefile
index 4e84f42c1fee..5a321bd5ac78 100644
--- a/security/p5-Authen-PAAS/Makefile
+++ b/security/p5-Authen-PAAS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-PAAS
PORTVERSION= 1.1.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-PAM/Makefile b/security/p5-Authen-PAM/Makefile
index a80413cb3746..c22d41a4ad41 100644
--- a/security/p5-Authen-PAM/Makefile
+++ b/security/p5-Authen-PAM/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Authen-PAM
PORTVERSION= 0.16
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= des@FreeBSD.org
diff --git a/security/p5-Authen-PluggableCaptcha/Makefile b/security/p5-Authen-PluggableCaptcha/Makefile
index 9876460442d6..2f227fe5ca64 100644
--- a/security/p5-Authen-PluggableCaptcha/Makefile
+++ b/security/p5-Authen-PluggableCaptcha/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-PluggableCaptcha
PORTVERSION= 0.05
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile
index 627425e9e20a..16af5dc5060d 100644
--- a/security/p5-Authen-Radius/Makefile
+++ b/security/p5-Authen-Radius/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Radius
PORTVERSION= 0.13
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= RadiusPerl-${PORTVERSION}
diff --git a/security/p5-Authen-SASL-Cyrus/Makefile b/security/p5-Authen-SASL-Cyrus/Makefile
index 2d06420f31e3..bedf963ecf58 100644
--- a/security/p5-Authen-SASL-Cyrus/Makefile
+++ b/security/p5-Authen-SASL-Cyrus/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-SASL-Cyrus
PORTVERSION= 0.12
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-Authen-SASL/Makefile b/security/p5-Authen-SASL/Makefile
index 95255a4256d0..9cb6509d8c14 100644
--- a/security/p5-Authen-SASL/Makefile
+++ b/security/p5-Authen-SASL/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Authen-SASL
PORTVERSION= 2.10
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Authen-Simple-DBI/Makefile b/security/p5-Authen-Simple-DBI/Makefile
index 34f1684eceb6..319e2bcf4ebd 100644
--- a/security/p5-Authen-Simple-DBI/Makefile
+++ b/security/p5-Authen-Simple-DBI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-DBI
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-DBM/Makefile b/security/p5-Authen-Simple-DBM/Makefile
index 8c4e0d670562..0235ce987683 100644
--- a/security/p5-Authen-Simple-DBM/Makefile
+++ b/security/p5-Authen-Simple-DBM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-DBM
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-HTTP/Makefile b/security/p5-Authen-Simple-HTTP/Makefile
index d16a8070f6b1..e1c1d0ee1bb5 100644
--- a/security/p5-Authen-Simple-HTTP/Makefile
+++ b/security/p5-Authen-Simple-HTTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-HTTP
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-LDAP/Makefile b/security/p5-Authen-Simple-LDAP/Makefile
index 45adb856d299..6aefe769c633 100644
--- a/security/p5-Authen-Simple-LDAP/Makefile
+++ b/security/p5-Authen-Simple-LDAP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-LDAP
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-Net/Makefile b/security/p5-Authen-Simple-Net/Makefile
index 7bc742e67e15..360ad5264dd2 100644
--- a/security/p5-Authen-Simple-Net/Makefile
+++ b/security/p5-Authen-Simple-Net/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-Net
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-PAM/Makefile b/security/p5-Authen-Simple-PAM/Makefile
index 6c1ada04cee6..71ea21e84985 100644
--- a/security/p5-Authen-Simple-PAM/Makefile
+++ b/security/p5-Authen-Simple-PAM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-PAM
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-Passwd/Makefile b/security/p5-Authen-Simple-Passwd/Makefile
index 11a3161d8409..019479424b5e 100644
--- a/security/p5-Authen-Simple-Passwd/Makefile
+++ b/security/p5-Authen-Simple-Passwd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-Passwd
PORTVERSION= 0.6
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-RADIUS/Makefile b/security/p5-Authen-Simple-RADIUS/Makefile
index e089f401ed13..d04eb8f2a588 100644
--- a/security/p5-Authen-Simple-RADIUS/Makefile
+++ b/security/p5-Authen-Simple-RADIUS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-RADIUS
PORTVERSION= 0.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-SMB/Makefile b/security/p5-Authen-Simple-SMB/Makefile
index c6324a204e2c..423c7f4e5122 100644
--- a/security/p5-Authen-Simple-SMB/Makefile
+++ b/security/p5-Authen-Simple-SMB/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-SMB
PORTVERSION= 0.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-SSH/Makefile b/security/p5-Authen-Simple-SSH/Makefile
index 1b62705235c5..09674dda3acc 100644
--- a/security/p5-Authen-Simple-SSH/Makefile
+++ b/security/p5-Authen-Simple-SSH/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-SSH
PORTVERSION= 0.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple/Makefile b/security/p5-Authen-Simple/Makefile
index ff69971ddc0d..5b99da0742a6 100644
--- a/security/p5-Authen-Simple/Makefile
+++ b/security/p5-Authen-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple
PORTVERSION= 0.4
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Smb/Makefile b/security/p5-Authen-Smb/Makefile
index 6f654e9d7047..7d35076ffd16 100644
--- a/security/p5-Authen-Smb/Makefile
+++ b/security/p5-Authen-Smb/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Authen-Smb
PORTVERSION= 0.91
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ma499@doc.ic.ac.uk
diff --git a/security/p5-Authen-TacacsPlus/Makefile b/security/p5-Authen-TacacsPlus/Makefile
index b3585c7bca30..42f2a8641feb 100644
--- a/security/p5-Authen-TacacsPlus/Makefile
+++ b/security/p5-Authen-TacacsPlus/Makefile
@@ -8,8 +8,7 @@
PORTNAME= TacacsPlus
PORTVERSION= 0.16
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Authen-Ticket/Makefile b/security/p5-Authen-Ticket/Makefile
index 8e6641c61e8a..922405d34ec8 100644
--- a/security/p5-Authen-Ticket/Makefile
+++ b/security/p5-Authen-Ticket/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Ticket
PORTVERSION= 0.02
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Authen-TypeKey/Makefile b/security/p5-Authen-TypeKey/Makefile
index 4433cc6dba36..819b051b41d8 100644
--- a/security/p5-Authen-TypeKey/Makefile
+++ b/security/p5-Authen-TypeKey/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-TypeKey
PORTVERSION= 0.05
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/security/p5-Crypt-Anubis/Makefile b/security/p5-Crypt-Anubis/Makefile
index e8ae60d5ccb3..40089146c05a 100644
--- a/security/p5-Crypt-Anubis/Makefile
+++ b/security/p5-Crypt-Anubis/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Anubis
PORTVERSION= 1.0.4
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-AppleTwoFish/Makefile b/security/p5-Crypt-AppleTwoFish/Makefile
index 62eed1a3f275..717f3be6cb9f 100644
--- a/security/p5-Crypt-AppleTwoFish/Makefile
+++ b/security/p5-Crypt-AppleTwoFish/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-AppleTwoFish
PORTVERSION= 0.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Blowfish/Makefile b/security/p5-Crypt-Blowfish/Makefile
index cd98ec5e2a82..b4a8f43740c3 100644
--- a/security/p5-Crypt-Blowfish/Makefile
+++ b/security/p5-Crypt-Blowfish/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Blowfish
PORTVERSION= 2.10
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Blowfish_PP/Makefile b/security/p5-Crypt-Blowfish_PP/Makefile
index c301e7458070..39238f26c016 100644
--- a/security/p5-Crypt-Blowfish_PP/Makefile
+++ b/security/p5-Crypt-Blowfish_PP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Blowfish_PP
PORTVERSION= 1.12
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Crypt-CAST5_PP/Makefile b/security/p5-Crypt-CAST5_PP/Makefile
index b9592e362755..86ad4dea4a74 100644
--- a/security/p5-Crypt-CAST5_PP/Makefile
+++ b/security/p5-Crypt-CAST5_PP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-CAST5_PP
PORTVERSION= 1.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-CFB/Makefile b/security/p5-Crypt-CFB/Makefile
index 3fa668462d03..43289c10d8de 100644
--- a/security/p5-Crypt-CFB/Makefile
+++ b/security/p5-Crypt-CFB/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-CFB
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Caesar/Makefile b/security/p5-Crypt-Caesar/Makefile
index 8d6071d48bab..634961f37fe4 100644
--- a/security/p5-Crypt-Caesar/Makefile
+++ b/security/p5-Crypt-Caesar/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Caesar
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Camellia_PP/Makefile b/security/p5-Crypt-Camellia_PP/Makefile
index d2012352b5e0..50c254996687 100644
--- a/security/p5-Crypt-Camellia_PP/Makefile
+++ b/security/p5-Crypt-Camellia_PP/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Camellia_PP
PORTVERSION= 0.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= yanagisawa@csg.is.titech.ac.jp
diff --git a/security/p5-Crypt-Chimera/Makefile b/security/p5-Crypt-Chimera/Makefile
index 753c329b2ec9..eeeb90d1b013 100644
--- a/security/p5-Crypt-Chimera/Makefile
+++ b/security/p5-Crypt-Chimera/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Chimera
PORTVERSION= 1.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-CipherSaber/Makefile b/security/p5-Crypt-CipherSaber/Makefile
index 29595443451a..879a7eb7d312 100644
--- a/security/p5-Crypt-CipherSaber/Makefile
+++ b/security/p5-Crypt-CipherSaber/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-CipherSaber
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Crypt-Cracklib/Makefile b/security/p5-Crypt-Cracklib/Makefile
index 3c098518608a..3d0ea5fab3ed 100644
--- a/security/p5-Crypt-Cracklib/Makefile
+++ b/security/p5-Crypt-Cracklib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Cracklib
PORTVERSION= 1.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Ctr/Makefile b/security/p5-Crypt-Ctr/Makefile
index c1e85209ea14..100226b385af 100644
--- a/security/p5-Crypt-Ctr/Makefile
+++ b/security/p5-Crypt-Ctr/Makefile
@@ -7,8 +7,7 @@ PORTNAME= Crypt-Ctr
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index 2a2803b73f64..b0933f83a917 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-DES
PORTVERSION= 2.05
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-DES_EDE3/Makefile b/security/p5-Crypt-DES_EDE3/Makefile
index a8d1bcb3bdcd..8e045f581bf2 100644
--- a/security/p5-Crypt-DES_EDE3/Makefile
+++ b/security/p5-Crypt-DES_EDE3/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Crypt-DES_EDE3
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-DES_PP/Makefile b/security/p5-Crypt-DES_PP/Makefile
index afcee0347e37..f76ad861ed04 100644
--- a/security/p5-Crypt-DES_PP/Makefile
+++ b/security/p5-Crypt-DES_PP/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-DES_PP
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-DH/Makefile b/security/p5-Crypt-DH/Makefile
index 3f068ebab72d..f598dbfb02c0 100644
--- a/security/p5-Crypt-DH/Makefile
+++ b/security/p5-Crypt-DH/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-DH
PORTVERSION= 0.06
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-DSA/Makefile b/security/p5-Crypt-DSA/Makefile
index a0cf5355f739..ff0427ac98f6 100644
--- a/security/p5-Crypt-DSA/Makefile
+++ b/security/p5-Crypt-DSA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-DSA
PORTVERSION= 0.14
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Dining/Makefile b/security/p5-Crypt-Dining/Makefile
index e03fb138cc06..e60d6d0a74d5 100644
--- a/security/p5-Crypt-Dining/Makefile
+++ b/security/p5-Crypt-Dining/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Dining
PORTVERSION= 1.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Crypt-ECB/Makefile b/security/p5-Crypt-ECB/Makefile
index fee79b050aaa..9393f16438e1 100644
--- a/security/p5-Crypt-ECB/Makefile
+++ b/security/p5-Crypt-ECB/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-ECB
PORTVERSION= 1.40
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/security/p5-Crypt-Enigma/Makefile b/security/p5-Crypt-Enigma/Makefile
index 4900e26ee359..57c2ccde41e1 100644
--- a/security/p5-Crypt-Enigma/Makefile
+++ b/security/p5-Crypt-Enigma/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Enigma
PORTVERSION= 1.3
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-GOST/Makefile b/security/p5-Crypt-GOST/Makefile
index dabd8cc46542..02c4a6db0262 100644
--- a/security/p5-Crypt-GOST/Makefile
+++ b/security/p5-Crypt-GOST/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-GOST
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-GOST_PP/Makefile b/security/p5-Crypt-GOST_PP/Makefile
index ac2534cd8f52..8977f3983bb7 100644
--- a/security/p5-Crypt-GOST_PP/Makefile
+++ b/security/p5-Crypt-GOST_PP/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-GOST_PP
PORTVERSION= 1.10
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-GPG/Makefile b/security/p5-Crypt-GPG/Makefile
index c86b22d355fe..8d67cd91320d 100644
--- a/security/p5-Crypt-GPG/Makefile
+++ b/security/p5-Crypt-GPG/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-GPG
PORTVERSION= 1.63
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-GeneratePassword/Makefile b/security/p5-Crypt-GeneratePassword/Makefile
index e943a8632eb2..98be475f1161 100644
--- a/security/p5-Crypt-GeneratePassword/Makefile
+++ b/security/p5-Crypt-GeneratePassword/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-GeneratePassword
PORTVERSION= 0.03
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= andrew@scoop.co.nz
diff --git a/security/p5-Crypt-HCE_MD5/Makefile b/security/p5-Crypt-HCE_MD5/Makefile
index a9a2d72abcd0..3abdfc921cbf 100644
--- a/security/p5-Crypt-HCE_MD5/Makefile
+++ b/security/p5-Crypt-HCE_MD5/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-HCE_MD5
PORTVERSION= 0.70
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-HCE_SHA/Makefile b/security/p5-Crypt-HCE_SHA/Makefile
index 25df4b5eb21c..53138886a8b4 100644
--- a/security/p5-Crypt-HCE_SHA/Makefile
+++ b/security/p5-Crypt-HCE_SHA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-HCE_SHA
PORTVERSION= 0.70
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-Imail/Makefile b/security/p5-Crypt-Imail/Makefile
index f18aa0893e70..b44955322875 100644
--- a/security/p5-Crypt-Imail/Makefile
+++ b/security/p5-Crypt-Imail/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Imail
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Khazad/Makefile b/security/p5-Crypt-Khazad/Makefile
index 5bc41cc114e6..7590286df7b1 100644
--- a/security/p5-Crypt-Khazad/Makefile
+++ b/security/p5-Crypt-Khazad/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Khazad
PORTVERSION= 1.0.3
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-License/Makefile b/security/p5-Crypt-License/Makefile
index 908fac12eb99..1fcf43fbe0a5 100644
--- a/security/p5-Crypt-License/Makefile
+++ b/security/p5-Crypt-License/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-License
PORTVERSION= 2.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Lite/Makefile b/security/p5-Crypt-Lite/Makefile
index 2a30b9910afa..05fcdd613bb4 100644
--- a/security/p5-Crypt-Lite/Makefile
+++ b/security/p5-Crypt-Lite/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Lite
PORTVERSION= 0.82.11
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Loki97/Makefile b/security/p5-Crypt-Loki97/Makefile
index bda145288a6e..364d64e4b1f6 100644
--- a/security/p5-Crypt-Loki97/Makefile
+++ b/security/p5-Crypt-Loki97/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Loki97
PORTVERSION= 1.0.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-MySQL/Makefile b/security/p5-Crypt-MySQL/Makefile
index 42bbe49b2461..c57be350cb4a 100644
--- a/security/p5-Crypt-MySQL/Makefile
+++ b/security/p5-Crypt-MySQL/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-MySQL
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-NULL/Makefile b/security/p5-Crypt-NULL/Makefile
index c8b3d8e223b5..b2a8bf9c672e 100644
--- a/security/p5-Crypt-NULL/Makefile
+++ b/security/p5-Crypt-NULL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-NULL
PORTVERSION= 1.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kaoru@kaisei.org
diff --git a/security/p5-Crypt-OFB/Makefile b/security/p5-Crypt-OFB/Makefile
index f408568d6e3e..c82c83f4fa56 100644
--- a/security/p5-Crypt-OFB/Makefile
+++ b/security/p5-Crypt-OFB/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OFB
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-OICQ/Makefile b/security/p5-Crypt-OICQ/Makefile
index 605112e49c1c..10dcc2e1d7cd 100644
--- a/security/p5-Crypt-OICQ/Makefile
+++ b/security/p5-Crypt-OICQ/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OICQ
PORTVERSION= 1.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/security/p5-Crypt-OTP/Makefile b/security/p5-Crypt-OTP/Makefile
index d053372d0689..b9c5ad431915 100644
--- a/security/p5-Crypt-OTP/Makefile
+++ b/security/p5-Crypt-OTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OTP
PORTVERSION= 2.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 18a0f0caeff2..3a4911c57331 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Crypt-OpenPGP
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/security/p5-Crypt-OpenSSL-Bignum/Makefile b/security/p5-Crypt-OpenSSL-Bignum/Makefile
index 05602f33b2e6..c3b14d102ebe 100644
--- a/security/p5-Crypt-OpenSSL-Bignum/Makefile
+++ b/security/p5-Crypt-OpenSSL-Bignum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OpenSSL-Bignum
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Crypt-OpenSSL-DSA/Makefile b/security/p5-Crypt-OpenSSL-DSA/Makefile
index 0a14745cc9b6..95e868b3a946 100644
--- a/security/p5-Crypt-OpenSSL-DSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-DSA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OpenSSL-DSA
PORTVERSION= 0.13
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-OpenSSL-RSA/Makefile b/security/p5-Crypt-OpenSSL-RSA/Makefile
index b8fe185bc46d..2f885e96b7a6 100644
--- a/security/p5-Crypt-OpenSSL-RSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-RSA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OpenSSL-RSA
PORTVERSION= 0.25
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-OpenSSL-Random/Makefile b/security/p5-Crypt-OpenSSL-Random/Makefile
index 919d068f79b5..742d186f74ff 100644
--- a/security/p5-Crypt-OpenSSL-Random/Makefile
+++ b/security/p5-Crypt-OpenSSL-Random/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OpenSSL-Random
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-OpenSSL-X509/Makefile b/security/p5-Crypt-OpenSSL-X509/Makefile
index 822f60af4330..1a73db8a16b7 100644
--- a/security/p5-Crypt-OpenSSL-X509/Makefile
+++ b/security/p5-Crypt-OpenSSL-X509/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OpenSSL-X509
PORTVERSION= 0.5
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kftseng@iyard.org
diff --git a/security/p5-Crypt-PGPSimple/Makefile b/security/p5-Crypt-PGPSimple/Makefile
index 2258146098ab..73eb3505973d 100644
--- a/security/p5-Crypt-PGPSimple/Makefile
+++ b/security/p5-Crypt-PGPSimple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-PGPSimple
PORTVERSION= 0.13
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rachek@si.FreeBSD.org
diff --git a/security/p5-Crypt-PassGen/Makefile b/security/p5-Crypt-PassGen/Makefile
index fb399aae90e1..176fa0f1ba38 100644
--- a/security/p5-Crypt-PassGen/Makefile
+++ b/security/p5-Crypt-PassGen/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-PassGen
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/security/p5-Crypt-PasswdMD5/Makefile b/security/p5-Crypt-PasswdMD5/Makefile
index c3ac7a2c48d1..757e465f4ebf 100644
--- a/security/p5-Crypt-PasswdMD5/Makefile
+++ b/security/p5-Crypt-PasswdMD5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-PasswdMD5
PORTVERSION= 1.3
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Crypt-Primes/Makefile b/security/p5-Crypt-Primes/Makefile
index d5b36c943b41..4d5a69fa9faf 100644
--- a/security/p5-Crypt-Primes/Makefile
+++ b/security/p5-Crypt-Primes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Primes
PORTVERSION= 0.50
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-RC4/Makefile b/security/p5-Crypt-RC4/Makefile
index cd198eee95f8..2a5fcd552c13 100644
--- a/security/p5-Crypt-RC4/Makefile
+++ b/security/p5-Crypt-RC4/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RC4
PORTVERSION= 2.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-RC5/Makefile b/security/p5-Crypt-RC5/Makefile
index 1b3ff7298181..2f0f65853ce6 100644
--- a/security/p5-Crypt-RC5/Makefile
+++ b/security/p5-Crypt-RC5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RC5
PORTVERSION= 2.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-RC6/Makefile b/security/p5-Crypt-RC6/Makefile
index 29c47fa47f32..869bd79cf9e5 100644
--- a/security/p5-Crypt-RC6/Makefile
+++ b/security/p5-Crypt-RC6/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RC6
PORTVERSION= 1.0
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-RIPEMD160/Makefile b/security/p5-Crypt-RIPEMD160/Makefile
index 68998df70ecd..1deef3a971f6 100644
--- a/security/p5-Crypt-RIPEMD160/Makefile
+++ b/security/p5-Crypt-RIPEMD160/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RIPEMD160
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-RSA/Makefile b/security/p5-Crypt-RSA/Makefile
index 11e7ceb52ff6..2df6d9231d7c 100644
--- a/security/p5-Crypt-RSA/Makefile
+++ b/security/p5-Crypt-RSA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RSA
PORTVERSION= 1.58
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Rabbit/Makefile b/security/p5-Crypt-Rabbit/Makefile
index 4cdc3c8986e0..180a445411c7 100644
--- a/security/p5-Crypt-Rabbit/Makefile
+++ b/security/p5-Crypt-Rabbit/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Rabbit
PORTVERSION= 1.0.0
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-RandPasswd/Makefile b/security/p5-Crypt-RandPasswd/Makefile
index 9136ba2d9b4c..d2c7bdddf1d0 100644
--- a/security/p5-Crypt-RandPasswd/Makefile
+++ b/security/p5-Crypt-RandPasswd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RandPasswd
PORTVERSION= 0.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-Random/Makefile b/security/p5-Crypt-Random/Makefile
index 900a8df19c3f..0d76d01486e7 100644
--- a/security/p5-Crypt-Random/Makefile
+++ b/security/p5-Crypt-Random/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Crypt-Random
PORTVERSION= 1.25
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Rijndael_PP/Makefile b/security/p5-Crypt-Rijndael_PP/Makefile
index 47bf9901b455..c6f2eaef649b 100644
--- a/security/p5-Crypt-Rijndael_PP/Makefile
+++ b/security/p5-Crypt-Rijndael_PP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Rijndael_PP
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/security/p5-Crypt-SKey/Makefile b/security/p5-Crypt-SKey/Makefile
index 64c5caddab89..e6c3ac80e029 100644
--- a/security/p5-Crypt-SKey/Makefile
+++ b/security/p5-Crypt-SKey/Makefile
@@ -7,8 +7,7 @@ PORTNAME= Crypt-SKey
PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-SSLeay/Makefile b/security/p5-Crypt-SSLeay/Makefile
index 59bdee408b43..92bc44cfba9e 100644
--- a/security/p5-Crypt-SSLeay/Makefile
+++ b/security/p5-Crypt-SSLeay/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-SSLeay
PORTVERSION= 0.57
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Crypt-Salt/Makefile b/security/p5-Crypt-Salt/Makefile
index b37f63df94a8..f0a9f7ecf377 100644
--- a/security/p5-Crypt-Salt/Makefile
+++ b/security/p5-Crypt-Salt/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Salt
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-SaltedHash/Makefile b/security/p5-Crypt-SaltedHash/Makefile
index 69fdb1ccc927..54a353f9155a 100644
--- a/security/p5-Crypt-SaltedHash/Makefile
+++ b/security/p5-Crypt-SaltedHash/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-SaltedHash
PORTVERSION= 0.05
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Serpent/Makefile b/security/p5-Crypt-Serpent/Makefile
index 2991db1342c5..ddea85c4b4d9 100644
--- a/security/p5-Crypt-Serpent/Makefile
+++ b/security/p5-Crypt-Serpent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Serpent
PORTVERSION= 1.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Shark/Makefile b/security/p5-Crypt-Shark/Makefile
index cde776c3cf33..00f3c20a1b2d 100644
--- a/security/p5-Crypt-Shark/Makefile
+++ b/security/p5-Crypt-Shark/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Shark
PORTVERSION= 1.0.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-SmbHash/Makefile b/security/p5-Crypt-SmbHash/Makefile
index 1d030ad8e1fb..b9c20e31e6e9 100644
--- a/security/p5-Crypt-SmbHash/Makefile
+++ b/security/p5-Crypt-SmbHash/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-SmbHash
PORTVERSION= 0.12
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= flz@FreeBSD.org
diff --git a/security/p5-Crypt-Solitaire/Makefile b/security/p5-Crypt-Solitaire/Makefile
index 90ad69f7da53..5d2cf4cf530e 100644
--- a/security/p5-Crypt-Solitaire/Makefile
+++ b/security/p5-Crypt-Solitaire/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Solitaire
PORTVERSION= 2.0
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-TEA/Makefile b/security/p5-Crypt-TEA/Makefile
index 34d9f47eea12..ea7ddf0f7f3c 100644
--- a/security/p5-Crypt-TEA/Makefile
+++ b/security/p5-Crypt-TEA/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-TEA
PORTVERSION= 1.25
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-TripleDES/Makefile b/security/p5-Crypt-TripleDES/Makefile
index 8be6516c963c..bb98ebf110f7 100644
--- a/security/p5-Crypt-TripleDES/Makefile
+++ b/security/p5-Crypt-TripleDES/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-TripleDES
PORTVERSION= 0.24
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-Twofish/Makefile b/security/p5-Crypt-Twofish/Makefile
index 14c612f1fea1..71004e910a64 100644
--- a/security/p5-Crypt-Twofish/Makefile
+++ b/security/p5-Crypt-Twofish/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Crypt-Twofish
PORTVERSION= 2.12
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Crypt-Twofish2/Makefile b/security/p5-Crypt-Twofish2/Makefile
index bd55453533e5..0f149465d0d8 100644
--- a/security/p5-Crypt-Twofish2/Makefile
+++ b/security/p5-Crypt-Twofish2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Twofish2
PORTVERSION= 1.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-UnixCrypt/Makefile b/security/p5-Crypt-UnixCrypt/Makefile
index c2eb7bc651fd..71336710790a 100644
--- a/security/p5-Crypt-UnixCrypt/Makefile
+++ b/security/p5-Crypt-UnixCrypt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-UnixCrypt
PORTVERSION= 1.0
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-X509/Makefile b/security/p5-Crypt-X509/Makefile
index ef75da8113be..3cffbaac0540 100644
--- a/security/p5-Crypt-X509/Makefile
+++ b/security/p5-Crypt-X509/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-X509
PORTVERSION= 0.32
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Data-Entropy/Makefile b/security/p5-Data-Entropy/Makefile
index 7b6546df7eb9..3845002ceaa4 100644
--- a/security/p5-Data-Entropy/Makefile
+++ b/security/p5-Data-Entropy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Entropy
PORTVERSION= 0.004
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Data-Password/Makefile b/security/p5-Data-Password/Makefile
index 80d73719d6da..71642f182b61 100644
--- a/security/p5-Data-Password/Makefile
+++ b/security/p5-Data-Password/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Password
PORTVERSION= 1.07
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@c0decafe.net
diff --git a/security/p5-Digest-Adler32/Makefile b/security/p5-Digest-Adler32/Makefile
index 30a4604494db..abcbb90b2752 100644
--- a/security/p5-Digest-Adler32/Makefile
+++ b/security/p5-Digest-Adler32/Makefile
@@ -7,8 +7,7 @@ PORTNAME= Digest-Adler32
PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-BubbleBabble/Makefile b/security/p5-Digest-BubbleBabble/Makefile
index 8975cdd20be9..85f8bec30c16 100644
--- a/security/p5-Digest-BubbleBabble/Makefile
+++ b/security/p5-Digest-BubbleBabble/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Digest-BubbleBabble
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Digest-CRC/Makefile b/security/p5-Digest-CRC/Makefile
index 67470ddb64e3..9c7e25671431 100644
--- a/security/p5-Digest-CRC/Makefile
+++ b/security/p5-Digest-CRC/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-CRC
PORTVERSION= 0.14
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Crc32/Makefile b/security/p5-Digest-Crc32/Makefile
index 2ef0d978a259..3237a9e9ef49 100644
--- a/security/p5-Digest-Crc32/Makefile
+++ b/security/p5-Digest-Crc32/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Crc32
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-DJB/Makefile b/security/p5-Digest-DJB/Makefile
index 5861f9749779..77911e356311 100644
--- a/security/p5-Digest-DJB/Makefile
+++ b/security/p5-Digest-DJB/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-DJB
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-DMAC/Makefile b/security/p5-Digest-DMAC/Makefile
index c38bc9c683a7..0b5d57175307 100644
--- a/security/p5-Digest-DMAC/Makefile
+++ b/security/p5-Digest-DMAC/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-DMAC
PORTVERSION= 1.1.4
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-EMAC/Makefile b/security/p5-Digest-EMAC/Makefile
index 74c47831442f..b08cfb4b7de0 100644
--- a/security/p5-Digest-EMAC/Makefile
+++ b/security/p5-Digest-EMAC/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-EMAC
PORTVERSION= 1.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Elf/Makefile b/security/p5-Digest-Elf/Makefile
index a778d932fb90..df68f2ae12b4 100644
--- a/security/p5-Digest-Elf/Makefile
+++ b/security/p5-Digest-Elf/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Elf
PORTVERSION= 1.4
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-FNV/Makefile b/security/p5-Digest-FNV/Makefile
index fe0039b19906..3df4b8d344bf 100644
--- a/security/p5-Digest-FNV/Makefile
+++ b/security/p5-Digest-FNV/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-FNV
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-HMAC/Makefile b/security/p5-Digest-HMAC/Makefile
index 7c86146fa878..bba749235cce 100644
--- a/security/p5-Digest-HMAC/Makefile
+++ b/security/p5-Digest-HMAC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-HMAC
PORTVERSION= 1.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Digest-Hashcash/Makefile b/security/p5-Digest-Hashcash/Makefile
index e18649252bc4..019272731b77 100644
--- a/security/p5-Digest-Hashcash/Makefile
+++ b/security/p5-Digest-Hashcash/Makefile
@@ -6,7 +6,7 @@
PORTNAME= Digest-Hashcash
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/A/AD/ADAMBACK
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/security/p5-Digest-Haval256/Makefile b/security/p5-Digest-Haval256/Makefile
index d3b9d1791e5d..73394d9bfab9 100644
--- a/security/p5-Digest-Haval256/Makefile
+++ b/security/p5-Digest-Haval256/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Haval256
PORTVERSION= 1.0.5
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-JHash/Makefile b/security/p5-Digest-JHash/Makefile
index 67edf7065126..8b95a6ff8b21 100644
--- a/security/p5-Digest-JHash/Makefile
+++ b/security/p5-Digest-JHash/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-JHash
PORTVERSION= 0.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-MD2/Makefile b/security/p5-Digest-MD2/Makefile
index d6f10b916c97..0b92b1ec3a65 100644
--- a/security/p5-Digest-MD2/Makefile
+++ b/security/p5-Digest-MD2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-MD2
PORTVERSION= 2.03
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Digest-MD5-File/Makefile b/security/p5-Digest-MD5-File/Makefile
index 7a6a7ea880b2..51c99670eb87 100644
--- a/security/p5-Digest-MD5-File/Makefile
+++ b/security/p5-Digest-MD5-File/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-MD5-File
PORTVERSION= 0.06
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-MD5-M4p/Makefile b/security/p5-Digest-MD5-M4p/Makefile
index cd5bca733b0a..4998d3a57e67 100644
--- a/security/p5-Digest-MD5-M4p/Makefile
+++ b/security/p5-Digest-MD5-M4p/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-MD5-M4p
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index 9c0c30c8b390..3e9a1c7968ec 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-MD5
PORTVERSION= 2.36
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tabthorpe@FreeBSD.org
diff --git a/security/p5-Digest-ManberHash/Makefile b/security/p5-Digest-ManberHash/Makefile
index 951665039d9d..1b919bd78937 100644
--- a/security/p5-Digest-ManberHash/Makefile
+++ b/security/p5-Digest-ManberHash/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-ManberHash
PORTVERSION= 0.7
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Nilsimsa/Makefile b/security/p5-Digest-Nilsimsa/Makefile
index 96f2c794fc3c..c28e5ad07c78 100644
--- a/security/p5-Digest-Nilsimsa/Makefile
+++ b/security/p5-Digest-Nilsimsa/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-Nilsimsa
PORTVERSION= 0.06
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/security/p5-Digest-Pearson-PurePerl/Makefile b/security/p5-Digest-Pearson-PurePerl/Makefile
index 8b37a6bdf6c5..8797d2f555cc 100644
--- a/security/p5-Digest-Pearson-PurePerl/Makefile
+++ b/security/p5-Digest-Pearson-PurePerl/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Pearson-PurePerl
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Pearson/Makefile b/security/p5-Digest-Pearson/Makefile
index 9395eacad276..94573d3f3aff 100644
--- a/security/p5-Digest-Pearson/Makefile
+++ b/security/p5-Digest-Pearson/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Pearson
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Perl-MD4/Makefile b/security/p5-Digest-Perl-MD4/Makefile
index c0c34bda7d1a..a93e976d27c2 100644
--- a/security/p5-Digest-Perl-MD4/Makefile
+++ b/security/p5-Digest-Perl-MD4/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Perl-MD4
PORTVERSION= 1.4
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Perl-MD5/Makefile b/security/p5-Digest-Perl-MD5/Makefile
index d87b00d53a52..cd2ca2c24c6f 100644
--- a/security/p5-Digest-Perl-MD5/Makefile
+++ b/security/p5-Digest-Perl-MD5/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Perl-MD5
PORTVERSION= 1.8
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-SHA-PurePerl/Makefile b/security/p5-Digest-SHA-PurePerl/Makefile
index f49cf805c7cd..681e748e2e9e 100644
--- a/security/p5-Digest-SHA-PurePerl/Makefile
+++ b/security/p5-Digest-SHA-PurePerl/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-SHA-PurePerl
PORTVERSION= 5.45
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-SHA1/Makefile b/security/p5-Digest-SHA1/Makefile
index c2fca60ef4be..d7401c94cb25 100644
--- a/security/p5-Digest-SHA1/Makefile
+++ b/security/p5-Digest-SHA1/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-SHA1
PORTVERSION= 2.11
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Digest-SHA256/Makefile b/security/p5-Digest-SHA256/Makefile
index c3dcebda55c6..54945469650b 100644
--- a/security/p5-Digest-SHA256/Makefile
+++ b/security/p5-Digest-SHA256/Makefile
@@ -12,8 +12,7 @@ PORTNAME= Digest-SHA256
PORTVERSION= 0.01b
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= SHA256-${PORTVERSION}
diff --git a/security/p5-Digest-SV1/Makefile b/security/p5-Digest-SV1/Makefile
index 99a1482fb2a4..d749124f917a 100644
--- a/security/p5-Digest-SV1/Makefile
+++ b/security/p5-Digest-SV1/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-SV1
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Tiger/Makefile b/security/p5-Digest-Tiger/Makefile
index 46b595a4df92..8c24c402e52e 100644
--- a/security/p5-Digest-Tiger/Makefile
+++ b/security/p5-Digest-Tiger/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Tiger
PORTVERSION= 0.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Whirlpool/Makefile b/security/p5-Digest-Whirlpool/Makefile
index 4cc40ef89c74..ca1992700786 100644
--- a/security/p5-Digest-Whirlpool/Makefile
+++ b/security/p5-Digest-Whirlpool/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Whirlpool
PORTVERSION= 1.0.6
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile
index 544a1f9366c7..03f721e935ef 100644
--- a/security/p5-Digest/Makefile
+++ b/security/p5-Digest/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest
PORTVERSION= 1.15
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Email-Obfuscate/Makefile b/security/p5-Email-Obfuscate/Makefile
index 1add8200b4bd..df2146a4af3c 100644
--- a/security/p5-Email-Obfuscate/Makefile
+++ b/security/p5-Email-Obfuscate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-Obfuscate
PORTVERSION= 1.13
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile
index 8373aec7f430..0fb04e76d7d1 100644
--- a/security/p5-File-Scan-ClamAV/Makefile
+++ b/security/p5-File-Scan-ClamAV/Makefile
@@ -9,8 +9,7 @@ PORTNAME= File-Scan-ClamAV
PORTVERSION= 1.8
PORTREVISION= 3
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= j.koopmann@seceidos.de
diff --git a/security/p5-File-Scan/Makefile b/security/p5-File-Scan/Makefile
index 46419f424f30..63904b0968ef 100644
--- a/security/p5-File-Scan/Makefile
+++ b/security/p5-File-Scan/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Scan
PORTVERSION= 1.43
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File/HDIAS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jims@bluenotch.com
diff --git a/security/p5-Filter-CBC/Makefile b/security/p5-Filter-CBC/Makefile
index af2399f5fc47..72adba3bbc2f 100644
--- a/security/p5-Filter-CBC/Makefile
+++ b/security/p5-Filter-CBC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filter-CBC
PORTVERSION= 0.09
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-Filter-Crypto/Makefile b/security/p5-Filter-Crypto/Makefile
index f4debc4fa416..3bded10d1a8a 100644
--- a/security/p5-Filter-Crypto/Makefile
+++ b/security/p5-Filter-Crypto/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filter-Crypto
PORTVERSION= 1.18
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile
index 3ce6cb82d0b4..00c7d2d6191d 100644
--- a/security/p5-GD-SecurityImage/Makefile
+++ b/security/p5-GD-SecurityImage/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GD-SecurityImage
PORTVERSION= 1.65
PORTEPOCH= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-GSSAPI/Makefile b/security/p5-GSSAPI/Makefile
index bd81111e98bb..1d80c4951ca9 100644
--- a/security/p5-GSSAPI/Makefile
+++ b/security/p5-GSSAPI/Makefile
@@ -8,7 +8,7 @@
PORTNAME= GSSAPI
PORTVERSION= 0.26
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= LWP/AGROLMS
PKGNAMEPREFIX= p5-
diff --git a/security/p5-HTML-Email-Obfuscate/Makefile b/security/p5-HTML-Email-Obfuscate/Makefile
index d462f0e62f07..6d3bbd319040 100644
--- a/security/p5-HTML-Email-Obfuscate/Makefile
+++ b/security/p5-HTML-Email-Obfuscate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-Email-Obfuscate
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= LWP/ADAMK
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile
index 140767a17cc7..502d8b7e04de 100644
--- a/security/p5-Module-Signature/Makefile
+++ b/security/p5-Module-Signature/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Module-Signature
PORTVERSION= 0.55
PORTREVISION= 2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/security/p5-Net-Daemon-SSL/Makefile b/security/p5-Net-Daemon-SSL/Makefile
index dc7691b6c5a6..6240ae18d921 100644
--- a/security/p5-Net-Daemon-SSL/Makefile
+++ b/security/p5-Net-Daemon-SSL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Daemon-SSL
PORTVERSION= 1.0
CATEGORIES= security net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= simond@irrelevant.org
diff --git a/security/p5-Net-OpenID-JanRain/Makefile b/security/p5-Net-OpenID-JanRain/Makefile
index fce96b293e61..ed42d00f2f90 100644
--- a/security/p5-Net-OpenID-JanRain/Makefile
+++ b/security/p5-Net-OpenID-JanRain/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-OpenID-JanRain
PORTVERSION= 1.1.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile
index 29a08fd00ad6..4a48c8ea20a2 100644
--- a/security/p5-Net-SSLeay/Makefile
+++ b/security/p5-Net-SSLeay/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Net-SSLeay
PORTVERSION= 1.30
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Net_SSLeay.pm-${PORTVERSION}
diff --git a/security/p5-Nmap-Scanner/Makefile b/security/p5-Nmap-Scanner/Makefile
index 7a1a9797115c..3ce5b4c39829 100644
--- a/security/p5-Nmap-Scanner/Makefile
+++ b/security/p5-Nmap-Scanner/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Nmap-Scanner
PORTVERSION= 0.9
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/M/MA/MAXSCHUBE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-OpenCA-CRL/Makefile b/security/p5-OpenCA-CRL/Makefile
index aa5f1c6f5df7..84ddc2c521ff 100644
--- a/security/p5-OpenCA-CRL/Makefile
+++ b/security/p5-OpenCA-CRL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OpenCA-CRL
PORTVERSION= 0.9.17
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OpenCA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-OpenCA-CRR/Makefile b/security/p5-OpenCA-CRR/Makefile
index 1c494359de0a..15283f99c3ec 100644
--- a/security/p5-OpenCA-CRR/Makefile
+++ b/security/p5-OpenCA-CRR/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OpenCA-CRR
PORTVERSION= 0.0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OpenCA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-OpenCA-PKCS7/Makefile b/security/p5-OpenCA-PKCS7/Makefile
index de6084b30087..7f0124676100 100644
--- a/security/p5-OpenCA-PKCS7/Makefile
+++ b/security/p5-OpenCA-PKCS7/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OpenCA-PKCS7
PORTVERSION= 0.9.13
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OpenCA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-OpenCA-REQ/Makefile b/security/p5-OpenCA-REQ/Makefile
index 81b43bcfc2ff..625d33a91820 100644
--- a/security/p5-OpenCA-REQ/Makefile
+++ b/security/p5-OpenCA-REQ/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OpenCA-REQ
PORTVERSION= 0.9.52
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OpenCA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index 2328d2410165..c95239079167 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PGP-Sign
PORTVERSION= 0.20
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PGP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index 42a8a5e273c2..24fc8166132a 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PGP
PORTVERSION= 0.3a
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PGP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-POE-Component-SSLify/Makefile b/security/p5-POE-Component-SSLify/Makefile
index a9eca80f0c96..ad4bafdf51b4 100644
--- a/security/p5-POE-Component-SSLify/Makefile
+++ b/security/p5-POE-Component-SSLify/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-SSLify
PORTVERSION= 0.10
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/A/AP/APOCAL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-PerlCryptLib/Makefile b/security/p5-PerlCryptLib/Makefile
index 2e2cf16a4ac4..7a9e6a1f1d32 100644
--- a/security/p5-PerlCryptLib/Makefile
+++ b/security/p5-PerlCryptLib/Makefile
@@ -8,7 +8,7 @@
PORTNAME= PerlCryptLib
PORTVERSION= 1.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AL/ALVAROL
PKGNAMEPREFIX= p5-
diff --git a/security/p5-SHA/Makefile b/security/p5-SHA/Makefile
index 4cf6038382d0..ee366c5da927 100644
--- a/security/p5-SHA/Makefile
+++ b/security/p5-SHA/Makefile
@@ -8,8 +8,8 @@
PORTNAME= SHA
PORTVERSION= 2.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/G/GA/GAAS/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/G/GA/GAAS
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Safe-Hole/Makefile b/security/p5-Safe-Hole/Makefile
index 09f81e5ff75a..1c1e999eb8e8 100644
--- a/security/p5-Safe-Hole/Makefile
+++ b/security/p5-Safe-Hole/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Safe-Hole
PORTVERSION= 0.10
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Safe
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= sethk@meowfishies.com
diff --git a/security/p5-Snort-Rule/Makefile b/security/p5-Snort-Rule/Makefile
index e81617f5ad5b..30ec3e09620c 100644
--- a/security/p5-Snort-Rule/Makefile
+++ b/security/p5-Snort-Rule/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Snort-Rule
PORTVERSION= 1.06
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/S/SA/SAXJAZMAN/Snort/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../by-authors/id/S/SA/SAXJAZMAN/Snort
PKGNAMEPREFIX= p5-
MAINTAINER= pauls@utdallas.edu
diff --git a/security/p5-Text-Password-Pronounceable/Makefile b/security/p5-Text-Password-Pronounceable/Makefile
index e159bf8c08fb..27f15fc67a18 100644
--- a/security/p5-Text-Password-Pronounceable/Makefile
+++ b/security/p5-Text-Password-Pronounceable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Password-Pronounceable
PORTVERSION= 0.28
CATEGORIES= security textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/security/p5-Tie-EncryptedHash/Makefile b/security/p5-Tie-EncryptedHash/Makefile
index f215e3492b4d..4f67b1dfafa1 100644
--- a/security/p5-Tie-EncryptedHash/Makefile
+++ b/security/p5-Tie-EncryptedHash/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-EncryptedHash
PORTVERSION= 1.21
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Tree-Authz/Makefile b/security/p5-Tree-Authz/Makefile
index a0197f41d0a5..4814ba4db547 100644
--- a/security/p5-Tree-Authz/Makefile
+++ b/security/p5-Tree-Authz/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Authz
PORTVERSION= 0.03
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/shells/p5-Term-ShellUI/Makefile b/shells/p5-Term-ShellUI/Makefile
index 7b1f0cc36b6d..241b11e8ce6f 100644
--- a/shells/p5-Term-ShellUI/Makefile
+++ b/shells/p5-Term-ShellUI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-ShellUI
PORTVERSION= 0.86
CATEGORIES= shells perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term/BRONSON
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index e15391c09516..d36068664ebe 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -8,7 +8,7 @@
PORTNAME= psh
PORTVERSION= 1.8.1
CATEGORIES= shells perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GR/GREGOR
MAINTAINER= garga@FreeBSD.org
diff --git a/shells/zoidberg/Makefile b/shells/zoidberg/Makefile
index ea655366e762..cdbdf96f261a 100644
--- a/shells/zoidberg/Makefile
+++ b/shells/zoidberg/Makefile
@@ -9,9 +9,8 @@
PORTNAME= zoidberg
PORTVERSION= 0.96
CATEGORIES= shells perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://zoidberg.student.utwente.nl/downloads/Zoidberg/
-MASTER_SITE_SUBDIR= Bundle
DISTNAME= Zoidberg-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/p5-BSD-Jail-Object/Makefile b/sysutils/p5-BSD-Jail-Object/Makefile
index 82d4597f91e4..4cdd56478cfa 100644
--- a/sysutils/p5-BSD-Jail-Object/Makefile
+++ b/sysutils/p5-BSD-Jail-Object/Makefile
@@ -8,8 +8,7 @@
PORTNAME= BSD-Jail-Object
PORTVERSION= 0.02
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/M/MA/MAHLON
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mahlon@martini.nu
diff --git a/sysutils/p5-BSD-Sysctl/Makefile b/sysutils/p5-BSD-Sysctl/Makefile
index 599382c83005..34469c7169da 100644
--- a/sysutils/p5-BSD-Sysctl/Makefile
+++ b/sysutils/p5-BSD-Sysctl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= BSD-Sysctl
PORTVERSION= 0.08
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= BSD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= david@landgren.net
diff --git a/sysutils/p5-Dir-Purge/Makefile b/sysutils/p5-Dir-Purge/Makefile
index 2cb722ee0357..eefcc41a2a22 100644
--- a/sysutils/p5-Dir-Purge/Makefile
+++ b/sysutils/p5-Dir-Purge/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Dir-Purge
PORTVERSION= 1.02
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Dir
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/sysutils/p5-File-Next/Makefile b/sysutils/p5-File-Next/Makefile
index ab6835c3b9b1..3af784ea69ea 100644
--- a/sysutils/p5-File-Next/Makefile
+++ b/sysutils/p5-File-Next/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Next
PORTVERSION= 1.02
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/sysutils/p5-File-Which/Makefile b/sysutils/p5-File-Which/Makefile
index 308153871427..6b8e85734188 100644
--- a/sysutils/p5-File-Which/Makefile
+++ b/sysutils/p5-File-Which/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Which
PORTVERSION= 0.05
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/sysutils/p5-Filesys-Df/Makefile b/sysutils/p5-Filesys-Df/Makefile
index 1d827021c5a4..98695d73298c 100644
--- a/sysutils/p5-Filesys-Df/Makefile
+++ b/sysutils/p5-Filesys-Df/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filesys-Df
PORTVERSION= 0.92
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filesys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@FreeBSD.org
diff --git a/sysutils/p5-Filesys-DiskFree/Makefile b/sysutils/p5-Filesys-DiskFree/Makefile
index 28bcfc83dc7e..a47b188e01f4 100644
--- a/sysutils/p5-Filesys-DiskFree/Makefile
+++ b/sysutils/p5-Filesys-DiskFree/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Filesys-DiskFree
PORTVERSION= 0.06
PORTREVISION= 1
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filesys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= david@trucs.org
diff --git a/sysutils/p5-Filesys-DiskSpace/Makefile b/sysutils/p5-Filesys-DiskSpace/Makefile
index 55b654679e05..efdfa28cc31f 100644
--- a/sysutils/p5-Filesys-DiskSpace/Makefile
+++ b/sysutils/p5-Filesys-DiskSpace/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filesys-DiskSpace
PORTVERSION= 0.05
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filesys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/sysutils/p5-Filesys-DiskUsage/Makefile b/sysutils/p5-Filesys-DiskUsage/Makefile
index f1ceaa0f078a..59c3b88df172 100644
--- a/sysutils/p5-Filesys-DiskUsage/Makefile
+++ b/sysutils/p5-Filesys-DiskUsage/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filesys-DiskUsage
PORTVERSION= 0.04
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filesys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/p5-Filesys-Statvfs/Makefile b/sysutils/p5-Filesys-Statvfs/Makefile
index f64332fecf51..aa9ca825b732 100644
--- a/sysutils/p5-Filesys-Statvfs/Makefile
+++ b/sysutils/p5-Filesys-Statvfs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filesys-Statvfs
PORTVERSION= 0.82
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filesys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@freebsd.org
diff --git a/sysutils/p5-Fuse-Simple/Makefile b/sysutils/p5-Fuse-Simple/Makefile
index ca14c425db21..82e045ab3655 100644
--- a/sysutils/p5-Fuse-Simple/Makefile
+++ b/sysutils/p5-Fuse-Simple/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Fuse-Simple
PORTVERSION= 1.00
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/N/NO/NOSEYNICK/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/N/NO/NOSEYNICK
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/sysutils/p5-Fuse/Makefile b/sysutils/p5-Fuse/Makefile
index d0d224169262..fd7c720db727 100644
--- a/sysutils/p5-Fuse/Makefile
+++ b/sysutils/p5-Fuse/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Fuse
PORTVERSION= 0.09
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DP/DPAVLIN
PKGNAMEPREFIX= p5-
diff --git a/sysutils/p5-Proc-PidUtil/Makefile b/sysutils/p5-Proc-PidUtil/Makefile
index 6f10b66c6000..c12eaa9d705c 100644
--- a/sysutils/p5-Proc-PidUtil/Makefile
+++ b/sysutils/p5-Proc-PidUtil/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-PidUtil
PORTVERSION= 0.08
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/sysutils/p5-Quota/Makefile b/sysutils/p5-Quota/Makefile
index 19f3ae608d7b..260eafd8db2e 100644
--- a/sysutils/p5-Quota/Makefile
+++ b/sysutils/p5-Quota/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Quota
PORTVERSION= 1.6.2
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Quota
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/sysutils/p5-Schedule-At/Makefile b/sysutils/p5-Schedule-At/Makefile
index c2fbe97d049f..60606b503851 100644
--- a/sysutils/p5-Schedule-At/Makefile
+++ b/sysutils/p5-Schedule-At/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Schedule-At
PORTVERSION= 1.06
PORTREVISION= 1
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Schedule
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/sysutils/p5-Schedule-Cron/Makefile b/sysutils/p5-Schedule-Cron/Makefile
index f87bd74606c9..a2a90d4e1dec 100644
--- a/sysutils/p5-Schedule-Cron/Makefile
+++ b/sysutils/p5-Schedule-Cron/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Schedule-Cron
PORTVERSION= 0.97
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Schedule
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/sysutils/p5-Schedule-Load/Makefile b/sysutils/p5-Schedule-Load/Makefile
index 10ad54f38a4a..7cbd14de0b78 100644
--- a/sysutils/p5-Schedule-Load/Makefile
+++ b/sysutils/p5-Schedule-Load/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Schedule-Load
PORTVERSION= 3.051
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Schedule
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/sysutils/p5-Schedule-Match/Makefile b/sysutils/p5-Schedule-Match/Makefile
index cd8837f20e6d..02868932b75c 100644
--- a/sysutils/p5-Schedule-Match/Makefile
+++ b/sysutils/p5-Schedule-Match/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Schedule-Match
PORTVERSION= 0.07
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Schedule
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/sysutils/p5-Stat-lsMode/Makefile b/sysutils/p5-Stat-lsMode/Makefile
index d2140c79dd6c..0819ce192380 100644
--- a/sysutils/p5-Stat-lsMode/Makefile
+++ b/sysutils/p5-Stat-lsMode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Stat-lsMode
PORTVERSION= 0.50
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Stat
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/sysutils/p5-Sys-CpuLoad/Makefile b/sysutils/p5-Sys-CpuLoad/Makefile
index 827945b500a1..7a01c57da551 100644
--- a/sysutils/p5-Sys-CpuLoad/Makefile
+++ b/sysutils/p5-Sys-CpuLoad/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-CpuLoad
PORTVERSION= 0.03
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/sysutils/p5-Sys-Gamin/Makefile b/sysutils/p5-Sys-Gamin/Makefile
index 4571e261c58c..de517846ba42 100644
--- a/sysutils/p5-Sys-Gamin/Makefile
+++ b/sysutils/p5-Sys-Gamin/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-Gamin
PORTVERSION= 0.1
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= n_hibma@freebsd.org
diff --git a/sysutils/p5-Sys-Hostname-FQDN/Makefile b/sysutils/p5-Sys-Hostname-FQDN/Makefile
index ed8713d3a941..07785d27c02d 100644
--- a/sysutils/p5-Sys-Hostname-FQDN/Makefile
+++ b/sysutils/p5-Sys-Hostname-FQDN/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-Hostname-FQDN
PORTVERSION= 0.07
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/sysutils/p5-Sys-Hostname-Long/Makefile b/sysutils/p5-Sys-Hostname-Long/Makefile
index 74d3fe80edb3..eeadeb16c5fd 100644
--- a/sysutils/p5-Sys-Hostname-Long/Makefile
+++ b/sysutils/p5-Sys-Hostname-Long/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-Hostname-Long
PORTVERSION= 1.4
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tdb@FreeBSD.org
diff --git a/sysutils/p5-Sys-Utmp/Makefile b/sysutils/p5-Sys-Utmp/Makefile
index 51239f345d27..11ff5b9c70a4 100644
--- a/sysutils/p5-Sys-Utmp/Makefile
+++ b/sysutils/p5-Sys-Utmp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-Utmp
PORTVERSION= 1.6
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= zaa@ulstu.ru
diff --git a/sysutils/p5-Sysadm-Install/Makefile b/sysutils/p5-Sysadm-Install/Makefile
index b647587553a1..32a5d6b7371d 100644
--- a/sysutils/p5-Sysadm-Install/Makefile
+++ b/sysutils/p5-Sysadm-Install/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Sysadm-Install
PORTVERSION= 0.25
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/M/MS/MSCHILLI
PKGNAMEPREFIX= p5-
diff --git a/sysutils/p5-SyslogScan/Makefile b/sysutils/p5-SyslogScan/Makefile
index 97768e5f66a1..671867d465a6 100644
--- a/sysutils/p5-SyslogScan/Makefile
+++ b/sysutils/p5-SyslogScan/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SyslogScan
PORTVERSION= 0.32
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SyslogScan
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/sysutils/p5-Tie-Syslog/Makefile b/sysutils/p5-Tie-Syslog/Makefile
index 1b27ee77cfc2..79228d759ea4 100644
--- a/sysutils/p5-Tie-Syslog/Makefile
+++ b/sysutils/p5-Tie-Syslog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Syslog
PORTVERSION= 1.07
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/p5-Unix-ConfigFile/Makefile b/sysutils/p5-Unix-ConfigFile/Makefile
index e4856d5b7dd7..9a75a6a28a84 100644
--- a/sysutils/p5-Unix-ConfigFile/Makefile
+++ b/sysutils/p5-Unix-ConfigFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Unix-ConfigFile
PORTVERSION= 0.06
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unix
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/p5-Unix-Mknod/Makefile b/sysutils/p5-Unix-Mknod/Makefile
index f06988988cb3..d865bd63abd5 100644
--- a/sysutils/p5-Unix-Mknod/Makefile
+++ b/sysutils/p5-Unix-Mknod/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Unix-Mknod
PORTVERSION= 0.04
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unix
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@FreeBSD.org
diff --git a/sysutils/p5-Unix-Processors/Makefile b/sysutils/p5-Unix-Processors/Makefile
index 41e9c7a9b3a6..97755306fb2b 100644
--- a/sysutils/p5-Unix-Processors/Makefile
+++ b/sysutils/p5-Unix-Processors/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Unix-Processors
PORTVERSION= 2.034
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unix
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/sysutils/p5-Unix-Syslog/Makefile b/sysutils/p5-Unix-Syslog/Makefile
index ec53cbb8f0bd..fc952ecaa859 100644
--- a/sysutils/p5-Unix-Syslog/Makefile
+++ b/sysutils/p5-Unix-Syslog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Unix-Syslog
PORTVERSION= 1.0
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unix/MHARNISCH
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/sysutils/p5-User/Makefile b/sysutils/p5-User/Makefile
index 955bc85958ed..71e8d594092e 100644
--- a/sysutils/p5-User/Makefile
+++ b/sysutils/p5-User/Makefile
@@ -8,8 +8,7 @@
PORTNAME= User
PORTVERSION= 1.8
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= User
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/sysutils/savelogs/Makefile b/sysutils/savelogs/Makefile
index bb33ddd92a30..ddeffe036637 100644
--- a/sysutils/savelogs/Makefile
+++ b/sysutils/savelogs/Makefile
@@ -8,8 +8,8 @@
PORTNAME= savelogs
PORTVERSION= 1.81
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SC/SCOTTW/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/S/SC/SCOTTW
MAINTAINER= ports@c0decafe.net
COMMENT= Save log files in a nice way
diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile
index 9c5c112e7099..4fbc09c26df0 100644
--- a/textproc/btparse/Makefile
+++ b/textproc/btparse/Makefile
@@ -8,7 +8,7 @@
PORTNAME= btparse
PORTVERSION= 0.35
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/A/AM/AMBS/${PORTNAME}
MAINTAINER= kay_lehmann@web.de
diff --git a/textproc/makepatch/Makefile b/textproc/makepatch/Makefile
index e8b461f932df..7a7952658fe9 100644
--- a/textproc/makepatch/Makefile
+++ b/textproc/makepatch/Makefile
@@ -8,7 +8,7 @@
PORTNAME= makepatch
PORTVERSION= 2.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/JV
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-AI-Categorizer/Makefile b/textproc/p5-AI-Categorizer/Makefile
index ef93ab993190..de8344fca699 100644
--- a/textproc/p5-AI-Categorizer/Makefile
+++ b/textproc/p5-AI-Categorizer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AI-Categorizer
PORTVERSION= 0.07
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= AI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-Algorithm-RabinKarp/Makefile b/textproc/p5-Algorithm-RabinKarp/Makefile
index 5b01fe13b5d3..c7c71a448efe 100644
--- a/textproc/p5-Algorithm-RabinKarp/Makefile
+++ b/textproc/p5-Algorithm-RabinKarp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Algorithm-RabinKarp
PORTVERSION= 0.41
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/N/NN/NNUNLEY
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION}_1
diff --git a/textproc/p5-Apache-ParseLog/Makefile b/textproc/p5-Apache-ParseLog/Makefile
index 36b19888b823..e01ff57209b9 100644
--- a/textproc/p5-Apache-ParseLog/Makefile
+++ b/textproc/p5-Apache-ParseLog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Apache-ParseLog
PORTVERSION= 1.02
CATEGORIES= textproc www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Apache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Apache-XBEL/Makefile b/textproc/p5-Apache-XBEL/Makefile
index 056c5b0ee536..3278f296f10d 100644
--- a/textproc/p5-Apache-XBEL/Makefile
+++ b/textproc/p5-Apache-XBEL/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Apache-XBEL
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Apache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Bloom-Filter/Makefile b/textproc/p5-Bloom-Filter/Makefile
index db41d3bd0193..9fc1c9c164a8 100644
--- a/textproc/p5-Bloom-Filter/Makefile
+++ b/textproc/p5-Bloom-Filter/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Bloom-Filter
PORTVERSION= 1.0
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/M/MC/MCEGLOWS
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-CAM-PDF/Makefile b/textproc/p5-CAM-PDF/Makefile
index e2f87fcc7154..3941d99fd95a 100644
--- a/textproc/p5-CAM-PDF/Makefile
+++ b/textproc/p5-CAM-PDF/Makefile
@@ -8,7 +8,7 @@
PORTNAME= CAM-PDF
PORTVERSION= 1.12
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CD/CDOLAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-CQL-Parser/Makefile b/textproc/p5-CQL-Parser/Makefile
index 20e527470525..c76b21da91e8 100644
--- a/textproc/p5-CQL-Parser/Makefile
+++ b/textproc/p5-CQL-Parser/Makefile
@@ -8,7 +8,7 @@
PORTNAME= CQL-Parser
PORTVERSION= 1.0
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/E/ES/ESUMMERS
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-CSS-SAC/Makefile b/textproc/p5-CSS-SAC/Makefile
index 644e086f95b2..33edbfdcffdd 100644
--- a/textproc/p5-CSS-SAC/Makefile
+++ b/textproc/p5-CSS-SAC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= CSS-SAC
PORTVERSION= 0.06
CATEGORIES= textproc perl5 www
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CSS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-CSS-Squish/Makefile b/textproc/p5-CSS-Squish/Makefile
index 43e37daf84ae..9eb33b18d2d2 100644
--- a/textproc/p5-CSS-Squish/Makefile
+++ b/textproc/p5-CSS-Squish/Makefile
@@ -8,8 +8,7 @@
PORTNAME= CSS-Squish
PORTVERSION= 0.07
CATEGORIES= textproc www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CSS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-CSS/Makefile b/textproc/p5-CSS/Makefile
index 7c42cb5ac000..fb431182ad12 100644
--- a/textproc/p5-CSS/Makefile
+++ b/textproc/p5-CSS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= CSS
PORTVERSION= 1.07
CATEGORIES= textproc www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CSS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-Chess-PGN-Parse/Makefile b/textproc/p5-Chess-PGN-Parse/Makefile
index e913480809d3..765fb94465e7 100644
--- a/textproc/p5-Chess-PGN-Parse/Makefile
+++ b/textproc/p5-Chess-PGN-Parse/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Chess-PGN-Parse
PORTVERSION= 0.19
CATEGORIES= textproc games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GM/GMAX
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile b/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
index 99afe86c6361..a65e1bde43e9 100644
--- a/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
+++ b/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Data-FormValidator-Constraints-DateTime
PORTVERSION= 1.09
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/W/WO/WONKO
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Data-Report/Makefile b/textproc/p5-Data-Report/Makefile
index 06a6275a8d57..8a0224fbdb87 100644
--- a/textproc/p5-Data-Report/Makefile
+++ b/textproc/p5-Data-Report/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Report
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Data-SpreadPagination/Makefile b/textproc/p5-Data-SpreadPagination/Makefile
index 1b045dd26469..edbc5934f2f6 100644
--- a/textproc/p5-Data-SpreadPagination/Makefile
+++ b/textproc/p5-Data-SpreadPagination/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-SpreadPagination
PORTVERSION= 0.1.2
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= svysh@pn.sinp.msu.ru
diff --git a/textproc/p5-Devel-TraceSAX/Makefile b/textproc/p5-Devel-TraceSAX/Makefile
index 9d980a7db003..31440c3823b4 100644
--- a/textproc/p5-Devel-TraceSAX/Makefile
+++ b/textproc/p5-Devel-TraceSAX/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-TraceSAX
PORTVERSION= 0.021
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/textproc/p5-Filter-Simple/Makefile b/textproc/p5-Filter-Simple/Makefile
index 4ff4711369db..0f43b32a96d3 100644
--- a/textproc/p5-Filter-Simple/Makefile
+++ b/textproc/p5-Filter-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filter-Simple
PORTVERSION= 0.82
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pgollucci@p6m7g8.com
diff --git a/textproc/p5-FormValidator-Simple/Makefile b/textproc/p5-FormValidator-Simple/Makefile
index fb739754802a..6f0e77b1804b 100644
--- a/textproc/p5-FormValidator-Simple/Makefile
+++ b/textproc/p5-FormValidator-Simple/Makefile
@@ -8,7 +8,7 @@
PORTNAME= FormValidator-Simple
PORTVERSION= 0.22
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/L/LY/LYOKATO
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Games-Dissociate/Makefile b/textproc/p5-Games-Dissociate/Makefile
index d485c3b106bd..0e1cdc6cc165 100644
--- a/textproc/p5-Games-Dissociate/Makefile
+++ b/textproc/p5-Games-Dissociate/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Games-Dissociate
PORTVERSION= 0.18
CATEGORIES= textproc games perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AV/AVIF
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Google-Data-JSON/Makefile b/textproc/p5-Google-Data-JSON/Makefile
index c35ba956717e..ac76c157dcb0 100644
--- a/textproc/p5-Google-Data-JSON/Makefile
+++ b/textproc/p5-Google-Data-JSON/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Google-Data-JSON
PORTVERSION= 0.1.5
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= HTML/TAKERU
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-HTML-Copy/Makefile b/textproc/p5-HTML-Copy/Makefile
index 193d3fac3288..8a41c8eae5a4 100644
--- a/textproc/p5-HTML-Copy/Makefile
+++ b/textproc/p5-HTML-Copy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-Copy
PORTVERSION= 1.23
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML/TKURITA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-HTML-Entities-ImodePictogram/Makefile b/textproc/p5-HTML-Entities-ImodePictogram/Makefile
index a2aab60d0e7b..64f1d826096f 100644
--- a/textproc/p5-HTML-Entities-ImodePictogram/Makefile
+++ b/textproc/p5-HTML-Entities-ImodePictogram/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-Entities-ImodePictogram
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= smatsui@karashi.org
diff --git a/textproc/p5-HTML-Entities-Numbered/Makefile b/textproc/p5-HTML-Entities-Numbered/Makefile
index 6589f1c20873..395ad780f3b3 100644
--- a/textproc/p5-HTML-Entities-Numbered/Makefile
+++ b/textproc/p5-HTML-Entities-Numbered/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-Entities-Numbered
PORTVERSION= 0.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-HTML-EscapeEvil/Makefile b/textproc/p5-HTML-EscapeEvil/Makefile
index 9f887d8f6c21..ac1611878c0c 100644
--- a/textproc/p5-HTML-EscapeEvil/Makefile
+++ b/textproc/p5-HTML-EscapeEvil/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-EscapeEvil
PORTVERSION= 0.05
CATEGORIES= textproc perl5 www
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-HTML-Format/Makefile b/textproc/p5-HTML-Format/Makefile
index ae9c97f71083..2ae2cccd30bc 100644
--- a/textproc/p5-HTML-Format/Makefile
+++ b/textproc/p5-HTML-Format/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-Format
PORTVERSION= 2.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-HTML-FormatText-WithLinks/Makefile b/textproc/p5-HTML-FormatText-WithLinks/Makefile
index 4fa63909fca9..f0022d6c72ec 100644
--- a/textproc/p5-HTML-FormatText-WithLinks/Makefile
+++ b/textproc/p5-HTML-FormatText-WithLinks/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-FormatText-WithLinks
PORTVERSION= 0.09
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= loader@freebsdmall.com
diff --git a/textproc/p5-HTML-Fraction/Makefile b/textproc/p5-HTML-Fraction/Makefile
index 020f9e2174c4..d9042cd97b69 100644
--- a/textproc/p5-HTML-Fraction/Makefile
+++ b/textproc/p5-HTML-Fraction/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-Fraction
PORTVERSION= 0.40
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-HTML-SBC/Makefile b/textproc/p5-HTML-SBC/Makefile
index 79bd43d9d654..b16e03cfcdc9 100644
--- a/textproc/p5-HTML-SBC/Makefile
+++ b/textproc/p5-HTML-SBC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-SBC
PORTVERSION= 0.15
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-HTML-TagFilter/Makefile b/textproc/p5-HTML-TagFilter/Makefile
index 986beddb1ffe..444fd75f5390 100644
--- a/textproc/p5-HTML-TagFilter/Makefile
+++ b/textproc/p5-HTML-TagFilter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-TagFilter
PORTVERSION= 1.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-HTML-Tiny/Makefile b/textproc/p5-HTML-Tiny/Makefile
index b8f26d9f2f20..35dcb54fa220 100644
--- a/textproc/p5-HTML-Tiny/Makefile
+++ b/textproc/p5-HTML-Tiny/Makefile
@@ -8,7 +8,7 @@
PORTNAME= HTML-Tiny
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/A/AN/ANDYA
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-HTML-Truncate/Makefile b/textproc/p5-HTML-Truncate/Makefile
index 725c21d85d83..7bbd1b1b1a7b 100644
--- a/textproc/p5-HTML-Truncate/Makefile
+++ b/textproc/p5-HTML-Truncate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-Truncate
PORTVERSION= 0.11
CATEGORIES= textproc www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Hash-Merge/Makefile b/textproc/p5-Hash-Merge/Makefile
index feaef904e907..f562863ed377 100644
--- a/textproc/p5-Hash-Merge/Makefile
+++ b/textproc/p5-Hash-Merge/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Hash-Merge
PORTVERSION= 0.10
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Hash
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Hatena-Keyword/Makefile b/textproc/p5-Hatena-Keyword/Makefile
index e24a549cd0c7..3b05b13ce914 100644
--- a/textproc/p5-Hatena-Keyword/Makefile
+++ b/textproc/p5-Hatena-Keyword/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Hatena-Keyword
PORTVERSION= 0.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/N/NA/NAOYA
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-IDNA-Punycode/Makefile b/textproc/p5-IDNA-Punycode/Makefile
index 9dafd1829b69..4f47ce1bc352 100644
--- a/textproc/p5-IDNA-Punycode/Makefile
+++ b/textproc/p5-IDNA-Punycode/Makefile
@@ -8,7 +8,7 @@
PORTNAME= IDNA-Punycode
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROBURBAN/
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-IO-CSVHeaderFile/Makefile b/textproc/p5-IO-CSVHeaderFile/Makefile
index 67a37d231ba9..eb1aaa95c708 100644
--- a/textproc/p5-IO-CSVHeaderFile/Makefile
+++ b/textproc/p5-IO-CSVHeaderFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-CSVHeaderFile
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= vasek@ti.cz
diff --git a/textproc/p5-KinoSearch/Makefile b/textproc/p5-KinoSearch/Makefile
index 865ff774cf0f..9860d64cbaf6 100644
--- a/textproc/p5-KinoSearch/Makefile
+++ b/textproc/p5-KinoSearch/Makefile
@@ -8,7 +8,7 @@
PORTNAME= KinoSearch
PORTVERSION= 0.162
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/C/CR/CREAMYG
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Lingua-Conjunction/Makefile b/textproc/p5-Lingua-Conjunction/Makefile
index 70c8a8f20182..b5b16d204265 100644
--- a/textproc/p5-Lingua-Conjunction/Makefile
+++ b/textproc/p5-Lingua-Conjunction/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-Conjunction
PORTVERSION= 2.00
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-AddressParse/Makefile b/textproc/p5-Lingua-EN-AddressParse/Makefile
index fddac6cc638d..cf55b79495d6 100644
--- a/textproc/p5-Lingua-EN-AddressParse/Makefile
+++ b/textproc/p5-Lingua-EN-AddressParse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-AddressParse
PORTVERSION= 1.15
CATEGORIES= textproc perl5 geography
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-Fathom/Makefile b/textproc/p5-Lingua-EN-Fathom/Makefile
index 61f271771c12..7148f3319896 100644
--- a/textproc/p5-Lingua-EN-Fathom/Makefile
+++ b/textproc/p5-Lingua-EN-Fathom/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Fathom
PORTVERSION= 1.11
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-Gender/Makefile b/textproc/p5-Lingua-EN-Gender/Makefile
index 86b0d1f9428f..bb4db3212689 100644
--- a/textproc/p5-Lingua-EN-Gender/Makefile
+++ b/textproc/p5-Lingua-EN-Gender/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Lingua-EN-Gender
PORTVERSION= 1.0
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/E/EE/EEKIM
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Lingua-EN-Infinitive/Makefile b/textproc/p5-Lingua-EN-Infinitive/Makefile
index 95ae17053091..95ac058e864a 100644
--- a/textproc/p5-Lingua-EN-Infinitive/Makefile
+++ b/textproc/p5-Lingua-EN-Infinitive/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Infinitive
PORTVERSION= 1.09
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/textproc/p5-Lingua-EN-Inflect-Number/Makefile b/textproc/p5-Lingua-EN-Inflect-Number/Makefile
index 62ffa425d147..e48c262fc167 100644
--- a/textproc/p5-Lingua-EN-Inflect-Number/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect-Number/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Lingua-EN-Inflect-Number
PORTVERSION= 1.1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-Inflect/Makefile b/textproc/p5-Lingua-EN-Inflect/Makefile
index d8addaacc240..7256070b9f12 100644
--- a/textproc/p5-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Inflect
PORTVERSION= 1.89
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-MatchNames/Makefile b/textproc/p5-Lingua-EN-MatchNames/Makefile
index 8382ad3d2edf..50dcc46d188b 100644
--- a/textproc/p5-Lingua-EN-MatchNames/Makefile
+++ b/textproc/p5-Lingua-EN-MatchNames/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-MatchNames
PORTVERSION= 1.12
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-NameCase/Makefile b/textproc/p5-Lingua-EN-NameCase/Makefile
index 53969d73a8e2..07015665c301 100644
--- a/textproc/p5-Lingua-EN-NameCase/Makefile
+++ b/textproc/p5-Lingua-EN-NameCase/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-NameCase
PORTVERSION= 1.15
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-NameParse/Makefile b/textproc/p5-Lingua-EN-NameParse/Makefile
index d1bc20edcb3b..ec121386b6cb 100644
--- a/textproc/p5-Lingua-EN-NameParse/Makefile
+++ b/textproc/p5-Lingua-EN-NameParse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-NameParse
PORTVERSION= 1.24
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-NamedEntity/Makefile b/textproc/p5-Lingua-EN-NamedEntity/Makefile
index 75312174365b..4a0bebcbea6d 100644
--- a/textproc/p5-Lingua-EN-NamedEntity/Makefile
+++ b/textproc/p5-Lingua-EN-NamedEntity/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-NamedEntity
PORTVERSION= 1.7
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/textproc/p5-Lingua-EN-Nickname/Makefile b/textproc/p5-Lingua-EN-Nickname/Makefile
index ad4767a682bc..ff0240cf8284 100644
--- a/textproc/p5-Lingua-EN-Nickname/Makefile
+++ b/textproc/p5-Lingua-EN-Nickname/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Nickname
PORTVERSION= 1.14
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-Numbers-Easy/Makefile b/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
index ebae518dd75c..e5a84afddef9 100644
--- a/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Numbers-Easy
PORTVERSION= 1.2
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua/ABIGAIL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Lingua_EN_Numbers_Easy-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile b/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
index 8a7e6cf2bff7..2b8f779bd9a1 100644
--- a/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Numbers-Ordinate
PORTVERSION= 1.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-Numbers/Makefile b/textproc/p5-Lingua-EN-Numbers/Makefile
index b923893ad2d4..3ff3ef4adf32 100644
--- a/textproc/p5-Lingua-EN-Numbers/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Numbers
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-Squeeze/Makefile b/textproc/p5-Lingua-EN-Squeeze/Makefile
index 8a95a3116e3d..ba1a42ce0b2d 100644
--- a/textproc/p5-Lingua-EN-Squeeze/Makefile
+++ b/textproc/p5-Lingua-EN-Squeeze/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Squeeze
PORTVERSION= 2006.0704
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-Summarize/Makefile b/textproc/p5-Lingua-EN-Summarize/Makefile
index 17833319bc9f..d40ea23189d3 100644
--- a/textproc/p5-Lingua-EN-Summarize/Makefile
+++ b/textproc/p5-Lingua-EN-Summarize/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Summarize
PORTVERSION= 0.2
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-Syllable/Makefile b/textproc/p5-Lingua-EN-Syllable/Makefile
index 763a74ccb48c..9f3c1741e81e 100644
--- a/textproc/p5-Lingua-EN-Syllable/Makefile
+++ b/textproc/p5-Lingua-EN-Syllable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Syllable
PORTVERSION= 0.251
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-Tagger/Makefile b/textproc/p5-Lingua-EN-Tagger/Makefile
index e39ceae4aa83..2443d3e1d502 100644
--- a/textproc/p5-Lingua-EN-Tagger/Makefile
+++ b/textproc/p5-Lingua-EN-Tagger/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-EN-Tagger
PORTVERSION= 0.13
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-Lingua-Ident/Makefile b/textproc/p5-Lingua-Ident/Makefile
index beb3eeb10bfe..fa359bc2144d 100644
--- a/textproc/p5-Lingua-Ident/Makefile
+++ b/textproc/p5-Lingua-Ident/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Lingua-Ident
PORTVERSION= 1.6
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/MPIOTR
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Lingua-Identify/Makefile b/textproc/p5-Lingua-Identify/Makefile
index 1eab8c9b6f1c..b68536027515 100644
--- a/textproc/p5-Lingua-Identify/Makefile
+++ b/textproc/p5-Lingua-Identify/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-Identify
PORTVERSION= 0.19
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Lingua-Ispell/Makefile b/textproc/p5-Lingua-Ispell/Makefile
index f8c7503a29ce..3d3b6f7959b4 100644
--- a/textproc/p5-Lingua-Ispell/Makefile
+++ b/textproc/p5-Lingua-Ispell/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Lingua-Ispell
PORTVERSION= 0.07
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Lingua-PT-Stemmer/Makefile b/textproc/p5-Lingua-PT-Stemmer/Makefile
index 56bce60d9998..1bd148ced4a6 100644
--- a/textproc/p5-Lingua-PT-Stemmer/Makefile
+++ b/textproc/p5-Lingua-PT-Stemmer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-PT-Stemmer
PORTVERSION= 0.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Lingua-Preferred/Makefile b/textproc/p5-Lingua-Preferred/Makefile
index ee3b27508814..f68e6f3f33b6 100644
--- a/textproc/p5-Lingua-Preferred/Makefile
+++ b/textproc/p5-Lingua-Preferred/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Lingua-Preferred
PORTVERSION= 0.2.4
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/E/ED/EDAVIS
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Lingua-Stem-Fr/Makefile b/textproc/p5-Lingua-Stem-Fr/Makefile
index a825f00759ff..52079693e828 100644
--- a/textproc/p5-Lingua-Stem-Fr/Makefile
+++ b/textproc/p5-Lingua-Stem-Fr/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-Stem-Fr
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Lingua-Stem-It/Makefile b/textproc/p5-Lingua-Stem-It/Makefile
index 4b1d0508b338..ec9d746d0d20 100644
--- a/textproc/p5-Lingua-Stem-It/Makefile
+++ b/textproc/p5-Lingua-Stem-It/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-Stem-It
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Lingua-Stem-Ru/Makefile b/textproc/p5-Lingua-Stem-Ru/Makefile
index 013567b7c6b3..cd1fa71494c6 100644
--- a/textproc/p5-Lingua-Stem-Ru/Makefile
+++ b/textproc/p5-Lingua-Stem-Ru/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-Stem-Ru
PORTVERSION= 0.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Lingua-Stem-Snowball-Da/Makefile b/textproc/p5-Lingua-Stem-Snowball-Da/Makefile
index f5460be1ab15..450006d2556b 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Da/Makefile
+++ b/textproc/p5-Lingua-Stem-Snowball-Da/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-Stem-Snowball-Da
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Lingua-Stem-Snowball-No/Makefile b/textproc/p5-Lingua-Stem-Snowball-No/Makefile
index 2dada573d64a..c15507f67fc8 100644
--- a/textproc/p5-Lingua-Stem-Snowball-No/Makefile
+++ b/textproc/p5-Lingua-Stem-Snowball-No/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Lingua-Stem-Snowball-No
PORTVERSION= 1.2
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AS/ASKSH
PKGNAMEPREFIX= p5-
DISTNAME= Snowball-Norwegian-${PORTVERSION}
diff --git a/textproc/p5-Lingua-Stem-Snowball-Se/Makefile b/textproc/p5-Lingua-Stem-Snowball-Se/Makefile
index 62cc94c4fa86..7e07bc108fd0 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Se/Makefile
+++ b/textproc/p5-Lingua-Stem-Snowball-Se/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Lingua-Stem-Snowball-Se
PORTVERSION= 1.2
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AS/ASKSH
PKGNAMEPREFIX= p5-
DISTNAME= Snowball-Swedish-${PORTVERSION}
diff --git a/textproc/p5-Lingua-Stem-Snowball/Makefile b/textproc/p5-Lingua-Stem-Snowball/Makefile
index 9217607c187a..5d5ceb24e470 100644
--- a/textproc/p5-Lingua-Stem-Snowball/Makefile
+++ b/textproc/p5-Lingua-Stem-Snowball/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-Stem-Snowball
PORTVERSION= 0.941
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Lingua-Stem/Makefile b/textproc/p5-Lingua-Stem/Makefile
index 671107f324c9..c48b6c4c8231 100644
--- a/textproc/p5-Lingua-Stem/Makefile
+++ b/textproc/p5-Lingua-Stem/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-Stem
PORTVERSION= 0.83
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Lingua-StopWords/Makefile b/textproc/p5-Lingua-StopWords/Makefile
index a91986455d32..464b5bf5ef52 100644
--- a/textproc/p5-Lingua-StopWords/Makefile
+++ b/textproc/p5-Lingua-StopWords/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lingua-StopWords
PORTVERSION= 0.08
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lingua
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-MARC-Lint/Makefile b/textproc/p5-MARC-Lint/Makefile
index 42f0112a0463..fb6d23715c63 100644
--- a/textproc/p5-MARC-Lint/Makefile
+++ b/textproc/p5-MARC-Lint/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MARC-Lint
PORTVERSION= 1.42
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MARC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/textproc/p5-MARC-Record/Makefile b/textproc/p5-MARC-Record/Makefile
index 6acbe7784100..454f1878ebe8 100644
--- a/textproc/p5-MARC-Record/Makefile
+++ b/textproc/p5-MARC-Record/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MARC-Record
PORTVERSION= 2.0.0
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MARC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/textproc/p5-MARC/Makefile b/textproc/p5-MARC/Makefile
index ddf53d23477e..113568d09719 100644
--- a/textproc/p5-MARC/Makefile
+++ b/textproc/p5-MARC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MARC
PORTVERSION= 1.15
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MARC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/textproc/p5-MKDoc-XML/Makefile b/textproc/p5-MKDoc-XML/Makefile
index bea3200e53dd..08321f9e02dd 100644
--- a/textproc/p5-MKDoc-XML/Makefile
+++ b/textproc/p5-MKDoc-XML/Makefile
@@ -8,7 +8,7 @@
PORTNAME= MKDoc-XML
PORTVERSION= 0.75
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/B/BP/BPOSTLE
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Makefile-Parser/Makefile b/textproc/p5-Makefile-Parser/Makefile
index 299c3f61421f..f6c4f145b572 100644
--- a/textproc/p5-Makefile-Parser/Makefile
+++ b/textproc/p5-Makefile-Parser/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Makefile-Parser
PORTVERSION= 0.17
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AG/AGENT
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-MathML-Entities/Makefile b/textproc/p5-MathML-Entities/Makefile
index e3b8538ff786..68a3f8b49173 100644
--- a/textproc/p5-MathML-Entities/Makefile
+++ b/textproc/p5-MathML-Entities/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MathML-Entities
PORTVERSION= 0.13
CATEGORIES= textproc www math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MathML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-NetAddr-IP-Find/Makefile b/textproc/p5-NetAddr-IP-Find/Makefile
index c459b1523d99..0ad7ed266494 100644
--- a/textproc/p5-NetAddr-IP-Find/Makefile
+++ b/textproc/p5-NetAddr-IP-Find/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NetAddr-IP-Find
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= NetAddr
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Number-Format/Makefile b/textproc/p5-Number-Format/Makefile
index 70f7974f3b4f..d18cfe247bb4 100644
--- a/textproc/p5-Number-Format/Makefile
+++ b/textproc/p5-Number-Format/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Number-Format
PORTVERSION= 1.52
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Number
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-Number-Spell/Makefile b/textproc/p5-Number-Spell/Makefile
index 98e1d0a9997f..b5646b0b7a8c 100644
--- a/textproc/p5-Number-Spell/Makefile
+++ b/textproc/p5-Number-Spell/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Number-Spell
PORTVERSION= 0.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Number
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index aab4779b4f64..743ff2cdf0c3 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -9,8 +9,7 @@
PORTNAME= PDF-API2
PORTVERSION= 0.69
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PDF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/textproc/p5-PDF-API3/Makefile b/textproc/p5-PDF-API3/Makefile
index aab4779b4f64..743ff2cdf0c3 100644
--- a/textproc/p5-PDF-API3/Makefile
+++ b/textproc/p5-PDF-API3/Makefile
@@ -9,8 +9,7 @@
PORTNAME= PDF-API2
PORTVERSION= 0.69
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PDF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/textproc/p5-PDF-Create/Makefile b/textproc/p5-PDF-Create/Makefile
index cd0ec446f337..b189c1ea8c68 100644
--- a/textproc/p5-PDF-Create/Makefile
+++ b/textproc/p5-PDF-Create/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PDF-Create
PORTVERSION= 0.08
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PDF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jadawin@FreeBSD.org
diff --git a/textproc/p5-PDF-FromHTML/Makefile b/textproc/p5-PDF-FromHTML/Makefile
index 42aba15b3cbb..56d66435150c 100644
--- a/textproc/p5-PDF-FromHTML/Makefile
+++ b/textproc/p5-PDF-FromHTML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PDF-FromHTML
PORTVERSION= 0.24
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PDF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-PDF-Writer/Makefile b/textproc/p5-PDF-Writer/Makefile
index 822b12fe4c90..985d72c66434 100644
--- a/textproc/p5-PDF-Writer/Makefile
+++ b/textproc/p5-PDF-Writer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PDF-Writer
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PDF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/textproc/p5-POE-Filter-XML/Makefile b/textproc/p5-POE-Filter-XML/Makefile
index b9661276ced8..c84ad1ec8443 100644
--- a/textproc/p5-POE-Filter-XML/Makefile
+++ b/textproc/p5-POE-Filter-XML/Makefile
@@ -9,8 +9,7 @@
PORTNAME= POE-Filter-XML
PORTVERSION= 0.33
CATEGORIES= textproc devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-POSIX-Regex/Makefile b/textproc/p5-POSIX-Regex/Makefile
index 1816428cf629..d95c0dbd35c2 100644
--- a/textproc/p5-POSIX-Regex/Makefile
+++ b/textproc/p5-POSIX-Regex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POSIX-Regex
PORTVERSION= 0.89
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POSIX
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/textproc/p5-PPI-HTML/Makefile b/textproc/p5-PPI-HTML/Makefile
index aca6a80ceed5..a2561f5ff6a5 100644
--- a/textproc/p5-PPI-HTML/Makefile
+++ b/textproc/p5-PPI-HTML/Makefile
@@ -8,7 +8,7 @@
PORTNAME= PPI-HTML
PORTVERSION= 1.07
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/A/AD/ADAMK
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-PPI/Makefile b/textproc/p5-PPI/Makefile
index 01dfc18d6224..c75cc5f05443 100644
--- a/textproc/p5-PPI/Makefile
+++ b/textproc/p5-PPI/Makefile
@@ -8,7 +8,7 @@
PORTNAME= PPI
PORTVERSION= 1.201
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/A/AD/ADAMK
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Parse-CSV/Makefile b/textproc/p5-Parse-CSV/Makefile
index f945bc40cef5..dc967f1f061c 100644
--- a/textproc/p5-Parse-CSV/Makefile
+++ b/textproc/p5-Parse-CSV/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Parse-CSV
PORTVERSION= 1.00
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/textproc/p5-Parse-FixedLength/Makefile b/textproc/p5-Parse-FixedLength/Makefile
index 1b4fa7a3349f..6215273577f4 100644
--- a/textproc/p5-Parse-FixedLength/Makefile
+++ b/textproc/p5-Parse-FixedLength/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Parse-FixedLength
PORTVERSION= 5.37
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Parse-Flex/Makefile b/textproc/p5-Parse-Flex/Makefile
index c33a52e969d0..29e5d14ca6ea 100644
--- a/textproc/p5-Parse-Flex/Makefile
+++ b/textproc/p5-Parse-Flex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Parse-Flex
PORTVERSION= 0.11
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-Parse-PhoneNumber/Makefile b/textproc/p5-Parse-PhoneNumber/Makefile
index 07d02b8638dd..51fffe3318a8 100644
--- a/textproc/p5-Parse-PhoneNumber/Makefile
+++ b/textproc/p5-Parse-PhoneNumber/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Parse-PhoneNumber
PORTVERSION= 1.6
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-Parse-Syslog/Makefile b/textproc/p5-Parse-Syslog/Makefile
index 43eff150091b..1ebac00ff5d4 100644
--- a/textproc/p5-Parse-Syslog/Makefile
+++ b/textproc/p5-Parse-Syslog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Parse-Syslog
PORTVERSION= 1.10
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/textproc/p5-Petal-CodePerl/Makefile b/textproc/p5-Petal-CodePerl/Makefile
index a8ec0fe66eb0..4919bc404e70 100644
--- a/textproc/p5-Petal-CodePerl/Makefile
+++ b/textproc/p5-Petal-CodePerl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Petal-CodePerl
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/F/FD/FDALY
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Petal-Mail/Makefile b/textproc/p5-Petal-Mail/Makefile
index 9aec4945d0ee..0a903d965e90 100644
--- a/textproc/p5-Petal-Mail/Makefile
+++ b/textproc/p5-Petal-Mail/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Petal-Mail
PORTVERSION= 0.31
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/B/BP/BPOSTLE
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Petal-Utils/Makefile b/textproc/p5-Petal-Utils/Makefile
index 475b3d16841c..f43f4c32c5f6 100644
--- a/textproc/p5-Petal-Utils/Makefile
+++ b/textproc/p5-Petal-Utils/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Petal-Utils
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/W/WM/WMCKEE
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Petal/Makefile b/textproc/p5-Petal/Makefile
index 4b23922ee555..21e4926d142e 100644
--- a/textproc/p5-Petal/Makefile
+++ b/textproc/p5-Petal/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Petal
PORTVERSION= 2.19
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/B/BP/BPOSTLE
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Plagger/Makefile b/textproc/p5-Plagger/Makefile
index 1bbc0e5d0521..22153ea28c8b 100644
--- a/textproc/p5-Plagger/Makefile
+++ b/textproc/p5-Plagger/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Plagger
PORTVERSION= 0.7.17
PORTREVISION= 2
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/M/MI/MIYAGAWA
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
index 7fef28b52444..8aec28c50de0 100644
--- a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
+++ b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Plucene-Plugin-Analyzer-SnowballAnalyzer
PORTVERSION= 1.1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/F/FA/FABPOT
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Plucene/Makefile b/textproc/p5-Plucene/Makefile
index 90888ecbb94b..530b471fcc54 100644
--- a/textproc/p5-Plucene/Makefile
+++ b/textproc/p5-Plucene/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Plucene
PORTVERSION= 1.25
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/T/TM/TMTM
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Pod-Constants/Makefile b/textproc/p5-Pod-Constants/Makefile
index d93cf6207ef7..52671d34e8e8 100644
--- a/textproc/p5-Pod-Constants/Makefile
+++ b/textproc/p5-Pod-Constants/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Pod-Constants
PORTVERSION= 0.16
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SAMV
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Pod-DocBook/Makefile b/textproc/p5-Pod-DocBook/Makefile
index 9acf2797177b..0bc094035f5e 100644
--- a/textproc/p5-Pod-DocBook/Makefile
+++ b/textproc/p5-Pod-DocBook/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Pod-DocBook
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/N/NA/NANDU
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Pod-POM-View-HTML-Filter/Makefile b/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
index 8486d41d899d..5a12fde35832 100644
--- a/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
+++ b/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Pod-POM-View-HTML-Filter
PORTVERSION= 0.09
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Pod-POM/Makefile b/textproc/p5-Pod-POM/Makefile
index 0ec23d12ccf6..18a8e4bcacd2 100644
--- a/textproc/p5-Pod-POM/Makefile
+++ b/textproc/p5-Pod-POM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Pod-POM
PORTVERSION= 0.17
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod/ABW
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-Pod-Parser/Makefile b/textproc/p5-Pod-Parser/Makefile
index 02fe54cc68a5..b4a71d0445cc 100644
--- a/textproc/p5-Pod-Parser/Makefile
+++ b/textproc/p5-Pod-Parser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Pod-Parser
PORTVERSION= 1.35
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-Pod-ProjectDocs/Makefile b/textproc/p5-Pod-ProjectDocs/Makefile
index 87e6ac76e678..9e16ff281265 100644
--- a/textproc/p5-Pod-ProjectDocs/Makefile
+++ b/textproc/p5-Pod-ProjectDocs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Pod-ProjectDocs
PORTVERSION= 0.26
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-Pod-Stripper/Makefile b/textproc/p5-Pod-Stripper/Makefile
index 75ca01d894ae..aa48a3b5fc86 100644
--- a/textproc/p5-Pod-Stripper/Makefile
+++ b/textproc/p5-Pod-Stripper/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Pod-Stripper
PORTVERSION= 0.22
PORTREVISION= 3
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-Pod-Tree/Makefile b/textproc/p5-Pod-Tree/Makefile
index 585b8f5ca4ef..637d214508d0 100644
--- a/textproc/p5-Pod-Tree/Makefile
+++ b/textproc/p5-Pod-Tree/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Pod-Tree
PORTVERSION= 1.15
CATEGORIES= textproc devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Pod-WSDL/Makefile b/textproc/p5-Pod-WSDL/Makefile
index 178760e9ddbd..d97735643420 100644
--- a/textproc/p5-Pod-WSDL/Makefile
+++ b/textproc/p5-Pod-WSDL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Pod-WSDL
PORTVERSION= 0.05
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Pod-XML/Makefile b/textproc/p5-Pod-XML/Makefile
index 4dec51a9739e..0ee11dae3828 100644
--- a/textproc/p5-Pod-XML/Makefile
+++ b/textproc/p5-Pod-XML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Pod-XML
PORTVERSION= 0.99
CATEGORIES= textproc devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-RADIUS-UserFile/Makefile b/textproc/p5-RADIUS-UserFile/Makefile
index 1626cb3cc6b5..76e57d0c6454 100644
--- a/textproc/p5-RADIUS-UserFile/Makefile
+++ b/textproc/p5-RADIUS-UserFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RADIUS-UserFile
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RADIUS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index 3600cc8ef203..9cef97854e20 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RDF-Core
PORTVERSION= 0.51
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RDF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile
index 72a1f35b9599..229e21257506 100644
--- a/textproc/p5-RDF-Notation3/Makefile
+++ b/textproc/p5-RDF-Notation3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RDF-Notation3
PORTVERSION= 0.91
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RDF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-RDF-Simple/Makefile b/textproc/p5-RDF-Simple/Makefile
index db11f20d427d..a9a47ff07a8a 100644
--- a/textproc/p5-RDF-Simple/Makefile
+++ b/textproc/p5-RDF-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RDF-Simple
PORTVERSION= 0.30
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RDF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-0.3
diff --git a/textproc/p5-RDFStore/Makefile b/textproc/p5-RDFStore/Makefile
index b349377d1720..5fca1d4a0daf 100644
--- a/textproc/p5-RDFStore/Makefile
+++ b/textproc/p5-RDFStore/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RDFStore
PORTVERSION= 0.51
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RDF/AREGGIORI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-RTF-Parser/Makefile b/textproc/p5-RTF-Parser/Makefile
index a7c3c508f4a9..6e861c17d05c 100644
--- a/textproc/p5-RTF-Parser/Makefile
+++ b/textproc/p5-RTF-Parser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RTF-Parser
PORTVERSION= 1.09
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RTF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-RTF-Tokenizer/Makefile b/textproc/p5-RTF-Tokenizer/Makefile
index 74e77487302a..dcb3b74bdf7b 100644
--- a/textproc/p5-RTF-Tokenizer/Makefile
+++ b/textproc/p5-RTF-Tokenizer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RTF-Tokenizer
PORTVERSION= 1.10
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RTF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-RTF-Writer/Makefile b/textproc/p5-RTF-Writer/Makefile
index f5733b9cfbe8..59c2d33672b6 100644
--- a/textproc/p5-RTF-Writer/Makefile
+++ b/textproc/p5-RTF-Writer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RTF-Writer
PORTVERSION= 1.11
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= RTF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-Regex-PreSuf/Makefile b/textproc/p5-Regex-PreSuf/Makefile
index dff6d48db5fc..3b7a0d21189f 100644
--- a/textproc/p5-Regex-PreSuf/Makefile
+++ b/textproc/p5-Regex-PreSuf/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Regex-PreSuf
PORTVERSION= 1.17
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text/JHI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
diff --git a/textproc/p5-Regexp-Common-profanity_us/Makefile b/textproc/p5-Regexp-Common-profanity_us/Makefile
index 913b02f1b62a..ece98fcb72ce 100644
--- a/textproc/p5-Regexp-Common-profanity_us/Makefile
+++ b/textproc/p5-Regexp-Common-profanity_us/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Regexp-Common-profanity_us
PORTVERSION= 2.2
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/textproc/p5-Regexp-Common/Makefile b/textproc/p5-Regexp-Common/Makefile
index d81e8e49014e..f696e4c2efa1 100644
--- a/textproc/p5-Regexp-Common/Makefile
+++ b/textproc/p5-Regexp-Common/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Regexp-Common
PORTVERSION= 2.120
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Regexp-Copy/Makefile b/textproc/p5-Regexp-Copy/Makefile
index 8c7946194257..581ba2d2dfc5 100644
--- a/textproc/p5-Regexp-Copy/Makefile
+++ b/textproc/p5-Regexp-Copy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Regexp-Copy
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/J/JD/JDUNCAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Regexp-DefaultFlags/Makefile b/textproc/p5-Regexp-DefaultFlags/Makefile
index fad5a7c5f87e..c20204462a55 100644
--- a/textproc/p5-Regexp-DefaultFlags/Makefile
+++ b/textproc/p5-Regexp-DefaultFlags/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Regexp-DefaultFlags
PORTVERSION= 0.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/textproc/p5-Regexp-Log-Common/Makefile b/textproc/p5-Regexp-Log-Common/Makefile
index b97d3b75ef43..eb40c495458d 100644
--- a/textproc/p5-Regexp-Log-Common/Makefile
+++ b/textproc/p5-Regexp-Log-Common/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Regexp-Log-Common
PORTVERSION= 0.05
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Regexp-Log/Makefile b/textproc/p5-Regexp-Log/Makefile
index de31331f540c..acdf712c5c5d 100644
--- a/textproc/p5-Regexp-Log/Makefile
+++ b/textproc/p5-Regexp-Log/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Regexp-Log
PORTVERSION= 0.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-SGML-DTDParse/Makefile b/textproc/p5-SGML-DTDParse/Makefile
index fc0bb0e2f2c5..62f4cabdf22e 100644
--- a/textproc/p5-SGML-DTDParse/Makefile
+++ b/textproc/p5-SGML-DTDParse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SGML-DTDParse
PORTVERSION= 2.00
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SGML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-SGML-Parser-OpenSP/Makefile b/textproc/p5-SGML-Parser-OpenSP/Makefile
index f5c15cfa3526..fff9dbe52e43 100644
--- a/textproc/p5-SGML-Parser-OpenSP/Makefile
+++ b/textproc/p5-SGML-Parser-OpenSP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SGML-Parser-OpenSP
PORTVERSION= 0.991
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SGML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= cyberbotx@cyberbotx.com
diff --git a/textproc/p5-SGMLSpm/Makefile b/textproc/p5-SGMLSpm/Makefile
index 4152e975e744..4d2007402f35 100644
--- a/textproc/p5-SGMLSpm/Makefile
+++ b/textproc/p5-SGMLSpm/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SGMLSpm
PORTVERSION= 1.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SGMLS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION}ii
diff --git a/textproc/p5-SVG/Makefile b/textproc/p5-SVG/Makefile
index 923494e41104..808fa472facb 100644
--- a/textproc/p5-SVG/Makefile
+++ b/textproc/p5-SVG/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVG
PORTVERSION= 2.33
CATEGORIES= textproc graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVG
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-Search-VectorSpace/Makefile b/textproc/p5-Search-VectorSpace/Makefile
index c6534f5e58e4..a3612738ced2 100644
--- a/textproc/p5-Search-VectorSpace/Makefile
+++ b/textproc/p5-Search-VectorSpace/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Search-VectorSpace
PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Search
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-Senna/Makefile b/textproc/p5-Senna/Makefile
index 32ce373c0a44..835da7e4101f 100644
--- a/textproc/p5-Senna/Makefile
+++ b/textproc/p5-Senna/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Senna
PORTVERSION= 0.51
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/D/DM/DMAKI/
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Sort-ArbBiLex/Makefile b/textproc/p5-Sort-ArbBiLex/Makefile
index 23964ff81471..c5abe655ac36 100644
--- a/textproc/p5-Sort-ArbBiLex/Makefile
+++ b/textproc/p5-Sort-ArbBiLex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-ArbBiLex
PORTVERSION= 4.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Sort-Fields/Makefile b/textproc/p5-Sort-Fields/Makefile
index e2ecd11e7612..a3ad4b70d5e7 100644
--- a/textproc/p5-Sort-Fields/Makefile
+++ b/textproc/p5-Sort-Fields/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Fields
PORTVERSION= 0.90
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Sort-Naturally/Makefile b/textproc/p5-Sort-Naturally/Makefile
index 19f702c43c86..f1e667b0d95a 100644
--- a/textproc/p5-Sort-Naturally/Makefile
+++ b/textproc/p5-Sort-Naturally/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Naturally
PORTVERSION= 1.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-Spork/Makefile b/textproc/p5-Spork/Makefile
index 20a1fa13e182..8203fff4a7b9 100644
--- a/textproc/p5-Spork/Makefile
+++ b/textproc/p5-Spork/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Spork
PORTVERSION= 0.20
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY/
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index 1b7d36de2c1f..ecf2d33ee25d 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Spreadsheet-ParseExcel
PORTVERSION= 0.3200
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Spreadsheet
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/00$//}
diff --git a/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile b/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
index bf839cc51d73..dff6c78030ba 100644
--- a/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Spreadsheet-WriteExcel-FromXML
PORTVERSION= 1.1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Spreadsheet
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index a5c2934baa61..79be7747d5c8 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Spreadsheet-WriteExcel
PORTVERSION= 2.20
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Spreadsheet
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-Spreadsheet-WriteExcelXML/Makefile b/textproc/p5-Spreadsheet-WriteExcelXML/Makefile
index d49439f2f820..ee471b5d8118 100644
--- a/textproc/p5-Spreadsheet-WriteExcelXML/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcelXML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Spreadsheet-WriteExcelXML
PORTVERSION= 0.10
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Spreadsheet
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-String-Divert/Makefile b/textproc/p5-String-Divert/Makefile
index 089903ba4b8c..9aade6154c95 100644
--- a/textproc/p5-String-Divert/Makefile
+++ b/textproc/p5-String-Divert/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Divert
PORTVERSION= 0.96
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-String-Format/Makefile b/textproc/p5-String-Format/Makefile
index 88dc94e0881a..14efbfd870ce 100644
--- a/textproc/p5-String-Format/Makefile
+++ b/textproc/p5-String-Format/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Format
PORTVERSION= 1.14
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= matt_mills@btopenworld.com
diff --git a/textproc/p5-String-Fraction/Makefile b/textproc/p5-String-Fraction/Makefile
index 6eccea4a41b1..766cbdc4feb3 100644
--- a/textproc/p5-String-Fraction/Makefile
+++ b/textproc/p5-String-Fraction/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Fraction
PORTVERSION= 0.20
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-String-Koremutake/Makefile b/textproc/p5-String-Koremutake/Makefile
index 3ea80ad3c7b0..b6203e175253 100644
--- a/textproc/p5-String-Koremutake/Makefile
+++ b/textproc/p5-String-Koremutake/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Koremutake
PORTVERSION= 0.30
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-String-Scanf/Makefile b/textproc/p5-String-Scanf/Makefile
index a770e0d4db6c..3e8f38d9a9ad 100644
--- a/textproc/p5-String-Scanf/Makefile
+++ b/textproc/p5-String-Scanf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Scanf
PORTVERSION= 2.1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-String-ShellQuote/Makefile b/textproc/p5-String-ShellQuote/Makefile
index 87df91676602..312efbfa5549 100644
--- a/textproc/p5-String-ShellQuote/Makefile
+++ b/textproc/p5-String-ShellQuote/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-ShellQuote
PORTVERSION= 1.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-String-Strip/Makefile b/textproc/p5-String-Strip/Makefile
index 2adc1811d259..b0f905983d0b 100644
--- a/textproc/p5-String-Strip/Makefile
+++ b/textproc/p5-String-Strip/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Strip
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-String-Tokenizer/Makefile b/textproc/p5-String-Tokenizer/Makefile
index 6fb7741d9fb6..8772789f67d0 100644
--- a/textproc/p5-String-Tokenizer/Makefile
+++ b/textproc/p5-String-Tokenizer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Tokenizer
PORTVERSION= 0.05
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile b/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
index 5dfb225edf4f..fdd61ac2d2aa 100644
--- a/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
+++ b/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Syntax-Highlight-Engine-Kate
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Syntax
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile b/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
index 90f32b3ca02e..664b8b36361f 100644
--- a/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
+++ b/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Syntax-Highlight-Perl-Improved
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/D/DA/DAVIDCYL/Syntax-Highlight-Perl-Improved-101
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-TeX-Encode/Makefile b/textproc/p5-TeX-Encode/Makefile
index 84777165672d..30cf34408e46 100644
--- a/textproc/p5-TeX-Encode/Makefile
+++ b/textproc/p5-TeX-Encode/Makefile
@@ -8,7 +8,7 @@
PORTNAME= TeX-Encode
PORTVERSION= 0.9
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TI/TIMBRODY
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-TeX-Hyphen/Makefile b/textproc/p5-TeX-Hyphen/Makefile
index 8ef4c1a006be..7f183519b228 100644
--- a/textproc/p5-TeX-Hyphen/Makefile
+++ b/textproc/p5-TeX-Hyphen/Makefile
@@ -8,8 +8,7 @@
PORTNAME= TeX-Hyphen
PORTVERSION= 0.140
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= TeX
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/p5-Template-Declare/Makefile b/textproc/p5-Template-Declare/Makefile
index ec1e4e27510b..34f0ed0c08aa 100644
--- a/textproc/p5-Template-Declare/Makefile
+++ b/textproc/p5-Template-Declare/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Template-Declare
PORTVERSION= 0.27
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Template
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Template-Extract/Makefile b/textproc/p5-Template-Extract/Makefile
index 7c89abef4c95..141e71da4461 100644
--- a/textproc/p5-Template-Extract/Makefile
+++ b/textproc/p5-Template-Extract/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Template-Extract
PORTVERSION= 0.41
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Template
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Template-Magic/Makefile b/textproc/p5-Template-Magic/Makefile
index 8025a147021a..6d878d0004fa 100644
--- a/textproc/p5-Template-Magic/Makefile
+++ b/textproc/p5-Template-Magic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Template-Magic
PORTVERSION= 1.39
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Template
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
index f1fd0331f86e..e1b099f370a3 100644
--- a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Template-Plugin-Lingua-EN-Inflect
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Template
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Test-Perl-Critic/Makefile b/textproc/p5-Test-Perl-Critic/Makefile
index b42f9611c0fa..7358c49f9fe6 100644
--- a/textproc/p5-Test-Perl-Critic/Makefile
+++ b/textproc/p5-Test-Perl-Critic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Perl-Critic
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test/THALJEF/testperlcritic
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-Text-ASCIITable/Makefile b/textproc/p5-Text-ASCIITable/Makefile
index 1ac46c5124da..11109392b170 100644
--- a/textproc/p5-Text-ASCIITable/Makefile
+++ b/textproc/p5-Text-ASCIITable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-ASCIITable
PORTVERSION= 0.18
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/textproc/p5-Text-Affixes/Makefile b/textproc/p5-Text-Affixes/Makefile
index 06bd6d8e976c..4a6a8b94874f 100644
--- a/textproc/p5-Text-Affixes/Makefile
+++ b/textproc/p5-Text-Affixes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Affixes
PORTVERSION= 0.07
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-Text-Aligner/Makefile b/textproc/p5-Text-Aligner/Makefile
index 2e831818951b..8b72d7a78af9 100644
--- a/textproc/p5-Text-Aligner/Makefile
+++ b/textproc/p5-Text-Aligner/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Aligner
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index f0cb10ee2565..fda26935cbd2 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Text-Autoformat
PORTVERSION= 1.14.0
DISTVERSIONPREFIX= v
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text/DCONWAY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Balanced/Makefile b/textproc/p5-Text-Balanced/Makefile
index d4e05fe1a8be..1d3da4f0ec52 100644
--- a/textproc/p5-Text-Balanced/Makefile
+++ b/textproc/p5-Text-Balanced/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Text-Balanced
PORTVERSION= 2.0.0
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/textproc/p5-Text-Bind/Makefile b/textproc/p5-Text-Bind/Makefile
index 67b14f711e0c..9957b089adad 100644
--- a/textproc/p5-Text-Bind/Makefile
+++ b/textproc/p5-Text-Bind/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Bind
PORTVERSION= 0.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-CSV-Simple/Makefile b/textproc/p5-Text-CSV-Simple/Makefile
index 090bcbdf5ad7..b8a65e0f16f4 100644
--- a/textproc/p5-Text-CSV-Simple/Makefile
+++ b/textproc/p5-Text-CSV-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-CSV-Simple
PORTVERSION= 1.00
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/p5-Text-CSV_PP/Makefile b/textproc/p5-Text-CSV_PP/Makefile
index 43789c7fa0ad..2701008e8294 100644
--- a/textproc/p5-Text-CSV_PP/Makefile
+++ b/textproc/p5-Text-CSV_PP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-CSV_PP
PORTVERSION= 1.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Text-Capitalize/Makefile b/textproc/p5-Text-Capitalize/Makefile
index 7760401fe05e..7ccbf2fe5b6e 100644
--- a/textproc/p5-Text-Capitalize/Makefile
+++ b/textproc/p5-Text-Capitalize/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Capitalize
PORTVERSION= 0.5
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= amdmi3@amdmi3.ru
diff --git a/textproc/p5-Text-Chomp/Makefile b/textproc/p5-Text-Chomp/Makefile
index 7f967dd38aef..adfd99156506 100644
--- a/textproc/p5-Text-Chomp/Makefile
+++ b/textproc/p5-Text-Chomp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Chomp
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Text-Context-EitherSide/Makefile b/textproc/p5-Text-Context-EitherSide/Makefile
index a89b8380ce55..8bff17cb2392 100644
--- a/textproc/p5-Text-Context-EitherSide/Makefile
+++ b/textproc/p5-Text-Context-EitherSide/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Context-EitherSide
PORTVERSION= 1.3
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Decorator/Makefile b/textproc/p5-Text-Decorator/Makefile
index 32ae0e33d402..b2abf2c77534 100644
--- a/textproc/p5-Text-Decorator/Makefile
+++ b/textproc/p5-Text-Decorator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Decorator
PORTVERSION= 1.65
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-Text-Delimited/Makefile b/textproc/p5-Text-Delimited/Makefile
index b7e3fc69ec4f..1edfcf294249 100644
--- a/textproc/p5-Text-Delimited/Makefile
+++ b/textproc/p5-Text-Delimited/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Delimited
PORTVERSION= 2.00
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/textproc/p5-Text-Diff-HTML/Makefile b/textproc/p5-Text-Diff-HTML/Makefile
index 4807a66668eb..8ec20cfecaa1 100644
--- a/textproc/p5-Text-Diff-HTML/Makefile
+++ b/textproc/p5-Text-Diff-HTML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Diff-HTML
PORTVERSION= 0.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Diff/Makefile b/textproc/p5-Text-Diff/Makefile
index 4dd4c6d8ff8e..51a2f77bdeae 100644
--- a/textproc/p5-Text-Diff/Makefile
+++ b/textproc/p5-Text-Diff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Diff
PORTVERSION= 0.35
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Diff3/Makefile b/textproc/p5-Text-Diff3/Makefile
index f27ca352ea02..3adac9054276 100644
--- a/textproc/p5-Text-Diff3/Makefile
+++ b/textproc/p5-Text-Diff3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Diff3
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-Text-DoubleMetaphone/Makefile b/textproc/p5-Text-DoubleMetaphone/Makefile
index 3fa3b4f8981d..d94fc7707551 100644
--- a/textproc/p5-Text-DoubleMetaphone/Makefile
+++ b/textproc/p5-Text-DoubleMetaphone/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-DoubleMetaphone
PORTVERSION= 0.07
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Emoticon-GoogleTalk/Makefile b/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
index 21c4e99219b0..f3e8ed4fdf5b 100644
--- a/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
+++ b/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Emoticon-GoogleTalk
PORTVERSION= 0.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-Text-Emoticon/Makefile b/textproc/p5-Text-Emoticon/Makefile
index 76851addbaeb..5c74708cbf51 100644
--- a/textproc/p5-Text-Emoticon/Makefile
+++ b/textproc/p5-Text-Emoticon/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Emoticon
PORTVERSION= 0.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/textproc/p5-Text-EtText/Makefile b/textproc/p5-Text-EtText/Makefile
index 6e4facc4df3d..521a638ce355 100644
--- a/textproc/p5-Text-EtText/Makefile
+++ b/textproc/p5-Text-EtText/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-EtText
PORTVERSION= 2.2
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Text-ExtractWords/Makefile b/textproc/p5-Text-ExtractWords/Makefile
index 221e1f2878a4..d5dfbb275cbe 100644
--- a/textproc/p5-Text-ExtractWords/Makefile
+++ b/textproc/p5-Text-ExtractWords/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-ExtractWords
PORTVERSION= 0.08
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-Text-FillIn/Makefile b/textproc/p5-Text-FillIn/Makefile
index c020e296fcf3..f2b52bb2c6f1 100644
--- a/textproc/p5-Text-FillIn/Makefile
+++ b/textproc/p5-Text-FillIn/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-FillIn
PORTVERSION= 0.05
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Filter-Chain/Makefile b/textproc/p5-Text-Filter-Chain/Makefile
index f525a5d26743..2597bff40861 100644
--- a/textproc/p5-Text-Filter-Chain/Makefile
+++ b/textproc/p5-Text-Filter-Chain/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Filter-Chain
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Filter/Makefile b/textproc/p5-Text-Filter/Makefile
index f46d5fb11f1f..6fd79c77dbd8 100644
--- a/textproc/p5-Text-Filter/Makefile
+++ b/textproc/p5-Text-Filter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Filter
PORTVERSION= 1.9
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-FixedLength-Extra/Makefile b/textproc/p5-Text-FixedLength-Extra/Makefile
index 7c5102be0fca..ba9132964e3b 100644
--- a/textproc/p5-Text-FixedLength-Extra/Makefile
+++ b/textproc/p5-Text-FixedLength-Extra/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-FixedLength-Extra
PORTVERSION= 1.1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-FixedLength/Makefile b/textproc/p5-Text-FixedLength/Makefile
index 9de4a4bdf01e..753748c96e16 100644
--- a/textproc/p5-Text-FixedLength/Makefile
+++ b/textproc/p5-Text-FixedLength/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-FixedLength
PORTVERSION= 0.12
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Flowchart/Makefile b/textproc/p5-Text-Flowchart/Makefile
index 0f88c65a4b80..cf107c39812b 100644
--- a/textproc/p5-Text-Flowchart/Makefile
+++ b/textproc/p5-Text-Flowchart/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Flowchart
PORTVERSION= 1.00
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Format+NWrap/Makefile b/textproc/p5-Text-Format+NWrap/Makefile
index 970dccdc9a6a..567ad305bf13 100644
--- a/textproc/p5-Text-Format+NWrap/Makefile
+++ b/textproc/p5-Text-Format+NWrap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Format+NWrap
PORTVERSION= 0.52
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Text-Format0.52+NWrap0.11
diff --git a/textproc/p5-Text-Format/Makefile b/textproc/p5-Text-Format/Makefile
index b482c8511f27..8254c6d6b53f 100644
--- a/textproc/p5-Text-Format/Makefile
+++ b/textproc/p5-Text-Format/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Format
PORTVERSION= 0.52
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/textproc/p5-Text-FormatTable/Makefile b/textproc/p5-Text-FormatTable/Makefile
index cbd1a3e447eb..d3e2b9458682 100644
--- a/textproc/p5-Text-FormatTable/Makefile
+++ b/textproc/p5-Text-FormatTable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-FormatTable
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Text-German/Makefile b/textproc/p5-Text-German/Makefile
index 8114ddb308d3..488c9c113167 100644
--- a/textproc/p5-Text-German/Makefile
+++ b/textproc/p5-Text-German/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Text-German
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/U/UL/ULPFR
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-Glob/Makefile b/textproc/p5-Text-Glob/Makefile
index 757c52c3aa58..2aa23217bf15 100644
--- a/textproc/p5-Text-Glob/Makefile
+++ b/textproc/p5-Text-Glob/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Glob
PORTVERSION= 0.08
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-Text-Graphics/Makefile b/textproc/p5-Text-Graphics/Makefile
index 1b60b127cacc..8e6a91c973c5 100644
--- a/textproc/p5-Text-Graphics/Makefile
+++ b/textproc/p5-Text-Graphics/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Text-Graphics
PORTVERSION= 1.0001
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Hatena/Makefile b/textproc/p5-Text-Hatena/Makefile
index 790de4981a59..f3280809449b 100644
--- a/textproc/p5-Text-Hatena/Makefile
+++ b/textproc/p5-Text-Hatena/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Hatena
PORTVERSION= 0.20
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Text-Highlight/Makefile b/textproc/p5-Text-Highlight/Makefile
index df0f0159c046..05bdef26516b 100644
--- a/textproc/p5-Text-Highlight/Makefile
+++ b/textproc/p5-Text-Highlight/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Text-Highlight
PORTVERSION= 0.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/I/IC/ICRF
PKGNAMEPREFIX= p5-
DISTNAME= text-highlight-${PORTVERSION}
diff --git a/textproc/p5-Text-Language-Guess/Makefile b/textproc/p5-Text-Language-Guess/Makefile
index 6745e822fe54..c64fb64905da 100644
--- a/textproc/p5-Text-Language-Guess/Makefile
+++ b/textproc/p5-Text-Language-Guess/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Text-Language-Guess
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/M/MS/MSCHILLI
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-Metaphone/Makefile b/textproc/p5-Text-Metaphone/Makefile
index 6d661fb6ffe0..22e2a1499178 100644
--- a/textproc/p5-Text-Metaphone/Makefile
+++ b/textproc/p5-Text-Metaphone/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Metaphone
PORTVERSION= 2.00
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Text-NeatTemplate/Makefile b/textproc/p5-Text-NeatTemplate/Makefile
index c13fc2a8584b..2cec3ce437cc 100644
--- a/textproc/p5-Text-NeatTemplate/Makefile
+++ b/textproc/p5-Text-NeatTemplate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-NeatTemplate
PORTVERSION= 0.08
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-Text-Netstring/Makefile b/textproc/p5-Text-Netstring/Makefile
index b89a9b6bd614..3dac884cfff9 100644
--- a/textproc/p5-Text-Netstring/Makefile
+++ b/textproc/p5-Text-Netstring/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Netstring
PORTVERSION= 0.07
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= james@now.ie
diff --git a/textproc/p5-Text-Ngram/Makefile b/textproc/p5-Text-Ngram/Makefile
index 03d7f2443aad..2781c3bf81e3 100644
--- a/textproc/p5-Text-Ngram/Makefile
+++ b/textproc/p5-Text-Ngram/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Ngram
PORTVERSION= 0.10
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-Text-Ngrams/Makefile b/textproc/p5-Text-Ngrams/Makefile
index b3087d13cf12..628944a2b236 100644
--- a/textproc/p5-Text-Ngrams/Makefile
+++ b/textproc/p5-Text-Ngrams/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Ngrams
PORTVERSION= 1.9
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-Text-Original/Makefile b/textproc/p5-Text-Original/Makefile
index 6f90a91c9ae3..26693a5258ff 100644
--- a/textproc/p5-Text-Original/Makefile
+++ b/textproc/p5-Text-Original/Makefile
@@ -8,9 +8,7 @@
PORTNAME= Text-Original
PORTVERSION= 1.4
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-# if this is wrong, fix it by hand
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Text-ParagraphDiff/Makefile b/textproc/p5-Text-ParagraphDiff/Makefile
index e468de7c74b9..fe1f77af2f5d 100644
--- a/textproc/p5-Text-ParagraphDiff/Makefile
+++ b/textproc/p5-Text-ParagraphDiff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-ParagraphDiff
PORTVERSION= 2.70
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Text-Query/Makefile b/textproc/p5-Text-Query/Makefile
index 95c0f1e6b606..f04199ba842d 100644
--- a/textproc/p5-Text-Query/Makefile
+++ b/textproc/p5-Text-Query/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Query
PORTVERSION= 0.07
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Quoted/Makefile b/textproc/p5-Text-Quoted/Makefile
index 4f462694f257..9a1e69468a84 100644
--- a/textproc/p5-Text-Quoted/Makefile
+++ b/textproc/p5-Text-Quoted/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Quoted
PORTVERSION= 2.05
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/textproc/p5-Text-RecordParser/Makefile b/textproc/p5-Text-RecordParser/Makefile
index 24e012bb9ca7..beee36bc5e64 100644
--- a/textproc/p5-Text-RecordParser/Makefile
+++ b/textproc/p5-Text-RecordParser/Makefile
@@ -8,8 +8,7 @@ PORTNAME= Text-RecordParser
PORTVERSION= 1.2.1
DISTVERSIONPREFIX= v
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/textproc/p5-Text-Report/Makefile b/textproc/p5-Text-Report/Makefile
index 49e29176c754..4ce86e25339c 100644
--- a/textproc/p5-Text-Report/Makefile
+++ b/textproc/p5-Text-Report/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Report
PORTVERSION= 1.004
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/textproc/p5-Text-Repository/Makefile b/textproc/p5-Text-Repository/Makefile
index 3c778f1dc55b..c791413edb84 100644
--- a/textproc/p5-Text-Repository/Makefile
+++ b/textproc/p5-Text-Repository/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Repository
PORTVERSION= 1.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Text-Shellwords/Makefile b/textproc/p5-Text-Shellwords/Makefile
index a9287b2950e4..512af95e15f8 100644
--- a/textproc/p5-Text-Shellwords/Makefile
+++ b/textproc/p5-Text-Shellwords/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Shellwords
PORTVERSION= 1.08
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hartzell@alerce.com
diff --git a/textproc/p5-Text-SimpleTable/Makefile b/textproc/p5-Text-SimpleTable/Makefile
index 0c47474aab48..7ae3bb28f472 100644
--- a/textproc/p5-Text-SimpleTable/Makefile
+++ b/textproc/p5-Text-SimpleTable/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Text-SimpleTable
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/S/SR/SRI
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-SimpleTemplate/Makefile b/textproc/p5-Text-SimpleTemplate/Makefile
index 4c40d35a097d..3688c5803a7c 100644
--- a/textproc/p5-Text-SimpleTemplate/Makefile
+++ b/textproc/p5-Text-SimpleTemplate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-SimpleTemplate
PORTVERSION= 0.36
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Striphigh/Makefile b/textproc/p5-Text-Striphigh/Makefile
index 54fcb14dfbeb..95e1d0cffd64 100644
--- a/textproc/p5-Text-Striphigh/Makefile
+++ b/textproc/p5-Text-Striphigh/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Striphigh
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kai@xs4all.nl
diff --git a/textproc/p5-Text-Table/Makefile b/textproc/p5-Text-Table/Makefile
index 26f710fbe69e..31c70f107843 100644
--- a/textproc/p5-Text-Table/Makefile
+++ b/textproc/p5-Text-Table/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Table
PORTVERSION= 1.107
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Text-Tabs+Wrap/Makefile b/textproc/p5-Text-Tabs+Wrap/Makefile
index e197d0e0e7ad..7d99727670c4 100644
--- a/textproc/p5-Text-Tabs+Wrap/Makefile
+++ b/textproc/p5-Text-Tabs+Wrap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Tabs+Wrap
PORTVERSION= 2006.1117
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Text-TabularDisplay/Makefile b/textproc/p5-Text-TabularDisplay/Makefile
index cd1a2140d547..c1d00b8ecb81 100644
--- a/textproc/p5-Text-TabularDisplay/Makefile
+++ b/textproc/p5-Text-TabularDisplay/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Text-TabularDisplay
PORTVERSION= 1.22
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/textproc/p5-Text-Tags/Makefile b/textproc/p5-Text-Tags/Makefile
index d44d4e034e1e..5c9fe973f66f 100644
--- a/textproc/p5-Text-Tags/Makefile
+++ b/textproc/p5-Text-Tags/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Tags
PORTVERSION= 0.04
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index 7816b6d8aed2..52f404ca23da 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Text-Template
PORTVERSION= 1.44
CATEGORIES= textproc perl5
MASTER_SITES= http://perl.plover.com/Template/ \
- ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+ CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/textproc/p5-Text-Textile/Makefile b/textproc/p5-Text-Textile/Makefile
index 889e6d98db3a..16ee6e43c642 100644
--- a/textproc/p5-Text-Textile/Makefile
+++ b/textproc/p5-Text-Textile/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Text-Textile
PORTVERSION= 2.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hcoyote@ghostar.org
diff --git a/textproc/p5-Text-Tmpl/Makefile b/textproc/p5-Text-Tmpl/Makefile
index 3cbf4ad4dca4..51838a18532d 100644
--- a/textproc/p5-Text-Tmpl/Makefile
+++ b/textproc/p5-Text-Tmpl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Tmpl
PORTVERSION= 0.30
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-Unaccent/Makefile b/textproc/p5-Text-Unaccent/Makefile
index bb43b03c9b02..84284d5b1138 100644
--- a/textproc/p5-Text-Unaccent/Makefile
+++ b/textproc/p5-Text-Unaccent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Unaccent
PORTVERSION= 1.08
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-Text-VimColor/Makefile b/textproc/p5-Text-VimColor/Makefile
index 973fcaf08999..92be04dfa678 100644
--- a/textproc/p5-Text-VimColor/Makefile
+++ b/textproc/p5-Text-VimColor/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Text-VimColor
PORTVERSION= 0.11
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GE/GEOFFR/
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-WikiFormat/Makefile b/textproc/p5-Text-WikiFormat/Makefile
index f2dd095c1866..2b232acd4141 100644
--- a/textproc/p5-Text-WikiFormat/Makefile
+++ b/textproc/p5-Text-WikiFormat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-WikiFormat
PORTVERSION= 0.79
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= zaa@zaa.pp.ru
diff --git a/textproc/p5-Text-WordDiff/Makefile b/textproc/p5-Text-WordDiff/Makefile
index 375d0c1f84a5..ee5b49924ac8 100644
--- a/textproc/p5-Text-WordDiff/Makefile
+++ b/textproc/p5-Text-WordDiff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-WordDiff
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index 8157c1f9aaf3..deabce72cf65 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Wrapper
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-vCard/Makefile b/textproc/p5-Text-vCard/Makefile
index bc6aa564c559..742f39334b44 100644
--- a/textproc/p5-Text-vCard/Makefile
+++ b/textproc/p5-Text-vCard/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-vCard
PORTVERSION= 2.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/textproc/p5-Time-Human/Makefile b/textproc/p5-Time-Human/Makefile
index d60f304a56d9..77a1d4496ea7 100644
--- a/textproc/p5-Time-Human/Makefile
+++ b/textproc/p5-Time-Human/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Human
PORTVERSION= 1.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= roam@FreeBSD.org
diff --git a/textproc/p5-Tk-XMLViewer/Makefile b/textproc/p5-Tk-XMLViewer/Makefile
index 83b59afe6647..d9915315b1af 100644
--- a/textproc/p5-Tk-XMLViewer/Makefile
+++ b/textproc/p5-Tk-XMLViewer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tk-XMLViewer
PORTVERSION= 0.19
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Tree-Nary/Makefile b/textproc/p5-Tree-Nary/Makefile
index 0f2883699dbd..ab514abb5b99 100644
--- a/textproc/p5-Tree-Nary/Makefile
+++ b/textproc/p5-Tree-Nary/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tree-Nary
PORTVERSION= 1.30
PORTEPOCH= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-1.3
diff --git a/textproc/p5-UML-State/Makefile b/textproc/p5-UML-State/Makefile
index ba9538bddfaf..16caef223223 100644
--- a/textproc/p5-UML-State/Makefile
+++ b/textproc/p5-UML-State/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UML-State
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= UML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-URI-Find/Makefile b/textproc/p5-URI-Find/Makefile
index 40db90b9a542..d7e2b57eedbd 100644
--- a/textproc/p5-URI-Find/Makefile
+++ b/textproc/p5-URI-Find/Makefile
@@ -8,8 +8,7 @@
PORTNAME= URI-Find
PORTVERSION= 0.16
CATEGORIES= textproc net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= URI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Unicode-Normalize/Makefile b/textproc/p5-Unicode-Normalize/Makefile
index 57b4c93986f1..1f4f091c0afb 100644
--- a/textproc/p5-Unicode-Normalize/Makefile
+++ b/textproc/p5-Unicode-Normalize/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Unicode-Normalize
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unicode
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-WDDX/Makefile b/textproc/p5-WDDX/Makefile
index ed15c8691f02..9851382b6615 100644
--- a/textproc/p5-WDDX/Makefile
+++ b/textproc/p5-WDDX/Makefile
@@ -9,7 +9,7 @@ PORTNAME= WDDX
PORTVERSION= 1.02
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/P/PE/PETDANCE
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-WWW-Google-SiteMap/Makefile b/textproc/p5-WWW-Google-SiteMap/Makefile
index 3a3b0b6bf43c..11085d07286a 100644
--- a/textproc/p5-WWW-Google-SiteMap/Makefile
+++ b/textproc/p5-WWW-Google-SiteMap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= WWW-Google-SiteMap
PORTVERSION= 1.09
CATEGORIES= textproc www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= WWW
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= nork@FreeBSD.org
diff --git a/textproc/p5-XML-Atom-Filter/Makefile b/textproc/p5-XML-Atom-Filter/Makefile
index 2763ac069926..c092222b59d9 100644
--- a/textproc/p5-XML-Atom-Filter/Makefile
+++ b/textproc/p5-XML-Atom-Filter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Atom-Filter
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-Atom-SimpleFeed/Makefile b/textproc/p5-XML-Atom-SimpleFeed/Makefile
index a56a7df58375..401d95a59e5e 100644
--- a/textproc/p5-XML-Atom-SimpleFeed/Makefile
+++ b/textproc/p5-XML-Atom-SimpleFeed/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Atom-SimpleFeed
PORTVERSION= 0.8
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-XML-Atom-Stream/Makefile b/textproc/p5-XML-Atom-Stream/Makefile
index 4a3cce25b67e..26edfda2be27 100644
--- a/textproc/p5-XML-Atom-Stream/Makefile
+++ b/textproc/p5-XML-Atom-Stream/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Atom-Stream
PORTVERSION= 0.10
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-XML-AutoWriter/Makefile b/textproc/p5-XML-AutoWriter/Makefile
index 6073f377d859..ddbfd2c4e7bb 100644
--- a/textproc/p5-XML-AutoWriter/Makefile
+++ b/textproc/p5-XML-AutoWriter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-AutoWriter
PORTVERSION= 0.39
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/p5-XML-Catalog/Makefile b/textproc/p5-XML-Catalog/Makefile
index d756f4a543cb..fab3960f7526 100644
--- a/textproc/p5-XML-Catalog/Makefile
+++ b/textproc/p5-XML-Catalog/Makefile
@@ -10,8 +10,7 @@ PORTNAME= XML-Catalog
PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-Clean/Makefile b/textproc/p5-XML-Clean/Makefile
index 5ab92e99757b..c37652d2fff6 100644
--- a/textproc/p5-XML-Clean/Makefile
+++ b/textproc/p5-XML-Clean/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Clean
PORTVERSION= 1.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/textproc/p5-XML-DOM-Lite/Makefile b/textproc/p5-XML-DOM-Lite/Makefile
index 1815c9d41aa0..dc11b2f4b9d7 100644
--- a/textproc/p5-XML-DOM-Lite/Makefile
+++ b/textproc/p5-XML-DOM-Lite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-DOM-Lite
PORTVERSION= 0.15
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-DOM-XPath/Makefile b/textproc/p5-XML-DOM-XPath/Makefile
index 4392bf709511..d35517210ada 100644
--- a/textproc/p5-XML-DOM-XPath/Makefile
+++ b/textproc/p5-XML-DOM-XPath/Makefile
@@ -9,8 +9,7 @@ PORTNAME= XML-DOM-XPath
PORTVERSION= 0.13
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mauricio@arareko.net
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index 2ebcc5cd3f2f..ca25bb219f73 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-DOM
PORTVERSION= 1.44
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/p5-XML-DT/Makefile b/textproc/p5-XML-DT/Makefile
index 1adb3751ac1b..eeeca40960a0 100644
--- a/textproc/p5-XML-DT/Makefile
+++ b/textproc/p5-XML-DT/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-DT
PORTVERSION= 0.47
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-XML-DifferenceMarkup/Makefile b/textproc/p5-XML-DifferenceMarkup/Makefile
index 9ed981be2793..78cd5f22160b 100644
--- a/textproc/p5-XML-DifferenceMarkup/Makefile
+++ b/textproc/p5-XML-DifferenceMarkup/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-DifferenceMarkup
PORTVERSION= 0.11
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Directory/Makefile b/textproc/p5-XML-Directory/Makefile
index eb39f78d4779..a2e009e7cba4 100644
--- a/textproc/p5-XML-Directory/Makefile
+++ b/textproc/p5-XML-Directory/Makefile
@@ -9,8 +9,7 @@ PORTNAME= XML-Directory
PORTVERSION= 1.00
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Driver-HTML/Makefile b/textproc/p5-XML-Driver-HTML/Makefile
index 4e3e9d8f1a90..1d5f1f3e5223 100644
--- a/textproc/p5-XML-Driver-HTML/Makefile
+++ b/textproc/p5-XML-Driver-HTML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Driver-HTML
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Dumper/Makefile b/textproc/p5-XML-Dumper/Makefile
index d400aab265c4..f54b657164a5 100644
--- a/textproc/p5-XML-Dumper/Makefile
+++ b/textproc/p5-XML-Dumper/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Dumper
PORTVERSION= 0.81
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-Encoding/Makefile b/textproc/p5-XML-Encoding/Makefile
index 8250fcef772d..4c519ae807fa 100644
--- a/textproc/p5-XML-Encoding/Makefile
+++ b/textproc/p5-XML-Encoding/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Encoding
PORTVERSION= 2.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-FOAF/Makefile b/textproc/p5-XML-FOAF/Makefile
index 42f18196597d..f198d6eb49db 100644
--- a/textproc/p5-XML-FOAF/Makefile
+++ b/textproc/p5-XML-FOAF/Makefile
@@ -8,7 +8,7 @@
PORTNAME= XML-FOAF
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/B/BT/BTROTT
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-XML-Feed/Makefile b/textproc/p5-XML-Feed/Makefile
index 630b48853da1..bf53a6042137 100644
--- a/textproc/p5-XML-Feed/Makefile
+++ b/textproc/p5-XML-Feed/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Feed
PORTVERSION= 0.12
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-Filter-BufferText/Makefile b/textproc/p5-XML-Filter-BufferText/Makefile
index f949139ca05b..3774e356f423 100644
--- a/textproc/p5-XML-Filter-BufferText/Makefile
+++ b/textproc/p5-XML-Filter-BufferText/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Filter-BufferText
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
index d538ec319ccf..e33fc5b7c924 100644
--- a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
+++ b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Filter-DOMFilter-LibXML
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ahumphrey@realestate.com.au
diff --git a/textproc/p5-XML-Filter-DetectWS/Makefile b/textproc/p5-XML-Filter-DetectWS/Makefile
index b3cb69d56761..dfba503f1f13 100644
--- a/textproc/p5-XML-Filter-DetectWS/Makefile
+++ b/textproc/p5-XML-Filter-DetectWS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Filter-DetectWS
PORTVERSION= 0.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Filter-Reindent/Makefile b/textproc/p5-XML-Filter-Reindent/Makefile
index ecaa7a37be11..443ac3f6a1cf 100644
--- a/textproc/p5-XML-Filter-Reindent/Makefile
+++ b/textproc/p5-XML-Filter-Reindent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Filter-Reindent
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Filter-SAX1toSAX2/Makefile b/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
index 4a46e5d90c4b..679cd0946fa3 100644
--- a/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
+++ b/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Filter-SAX1toSAX2
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Filter-SAXT/Makefile b/textproc/p5-XML-Filter-SAXT/Makefile
index 13579c227de5..e62898e95cc6 100644
--- a/textproc/p5-XML-Filter-SAXT/Makefile
+++ b/textproc/p5-XML-Filter-SAXT/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Filter-SAXT
PORTVERSION= 0.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Filter-XInclude/Makefile b/textproc/p5-XML-Filter-XInclude/Makefile
index a554758d598e..ec6840c6f12b 100644
--- a/textproc/p5-XML-Filter-XInclude/Makefile
+++ b/textproc/p5-XML-Filter-XInclude/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Filter-XInclude
PORTVERSION= 1.0
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Filter-XSLT/Makefile b/textproc/p5-XML-Filter-XSLT/Makefile
index 9dd9abb95ab5..34a4d89d4869 100644
--- a/textproc/p5-XML-Filter-XSLT/Makefile
+++ b/textproc/p5-XML-Filter-XSLT/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Filter-XSLT
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-GDOME/Makefile b/textproc/p5-XML-GDOME/Makefile
index d881cf8a8eeb..a8a36dea56e8 100644
--- a/textproc/p5-XML-GDOME/Makefile
+++ b/textproc/p5-XML-GDOME/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-GDOME
PORTVERSION= 0.86
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= se@FreeBSD.org
diff --git a/textproc/p5-XML-Generator-DBI/Makefile b/textproc/p5-XML-Generator-DBI/Makefile
index 11c18a9e4dc2..194a1a38a98b 100644
--- a/textproc/p5-XML-Generator-DBI/Makefile
+++ b/textproc/p5-XML-Generator-DBI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Generator-DBI
PORTVERSION= 1.00
CATEGORIES= textproc databases perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Grove/Makefile b/textproc/p5-XML-Grove/Makefile
index 9119dea02b56..03ae0593e327 100644
--- a/textproc/p5-XML-Grove/Makefile
+++ b/textproc/p5-XML-Grove/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Grove
PORTVERSION= 0.46.a
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a/alpha/}
diff --git a/textproc/p5-XML-Hadler-HTMLWriter/Makefile b/textproc/p5-XML-Hadler-HTMLWriter/Makefile
index 671e311c6a35..63426cca518a 100644
--- a/textproc/p5-XML-Hadler-HTMLWriter/Makefile
+++ b/textproc/p5-XML-Hadler-HTMLWriter/Makefile
@@ -7,8 +7,7 @@
PORTNAME= XML-Handler-HTMLWriter
PORTVERSION= 2.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-XML-Handler-Dtd2DocBook/Makefile b/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
index f7ea322692ad..a5cd5dfd9f13 100644
--- a/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
+++ b/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Handler-Dtd2DocBook
PORTVERSION= 0.41
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-XML-Handler-Dtd2Html/Makefile b/textproc/p5-XML-Handler-Dtd2Html/Makefile
index 3fbf25882d61..f2161595b6a2 100644
--- a/textproc/p5-XML-Handler-Dtd2Html/Makefile
+++ b/textproc/p5-XML-Handler-Dtd2Html/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Handler-Dtd2Html
PORTVERSION= 0.41
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-XML-Handler-Trees/Makefile b/textproc/p5-XML-Handler-Trees/Makefile
index c918350add75..09bef7eaa16d 100644
--- a/textproc/p5-XML-Handler-Trees/Makefile
+++ b/textproc/p5-XML-Handler-Trees/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Handler-Trees
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Handler-YAWriter/Makefile b/textproc/p5-XML-Handler-YAWriter/Makefile
index e288b4c59973..00ab2af83c62 100644
--- a/textproc/p5-XML-Handler-YAWriter/Makefile
+++ b/textproc/p5-XML-Handler-YAWriter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Handler-YAWriter
PORTVERSION= 0.23
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-LibRSVG/Makefile b/textproc/p5-XML-LibRSVG/Makefile
index 364ac88950f5..50f620a21b37 100644
--- a/textproc/p5-XML-LibRSVG/Makefile
+++ b/textproc/p5-XML-LibRSVG/Makefile
@@ -9,8 +9,7 @@ PORTNAME= XML-LibRSVG
PORTVERSION= 0.01
PORTREVISION= 4
CATEGORIES= textproc graphics perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-LibXML-Common/Makefile b/textproc/p5-XML-LibXML-Common/Makefile
index 05d952ca7e99..093a6632578a 100644
--- a/textproc/p5-XML-LibXML-Common/Makefile
+++ b/textproc/p5-XML-LibXML-Common/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-LibXML-Common
PORTVERSION= 0.13
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
# Feel free to update this port when the CPAN module is updated
diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index adcbbbcacd3c..425db8cbcae0 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-LibXML
PORTVERSION= 1.66000
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/textproc/p5-XML-LibXSLT/Makefile b/textproc/p5-XML-LibXSLT/Makefile
index 787c0f41f304..2e2f52312cc6 100644
--- a/textproc/p5-XML-LibXSLT/Makefile
+++ b/textproc/p5-XML-LibXSLT/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-LibXSLT
PORTVERSION= 1.66
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Liberal/Makefile b/textproc/p5-XML-Liberal/Makefile
index 643efb9d3b04..2998c91fb839 100644
--- a/textproc/p5-XML-Liberal/Makefile
+++ b/textproc/p5-XML-Liberal/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Liberal
PORTVERSION= 0.18
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-Literal/Makefile b/textproc/p5-XML-Literal/Makefile
index 60364d942910..8099e6df78c8 100644
--- a/textproc/p5-XML-Literal/Makefile
+++ b/textproc/p5-XML-Literal/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Literal
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-NamespaceSupport/Makefile b/textproc/p5-XML-NamespaceSupport/Makefile
index 2c77b00653a6..31476bf4d75a 100644
--- a/textproc/p5-XML-NamespaceSupport/Makefile
+++ b/textproc/p5-XML-NamespaceSupport/Makefile
@@ -9,8 +9,7 @@ PORTNAME= XML-NamespaceSupport
PORTVERSION= 1.09
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index 15a6f8027d93..48926db5d087 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Node
PORTVERSION= 0.11
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-OPML/Makefile b/textproc/p5-XML-OPML/Makefile
index 1443f54a4295..cd50c8bfdf18 100644
--- a/textproc/p5-XML-OPML/Makefile
+++ b/textproc/p5-XML-OPML/Makefile
@@ -9,8 +9,7 @@
PORTNAME= XML-OPML
PORTVERSION= 0.26
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/textproc/p5-XML-Parser-EasyTree/Makefile b/textproc/p5-XML-Parser-EasyTree/Makefile
index d1e2336f5659..816f993954e4 100644
--- a/textproc/p5-XML-Parser-EasyTree/Makefile
+++ b/textproc/p5-XML-Parser-EasyTree/Makefile
@@ -9,8 +9,7 @@
PORTNAME= XML-Parser-EasyTree
PORTVERSION= 0.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-Parser-Lite-Tree/Makefile b/textproc/p5-XML-Parser-Lite-Tree/Makefile
index 548f6aebde25..d95c4888e383 100644
--- a/textproc/p5-XML-Parser-Lite-Tree/Makefile
+++ b/textproc/p5-XML-Parser-Lite-Tree/Makefile
@@ -9,8 +9,7 @@
PORTNAME= XML-Parser-Lite-Tree
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-Parser-Style-Elemental/Makefile b/textproc/p5-XML-Parser-Style-Elemental/Makefile
index be913f053358..aef295085411 100644
--- a/textproc/p5-XML-Parser-Style-Elemental/Makefile
+++ b/textproc/p5-XML-Parser-Style-Elemental/Makefile
@@ -7,8 +7,7 @@
PORTNAME= XML-Parser-Style-Elemental
PORTVERSION= 0.50
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-Quote/Makefile b/textproc/p5-XML-Quote/Makefile
index d27611e6487c..482f0dbcd030 100644
--- a/textproc/p5-XML-Quote/Makefile
+++ b/textproc/p5-XML-Quote/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Quote
PORTVERSION= 1.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-RAI/Makefile b/textproc/p5-XML-RAI/Makefile
index edc22d36761d..34ac7e73340c 100644
--- a/textproc/p5-XML-RAI/Makefile
+++ b/textproc/p5-XML-RAI/Makefile
@@ -8,8 +8,7 @@ PORTNAME= XML-RAI
PORTVERSION= 1.30.22
PORTEPOCH= 2
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.([0-9]+)$/\1/}
diff --git a/textproc/p5-XML-RSS-Feed/Makefile b/textproc/p5-XML-RSS-Feed/Makefile
index 9bbe601cf71a..05445d2e1662 100644
--- a/textproc/p5-XML-RSS-Feed/Makefile
+++ b/textproc/p5-XML-RSS-Feed/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-RSS-Feed
PORTVERSION= 2.2.12
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
diff --git a/textproc/p5-XML-RSS-JavaScript/Makefile b/textproc/p5-XML-RSS-JavaScript/Makefile
index 5bda4451a4a7..ee3369d9f3e5 100644
--- a/textproc/p5-XML-RSS-JavaScript/Makefile
+++ b/textproc/p5-XML-RSS-JavaScript/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-RSS-JavaScript
PORTVERSION= 0.62
CATEGORIES= textproc www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-RSS-Liberal/Makefile b/textproc/p5-XML-RSS-Liberal/Makefile
index b872d57790d8..e12515592172 100644
--- a/textproc/p5-XML-RSS-Liberal/Makefile
+++ b/textproc/p5-XML-RSS-Liberal/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-RSS-Liberal
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/p5-XML-RSS-SimpleGen/Makefile b/textproc/p5-XML-RSS-SimpleGen/Makefile
index 635dfbbd1630..80e778943a88 100644
--- a/textproc/p5-XML-RSS-SimpleGen/Makefile
+++ b/textproc/p5-XML-RSS-SimpleGen/Makefile
@@ -9,8 +9,7 @@
PORTNAME= XML-RSS-SimpleGen
PORTVERSION= 11.11
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-RegExp/Makefile b/textproc/p5-XML-RegExp/Makefile
index 463c12fac8f0..f8a780174c67 100644
--- a/textproc/p5-XML-RegExp/Makefile
+++ b/textproc/p5-XML-RegExp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-RegExp
PORTVERSION= 0.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-SAX-Expat/Makefile b/textproc/p5-XML-SAX-Expat/Makefile
index 4862168cbe14..81ab8f95d7fb 100644
--- a/textproc/p5-XML-SAX-Expat/Makefile
+++ b/textproc/p5-XML-SAX-Expat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-SAX-Expat
PORTVERSION= 0.39
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-SAX-ExpatXS/Makefile b/textproc/p5-XML-SAX-ExpatXS/Makefile
index 49ef2858cebc..701a00c5171c 100644
--- a/textproc/p5-XML-SAX-ExpatXS/Makefile
+++ b/textproc/p5-XML-SAX-ExpatXS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-SAX-ExpatXS
PORTVERSION= 1.31
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-SAX-Machines/Makefile b/textproc/p5-XML-SAX-Machines/Makefile
index bfa9c91d0cdf..cad67a2ad5f4 100644
--- a/textproc/p5-XML-SAX-Machines/Makefile
+++ b/textproc/p5-XML-SAX-Machines/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-SAX-Machines
PORTVERSION= 0.41
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-SAX-Simple/Makefile b/textproc/p5-XML-SAX-Simple/Makefile
index cfd3621bfc66..e2be8714ae09 100644
--- a/textproc/p5-XML-SAX-Simple/Makefile
+++ b/textproc/p5-XML-SAX-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-SAX-Simple
PORTVERSION= 0.02
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-SAX-Writer/Makefile b/textproc/p5-XML-SAX-Writer/Makefile
index 724bfe2ffa7e..394a116547ae 100644
--- a/textproc/p5-XML-SAX-Writer/Makefile
+++ b/textproc/p5-XML-SAX-Writer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-SAX-Writer
PORTVERSION= 0.50
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-SAX/Makefile b/textproc/p5-XML-SAX/Makefile
index 9074cd78d1b9..10cd9189526d 100644
--- a/textproc/p5-XML-SAX/Makefile
+++ b/textproc/p5-XML-SAX/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-SAX
PORTVERSION= 0.16
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-SAXDriver-CSV/Makefile b/textproc/p5-XML-SAXDriver-CSV/Makefile
index 213df3bf3c09..974e7feac5c5 100644
--- a/textproc/p5-XML-SAXDriver-CSV/Makefile
+++ b/textproc/p5-XML-SAXDriver-CSV/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-SAXDriver-CSV
PORTVERSION= 0.07
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-XML-SAXDriver-Excel/Makefile b/textproc/p5-XML-SAXDriver-Excel/Makefile
index 4cdd38b906f5..f3cc30cdbf8a 100644
--- a/textproc/p5-XML-SAXDriver-Excel/Makefile
+++ b/textproc/p5-XML-SAXDriver-Excel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-SAXDriver-Excel
PORTVERSION= 0.06
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/p5-XML-SAXDriver-Sablotron/Makefile b/textproc/p5-XML-SAXDriver-Sablotron/Makefile
index c3458042e5d8..1f8ccc67d63c 100644
--- a/textproc/p5-XML-SAXDriver-Sablotron/Makefile
+++ b/textproc/p5-XML-SAXDriver-Sablotron/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-SAXDriver-Sablotron
PORTVERSION= 0.30
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-STX/Makefile b/textproc/p5-XML-STX/Makefile
index a1a4fb753b56..5743853f5251 100644
--- a/textproc/p5-XML-STX/Makefile
+++ b/textproc/p5-XML-STX/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-STX
PORTVERSION= 0.43
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-Schematron/Makefile b/textproc/p5-XML-Schematron/Makefile
index 8e8bd49a0a4d..236c04dc8a04 100644
--- a/textproc/p5-XML-Schematron/Makefile
+++ b/textproc/p5-XML-Schematron/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Schematron
PORTVERSION= 0.98
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-SimpleObject-LibXML/Makefile b/textproc/p5-XML-SimpleObject-LibXML/Makefile
index 235626f4d068..b47a52c02176 100644
--- a/textproc/p5-XML-SimpleObject-LibXML/Makefile
+++ b/textproc/p5-XML-SimpleObject-LibXML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-SimpleObject-LibXML
PORTVERSION= 0.60
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-SimpleObject/Makefile b/textproc/p5-XML-SimpleObject/Makefile
index d0b2c3e66f65..675ca00f312e 100644
--- a/textproc/p5-XML-SimpleObject/Makefile
+++ b/textproc/p5-XML-SimpleObject/Makefile
@@ -9,8 +9,7 @@ PORTNAME= XML-SimpleObject
PORTVERSION= 0.53
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-Stream/Makefile b/textproc/p5-XML-Stream/Makefile
index 8a46145b400c..5f84d2786c23 100644
--- a/textproc/p5-XML-Stream/Makefile
+++ b/textproc/p5-XML-Stream/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Stream
PORTVERSION= 1.22
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/textproc/p5-XML-TreeBuilder/Makefile b/textproc/p5-XML-TreeBuilder/Makefile
index 562a94d92769..b2d1c89675b5 100644
--- a/textproc/p5-XML-TreeBuilder/Makefile
+++ b/textproc/p5-XML-TreeBuilder/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-TreeBuilder
PORTVERSION= 3.09
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-XBEL/Makefile b/textproc/p5-XML-XBEL/Makefile
index df9493d3c633..d26efe52c003 100644
--- a/textproc/p5-XML-XBEL/Makefile
+++ b/textproc/p5-XML-XBEL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-XBEL
PORTVERSION= 1.4
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index 0f0134e0970c..667ccb491a4a 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-XPath
PORTVERSION= 1.13
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index 2421bfb5e10c..1ffea6567439 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-XQL
PORTVERSION= 0.68
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-XSLT/Makefile b/textproc/p5-XML-XSLT/Makefile
index 0ad20a2ea238..54004df9aab9 100644
--- a/textproc/p5-XML-XSLT/Makefile
+++ b/textproc/p5-XML-XSLT/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-XSLT
PORTVERSION= 0.48
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-XUpdate-LibXML/Makefile b/textproc/p5-XML-XUpdate-LibXML/Makefile
index 4bda8eaf8857..a6d0bf5da897 100644
--- a/textproc/p5-XML-XUpdate-LibXML/Makefile
+++ b/textproc/p5-XML-XUpdate-LibXML/Makefile
@@ -9,8 +9,7 @@ PORTNAME= XML-XUpdate-LibXML
PORTVERSION= 0.6.0
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lev@FreeBSD.org
diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile
index 4110bd05c8e0..e401f65eeaf3 100644
--- a/textproc/p5-XML-Xerces/Makefile
+++ b/textproc/p5-XML-Xerces/Makefile
@@ -8,8 +8,7 @@
PORTNAME= XML-Xerces
PORTVERSION= 2.7.0
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= XML-Xerces-${PORTVERSION}-0
diff --git a/textproc/p5-YAML-Syck/Makefile b/textproc/p5-YAML-Syck/Makefile
index 30764dc6cc9a..c20129f8dc36 100644
--- a/textproc/p5-YAML-Syck/Makefile
+++ b/textproc/p5-YAML-Syck/Makefile
@@ -8,8 +8,7 @@
PORTNAME= YAML-Syck
PORTVERSION= 1.01
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= YAML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-YAML/Makefile b/textproc/p5-YAML/Makefile
index 8352a71698e5..b09bd3866484 100644
--- a/textproc/p5-YAML/Makefile
+++ b/textproc/p5-YAML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= YAML
PORTVERSION= 0.66
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= YAML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-YAPE-HTML/Makefile b/textproc/p5-YAPE-HTML/Makefile
index 9262d3f21a48..0e1176032e97 100644
--- a/textproc/p5-YAPE-HTML/Makefile
+++ b/textproc/p5-YAPE-HTML/Makefile
@@ -8,7 +8,7 @@
PORTNAME= YAPE-HTML
PORTVERSION= 1.11
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/P/PI/PINYAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-YAPE-Regex-Explain/Makefile b/textproc/p5-YAPE-Regex-Explain/Makefile
index 37da54da9c33..f9797ea289d4 100644
--- a/textproc/p5-YAPE-Regex-Explain/Makefile
+++ b/textproc/p5-YAPE-Regex-Explain/Makefile
@@ -8,7 +8,7 @@
PORTNAME= YAPE-Regex-Explain
PORTVERSION= 3.011
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/P/PI/PINYAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-YAPE-Regex/Makefile b/textproc/p5-YAPE-Regex/Makefile
index 016ae67c9cc4..cbbfcbee168d 100644
--- a/textproc/p5-YAPE-Regex/Makefile
+++ b/textproc/p5-YAPE-Regex/Makefile
@@ -8,7 +8,7 @@
PORTNAME= YAPE-Regex
PORTVERSION= 3.03
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/P/PI/PINYAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-ack/Makefile b/textproc/p5-ack/Makefile
index 7e94457bff6c..fd0446f210b3 100644
--- a/textproc/p5-ack/Makefile
+++ b/textproc/p5-ack/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ack
PORTVERSION= 1.80
CATEGORIES= textproc perl5 sysutils
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= App
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-dTemplate/Makefile b/textproc/p5-dTemplate/Makefile
index db8644d466cb..1ac5839eea39 100644
--- a/textproc/p5-dTemplate/Makefile
+++ b/textproc/p5-dTemplate/Makefile
@@ -7,8 +7,7 @@
PORTNAME= dTemplate
PORTVERSION= 2.5
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= dTemplate
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-libxml/Makefile b/textproc/p5-libxml/Makefile
index acb9430452b5..d4ec94a438ad 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libxml
PORTVERSION= 0.08
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= XML
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= libxml-perl-${PORTVERSION}
diff --git a/textproc/p5-podlators/Makefile b/textproc/p5-podlators/Makefile
index 918aa5bd33b3..d15cdcbda44b 100644
--- a/textproc/p5-podlators/Makefile
+++ b/textproc/p5-podlators/Makefile
@@ -8,8 +8,7 @@
PORTNAME= podlators
PORTVERSION= 2.0.6
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/sdf/Makefile b/textproc/sdf/Makefile
index fda64b7c4f8e..9ebb57714f6e 100644
--- a/textproc/sdf/Makefile
+++ b/textproc/sdf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sdf
PORTVERSION= 2.001
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
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
@@ -8,8 +8,7 @@
PORTNAME= WebService-NoPaste
PORTVERSION= 0.03
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= WebService
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/www/p5-WebService-Technorati/Makefile b/www/p5-WebService-Technorati/Makefile
index 0912a8747bf1..2ef5e83a5033 100644
--- a/www/p5-WebService-Technorati/Makefile
+++ b/www/p5-WebService-Technorati/Makefile
@@ -9,8 +9,7 @@
PORTNAME= WebService-Technorati
PORTVERSION= 0.04
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= WebService
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/www/p5-Xango/Makefile b/www/p5-Xango/Makefile
index a9684f7cb40c..7675a01128ed 100644
--- a/www/p5-Xango/Makefile
+++ b/www/p5-Xango/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Xango
PORTVERSION= 1.08
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-Yahoo-Lifestyle/Makefile b/www/p5-Yahoo-Lifestyle/Makefile
index 6def14ffb2f4..675fdea80a49 100644
--- a/www/p5-Yahoo-Lifestyle/Makefile
+++ b/www/p5-Yahoo-Lifestyle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Yahoo-Lifestyle
PORTVERSION= 0.2
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Yahoo
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hcchien@hcchien.org
diff --git a/www/p5-Yahoo-Search/Makefile b/www/p5-Yahoo-Search/Makefile
index 4e3b7ca36d12..9d0c24f52ec0 100644
--- a/www/p5-Yahoo-Search/Makefile
+++ b/www/p5-Yahoo-Search/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Yahoo-Search
PORTVERSION= 1.10.13
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Yahoo
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/www/p5-chklinks/Makefile b/www/p5-chklinks/Makefile
index 3289518499a8..d18d12d48ca1 100644
--- a/www/p5-chklinks/Makefile
+++ b/www/p5-chklinks/Makefile
@@ -8,7 +8,7 @@
PORTNAME= chklinks
PORTVERSION= 3.09
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Locale/IMACAT
PKGNAMEPREFIX= p5-
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index 53140656b1cc..a99415c2d825 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libapreq
PORTVERSION= 1.33
CATEGORIES= www perl5 devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 9d26c285675c..8146bfa86f42 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libwww
PORTVERSION= 5.805
CATEGORIES= www perl5 devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= LWP
PKGNAMEPREFIX= p5-
DISTNAME= libwww-perl-${PORTVERSION}
diff --git a/www/p5-webservice-validator-css-w3c/Makefile b/www/p5-webservice-validator-css-w3c/Makefile
index b7ef59b9c1ca..596ec6ca5db2 100644
--- a/www/p5-webservice-validator-css-w3c/Makefile
+++ b/www/p5-webservice-validator-css-w3c/Makefile
@@ -8,8 +8,7 @@
PORTNAME= WebService-Validator-CSS-W3C
PORTVERSION= 0.2
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= WebService
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= toni.viemero@iki.fi
diff --git a/www/p5-webservice-validator-html-w3c/Makefile b/www/p5-webservice-validator-html-w3c/Makefile
index f3240b1ad69e..89709968ff86 100644
--- a/www/p5-webservice-validator-html-w3c/Makefile
+++ b/www/p5-webservice-validator-html-w3c/Makefile
@@ -8,8 +8,7 @@
PORTNAME= WebService-Validator-HTML-W3C
PORTVERSION= 0.22
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= WebService
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= toni.viemero@iki.fi
diff --git a/www/weblint++/Makefile b/www/weblint++/Makefile
index 429e4e1113b3..cdee892c4157 100644
--- a/www/weblint++/Makefile
+++ b/www/weblint++/Makefile
@@ -8,7 +8,7 @@
PORTNAME= weblint++
PORTVERSION= 1.14
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR=../../authors/id/B/BD/BDFOY
MAINTAINER= aaron@FreeBSD.org
diff --git a/www/weblint/Makefile b/www/weblint/Makefile
index 721d98a25eb6..ea87aa0000e9 100644
--- a/www/weblint/Makefile
+++ b/www/weblint/Makefile
@@ -8,7 +8,7 @@
PORTNAME= weblint
PORTVERSION= 1.020
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR=../../authors/id/NEILB
MAINTAINER= dinoex@FreeBSD.org
diff --git a/x11-fonts/p5-Font-AFM/Makefile b/x11-fonts/p5-Font-AFM/Makefile
index 409cdea2d02a..f94265917b3b 100644
--- a/x11-fonts/p5-Font-AFM/Makefile
+++ b/x11-fonts/p5-Font-AFM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Font-AFM
PORTVERSION= 1.19
CATEGORIES= x11-fonts perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Font
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/x11-fonts/p5-Font-TTF/Makefile b/x11-fonts/p5-Font-TTF/Makefile
index 04656242175d..d99884c8175d 100644
--- a/x11-fonts/p5-Font-TTF/Makefile
+++ b/x11-fonts/p5-Font-TTF/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Font-TTF
PORTVERSION= 0.43
CATEGORIES= x11-fonts perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Font
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/x11-fonts/p5-Font-TTFMetrics/Makefile b/x11-fonts/p5-Font-TTFMetrics/Makefile
index e6f2ca542493..ab84a3df6168 100644
--- a/x11-fonts/p5-Font-TTFMetrics/Makefile
+++ b/x11-fonts/p5-Font-TTFMetrics/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Font-TTFMetrics
PORTVERSION= 0.1
CATEGORIES= x11-fonts perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Font
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/x11-toolkits/p5-GdkImlib/Makefile b/x11-toolkits/p5-GdkImlib/Makefile
index 3d045425e6d9..198ab5480106 100644
--- a/x11-toolkits/p5-GdkImlib/Makefile
+++ b/x11-toolkits/p5-GdkImlib/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GdkImlib
PORTVERSION= 0.7009
PORTREVISION= 3
CATEGORIES= x11-toolkits lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Gtk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
diff --git a/x11-toolkits/p5-GdkPixbuf/Makefile b/x11-toolkits/p5-GdkPixbuf/Makefile
index 04ad53fd9064..d1c76caed152 100644
--- a/x11-toolkits/p5-GdkPixbuf/Makefile
+++ b/x11-toolkits/p5-GdkPixbuf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GdkPixbuf
PORTVERSION= 0.7009
PORTREVISION= 4
CATEGORIES= x11-toolkits lang perl5 gnome
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Gtk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile
index 0e67b753c87d..c4cc0d3fd684 100644
--- a/x11-toolkits/p5-Glade2/Makefile
+++ b/x11-toolkits/p5-Glade2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Glade
PORTVERSION= 1.006
PORTREVISION= 1
CATEGORIES= x11-toolkits gnome perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TS/TSCH/
PKGNAMEPREFIX= p5-
PKGNAMESUFFIX= 2
diff --git a/x11-toolkits/p5-Gnome/Makefile b/x11-toolkits/p5-Gnome/Makefile
index 667bf3f26078..7c62bcf27f14 100644
--- a/x11-toolkits/p5-Gnome/Makefile
+++ b/x11-toolkits/p5-Gnome/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Gnome
PORTVERSION= 0.7009
PORTREVISION= 3
CATEGORIES= x11-toolkits lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Gtk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index beef0803d26c..6a9e04b929bd 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Gtk
PORTVERSION= 0.7009
PORTREVISION= 3
CATEGORIES= x11-toolkits lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Gtk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-Perl-${PORTVERSION}
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
index 96b1acc80aff..c9f3c7d47525 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gtk2-TrayIcon
PORTVERSION= 0.06
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/B/BO/BORUP
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-GtkXmHTML/Makefile b/x11-toolkits/p5-GtkXmHTML/Makefile
index d898289c9ed7..bca28f48e4bb 100644
--- a/x11-toolkits/p5-GtkXmHTML/Makefile
+++ b/x11-toolkits/p5-GtkXmHTML/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GtkXmHTML
PORTVERSION= 0.7009
PORTREVISION= 3
CATEGORIES= x11-toolkits lang perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Gtk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index fd1c28e67011..261193eda4a5 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Prima
PORTVERSION= 1.22
CATEGORIES= x11-toolkits perl5 graphics
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Prima
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= dmitry@karasik.eu.org
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index 9de2fdcc7a5f..10a4437ed883 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tcl-Tk
PORTVERSION= 0.97
CATEGORIES= x11-toolkits lang perl5 tk
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tcl
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index 4b897f62f4fa..03a8394815d5 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= TclTk
PORTVERSION= 0.75
PORTREVISION= 1
CATEGORIES= x11-toolkits lang perl5 tk
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Tcl
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile
index 7cf9fa86f961..6ff74ba67d11 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/Makefile
+++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tk-Autoscroll
PORTVERSION= 1.14
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile
index 009514d6db0c..b10f4f13ea26 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/Makefile
+++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tk-ColourChooser
PORTVERSION= 1.52
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile
index 20563a54b39b..ed53cd8281fc 100644
--- a/x11-toolkits/p5-Tk-Date/Makefile
+++ b/x11-toolkits/p5-Tk-Date/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tk-Date
PORTVERSION= 0.42
PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile
index 5555662a2868..aad3d63c2cc7 100644
--- a/x11-toolkits/p5-Tk-Enscript/Makefile
+++ b/x11-toolkits/p5-Tk-Enscript/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tk-Enscript
PORTVERSION= 1.10
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile
index 00ce3fa4addf..d01757e0a599 100644
--- a/x11-toolkits/p5-Tk-FileDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FileDialog/Makefile
@@ -8,8 +8,7 @@ PORTNAME= Tk-FileDialog
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
MAINTAINER= minter@lunenburg.org
COMMENT= Tk::FileDialog - A file selector dialog for perl/Tk
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index 43ee9f39933d..bdb0ee28eab7 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tk-GBARR
PORTVERSION= 2.07
PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index 21783c3ce747..f4563ea0bfd2 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tk-Getopt
PORTVERSION= 0.49
PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile
index 4c8934634a5c..15f68d4a7927 100644
--- a/x11-toolkits/p5-Tk-HistEntry/Makefile
+++ b/x11-toolkits/p5-Tk-HistEntry/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tk-HistEntry
PORTVERSION= 0.43
PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-ResizeButton/Makefile b/x11-toolkits/p5-Tk-ResizeButton/Makefile
index 9859596b8486..82d505427909 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/Makefile
+++ b/x11-toolkits/p5-Tk-ResizeButton/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tk-ResizeButton
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-Splashscreen/Makefile b/x11-toolkits/p5-Tk-Splashscreen/Makefile
index 22d8510c4107..942e885a3ed9 100644
--- a/x11-toolkits/p5-Tk-Splashscreen/Makefile
+++ b/x11-toolkits/p5-Tk-Splashscreen/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tk-Splashscreen
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile
index 6ab2fcac5254..2fe2ac550fae 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/Makefile
+++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tk-TableMatrix
PORTVERSION= 1.23
PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index b5aabb99eb69..66362ddec61f 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tk
PORTVERSION= 804.027
PORTREVISION= 2
CATEGORIES= x11-toolkits tk perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= yinjieh@csie.nctu.edu.tw
diff --git a/x11/p5-Clipboard/Makefile b/x11/p5-Clipboard/Makefile
index 2eee71ee9f79..b3f54067fc15 100644
--- a/x11/p5-Clipboard/Makefile
+++ b/x11/p5-Clipboard/Makefile
@@ -9,8 +9,8 @@ PORTNAME= Clipboard
PORTVERSION= 0.09
PORTREVISION= 1
CATEGORIES= x11 perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/K/KI/KING
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../../authors/id/K/KI/KING
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile
index 4f2f9eb2dfc5..a23175ea708f 100644
--- a/x11/p5-X11-IdleTime/Makefile
+++ b/x11/p5-X11-IdleTime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= X11-IdleTime
PORTVERSION= 0.5
CATEGORIES= x11 perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= X11
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/x11/p5-X11-Protocol/Makefile b/x11/p5-X11-Protocol/Makefile
index 7fc4c88b7b2d..458c125f8f22 100644
--- a/x11/p5-X11-Protocol/Makefile
+++ b/x11/p5-X11-Protocol/Makefile
@@ -8,8 +8,7 @@
PORTNAME= X11-Protocol
PORTVERSION= 0.56
CATEGORIES= x11 perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= X11
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= yinjieh@csie.nctu.edu.tw