aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/p5-AI-Categorizer/Makefile4
-rw-r--r--textproc/p5-BibTeX-Parser/Makefile4
-rw-r--r--textproc/p5-CAM-PDF/Makefile4
-rw-r--r--textproc/p5-CQL-Parser/Makefile4
-rw-r--r--textproc/p5-CSS-Croco/Makefile4
-rw-r--r--textproc/p5-CSS-Packer/Makefile4
-rw-r--r--textproc/p5-CSS-SAC/Makefile4
-rw-r--r--textproc/p5-Class-CSV/Makefile4
-rw-r--r--textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile4
-rw-r--r--textproc/p5-Data-FormValidator/Makefile4
-rw-r--r--textproc/p5-Data-Phrasebook-Loader-YAML/Makefile4
-rw-r--r--textproc/p5-Data-Phrasebook/Makefile4
-rw-r--r--textproc/p5-Data-SpreadPagination/Makefile4
-rw-r--r--textproc/p5-Dev-Bollocks/Makefile4
-rw-r--r--textproc/p5-Devel-TraceSAX/Makefile4
-rw-r--r--textproc/p5-DocSet/Makefile4
-rw-r--r--textproc/p5-Excel-Template/Makefile4
-rw-r--r--textproc/p5-Excel-Writer-XLSX/Makefile4
-rw-r--r--textproc/p5-FormValidator-Lite/Makefile4
-rw-r--r--textproc/p5-Geo-Parse-OSM/Makefile4
-rw-r--r--textproc/p5-Google-Data-JSON/Makefile4
-rw-r--r--textproc/p5-HTML-Entities-Interpolate/Makefile4
-rw-r--r--textproc/p5-HTML-EscapeEvil/Makefile4
-rw-r--r--textproc/p5-HTML-Format/Makefile4
-rw-r--r--textproc/p5-HTML-FormatExternal/Makefile4
-rw-r--r--textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile4
-rw-r--r--textproc/p5-HTML-FormatText-WithLinks/Makefile4
-rw-r--r--textproc/p5-HTML-HTML5-Parser/Makefile4
-rw-r--r--textproc/p5-HTML-HTMLDoc/Makefile4
-rw-r--r--textproc/p5-HTML-Packer/Makefile4
-rw-r--r--textproc/p5-HTML-QRCode/Makefile4
-rw-r--r--textproc/p5-HTML-Quoted/Makefile4
-rw-r--r--textproc/p5-HTML-RewriteAttributes/Makefile4
-rw-r--r--textproc/p5-HTML-SBC/Makefile4
-rw-r--r--textproc/p5-HTML-TagFilter/Makefile4
-rw-r--r--textproc/p5-HTML-Tidy/Makefile4
-rw-r--r--textproc/p5-HTML-Truncate/Makefile4
-rw-r--r--textproc/p5-Hailo/Makefile4
-rw-r--r--textproc/p5-Hash-Merge/Makefile4
-rw-r--r--textproc/p5-IO-CSVHeaderFile/Makefile4
-rw-r--r--textproc/p5-JavaScript-Packer/Makefile4
-rw-r--r--textproc/p5-KinoSearch1/Makefile4
-rw-r--r--textproc/p5-LaTeX-Driver/Makefile4
-rw-r--r--textproc/p5-LaTeX-Encode/Makefile4
-rw-r--r--textproc/p5-LaTeX-Pod/Makefile4
-rw-r--r--textproc/p5-LaTeX-Table/Makefile4
-rw-r--r--textproc/p5-Lingua-EN-AddressParse/Makefile4
-rw-r--r--textproc/p5-Lingua-EN-FindNumber/Makefile4
-rw-r--r--textproc/p5-Lingua-EN-Infinitive/Makefile4
-rw-r--r--textproc/p5-Lingua-EN-Inflect-Number/Makefile4
-rw-r--r--textproc/p5-Lingua-EN-MatchNames/Makefile4
-rw-r--r--textproc/p5-Lingua-EN-NamedEntity/Makefile4
-rw-r--r--textproc/p5-Lingua-EN-Numbers-Easy/Makefile4
-rw-r--r--textproc/p5-Lingua-EN-Summarize/Makefile4
-rw-r--r--textproc/p5-Lingua-Identify/Makefile4
-rw-r--r--textproc/p5-Lingua-Ispell/Makefile4
-rw-r--r--textproc/p5-Lingua-Preferred/Makefile4
-rw-r--r--textproc/p5-Lingua-Stem/Makefile4
-rw-r--r--textproc/p5-MARC-Charset/Makefile4
-rw-r--r--textproc/p5-MARC-Lint/Makefile4
-rw-r--r--textproc/p5-MARC-XML/Makefile4
-rw-r--r--textproc/p5-Makefile-DOM/Makefile4
-rw-r--r--textproc/p5-Makefile-Parser/Makefile4
-rw-r--r--textproc/p5-Markapl/Makefile4
-rw-r--r--textproc/p5-Marpa-HTML/Makefile4
-rw-r--r--textproc/p5-Net-YASA/Makefile4
-rw-r--r--textproc/p5-NetAddr-IP-Find/Makefile4
-rw-r--r--textproc/p5-ODF-lpOD/Makefile4
-rw-r--r--textproc/p5-PDF-API2-Simple/Makefile4
-rw-r--r--textproc/p5-PDF-API2/Makefile4
-rw-r--r--textproc/p5-PDF-FromHTML/Makefile4
-rw-r--r--textproc/p5-PDF-Table/Makefile4
-rw-r--r--textproc/p5-POE-Filter-XML/Makefile4
-rw-r--r--textproc/p5-PPI-HTML/Makefile4
-rw-r--r--textproc/p5-PPI-XS/Makefile4
-rw-r--r--textproc/p5-PPI/Makefile4
-rw-r--r--textproc/p5-PPIx-EditorTools/Makefile4
-rw-r--r--textproc/p5-PPIx-QuoteLike/Makefile4
-rw-r--r--textproc/p5-PPIx-Regexp/Makefile4
-rw-r--r--textproc/p5-Parse-BooleanLogic/Makefile4
-rw-r--r--textproc/p5-Parse-CSV/Makefile4
-rw-r--r--textproc/p5-Perl-Critic-Bangs/Makefile4
-rw-r--r--textproc/p5-Perl-Critic-Itch/Makefile4
-rw-r--r--textproc/p5-Perl-Critic-Moose/Makefile4
-rw-r--r--textproc/p5-Perl-Critic-More/Makefile4
-rw-r--r--textproc/p5-Perl-Critic-Pulp/Makefile4
-rw-r--r--textproc/p5-Perl-Critic-Swift/Makefile4
-rw-r--r--textproc/p5-Perl-Critic-Tics/Makefile4
-rw-r--r--textproc/p5-Perl-Critic/Makefile4
-rw-r--r--textproc/p5-Perl-Lint/Makefile4
-rw-r--r--textproc/p5-Perl-MinimumVersion/Makefile4
-rw-r--r--textproc/p5-PerlPoint-Converters/Makefile4
-rw-r--r--textproc/p5-PerlPoint-Package/Makefile4
-rw-r--r--textproc/p5-Petal-CodePerl/Makefile4
-rw-r--r--textproc/p5-Petal-Mail/Makefile4
-rw-r--r--textproc/p5-Petal-Utils/Makefile4
-rw-r--r--textproc/p5-Petal/Makefile4
-rw-r--r--textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile4
-rw-r--r--textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile4
-rw-r--r--textproc/p5-Plucene-Simple/Makefile4
-rw-r--r--textproc/p5-Plucene/Makefile4
-rw-r--r--textproc/p5-Pod-Abstract/Makefile4
-rw-r--r--textproc/p5-Pod-Autopod/Makefile4
-rw-r--r--textproc/p5-Pod-DocBook/Makefile4
-rw-r--r--textproc/p5-Pod-Elemental/Makefile4
-rw-r--r--textproc/p5-Pod-Eventual/Makefile4
-rw-r--r--textproc/p5-Pod-HtmlEasy/Makefile4
-rw-r--r--textproc/p5-Pod-MinimumVersion/Makefile4
-rw-r--r--textproc/p5-Pod-POM-View-HTML-Filter/Makefile4
-rw-r--r--textproc/p5-Pod-Readme/Makefile4
-rw-r--r--textproc/p5-Pod-Spell/Makefile6
-rw-r--r--textproc/p5-Pod-WSDL/Makefile4
-rw-r--r--textproc/p5-Pod-WikiDoc/Makefile4
-rw-r--r--textproc/p5-Pod-XML/Makefile4
-rw-r--r--textproc/p5-Pod-Xhtml/Makefile4
-rw-r--r--textproc/p5-RADIUS-UserFile/Makefile4
-rw-r--r--textproc/p5-RDF-Core/Makefile4
-rw-r--r--textproc/p5-RDF-Notation3/Makefile4
-rw-r--r--textproc/p5-RDF-Query/Makefile4
-rw-r--r--textproc/p5-RDF-Simple/Makefile4
-rw-r--r--textproc/p5-RDF-Trine/Makefile4
-rw-r--r--textproc/p5-RDFStore/Makefile4
-rw-r--r--textproc/p5-RTF-Parser/Makefile4
-rw-r--r--textproc/p5-RTF-Writer/Makefile4
-rw-r--r--textproc/p5-Regexp-Common-Email-Address/Makefile4
-rw-r--r--textproc/p5-Regexp-Common-net-CIDR/Makefile4
-rw-r--r--textproc/p5-Regexp-Common-profanity_us/Makefile4
-rw-r--r--textproc/p5-Regexp-Common-time/Makefile4
-rw-r--r--textproc/p5-SGML-DTDParse/Makefile4
-rw-r--r--textproc/p5-SGML-Parser-OpenSP/Makefile4
-rw-r--r--textproc/p5-SVG-Parser/Makefile4
-rw-r--r--textproc/p5-Search-Elasticsearch-Client-0_90/Makefile4
-rw-r--r--textproc/p5-Search-Elasticsearch-Client-1_0/Makefile4
-rw-r--r--textproc/p5-Search-Elasticsearch-Client-2_0/Makefile4
-rw-r--r--textproc/p5-Search-Elasticsearch/Makefile4
-rw-r--r--textproc/p5-Search-Estraier/Makefile4
-rw-r--r--textproc/p5-Search-QueryParser-SQL/Makefile4
-rw-r--r--textproc/p5-Search-VectorSpace/Makefile4
-rw-r--r--textproc/p5-Senna/Makefile4
-rw-r--r--textproc/p5-Solr/Makefile4
-rw-r--r--textproc/p5-Sphinx-Config/Makefile4
-rw-r--r--textproc/p5-Sphinx-Manager/Makefile4
-rw-r--r--textproc/p5-Sphinx-Search/Makefile4
-rw-r--r--textproc/p5-Spreadsheet-ParseExcel/Makefile4
-rw-r--r--textproc/p5-Spreadsheet-Read/Makefile4
-rw-r--r--textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile4
-rw-r--r--textproc/p5-Spreadsheet-WriteExcel/Makefile4
-rw-r--r--textproc/p5-Spreadsheet-XLSX/Makefile4
-rw-r--r--textproc/p5-String-Flogger/Makefile4
-rw-r--r--textproc/p5-String-Fraction/Makefile4
-rw-r--r--textproc/p5-String-Koremutake/Makefile4
-rw-r--r--textproc/p5-String-Print/Makefile4
-rw-r--r--textproc/p5-String-ShowDiff/Makefile4
-rw-r--r--textproc/p5-String-ToIdentifier-EN/Makefile4
-rw-r--r--textproc/p5-TOML-Parser/Makefile4
-rw-r--r--textproc/p5-TOML/Makefile4
-rw-r--r--textproc/p5-TeX-Encode/Makefile4
-rw-r--r--textproc/p5-Template-Extract/Makefile4
-rw-r--r--textproc/p5-Template-Magic/Makefile4
-rw-r--r--textproc/p5-Template-Plugin-CSV/Makefile4
-rw-r--r--textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile4
-rw-r--r--textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile4
-rw-r--r--textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile4
-rw-r--r--textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile4
-rw-r--r--textproc/p5-Template-Plugin-HTML-SuperForm/Makefile4
-rw-r--r--textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile4
-rw-r--r--textproc/p5-Template-Plugin-XML-Escape/Makefile4
-rw-r--r--textproc/p5-Term-QRCode/Makefile4
-rw-r--r--textproc/p5-Test-Perl-Critic/Makefile4
-rw-r--r--textproc/p5-Text-Aligner/Makefile4
-rw-r--r--textproc/p5-Text-Autoformat/Makefile4
-rw-r--r--textproc/p5-Text-CSV-Encoded/Makefile4
-rw-r--r--textproc/p5-Text-CSV-Hashify/Makefile4
-rw-r--r--textproc/p5-Text-CSV-Simple/Makefile4
-rw-r--r--textproc/p5-Text-Colorizer/Makefile4
-rw-r--r--textproc/p5-Text-Context/Makefile4
-rw-r--r--textproc/p5-Text-Decorator/Makefile4
-rw-r--r--textproc/p5-Text-Diff-HTML/Makefile4
-rw-r--r--textproc/p5-Text-Emoticon-GoogleTalk/Makefile4
-rw-r--r--textproc/p5-Text-Emoticon-MSN/Makefile4
-rw-r--r--textproc/p5-Text-Emoticon/Makefile4
-rw-r--r--textproc/p5-Text-EtText/Makefile4
-rw-r--r--textproc/p5-Text-Extract-Word/Makefile4
-rw-r--r--textproc/p5-Text-FixedLength-Extra/Makefile4
-rw-r--r--textproc/p5-Text-Flow/Makefile4
-rw-r--r--textproc/p5-Text-Graphics/Makefile4
-rw-r--r--textproc/p5-Text-Haml/Makefile4
-rw-r--r--textproc/p5-Text-Hatena/Makefile4
-rw-r--r--textproc/p5-Text-Language-Guess/Makefile4
-rw-r--r--textproc/p5-Text-Markdown/Makefile4
-rw-r--r--textproc/p5-Text-MultiMarkdown/Makefile4
-rw-r--r--textproc/p5-Text-Ngram/Makefile4
-rw-r--r--textproc/p5-Text-Padding/Makefile4
-rw-r--r--textproc/p5-Text-ParagraphDiff/Makefile4
-rw-r--r--textproc/p5-Text-Prefix-XS/Makefile4
-rw-r--r--textproc/p5-Text-Quote/Makefile4
-rw-r--r--textproc/p5-Text-RecordParser/Makefile4
-rw-r--r--textproc/p5-Text-Table-Manifold/Makefile4
-rw-r--r--textproc/p5-Text-TestBase/Makefile4
-rw-r--r--textproc/p5-Text-Trac/Makefile4
-rw-r--r--textproc/p5-Text-WikiFormat/Makefile4
-rw-r--r--textproc/p5-Text-WordDiff/Makefile4
-rw-r--r--textproc/p5-Text-WrapI18N/Makefile4
-rw-r--r--textproc/p5-Text-vCard/Makefile4
-rw-r--r--textproc/p5-Tk-Pod/Makefile4
-rw-r--r--textproc/p5-Tk-XMLViewer/Makefile4
-rw-r--r--textproc/p5-UML-Class-Simple/Makefile4
-rw-r--r--textproc/p5-UML-Sequence/Makefile4
-rw-r--r--textproc/p5-UML-State/Makefile4
-rw-r--r--textproc/p5-URI-Find/Makefile4
-rw-r--r--textproc/p5-Unicode-Escape/Makefile4
-rw-r--r--textproc/p5-Unicode-LineBreak/Makefile4
-rw-r--r--textproc/p5-Validator-Custom/Makefile4
-rw-r--r--textproc/p5-Version-Next/Makefile4
-rw-r--r--textproc/p5-Vroom/Makefile4
-rw-r--r--textproc/p5-WDDX/Makefile4
-rw-r--r--textproc/p5-WWW-Google-SiteMap/Makefile4
-rw-r--r--textproc/p5-WordNet-Similarity/Makefile4
-rw-r--r--textproc/p5-XML-Atom-Ext-OpenSearch/Makefile4
-rw-r--r--textproc/p5-XML-Atom-Filter/Makefile4
-rw-r--r--textproc/p5-XML-Atom-Stream/Makefile4
-rw-r--r--textproc/p5-XML-Atom-Syndication/Makefile4
-rw-r--r--textproc/p5-XML-Atom/Makefile4
-rw-r--r--textproc/p5-XML-Canonical/Makefile4
-rw-r--r--textproc/p5-XML-Catalog/Makefile4
-rw-r--r--textproc/p5-XML-CommonNS/Makefile4
-rw-r--r--textproc/p5-XML-Compile-Cache/Makefile4
-rw-r--r--textproc/p5-XML-Compile-Dumper/Makefile4
-rw-r--r--textproc/p5-XML-Compile/Makefile4
-rw-r--r--textproc/p5-XML-DBMS/Makefile4
-rw-r--r--textproc/p5-XML-DOM-XPath/Makefile4
-rw-r--r--textproc/p5-XML-DOM2/Makefile4
-rw-r--r--textproc/p5-XML-DT/Makefile4
-rw-r--r--textproc/p5-XML-Declare/Makefile4
-rw-r--r--textproc/p5-XML-DifferenceMarkup/Makefile4
-rw-r--r--textproc/p5-XML-Directory/Makefile4
-rw-r--r--textproc/p5-XML-Driver-HTML/Makefile4
-rw-r--r--textproc/p5-XML-Dumper/Makefile4
-rw-r--r--textproc/p5-XML-Elemental/Makefile4
-rw-r--r--textproc/p5-XML-Encoding/Makefile4
-rw-r--r--textproc/p5-XML-Entities/Makefile4
-rw-r--r--textproc/p5-XML-Feed/Makefile4
-rw-r--r--textproc/p5-XML-FeedPP/Makefile4
-rw-r--r--textproc/p5-XML-Filter-BufferText/Makefile4
-rw-r--r--textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile4
-rw-r--r--textproc/p5-XML-Filter-DetectWS/Makefile4
-rw-r--r--textproc/p5-XML-Filter-GenericChunk/Makefile4
-rw-r--r--textproc/p5-XML-Filter-Reindent/Makefile4
-rw-r--r--textproc/p5-XML-Filter-SAX1toSAX2/Makefile4
-rw-r--r--textproc/p5-XML-Filter-XInclude/Makefile4
-rw-r--r--textproc/p5-XML-Filter-XSLT/Makefile4
-rw-r--r--textproc/p5-XML-Flow/Makefile4
-rw-r--r--textproc/p5-XML-GDOME/Makefile4
-rw-r--r--textproc/p5-XML-Generator-DBI/Makefile4
-rw-r--r--textproc/p5-XML-Generator-PerlData/Makefile4
-rw-r--r--textproc/p5-XML-Grove/Makefile4
-rw-r--r--textproc/p5-XML-Handler-Dtd2DocBook/Makefile4
-rw-r--r--textproc/p5-XML-Handler-Dtd2Html/Makefile4
-rw-r--r--textproc/p5-XML-Handler-HTMLWriter/Makefile4
-rw-r--r--textproc/p5-XML-Handler-YAWriter/Makefile4
-rw-r--r--textproc/p5-XML-Hash-LX/Makefile4
-rw-r--r--textproc/p5-XML-LibXML-Cache/Makefile4
-rw-r--r--textproc/p5-XML-LibXML-Iterator/Makefile4
-rw-r--r--textproc/p5-XML-LibXML-PrettyPrint/Makefile4
-rw-r--r--textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile4
-rw-r--r--textproc/p5-XML-LibXML-Simple/Makefile4
-rw-r--r--textproc/p5-XML-LibXML/Makefile4
-rw-r--r--textproc/p5-XML-LibXSLT/Makefile4
-rw-r--r--textproc/p5-XML-Liberal/Makefile4
-rw-r--r--textproc/p5-XML-Literal/Makefile4
-rw-r--r--textproc/p5-XML-Node/Makefile4
-rw-r--r--textproc/p5-XML-NodeFilter/Makefile4
-rw-r--r--textproc/p5-XML-OPML/Makefile4
-rw-r--r--textproc/p5-XML-Parser-EasyTree/Makefile4
-rw-r--r--textproc/p5-XML-Parser-Style-EasyTree/Makefile4
-rw-r--r--textproc/p5-XML-RAI/Makefile4
-rw-r--r--textproc/p5-XML-RSS-Feed/Makefile4
-rw-r--r--textproc/p5-XML-RSS-LibXML/Makefile4
-rw-r--r--textproc/p5-XML-RSS-Liberal/Makefile4
-rw-r--r--textproc/p5-XML-Reader/Makefile4
-rw-r--r--textproc/p5-XML-SAX-ExpatXS/Makefile4
-rw-r--r--textproc/p5-XML-SAX-Machines/Makefile4
-rw-r--r--textproc/p5-XML-SAX-Simple/Makefile4
-rw-r--r--textproc/p5-XML-SAX-Writer/Makefile4
-rw-r--r--textproc/p5-XML-SAX/Makefile4
-rw-r--r--textproc/p5-XML-SAXDriver-CSV/Makefile4
-rw-r--r--textproc/p5-XML-SAXDriver-Excel/Makefile4
-rw-r--r--textproc/p5-XML-STX/Makefile4
-rw-r--r--textproc/p5-XML-Schematron/Makefile4
-rw-r--r--textproc/p5-XML-SemanticDiff/Makefile4
-rw-r--r--textproc/p5-XML-Simple/Makefile4
-rw-r--r--textproc/p5-XML-SimpleObject/Makefile4
-rw-r--r--textproc/p5-XML-Smart/Makefile4
-rw-r--r--textproc/p5-XML-Stream/Makefile4
-rw-r--r--textproc/p5-XML-TokeParser/Makefile4
-rw-r--r--textproc/p5-XML-Toolkit/Makefile4
-rw-r--r--textproc/p5-XML-TreeBuilder/Makefile4
-rw-r--r--textproc/p5-XML-TreePP/Makefile4
-rw-r--r--textproc/p5-XML-Twig/Makefile4
-rw-r--r--textproc/p5-XML-Validate/Makefile4
-rw-r--r--textproc/p5-XML-Validator-Schema/Makefile4
-rw-r--r--textproc/p5-XML-XBEL/Makefile4
-rw-r--r--textproc/p5-XML-XML2JSON/Makefile4
-rw-r--r--textproc/p5-XML-XPath/Makefile7
-rw-r--r--textproc/p5-XML-XQL/Makefile4
-rw-r--r--textproc/p5-XML-XSLT/Makefile4
-rw-r--r--textproc/p5-XML-XUpdate-LibXML/Makefile4
-rw-r--r--textproc/p5-ack/Makefile4
-rw-r--r--textproc/p5-libxml/Makefile4
309 files changed, 621 insertions, 620 deletions
diff --git a/textproc/p5-AI-Categorizer/Makefile b/textproc/p5-AI-Categorizer/Makefile
index debf461524ec..6300324b1a1f 100644
--- a/textproc/p5-AI-Categorizer/Makefile
+++ b/textproc/p5-AI-Categorizer/Makefile
@@ -14,7 +14,8 @@ COMMENT= Automatic Text Categorization
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Container>=0:devel/p5-Class-Container \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Container>=0:devel/p5-Class-Container \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Statistics-Contingency>=0:math/p5-Statistics-Contingency \
p5-Lingua-Stem>=0:textproc/p5-Lingua-Stem \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Class-Container>=0:devel/p5-Class-Container \
p5-Algorithm-SVM>=0:devel/p5-Algorithm-SVM \
p5-AI-DecisionTree>=0:math/p5-AI-DecisionTree \
p5-Algorithm-NaiveBayes>=0:devel/p5-Algorithm-NaiveBayes
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-BibTeX-Parser/Makefile b/textproc/p5-BibTeX-Parser/Makefile
index f641b2963433..480ff2750cab 100644
--- a/textproc/p5-BibTeX-Parser/Makefile
+++ b/textproc/p5-BibTeX-Parser/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-IO-String>=0:devel/p5-IO-String \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-String>=0:devel/p5-IO-String \
p5-LaTeX-ToUnicode>=0.02:textproc/p5-LaTeX-ToUnicode
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-CAM-PDF/Makefile b/textproc/p5-CAM-PDF/Makefile
index b78051854a8e..f845b4edce7c 100644
--- a/textproc/p5-CAM-PDF/Makefile
+++ b/textproc/p5-CAM-PDF/Makefile
@@ -14,9 +14,9 @@ COMMENT= PDF manipulation library
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-RC4>=2.02:security/p5-Crypt-RC4 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-RC4>=2.02:security/p5-Crypt-RC4 \
p5-Text-PDF>=0.29:print/p5-Text-PDF
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Memory-Cycle>=1.02:devel/p5-Test-Memory-Cycle \
p5-Test-Pod>=0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
diff --git a/textproc/p5-CQL-Parser/Makefile b/textproc/p5-CQL-Parser/Makefile
index cd72c88efe68..7504ac3c3744 100644
--- a/textproc/p5-CQL-Parser/Makefile
+++ b/textproc/p5-CQL-Parser/Makefile
@@ -15,10 +15,10 @@ COMMENT= Compiles CQL strings into parse trees of Node subtypes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0.1:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.1:devel/p5-Class-Accessor \
p5-Clone>=0.15:devel/p5-Clone \
p5-String-Tokenizer>=0.05:textproc/p5-String-Tokenizer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CPAN-Changes>=0:devel/p5-CPAN-Changes \
p5-Test-Exception>=0.21:devel/p5-Test-Exception
diff --git a/textproc/p5-CSS-Croco/Makefile b/textproc/p5-CSS-Croco/Makefile
index 68e6ea47c548..9b152048b36a 100644
--- a/textproc/p5-CSS-Croco/Makefile
+++ b/textproc/p5-CSS-Croco/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Quick CSS parser
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI
LIB_DEPENDS= libcroco-0.6.so:textproc/libcroco
USES= perl5 pkgconfig
diff --git a/textproc/p5-CSS-Packer/Makefile b/textproc/p5-CSS-Packer/Makefile
index 032d9b0efe65..27ac088d3cff 100644
--- a/textproc/p5-CSS-Packer/Makefile
+++ b/textproc/p5-CSS-Packer/Makefile
@@ -13,8 +13,8 @@ COMMENT= Another CSS minifier
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Regexp-RegGrp>=1.001001:devel/p5-Regexp-RegGrp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Regexp-RegGrp>=1.001001:devel/p5-Regexp-RegGrp
TEST_DEPENDS= p5-Test-File-Contents>=0.21:devel/p5-Test-File-Contents \
p5-Test-Pod>=1.22:devel/p5-Test-Pod
diff --git a/textproc/p5-CSS-SAC/Makefile b/textproc/p5-CSS-SAC/Makefile
index b6edc89e3319..bda4baf02d46 100644
--- a/textproc/p5-CSS-SAC/Makefile
+++ b/textproc/p5-CSS-SAC/Makefile
@@ -14,8 +14,8 @@ COMMENT= SAC CSS (Simple API for CSS) parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-ArrayObjects>=0.04:devel/p5-Class-ArrayObjects
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-ArrayObjects>=0.04:devel/p5-Class-ArrayObjects
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Class-CSV/Makefile b/textproc/p5-Class-CSV/Makefile
index f73853263ae0..df59fe6c5c93 100644
--- a/textproc/p5-Class-CSV/Makefile
+++ b/textproc/p5-Class-CSV/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Class based CSV parser/writer
-BUILD_DEPENDS= p5-Text-CSV_XS>=0.23:textproc/p5-Text-CSV_XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-CSV_XS>=0.23:textproc/p5-Text-CSV_XS \
p5-Class-Accessor>=0.18:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile b/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
index cc5a59350f5d..4cbce33f7dfb 100644
--- a/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
+++ b/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
@@ -15,11 +15,11 @@ COMMENT= Data::FormValidator constraints for dates and times
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator \
p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Data-FormValidator/Makefile b/textproc/p5-Data-FormValidator/Makefile
index 3a4cc241fcd3..bc2f2e324c4c 100644
--- a/textproc/p5-Data-FormValidator/Makefile
+++ b/textproc/p5-Data-FormValidator/Makefile
@@ -13,7 +13,8 @@ COMMENT= Validates user input (usually from an HTML form) based
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI>=3.48:www/p5-CGI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI>=3.48:www/p5-CGI \
p5-Date-Calc>=5.0:devel/p5-Date-Calc \
p5-Email-Valid>=0:mail/p5-Email-Valid \
p5-File-MMagic>=1.17:devel/p5-File-MMagic \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-CGI>=3.48:www/p5-CGI \
p5-MIME-Types>=1.005:mail/p5-MIME-Types \
p5-Perl6-Junction>=1.10:devel/p5-Perl6-Junction \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile b/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile
index 0946b6f92f9b..279b7abda0e1 100644
--- a/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile
+++ b/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile
@@ -13,9 +13,9 @@ COMMENT= Loader class for phrasebook implementations using YAML
LICENSE= ART20
-BUILD_DEPENDS= p5-Data-Phrasebook>=0.24:textproc/p5-Data-Phrasebook \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Phrasebook>=0.24:textproc/p5-Data-Phrasebook \
p5-YAML>=0.35:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Distribution>=0:devel/p5-Test-Distribution
USES= perl5
diff --git a/textproc/p5-Data-Phrasebook/Makefile b/textproc/p5-Data-Phrasebook/Makefile
index 7d9fdd5cb40f..a693ecc763d1 100644
--- a/textproc/p5-Data-Phrasebook/Makefile
+++ b/textproc/p5-Data-Phrasebook/Makefile
@@ -13,8 +13,8 @@ COMMENT= Accessing phrasebooks from various data sources
LICENSE= ART20
-BUILD_DEPENDS= p5-Module-Pluggable>=2.7:devel/p5-Module-Pluggable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Pluggable>=2.7:devel/p5-Module-Pluggable
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Data-SpreadPagination/Makefile b/textproc/p5-Data-SpreadPagination/Makefile
index a7bb0643e43a..a500c7270c62 100644
--- a/textproc/p5-Data-SpreadPagination/Makefile
+++ b/textproc/p5-Data-SpreadPagination/Makefile
@@ -14,9 +14,9 @@ COMMENT= Page numbering and spread pagination
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Page>=0:databases/p5-Data-Page \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Page>=0:databases/p5-Data-Page \
p5-Math-Round>=0:math/p5-Math-Round
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=0:devel/p5-Test-Pod
USES= perl5
diff --git a/textproc/p5-Dev-Bollocks/Makefile b/textproc/p5-Dev-Bollocks/Makefile
index a87f6291b564..bfb3576d33e1 100644
--- a/textproc/p5-Dev-Bollocks/Makefile
+++ b/textproc/p5-Dev-Bollocks/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to generate bollocks straight from middle management
-BUILD_DEPENDS= p5-Math-String>=0:math/p5-Math-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-String>=0:math/p5-Math-String
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Devel-TraceSAX/Makefile b/textproc/p5-Devel-TraceSAX/Makefile
index 8ea82c50d47a..83f7861a0214 100644
--- a/textproc/p5-Devel-TraceSAX/Makefile
+++ b/textproc/p5-Devel-TraceSAX/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Trace SAX events
-BUILD_DEPENDS= p5-Devel-TraceCalls>=0.03:devel/p5-Devel-TraceCalls \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-TraceCalls>=0.03:devel/p5-Devel-TraceCalls \
p5-XML-SAX-Machines>=0:textproc/p5-XML-SAX-Machines
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-DocSet/Makefile b/textproc/p5-DocSet/Makefile
index 73a00fff9999..8f436c5f36c7 100644
--- a/textproc/p5-DocSet/Makefile
+++ b/textproc/p5-DocSet/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Documentation projects builder in HTML, PS, and PDF formats
-BUILD_DEPENDS= p5-Pod-POM>=0:textproc/p5-Pod-POM \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Pod-POM>=0:textproc/p5-Pod-POM \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Excel-Template/Makefile b/textproc/p5-Excel-Template/Makefile
index cfbf83c75419..27be69288db2 100644
--- a/textproc/p5-Excel-Template/Makefile
+++ b/textproc/p5-Excel-Template/Makefile
@@ -14,12 +14,12 @@ COMMENT= Perl module for templating Excel files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-stringy>=0:devel/p5-IO-stringy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-stringy>=0:devel/p5-IO-stringy \
p5-Test-Exception>=0.21:devel/p5-Test-Exception \
p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel \
p5-Test-Deep>=0:devel/p5-Test-Deep
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Excel-Writer-XLSX/Makefile b/textproc/p5-Excel-Writer-XLSX/Makefile
index d54a74fca56a..3a1d55d9f74e 100644
--- a/textproc/p5-Excel-Writer-XLSX/Makefile
+++ b/textproc/p5-Excel-Writer-XLSX/Makefile
@@ -14,8 +14,8 @@ COMMENT= Create a new file in the Excel 2007+ XLSX format
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Zip>=1.30:archivers/p5-Archive-Zip
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Zip>=1.30:archivers/p5-Archive-Zip
TEST_DEPENDS= p5-Date-Calc>=0:devel/p5-Date-Calc \
p5-Date-Manip>=0:devel/p5-Date-Manip
diff --git a/textproc/p5-FormValidator-Lite/Makefile b/textproc/p5-FormValidator-Lite/Makefile
index f7c18e65c88d..b2762515e913 100644
--- a/textproc/p5-FormValidator-Lite/Makefile
+++ b/textproc/p5-FormValidator-Lite/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
p5-Class-Load>=0.11:devel/p5-Class-Load \
p5-Email-Valid>=0:mail/p5-Email-Valid \
p5-Email-Valid-Loose>=0:mail/p5-Email-Valid-Loose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CGI>=3.31:www/p5-CGI \
p5-Test-Requires>=0.05:devel/p5-Test-Requires \
p5-Text-TestBase>=0:textproc/p5-Text-TestBase \
diff --git a/textproc/p5-Geo-Parse-OSM/Makefile b/textproc/p5-Geo-Parse-OSM/Makefile
index c887859b6208..89057bccace5 100644
--- a/textproc/p5-Geo-Parse-OSM/Makefile
+++ b/textproc/p5-Geo-Parse-OSM/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= OpenStreetMap XML file regexp parser
-BUILD_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:0.221
diff --git a/textproc/p5-Google-Data-JSON/Makefile b/textproc/p5-Google-Data-JSON/Makefile
index 09784d9ed17c..47422f8f9018 100644
--- a/textproc/p5-Google-Data-JSON/Makefile
+++ b/textproc/p5-Google-Data-JSON/Makefile
@@ -13,7 +13,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= General XML-JSON converter based on Google Data APIs
-BUILD_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-JSON-Any>=0:converters/p5-JSON-Any \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Perl6-Export-Attrs>=0:devel/p5-Perl6-Export-Attrs \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-XML-Atom>=0:textproc/p5-XML-Atom \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-YAML-Syck>=0:textproc/p5-YAML-Syck
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic
diff --git a/textproc/p5-HTML-Entities-Interpolate/Makefile b/textproc/p5-HTML-Entities-Interpolate/Makefile
index a5e08a99e17a..8b120ec1e5a2 100644
--- a/textproc/p5-HTML-Entities-Interpolate/Makefile
+++ b/textproc/p5-HTML-Entities-Interpolate/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTML-Parser>=3.69:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3.69:www/p5-HTML-Parser \
p5-Tie-Function>=0.02:devel/p5-Tie-Function
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Capture-Tiny>=0.44:devel/p5-Capture-Tiny \
p5-File-Slurper>=0.009:devel/p5-File-Slurper
diff --git a/textproc/p5-HTML-EscapeEvil/Makefile b/textproc/p5-HTML-EscapeEvil/Makefile
index 9321bef44288..c016794e644c 100644
--- a/textproc/p5-HTML-EscapeEvil/Makefile
+++ b/textproc/p5-HTML-EscapeEvil/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Escape evil HTML tags
-BUILD_DEPENDS= p5-HTML-Tree>=0:www/p5-HTML-Tree \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-HTML-Parser>=0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-HTML-Format/Makefile b/textproc/p5-HTML-Format/Makefile
index 8d87aefff729..11ba9bb0c4c6 100644
--- a/textproc/p5-HTML-Format/Makefile
+++ b/textproc/p5-HTML-Format/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Font-AFM>=0:x11-fonts/p5-Font-AFM \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Font-AFM>=0:x11-fonts/p5-Font-AFM \
p5-HTML-Tree>=3.15:www/p5-HTML-Tree
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Slurper>=0:devel/p5-File-Slurper
NO_ARCH= yes
diff --git a/textproc/p5-HTML-FormatExternal/Makefile b/textproc/p5-HTML-FormatExternal/Makefile
index 02e00700a977..446b2c0304ea 100644
--- a/textproc/p5-HTML-FormatExternal/Makefile
+++ b/textproc/p5-HTML-FormatExternal/Makefile
@@ -12,10 +12,10 @@ COMMENT= HTML to text formatting using external programs
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-IPC-Run>0:devel/p5-IPC-Run \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IPC-Run>0:devel/p5-IPC-Run \
p5-URI>=0.08:net/p5-URI \
p5-constant-defer>=0:devel/p5-constant-defer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= ELINKS HTML2TEXT LINKS LYNX LYNX_CURRENT NETRIK W3M
OPTIONS_DEFAULT=LYNX
diff --git a/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile b/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
index cb75a23a8ccb..a09797715926 100644
--- a/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
+++ b/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl5 module to convert HTML to text with tables intact
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Format>=0:textproc/p5-HTML-Format \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Format>=0:textproc/p5-HTML-Format \
p5-HTML-FormatText-WithLinks>=0:textproc/p5-HTML-FormatText-WithLinks \
p5-HTML-Tree>=0:www/p5-HTML-Tree
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-HTML-FormatText-WithLinks/Makefile b/textproc/p5-HTML-FormatText-WithLinks/Makefile
index 83620cf0d4af..1f7757549256 100644
--- a/textproc/p5-HTML-FormatText-WithLinks/Makefile
+++ b/textproc/p5-HTML-FormatText-WithLinks/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl5 module to convert HTML to text with links as footnotes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Format>=0:textproc/p5-HTML-Format \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Format>=0:textproc/p5-HTML-Format \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-HTML-HTML5-Parser/Makefile b/textproc/p5-HTML-HTML5-Parser/Makefile
index ff21660c1788..6e81dc0bf1f0 100644
--- a/textproc/p5-HTML-HTML5-Parser/Makefile
+++ b/textproc/p5-HTML-HTML5-Parser/Makefile
@@ -15,12 +15,12 @@ COMMENT= Named entity list for HTML parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-HTML5-Entities>=0.002:textproc/p5-HTML-HTML5-Entities \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-HTML5-Entities>=0.002:textproc/p5-HTML-HTML5-Entities \
p5-IO-HTML>0:devel/p5-IO-HTML \
p5-Try-Tiny>0:lang/p5-Try-Tiny \
p5-URI>0:net/p5-URI \
p5-XML-LibXML>=1.94:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-HTML-HTMLDoc/Makefile b/textproc/p5-HTML-HTMLDoc/Makefile
index 45de51e81a72..7a587ed22ee8 100644
--- a/textproc/p5-HTML-HTMLDoc/Makefile
+++ b/textproc/p5-HTML-HTMLDoc/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kostjnspb@yandex.ru
COMMENT= Perl interface to the htmldoc program
-BUILD_DEPENDS= htmldoc>0:textproc/htmldoc
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= htmldoc>0:textproc/htmldoc
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-HTML-Packer/Makefile b/textproc/p5-HTML-Packer/Makefile
index 3f3accf87c63..6cd4ee6e1c60 100644
--- a/textproc/p5-HTML-Packer/Makefile
+++ b/textproc/p5-HTML-Packer/Makefile
@@ -13,10 +13,10 @@ COMMENT= Another HTML code cleaner
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CSS-Packer>=2.01:textproc/p5-CSS-Packer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CSS-Packer>=2.01:textproc/p5-CSS-Packer \
p5-JavaScript-Packer>=2.01:textproc/p5-JavaScript-Packer \
p5-Regexp-RegGrp>=1.001001:devel/p5-Regexp-RegGrp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.22:devel/p5-Test-Pod
NO_ARCH= yes
diff --git a/textproc/p5-HTML-QRCode/Makefile b/textproc/p5-HTML-QRCode/Makefile
index a18e65923ba9..1734482c2f95 100644
--- a/textproc/p5-HTML-QRCode/Makefile
+++ b/textproc/p5-HTML-QRCode/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Generate HTML based QR Code
-BUILD_DEPENDS= p5-Text-QRCode>0:textproc/p5-Text-QRCode
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-QRCode>0:textproc/p5-Text-QRCode
LIB_DEPENDS= libqrencode.so:graphics/libqrencode
USES= perl5
diff --git a/textproc/p5-HTML-Quoted/Makefile b/textproc/p5-HTML-Quoted/Makefile
index 87feb7af9ecb..9fa1210cc020 100644
--- a/textproc/p5-HTML-Quoted/Makefile
+++ b/textproc/p5-HTML-Quoted/Makefile
@@ -13,8 +13,8 @@ COMMENT= Extract structure of quoted HTML mail message
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Parser>=3.0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3.0:www/p5-HTML-Parser
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-HTML-RewriteAttributes/Makefile b/textproc/p5-HTML-RewriteAttributes/Makefile
index 255360a46054..f0cfdefa5312 100644
--- a/textproc/p5-HTML-RewriteAttributes/Makefile
+++ b/textproc/p5-HTML-RewriteAttributes/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple yet powerful HTML attribute rewriting
-BUILD_DEPENDS= p5-HTML-Parser>0:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>0:www/p5-HTML-Parser \
p5-HTML-Tagset>0:www/p5-HTML-Tagset \
p5-URI>0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-HTML-SBC/Makefile b/textproc/p5-HTML-SBC/Makefile
index 964194b3ad58..5fba6e99ccce 100644
--- a/textproc/p5-HTML-SBC/Makefile
+++ b/textproc/p5-HTML-SBC/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple blog code to valid XHTML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-HTML-TagFilter/Makefile b/textproc/p5-HTML-TagFilter/Makefile
index b000c387bd4a..e9ea8f6c8d41 100644
--- a/textproc/p5-HTML-TagFilter/Makefile
+++ b/textproc/p5-HTML-TagFilter/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Fine-grained html-filter, xss-blocker and mailto-obfuscator
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI \
p5-HTML-Parser>=0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-HTML-Tidy/Makefile b/textproc/p5-HTML-Tidy/Makefile
index 82e11fa82589..e6ff39c95309 100644
--- a/textproc/p5-HTML-Tidy/Makefile
+++ b/textproc/p5-HTML-Tidy/Makefile
@@ -12,9 +12,9 @@ COMMENT= Web validation in a Perl object using tidy
LICENSE= ART20
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
LIB_DEPENDS= libtidyp.so:textproc/tidyp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS
diff --git a/textproc/p5-HTML-Truncate/Makefile b/textproc/p5-HTML-Truncate/Makefile
index 4fbed55dbd7e..daa5dcad1070 100644
--- a/textproc/p5-HTML-Truncate/Makefile
+++ b/textproc/p5-HTML-Truncate/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Truncate HTML by character count while preserving well-formedness
-BUILD_DEPENDS= p5-HTML-Parser>=2:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=2:www/p5-HTML-Parser \
p5-HTML-Tagset>=3:www/p5-HTML-Tagset
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Hailo/Makefile b/textproc/p5-Hailo/Makefile
index b2698ac0f222..846db96a9f23 100644
--- a/textproc/p5-Hailo/Makefile
+++ b/textproc/p5-Hailo/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Any-Moose>=0.13:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0.13:devel/p5-Any-Moose \
p5-Class-Load>=0.06:devel/p5-Class-Load \
p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
p5-Data-Dump>=1.17:devel/p5-Data-Dump \
@@ -34,7 +35,6 @@ BUILD_DEPENDS= p5-Any-Moose>=0.13:devel/p5-Any-Moose \
p5-Regexp-Common>=2010010201:textproc/p5-Regexp-Common \
p5-Term-Sk>=0.06:devel/p5-Term-Sk \
p5-namespace-clean>=0.18:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Bot-Training>=0:misc/p5-Bot-Training \
p5-Bot-Training-MegaHAL>=0:misc/p5-Bot-Training-MegaHAL \
p5-Bot-Training-StarCraft>=0:misc/p5-Bot-Training-StarCraft \
diff --git a/textproc/p5-Hash-Merge/Makefile b/textproc/p5-Hash-Merge/Makefile
index a991ad559b6d..bc0ced812bf8 100644
--- a/textproc/p5-Hash-Merge/Makefile
+++ b/textproc/p5-Hash-Merge/Makefile
@@ -13,8 +13,8 @@ COMMENT= Merges hashes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Clone-Choose>=0.008:devel/p5-Clone-Choose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone-Choose>=0.008:devel/p5-Clone-Choose
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-IO-CSVHeaderFile/Makefile b/textproc/p5-IO-CSVHeaderFile/Makefile
index cd07b89a38e3..6eb1ff619940 100644
--- a/textproc/p5-IO-CSVHeaderFile/Makefile
+++ b/textproc/p5-IO-CSVHeaderFile/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to automate reads from CSV formatted text files
-BUILD_DEPENDS= p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-JavaScript-Packer/Makefile b/textproc/p5-JavaScript-Packer/Makefile
index ac6b3de248e9..92af49dbd2b4 100644
--- a/textproc/p5-JavaScript-Packer/Makefile
+++ b/textproc/p5-JavaScript-Packer/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl version of Dean Edwards' Packer.js
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Regexp-RegGrp>=1.001001:devel/p5-Regexp-RegGrp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Regexp-RegGrp>=1.001001:devel/p5-Regexp-RegGrp
TEST_DEPENDS= p5-Test-Pod>=1.22:devel/p5-Test-Pod
NO_ARCH= yes
diff --git a/textproc/p5-KinoSearch1/Makefile b/textproc/p5-KinoSearch1/Makefile
index 90b98c4fde1f..70f5a729f397 100644
--- a/textproc/p5-KinoSearch1/Makefile
+++ b/textproc/p5-KinoSearch1/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl search engine library
-BUILD_DEPENDS= p5-Lingua-StopWords>=0.02:textproc/p5-Lingua-StopWords \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-StopWords>=0.02:textproc/p5-Lingua-StopWords \
p5-Lingua-Stem-Snowball>=0.94:textproc/p5-Lingua-Stem-Snowball \
p5-Clone>=0.18:devel/p5-Clone
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-LaTeX-Driver/Makefile b/textproc/p5-LaTeX-Driver/Makefile
index 5e7cb81cc12c..cd916ca1f736 100644
--- a/textproc/p5-LaTeX-Driver/Makefile
+++ b/textproc/p5-LaTeX-Driver/Makefile
@@ -14,14 +14,14 @@ COMMENT= Perl module of LaTeX Driver
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Exception-Class>=0:devel/p5-Exception-Class \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-File-pushd>=0:devel/p5-File-pushd \
p5-IPC-ShellCmd>=0:devel/p5-IPC-ShellCmd \
p5-Readonly>=0:devel/p5-Readonly
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:0.2002
diff --git a/textproc/p5-LaTeX-Encode/Makefile b/textproc/p5-LaTeX-Encode/Makefile
index 3e4579d0aa56..4f996db931c1 100644
--- a/textproc/p5-LaTeX-Encode/Makefile
+++ b/textproc/p5-LaTeX-Encode/Makefile
@@ -13,8 +13,8 @@ COMMENT= Encode characters for LaTeX formatting
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Readonly>=0:devel/p5-Readonly
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Readonly>=0:devel/p5-Readonly
TEST_DEPENDS= p5-Carp-Always>=0:devel/p5-Carp-Always
NO_ARCH= yes
diff --git a/textproc/p5-LaTeX-Pod/Makefile b/textproc/p5-LaTeX-Pod/Makefile
index 965615640d91..0c43d37a04c0 100644
--- a/textproc/p5-LaTeX-Pod/Makefile
+++ b/textproc/p5-LaTeX-Pod/Makefile
@@ -14,11 +14,11 @@ COMMENT= Transform LaTeX source files to POD
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-LaTeX-TOM>=0.9:textproc/p5-LaTeX-TOM \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-LaTeX-TOM>=0.9:textproc/p5-LaTeX-TOM \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Params-Validate>=0.91:devel/p5-Params-Validate \
p5-boolean>=0.20:devel/p5-boolean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-LaTeX-Table/Makefile b/textproc/p5-LaTeX-Table/Makefile
index b2085b6e79d6..aee1d8f6b0d6 100644
--- a/textproc/p5-LaTeX-Table/Makefile
+++ b/textproc/p5-LaTeX-Table/Makefile
@@ -15,7 +15,8 @@ COMMENT= Perl extension for the automatic generation of LaTeX tables
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-LaTeX-Driver>=0:textproc/p5-LaTeX-Driver \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-LaTeX-Driver>=0:textproc/p5-LaTeX-Driver \
p5-LaTeX-Encode>=0:textproc/p5-LaTeX-Encode \
p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
p5-Moose>=0.76:devel/p5-Moose \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-LaTeX-Driver>=0:textproc/p5-LaTeX-Driver \
p5-Number-Format>=0:textproc/p5-Number-Format \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
p5-Text-CSV>=0:textproc/p5-Text-CSV
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>=0.084:devel/p5-Test-NoWarnings
NO_ARCH= yes
diff --git a/textproc/p5-Lingua-EN-AddressParse/Makefile b/textproc/p5-Lingua-EN-AddressParse/Makefile
index 663749866e94..80419ea311f9 100644
--- a/textproc/p5-Lingua-EN-AddressParse/Makefile
+++ b/textproc/p5-Lingua-EN-AddressParse/Makefile
@@ -12,10 +12,10 @@ COMMENT= Perl module to manipulate geographical addresses
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Lingua-EN-NameParse>=1.24:textproc/p5-Lingua-EN-NameParse \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-EN-NameParse>=1.24:textproc/p5-Lingua-EN-NameParse \
p5-Locale-SubCountry>=1.41:misc/p5-Locale-SubCountry \
p5-Parse-RecDescent>=1:devel/p5-Parse-RecDescent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-JSON>=0:converters/p5-JSON
NO_ARCH= yes
diff --git a/textproc/p5-Lingua-EN-FindNumber/Makefile b/textproc/p5-Lingua-EN-FindNumber/Makefile
index 4001a942a0f7..49704717d17a 100644
--- a/textproc/p5-Lingua-EN-FindNumber/Makefile
+++ b/textproc/p5-Lingua-EN-FindNumber/Makefile
@@ -13,8 +13,8 @@ COMMENT= Locate (written) numbers in English text
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Lingua-EN-Words2Nums>=0:textproc/p5-Lingua-EN-Words2Nums
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-EN-Words2Nums>=0:textproc/p5-Lingua-EN-Words2Nums
TEST_DEPENDS= p5-Test-Pod>=1:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage
diff --git a/textproc/p5-Lingua-EN-Infinitive/Makefile b/textproc/p5-Lingua-EN-Infinitive/Makefile
index e676cef279d9..b507cfa35273 100644
--- a/textproc/p5-Lingua-EN-Infinitive/Makefile
+++ b/textproc/p5-Lingua-EN-Infinitive/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moo>=2.003000:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=2.003000:devel/p5-Moo \
p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5 tar:tgz
diff --git a/textproc/p5-Lingua-EN-Inflect-Number/Makefile b/textproc/p5-Lingua-EN-Inflect-Number/Makefile
index 4014b0de6fea..1b69f651534f 100644
--- a/textproc/p5-Lingua-EN-Inflect-Number/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect-Number/Makefile
@@ -13,8 +13,8 @@ COMMENT= Force number of words to singular or plural
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Lingua-EN-MatchNames/Makefile b/textproc/p5-Lingua-EN-MatchNames/Makefile
index 57cb352e1e43..12298b8f2580 100644
--- a/textproc/p5-Lingua-EN-MatchNames/Makefile
+++ b/textproc/p5-Lingua-EN-MatchNames/Makefile
@@ -13,11 +13,11 @@ COMMENT= Smart matching for human names
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Lingua-EN-NameParse>=0:textproc/p5-Lingua-EN-NameParse \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-EN-NameParse>=0:textproc/p5-Lingua-EN-NameParse \
p5-Lingua-EN-Nickname>=0:textproc/p5-Lingua-EN-Nickname \
p5-String-Approx>=0:devel/p5-String-Approx \
p5-Text-Metaphone>=0:textproc/p5-Text-Metaphone
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Lingua-EN-NamedEntity/Makefile b/textproc/p5-Lingua-EN-NamedEntity/Makefile
index 7d2a821976b5..68b8951c3857 100644
--- a/textproc/p5-Lingua-EN-NamedEntity/Makefile
+++ b/textproc/p5-Lingua-EN-NamedEntity/Makefile
@@ -13,8 +13,8 @@ COMMENT= Basic Named Entity Extraction algorithm
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Lingua-Stem>=0:textproc/p5-Lingua-Stem
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-Stem>=0:textproc/p5-Lingua-Stem
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Lingua-EN-Numbers-Easy/Makefile b/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
index c51bbeaa312d..57b4cc24f659 100644
--- a/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
@@ -12,8 +12,8 @@ COMMENT= Perl module providing hash access to Lingua::EN::Numbers objects
LICENSE= MIT
-BUILD_DEPENDS= p5-Lingua-EN-Numbers>=1.01:textproc/p5-Lingua-EN-Numbers
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-EN-Numbers>=1.01:textproc/p5-Lingua-EN-Numbers
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Lingua-EN-Summarize/Makefile b/textproc/p5-Lingua-EN-Summarize/Makefile
index c02ff9af43d5..3144435b22ba 100644
--- a/textproc/p5-Lingua-EN-Summarize/Makefile
+++ b/textproc/p5-Lingua-EN-Summarize/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple tool for summarizing bodies of English text
-BUILD_DEPENDS= p5-HTML-Summary>=0:www/p5-HTML-Summary \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Summary>=0:www/p5-HTML-Summary \
p5-HTML-Parser>=0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Lingua-Identify/Makefile b/textproc/p5-Lingua-Identify/Makefile
index 008fd4e947da..56e8a09cdf4c 100644
--- a/textproc/p5-Lingua-Identify/Makefile
+++ b/textproc/p5-Lingua-Identify/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Lingua::Identify - Language identification
-BUILD_DEPENDS= p5-Class-Factory-Util>=1.6:devel/p5-Class-Factory-Util \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Factory-Util>=1.6:devel/p5-Class-Factory-Util \
p5-Text-Affixes>=0.04:textproc/p5-Text-Affixes \
p5-Text-Ngram>=0.03:textproc/p5-Text-Ngram
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Lingua-Ispell/Makefile b/textproc/p5-Lingua-Ispell/Makefile
index 6e0b094fdb73..792970c8d8d2 100644
--- a/textproc/p5-Lingua-Ispell/Makefile
+++ b/textproc/p5-Lingua-Ispell/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module that encapsulates access to the Ispell program
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= ispell:textproc/aspell-ispell
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ispell:textproc/aspell-ispell
NO_ARCH= yes
REINPLACE_ARGS= -i ''
diff --git a/textproc/p5-Lingua-Preferred/Makefile b/textproc/p5-Lingua-Preferred/Makefile
index 83b5cba1b57d..866259f0fa9c 100644
--- a/textproc/p5-Lingua-Preferred/Makefile
+++ b/textproc/p5-Lingua-Preferred/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension to choose a language
-BUILD_DEPENDS= p5-Log-TraceMessages>=0:devel/p5-Log-TraceMessages
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-TraceMessages>=0:devel/p5-Log-TraceMessages
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Lingua-Stem/Makefile b/textproc/p5-Lingua-Stem/Makefile
index 2cb73e3a8519..9d69d34b0fc8 100644
--- a/textproc/p5-Lingua-Stem/Makefile
+++ b/textproc/p5-Lingua-Stem/Makefile
@@ -14,7 +14,8 @@ COMMENT= Provides word stemming algorithms localized by language
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Lingua-PT-Stemmer>=0:textproc/p5-Lingua-PT-Stemmer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-PT-Stemmer>=0:textproc/p5-Lingua-PT-Stemmer \
p5-Lingua-Stem-Fr>=0:textproc/p5-Lingua-Stem-Fr \
p5-Lingua-Stem-It>=0:textproc/p5-Lingua-Stem-It \
p5-Lingua-Stem-Ru>=0:textproc/p5-Lingua-Stem-Ru \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Lingua-PT-Stemmer>=0:textproc/p5-Lingua-PT-Stemmer \
p5-Lingua-Stem-Snowball-No>=0:textproc/p5-Lingua-Stem-Snowball-No \
p5-Lingua-Stem-Snowball-Se>=0:textproc/p5-Lingua-Stem-Snowball-Se \
p5-Text-German>=0:textproc/p5-Text-German
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-MARC-Charset/Makefile b/textproc/p5-MARC-Charset/Makefile
index 2cc548a55f02..4f67d83daa78 100644
--- a/textproc/p5-MARC-Charset/Makefile
+++ b/textproc/p5-MARC-Charset/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert MARC-8 encoded strings to UTF-8
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-MARC-Lint/Makefile b/textproc/p5-MARC-Lint/Makefile
index 774bcceb7159..2a10426d96dd 100644
--- a/textproc/p5-MARC-Lint/Makefile
+++ b/textproc/p5-MARC-Lint/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Mechanism for validating MARC records
-BUILD_DEPENDS= p5-MARC-Record>=0:textproc/p5-MARC-Record \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MARC-Record>=0:textproc/p5-MARC-Record \
p5-Business-ISBN>=2.03:misc/p5-Business-ISBN
-RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/marc-lint
diff --git a/textproc/p5-MARC-XML/Makefile b/textproc/p5-MARC-XML/Makefile
index 05b9aac35fe2..b22fb29edafe 100644
--- a/textproc/p5-MARC-XML/Makefile
+++ b/textproc/p5-MARC-XML/Makefile
@@ -14,10 +14,10 @@ COMMENT= Extension to the MARC-Record distribution for working with XML data
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MARC-Record>=2:textproc/p5-MARC-Record \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MARC-Record>=2:textproc/p5-MARC-Record \
p5-MARC-Charset>=0.98:textproc/p5-MARC-Charset \
p5-XML-SAX>=0.12:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Makefile-DOM/Makefile b/textproc/p5-Makefile-DOM/Makefile
index 8c0811e4abfa..0a1ff54fdbf9 100644
--- a/textproc/p5-Makefile-DOM/Makefile
+++ b/textproc/p5-Makefile-DOM/Makefile
@@ -15,10 +15,10 @@ COMMENT= Simple DOM parser for Makefiles
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Clone>=0.18:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0.18:devel/p5-Clone \
p5-List-MoreUtils>=0.21:lang/p5-List-MoreUtils \
p5-Params-Util>=0.22:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Makefile-Parser/Makefile b/textproc/p5-Makefile-Parser/Makefile
index 39e992820789..d511c648f176 100644
--- a/textproc/p5-Makefile-Parser/Makefile
+++ b/textproc/p5-Makefile-Parser/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Makefile::Parser - A Simple Parser for Makefiles
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Class-Trigger>=0.13:devel/p5-Class-Trigger \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-IPC-Run3>=0.036:devel/p5-IPC-Run3 \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Makefile-DOM>=0.005:textproc/p5-Makefile-DOM
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Markapl/Makefile b/textproc/p5-Markapl/Makefile
index 88c1336c6f73..8db947868bdb 100644
--- a/textproc/p5-Markapl/Makefile
+++ b/textproc/p5-Markapl/Makefile
@@ -14,12 +14,12 @@ COMMENT= Markup as Perl
LICENSE= MIT
-BUILD_DEPENDS= p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \
p5-HTML-Lint>=0:www/p5-HTML-Lint \
p5-B-Hooks-EndOfScope>=0.05:devel/p5-B-Hooks-EndOfScope \
p5-String-BufferStack>=1.15:textproc/p5-String-BufferStack \
p5-Devel-Declare>=0:devel/p5-Devel-Declare
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Marpa-HTML/Makefile b/textproc/p5-Marpa-HTML/Makefile
index d9bc7d1824b4..55b800df063b 100644
--- a/textproc/p5-Marpa-HTML/Makefile
+++ b/textproc/p5-Marpa-HTML/Makefile
@@ -16,10 +16,10 @@ COMMENT= High-level HTML Parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Parser>=3.64:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3.64:www/p5-HTML-Parser \
p5-Marpa-PP>=0.012:lang/p5-Marpa-PP \
p5-Marpa-XS>=0.026:lang/p5-Marpa-XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/textproc/p5-Net-YASA/Makefile b/textproc/p5-Net-YASA/Makefile
index d1de614ecac9..80a5c38ee2eb 100644
--- a/textproc/p5-Net-YASA/Makefile
+++ b/textproc/p5-Net-YASA/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to YASA (Yet Another Suffix Array)
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-NetAddr-IP-Find/Makefile b/textproc/p5-NetAddr-IP-Find/Makefile
index d8926f0a7cad..4df70816eb26 100644
--- a/textproc/p5-NetAddr-IP-Find/Makefile
+++ b/textproc/p5-NetAddr-IP-Find/Makefile
@@ -14,8 +14,8 @@ COMMENT= Iterates over all IP addresses in a text similar to Email::Find
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-NetAddr-IP>0:net-mgmt/p5-NetAddr-IP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-NetAddr-IP>0:net-mgmt/p5-NetAddr-IP
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-ODF-lpOD/Makefile b/textproc/p5-ODF-lpOD/Makefile
index 5f8bcdb526af..a96534fa0db7 100644
--- a/textproc/p5-ODF-lpOD/Makefile
+++ b/textproc/p5-ODF-lpOD/Makefile
@@ -13,13 +13,13 @@ COMMENT= OpenDocument management interface
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Archive-Zip>=1.30:archivers/p5-Archive-Zip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Zip>=1.30:archivers/p5-Archive-Zip \
p5-XML-Twig>=3.37:textproc/p5-XML-Twig \
p5-File-Type>=0:devel/p5-File-Type \
p5-Image-Size>=0:graphics/p5-Image-Size \
p5-libwww>=0:www/p5-libwww \
p5-File-Slurp>=0:devel/p5-File-Slurp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-PDF-API2-Simple/Makefile b/textproc/p5-PDF-API2-Simple/Makefile
index 06fadd9b3e55..999336683e24 100644
--- a/textproc/p5-PDF-API2-Simple/Makefile
+++ b/textproc/p5-PDF-API2-Simple/Makefile
@@ -12,8 +12,8 @@ COMMENT= Wrapper for the PDF::API2 modules
LICENSE= PD
-BUILD_DEPENDS= p5-PDF-API2>=0:textproc/p5-PDF-API2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PDF-API2>=0:textproc/p5-PDF-API2
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index 7b02956291bc..f5ada5d6c512 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -13,8 +13,8 @@ COMMENT= Facilitates the creation and modification of PDF files
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Font-TTF>=0:x11-fonts/p5-Font-TTF
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Font-TTF>=0:x11-fonts/p5-Font-TTF
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
diff --git a/textproc/p5-PDF-FromHTML/Makefile b/textproc/p5-PDF-FromHTML/Makefile
index ca817f13ba08..fb3fc193845d 100644
--- a/textproc/p5-PDF-FromHTML/Makefile
+++ b/textproc/p5-PDF-FromHTML/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert HTML documents to PDF
-BUILD_DEPENDS= p5-Graphics-ColorNames>=0:graphics/p5-Graphics-ColorNames \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Graphics-ColorNames>=0:graphics/p5-Graphics-ColorNames \
p5-HTML-Tidy>=0:textproc/p5-HTML-Tidy \
p5-Image-Size>=0:graphics/p5-Image-Size \
p5-PDF-API2>=0:textproc/p5-PDF-API2 \
p5-PDF-Writer>=0.05:textproc/p5-PDF-Writer \
p5-XML-Twig>=0:textproc/p5-XML-Twig \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-PDF-Table/Makefile b/textproc/p5-PDF-Table/Makefile
index bce45cf7ba5d..2130935f7916 100644
--- a/textproc/p5-PDF-Table/Makefile
+++ b/textproc/p5-PDF-Table/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= danilo@FreeBSD.org
COMMENT= Utility class for building table layouts in a PDF::API2 object
-BUILD_DEPENDS= p5-PDF-API2>=0:textproc/p5-PDF-API2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PDF-API2>=0:textproc/p5-PDF-API2
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-POE-Filter-XML/Makefile b/textproc/p5-POE-Filter-XML/Makefile
index 84cad70eb54d..bd3978e67bc4 100644
--- a/textproc/p5-POE-Filter-XML/Makefile
+++ b/textproc/p5-POE-Filter-XML/Makefile
@@ -13,13 +13,13 @@ COMMENT= POE Filter for parsing XML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-MooseX-InsideOut>=0:devel/p5-MooseX-InsideOut \
p5-MooseX-NonMoose>=0:devel/p5-MooseX-NonMoose \
p5-POE>=0:devel/p5-POE \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-XML-SAX-Base>=0:textproc/p5-XML-SAX-Base
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-PPI-HTML/Makefile b/textproc/p5-PPI-HTML/Makefile
index a5e03d2c09ea..7cdadd4d7781 100644
--- a/textproc/p5-PPI-HTML/Makefile
+++ b/textproc/p5-PPI-HTML/Makefile
@@ -15,10 +15,10 @@ COMMENT= Generate syntax-highlighted HTML for Perl using PPI
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PPI>=0.990:textproc/p5-PPI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PPI>=0.990:textproc/p5-PPI \
p5-CSS-Tiny>=0.10:textproc/p5-CSS-Tiny \
p5-Params-Util>=0.05:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-PPI-XS/Makefile b/textproc/p5-PPI-XS/Makefile
index 3226c908f1ae..0a9bfa3b04f4 100644
--- a/textproc/p5-PPI-XS/Makefile
+++ b/textproc/p5-PPI-XS/Makefile
@@ -13,8 +13,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-PPI>=1.000:textproc/p5-PPI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PPI>=1.000:textproc/p5-PPI
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-PPI/Makefile b/textproc/p5-PPI/Makefile
index 22615ece3b4f..bd2d57f656b0 100644
--- a/textproc/p5-PPI/Makefile
+++ b/textproc/p5-PPI/Makefile
@@ -15,14 +15,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Inspector>=1.22:devel/p5-Class-Inspector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Inspector>=1.22:devel/p5-Class-Inspector \
p5-Clone>=0.30:devel/p5-Clone \
p5-File-Remove>=1.42:devel/p5-File-Remove \
p5-IO-String>=1.07:devel/p5-IO-String \
p5-List-MoreUtils>=0.16:lang/p5-List-MoreUtils \
p5-Params-Util>=1.00:devel/p5-Params-Util \
p5-Task-Weaken>0:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Object>=0.07:devel/p5-Test-Object \
p5-Test-SubCalls>=1.07:devel/p5-Test-SubCalls
diff --git a/textproc/p5-PPIx-EditorTools/Makefile b/textproc/p5-PPIx-EditorTools/Makefile
index a4a976340897..adad0113c78c 100644
--- a/textproc/p5-PPIx-EditorTools/Makefile
+++ b/textproc/p5-PPIx-EditorTools/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-XSAccessor>=1.02:devel/p5-Class-XSAccessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-XSAccessor>=1.02:devel/p5-Class-XSAccessor \
p5-PPI>=1.203:textproc/p5-PPI \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Most>=0:devel/p5-Test-Most
diff --git a/textproc/p5-PPIx-QuoteLike/Makefile b/textproc/p5-PPIx-QuoteLike/Makefile
index dfd78022a552..b5490c3c2c25 100644
--- a/textproc/p5-PPIx-QuoteLike/Makefile
+++ b/textproc/p5-PPIx-QuoteLike/Makefile
@@ -14,8 +14,8 @@ COMMENT= Parse Perl string literals and string-literal-like things
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PPI>=1.117:textproc/p5-PPI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PPI>=1.117:textproc/p5-PPI
PORTSCOUT= limit:^[0-9\.]*$$
diff --git a/textproc/p5-PPIx-Regexp/Makefile b/textproc/p5-PPIx-Regexp/Makefile
index 4523e101e55c..aa86f3e113f2 100644
--- a/textproc/p5-PPIx-Regexp/Makefile
+++ b/textproc/p5-PPIx-Regexp/Makefile
@@ -16,8 +16,8 @@ LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSES/Artistic
LICENSE_FILE_GPLv1= ${WRKSRC}/LICENSES/Copying
-BUILD_DEPENDS= p5-PPI>=1.117:textproc/p5-PPI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PPI>=1.117:textproc/p5-PPI
PORTSCOUT= limit:^[^_]+$$
diff --git a/textproc/p5-Parse-BooleanLogic/Makefile b/textproc/p5-Parse-BooleanLogic/Makefile
index 6aad487754c0..a33560195384 100644
--- a/textproc/p5-Parse-BooleanLogic/Makefile
+++ b/textproc/p5-Parse-BooleanLogic/Makefile
@@ -14,9 +14,9 @@ COMMENT= Parser of boolean expressions
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Regexp-Common>=2.122:textproc/p5-Regexp-Common \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Regexp-Common>=2.122:textproc/p5-Regexp-Common \
p5-Module-Install>=0.91_1:devel/p5-Module-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
USES= perl5
diff --git a/textproc/p5-Parse-CSV/Makefile b/textproc/p5-Parse-CSV/Makefile
index ed1101716c76..30aafc5ae0f4 100644
--- a/textproc/p5-Parse-CSV/Makefile
+++ b/textproc/p5-Parse-CSV/Makefile
@@ -13,9 +13,9 @@ COMMENT= Highly flexible CSV parser for large files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Params-Util>=1:devel/p5-Params-Util \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Util>=1:devel/p5-Params-Util \
p5-Text-CSV_XS>=0.80:textproc/p5-Text-CSV_XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Perl-Critic-Bangs/Makefile b/textproc/p5-Perl-Critic-Bangs/Makefile
index 6a21601cfbec..dc6599d88457 100644
--- a/textproc/p5-Perl-Critic-Bangs/Makefile
+++ b/textproc/p5-Perl-Critic-Bangs/Makefile
@@ -14,8 +14,8 @@ COMMENT= Collection of handy Perl::Critic policies
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic
TEST_DEPENDS= p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic \
p5-Perl-Critic-Deprecated>=0:devel/p5-Perl-Critic-Deprecated
diff --git a/textproc/p5-Perl-Critic-Itch/Makefile b/textproc/p5-Perl-Critic-Itch/Makefile
index e6da311cbe05..9a3fb4e1b73d 100644
--- a/textproc/p5-Perl-Critic-Itch/Makefile
+++ b/textproc/p5-Perl-Critic-Itch/Makefile
@@ -12,8 +12,8 @@ COMMENT= Collection of Perl::Critic Policies
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Perl-Critic-Moose/Makefile b/textproc/p5-Perl-Critic-Moose/Makefile
index 336423f7b0a5..8f27927e3757 100644
--- a/textproc/p5-Perl-Critic-Moose/Makefile
+++ b/textproc/p5-Perl-Critic-Moose/Makefile
@@ -12,9 +12,9 @@ COMMENT= Policies for Perl::Critic concerned with using Moose
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
p5-Perl-Critic>=0:textproc/p5-Perl-Critic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Perl-Critic-More/Makefile b/textproc/p5-Perl-Critic-More/Makefile
index efac01691c44..921fe67c65f0 100644
--- a/textproc/p5-Perl-Critic-More/Makefile
+++ b/textproc/p5-Perl-Critic-More/Makefile
@@ -12,8 +12,8 @@ COMMENT= Supplemental policies for Perl::Critic
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-Perl-Critic-Pulp/Makefile b/textproc/p5-Perl-Critic-Pulp/Makefile
index c825d4a0447b..a60954ed84a0 100644
--- a/textproc/p5-Perl-Critic-Pulp/Makefile
+++ b/textproc/p5-Perl-Critic-Pulp/Makefile
@@ -12,10 +12,10 @@ COMMENT= some add-on perlcritic policies
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic \
p5-Perl-MinimumVersion>=0:textproc/p5-Perl-MinimumVersion \
p5-Pod-MinimumVersion>=0:textproc/p5-Pod-MinimumVersion
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Perl-Critic-Swift/Makefile b/textproc/p5-Perl-Critic-Swift/Makefile
index 34e214d478b6..b5f67d0d2484 100644
--- a/textproc/p5-Perl-Critic-Swift/Makefile
+++ b/textproc/p5-Perl-Critic-Swift/Makefile
@@ -13,8 +13,8 @@ COMMENT= A set of additional policies for Perl::Critic
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-Perl-Critic-Tics/Makefile b/textproc/p5-Perl-Critic-Tics/Makefile
index cff85e1d50b6..4fbbc90aa88d 100644
--- a/textproc/p5-Perl-Critic-Tics/Makefile
+++ b/textproc/p5-Perl-Critic-Tics/Makefile
@@ -12,8 +12,8 @@ COMMENT= Extra policies for Perl::Critic
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Perl-Critic>=0:textproc/p5-Perl-Critic
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Perl-Critic/Makefile b/textproc/p5-Perl-Critic/Makefile
index 9867940bcfb8..cb2d6ee0913c 100644
--- a/textproc/p5-Perl-Critic/Makefile
+++ b/textproc/p5-Perl-Critic/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-B-Keywords>=1.05:devel/p5-B-Keywords \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Keywords>=1.05:devel/p5-B-Keywords \
p5-Config-Tiny>=2:devel/p5-Config-Tiny \
p5-Exception-Class>=1.23:devel/p5-Exception-Class \
p5-File-HomeDir>=0:devel/p5-File-HomeDir \
@@ -31,7 +32,6 @@ BUILD_DEPENDS= p5-B-Keywords>=1.05:devel/p5-B-Keywords \
p5-String-Format>=1.13:textproc/p5-String-Format \
p5-Task-Weaken>=0:devel/p5-Task-Weaken \
perltidy:devel/p5-Perl-Tidy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
diff --git a/textproc/p5-Perl-Lint/Makefile b/textproc/p5-Perl-Lint/Makefile
index b46a2beda301..3331b1a8b962 100644
--- a/textproc/p5-Perl-Lint/Makefile
+++ b/textproc/p5-Perl-Lint/Makefile
@@ -13,7 +13,8 @@ COMMENT= Yet another Perl source code linter
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-B-Keywords>=0:devel/p5-B-Keywords \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Keywords>=0:devel/p5-B-Keywords \
p5-Compiler-Lexer>=0.22:devel/p5-Compiler-Lexer \
p5-Email-Address>=0:mail/p5-Email-Address \
p5-List-Flatten>=0:devel/p5-List-Flatten \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-B-Keywords>=0:devel/p5-B-Keywords \
p5-Regexp-Lexer>=0.05:devel/p5-Regexp-Lexer \
p5-String-CamelCase>=0:textproc/p5-String-CamelCase \
p5-Test-Deep>=0:devel/p5-Test-Deep
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Text-TestBase>=0:textproc/p5-Text-TestBase
NO_ARCH= yes
diff --git a/textproc/p5-Perl-MinimumVersion/Makefile b/textproc/p5-Perl-MinimumVersion/Makefile
index 083bbe445c93..01611a5820c4 100644
--- a/textproc/p5-Perl-MinimumVersion/Makefile
+++ b/textproc/p5-Perl-MinimumVersion/Makefile
@@ -13,13 +13,13 @@ COMMENT= Find a minimum required version of perl for Perl code
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
p5-File-Find-Rule-Perl>=0:devel/p5-File-Find-Rule-Perl \
p5-PPI>=1.215:textproc/p5-PPI \
p5-PPIx-Regexp>=0.033:textproc/p5-PPIx-Regexp \
p5-Perl-Critic>=1.104:textproc/p5-Perl-Critic \
p5-Params-Util>=0.25:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Script>=0:devel/p5-Test-Script
USES= perl5
diff --git a/textproc/p5-PerlPoint-Converters/Makefile b/textproc/p5-PerlPoint-Converters/Makefile
index fca83edfaf61..37872994298a 100644
--- a/textproc/p5-PerlPoint-Converters/Makefile
+++ b/textproc/p5-PerlPoint-Converters/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert PerlPoint docs into various formats
-BUILD_DEPENDS= p5-PerlPoint-Package>=0:textproc/p5-PerlPoint-Package \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PerlPoint-Package>=0:textproc/p5-PerlPoint-Package \
p5-Getopt-ArgvFile>=0:devel/p5-Getopt-ArgvFile
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-PerlPoint-Package/Makefile b/textproc/p5-PerlPoint-Package/Makefile
index 337ebb0c6ccf..9a054db65e09 100644
--- a/textproc/p5-PerlPoint-Package/Makefile
+++ b/textproc/p5-PerlPoint-Package/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= PerlPoint is both a presentation and a documentation toolset
-BUILD_DEPENDS= p5-Digest-SHA1>=0:security/p5-Digest-SHA1
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-SHA1>=0:security/p5-Digest-SHA1
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Petal-CodePerl/Makefile b/textproc/p5-Petal-CodePerl/Makefile
index f16447301052..9525772b02d2 100644
--- a/textproc/p5-Petal-CodePerl/Makefile
+++ b/textproc/p5-Petal-CodePerl/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Make Petal go faster by compiling the expressions
-BUILD_DEPENDS= p5-Petal>=0:textproc/p5-Petal \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Petal>=0:textproc/p5-Petal \
p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
p5-Code-Perl>=0:devel/p5-Code-Perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Petal-Mail/Makefile b/textproc/p5-Petal-Mail/Makefile
index 734aa2a19ca0..436cb8aa1258 100644
--- a/textproc/p5-Petal-Mail/Makefile
+++ b/textproc/p5-Petal-Mail/Makefile
@@ -15,8 +15,8 @@ COMMENT= Format text e-mail using Petal
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Petal>=0:textproc/p5-Petal
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Petal>=0:textproc/p5-Petal
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Petal-Utils/Makefile b/textproc/p5-Petal-Utils/Makefile
index 92c66b99a27b..1bfe1bb2c129 100644
--- a/textproc/p5-Petal-Utils/Makefile
+++ b/textproc/p5-Petal-Utils/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Useful template modifiers for Petal
-BUILD_DEPENDS= p5-Petal>=0:textproc/p5-Petal \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Petal>=0:textproc/p5-Petal \
p5-TimeDate>=0:devel/p5-TimeDate \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-Petal/Makefile b/textproc/p5-Petal/Makefile
index 0b26fc2a3160..aef28916ce62 100644
--- a/textproc/p5-Petal/Makefile
+++ b/textproc/p5-Petal/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl Template Attribute Language - TAL for Perl!
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Locale-Maketext-Gettext>=0:devel/p5-Locale-Maketext-Gettext \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Locale-Maketext-Gettext>=0:devel/p5-Locale-Maketext-Gettext \
p5-MKDoc-XML>=0.72:textproc/p5-MKDoc-XML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-URI>=0:net/p5-URI
NO_ARCH= yes
diff --git a/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile b/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile
index 6751183a39cf..0cce21e689ef 100644
--- a/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile
+++ b/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile
@@ -15,8 +15,8 @@ COMMENT= Analyzer for CJK texts
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Plucene>=0:textproc/p5-Plucene
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Plucene>=0:textproc/p5-Plucene
TEST_DEPENDS= p5-YAML>=0:textproc/p5-YAML
USE_PERL5= configure
diff --git a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
index 08277ff2431c..51c1a422c20b 100644
--- a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
+++ b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Stemmed analyzer plugin for p5-Plucene search engine
-BUILD_DEPENDS= p5-Lingua-StopWords>=0:textproc/p5-Lingua-StopWords \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-StopWords>=0:textproc/p5-Lingua-StopWords \
p5-Lingua-Stem-Snowball>=0:textproc/p5-Lingua-Stem-Snowball \
p5-Plucene>=0:textproc/p5-Plucene
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Plucene-Simple/Makefile b/textproc/p5-Plucene-Simple/Makefile
index 429bf8af043d..ee8659896409 100644
--- a/textproc/p5-Plucene-Simple/Makefile
+++ b/textproc/p5-Plucene-Simple/Makefile
@@ -13,11 +13,11 @@ DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION}
MAINTAINER= perl@FreeBSD.org
COMMENT= Interface to Plucene
-BUILD_DEPENDS= p5-Time-Piece-Range>=1.0:devel/p5-Time-Piece-Range \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Time-Piece-Range>=1.0:devel/p5-Time-Piece-Range \
p5-Plucene>=1.09:textproc/p5-Plucene \
p5-File-Find-Rule>=0.10:devel/p5-File-Find-Rule \
p5-File-Slurp>=2002.1031:devel/p5-File-Slurp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Class>=0.03:devel/p5-Test-Class
NO_ARCH= yes
diff --git a/textproc/p5-Plucene/Makefile b/textproc/p5-Plucene/Makefile
index 67d7a271d1e1..8d000f22ee8d 100644
--- a/textproc/p5-Plucene/Makefile
+++ b/textproc/p5-Plucene/Makefile
@@ -15,14 +15,14 @@ COMMENT= Perl port of the Java Lucene search engine
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tie-Array-Sorted>=0:devel/p5-Tie-Array-Sorted \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tie-Array-Sorted>=0:devel/p5-Tie-Array-Sorted \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Class-Virtual>=0:devel/p5-Class-Virtual \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Lingua-Stem>=0:textproc/p5-Lingua-Stem \
p5-Bit-Vector-Minimal>=0:math/p5-Bit-Vector-Minimal \
p5-IO-stringy>=0:devel/p5-IO-stringy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Pod-Abstract/Makefile b/textproc/p5-Pod-Abstract/Makefile
index d21727d022ff..cb2d364a7431 100644
--- a/textproc/p5-Pod-Abstract/Makefile
+++ b/textproc/p5-Pod-Abstract/Makefile
@@ -14,9 +14,9 @@ COMMENT= Abstract document tree for Perl POD documents
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-String>=0:devel/p5-IO-String \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-String>=0:devel/p5-IO-String \
p5-Task-Weaken>=0:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Pod-Autopod/Makefile b/textproc/p5-Pod-Autopod/Makefile
index 6ffb88d33b88..d710dcdc0ea5 100644
--- a/textproc/p5-Pod-Autopod/Makefile
+++ b/textproc/p5-Pod-Autopod/Makefile
@@ -13,8 +13,8 @@ COMMENT= Generates pod documentation by analysing perl modules
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Pod-Abstract>=0:textproc/p5-Pod-Abstract
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Pod-Abstract>=0:textproc/p5-Pod-Abstract
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Pod-DocBook/Makefile b/textproc/p5-Pod-DocBook/Makefile
index 422da6711ccf..42e7986cb13e 100644
--- a/textproc/p5-Pod-DocBook/Makefile
+++ b/textproc/p5-Pod-DocBook/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert Pod data to DocBook SGML
-BUILD_DEPENDS= p5-podlators>=0:textproc/p5-podlators \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-podlators>=0:textproc/p5-podlators \
p5-Text-Tabs+Wrap>=0:textproc/p5-Text-Tabs+Wrap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Pod-Elemental/Makefile b/textproc/p5-Pod-Elemental/Makefile
index 99174d3e658a..cf2f04a5ee29 100644
--- a/textproc/p5-Pod-Elemental/Makefile
+++ b/textproc/p5-Pod-Elemental/Makefile
@@ -13,7 +13,8 @@ COMMENT= Treating a Pod document as a tree of elements
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Load>=0:devel/p5-Class-Load \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Load>=0:devel/p5-Class-Load \
p5-Mixin-Linewise>=0:devel/p5-Mixin-Linewise \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Class-Load>=0:devel/p5-Class-Load \
p5-String-Truncate>=0:textproc/p5-String-Truncate \
p5-Sub-Exporter-ForMethods>=0:devel/p5-Sub-Exporter-ForMethods \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Differences>=0:devel/p5-Test-Differences
diff --git a/textproc/p5-Pod-Eventual/Makefile b/textproc/p5-Pod-Eventual/Makefile
index b647eb688911..4c1b2d6bfa58 100644
--- a/textproc/p5-Pod-Eventual/Makefile
+++ b/textproc/p5-Pod-Eventual/Makefile
@@ -14,8 +14,8 @@ COMMENT= Read a POD document as a series of trivial events
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mixin-Linewise>=0.102:devel/p5-Mixin-Linewise
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mixin-Linewise>=0.102:devel/p5-Mixin-Linewise
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
USES= perl5
diff --git a/textproc/p5-Pod-HtmlEasy/Makefile b/textproc/p5-Pod-HtmlEasy/Makefile
index 658429b20e52..82f297ee387f 100644
--- a/textproc/p5-Pod-HtmlEasy/Makefile
+++ b/textproc/p5-Pod-HtmlEasy/Makefile
@@ -14,13 +14,13 @@ COMMENT= Generate personalized HTML from PODs
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Slurp>=9999.13:devel/p5-File-Slurp \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Slurp>=9999.13:devel/p5-File-Slurp \
p5-IPC-Run>=0.8:devel/p5-IPC-Run \
p5-Exporter-Easy>=0:devel/p5-Exporter-Easy \
p5-Readonly>=1.03:devel/p5-Readonly \
p5-Regexp-Common>=2.12:textproc/p5-Regexp-Common \
p5-Pod-Escapes>=0:textproc/p5-Pod-Escapes
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 tar:tgz
USE_PERL5= configure
diff --git a/textproc/p5-Pod-MinimumVersion/Makefile b/textproc/p5-Pod-MinimumVersion/Makefile
index 120d346af4f2..ed6f99c2e869 100644
--- a/textproc/p5-Pod-MinimumVersion/Makefile
+++ b/textproc/p5-Pod-MinimumVersion/Makefile
@@ -12,8 +12,8 @@ COMMENT= report minimum Perl version for given POD
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-String>=1.02:devel/p5-IO-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-String>=1.02:devel/p5-IO-String
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Pod-POM-View-HTML-Filter/Makefile b/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
index f2eafcbb3aa7..d4aa29025526 100644
--- a/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
+++ b/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Use filters on sections of your pod documents
-BUILD_DEPENDS= p5-Pod-POM>=0:textproc/p5-Pod-POM \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Pod-POM>=0:textproc/p5-Pod-POM \
p5-Syntax-Highlight-Shell>=0:www/p5-Syntax-Highlight-Shell \
perltidy:devel/p5-Perl-Tidy \
p5-Syntax-Highlight-HTML>=0:www/p5-Syntax-Highlight-HTML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Pod-Readme/Makefile b/textproc/p5-Pod-Readme/Makefile
index d8e9bcd619c0..248d05126947 100644
--- a/textproc/p5-Pod-Readme/Makefile
+++ b/textproc/p5-Pod-Readme/Makefile
@@ -13,7 +13,8 @@ COMMENT= Convert POD to README file
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CPAN-Changes>=0:devel/p5-CPAN-Changes \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CPAN-Changes>=0:devel/p5-CPAN-Changes \
p5-Class-Method-Modifiers>=2.00:devel/p5-Class-Method-Modifiers \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Getopt-Long-Descriptive>=0:devel/p5-Getopt-Long-Descriptive \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-CPAN-Changes>=0:devel/p5-CPAN-Changes \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-Type-Tiny>=0:devel/p5-Type-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-String>=0:devel/p5-IO-String \
p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/textproc/p5-Pod-Spell/Makefile b/textproc/p5-Pod-Spell/Makefile
index 1522f3118541..0d2354846cac 100644
--- a/textproc/p5-Pod-Spell/Makefile
+++ b/textproc/p5-Pod-Spell/Makefile
@@ -11,13 +11,13 @@ COMMENT= Formatter for spellchecking Pod
LICENSE= ART20
-BUILD_DEPENDS= p5-Class-Tiny>=0:devel/p5-Class-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+ p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install
+RUN_DEPENDS= p5-Class-Tiny>=0:devel/p5-Class-Tiny \
p5-File-ShareDir>=0:devel/p5-File-ShareDir \
p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
p5-Path-Tiny>=0:devel/p5-Path-Tiny \
p5-Pod-Escapes>=1.01:textproc/p5-Pod-Escapes
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-BUILD_DEPENDS+= p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
NO_ARCH= yes
diff --git a/textproc/p5-Pod-WSDL/Makefile b/textproc/p5-Pod-WSDL/Makefile
index ea366c3af15e..3486beb56a01 100644
--- a/textproc/p5-Pod-WSDL/Makefile
+++ b/textproc/p5-Pod-WSDL/Makefile
@@ -14,10 +14,10 @@ COMMENT= Create WSDL documents from (extended) pod
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-stringy>=2.110:devel/p5-IO-stringy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-stringy>=2.110:devel/p5-IO-stringy \
p5-XML-Writer>=0.531:textproc/p5-XML-Writer \
p5-XML-XPath>=1.13:textproc/p5-XML-XPath
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Pod-WikiDoc/Makefile b/textproc/p5-Pod-WikiDoc/Makefile
index c166ee1f8ba8..b6bea98113c1 100644
--- a/textproc/p5-Pod-WikiDoc/Makefile
+++ b/textproc/p5-Pod-WikiDoc/Makefile
@@ -13,11 +13,11 @@ COMMENT= Generate Pod from inline wiki style text
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-pushd>=0:devel/p5-File-pushd \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-pushd>=0:devel/p5-File-pushd \
p5-Getopt-Lucid>=0.14:textproc/p5-Getopt-Lucid \
p5-IO-String>=1.06:devel/p5-IO-String \
p5-Parse-RecDescent>=1.967.006:devel/p5-Parse-RecDescent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IPC-Run3>=0.033:devel/p5-IPC-Run3 \
p5-Probe-Perl>=0.01:sysutils/p5-Probe-Perl
diff --git a/textproc/p5-Pod-XML/Makefile b/textproc/p5-Pod-XML/Makefile
index 9057bae370a9..c075304c3264 100644
--- a/textproc/p5-Pod-XML/Makefile
+++ b/textproc/p5-Pod-XML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Module to convert POD to XML
-BUILD_DEPENDS= p5-IO-stringy>=0:devel/p5-IO-stringy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-stringy>=0:devel/p5-IO-stringy
TEST_DEPENDS= p5-Test-File-Contents>=0:devel/p5-Test-File-Contents
USES= perl5
diff --git a/textproc/p5-Pod-Xhtml/Makefile b/textproc/p5-Pod-Xhtml/Makefile
index 86649819059c..100f273ff379 100644
--- a/textproc/p5-Pod-Xhtml/Makefile
+++ b/textproc/p5-Pod-Xhtml/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Generate well-formed XHTML documents from POD format documentation
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI
TEST_DEPENDS= p5-Test-Assertions>0:devel/p5-Test-Assertions
USES= perl5
diff --git a/textproc/p5-RADIUS-UserFile/Makefile b/textproc/p5-RADIUS-UserFile/Makefile
index 9013ed061b93..1739155d428c 100644
--- a/textproc/p5-RADIUS-UserFile/Makefile
+++ b/textproc/p5-RADIUS-UserFile/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl extension for manipulating a RADIUS users file
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index aa5f2d252e70..2720e8bedbb4 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Object oriented Perl modules for handling tasks related to RDF
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-DBI>=0:databases/p5-DBI \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile
index e680cb4059e0..50c5b14d030b 100644
--- a/textproc/p5-RDF-Notation3/Makefile
+++ b/textproc/p5-RDF-Notation3/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= RDF Notation3 parser
-BUILD_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX \
p5-RDF-Core>=0:textproc/p5-RDF-Core \
p5-RDFStore>=0:textproc/p5-RDFStore
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-RDF-Query/Makefile b/textproc/p5-RDF-Query/Makefile
index e28d5f13e4bc..3f4fc331f2dd 100644
--- a/textproc/p5-RDF-Query/Makefile
+++ b/textproc/p5-RDF-Query/Makefile
@@ -13,7 +13,8 @@ COMMENT= Complete SPARQL 1.1 Query and Update implementation for RDF::Trine
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-UUID>=0:devel/p5-Data-UUID \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-UUID>=0:devel/p5-Data-UUID \
p5-DateTime-Format-W3CDTF>=0:devel/p5-DateTime-Format-W3CDTF \
p5-Error>=0:lang/p5-Error \
p5-JSON>=2:converters/p5-JSON \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Data-UUID>=0:devel/p5-Data-UUID \
p5-RDF-Trine>=1.004:textproc/p5-RDF-Trine \
p5-Set-Scalar>=0:devel/p5-Set-Scalar \
p5-URI>=1.52:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-JSON>=0:devel/p5-Test-JSON \
p5-YAML>=0:textproc/p5-YAML
diff --git a/textproc/p5-RDF-Simple/Makefile b/textproc/p5-RDF-Simple/Makefile
index 2b3389b783fb..48c373780a88 100644
--- a/textproc/p5-RDF-Simple/Makefile
+++ b/textproc/p5-RDF-Simple/Makefile
@@ -13,13 +13,13 @@ COMMENT= Read and write RDF without complication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-MakeMethods>=0:devel/p5-Class-MakeMethods \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-MakeMethods>=0:devel/p5-Class-MakeMethods \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
p5-URI>=0:net/p5-URI \
p5-XML-SAX>=0:textproc/p5-XML-SAX \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-CaptureOutput>0:devel/p5-IO-CaptureOutput \
p5-Test-File>=0:devel/p5-Test-File
diff --git a/textproc/p5-RDF-Trine/Makefile b/textproc/p5-RDF-Trine/Makefile
index 20865078851e..af20e8099beb 100644
--- a/textproc/p5-RDF-Trine/Makefile
+++ b/textproc/p5-RDF-Trine/Makefile
@@ -14,7 +14,8 @@ COMMENT= RDF Framework for Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Algorithm-Combinatorics>=0:math/p5-Algorithm-Combinatorics \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Algorithm-Combinatorics>=0:math/p5-Algorithm-Combinatorics \
p5-Cache-LRU>=0.04:devel/p5-Cache-LRU \
p5-DBD-SQLite>=1.14:databases/p5-DBD-SQLite \
p5-DBI>=0:databases/p5-DBI \
@@ -38,7 +39,6 @@ BUILD_DEPENDS= p5-Algorithm-Combinatorics>=0:math/p5-Algorithm-Combinatorics \
p5-XML-Namespace>=0:textproc/p5-XML-Namespace \
p5-XML-SAX>=0.96:textproc/p5-XML-SAX \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-RDFStore/Makefile b/textproc/p5-RDFStore/Makefile
index 0e88d8ec0c8e..d1840dd626df 100644
--- a/textproc/p5-RDFStore/Makefile
+++ b/textproc/p5-RDFStore/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl API for RDF Storage
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-URI>=0:net/p5-URI \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= bdb perl5
USE_PERL5= configure
diff --git a/textproc/p5-RTF-Parser/Makefile b/textproc/p5-RTF-Parser/Makefile
index f738afc6294a..3ff00e1855c8 100644
--- a/textproc/p5-RTF-Parser/Makefile
+++ b/textproc/p5-RTF-Parser/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module for parsing RTF files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-RTF-Tokenizer>=1.16:textproc/p5-RTF-Tokenizer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-RTF-Tokenizer>=1.16:textproc/p5-RTF-Tokenizer
CONFLICTS_INSTALL= rtf2html-[0-9]*
diff --git a/textproc/p5-RTF-Writer/Makefile b/textproc/p5-RTF-Writer/Makefile
index b7f9c3589662..f9d11f2454d4 100644
--- a/textproc/p5-RTF-Writer/Makefile
+++ b/textproc/p5-RTF-Writer/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module for generating documents in Rich Text Format
-BUILD_DEPENDS= p5-Image-Size>=0:graphics/p5-Image-Size
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Image-Size>=0:graphics/p5-Image-Size
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Regexp-Common-Email-Address/Makefile b/textproc/p5-Regexp-Common-Email-Address/Makefile
index d02d894fc57a..cc342ebafdd6 100644
--- a/textproc/p5-Regexp-Common-Email-Address/Makefile
+++ b/textproc/p5-Regexp-Common-Email-Address/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Regex pattern for Email Addresses
-BUILD_DEPENDS= p5-Email-Address>=0:mail/p5-Email-Address \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Address>=0:mail/p5-Email-Address \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Regexp-Common-net-CIDR/Makefile b/textproc/p5-Regexp-Common-net-CIDR/Makefile
index 2b4735f03a84..c96b821ddde7 100644
--- a/textproc/p5-Regexp-Common-net-CIDR/Makefile
+++ b/textproc/p5-Regexp-Common-net-CIDR/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Provide patterns for CIDR blocks
-BUILD_DEPENDS= p5-Regexp-Common>0:textproc/p5-Regexp-Common
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Regexp-Common>0:textproc/p5-Regexp-Common
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Regexp-Common-profanity_us/Makefile b/textproc/p5-Regexp-Common-profanity_us/Makefile
index 63ef9a2978dd..53cc5d1c7609 100644
--- a/textproc/p5-Regexp-Common-profanity_us/Makefile
+++ b/textproc/p5-Regexp-Common-profanity_us/Makefile
@@ -14,8 +14,8 @@ COMMENT= Provide regexes for U.S. profanity
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Regexp-Common>=0:textproc/p5-Regexp-Common
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Regexp-Common>=0:textproc/p5-Regexp-Common
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Regexp-Common-time/Makefile b/textproc/p5-Regexp-Common-time/Makefile
index a2a38a9a78e8..027f04f935d9 100644
--- a/textproc/p5-Regexp-Common-time/Makefile
+++ b/textproc/p5-Regexp-Common-time/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= des@FreeBSD.org
COMMENT= Regexp::Common::time - Date and time regexps
-BUILD_DEPENDS= p5-Regexp-Common>0:textproc/p5-Regexp-Common
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Regexp-Common>0:textproc/p5-Regexp-Common
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-SGML-DTDParse/Makefile b/textproc/p5-SGML-DTDParse/Makefile
index 28e96a0a57bc..62d6046364b3 100644
--- a/textproc/p5-SGML-DTDParse/Makefile
+++ b/textproc/p5-SGML-DTDParse/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Parse an SGML or XML DTD
-BUILD_DEPENDS= p5-DelimMatch>=1.05:textproc/p5-DelimMatch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DelimMatch>=1.05:textproc/p5-DelimMatch \
p5-libxml>=0.08:textproc/p5-libxml \
p5-XML-DOM>=1.44:textproc/p5-XML-DOM \
p5-XML-Parser>=2.3:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-SGML-Parser-OpenSP/Makefile b/textproc/p5-SGML-Parser-OpenSP/Makefile
index 54dcef15dcf1..aaaf81e63e46 100644
--- a/textproc/p5-SGML-Parser-OpenSP/Makefile
+++ b/textproc/p5-SGML-Parser-OpenSP/Makefile
@@ -16,10 +16,10 @@ COMMENT= Parse SGML documents using OpenSP
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= onsgmls:textproc/opensp \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= onsgmls:textproc/opensp \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Test-Exception>=0:devel/p5-Test-Exception
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= dos2unix perl5
USE_PERL5= configure
diff --git a/textproc/p5-SVG-Parser/Makefile b/textproc/p5-SVG-Parser/Makefile
index 3a88351552a1..ef1cd5468309 100644
--- a/textproc/p5-SVG-Parser/Makefile
+++ b/textproc/p5-SVG-Parser/Makefile
@@ -14,10 +14,10 @@ COMMENT= XML Parser for SVG documents
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-SVG>=2:textproc/p5-SVG \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SVG>=2:textproc/p5-SVG \
p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= modbuild
USES= perl5
diff --git a/textproc/p5-Search-Elasticsearch-Client-0_90/Makefile b/textproc/p5-Search-Elasticsearch-Client-0_90/Makefile
index 7501bb41f169..9507b5a99431 100644
--- a/textproc/p5-Search-Elasticsearch-Client-0_90/Makefile
+++ b/textproc/p5-Search-Elasticsearch-Client-0_90/Makefile
@@ -13,12 +13,12 @@ COMMENT= ElasticSearch API for 0.90 servers
LICENSE= APACHE20
-BUILD_DEPENDS= p5-Search-Elasticsearch>=5.01:textproc/p5-Search-Elasticsearch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Search-Elasticsearch>=5.01:textproc/p5-Search-Elasticsearch \
p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
p5-Moo>=1.003:devel/p5-Moo \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Log-Any-Adapter-Callback>=0:devel/p5-Log-Any-Adapter-Callback \
diff --git a/textproc/p5-Search-Elasticsearch-Client-1_0/Makefile b/textproc/p5-Search-Elasticsearch-Client-1_0/Makefile
index 9eef3e9d20ae..b8a48b30ad0b 100644
--- a/textproc/p5-Search-Elasticsearch-Client-1_0/Makefile
+++ b/textproc/p5-Search-Elasticsearch-Client-1_0/Makefile
@@ -13,12 +13,12 @@ COMMENT= ElasticSearch API for 1.0 servers
LICENSE= APACHE20
-BUILD_DEPENDS= p5-Search-Elasticsearch>=5.01:textproc/p5-Search-Elasticsearch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Search-Elasticsearch>=5.01:textproc/p5-Search-Elasticsearch \
p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
p5-Moo>=1.003:devel/p5-Moo \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Log-Any-Adapter-Callback>=0:devel/p5-Log-Any-Adapter-Callback \
diff --git a/textproc/p5-Search-Elasticsearch-Client-2_0/Makefile b/textproc/p5-Search-Elasticsearch-Client-2_0/Makefile
index 869d019f135f..9fa3e4cc8a2f 100644
--- a/textproc/p5-Search-Elasticsearch-Client-2_0/Makefile
+++ b/textproc/p5-Search-Elasticsearch-Client-2_0/Makefile
@@ -13,12 +13,12 @@ COMMENT= ElasticSearch API for 2.0 servers
LICENSE= APACHE20
-BUILD_DEPENDS= p5-Search-Elasticsearch>=5.01:textproc/p5-Search-Elasticsearch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Search-Elasticsearch>=5.01:textproc/p5-Search-Elasticsearch \
p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
p5-Moo>=1.003:devel/p5-Moo \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Log-Any-Adapter-Callback>=0:devel/p5-Log-Any-Adapter-Callback \
diff --git a/textproc/p5-Search-Elasticsearch/Makefile b/textproc/p5-Search-Elasticsearch/Makefile
index d6b657bb290d..22f59cfaef65 100644
--- a/textproc/p5-Search-Elasticsearch/Makefile
+++ b/textproc/p5-Search-Elasticsearch/Makefile
@@ -13,7 +13,8 @@ COMMENT= ElasticSearch API
LICENSE= APACHE20
-BUILD_DEPENDS= p5-Any-URI-Escape>=0:www/p5-Any-URI-Escape \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-URI-Escape>=0:www/p5-Any-URI-Escape \
p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-HTTP-Tiny>=0.043:www/p5-HTTP-Tiny \
@@ -29,7 +30,6 @@ BUILD_DEPENDS= p5-Any-URI-Escape>=0:www/p5-Any-URI-Escape \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Log-Any-Adapter-Callback>=0:devel/p5-Log-Any-Adapter-Callback \
diff --git a/textproc/p5-Search-Estraier/Makefile b/textproc/p5-Search-Estraier/Makefile
index 81001e6dd207..8b4edb2d9991 100644
--- a/textproc/p5-Search-Estraier/Makefile
+++ b/textproc/p5-Search-Estraier/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Pure perl module to use Hyper Estraier search engine
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>0:devel/p5-Test-Exception
USES= perl5 shebangfix
diff --git a/textproc/p5-Search-QueryParser-SQL/Makefile b/textproc/p5-Search-QueryParser-SQL/Makefile
index d687ac6a5470..821f5915b6be 100644
--- a/textproc/p5-Search-QueryParser-SQL/Makefile
+++ b/textproc/p5-Search-QueryParser-SQL/Makefile
@@ -12,10 +12,10 @@ COMMENT= Turn free-text queries into SQL WHERE clauses
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-Search-QueryParser>=0.93:textproc/p5-Search-QueryParser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Search-VectorSpace/Makefile b/textproc/p5-Search-VectorSpace/Makefile
index c6a6da0a3def..8f26ffcf5dbc 100644
--- a/textproc/p5-Search-VectorSpace/Makefile
+++ b/textproc/p5-Search-VectorSpace/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Very basic vector-space search engine perl module
-BUILD_DEPENDS= PDL>=0:math/PDL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= PDL>=0:math/PDL \
p5-Lingua-Stem>=0:textproc/p5-Lingua-Stem
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Senna/Makefile b/textproc/p5-Senna/Makefile
index 11714b35067e..c827ec0bc1da 100644
--- a/textproc/p5-Senna/Makefile
+++ b/textproc/p5-Senna/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl module for Embeddable Fulltext Search Engine
LICENSE= LGPL21
-BUILD_DEPENDS= senna-cfg:textproc/senna
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= senna-cfg:textproc/senna
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-Solr/Makefile b/textproc/p5-Solr/Makefile
index d63dec392b2e..4ee165db0bd0 100644
--- a/textproc/p5-Solr/Makefile
+++ b/textproc/p5-Solr/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl extension for interfacing with Solr
LICENSE= APACHE20
-BUILD_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Sphinx-Config/Makefile b/textproc/p5-Sphinx-Config/Makefile
index f41c449920f5..ab75765c3ed0 100644
--- a/textproc/p5-Sphinx-Config/Makefile
+++ b/textproc/p5-Sphinx-Config/Makefile
@@ -13,8 +13,8 @@ COMMENT= Sphinx search engine configuration file read/modify/write
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Sphinx-Manager/Makefile b/textproc/p5-Sphinx-Manager/Makefile
index 55535c77c31d..8a92084f5d8e 100644
--- a/textproc/p5-Sphinx-Manager/Makefile
+++ b/textproc/p5-Sphinx-Manager/Makefile
@@ -13,11 +13,11 @@ COMMENT= Sphinx search engine management (start/stop)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
p5-Sphinx-Config>=0.09:textproc/p5-Sphinx-Config
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/textproc/p5-Sphinx-Search/Makefile b/textproc/p5-Sphinx-Search/Makefile
index db87d2c1d1d8..4fe8606922f9 100644
--- a/textproc/p5-Sphinx-Search/Makefile
+++ b/textproc/p5-Sphinx-Search/Makefile
@@ -14,12 +14,12 @@ COMMENT= Sphinx search engine API Perl client
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-DBI>=0:databases/p5-DBI \
p5-File-SearchPath>=0:devel/p5-File-SearchPath \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Path-Class>=0:devel/p5-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index 2c410a38cb47..208c7209eabc 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -15,10 +15,10 @@ COMMENT= Get information from Excel file
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-RC4>=0:security/p5-Crypt-RC4 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-RC4>=0:security/p5-Crypt-RC4 \
p5-Digest-Perl-MD5>=0:security/p5-Digest-Perl-MD5 \
p5-OLE-Storage_Lite>=0.19:devel/p5-OLE-Storage_Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= sample/parse.pl \
diff --git a/textproc/p5-Spreadsheet-Read/Makefile b/textproc/p5-Spreadsheet-Read/Makefile
index 88494966ef5b..2396785f1e76 100644
--- a/textproc/p5-Spreadsheet-Read/Makefile
+++ b/textproc/p5-Spreadsheet-Read/Makefile
@@ -13,11 +13,11 @@ COMMENT= Read the data from a spreadsheet
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Text-CSV_XS>=0.71:textproc/p5-Text-CSV_XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-CSV_XS>=0.71:textproc/p5-Text-CSV_XS \
p5-Text-CSV>=1.33:textproc/p5-Text-CSV \
p5-Spreadsheet-ReadSXC>=0.20:textproc/p5-Spreadsheet-ReadSXC \
p5-Spreadsheet-ParseExcel>=0.13:textproc/p5-Spreadsheet-ParseExcel
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
USES= perl5 tar:tgz
diff --git a/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile b/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
index cede3f4b803f..8b4709206e36 100644
--- a/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Create an Excel Spreadsheet from XML
-BUILD_DEPENDS= p5-OLE-Storage_Lite>=0:devel/p5-OLE-Storage_Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-OLE-Storage_Lite>=0:devel/p5-OLE-Storage_Lite \
p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index 00e25926db46..ed6ec1e51c56 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -14,11 +14,11 @@ COMMENT= Write to a cross-platform Excel binary file
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Date-Calc>=0:devel/p5-Date-Calc \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Calc>=0:devel/p5-Date-Calc \
p5-Date-Manip>=0:devel/p5-Date-Manip \
p5-OLE-Storage_Lite>=0:devel/p5-OLE-Storage_Lite \
p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/textproc/p5-Spreadsheet-XLSX/Makefile b/textproc/p5-Spreadsheet-XLSX/Makefile
index 9018b7068ca0..1d843ef7007d 100644
--- a/textproc/p5-Spreadsheet-XLSX/Makefile
+++ b/textproc/p5-Spreadsheet-XLSX/Makefile
@@ -9,9 +9,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= Perl extension for reading MS Excel 2007 files
-BUILD_DEPENDS= p5-Spreadsheet-ParseExcel>0:textproc/p5-Spreadsheet-ParseExcel \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Spreadsheet-ParseExcel>0:textproc/p5-Spreadsheet-ParseExcel \
p5-Archive-Zip>=1.18:archivers/p5-Archive-Zip
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-String-Flogger/Makefile b/textproc/p5-String-Flogger/Makefile
index ae5f55d87377..30881260f685 100644
--- a/textproc/p5-String-Flogger/Makefile
+++ b/textproc/p5-String-Flogger/Makefile
@@ -15,10 +15,10 @@ COMMENT= String munging for loggers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Params-Util>0:devel/p5-Params-Util \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Util>0:devel/p5-Params-Util \
p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
p5-JSON>0:converters/p5-JSON
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Simple>=0.82:devel/p5-Test-Simple
USES= perl5
diff --git a/textproc/p5-String-Fraction/Makefile b/textproc/p5-String-Fraction/Makefile
index c0b6bdd5fe27..ba7b4b0216a2 100644
--- a/textproc/p5-String-Fraction/Makefile
+++ b/textproc/p5-String-Fraction/Makefile
@@ -14,8 +14,8 @@ COMMENT= Convert fractions into Unicode chars
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Fraction>=0.40:textproc/p5-HTML-Fraction
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Fraction>=0.40:textproc/p5-HTML-Fraction
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-String-Koremutake/Makefile b/textproc/p5-String-Koremutake/Makefile
index 3341f9545d33..146e7b130002 100644
--- a/textproc/p5-String-Koremutake/Makefile
+++ b/textproc/p5-String-Koremutake/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert to/from Koremutake Memorable Random Strings
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Error>=0:lang/p5-Error \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Error>=0:lang/p5-Error \
p5-Test-Exception>=0:devel/p5-Test-Exception
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-String-Print/Makefile b/textproc/p5-String-Print/Makefile
index e37a7a8c049c..9373e6d7b4cd 100644
--- a/textproc/p5-String-Print/Makefile
+++ b/textproc/p5-String-Print/Makefile
@@ -13,10 +13,10 @@ COMMENT= Alternative of printf
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-TimeDate>=2.30:devel/p5-TimeDate \
p5-Unicode-LineBreak>=0:textproc/p5-Unicode-LineBreak
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/textproc/p5-String-ShowDiff/Makefile b/textproc/p5-String-ShowDiff/Makefile
index 486a242131e9..0a586ac5bfd1 100644
--- a/textproc/p5-String-ShowDiff/Makefile
+++ b/textproc/p5-String-ShowDiff/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl extension to help visualize differences between strings
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-String-ToIdentifier-EN/Makefile b/textproc/p5-String-ToIdentifier-EN/Makefile
index a700b519a18b..7f6a094c6209 100644
--- a/textproc/p5-String-ToIdentifier-EN/Makefile
+++ b/textproc/p5-String-ToIdentifier-EN/Makefile
@@ -13,10 +13,10 @@ COMMENT= Convert Strings to English Program Identifiers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Lingua-EN-Inflect-Phrase>=0:textproc/p5-Lingua-EN-Inflect-Phrase \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-EN-Inflect-Phrase>=0:textproc/p5-Lingua-EN-Inflect-Phrase \
p5-Text-Unidecode>=0:converters/p5-Text-Unidecode \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/textproc/p5-TOML-Parser/Makefile b/textproc/p5-TOML-Parser/Makefile
index 806ce15021f6..c2079882954c 100644
--- a/textproc/p5-TOML-Parser/Makefile
+++ b/textproc/p5-TOML-Parser/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Types-Serialiser>=0:devel/p5-Types-Serialiser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Types-Serialiser>=0:devel/p5-Types-Serialiser
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
PORTSCOUT= limit:^[0-9\.]*$$
diff --git a/textproc/p5-TOML/Makefile b/textproc/p5-TOML/Makefile
index af75d2f43312..74aaa0c8995c 100644
--- a/textproc/p5-TOML/Makefile
+++ b/textproc/p5-TOML/Makefile
@@ -14,8 +14,8 @@ COMMENT= Parser for Tom's Obvious, Minimal Language (TOML) #'
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-TOML-Parser>=0.04:textproc/p5-TOML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-TOML-Parser>=0.04:textproc/p5-TOML-Parser
NO_ARCH= yes
USE_PERL5= modbuildtiny
diff --git a/textproc/p5-TeX-Encode/Makefile b/textproc/p5-TeX-Encode/Makefile
index 75945f239aef..22834e734d00 100644
--- a/textproc/p5-TeX-Encode/Makefile
+++ b/textproc/p5-TeX-Encode/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTML-Parser>=3.35:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3.35:www/p5-HTML-Parser \
p5-Pod-LaTeX>=0.56:textproc/p5-Pod-LaTeX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Template-Extract/Makefile b/textproc/p5-Template-Extract/Makefile
index 2dbdfbaf6635..8d6139b4ea32 100644
--- a/textproc/p5-Template-Extract/Makefile
+++ b/textproc/p5-Template-Extract/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Use TT2 syntax to extract data from documents
-BUILD_DEPENDS= p5-Template-Toolkit>=0:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Template-Toolkit>=0:www/p5-Template-Toolkit
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Template-Magic/Makefile b/textproc/p5-Template-Magic/Makefile
index 7d6b9c9671a8..c43fd7314865 100644
--- a/textproc/p5-Template-Magic/Makefile
+++ b/textproc/p5-Template-Magic/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl Module with magic merger of runtime values with templates
-BUILD_DEPENDS= p5-IO-Util>=0:devel/p5-IO-Util \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Util>=0:devel/p5-IO-Util \
p5-OOTools>=0:devel/p5-OOTools \
p5-HTML-TableTiler>=0:www/p5-HTML-TableTiler
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Template-Plugin-CSV/Makefile b/textproc/p5-Template-Plugin-CSV/Makefile
index 3dcc0d38debe..2ffbe5c442a0 100644
--- a/textproc/p5-Template-Plugin-CSV/Makefile
+++ b/textproc/p5-Template-Plugin-CSV/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= dgeo@centrale-marseille.fr
COMMENT= Template::Plugin::CSV - Plugin for generating CSV
-BUILD_DEPENDS= p5-Template-Toolkit>0:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Template-Toolkit>0:www/p5-Template-Toolkit
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile
index 38a4ad5cce86..07db12fc5499 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile
@@ -14,9 +14,9 @@ COMMENT= CSS::Minifier::XS filter for Template Toolkit
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
p5-Template-Toolkit>=2:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile
index 141852411626..818443e599a1 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile
@@ -14,9 +14,9 @@ COMMENT= CSS::Minifier filter for Template Toolkit
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CSS-Minifier>=0:textproc/p5-CSS-Minifier \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CSS-Minifier>=0:textproc/p5-CSS-Minifier \
p5-Template-Toolkit>=2:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile
index 3d204823e958..fbb595d74cd5 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile
@@ -14,9 +14,9 @@ COMMENT= JavaScript::Minifier::XS filter for Template Toolkit
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS \
p5-Template-Toolkit>=2:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile
index e2eeff46a5df..53599484004c 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile
@@ -14,9 +14,9 @@ COMMENT= JavaScript::Minifier filter for Template Toolkit
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JavaScript-Minifier>=0:textproc/p5-JavaScript-Minifier \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JavaScript-Minifier>=0:textproc/p5-JavaScript-Minifier \
p5-Template-Toolkit>=2:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile b/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile
index ce8a554b8b12..405b3dc88e5a 100644
--- a/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile
+++ b/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Interface Template Toolkit to Lingua::EN::Inflect module
-BUILD_DEPENDS= p5-Template-Toolkit>0:www/p5-Template-Toolkit \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Template-Toolkit>0:www/p5-Template-Toolkit \
p5-HTML-SuperForm>0:textproc/p5-HTML-SuperForm
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
index 91cb3af94193..318d42a5858e 100644
--- a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Interface Template Toolkit to Lingua::EN::Inflect module
-BUILD_DEPENDS= p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Template-Plugin-XML-Escape/Makefile b/textproc/p5-Template-Plugin-XML-Escape/Makefile
index 56c10fdfbd7a..f71dcd3475f7 100644
--- a/textproc/p5-Template-Plugin-XML-Escape/Makefile
+++ b/textproc/p5-Template-Plugin-XML-Escape/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= simarg@gmail.com
COMMENT= Escape variables to suit being placed into XML
-BUILD_DEPENDS= p5-Template-Toolkit>=2.20:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Template-Toolkit>=2.20:www/p5-Template-Toolkit
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Term-QRCode/Makefile b/textproc/p5-Term-QRCode/Makefile
index af52607830b0..d28988dbdf8e 100644
--- a/textproc/p5-Term-QRCode/Makefile
+++ b/textproc/p5-Term-QRCode/Makefile
@@ -14,9 +14,9 @@ COMMENT= Generate QR Code on Terminal
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= libqrencode>=2.0.0:graphics/libqrencode \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= libqrencode>=2.0.0:graphics/libqrencode \
p5-Text-QRCode>0:textproc/p5-Text-QRCode
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Test-Perl-Critic/Makefile b/textproc/p5-Test-Perl-Critic/Makefile
index fb1850b772ec..1231354c12cc 100644
--- a/textproc/p5-Test-Perl-Critic/Makefile
+++ b/textproc/p5-Test-Perl-Critic/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-MCE>=1.827:devel/p5-MCE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MCE>=1.827:devel/p5-MCE \
p5-Perl-Critic>=0:textproc/p5-Perl-Critic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Text-Aligner/Makefile b/textproc/p5-Text-Aligner/Makefile
index 7a9c6007a163..2125caf82dbb 100644
--- a/textproc/p5-Text-Aligner/Makefile
+++ b/textproc/p5-Text-Aligner/Makefile
@@ -13,8 +13,8 @@ COMMENT= Align text in columns
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Term-ANSIColor>=2.02:devel/p5-Term-ANSIColor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ANSIColor>=2.02:devel/p5-Term-ANSIColor
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index 44e93098ba98..9888074d5828 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -16,8 +16,8 @@ COMMENT= Automatic and manual text wrapping and reformating formatting
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Text-Reform>=1.11:textproc/p5-Text-Reform
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Reform>=1.11:textproc/p5-Text-Reform
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-CSV-Encoded/Makefile b/textproc/p5-Text-CSV-Encoded/Makefile
index aa29e6351548..7a83e2143f97 100644
--- a/textproc/p5-Text-CSV-Encoded/Makefile
+++ b/textproc/p5-Text-CSV-Encoded/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Text-CSV>=0:textproc/p5-Text-CSV
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-CSV>=0:textproc/p5-Text-CSV
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-Text-CSV-Hashify/Makefile b/textproc/p5-Text-CSV-Hashify/Makefile
index 2e72e0aa4137..672ea4e3b6d7 100644
--- a/textproc/p5-Text-CSV-Hashify/Makefile
+++ b/textproc/p5-Text-CSV-Hashify/Makefile
@@ -14,8 +14,8 @@ COMMENT= Composition and decomposition of comma-separated values into hashes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Text-CSV>=0:textproc/p5-Text-CSV
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-CSV>=0:textproc/p5-Text-CSV
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-CSV-Simple/Makefile b/textproc/p5-Text-CSV-Simple/Makefile
index 44ceb6517616..c3e73ee79e47 100644
--- a/textproc/p5-Text-CSV-Simple/Makefile
+++ b/textproc/p5-Text-CSV-Simple/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl module for Simpler parsing of CSV files
-BUILD_DEPENDS= p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Class-Trigger>=0:devel/p5-Class-Trigger
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-Colorizer/Makefile b/textproc/p5-Text-Colorizer/Makefile
index c98411bcca6e..34c99d267bc0 100644
--- a/textproc/p5-Text-Colorizer/Makefile
+++ b/textproc/p5-Text-Colorizer/Makefile
@@ -14,9 +14,9 @@ COMMENT= Create colored text from text and color description
LICENSE= ART20 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Readonly>=0:devel/p5-Readonly \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Readonly>=0:devel/p5-Readonly \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-Text-Context/Makefile b/textproc/p5-Text-Context/Makefile
index aca200c50ad1..6460d6a1fd37 100644
--- a/textproc/p5-Text-Context/Makefile
+++ b/textproc/p5-Text-Context/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Handle highlighting search result context snippets
-BUILD_DEPENDS= p5-Text-Context-EitherSide>=1.1:textproc/p5-Text-Context-EitherSide \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Context-EitherSide>=1.1:textproc/p5-Text-Context-EitherSide \
p5-UNIVERSAL-require>=0.03:devel/p5-UNIVERSAL-require \
p5-HTML-Parser>0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-Decorator/Makefile b/textproc/p5-Text-Decorator/Makefile
index f6a44e07d778..532939064b2c 100644
--- a/textproc/p5-Text-Decorator/Makefile
+++ b/textproc/p5-Text-Decorator/Makefile
@@ -14,10 +14,10 @@ COMMENT= Apply a chain of filters to text
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
p5-URI-Find>=0:textproc/p5-URI-Find
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-Text-Diff-HTML/Makefile b/textproc/p5-Text-Diff-HTML/Makefile
index 9fd3030d872f..6543d0e95898 100644
--- a/textproc/p5-Text-Diff-HTML/Makefile
+++ b/textproc/p5-Text-Diff-HTML/Makefile
@@ -14,9 +14,9 @@ COMMENT= Text::Diff::HTML - XHTML format for Text::Diff::Unified
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Text-Diff>=0:textproc/p5-Text-Diff \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Diff>=0:textproc/p5-Text-Diff \
p5-HTML-Parser>=0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-Text-Emoticon-GoogleTalk/Makefile b/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
index 78d2dfff3c45..db702fea312b 100644
--- a/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
+++ b/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Emoticon filter of GoogleTalk
-BUILD_DEPENDS= p5-Text-Emoticon>=0:textproc/p5-Text-Emoticon
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Emoticon>=0:textproc/p5-Text-Emoticon
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-Emoticon-MSN/Makefile b/textproc/p5-Text-Emoticon-MSN/Makefile
index 3b4929848463..19a42e339c2d 100644
--- a/textproc/p5-Text-Emoticon-MSN/Makefile
+++ b/textproc/p5-Text-Emoticon-MSN/Makefile
@@ -13,8 +13,8 @@ COMMENT= Emoticon filter of MSN Messenger
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Text-Emoticon>=0.02:textproc/p5-Text-Emoticon
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Emoticon>=0.02:textproc/p5-Text-Emoticon
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Text-Emoticon/Makefile b/textproc/p5-Text-Emoticon/Makefile
index f4008a100b52..dd26f72d89d9 100644
--- a/textproc/p5-Text-Emoticon/Makefile
+++ b/textproc/p5-Text-Emoticon/Makefile
@@ -14,8 +14,8 @@ COMMENT= Factory class for Yahoo! and MSN emoticons
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Text-EtText/Makefile b/textproc/p5-Text-EtText/Makefile
index 021cc0b52e82..a781ac3fbfc4 100644
--- a/textproc/p5-Text-EtText/Makefile
+++ b/textproc/p5-Text-EtText/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple plain-text to HTML converter
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-Extract-Word/Makefile b/textproc/p5-Text-Extract-Word/Makefile
index c139963852a1..e37755005e89 100644
--- a/textproc/p5-Text-Extract-Word/Makefile
+++ b/textproc/p5-Text-Extract-Word/Makefile
@@ -13,8 +13,8 @@ COMMENT= Simple module for extracting the text from a Microsoft Word file
LICENSE= ART20
-BUILD_DEPENDS= p5-OLE-Storage_Lite>0:devel/p5-OLE-Storage_Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-OLE-Storage_Lite>0:devel/p5-OLE-Storage_Lite
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-FixedLength-Extra/Makefile b/textproc/p5-Text-FixedLength-Extra/Makefile
index 47c1bee87e4a..0c584ab7362f 100644
--- a/textproc/p5-Text-FixedLength-Extra/Makefile
+++ b/textproc/p5-Text-FixedLength-Extra/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Various niceties for p5-Text-FixedLength lovers
-BUILD_DEPENDS= p5-Text-FixedLength>=0:textproc/p5-Text-FixedLength
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-FixedLength>=0:textproc/p5-Text-FixedLength
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-Flow/Makefile b/textproc/p5-Text-Flow/Makefile
index fcd6c035c441..17220e39e54f 100644
--- a/textproc/p5-Text-Flow/Makefile
+++ b/textproc/p5-Text-Flow/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Flexible text flowing and word wrapping for not just ASCII output
-BUILD_DEPENDS= p5-Moose>=0.45:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.45:devel/p5-Moose
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-LongString>=0:devel/p5-Test-LongString
diff --git a/textproc/p5-Text-Graphics/Makefile b/textproc/p5-Text-Graphics/Makefile
index b7a2671ffb2b..f7d0cd506423 100644
--- a/textproc/p5-Text-Graphics/Makefile
+++ b/textproc/p5-Text-Graphics/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Text graphics rendering toolkit
-BUILD_DEPENDS= p5-Text-Wrapper>=0:textproc/p5-Text-Wrapper
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Wrapper>=0:textproc/p5-Text-Wrapper
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-Haml/Makefile b/textproc/p5-Text-Haml/Makefile
index ab8bec4436e4..f18ecaa20e23 100644
--- a/textproc/p5-Text-Haml/Makefile
+++ b/textproc/p5-Text-Haml/Makefile
@@ -11,8 +11,8 @@ COMMENT= Haml-parsing Perl extension
LICENSE= ART20
-BUILD_DEPENDS= p5-URI>0:net/p5-URI
-RUN_DEPENDS= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>0:net/p5-URI
TEST_DEPENDS= p5-Data-Section-Simple>=0:devel/p5-Data-Section-Simple
USES= perl5
diff --git a/textproc/p5-Text-Hatena/Makefile b/textproc/p5-Text-Hatena/Makefile
index ed4d2c1afbd2..0b98a1b2fe95 100644
--- a/textproc/p5-Text-Hatena/Makefile
+++ b/textproc/p5-Text-Hatena/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for formatting text with Hatena Style
-BUILD_DEPENDS= p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent \
p5-Regexp-Assemble>=0.28:devel/p5-Regexp-Assemble
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Base>=0:devel/p5-Test-Base
USES= perl5
diff --git a/textproc/p5-Text-Language-Guess/Makefile b/textproc/p5-Text-Language-Guess/Makefile
index b1182f666439..0c671f014ce0 100644
--- a/textproc/p5-Text-Language-Guess/Makefile
+++ b/textproc/p5-Text-Language-Guess/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= Trained module to guess a document's language
-BUILD_DEPENDS= p5-Log-Log4perl>=1.0:devel/p5-Log-Log4perl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Log4perl>=1.0:devel/p5-Log-Log4perl \
p5-Text-ExtractWords>=0:textproc/p5-Text-ExtractWords \
p5-Lingua-StopWords>=0:textproc/p5-Lingua-StopWords
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-Markdown/Makefile b/textproc/p5-Text-Markdown/Makefile
index 45ad9b21c6c3..d3c5f8297747 100644
--- a/textproc/p5-Text-Markdown/Makefile
+++ b/textproc/p5-Text-Markdown/Makefile
@@ -13,8 +13,8 @@ COMMENT= Markdown Perl5 module
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
TEST_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences \
p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/textproc/p5-Text-MultiMarkdown/Makefile b/textproc/p5-Text-MultiMarkdown/Makefile
index 0a5bb6ad7991..084f1e8f6d98 100644
--- a/textproc/p5-Text-MultiMarkdown/Makefile
+++ b/textproc/p5-Text-MultiMarkdown/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert MultiMarkdown syntax to (X)HTML
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/License.text
-BUILD_DEPENDS= p5-HTML-Parser>0:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>0:www/p5-HTML-Parser \
p5-Text-Markdown>=1.0.26:textproc/p5-Text-Markdown
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/textproc/p5-Text-Ngram/Makefile b/textproc/p5-Text-Ngram/Makefile
index bb5448cc5b9b..85d4ecf040a8 100644
--- a/textproc/p5-Text-Ngram/Makefile
+++ b/textproc/p5-Text-Ngram/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module for n-gram analysis
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Unicode-CaseFold>=1.00:textproc/p5-Unicode-CaseFold
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Unicode-CaseFold>=1.00:textproc/p5-Unicode-CaseFold
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-Padding/Makefile b/textproc/p5-Text-Padding/Makefile
index 50b2b8545814..b24743530638 100644
--- a/textproc/p5-Text-Padding/Makefile
+++ b/textproc/p5-Text-Padding/Makefile
@@ -13,10 +13,10 @@ COMMENT= Simple way of formatting a text
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar \
p5-Text-Truncate>=0:textproc/p5-Text-Truncate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= modbuild
USES= perl5
diff --git a/textproc/p5-Text-ParagraphDiff/Makefile b/textproc/p5-Text-ParagraphDiff/Makefile
index 08eca2c44fae..bd84963ea599 100644
--- a/textproc/p5-Text-ParagraphDiff/Makefile
+++ b/textproc/p5-Text-ParagraphDiff/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Visual difference for paragraphed text
-BUILD_DEPENDS= p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
p5-HTML-Parser>=0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= bin/tdiff
diff --git a/textproc/p5-Text-Prefix-XS/Makefile b/textproc/p5-Text-Prefix-XS/Makefile
index d73dfcb8d976..aef3f53d7ab0 100644
--- a/textproc/p5-Text-Prefix-XS/Makefile
+++ b/textproc/p5-Text-Prefix-XS/Makefile
@@ -14,8 +14,8 @@ COMMENT= Fast prefix searching
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Digest-SHA1>=1:security/p5-Digest-SHA1
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-SHA1>=1:security/p5-Digest-SHA1
TEST_DEPENDS= p5-Test-Deep>=0.108:devel/p5-Test-Deep
USE_PERL5= configure
diff --git a/textproc/p5-Text-Quote/Makefile b/textproc/p5-Text-Quote/Makefile
index d8ec4d6b4cfb..fb11622a5cad 100644
--- a/textproc/p5-Text-Quote/Makefile
+++ b/textproc/p5-Text-Quote/Makefile
@@ -14,8 +14,8 @@ COMMENT= Quotes strings as required for perl to eval them back correctly
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Assert>=0.13:devel/p5-Carp-Assert
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Assert>=0.13:devel/p5-Carp-Assert
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-RecordParser/Makefile b/textproc/p5-Text-RecordParser/Makefile
index 8aa70ab4f66c..790333ae46c0 100644
--- a/textproc/p5-Text-RecordParser/Makefile
+++ b/textproc/p5-Text-RecordParser/Makefile
@@ -11,13 +11,13 @@ COMMENT= Read record-oriented files
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-IO-stringy>=0:devel/p5-IO-stringy \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Readonly>=0:devel/p5-Readonly \
p5-Text-Autoformat>=0:textproc/p5-Text-Autoformat \
p5-Text-TabularDisplay>=1.22:textproc/p5-Text-TabularDisplay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/textproc/p5-Text-Table-Manifold/Makefile b/textproc/p5-Text-Table-Manifold/Makefile
index 26eed9bdb5d3..f0b0a2f29156 100644
--- a/textproc/p5-Text-Table-Manifold/Makefile
+++ b/textproc/p5-Text-Table-Manifold/Makefile
@@ -13,14 +13,14 @@ COMMENT= Render tables in manifold formats
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Const-Exporter>=0.2.3:devel/p5-Const-Exporter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Const-Exporter>=0.2.3:devel/p5-Const-Exporter \
p5-HTML-Entities-Interpolate>=1.05:textproc/p5-HTML-Entities-Interpolate \
p5-List-AllUtils>=0.08:devel/p5-List-AllUtils \
p5-Module-Runtime>=0.014:devel/p5-Module-Runtime \
p5-Moo>=1.006000:devel/p5-Moo \
p5-Type-Tiny>=1.000004:devel/p5-Type-Tiny \
p5-Unicode-LineBreak>=2013.10:textproc/p5-Unicode-LineBreak
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5 tar:tgz
diff --git a/textproc/p5-Text-TestBase/Makefile b/textproc/p5-Text-TestBase/Makefile
index a63105684676..240cbfe86eab 100644
--- a/textproc/p5-Text-TestBase/Makefile
+++ b/textproc/p5-Text-TestBase/Makefile
@@ -13,8 +13,8 @@ COMMENT= Parser for Test::Base format
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite
TEST_DEPENDS= p5-Test-Requires>0:devel/p5-Test-Requires
NO_ARCH= yes
diff --git a/textproc/p5-Text-Trac/Makefile b/textproc/p5-Text-Trac/Makefile
index 9d595de588f2..25e4ae17058a 100644
--- a/textproc/p5-Text-Trac/Makefile
+++ b/textproc/p5-Text-Trac/Makefile
@@ -13,14 +13,14 @@ COMMENT= Perl extension for formatting text with Trac Wiki Style
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
p5-Path-Tiny>=0:devel/p5-Path-Tiny \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Base>=0:devel/p5-Test-Base
USES= perl5
diff --git a/textproc/p5-Text-WikiFormat/Makefile b/textproc/p5-Text-WikiFormat/Makefile
index 3ac910b8b6e4..a211e30596e8 100644
--- a/textproc/p5-Text-WikiFormat/Makefile
+++ b/textproc/p5-Text-WikiFormat/Makefile
@@ -14,8 +14,8 @@ COMMENT= Module for translating Wiki formatted text into other formats
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=0.01:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0.01:net/p5-URI
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Text-WordDiff/Makefile b/textproc/p5-Text-WordDiff/Makefile
index ba57d428ff4b..0f6be95c2a4e 100644
--- a/textproc/p5-Text-WordDiff/Makefile
+++ b/textproc/p5-Text-WordDiff/Makefile
@@ -13,9 +13,9 @@ COMMENT= Track changes between documents
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
p5-HTML-Parser>=0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-Text-WrapI18N/Makefile b/textproc/p5-Text-WrapI18N/Makefile
index 9450b2dbf05c..a6d281e74cbb 100644
--- a/textproc/p5-Text-WrapI18N/Makefile
+++ b/textproc/p5-Text-WrapI18N/Makefile
@@ -14,8 +14,8 @@ COMMENT= Line wrapping module
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Text-CharWidth>=0.02:textproc/p5-Text-CharWidth
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-CharWidth>=0.02:textproc/p5-Text-CharWidth
USE_PERL5= configure
USES= perl5
diff --git a/textproc/p5-Text-vCard/Makefile b/textproc/p5-Text-vCard/Makefile
index 1ace18d23bd9..7657c482d3ab 100644
--- a/textproc/p5-Text-vCard/Makefile
+++ b/textproc/p5-Text-vCard/Makefile
@@ -13,13 +13,13 @@ COMMENT= Package to parse, edit and create multiple vCards (RFC 2426)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Moo>=0:devel/p5-Moo \
p5-Path-Tiny>=0:devel/p5-Path-Tiny \
p5-Text-vFile-asData>=0:devel/p5-Text-vFile-asData \
p5-Unicode-LineBreak>=0:textproc/p5-Unicode-LineBreak \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Directory-Scratch>=0:devel/p5-Directory-Scratch \
p5-Test-Most>=0:devel/p5-Test-Most
diff --git a/textproc/p5-Tk-Pod/Makefile b/textproc/p5-Tk-Pod/Makefile
index c8ab5030bc7f..e28af3571b5a 100644
--- a/textproc/p5-Tk-Pod/Makefile
+++ b/textproc/p5-Tk-Pod/Makefile
@@ -13,8 +13,8 @@ COMMENT= Simple Pod browser with hypertext capabilities in a Toplevel widget
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tk>=800.004:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=800.004:x11-toolkits/p5-Tk
NO_ARCH= yes
USE_PERL5= configure
diff --git a/textproc/p5-Tk-XMLViewer/Makefile b/textproc/p5-Tk-XMLViewer/Makefile
index fc69fdf41cf1..f33bb4f6c4c6 100644
--- a/textproc/p5-Tk-XMLViewer/Makefile
+++ b/textproc/p5-Tk-XMLViewer/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Tk::XMLViewer - Tk widget to display XML
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk \
p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-UML-Class-Simple/Makefile b/textproc/p5-UML-Class-Simple/Makefile
index b0e58c605db0..f7592b3960d3 100644
--- a/textproc/p5-UML-Class-Simple/Makefile
+++ b/textproc/p5-UML-Class-Simple/Makefile
@@ -12,7 +12,8 @@ COMMENT= Render simple UML class diagrams, by loading the code
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Inspector>=1.16:devel/p5-Class-Inspector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Inspector>=1.16:devel/p5-Class-Inspector \
p5-File-Slurp>0:devel/p5-File-Slurp \
p5-IPC-Run3>0:devel/p5-IPC-Run3 \
p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Class-Inspector>=1.16:devel/p5-Class-Inspector \
p5-XML-LibXML>0:textproc/p5-XML-LibXML \
p5-YAML-Syck>0:textproc/p5-YAML-Syck \
dot:graphics/graphviz
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-UML-Sequence/Makefile b/textproc/p5-UML-Sequence/Makefile
index a71933f39dd3..dfcca4817d03 100644
--- a/textproc/p5-UML-Sequence/Makefile
+++ b/textproc/p5-UML-Sequence/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module that produce UML sequence diagrams
-BUILD_DEPENDS= p5-XML-DOM>=1.25:textproc/p5-XML-DOM \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-DOM>=1.25:textproc/p5-XML-DOM \
p5-GD>=2.30:graphics/p5-GD \
p5-GD-TextUtil>=0.86:graphics/p5-GD-TextUtil
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-UML-State/Makefile b/textproc/p5-UML-State/Makefile
index 28ad17c187ef..787b5558652a 100644
--- a/textproc/p5-UML-State/Makefile
+++ b/textproc/p5-UML-State/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module that produce simple UML state diagrams
-BUILD_DEPENDS= p5-XML-DOM>=0:textproc/p5-XML-DOM
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-DOM>=0:textproc/p5-XML-DOM
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-URI-Find/Makefile b/textproc/p5-URI-Find/Makefile
index 7bbcc0b48047..0555d4a60450 100644
--- a/textproc/p5-URI-Find/Makefile
+++ b/textproc/p5-URI-Find/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module to find URIs in arbitrary text
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=1:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=1:net/p5-URI
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-Unicode-Escape/Makefile b/textproc/p5-Unicode-Escape/Makefile
index 039168f500a1..85a48d1daa0f 100644
--- a/textproc/p5-Unicode-Escape/Makefile
+++ b/textproc/p5-Unicode-Escape/Makefile
@@ -14,8 +14,8 @@ COMMENT= Escape and unescape Unicode characters other than ASCII
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Unicode-String>=0:converters/p5-Unicode-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Unicode-String>=0:converters/p5-Unicode-String
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-Unicode-LineBreak/Makefile b/textproc/p5-Unicode-LineBreak/Makefile
index e9132fc1f528..90ad684e851d 100644
--- a/textproc/p5-Unicode-LineBreak/Makefile
+++ b/textproc/p5-Unicode-LineBreak/Makefile
@@ -15,8 +15,8 @@ COMMENT= Unicode-LineBreak package
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MIME-Charset>=1.006.2:mail/p5-MIME-Charset
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MIME-Charset>=1.006.2:mail/p5-MIME-Charset
MAKE_JOBS_UNSAFE= yes
diff --git a/textproc/p5-Validator-Custom/Makefile b/textproc/p5-Validator-Custom/Makefile
index f0a8e07eeffd..26e204b83f5f 100644
--- a/textproc/p5-Validator-Custom/Makefile
+++ b/textproc/p5-Validator-Custom/Makefile
@@ -14,8 +14,8 @@ COMMENT= Validator::Custom for simple data validation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Object-Simple>=3.0621:devel/p5-Object-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Object-Simple>=3.0621:devel/p5-Object-Simple
TEST_DEPENDS= p5-JSON>=2:converters/p5-JSON \
p5-Test-Pod>=1.22:devel/p5-Test-Pod
diff --git a/textproc/p5-Version-Next/Makefile b/textproc/p5-Version-Next/Makefile
index b336a427f4d3..159989a06ed6 100644
--- a/textproc/p5-Version-Next/Makefile
+++ b/textproc/p5-Version-Next/Makefile
@@ -12,8 +12,8 @@ COMMENT= Increment module version numbers simply and correctly
LICENSE= APACHE20
-BUILD_DEPENDS= p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Vroom/Makefile b/textproc/p5-Vroom/Makefile
index 8193bfbc35ae..bbe47134245a 100644
--- a/textproc/p5-Vroom/Makefile
+++ b/textproc/p5-Vroom/Makefile
@@ -15,12 +15,12 @@ COMMENT= Slide Shows in Vim
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-HomeDir>=0:devel/p5-File-HomeDir \
p5-IO-All>=0:devel/p5-IO-All \
p5-Template-Toolkit-Simple>=0:www/p5-Template-Toolkit-Simple \
p5-Term-Size>=0:devel/p5-Term-Size \
p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-WDDX/Makefile b/textproc/p5-WDDX/Makefile
index d6debc8847b0..62b4f0206093 100644
--- a/textproc/p5-WDDX/Makefile
+++ b/textproc/p5-WDDX/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to parse WDDX Packets
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-WWW-Google-SiteMap/Makefile b/textproc/p5-WWW-Google-SiteMap/Makefile
index 0f1d2606c1cb..0ec10ec77925 100644
--- a/textproc/p5-WWW-Google-SiteMap/Makefile
+++ b/textproc/p5-WWW-Google-SiteMap/Makefile
@@ -15,9 +15,9 @@ COMMENT= Perl extension for managing Google SiteMaps
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-Twig>=0:textproc/p5-XML-Twig \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Twig>=0:textproc/p5-XML-Twig \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-WordNet-Similarity/Makefile b/textproc/p5-WordNet-Similarity/Makefile
index 8ad06cb6bd21..15e1ab9f7624 100644
--- a/textproc/p5-WordNet-Similarity/Makefile
+++ b/textproc/p5-WordNet-Similarity/Makefile
@@ -13,10 +13,10 @@ COMMENT= Modules/CLI to determine semantic relatedness using the WordNet
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-Text-Similarity>=0.10:textproc/p5-Text-Similarity \
p5-WordNet-QueryData>=1.49:textproc/p5-WordNet-QueryData
-RUN_DEPENDS:= ${BUILD_DEPENDS}
WNHOME?= ${LOCALBASE}/share/WordNet
diff --git a/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile b/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
index f651bbe27d61..1188906bf90f 100644
--- a/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
+++ b/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= XML::Atom extension for OpenSearch data
-BUILD_DEPENDS= p5-XML-Atom>=0:textproc/p5-XML-Atom
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Atom>=0:textproc/p5-XML-Atom
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Atom-Filter/Makefile b/textproc/p5-XML-Atom-Filter/Makefile
index 216c9fc57151..f2044d45dfb7 100644
--- a/textproc/p5-XML-Atom-Filter/Makefile
+++ b/textproc/p5-XML-Atom-Filter/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Easy creation of command line Atom processing tools
-BUILD_DEPENDS= p5-XML-Atom>=0:textproc/p5-XML-Atom
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Atom>=0:textproc/p5-XML-Atom
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Atom-Stream/Makefile b/textproc/p5-XML-Atom-Stream/Makefile
index e62a91f04df5..fd0bad588005 100644
--- a/textproc/p5-XML-Atom-Stream/Makefile
+++ b/textproc/p5-XML-Atom-Stream/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Client interface for AtomStream
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-XML-SAX>=0.12:textproc/p5-XML-SAX \
p5-XML-Handler-Trees>=0.02:textproc/p5-XML-Handler-Trees \
p5-XML-Atom>=0.20:textproc/p5-XML-Atom \
p5-XML-LibXML>=1.59:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Atom-Syndication/Makefile b/textproc/p5-XML-Atom-Syndication/Makefile
index 5ecf28351831..b5b64bfb4ece 100644
--- a/textproc/p5-XML-Atom-Syndication/Makefile
+++ b/textproc/p5-XML-Atom-Syndication/Makefile
@@ -13,10 +13,10 @@ COMMENT= Simple lightweight client for consuming Atom syndication feeds
LICENSE= ART10
-BUILD_DEPENDS= p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
p5-XML-Elemental>=2:textproc/p5-XML-Elemental \
p5-XML-Writer>=0.6:textproc/p5-XML-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-XML-Atom/Makefile b/textproc/p5-XML-Atom/Makefile
index 502c386a2d73..485b756b553e 100644
--- a/textproc/p5-XML-Atom/Makefile
+++ b/textproc/p5-XML-Atom/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-XML-LibXML>=1.69:textproc/p5-XML-LibXML \
p5-XML-XPath>=0:textproc/p5-XML-XPath \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-XML-Canonical/Makefile b/textproc/p5-XML-Canonical/Makefile
index 62abda2b9b44..e58a16a2cfde 100644
--- a/textproc/p5-XML-Canonical/Makefile
+++ b/textproc/p5-XML-Canonical/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl Implementation of Canonical XML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-GDOME>=0:textproc/p5-XML-GDOME
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-GDOME>=0:textproc/p5-XML-GDOME
LIB_DEPENDS= libgdome.so:textproc/gdome2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5 pkgconfig
diff --git a/textproc/p5-XML-Catalog/Makefile b/textproc/p5-XML-Catalog/Makefile
index 07d6e73496fd..27a65ebba720 100644
--- a/textproc/p5-XML-Catalog/Makefile
+++ b/textproc/p5-XML-Catalog/Makefile
@@ -15,11 +15,11 @@ COMMENT= Resolve public identifiers and remap system identifiers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI \
p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-Text-ParseWords>0:textproc/p5-Text-ParseWords \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= dos2unix perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-CommonNS/Makefile b/textproc/p5-XML-CommonNS/Makefile
index 698ba7195ca6..2eebbd5cab8e 100644
--- a/textproc/p5-XML-CommonNS/Makefile
+++ b/textproc/p5-XML-CommonNS/Makefile
@@ -14,8 +14,8 @@ COMMENT= List of commonly used namespaces
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-NamespaceFactory>=0:textproc/p5-XML-NamespaceFactory
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-NamespaceFactory>=0:textproc/p5-XML-NamespaceFactory
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Compile-Cache/Makefile b/textproc/p5-XML-Compile-Cache/Makefile
index 589665d755f1..3c562217e856 100644
--- a/textproc/p5-XML-Compile-Cache/Makefile
+++ b/textproc/p5-XML-Compile-Cache/Makefile
@@ -13,10 +13,10 @@ COMMENT= Cache Compiled XML Translators
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Report>=1.26:devel/p5-Log-Report \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Report>=1.26:devel/p5-Log-Report \
p5-XML-Compile>=1.60:textproc/p5-XML-Compile \
p5-XML-LibXML-Simple>=0.95:textproc/p5-XML-LibXML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-XML-Compile-Tester>=0.02:devel/p5-XML-Compile-Tester
USES= perl5
diff --git a/textproc/p5-XML-Compile-Dumper/Makefile b/textproc/p5-XML-Compile-Dumper/Makefile
index 3480a6a5cc95..1edfa6f72c15 100644
--- a/textproc/p5-XML-Compile-Dumper/Makefile
+++ b/textproc/p5-XML-Compile-Dumper/Makefile
@@ -14,13 +14,13 @@ COMMENT= Dump Compiled XML Translators
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Dump-Streamer>=2.08:devel/p5-Data-Dump-Streamer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Dump-Streamer>=2.08:devel/p5-Data-Dump-Streamer \
p5-Log-Report>=0.19:devel/p5-Log-Report \
p5-Test-Pod>=1.00:devel/p5-Test-Pod \
p5-XML-Compile-Tester>=0.02:devel/p5-XML-Compile-Tester \
p5-XML-Compile>=1.1:textproc/p5-XML-Compile \
p5-XML-LibXML-Simple>=0.13:textproc/p5-XML-LibXML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Compile/Makefile b/textproc/p5-XML-Compile/Makefile
index b9b58495e5a2..d1b0cb8feb97 100644
--- a/textproc/p5-XML-Compile/Makefile
+++ b/textproc/p5-XML-Compile/Makefile
@@ -13,10 +13,10 @@ COMMENT= Compilation based XML processing
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Report>=1.20:devel/p5-Log-Report \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Report>=1.20:devel/p5-Log-Report \
p5-Types-Serialiser>=0:devel/p5-Types-Serialiser \
p5-XML-LibXML>=2.0107:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0.095:devel/p5-Test-Deep \
p5-XML-Compile-Tester>=0.90:devel/p5-XML-Compile-Tester
diff --git a/textproc/p5-XML-DBMS/Makefile b/textproc/p5-XML-DBMS/Makefile
index d1cda9d87619..e3e577d247ef 100644
--- a/textproc/p5-XML-DBMS/Makefile
+++ b/textproc/p5-XML-DBMS/Makefile
@@ -12,11 +12,11 @@ DISTNAME= perl-${PORTNAME:tl}-${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
COMMENT= Perl port of Java package XML-DBMS v1.0
-BUILD_DEPENDS= p5-libxml>=0:textproc/p5-libxml \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libxml>=0:textproc/p5-libxml \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-TimeDate>=0:devel/p5-TimeDate \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= EXAMPLES
diff --git a/textproc/p5-XML-DOM-XPath/Makefile b/textproc/p5-XML-DOM-XPath/Makefile
index 881d6984dee4..fca7ab1f7e45 100644
--- a/textproc/p5-XML-DOM-XPath/Makefile
+++ b/textproc/p5-XML-DOM-XPath/Makefile
@@ -14,9 +14,9 @@ COMMENT= Adds XPath support to XML::DOM, using XML::XPath engine
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-DOM>=0:textproc/p5-XML-DOM \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-DOM>=0:textproc/p5-XML-DOM \
p5-XML-XPathEngine>=0:textproc/p5-XML-XPathEngine
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-DOM2/Makefile b/textproc/p5-XML-DOM2/Makefile
index 256d9bddc497..856181e799b0 100644
--- a/textproc/p5-XML-DOM2/Makefile
+++ b/textproc/p5-XML-DOM2/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= DOM controlled, strict XML module for extentable xml objects
-BUILD_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-DT/Makefile b/textproc/p5-XML-DT/Makefile
index 39f8d163e919..ea4173364690 100644
--- a/textproc/p5-XML-DT/Makefile
+++ b/textproc/p5-XML-DT/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module for down translation of XML to strings
-BUILD_DEPENDS= p5-XML-LibXML>=1.54:textproc/p5-XML-LibXML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=1.54:textproc/p5-XML-LibXML \
p5-libwww>=1.35:www/p5-libwww \
p5-XML-DTDParser>=2.00:textproc/p5-XML-DTDParser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Declare/Makefile b/textproc/p5-XML-Declare/Makefile
index ae7300f567e9..ed7e464bfafb 100644
--- a/textproc/p5-XML-Declare/Makefile
+++ b/textproc/p5-XML-Declare/Makefile
@@ -14,8 +14,8 @@ COMMENT= Create XML documents with declaration style
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-lib-abs>=0.90:devel/p5-lib-abs \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
diff --git a/textproc/p5-XML-DifferenceMarkup/Makefile b/textproc/p5-XML-DifferenceMarkup/Makefile
index 407f3c37f220..5dd93c02a348 100644
--- a/textproc/p5-XML-DifferenceMarkup/Makefile
+++ b/textproc/p5-XML-DifferenceMarkup/Makefile
@@ -13,8 +13,8 @@ COMMENT= This module implements an XML diff producing XML output
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML
LIB_DEPENDS= libdiffmark.so:textproc/diffmark
USES= perl5
diff --git a/textproc/p5-XML-Directory/Makefile b/textproc/p5-XML-Directory/Makefile
index d878572de4a2..0d2ac417c24e 100644
--- a/textproc/p5-XML-Directory/Makefile
+++ b/textproc/p5-XML-Directory/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Returns a content of directory as XML
-BUILD_DEPENDS= p5-RDF-Notation3>=0:textproc/p5-RDF-Notation3 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-RDF-Notation3>=0:textproc/p5-RDF-Notation3 \
p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Driver-HTML/Makefile b/textproc/p5-XML-Driver-HTML/Makefile
index e6e13233c0d6..24aa93560afb 100644
--- a/textproc/p5-XML-Driver-HTML/Makefile
+++ b/textproc/p5-XML-Driver-HTML/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl SAX Driver for non wellformed HTML
-BUILD_DEPENDS= p5-XML-TreeBuilder>=0:textproc/p5-XML-TreeBuilder \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-TreeBuilder>=0:textproc/p5-XML-TreeBuilder \
p5-XML-Handler-YAWriter>=0:textproc/p5-XML-Handler-YAWriter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Dumper/Makefile b/textproc/p5-XML-Dumper/Makefile
index d5ef22e49010..01495a1f4463 100644
--- a/textproc/p5-XML-Dumper/Makefile
+++ b/textproc/p5-XML-Dumper/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module for dumping Perl objects from/to XML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-XML-Elemental/Makefile b/textproc/p5-XML-Elemental/Makefile
index 196a1553ae4f..edabf75ddb5c 100644
--- a/textproc/p5-XML-Elemental/Makefile
+++ b/textproc/p5-XML-Elemental/Makefile
@@ -13,9 +13,9 @@ COMMENT= Generic classes for simplistic and perlish handling of XML data
LICENSE= ART10
-BUILD_DEPENDS= p5-Task-Weaken>=1.02:devel/p5-Task-Weaken \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Task-Weaken>=1.02:devel/p5-Task-Weaken \
p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-XML-Encoding/Makefile b/textproc/p5-XML-Encoding/Makefile
index 2014d4555c80..497515d28bd0 100644
--- a/textproc/p5-XML-Encoding/Makefile
+++ b/textproc/p5-XML-Encoding/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module for parsing XML encoding maps
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Entities/Makefile b/textproc/p5-XML-Entities/Makefile
index b3790648a151..8543f0d9fa67 100644
--- a/textproc/p5-XML-Entities/Makefile
+++ b/textproc/p5-XML-Entities/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tj@FreeBSD.org
COMMENT= Generic classes for simplistic and perlish handling of XML data
-BUILD_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Feed/Makefile b/textproc/p5-XML-Feed/Makefile
index 7b5d46e153bd..568bd6e9e177 100644
--- a/textproc/p5-XML-Feed/Makefile
+++ b/textproc/p5-XML-Feed/Makefile
@@ -13,7 +13,8 @@ COMMENT= Perl5 modules for Syndication feed parser and auto-discovery
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
p5-DateTime-Format-W3CDTF>=0:devel/p5-DateTime-Format-W3CDTF \
@@ -26,7 +27,6 @@ BUILD_DEPENDS= p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
p5-XML-LibXML>=1.66:textproc/p5-XML-LibXML \
p5-XML-RSS>=1.47:textproc/p5-XML-RSS \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-XML-RSS-LibXML>=0.30.04:textproc/p5-XML-RSS-LibXML
USES= perl5
diff --git a/textproc/p5-XML-FeedPP/Makefile b/textproc/p5-XML-FeedPP/Makefile
index 2a503981fbb5..c6c662742a91 100644
--- a/textproc/p5-XML-FeedPP/Makefile
+++ b/textproc/p5-XML-FeedPP/Makefile
@@ -13,8 +13,8 @@ COMMENT= Parse/write/merge/edit RSS/RDF/Atom syndication feeds
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-TreePP>=0.39:textproc/p5-XML-TreePP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-TreePP>=0.39:textproc/p5-XML-TreePP
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Filter-BufferText/Makefile b/textproc/p5-XML-Filter-BufferText/Makefile
index bb186dcf8f20..213f56e6b73d 100644
--- a/textproc/p5-XML-Filter-BufferText/Makefile
+++ b/textproc/p5-XML-Filter-BufferText/Makefile
@@ -14,8 +14,8 @@ COMMENT= Filter to put all characters() in one event
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
index 7d9084b0732e..7d4d7e064113 100644
--- a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
+++ b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl SAX Filter allowing DOM processing of selected subtrees
-BUILD_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML
TEST_DEPENDS= p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer
NO_ARCH= yes
diff --git a/textproc/p5-XML-Filter-DetectWS/Makefile b/textproc/p5-XML-Filter-DetectWS/Makefile
index 36fd11787811..606bf4a2673f 100644
--- a/textproc/p5-XML-Filter-DetectWS/Makefile
+++ b/textproc/p5-XML-Filter-DetectWS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= PerlSAX filter that detects ignorable whitespace
-BUILD_DEPENDS= p5-XML-Filter-SAXT>=0:textproc/p5-XML-Filter-SAXT
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Filter-SAXT>=0:textproc/p5-XML-Filter-SAXT
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Filter-GenericChunk/Makefile b/textproc/p5-XML-Filter-GenericChunk/Makefile
index dd458a939123..f7481f3db44d 100644
--- a/textproc/p5-XML-Filter-GenericChunk/Makefile
+++ b/textproc/p5-XML-Filter-GenericChunk/Makefile
@@ -14,9 +14,9 @@ COMMENT= Base Class for SAX Filters parsing WellBallanced Chunks
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-LibXML>=1.4:textproc/p5-XML-LibXML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=1.4:textproc/p5-XML-LibXML \
p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Filter-Reindent/Makefile b/textproc/p5-XML-Filter-Reindent/Makefile
index 3bfee7f00741..199e23370ff5 100644
--- a/textproc/p5-XML-Filter-Reindent/Makefile
+++ b/textproc/p5-XML-Filter-Reindent/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Reformats whitespace for pretty printing XML
-BUILD_DEPENDS= p5-XML-Filter-DetectWS>=0:textproc/p5-XML-Filter-DetectWS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Filter-DetectWS>=0:textproc/p5-XML-Filter-DetectWS
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Filter-SAX1toSAX2/Makefile b/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
index e029d98ba0a9..41d8dd6ba858 100644
--- a/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
+++ b/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert SAX1 events to SAX2
-BUILD_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX \
p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Filter-XInclude/Makefile b/textproc/p5-XML-Filter-XInclude/Makefile
index a617e3f00647..e8846a555ec3 100644
--- a/textproc/p5-XML-Filter-XInclude/Makefile
+++ b/textproc/p5-XML-Filter-XInclude/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= XInclude as a SAX Filter
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI \
p5-XML-SAX>=0:textproc/p5-XML-SAX \
p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
MAKE_JOBS_UNSAFE= yes
diff --git a/textproc/p5-XML-Filter-XSLT/Makefile b/textproc/p5-XML-Filter-XSLT/Makefile
index d6914c43ad27..f09889fd0a57 100644
--- a/textproc/p5-XML-Filter-XSLT/Makefile
+++ b/textproc/p5-XML-Filter-XSLT/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= XSLT as a SAX Filter
-BUILD_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX \
p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
p5-XML-LibXSLT>=0:textproc/p5-XML-LibXSLT
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Flow/Makefile b/textproc/p5-XML-Flow/Makefile
index 6f55029a9096..34b88ca96f95 100644
--- a/textproc/p5-XML-Flow/Makefile
+++ b/textproc/p5-XML-Flow/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Store (restore) perl data structures in XML stream
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-XML-Writer>=0:textproc/p5-XML-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-GDOME/Makefile b/textproc/p5-XML-GDOME/Makefile
index 218d90ba6c4c..87d4b5b2dd82 100644
--- a/textproc/p5-XML-GDOME/Makefile
+++ b/textproc/p5-XML-GDOME/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl module that provides the DOM Level 2 Core API for XML documents
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-XML-SAX>=0:textproc/p5-XML-SAX
LIB_DEPENDS= libgdome.so:textproc/gdome2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 pkgconfig
USE_PERL5= configure
diff --git a/textproc/p5-XML-Generator-DBI/Makefile b/textproc/p5-XML-Generator-DBI/Makefile
index e9109bbad6df..b64258b96bc0 100644
--- a/textproc/p5-XML-Generator-DBI/Makefile
+++ b/textproc/p5-XML-Generator-DBI/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Generate SAX events from SQL queries
-BUILD_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Generator-PerlData/Makefile b/textproc/p5-XML-Generator-PerlData/Makefile
index c23d1f1b7eaa..81138e9fa7d1 100644
--- a/textproc/p5-XML-Generator-PerlData/Makefile
+++ b/textproc/p5-XML-Generator-PerlData/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl extension for generating SAX2 events from Perl data structures
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-SAX-Base>=1.02:textproc/p5-XML-SAX-Base
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SAX-Base>=1.02:textproc/p5-XML-SAX-Base
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Grove/Makefile b/textproc/p5-XML-Grove/Makefile
index ff06aa335f06..f84c60294ee8 100644
--- a/textproc/p5-XML-Grove/Makefile
+++ b/textproc/p5-XML-Grove/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl-style XML objects
LICENSE= ART10
-BUILD_DEPENDS= p5-libxml>=0:textproc/p5-libxml
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libxml>=0:textproc/p5-libxml
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Handler-Dtd2DocBook/Makefile b/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
index 30a58c095072..1e8f6940e4d9 100644
--- a/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
+++ b/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Generate a DocBook documentation from a DTD
-BUILD_DEPENDS= p5-libxml>=0:textproc/p5-libxml \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libxml>=0:textproc/p5-libxml \
p5-XML-Handler-Dtd2Html>=0.41:textproc/p5-XML-Handler-Dtd2Html
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Handler-Dtd2Html/Makefile b/textproc/p5-XML-Handler-Dtd2Html/Makefile
index eb767216e313..0681dac0e11f 100644
--- a/textproc/p5-XML-Handler-Dtd2Html/Makefile
+++ b/textproc/p5-XML-Handler-Dtd2Html/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= SAX2 handler for generate a Html documentation from a DTD
-BUILD_DEPENDS= p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent \
p5-HTML-Template>=2.8:www/p5-HTML-Template \
p5-XML-Parser>=2.3:textproc/p5-XML-Parser \
p5-XML-SAX-Expat>=0.37:textproc/p5-XML-SAX-Expat \
p5-XML-SAX-Writer>=0.44:textproc/p5-XML-SAX-Writer \
p5-libxml>=0.08:textproc/p5-libxml
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Handler-HTMLWriter/Makefile b/textproc/p5-XML-Handler-HTMLWriter/Makefile
index 6d174882db69..faa0d96cacee 100644
--- a/textproc/p5-XML-Handler-HTMLWriter/Makefile
+++ b/textproc/p5-XML-Handler-HTMLWriter/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= PerlSAX handlers for outputting HTML
-BUILD_DEPENDS= p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
p5-HTML-Parser>=0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Handler-YAWriter/Makefile b/textproc/p5-XML-Handler-YAWriter/Makefile
index 41e2a0c05faf..a73a9be6605f 100644
--- a/textproc/p5-XML-Handler-YAWriter/Makefile
+++ b/textproc/p5-XML-Handler-YAWriter/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Yet another Perl SAX XML Writer
-BUILD_DEPENDS= p5-libxml>=0:textproc/p5-libxml
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libxml>=0:textproc/p5-libxml
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Hash-LX/Makefile b/textproc/p5-XML-Hash-LX/Makefile
index ba3958a2c815..ae6020fe48bd 100644
--- a/textproc/p5-XML-Hash-LX/Makefile
+++ b/textproc/p5-XML-Hash-LX/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert hash to xml and xml to hash using LibXML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-lib-abs>=0.90:devel/p5-lib-abs \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-lib-abs>=0.90:devel/p5-lib-abs \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-XML-LibXML-Cache/Makefile b/textproc/p5-XML-LibXML-Cache/Makefile
index 996c3dc1297c..41966be3d3fc 100644
--- a/textproc/p5-XML-LibXML-Cache/Makefile
+++ b/textproc/p5-XML-LibXML-Cache/Makefile
@@ -14,10 +14,10 @@ COMMENT= Document cache for XML::LibXML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI \
p5-XML-LibXML>=1.59:textproc/p5-XML-LibXML \
p5-XML-LibXSLT>=1.59:textproc/p5-XML-LibXSLT
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Touch>=0:devel/p5-File-Touch \
p5-Test-Deep>=0:devel/p5-Test-Deep
diff --git a/textproc/p5-XML-LibXML-Iterator/Makefile b/textproc/p5-XML-LibXML-Iterator/Makefile
index 1320516ea843..c90cba4c7084 100644
--- a/textproc/p5-XML-LibXML-Iterator/Makefile
+++ b/textproc/p5-XML-LibXML-Iterator/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= XML::LibXML::Iterator is an iterator for XML::LibXML parsed documents
-BUILD_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-XML-NodeFilter>=0:textproc/p5-XML-NodeFilter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-LibXML-PrettyPrint/Makefile b/textproc/p5-XML-LibXML-PrettyPrint/Makefile
index ce0d80be7ad6..fdd2ba286672 100644
--- a/textproc/p5-XML-LibXML-PrettyPrint/Makefile
+++ b/textproc/p5-XML-LibXML-PrettyPrint/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
p5-XML-LibXML>=1.62:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Warnings>=0:devel/p5-Test-Warnings
NO_ARCH= yes
diff --git a/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile b/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile
index 3df45e143c55..2bfc0332dda6 100644
--- a/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile
+++ b/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile
@@ -13,9 +13,9 @@ COMMENT= Parse XML chunks via LibXML SAX
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-LibXML>=1.66:textproc/p5-XML-LibXML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=1.66:textproc/p5-XML-LibXML \
p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USE_PERL5= modbuild
diff --git a/textproc/p5-XML-LibXML-Simple/Makefile b/textproc/p5-XML-LibXML-Simple/Makefile
index 3ae39d6d482b..8b74b763fda4 100644
--- a/textproc/p5-XML-LibXML-Simple/Makefile
+++ b/textproc/p5-XML-LibXML-Simple/Makefile
@@ -13,9 +13,9 @@ COMMENT= XML::LibXML clone of XML::Simple::XMLin()
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
p5-XML-LibXML>=1.64:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index 0f55183c80c8..0296c06e8c62 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -14,9 +14,9 @@ COMMENT= Interface to Gnome libxml2 library
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-NamespaceSupport>=1.07:textproc/p5-XML-NamespaceSupport \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-NamespaceSupport>=1.07:textproc/p5-XML-NamespaceSupport \
p5-XML-SAX>=0.11:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
p5-URI>=0:net/p5-URI
diff --git a/textproc/p5-XML-LibXSLT/Makefile b/textproc/p5-XML-LibXSLT/Makefile
index ae7f60c2efc5..8b5037772e77 100644
--- a/textproc/p5-XML-LibXSLT/Makefile
+++ b/textproc/p5-XML-LibXSLT/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl interface to the GNOME XSLT library
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= gnome perl5 pkgconfig
USE_GNOME= libxml2 libxslt
diff --git a/textproc/p5-XML-Liberal/Makefile b/textproc/p5-XML-Liberal/Makefile
index e92def232a78..58a08cca47c1 100644
--- a/textproc/p5-XML-Liberal/Makefile
+++ b/textproc/p5-XML-Liberal/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Super liberal XML parser that parses broken XML
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
p5-Module-Pluggable-Fast>=0.16:devel/p5-Module-Pluggable-Fast \
p5-XML-LibXML>=1.58:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Literal/Makefile b/textproc/p5-XML-Literal/Makefile
index 8bfddb6d6f39..f5b8bc5d1328 100644
--- a/textproc/p5-XML-Literal/Makefile
+++ b/textproc/p5-XML-Literal/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Syntax support for XML literals
-BUILD_DEPENDS= p5-Sub-Override>=0:devel/p5-Sub-Override
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Override>=0:devel/p5-Sub-Override
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index 0f3552ba40d9..bd0f5a5cb5fe 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl5 module to extend and simplify XML::Parser
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-NodeFilter/Makefile b/textproc/p5-XML-NodeFilter/Makefile
index cd18762bc170..8ae934cfaf57 100644
--- a/textproc/p5-XML-NodeFilter/Makefile
+++ b/textproc/p5-XML-NodeFilter/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= XML::NodeFilter is an object that know how to "filter out" nodes
-BUILD_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-OPML/Makefile b/textproc/p5-XML-OPML/Makefile
index 996f8d93d5dc..6fd05d6711d3 100644
--- a/textproc/p5-XML-OPML/Makefile
+++ b/textproc/p5-XML-OPML/Makefile
@@ -14,9 +14,9 @@ COMMENT= Creates and updates OPML (Outline Processor Markup Language) files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-XML-SimpleObject>=0:textproc/p5-XML-SimpleObject
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Parser-EasyTree/Makefile b/textproc/p5-XML-Parser-EasyTree/Makefile
index 02c4950936f4..11bff3ae1e74 100644
--- a/textproc/p5-XML-Parser-EasyTree/Makefile
+++ b/textproc/p5-XML-Parser-EasyTree/Makefile
@@ -14,8 +14,8 @@ COMMENT= Easier tree style for XML::Parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Parser-Style-EasyTree/Makefile b/textproc/p5-XML-Parser-Style-EasyTree/Makefile
index 6e22b0376c89..cf4aa6b86ea7 100644
--- a/textproc/p5-XML-Parser-Style-EasyTree/Makefile
+++ b/textproc/p5-XML-Parser-Style-EasyTree/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Parse XML to a simple tree
-BUILD_DEPENDS= p5-XML-Parser>0:textproc/p5-XML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>0:textproc/p5-XML-Parser \
p5-ex-lib>=0.03:devel/p5-ex-lib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-RAI/Makefile b/textproc/p5-XML-RAI/Makefile
index 13437e6825db..73510299091a 100644
--- a/textproc/p5-XML-RAI/Makefile
+++ b/textproc/p5-XML-RAI/Makefile
@@ -13,9 +13,9 @@ COMMENT= RSS Abstraction Interface
LICENSE= ART10
-BUILD_DEPENDS= p5-XML-RSS-Parser>=0:textproc/p5-XML-RSS-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-RSS-Parser>=0:textproc/p5-XML-RSS-Parser \
p5-TimeDate>=0:devel/p5-TimeDate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-XML-RSS-Feed/Makefile b/textproc/p5-XML-RSS-Feed/Makefile
index 7ef79be1282f..8e4665f3eb35 100644
--- a/textproc/p5-XML-RSS-Feed/Makefile
+++ b/textproc/p5-XML-RSS-Feed/Makefile
@@ -15,11 +15,11 @@ COMMENT= Persistent XML RSS encapsulation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Clone>=0:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0:devel/p5-Clone \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-URI>=0:net/p5-URI \
p5-XML-RSS>=0:textproc/p5-XML-RSS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-XML-RSS-LibXML/Makefile b/textproc/p5-XML-RSS-LibXML/Makefile
index f7e7eac1827e..c9c099281316 100644
--- a/textproc/p5-XML-RSS-LibXML/Makefile
+++ b/textproc/p5-XML-RSS-LibXML/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
p5-DateTime-Format-W3CDTF>=0:devel/p5-DateTime-Format-W3CDTF \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
p5-XML-LibXML>=1.66:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Warn>=0:devel/p5-Test-Warn
diff --git a/textproc/p5-XML-RSS-Liberal/Makefile b/textproc/p5-XML-RSS-Liberal/Makefile
index a8c7c595decc..74e65cb546e7 100644
--- a/textproc/p5-XML-RSS-Liberal/Makefile
+++ b/textproc/p5-XML-RSS-Liberal/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= XML::RSS With A Liberal Parser
-BUILD_DEPENDS= p5-XML-Liberal>=0:textproc/p5-XML-Liberal \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Liberal>=0:textproc/p5-XML-Liberal \
p5-XML-RSS-LibXML>=0:textproc/p5-XML-RSS-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-XML-Reader/Makefile b/textproc/p5-XML-Reader/Makefile
index 6bebf358edf7..fba37d560668 100644
--- a/textproc/p5-XML-Reader/Makefile
+++ b/textproc/p5-XML-Reader/Makefile
@@ -12,8 +12,8 @@ COMMENT= Reading XML and providing path information based on a pull-parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Acme-HTTP>=0:net/p5-Acme-HTTP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Acme-HTTP>=0:net/p5-Acme-HTTP
TEST_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-XML-Parsepp>=0:textproc/p5-XML-Parsepp
diff --git a/textproc/p5-XML-SAX-ExpatXS/Makefile b/textproc/p5-XML-SAX-ExpatXS/Makefile
index 92e0bd93fcc1..a0c1dd36760c 100644
--- a/textproc/p5-XML-SAX-ExpatXS/Makefile
+++ b/textproc/p5-XML-SAX-ExpatXS/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= PerlSAX2 XS extension to Expat parser
-BUILD_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX
LIB_DEPENDS= libexpat.so:textproc/expat2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-SAX-Machines/Makefile b/textproc/p5-XML-SAX-Machines/Makefile
index 3298a40f0713..a337edaa642e 100644
--- a/textproc/p5-XML-SAX-Machines/Makefile
+++ b/textproc/p5-XML-SAX-Machines/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Manage collections of SAX processors
-BUILD_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SAX>=0:textproc/p5-XML-SAX \
p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-SAX-Simple/Makefile b/textproc/p5-XML-SAX-Simple/Makefile
index ac2d4c4da9d7..9cadda537be2 100644
--- a/textproc/p5-XML-SAX-Simple/Makefile
+++ b/textproc/p5-XML-SAX-Simple/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-XML-Handler-Trees>=0.2:textproc/p5-XML-Handler-Trees \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Handler-Trees>=0.2:textproc/p5-XML-Handler-Trees \
p5-XML-SAX>=0.99:textproc/p5-XML-SAX \
p5-XML-Simple>=2.22:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-SAX-Writer/Makefile b/textproc/p5-XML-SAX-Writer/Makefile
index fd76c335c5d2..df93925cc652 100644
--- a/textproc/p5-XML-SAX-Writer/Makefile
+++ b/textproc/p5-XML-SAX-Writer/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-XML-Filter-BufferText>=1.00:textproc/p5-XML-Filter-BufferText \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Filter-BufferText>=1.00:textproc/p5-XML-Filter-BufferText \
p5-XML-NamespaceSupport>=1.00:textproc/p5-XML-NamespaceSupport \
p5-XML-SAX-Base>=1.01:textproc/p5-XML-SAX-Base
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-XML-SAX/Makefile b/textproc/p5-XML-SAX/Makefile
index 624a87a4213c..c637df8c09d7 100644
--- a/textproc/p5-XML-SAX/Makefile
+++ b/textproc/p5-XML-SAX/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple API for XML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-NamespaceSupport>=0.03:textproc/p5-XML-NamespaceSupport \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-NamespaceSupport>=0.03:textproc/p5-XML-NamespaceSupport \
p5-XML-SAX-Base>=1.05:textproc/p5-XML-SAX-Base
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-XML-SAXDriver-CSV/Makefile b/textproc/p5-XML-SAXDriver-CSV/Makefile
index 8b27736fbe4b..80fdb9ef046b 100644
--- a/textproc/p5-XML-SAXDriver-CSV/Makefile
+++ b/textproc/p5-XML-SAXDriver-CSV/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl SAX driver for converting CSV files to XML
-BUILD_DEPENDS= p5-Text-CSV_XS>=0.22:textproc/p5-Text-CSV_XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-CSV_XS>=0.22:textproc/p5-Text-CSV_XS \
p5-XML-Handler-YAWriter>=0:textproc/p5-XML-Handler-YAWriter \
p5-XML-SAX>=0.14:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 dos2unix
USE_PERL5= configure
diff --git a/textproc/p5-XML-SAXDriver-Excel/Makefile b/textproc/p5-XML-SAXDriver-Excel/Makefile
index be9b648c7b57..5d4b441f7e05 100644
--- a/textproc/p5-XML-SAXDriver-Excel/Makefile
+++ b/textproc/p5-XML-SAXDriver-Excel/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl SAX driver for converting Excel files to XML
-BUILD_DEPENDS= p5-Spreadsheet-ParseExcel>=0.2603:textproc/p5-Spreadsheet-ParseExcel \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Spreadsheet-ParseExcel>=0.2603:textproc/p5-Spreadsheet-ParseExcel \
p5-XML-SAX>=0.14:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 dos2unix
USE_PERL5= configure
diff --git a/textproc/p5-XML-STX/Makefile b/textproc/p5-XML-STX/Makefile
index 9d39bc37f7c2..6c4115298c31 100644
--- a/textproc/p5-XML-STX/Makefile
+++ b/textproc/p5-XML-STX/Makefile
@@ -14,10 +14,10 @@ COMMENT= Pure Perl STX processor
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Clone>=0:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0:devel/p5-Clone \
p5-XML-NamespaceSupport>=0:textproc/p5-XML-NamespaceSupport \
p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
USE_PERL5= configure
diff --git a/textproc/p5-XML-Schematron/Makefile b/textproc/p5-XML-Schematron/Makefile
index 56808a421b60..575f38dc7502 100644
--- a/textproc/p5-XML-Schematron/Makefile
+++ b/textproc/p5-XML-Schematron/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl implementation of the Schematron
-BUILD_DEPENDS= p5-libxml>=0:textproc/p5-libxml \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libxml>=0:textproc/p5-libxml \
p5-Check-ISA>=0:devel/p5-Check-ISA \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-NonMoose>=0:devel/p5-MooseX-NonMoose \
p5-MooseX-Traits>=0:devel/p5-MooseX-Traits \
p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
p5-XML-Filter-BufferText>=0:textproc/p5-XML-Filter-BufferText
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-SemanticDiff/Makefile b/textproc/p5-XML-SemanticDiff/Makefile
index 591d6c42a33e..46dc43a8b1b8 100644
--- a/textproc/p5-XML-SemanticDiff/Makefile
+++ b/textproc/p5-XML-SemanticDiff/Makefile
@@ -13,8 +13,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
NO_ARCH= yes
USES= perl5
diff --git a/textproc/p5-XML-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 3d7fdb7095aa..bb66353e1e6a 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-XML-SAX>=0.15:textproc/p5-XML-SAX \
p5-XML-SAX-Expat>=0:textproc/p5-XML-SAX-Expat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
MAKE_JOBS_UNSAFE= yes
NO_ARCH= yes
diff --git a/textproc/p5-XML-SimpleObject/Makefile b/textproc/p5-XML-SimpleObject/Makefile
index c9c6b548131e..4d39a689a4fb 100644
--- a/textproc/p5-XML-SimpleObject/Makefile
+++ b/textproc/p5-XML-SimpleObject/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= API for accessing the structure of an XML document
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
WRKSRC?= ${WRKDIR}/${PORTNAME}${PORTVERSION}
diff --git a/textproc/p5-XML-Smart/Makefile b/textproc/p5-XML-Smart/Makefile
index 8ac48d186ccf..bb7003ea35ea 100644
--- a/textproc/p5-XML-Smart/Makefile
+++ b/textproc/p5-XML-Smart/Makefile
@@ -15,9 +15,9 @@ COMMENT= Smart, easy and powerful way to access/create XML files/data
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Object-MultiType>=0.03:devel/p5-Object-MultiType \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Object-MultiType>=0.03:devel/p5-Object-MultiType \
p5-XML-XPath>=0:textproc/p5-XML-XPath
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-Devel-Cycle>=0:devel/p5-Devel-Cycle
diff --git a/textproc/p5-XML-Stream/Makefile b/textproc/p5-XML-Stream/Makefile
index b59e4c6fbffa..7e66a7399775 100644
--- a/textproc/p5-XML-Stream/Makefile
+++ b/textproc/p5-XML-Stream/Makefile
@@ -13,8 +13,8 @@ COMMENT= XML::Stream provides you with access to XML Stream
LICENSE= LGPL21
-BUILD_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-TokeParser/Makefile b/textproc/p5-XML-TokeParser/Makefile
index 8d2dda9cf401..3a2891487005 100644
--- a/textproc/p5-XML-TokeParser/Makefile
+++ b/textproc/p5-XML-TokeParser/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mike@urgle.com
COMMENT= Simplified interface to XML::Parser
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-Toolkit/Makefile b/textproc/p5-XML-Toolkit/Makefile
index 47132cd574d5..e665c03c6318 100644
--- a/textproc/p5-XML-Toolkit/Makefile
+++ b/textproc/p5-XML-Toolkit/Makefile
@@ -15,7 +15,8 @@ COMMENT= Suit of XML tools with Antlers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Bread-Board>=0:devel/p5-Bread-Board \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bread-Board>=0:devel/p5-Bread-Board \
p5-Devel-PackagePath>=0.01:devel/p5-Devel-PackagePath \
p5-Moose>=0.92:devel/p5-Moose \
p5-MooseX-Aliases>=0:devel/p5-MooseX-Aliases \
@@ -30,7 +31,6 @@ BUILD_DEPENDS= p5-Bread-Board>=0:devel/p5-Bread-Board \
p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
p5-aliased>=0:devel/p5-aliased \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-XML>=0:devel/p5-Test-XML
diff --git a/textproc/p5-XML-TreeBuilder/Makefile b/textproc/p5-XML-TreeBuilder/Makefile
index 2a6f7f3a49b6..8840e3527791 100644
--- a/textproc/p5-XML-TreeBuilder/Makefile
+++ b/textproc/p5-XML-TreeBuilder/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl module to make XML document trees
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Tagset>=3.02:www/p5-HTML-Tagset \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Tagset>=3.02:www/p5-HTML-Tagset \
p5-HTML-Tree>=4.1:www/p5-HTML-Tree \
p5-XML-Catalog>=1.0.2:textproc/p5-XML-Catalog \
p5-XML-Parser>0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-TreePP/Makefile b/textproc/p5-XML-TreePP/Makefile
index e2f4d740f7b4..511f5afdcb37 100644
--- a/textproc/p5-XML-TreePP/Makefile
+++ b/textproc/p5-XML-TreePP/Makefile
@@ -13,8 +13,8 @@ COMMENT= Pure Perl implementation for parsing/writing xml files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=5.811:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=5.811:www/p5-libwww
TEST_DEPENDS= p5-HTTP-Lite>=0:www/p5-HTTP-Lite \
p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
diff --git a/textproc/p5-XML-Twig/Makefile b/textproc/p5-XML-Twig/Makefile
index 077b13af4238..20bb2a20d319 100644
--- a/textproc/p5-XML-Twig/Makefile
+++ b/textproc/p5-XML-Twig/Makefile
@@ -13,13 +13,13 @@ COMMENT= Process huge XML documents by chunks via a tree interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Tree>=3.13:www/p5-HTML-Tree \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Tree>=3.13:www/p5-HTML-Tree \
p5-Text-Iconv>=0:converters/p5-Text-Iconv \
p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-XML-XPath>=0:textproc/p5-XML-XPath \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-CaptureOutput>=0:devel/p5-IO-CaptureOutput \
p5-XML-Handler-YAWriter>=0:textproc/p5-XML-Handler-YAWriter \
p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
diff --git a/textproc/p5-XML-Validate/Makefile b/textproc/p5-XML-Validate/Makefile
index 22d95775886b..ae643d44a8d7 100644
--- a/textproc/p5-XML-Validate/Makefile
+++ b/textproc/p5-XML-Validate/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= XML validator factory
-BUILD_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-Log-TraceMessages>=0:devel/p5-Log-TraceMessages
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Assertions>0:devel/p5-Test-Assertions
USES= perl5
diff --git a/textproc/p5-XML-Validator-Schema/Makefile b/textproc/p5-XML-Validator-Schema/Makefile
index 6713501456f9..1392a8f5e76b 100644
--- a/textproc/p5-XML-Validator-Schema/Makefile
+++ b/textproc/p5-XML-Validator-Schema/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module for validating XML documents against a W3C XML Schema
-BUILD_DEPENDS= p5-Tree-DAG_Node>=0:devel/p5-Tree-DAG_Node \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tree-DAG_Node>=0:devel/p5-Tree-DAG_Node \
p5-XML-SAX>=0:textproc/p5-XML-SAX \
p5-XML-Filter-BufferText>=0:textproc/p5-XML-Filter-BufferText
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-XBEL/Makefile b/textproc/p5-XML-XBEL/Makefile
index 109947997d46..dc962650c2f1 100644
--- a/textproc/p5-XML-XBEL/Makefile
+++ b/textproc/p5-XML-XBEL/Makefile
@@ -14,9 +14,9 @@ COMMENT= OOP for reading and writing XBEL documents
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-TimeDate>=0:devel/p5-TimeDate \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-TimeDate>=0:devel/p5-TimeDate \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-XML-XML2JSON/Makefile b/textproc/p5-XML-XML2JSON/Makefile
index c467352b8a57..4f742ce678fc 100644
--- a/textproc/p5-XML-XML2JSON/Makefile
+++ b/textproc/p5-XML-XML2JSON/Makefile
@@ -14,8 +14,8 @@ COMMENT= Convert XML into JSON (and back again) using XML::LibXML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-LibXML>=1.59:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=1.59:textproc/p5-XML-LibXML
# the order of options follows the search order of JSON module by XML::XML2JSON
OPTIONS_MULTI= JSON_BACKEND
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index 3267d8da5969..59cd3bad61c6 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -13,8 +13,8 @@ COMMENT= Modules for parsing and evaluating XPath statements
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-XML-Parser>=2.23:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=2.23:textproc/p5-XML-Parser
TEST_DEPENDS= p5-Path-Tiny>=0.076:devel/p5-Path-Tiny
NO_ARCH= yes
@@ -24,7 +24,8 @@ USE_PERL5= configure
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 502501
-BUILD_DEPENDS+= p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS+= p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils
RUN_DEPENDS+= p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils
.endif
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index 2e01412b6e37..2417f822fe65 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module for querying XML tree structures with XQL
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-Date-Manip>=0:devel/p5-Date-Manip \
p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
p5-XML-DOM>=0:textproc/p5-XML-DOM
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-XSLT/Makefile b/textproc/p5-XML-XSLT/Makefile
index 8365e20eba1f..c8b0f0d195b5 100644
--- a/textproc/p5-XML-XSLT/Makefile
+++ b/textproc/p5-XML-XSLT/Makefile
@@ -14,8 +14,8 @@ COMMENT= XML::XSLT - A perl module for processing XSLT
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-DOM>=0:textproc/p5-XML-DOM
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-DOM>=0:textproc/p5-XML-DOM
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-XML-XUpdate-LibXML/Makefile b/textproc/p5-XML-XUpdate-LibXML/Makefile
index 272e8090e35d..f88f80d752ad 100644
--- a/textproc/p5-XML-XUpdate-LibXML/Makefile
+++ b/textproc/p5-XML-XUpdate-LibXML/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lev@FreeBSD.org
COMMENT= Simple implementation of XUpdate format based on and XML::LibXML
-BUILD_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-XML-LibXML-Iterator>=0:textproc/p5-XML-LibXML-Iterator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-ack/Makefile b/textproc/p5-ack/Makefile
index be6b32721741..a7a4330de6be 100644
--- a/textproc/p5-ack/Makefile
+++ b/textproc/p5-ack/Makefile
@@ -14,8 +14,8 @@ COMMENT= Grep-like text finder for large trees of text
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-BUILD_DEPENDS= p5-File-Next>=1.16:sysutils/p5-File-Next
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Next>=1.16:sysutils/p5-File-Next
TEST_DEPENDS= bash:shells/bash \
p5-IO-Tty>=0:devel/p5-IO-Tty
diff --git a/textproc/p5-libxml/Makefile b/textproc/p5-libxml/Makefile
index 7607c8c69076..73abffc55a66 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/Makefile
@@ -15,8 +15,8 @@ COMMENT= Collection of Perl5 modules for working with XML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
USES= perl5
USE_PERL5= configure