summaryrefslogtreecommitdiff
path: root/textproc
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 /textproc
parentUpdate to version 3.1.7. (diff)
- Take advantage of CPAN macro from bsd.sites.mk, change ${MASTER_SITE_PERL_CPAN} to CPAN.
PR: ports/122674 Submitted by: Philip M. Gollucci <pgollucci@p6m7g8.com> Reworked by: araujo (myself) Approved by: portmgr (pav)
Notes
Notes: svn path=/head/; revision=211450
Diffstat (limited to 'textproc')
-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
312 files changed, 312 insertions, 576 deletions
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