aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/p5-Archive-Any-Plugin-Rar/Makefile4
-rw-r--r--archivers/p5-Archive-Any/Makefile4
-rw-r--r--archivers/p5-Archive-Extract-Libarchive/Makefile4
-rw-r--r--archivers/p5-Archive-Peek/Makefile4
-rw-r--r--archivers/p5-Archive-Rar/Makefile4
-rw-r--r--archivers/p5-Archive-SimpleExtractor/Makefile4
-rw-r--r--archivers/p5-Archive-Tar-Wrapper/Makefile4
-rw-r--r--archivers/p5-Compress-LZW/Makefile4
-rw-r--r--archivers/p5-IO-Compress-Lzf/Makefile4
-rw-r--r--archivers/p5-IO-Compress-Lzma/Makefile4
-rw-r--r--archivers/p5-IO-Compress-Lzop/Makefile4
-rw-r--r--archivers/p5-IO-Compress/Makefile4
-rw-r--r--archivers/p5-POE-Filter-Bzip2/Makefile4
-rw-r--r--archivers/p5-POE-Filter-LZF/Makefile4
-rw-r--r--archivers/p5-POE-Filter-LZO/Makefile4
-rw-r--r--archivers/p5-POE-Filter-LZW/Makefile4
-rw-r--r--archivers/p5-POE-Filter-Zlib/Makefile4
-rw-r--r--archivers/p5-PerlIO-via-Bzip2/Makefile4
-rw-r--r--astro/p5-Astro-ADS/Makefile4
-rw-r--r--astro/p5-Astro-App-Satpass2/Makefile4
-rw-r--r--astro/p5-Astro-Catalog/Makefile4
-rw-r--r--astro/p5-Astro-Coords/Makefile4
-rw-r--r--astro/p5-Astro-DSS/Makefile4
-rw-r--r--astro/p5-Astro-Flux/Makefile4
-rw-r--r--astro/p5-Astro-SIMBAD-Client/Makefile4
-rw-r--r--astro/p5-Astro-SIMBAD/Makefile4
-rw-r--r--astro/p5-Astro-Telescope/Makefile4
-rw-r--r--astro/p5-GPS-Babel/Makefile4
-rw-r--r--astro/p5-GPS/Makefile4
-rw-r--r--astro/p5-Starlink-AST/Makefile4
-rw-r--r--astro/p5-Weather-Underground/Makefile4
-rw-r--r--audio/p5-Audio-MPD-Common/Makefile4
-rw-r--r--audio/p5-Audio-MPD/Makefile4
-rw-r--r--audio/p5-Audio-Musepack/Makefile4
-rw-r--r--audio/p5-Audio-Scrobbler/Makefile4
-rw-r--r--audio/p5-Audio-Wav/Makefile4
-rw-r--r--audio/p5-Audio/Makefile4
-rw-r--r--audio/p5-MP3-Find/Makefile4
-rw-r--r--audio/p5-MP3-Tag-Utils/Makefile4
-rw-r--r--audio/p5-MusicBrainz-DiscID/Makefile4
-rw-r--r--audio/p5-Net-FreeDB/Makefile4
-rw-r--r--audio/p5-Ogg-Vorbis-Header/Makefile4
-rw-r--r--audio/p5-Test-Corpus-Audio-MPD/Makefile4
-rw-r--r--biology/p5-AcePerl/Makefile4
-rw-r--r--biology/p5-Bio-ASN1-EntrezGene/Makefile4
-rw-r--r--biology/p5-Bio-Coordinate/Makefile4
-rw-r--r--biology/p5-Bio-Das-Lite/Makefile4
-rw-r--r--biology/p5-Bio-Das/Makefile4
-rw-r--r--biology/p5-Bio-FeatureIO/Makefile4
-rw-r--r--biology/p5-Bio-GFF3/Makefile4
-rw-r--r--biology/p5-Bio-Glite/Makefile4
-rw-r--r--biology/p5-Bio-Graphics/Makefile4
-rw-r--r--biology/p5-Bio-MAGETAB/Makefile4
-rw-r--r--biology/p5-Bio-NEXUS/Makefile4
-rw-r--r--biology/p5-Bio-Phylo/Makefile4
-rw-r--r--biology/p5-Bio-SCF/Makefile4
-rw-r--r--biology/p5-BioPerl-Run/Makefile4
-rw-r--r--biology/p5-BioPerl/Makefile4
-rw-r--r--chinese/p5-Lingua-Han-PinYin/Makefile4
-rw-r--r--chinese/p5-Lingua-Han-Utils/Makefile4
-rw-r--r--chinese/p5-Lingua-ZH-Keywords/Makefile4
-rw-r--r--chinese/p5-Lingua-ZH-Summarize/Makefile4
-rw-r--r--chinese/p5-Lingua-ZH-Toke/Makefile4
-rw-r--r--comms/p5-Device-Modem/Makefile4
-rw-r--r--comms/p5-Nexmo-SMS/Makefile4
-rw-r--r--comms/p5-SMS-Send-DeviceGsm/Makefile4
-rw-r--r--comms/p5-SMS-Send-NexmoUnicode/Makefile4
-rw-r--r--comms/p5-SMS-Send-TW-HiAir/Makefile4
-rw-r--r--comms/p5-SMS-Send-TW-ShareSMS/Makefile4
-rw-r--r--comms/p5-SMS-Send/Makefile4
-rw-r--r--converters/p5-Boulder/Makefile4
-rw-r--r--converters/p5-Convert-TNEF/Makefile4
-rw-r--r--converters/p5-Encode-compat/Makefile4
-rw-r--r--converters/p5-JSON-MaybeXS/Makefile4
-rw-r--r--converters/p5-JSON-XS/Makefile4
-rw-r--r--converters/p5-LaTeXML/Makefile4
-rw-r--r--converters/p5-Number-Nary/Makefile4
-rw-r--r--converters/p5-Sereal/Makefile4
-rw-r--r--converters/p5-Unicode-Map8/Makefile4
-rw-r--r--converters/p5-Unicode-MapUTF8/Makefile4
-rw-r--r--converters/p5-Unicode-Stringprep/Makefile4
-rw-r--r--converters/p5-WAP-wbxml/Makefile4
-rw-r--r--databases/p5-Amazon-SimpleDB/Makefile4
-rw-r--r--databases/p5-AnyEvent-BDB/Makefile4
-rw-r--r--databases/p5-AnyEvent-Redis/Makefile4
-rw-r--r--databases/p5-App-Sqitch/Makefile4
-rw-r--r--databases/p5-BDB/Makefile4
-rw-r--r--databases/p5-Bucardo/Makefile4
-rw-r--r--databases/p5-CDB_File-Generator/Makefile4
-rw-r--r--databases/p5-Cache-BDB/Makefile4
-rw-r--r--databases/p5-Cache-Memcached-Managed/Makefile4
-rw-r--r--databases/p5-Cache-Memcached-libmemcached/Makefile4
-rw-r--r--databases/p5-Class-DBI-AsForm/Makefile4
-rw-r--r--databases/p5-Class-DBI-AutoLoader/Makefile4
-rw-r--r--databases/p5-Class-DBI-DDL/Makefile4
-rw-r--r--databases/p5-Class-DBI-LazyInflate/Makefile4
-rw-r--r--databases/p5-Class-DBI-Loader-Relationship/Makefile4
-rw-r--r--databases/p5-Class-DBI-Oracle/Makefile4
-rw-r--r--databases/p5-Class-DBI-Pg/Makefile4
-rw-r--r--databases/p5-Class-DBI-Plugin-AbstractCount/Makefile4
-rw-r--r--databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile4
-rw-r--r--databases/p5-Class-DBI-Plugin-Pager/Makefile4
-rw-r--r--databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile4
-rw-r--r--databases/p5-Class-DBI-Plugin-Type/Makefile4
-rw-r--r--databases/p5-Class-DBI-Plugin/Makefile4
-rw-r--r--databases/p5-Class-DBI-Replication/Makefile4
-rw-r--r--databases/p5-Class-DBI-Sweet/Makefile4
-rw-r--r--databases/p5-Class-DBI-Untaint/Makefile4
-rw-r--r--databases/p5-Class-DBI-mysql/Makefile4
-rw-r--r--databases/p5-Class-DBI/Makefile4
-rw-r--r--databases/p5-CouchDB-View/Makefile4
-rw-r--r--databases/p5-DBD-AnyData/Makefile4
-rw-r--r--databases/p5-DBD-CSV/Makefile4
-rw-r--r--databases/p5-DBD-Excel/Makefile4
-rw-r--r--databases/p5-DBD-Google/Makefile4
-rw-r--r--databases/p5-DBD-InterBase/Makefile4
-rw-r--r--databases/p5-DBD-LDAP/Makefile4
-rw-r--r--databases/p5-DBD-Mock/Makefile4
-rw-r--r--databases/p5-DBD-Multi/Makefile4
-rw-r--r--databases/p5-DBD-ODBC/Makefile4
-rw-r--r--databases/p5-DBD-Pg/Makefile4
-rw-r--r--databases/p5-DBD-SQLite/Makefile4
-rw-r--r--databases/p5-DBD-Sybase/Makefile4
-rw-r--r--databases/p5-DBD-mysql/Makefile3
-rw-r--r--databases/p5-DBICx-Sugar/Makefile4
-rw-r--r--databases/p5-DBICx-TestDatabase/Makefile4
-rw-r--r--databases/p5-DBICx-TxnInsert/Makefile4
-rw-r--r--databases/p5-DBIWrapper/Makefile4
-rw-r--r--databases/p5-DBIx-Admin-CreateTable/Makefile4
-rw-r--r--databases/p5-DBIx-Admin-DSNManager/Makefile4
-rw-r--r--databases/p5-DBIx-Admin-TableInfo/Makefile4
-rw-r--r--databases/p5-DBIx-AnyDBD/Makefile4
-rw-r--r--databases/p5-DBIx-Class-Candy/Makefile4
-rw-r--r--databases/p5-DBIx-Class-Cursor-Cached/Makefile4
-rw-r--r--databases/p5-DBIx-Class-DateTime-Epoch/Makefile4
-rw-r--r--databases/p5-DBIx-Class-DynamicDefault/Makefile4
-rw-r--r--databases/p5-DBIx-Class-EncodedColumn/Makefile4
-rw-r--r--databases/p5-DBIx-Class-Loader/Makefile4
-rw-r--r--databases/p5-DBIx-Class-QueryLog/Makefile4
-rw-r--r--databases/p5-DBIx-Class-ResultSet-HashRef/Makefile4
-rw-r--r--databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile4
-rw-r--r--databases/p5-DBIx-Class-Schema-Config/Makefile4
-rw-r--r--databases/p5-DBIx-Class-Schema-Loader/Makefile4
-rw-r--r--databases/p5-DBIx-Class-Schema-PopulateMore/Makefile4
-rw-r--r--databases/p5-DBIx-Class-UUIDColumns/Makefile4
-rw-r--r--databases/p5-DBIx-Class/Makefile4
-rw-r--r--databases/p5-DBIx-Custom/Makefile4
-rw-r--r--databases/p5-DBIx-DBSchema/Makefile4
-rw-r--r--databases/p5-DBIx-Handler/Makefile4
-rw-r--r--databases/p5-DBIx-Lite/Makefile4
-rw-r--r--databases/p5-DBIx-Log4perl/Makefile4
-rw-r--r--databases/p5-DBIx-NoSQL/Makefile4
-rw-r--r--databases/p5-DBIx-Password/Makefile4
-rw-r--r--databases/p5-DBIx-Perlish/Makefile4
-rw-r--r--databases/p5-DBIx-Recordset/Makefile4
-rw-r--r--databases/p5-DBIx-RetryOverDisconnects/Makefile4
-rw-r--r--databases/p5-DBIx-SQLEngine/Makefile4
-rw-r--r--databases/p5-DBIx-SQLite-Simple/Makefile4
-rw-r--r--databases/p5-DBIx-Safe/Makefile4
-rw-r--r--databases/p5-DBIx-SearchBuilder/Makefile4
-rw-r--r--databases/p5-DBIx-Simple/Makefile4
-rw-r--r--databases/p5-DBIx-Sunny/Makefile4
-rw-r--r--databases/p5-DBIx-TableHash/Makefile4
-rw-r--r--databases/p5-DBIx-Tree/Makefile4
-rw-r--r--databases/p5-DBIx-Wrapper/Makefile4
-rw-r--r--databases/p5-DBIx-XHTML_Table/Makefile4
-rw-r--r--databases/p5-DBIx-XML_RDB/Makefile4
-rw-r--r--databases/p5-DR-Tarantool/Makefile4
-rw-r--r--databases/p5-Dancer-Plugin-DBIC/Makefile4
-rw-r--r--databases/p5-Dancer-Plugin-Database-Core/Makefile4
-rw-r--r--databases/p5-Dancer-Plugin-Database/Makefile4
-rw-r--r--databases/p5-Dancer-Plugin-Redis/Makefile4
-rw-r--r--databases/p5-Dancer-Session-Memcached/Makefile4
-rw-r--r--databases/p5-Dancer2-Plugin-DBIC/Makefile4
-rw-r--r--databases/p5-Dancer2-Plugin-Database/Makefile4
-rw-r--r--databases/p5-Data-Page/Makefile4
-rw-r--r--databases/p5-Data-Pageset/Makefile4
-rw-r--r--databases/p5-HTML-FormHandler-Model-DBIC/Makefile4
-rw-r--r--databases/p5-Ima-DBI/Makefile4
-rw-r--r--databases/p5-Interchange6-Schema/Makefile4
-rw-r--r--databases/p5-Iterator-DBI/Makefile4
-rw-r--r--databases/p5-Jifty-DBI/Makefile4
-rw-r--r--databases/p5-MLDBM-Sync/Makefile4
-rw-r--r--databases/p5-MLDBM/Makefile4
-rw-r--r--databases/p5-MR-Tarantool/Makefile4
-rw-r--r--databases/p5-Mango/Makefile4
-rw-r--r--databases/p5-Metadata/Makefile4
-rw-r--r--databases/p5-MySQL-Diff/Makefile4
-rw-r--r--databases/p5-Net-Async-CassandraCQL/Makefile4
-rw-r--r--databases/p5-ORLite-Migrate/Makefile4
-rw-r--r--databases/p5-ORLite/Makefile4
-rw-r--r--databases/p5-Oryx/Makefile4
-rw-r--r--databases/p5-POE-Component-DBIAgent/Makefile4
-rw-r--r--databases/p5-POE-Component-EasyDBI/Makefile4
-rw-r--r--databases/p5-POE-Component-LaDBI/Makefile4
-rw-r--r--databases/p5-POE-Component-RRDTool/Makefile4
-rw-r--r--databases/p5-Prophet/Makefile4
-rw-r--r--databases/p5-Protocol-CassandraCQL/Makefile4
-rw-r--r--databases/p5-RRD-Simple/Makefile4
-rw-r--r--databases/p5-Redis/Makefile4
-rw-r--r--databases/p5-Relations-Query/Makefile4
-rw-r--r--databases/p5-ResourcePool-Resource-DBI/Makefile4
-rw-r--r--databases/p5-Rose-DB-Object/Makefile4
-rw-r--r--databases/p5-Rose-DB/Makefile4
-rw-r--r--databases/p5-SQL-Abstract-More/Makefile4
-rw-r--r--databases/p5-SQL-Abstract/Makefile4
-rw-r--r--databases/p5-SQL-ReservedWords/Makefile4
-rw-r--r--databases/p5-SQL-Statement/Makefile4
-rw-r--r--databases/p5-SQL-Translator/Makefile4
-rw-r--r--databases/p5-SQLite-Work/Makefile4
-rw-r--r--databases/p5-Search-InvertedIndex/Makefile4
-rw-r--r--databases/p5-Search-Xapian10/Makefile4
-rw-r--r--databases/p5-Store-CouchDB/Makefile4
-rw-r--r--databases/p5-T2/Makefile4
-rw-r--r--databases/p5-Tangram/Makefile4
-rw-r--r--databases/p5-Template-DBI/Makefile4
-rw-r--r--databases/p5-Test-Cukes/Makefile4
-rw-r--r--databases/p5-Test-Database/Makefile4
-rw-r--r--databases/p5-Test-DatabaseRow/Makefile4
-rw-r--r--databases/p5-Text-Query-SQL/Makefile4
-rw-r--r--databases/p5-mysql-genocide/Makefile4
-rw-r--r--deskutils/p5-Data-ICal/Makefile4
-rw-r--r--deskutils/p5-Goo/Makefile4
-rw-r--r--devel/p5-AI-Pathfinding-AStar/Makefile4
-rw-r--r--devel/p5-Acme-MetaSyntactic/Makefile4
-rw-r--r--devel/p5-Agent/Makefile4
-rw-r--r--devel/p5-Algorithm-Accounting/Makefile4
-rw-r--r--devel/p5-Algorithm-Annotate/Makefile4
-rw-r--r--devel/p5-Algorithm-Bucketizer/Makefile4
-rw-r--r--devel/p5-Algorithm-Dependency-Objects/Makefile4
-rw-r--r--devel/p5-Algorithm-Dependency/Makefile4
-rw-r--r--devel/p5-Algorithm-Evolutionary/Makefile4
-rw-r--r--devel/p5-Algorithm-FloodControl/Makefile4
-rw-r--r--devel/p5-Algorithm-IncludeExclude/Makefile4
-rw-r--r--devel/p5-Algorithm-Networksort/Makefile4
-rw-r--r--devel/p5-Alzabo/Makefile4
-rw-r--r--devel/p5-Any-Daemon/Makefile4
-rw-r--r--devel/p5-Any-Moose-Convert/Makefile4
-rw-r--r--devel/p5-AnyData/Makefile4
-rw-r--r--devel/p5-AnyEvent-DBI-Abstract/Makefile4
-rw-r--r--devel/p5-AnyEvent-DBI/Makefile4
-rw-r--r--devel/p5-AnyEvent-Gearman/Makefile4
-rw-r--r--devel/p5-AnyEvent-RPC/Makefile4
-rw-r--r--devel/p5-AnyEvent-Subprocess/Makefile4
-rw-r--r--devel/p5-AnyEvent-Worker/Makefile4
-rw-r--r--devel/p5-AnyMQ/Makefile4
-rw-r--r--devel/p5-App-Build/Makefile4
-rw-r--r--devel/p5-App-CLI-Extension/Makefile4
-rw-r--r--devel/p5-App-Cmd/Makefile4
-rw-r--r--devel/p5-App-GitGot/Makefile7
-rw-r--r--devel/p5-App-GitHub/Makefile4
-rw-r--r--devel/p5-App-SD/Makefile4
-rw-r--r--devel/p5-App-SVN-Bisect/Makefile4
-rw-r--r--devel/p5-App-Trace/Makefile4
-rw-r--r--devel/p5-App-cpanminus-reporter/Makefile4
-rw-r--r--devel/p5-App-cpanoutdated/Makefile4
-rw-r--r--devel/p5-App-perlbrew/Makefile4
-rw-r--r--devel/p5-Array-Window/Makefile4
-rw-r--r--devel/p5-B-C/Makefile4
-rw-r--r--devel/p5-B-Hooks-EndOfScope/Makefile4
-rw-r--r--devel/p5-B-Hooks-OP-Annotation/Makefile4
-rw-r--r--devel/p5-B-OPCheck/Makefile6
-rw-r--r--devel/p5-BZ-Client/Makefile4
-rw-r--r--devel/p5-Best/Makefile4
-rw-r--r--devel/p5-Bread-Board-Declare/Makefile4
-rw-r--r--devel/p5-Bread-Board/Makefile4
-rw-r--r--devel/p5-CBOR-XS/Makefile4
-rw-r--r--devel/p5-CHI-Driver-DBI/Makefile4
-rw-r--r--devel/p5-CPAN-Checksums/Makefile4
-rw-r--r--devel/p5-CPAN-Inject/Makefile4
-rw-r--r--devel/p5-CPAN-Recent-Uploads/Makefile4
-rw-r--r--devel/p5-CPAN-Reporter-Smoker/Makefile4
-rw-r--r--devel/p5-CPAN-Reporter/Makefile4
-rw-r--r--devel/p5-CPAN-SQLite/Makefile4
-rw-r--r--devel/p5-CPAN-Site/Makefile4
-rw-r--r--devel/p5-CPAN-Testers-Common-Client/Makefile4
-rw-r--r--devel/p5-CPAN-Testers-Report/Makefile4
-rw-r--r--devel/p5-CPAN-Uploader/Makefile4
-rw-r--r--devel/p5-CPANPLUS-Dist-Build/Makefile4
-rw-r--r--devel/p5-CPANPLUS/Makefile4
-rw-r--r--devel/p5-CPS/Makefile4
-rw-r--r--devel/p5-Cache-AgainstFile/Makefile4
-rw-r--r--devel/p5-Cache-Cache/Makefile4
-rw-r--r--devel/p5-Cache-Memcached-Tie/Makefile4
-rw-r--r--devel/p5-Carp-Always-Color/Makefile4
-rw-r--r--devel/p5-Carp-Assert-More/Makefile4
-rw-r--r--devel/p5-Carp-Clan-Share/Makefile4
-rw-r--r--devel/p5-Carp-Datum/Makefile4
-rw-r--r--devel/p5-Carp-REPL/Makefile4
-rw-r--r--devel/p5-Class-Accessor-Children/Makefile4
-rw-r--r--devel/p5-Class-Accessor-Complex/Makefile4
-rw-r--r--devel/p5-Class-Accessor-Fast-Contained/Makefile4
-rw-r--r--devel/p5-Class-Accessor-Grouped/Makefile4
-rw-r--r--devel/p5-Class-Accessor-Installer/Makefile4
-rw-r--r--devel/p5-Class-Accessor-Lvalue/Makefile4
-rw-r--r--devel/p5-Class-AlzaboWrapper/Makefile4
-rw-r--r--devel/p5-Class-AutoClass/Makefile4
-rw-r--r--devel/p5-Class-Base/Makefile4
-rw-r--r--devel/p5-Class-C3-Componentised/Makefile4
-rw-r--r--devel/p5-Class-Closure/Makefile4
-rw-r--r--devel/p5-Class-CodeStyler/Makefile4
-rw-r--r--devel/p5-Class-Component/Makefile4
-rw-r--r--devel/p5-Class-Container/Makefile4
-rw-r--r--devel/p5-Class-Date/Makefile4
-rw-r--r--devel/p5-Class-Default/Makefile4
-rw-r--r--devel/p5-Class-Fields/Makefile4
-rw-r--r--devel/p5-Class-Handle/Makefile4
-rw-r--r--devel/p5-Class-InsideOut/Makefile4
-rw-r--r--devel/p5-Class-Load-XS/Makefile4
-rw-r--r--devel/p5-Class-Load/Makefile4
-rw-r--r--devel/p5-Class-Mix/Makefile4
-rw-r--r--devel/p5-Class-Observable/Makefile4
-rw-r--r--devel/p5-Class-ReturnValue/Makefile4
-rw-r--r--devel/p5-Class-StateMachine/Makefile4
-rw-r--r--devel/p5-Class-Std-Fast/Makefile4
-rw-r--r--devel/p5-Class-Tangram/Makefile4
-rw-r--r--devel/p5-Class-Unload/Makefile4
-rw-r--r--devel/p5-Class-Virtual/Makefile4
-rw-r--r--devel/p5-Class-Workflow/Makefile4
-rw-r--r--devel/p5-Code-Perl/Makefile4
-rw-r--r--devel/p5-Config-ApacheFormat/Makefile4
-rw-r--r--devel/p5-Config-Auto/Makefile4
-rw-r--r--devel/p5-Config-AutoConf/Makefile4
-rw-r--r--devel/p5-Config-GitLike/Makefile4
-rw-r--r--devel/p5-Config-INI-Reader-Ordered/Makefile4
-rw-r--r--devel/p5-Config-INI-Simple/Makefile4
-rw-r--r--devel/p5-Config-INI/Makefile4
-rw-r--r--devel/p5-Config-Identity/Makefile4
-rw-r--r--devel/p5-Config-IniFiles/Makefile4
-rw-r--r--devel/p5-Config-IniHash/Makefile4
-rw-r--r--devel/p5-Config-JFDI/Makefile4
-rw-r--r--devel/p5-Config-JSON/Makefile4
-rw-r--r--devel/p5-Config-MVP-Reader-INI/Makefile4
-rw-r--r--devel/p5-Config-MVP/Makefile4
-rw-r--r--devel/p5-Config-Merge/Makefile4
-rw-r--r--devel/p5-Config-Model-Tester/Makefile4
-rw-r--r--devel/p5-Config-Model/Makefile4
-rw-r--r--devel/p5-Config-Objective/Makefile4
-rw-r--r--devel/p5-Config-Validator/Makefile4
-rw-r--r--devel/p5-Connector/Makefile4
-rw-r--r--devel/p5-Const-Exporter/Makefile4
-rw-r--r--devel/p5-Contextual-Return/Makefile4
-rw-r--r--devel/p5-Coro/Makefile6
-rw-r--r--devel/p5-Curses-Application/Makefile4
-rw-r--r--devel/p5-Curses-Forms/Makefile4
-rw-r--r--devel/p5-Curses-UI/Makefile4
-rw-r--r--devel/p5-Curses-Widgets/Makefile4
-rw-r--r--devel/p5-Dancer-Debug/Makefile4
-rw-r--r--devel/p5-Danga-Socket/Makefile4
-rw-r--r--devel/p5-Data-ACL/Makefile4
-rw-r--r--devel/p5-Data-Bind/Makefile4
-rw-r--r--devel/p5-Data-ClearSilver-HDF/Makefile4
-rw-r--r--devel/p5-Data-Compare/Makefile4
-rw-r--r--devel/p5-Data-Domain/Makefile4
-rw-r--r--devel/p5-Data-Dump-Streamer/Makefile4
-rw-r--r--devel/p5-Data-HexDump-Range/Makefile4
-rw-r--r--devel/p5-Data-JavaScript-Anon/Makefile4
-rw-r--r--devel/p5-Data-Object/Makefile4
-rw-r--r--devel/p5-Data-ObjectDriver/Makefile4
-rw-r--r--devel/p5-Data-OptList/Makefile4
-rw-r--r--devel/p5-Data-Perl/Makefile4
-rw-r--r--devel/p5-Data-Printer/Makefile4
-rw-r--r--devel/p5-Data-Rx/Makefile4
-rw-r--r--devel/p5-Data-Section/Makefile4
-rw-r--r--devel/p5-Data-Serializable/Makefile4
-rw-r--r--devel/p5-Data-Serializer-Sereal/Makefile4
-rw-r--r--devel/p5-Data-Stream-Bulk/Makefile4
-rw-r--r--devel/p5-Data-Throttler/Makefile4
-rw-r--r--devel/p5-Data-Thunk/Makefile4
-rw-r--r--devel/p5-Data-TreeDumper-Renderer-GTK/Makefile4
-rw-r--r--devel/p5-Data-TreeDumper/Makefile4
-rw-r--r--devel/p5-Data-Validator/Makefile4
-rw-r--r--devel/p5-Data-Visitor/Makefile4
-rw-r--r--devel/p5-Date-Calc-Iterator/Makefile4
-rw-r--r--devel/p5-Date-Calc-XS/Makefile4
-rw-r--r--devel/p5-Date-Calc/Makefile4
-rw-r--r--devel/p5-Date-DayOfWeek/Makefile4
-rw-r--r--devel/p5-Date-Holidays-DK/Makefile4
-rw-r--r--devel/p5-Date-ISO/Makefile4
-rw-r--r--devel/p5-Date-Piece/Makefile4
-rw-r--r--devel/p5-Date-Roman/Makefile4
-rw-r--r--devel/p5-DateTime-Calendar-Christian/Makefile4
-rw-r--r--devel/p5-DateTime-Calendar-Discordian/Makefile4
-rw-r--r--devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile4
-rw-r--r--devel/p5-DateTime-Calendar-Hebrew/Makefile4
-rw-r--r--devel/p5-DateTime-Calendar-Julian/Makefile4
-rw-r--r--devel/p5-DateTime-Calendar-Pataphysical/Makefile4
-rw-r--r--devel/p5-DateTime-Event-Cron/Makefile4
-rw-r--r--devel/p5-DateTime-Event-Easter/Makefile4
-rw-r--r--devel/p5-DateTime-Event-ICal/Makefile4
-rw-r--r--devel/p5-DateTime-Event-Lunar/Makefile4
-rw-r--r--devel/p5-DateTime-Event-Random/Makefile4
-rw-r--r--devel/p5-DateTime-Event-Recurrence/Makefile4
-rw-r--r--devel/p5-DateTime-Event-Sunrise/Makefile4
-rw-r--r--devel/p5-DateTime-Fiscal-Year/Makefile4
-rw-r--r--devel/p5-DateTime-Format-Baby/Makefile4
-rw-r--r--devel/p5-DateTime-Format-Builder/Makefile4
-rw-r--r--devel/p5-DateTime-Format-DBI/Makefile4
-rw-r--r--devel/p5-DateTime-Format-DateParse/Makefile4
-rw-r--r--devel/p5-DateTime-Format-Duration/Makefile4
-rw-r--r--devel/p5-DateTime-Format-Epoch/Makefile4
-rw-r--r--devel/p5-DateTime-Format-Excel/Makefile4
-rw-r--r--devel/p5-DateTime-Format-IBeat/Makefile4
-rw-r--r--devel/p5-DateTime-Format-ISO8601/Makefile4
-rw-r--r--devel/p5-DateTime-Format-MySQL/Makefile4
-rw-r--r--devel/p5-DateTime-Format-Natural/Makefile4
-rw-r--r--devel/p5-DateTime-Format-Oracle/Makefile4
-rw-r--r--devel/p5-DateTime-Format-Pg/Makefile4
-rw-r--r--devel/p5-DateTime-Format-SQLite/Makefile4
-rw-r--r--devel/p5-DateTime-Format-Strptime/Makefile4
-rw-r--r--devel/p5-DateTime-Functions/Makefile4
-rw-r--r--devel/p5-DateTime-Incomplete/Makefile4
-rw-r--r--devel/p5-DateTime-Locale/Makefile1
-rw-r--r--devel/p5-DateTime-Precise/Makefile4
-rw-r--r--devel/p5-DateTime-Set/Makefile4
-rw-r--r--devel/p5-DateTime-TimeZone-LMT/Makefile4
-rw-r--r--devel/p5-DateTime-TimeZone/Makefile4
-rw-r--r--devel/p5-DateTime-Util-Calc/Makefile4
-rw-r--r--devel/p5-DateTime/Makefile4
-rw-r--r--devel/p5-DateTimeX-Easy/Makefile4
-rw-r--r--devel/p5-Debug-Client/Makefile4
-rw-r--r--devel/p5-Devel-ArgNames/Makefile4
-rw-r--r--devel/p5-Devel-Autoflush/Makefile4
-rw-r--r--devel/p5-Devel-CallChecker/Makefile4
-rw-r--r--devel/p5-Devel-Caller/Makefile4
-rw-r--r--devel/p5-Devel-CheckOS/Makefile4
-rw-r--r--devel/p5-Devel-Cover/Makefile13
-rw-r--r--devel/p5-Devel-Events-Objects/Makefile4
-rw-r--r--devel/p5-Devel-Events/Makefile4
-rw-r--r--devel/p5-Devel-GlobalDestruction/Makefile4
-rw-r--r--devel/p5-Devel-KYTProf/Makefile4
-rw-r--r--devel/p5-Devel-LeakGuard-Object/Makefile4
-rw-r--r--devel/p5-Devel-LexAlias/Makefile4
-rw-r--r--devel/p5-Devel-NYTProf/Makefile4
-rw-r--r--devel/p5-Devel-OverloadInfo/Makefile4
-rw-r--r--devel/p5-Devel-PackagePath/Makefile4
-rw-r--r--devel/p5-Devel-PartialDump/Makefile4
-rw-r--r--devel/p5-Devel-PatchPerl/Makefile4
-rw-r--r--devel/p5-Devel-REPL/Makefile4
-rw-r--r--devel/p5-Devel-Size-Report/Makefile4
-rw-r--r--devel/p5-Devel-StealthDebug/Makefile4
-rw-r--r--devel/p5-Device-USB/Makefile4
-rw-r--r--devel/p5-Directory-Scratch-Structured/Makefile4
-rw-r--r--devel/p5-Dist-Zilla/Makefile7
-rw-r--r--devel/p5-Eval-Closure/Makefile4
-rw-r--r--devel/p5-Eval-Context/Makefile4
-rw-r--r--devel/p5-Event-ExecFlow/Makefile4
-rw-r--r--devel/p5-Event-Join/Makefile4
-rw-r--r--devel/p5-Every/Makefile4
-rw-r--r--devel/p5-Exception-Class/Makefile4
-rw-r--r--devel/p5-Expect-Simple/Makefile4
-rw-r--r--devel/p5-ExtUtils-CChecker/Makefile4
-rw-r--r--devel/p5-ExtUtils-CppGuess/Makefile4
-rw-r--r--devel/p5-ExtUtils-InstallPaths/Makefile4
-rw-r--r--devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile4
-rw-r--r--devel/p5-ExtUtils-MakeMaker-Coverage/Makefile4
-rw-r--r--devel/p5-FSA-Rules/Makefile4
-rw-r--r--devel/p5-File-Attributes-Recursive/Makefile4
-rw-r--r--devel/p5-File-Attributes/Makefile4
-rw-r--r--devel/p5-File-BOM/Makefile4
-rw-r--r--devel/p5-File-BaseDir/Makefile4
-rw-r--r--devel/p5-File-Binary/Makefile4
-rw-r--r--devel/p5-File-ConfigDir/Makefile4
-rw-r--r--devel/p5-File-CreationTime/Makefile4
-rw-r--r--devel/p5-File-DesktopEntry/Makefile4
-rw-r--r--devel/p5-File-Dir-Dumper/Makefile4
-rw-r--r--devel/p5-File-Find-Object/Makefile4
-rw-r--r--devel/p5-File-Find-Rule-Filesys-Virtual/Makefile4
-rw-r--r--devel/p5-File-Find-Rule-Perl/Makefile4
-rw-r--r--devel/p5-File-Find-Rule-VCS/Makefile4
-rw-r--r--devel/p5-File-Flat/Makefile4
-rw-r--r--devel/p5-File-Flock/Makefile4
-rw-r--r--devel/p5-File-HomeDir-PathClass/Makefile4
-rw-r--r--devel/p5-File-HomeDir/Makefile4
-rw-r--r--devel/p5-File-Map/Makefile4
-rw-r--r--devel/p5-File-MimeInfo/Makefile4
-rw-r--r--devel/p5-File-Modified/Makefile4
-rw-r--r--devel/p5-File-Pid/Makefile4
-rw-r--r--devel/p5-File-Policy/Makefile4
-rw-r--r--devel/p5-File-Random/Makefile4
-rw-r--r--devel/p5-File-SearchPath/Makefile4
-rw-r--r--devel/p5-File-Share/Makefile4
-rw-r--r--devel/p5-File-ShareDir-PAR/Makefile4
-rw-r--r--devel/p5-File-ShareDir-PathClass/Makefile4
-rw-r--r--devel/p5-File-ShareDir/Makefile4
-rw-r--r--devel/p5-File-Slurp-Tree/Makefile4
-rw-r--r--devel/p5-File-Tail-Scribe/Makefile4
-rw-r--r--devel/p5-File-Write-Rotate/Makefile4
-rw-r--r--devel/p5-Filesys-Virtual-Plain/Makefile4
-rw-r--r--devel/p5-Filter-Template/Makefile4
-rw-r--r--devel/p5-Forest/Makefile4
-rw-r--r--devel/p5-Form-Sensible/Makefile4
-rw-r--r--devel/p5-Geo-JSON/Makefile4
-rw-r--r--devel/p5-Geo-ShapeFile/Makefile4
-rw-r--r--devel/p5-Getargs-Long/Makefile4
-rw-r--r--devel/p5-Getopt-Compact-WithCmd/Makefile4
-rw-r--r--devel/p5-Getopt-Long-Descriptive/Makefile4
-rw-r--r--devel/p5-Git-PurePerl/Makefile4
-rw-r--r--devel/p5-Git-Repository-Plugin-Log/Makefile4
-rw-r--r--devel/p5-Git-Repository/Makefile4
-rw-r--r--devel/p5-Git-Sub/Makefile4
-rw-r--r--devel/p5-Glib2/Makefile4
-rw-r--r--devel/p5-Google-ProtocolBuffers/Makefile4
-rw-r--r--devel/p5-Gravatar-URL/Makefile4
-rw-r--r--devel/p5-HOP-Lexer/Makefile4
-rw-r--r--devel/p5-Hash-AutoHash-Args/Makefile4
-rw-r--r--devel/p5-Hash-AutoHash/Makefile4
-rw-r--r--devel/p5-Hash-Case/Makefile4
-rw-r--r--devel/p5-Hash-Objectify/Makefile4
-rw-r--r--devel/p5-Hash-Slice/Makefile4
-rw-r--r--devel/p5-Heap-Simple-Perl/Makefile4
-rw-r--r--devel/p5-Heap-Simple-XS/Makefile4
-rw-r--r--devel/p5-IO-All-LWP/Makefile4
-rw-r--r--devel/p5-IO-All/Makefile4
-rw-r--r--devel/p5-IO-Any/Makefile4
-rw-r--r--devel/p5-IO-Async/Makefile4
-rw-r--r--devel/p5-IO-Digest/Makefile4
-rw-r--r--devel/p5-IO-Event/Makefile4
-rw-r--r--devel/p5-IO-Pager/Makefile4
-rw-r--r--devel/p5-IO-Prompt/Makefile4
-rw-r--r--devel/p5-IO-Prompter/Makefile4
-rw-r--r--devel/p5-IO-Pty-Easy/Makefile4
-rw-r--r--devel/p5-IO-YAML/Makefile4
-rw-r--r--devel/p5-IOC/Makefile4
-rw-r--r--devel/p5-IPC-Cache/Makefile4
-rw-r--r--devel/p5-IPC-DirQueue/Makefile4
-rw-r--r--devel/p5-IPC-Mmap-Share/Makefile4
-rw-r--r--devel/p5-IPC-PubSub/Makefile4
-rw-r--r--devel/p5-IPC-Run/Makefile4
-rw-r--r--devel/p5-IPC-SharedCache/Makefile4
-rw-r--r--devel/p5-IPC-ShellCmd/Makefile4
-rw-r--r--devel/p5-Import-Base/Makefile4
-rw-r--r--devel/p5-Import-Into/Makefile4
-rw-r--r--devel/p5-Inline-ASM/Makefile4
-rw-r--r--devel/p5-Inline-Filters/Makefile4
-rw-r--r--devel/p5-Inline-Java/Makefile4
-rw-r--r--devel/p5-Inline-Python/Makefile4
-rw-r--r--devel/p5-Inline-TT/Makefile4
-rw-r--r--devel/p5-Inline-Tcl/Makefile4
-rw-r--r--devel/p5-Inline/Makefile4
-rw-r--r--devel/p5-InlineX-C2XS/Makefile4
-rw-r--r--devel/p5-InlineX-CPP2XS/Makefile4
-rw-r--r--devel/p5-Input-Validator/Makefile4
-rw-r--r--devel/p5-Iodef-Pb-Simple/Makefile4
-rw-r--r--devel/p5-Iterator-IO/Makefile4
-rw-r--r--devel/p5-Iterator-Misc/Makefile4
-rw-r--r--devel/p5-Iterator-Util/Makefile4
-rw-r--r--devel/p5-Iterator/Makefile4
-rw-r--r--devel/p5-JIRA-REST/Makefile4
-rw-r--r--devel/p5-JQuery/Makefile4
-rw-r--r--devel/p5-JSON-Hyper/Makefile4
-rw-r--r--devel/p5-JSON-Path/Makefile4
-rw-r--r--devel/p5-JSON-RPC-Common/Makefile4
-rw-r--r--devel/p5-JSON-RPC-Dispatcher/Makefile4
-rw-r--r--devel/p5-JSON-RPC/Makefile4
-rw-r--r--devel/p5-JSON-Schema/Makefile4
-rw-r--r--devel/p5-Lexical-Import/Makefile4
-rw-r--r--devel/p5-Lexical-Persistence/Makefile4
-rw-r--r--devel/p5-List-AllUtils/Makefile4
-rw-r--r--devel/p5-List-Objects-Types/Makefile4
-rw-r--r--devel/p5-List-Objects-WithUtils/Makefile4
-rw-r--r--devel/p5-List-SomeUtils/Makefile4
-rw-r--r--devel/p5-Log-Accounting-SVK/Makefile4
-rw-r--r--devel/p5-Log-Accounting-SVN/Makefile4
-rw-r--r--devel/p5-Log-Agent-Logger/Makefile4
-rw-r--r--devel/p5-Log-Any-Adapter-Log4perl/Makefile4
-rw-r--r--devel/p5-Log-Any-App/Makefile4
-rw-r--r--devel/p5-Log-Any-IfLOG/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-Array/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-Colorful/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-Config/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-Configurator-Any/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-DBI/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-Dir/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-Email-EmailSend/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-File-Stamped/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-FileRotate/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-FileShared/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-FileWriteRotate/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-Perl/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-Scribe/Makefile4
-rw-r--r--devel/p5-Log-Dispatch/Makefile4
-rw-r--r--devel/p5-Log-Dispatchouli/Makefile4
-rw-r--r--devel/p5-Log-Handler/Makefile4
-rw-r--r--devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile4
-rw-r--r--devel/p5-Log-Message-Simple/Makefile4
-rw-r--r--devel/p5-Log-Message/Makefile4
-rw-r--r--devel/p5-Log-Report-Optional/Makefile4
-rw-r--r--devel/p5-Log-Report/Makefile4
-rw-r--r--devel/p5-Log-TraceMessages/Makefile4
-rw-r--r--devel/p5-Luka/Makefile4
-rw-r--r--devel/p5-MRO-Compat/Makefile4
-rw-r--r--devel/p5-Mac-PropertyList/Makefile4
-rw-r--r--devel/p5-Media-Type-Simple/Makefile4
-rw-r--r--devel/p5-MetaCPAN-Client/Makefile4
-rw-r--r--devel/p5-Metabase-Fact/Makefile4
-rw-r--r--devel/p5-Method-Signatures-Simple/Makefile4
-rw-r--r--devel/p5-Method-Signatures/Makefile4
-rw-r--r--devel/p5-Minilla/Makefile4
-rw-r--r--devel/p5-Mixin-Event-Dispatch/Makefile4
-rw-r--r--devel/p5-Mixin-Linewise/Makefile4
-rw-r--r--devel/p5-Mock-Quick/Makefile4
-rw-r--r--devel/p5-Module-Build-Convert/Makefile4
-rw-r--r--devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile4
-rw-r--r--devel/p5-Module-Build-Pluggable/Makefile4
-rw-r--r--devel/p5-Module-Build-Tiny/Makefile4
-rw-r--r--devel/p5-Module-Build-XSUtil/Makefile4
-rw-r--r--devel/p5-Module-CPANTS-Analyse/Makefile6
-rw-r--r--devel/p5-Module-CheckDeps/Makefile4
-rw-r--r--devel/p5-Module-CheckVersion/Makefile4
-rw-r--r--devel/p5-Module-Compile/Makefile4
-rw-r--r--devel/p5-Module-Extract-Use/Makefile4
-rw-r--r--devel/p5-Module-Extract/Makefile4
-rw-r--r--devel/p5-Module-ExtractUse/Makefile4
-rw-r--r--devel/p5-Module-Implementation/Makefile4
-rw-r--r--devel/p5-Module-Info-File/Makefile4
-rw-r--r--devel/p5-Module-Info/Makefile4
-rw-r--r--devel/p5-Module-Inspector/Makefile4
-rw-r--r--devel/p5-Module-Install-ReadmeFromPod/Makefile4
-rw-r--r--devel/p5-Module-Install-Template/Makefile4
-rw-r--r--devel/p5-Module-Install-TestBase/Makefile4
-rw-r--r--devel/p5-Module-Install-XSUtil/Makefile4
-rw-r--r--devel/p5-Module-Install/Makefile4
-rw-r--r--devel/p5-Module-Manifest/Makefile4
-rw-r--r--devel/p5-Module-Math-Depends/Makefile4
-rw-r--r--devel/p5-Module-Pluggable-Fast/Makefile4
-rw-r--r--devel/p5-Module-Release/Makefile4
-rw-r--r--devel/p5-Module-Runtime-Conflicts/Makefile4
-rw-r--r--devel/p5-Module-Starter-PBP/Makefile4
-rw-r--r--devel/p5-Module-Starter/Makefile4
-rw-r--r--devel/p5-Mojolicious-Plugin-NYTProf/Makefile4
-rw-r--r--devel/p5-Moo/Makefile4
-rw-r--r--devel/p5-MooX-Cmd/Makefile4
-rw-r--r--devel/p5-MooX-ConfigFromFile/Makefile4
-rw-r--r--devel/p5-MooX-File-ConfigDir/Makefile4
-rw-r--r--devel/p5-MooX-HandlesVia/Makefile4
-rw-r--r--devel/p5-MooX-Options/Makefile4
-rw-r--r--devel/p5-MooX-StrictConstructor/Makefile4
-rw-r--r--devel/p5-MooX-Thunking/Makefile4
-rw-r--r--devel/p5-MooX-TypeTiny/Makefile4
-rw-r--r--devel/p5-MooX-Types-MooseLike-Numeric/Makefile4
-rw-r--r--devel/p5-MooX-Types-MooseLike/Makefile4
-rw-r--r--devel/p5-Moos/Makefile4
-rw-r--r--devel/p5-Moose-Autobox/Makefile4
-rw-r--r--devel/p5-Moose-Policy/Makefile4
-rw-r--r--devel/p5-Moose-Test/Makefile4
-rw-r--r--devel/p5-Moose/Makefile4
-rw-r--r--devel/p5-MooseX-App-Cmd/Makefile4
-rw-r--r--devel/p5-MooseX-App/Makefile7
-rw-r--r--devel/p5-MooseX-ArrayRef/Makefile4
-rw-r--r--devel/p5-MooseX-Attribute-Chained/Makefile4
-rw-r--r--devel/p5-MooseX-Attribute-ENV/Makefile4
-rw-r--r--devel/p5-MooseX-AttributeHelpers/Makefile4
-rw-r--r--devel/p5-MooseX-AttributeShortcuts/Makefile4
-rw-r--r--devel/p5-MooseX-AuthorizedMethods/Makefile4
-rw-r--r--devel/p5-MooseX-ClassAttribute/Makefile4
-rw-r--r--devel/p5-MooseX-Daemonize/Makefile6
-rw-r--r--devel/p5-MooseX-Declare/Makefile4
-rw-r--r--devel/p5-MooseX-FollowPBP/Makefile4
-rw-r--r--devel/p5-MooseX-Getopt/Makefile4
-rw-r--r--devel/p5-MooseX-Has-Options/Makefile4
-rw-r--r--devel/p5-MooseX-Has-Sugar/Makefile4
-rw-r--r--devel/p5-MooseX-InsideOut/Makefile4
-rw-r--r--devel/p5-MooseX-LazyRequire/Makefile4
-rw-r--r--devel/p5-MooseX-Log-Log4perl/Makefile4
-rw-r--r--devel/p5-MooseX-MarkAsMethods/Makefile4
-rw-r--r--devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile4
-rw-r--r--devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile4
-rw-r--r--devel/p5-MooseX-MetaDescription/Makefile4
-rw-r--r--devel/p5-MooseX-Method-Signatures/Makefile4
-rw-r--r--devel/p5-MooseX-MethodAttributes/Makefile4
-rw-r--r--devel/p5-MooseX-NonMoose/Makefile4
-rw-r--r--devel/p5-MooseX-Object-Pluggable/Makefile4
-rw-r--r--devel/p5-MooseX-OneArgNew/Makefile4
-rw-r--r--devel/p5-MooseX-POE/Makefile4
-rw-r--r--devel/p5-MooseX-Params-Validate/Makefile4
-rw-r--r--devel/p5-MooseX-RelatedClassRoles/Makefile4
-rw-r--r--devel/p5-MooseX-Role-Loggable/Makefile4
-rw-r--r--devel/p5-MooseX-Role-Matcher/Makefile4
-rw-r--r--devel/p5-MooseX-Role-Parameterized/Makefile4
-rw-r--r--devel/p5-MooseX-Role-Strict/Makefile4
-rw-r--r--devel/p5-MooseX-Runnable/Makefile4
-rw-r--r--devel/p5-MooseX-SemiAffordanceAccessor/Makefile4
-rw-r--r--devel/p5-MooseX-SetOnce/Makefile4
-rw-r--r--devel/p5-MooseX-Singleton/Makefile4
-rw-r--r--devel/p5-MooseX-Storage/Makefile4
-rw-r--r--devel/p5-MooseX-StrictConstructor/Makefile4
-rw-r--r--devel/p5-MooseX-TraitFor-Meta-Class-BetterAnonClassNames/Makefile4
-rw-r--r--devel/p5-MooseX-Traits-Pluggable/Makefile4
-rw-r--r--devel/p5-MooseX-Traits/Makefile4
-rw-r--r--devel/p5-MooseX-TransactionalMethods/Makefile4
-rw-r--r--devel/p5-MooseX-Types-Common/Makefile4
-rw-r--r--devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile4
-rw-r--r--devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile4
-rw-r--r--devel/p5-MooseX-Types-DateTime/Makefile4
-rw-r--r--devel/p5-MooseX-Types-DateTimeX/Makefile4
-rw-r--r--devel/p5-MooseX-Types-JSON/Makefile4
-rw-r--r--devel/p5-MooseX-Types-Perl/Makefile4
-rw-r--r--devel/p5-MooseX-Types-Set-Object/Makefile4
-rw-r--r--devel/p5-MooseX-Types-Signal/Makefile4
-rw-r--r--devel/p5-MooseX-Types-Structured/Makefile4
-rw-r--r--devel/p5-MooseX-Types-URI/Makefile4
-rw-r--r--devel/p5-MooseX-Types/Makefile4
-rw-r--r--devel/p5-MooseX-Util/Makefile4
-rw-r--r--devel/p5-MouseX-App-Cmd/Makefile4
-rw-r--r--devel/p5-MouseX-ConfigFromFile/Makefile4
-rw-r--r--devel/p5-MouseX-Foreign/Makefile4
-rw-r--r--devel/p5-MouseX-NativeTraits/Makefile4
-rw-r--r--devel/p5-MouseX-StrictConstructor/Makefile4
-rw-r--r--devel/p5-MouseX-Traits/Makefile4
-rw-r--r--devel/p5-MouseX-Types-Path-Class/Makefile4
-rw-r--r--devel/p5-Net-DBus/Makefile4
-rw-r--r--devel/p5-Number-Tolerant/Makefile4
-rw-r--r--devel/p5-OLE-Storage_Lite/Makefile4
-rw-r--r--devel/p5-Object-Array/Makefile4
-rw-r--r--devel/p5-Object-Authority/Makefile4
-rw-r--r--devel/p5-Object-Container/Makefile4
-rw-r--r--devel/p5-Object-Event/Makefile4
-rw-r--r--devel/p5-Object-InsideOut/Makefile4
-rw-r--r--devel/p5-Object-Pluggable/Makefile4
-rw-r--r--devel/p5-Object-Role/Makefile4
-rw-r--r--devel/p5-Olson-Abbreviations/Makefile4
-rw-r--r--devel/p5-PAR/Makefile4
-rw-r--r--devel/p5-POE-API-Hooks/Makefile4
-rw-r--r--devel/p5-POE-API-Peek/Makefile4
-rw-r--r--devel/p5-POE-Component-Daemon/Makefile4
-rw-r--r--devel/p5-POE-Component-DebugShell/Makefile4
-rw-r--r--devel/p5-POE-Component-DirWatch/Makefile4
-rw-r--r--devel/p5-POE-Component-Hailo/Makefile4
-rw-r--r--devel/p5-POE-Component-IKC/Makefile4
-rw-r--r--devel/p5-POE-Component-JobQueue/Makefile4
-rw-r--r--devel/p5-POE-Component-Logger/Makefile4
-rw-r--r--devel/p5-POE-Component-Pluggable/Makefile4
-rw-r--r--devel/p5-POE-Component-RSS/Makefile4
-rw-r--r--devel/p5-POE-Component-RSSAggregator/Makefile4
-rw-r--r--devel/p5-POE-Component-Schedule/Makefile4
-rw-r--r--devel/p5-POE-Component-Server-XMLRPC/Makefile4
-rw-r--r--devel/p5-POE-Component-Syndicator/Makefile4
-rw-r--r--devel/p5-POE-Component-TSTP/Makefile4
-rw-r--r--devel/p5-POE-Devel-Profiler/Makefile4
-rw-r--r--devel/p5-POE-Loop-Glib/Makefile4
-rw-r--r--devel/p5-POE-Loop-Tk/Makefile4
-rw-r--r--devel/p5-POE-Quickie/Makefile4
-rw-r--r--devel/p5-POE-Stage/Makefile4
-rw-r--r--devel/p5-POE-XS-Queue-Array/Makefile4
-rw-r--r--devel/p5-POE/Makefile4
-rw-r--r--devel/p5-Package-DeprecationManager/Makefile4
-rw-r--r--devel/p5-Package-Stash/Makefile4
-rw-r--r--devel/p5-Package-Variant/Makefile4
-rw-r--r--devel/p5-Params-Validate/Makefile4
-rw-r--r--devel/p5-Paranoid-Log-Email/Makefile4
-rw-r--r--devel/p5-Paranoid-Log-Syslog/Makefile4
-rw-r--r--devel/p5-Paranoid/Makefile4
-rw-r--r--devel/p5-Parse-CPAN-Packages-Fast/Makefile4
-rw-r--r--devel/p5-Parse-CPAN-Packages/Makefile4
-rw-r--r--devel/p5-Parse-ErrorString-Perl/Makefile4
-rw-r--r--devel/p5-Parse-Method-Signatures/Makefile4
-rw-r--r--devel/p5-Parse-PlainConfig/Makefile4
-rw-r--r--devel/p5-ParseLex/Makefile4
-rw-r--r--devel/p5-Path-Class-File-Lockable/Makefile4
-rw-r--r--devel/p5-Path-Dispatcher-Declarative/Makefile4
-rw-r--r--devel/p5-Path-Dispatcher/Makefile4
-rw-r--r--devel/p5-Path-FindDev/Makefile4
-rw-r--r--devel/p5-Perl-Critic-Deprecated/Makefile4
-rw-r--r--devel/p5-Perl-PrereqScanner/Makefile4
-rw-r--r--devel/p5-Perl6-Builtins/Makefile4
-rw-r--r--devel/p5-Perl6-Export-Attrs/Makefile4
-rw-r--r--devel/p5-Perl6-Form/Makefile4
-rw-r--r--devel/p5-Perl6-Rules/Makefile4
-rw-r--r--devel/p5-Perl6-Slurp/Makefile4
-rw-r--r--devel/p5-Pipeline/Makefile4
-rw-r--r--devel/p5-Pithub/Makefile4
-rw-r--r--devel/p5-Pod-Coverage-Moose/Makefile4
-rw-r--r--devel/p5-Pod-Coverage-TrustPod/Makefile4
-rw-r--r--devel/p5-Pod-Usage/Makefile4
-rw-r--r--devel/p5-Proc-WaitStat/Makefile4
-rw-r--r--devel/p5-Progress-Any/Makefile4
-rw-r--r--devel/p5-Project-Gantt/Makefile4
-rw-r--r--devel/p5-RPSL-Parser/Makefile4
-rw-r--r--devel/p5-RRDTool-OO/Makefile4
-rw-r--r--devel/p5-Rcs-Agent/Makefile4
-rw-r--r--devel/p5-Readonly-XS/Makefile4
-rw-r--r--devel/p5-Ref-Util/Makefile4
-rw-r--r--devel/p5-Reflex/Makefile4
-rw-r--r--devel/p5-Reply/Makefile4
-rw-r--r--devel/p5-Return-MultiLevel/Makefile4
-rw-r--r--devel/p5-Return-Type/Makefile4
-rw-r--r--devel/p5-Rinci/Makefile4
-rw-r--r--devel/p5-Role-HasMessage/Makefile4
-rw-r--r--devel/p5-Role-Identifiable/Makefile4
-rw-r--r--devel/p5-Role-Tiny/Makefile4
-rw-r--r--devel/p5-Rose-DateTime/Makefile4
-rw-r--r--devel/p5-RunApp/Makefile4
-rw-r--r--devel/p5-SOAP-WSDL/Makefile4
-rw-r--r--devel/p5-SPOPS/Makefile4
-rw-r--r--devel/p5-SUPER/Makefile4
-rw-r--r--devel/p5-SVN-ACL/Makefile4
-rw-r--r--devel/p5-SVN-Access/Makefile4
-rw-r--r--devel/p5-SVN-Agent/Makefile4
-rw-r--r--devel/p5-SVN-Dumpfile/Makefile4
-rw-r--r--devel/p5-SVN-Hook/Makefile4
-rw-r--r--devel/p5-SVN-Hooks/Makefile4
-rw-r--r--devel/p5-SVN-Log/Makefile4
-rw-r--r--devel/p5-SVN-Look/Makefile4
-rw-r--r--devel/p5-SVN-Mirror/Makefile4
-rw-r--r--devel/p5-SVN-Notify-Config/Makefile4
-rw-r--r--devel/p5-SVN-Notify-Mirror/Makefile4
-rw-r--r--devel/p5-SVN-Notify/Makefile4
-rw-r--r--devel/p5-SVN-S4/Makefile4
-rw-r--r--devel/p5-SVN-Simple/Makefile4
-rw-r--r--devel/p5-SVN-Statistics/Makefile4
-rw-r--r--devel/p5-Scalar-Defer/Makefile4
-rw-r--r--devel/p5-Scalar-Does/Makefile4
-rw-r--r--devel/p5-Sepia/Makefile4
-rw-r--r--devel/p5-Set-Array/Makefile4
-rw-r--r--devel/p5-Set-ConsistentHash/Makefile4
-rw-r--r--devel/p5-Shell-Base/Makefile4
-rw-r--r--devel/p5-ShipIt-Step-Manifest/Makefile4
-rw-r--r--devel/p5-Specio/Makefile4
-rw-r--r--devel/p5-Spoon/Makefile4
-rw-r--r--devel/p5-String-Checker/Makefile4
-rw-r--r--devel/p5-String-Diff/Makefile4
-rw-r--r--devel/p5-Sub-Alias/Makefile4
-rw-r--r--devel/p5-Sub-Exporter-GlobExporter/Makefile4
-rw-r--r--devel/p5-Sub-Exporter-Lexical/Makefile4
-rw-r--r--devel/p5-Sub-Exporter-Progressive/Makefile4
-rw-r--r--devel/p5-Sub-Exporter/Makefile4
-rw-r--r--devel/p5-Sub-Info/Makefile4
-rw-r--r--devel/p5-Sub-Multi/Makefile4
-rw-r--r--devel/p5-Sub-Signatures/Makefile4
-rw-r--r--devel/p5-Sub-WrapPackages/Makefile4
-rw-r--r--devel/p5-Syntax-Keyword-Gather/Makefile4
-rw-r--r--devel/p5-Syntax-Keyword-Junction/Makefile4
-rw-r--r--devel/p5-Sys-Info-Driver-BSD/Makefile4
-rw-r--r--devel/p5-Sys-Info/Makefile4
-rw-r--r--devel/p5-System-Info/Makefile4
-rw-r--r--devel/p5-TAP-SimpleOutput/Makefile4
-rw-r--r--devel/p5-Term-Animation/Makefile4
-rw-r--r--devel/p5-Term-Clui/Makefile4
-rw-r--r--devel/p5-Term-Menus/Makefile4
-rw-r--r--devel/p5-Term-ProgressBar-Quiet/Makefile4
-rw-r--r--devel/p5-Term-ProgressBar-Simple/Makefile4
-rw-r--r--devel/p5-Term-ProgressBar/Makefile4
-rw-r--r--devel/p5-Term-Prompt/Makefile4
-rw-r--r--devel/p5-Term-Query/Makefile4
-rw-r--r--devel/p5-Term-RawInput/Makefile4
-rw-r--r--devel/p5-Term-ReadLine-Perl/Makefile4
-rw-r--r--devel/p5-Term-ReadLine-Zoid/Makefile4
-rw-r--r--devel/p5-Term-Shell/Makefile4
-rw-r--r--devel/p5-Term-Size-Any/Makefile4
-rw-r--r--devel/p5-Term-Table/Makefile4
-rw-r--r--devel/p5-Term-UI/Makefile4
-rw-r--r--devel/p5-Term-VT102-Boundless/Makefile4
-rw-r--r--devel/p5-Term-Visual/Makefile4
-rw-r--r--devel/p5-Test-Able-Runner/Makefile4
-rw-r--r--devel/p5-Test-Able/Makefile4
-rw-r--r--devel/p5-Test-Aggregate/Makefile4
-rw-r--r--devel/p5-Test-Bits/Makefile4
-rw-r--r--devel/p5-Test-CPAN-Meta-YAML/Makefile4
-rw-r--r--devel/p5-Test-CheckDeps/Makefile4
-rw-r--r--devel/p5-Test-Class-Most/Makefile4
-rw-r--r--devel/p5-Test-Class/Makefile4
-rw-r--r--devel/p5-Test-ClassAPI/Makefile4
-rw-r--r--devel/p5-Test-Classy/Makefile4
-rw-r--r--devel/p5-Test-CleanNamespaces/Makefile4
-rw-r--r--devel/p5-Test-Compile/Makefile4
-rw-r--r--devel/p5-Test-DBIx-Class/Makefile4
-rw-r--r--devel/p5-Test-Dependencies/Makefile4
-rw-r--r--devel/p5-Test-DependentModules/Makefile4
-rw-r--r--devel/p5-Test-Differences/Makefile4
-rw-r--r--devel/p5-Test-Distribution/Makefile4
-rw-r--r--devel/p5-Test-Exception/Makefile4
-rw-r--r--devel/p5-Test-Expect/Makefile4
-rw-r--r--devel/p5-Test-FailWarnings/Makefile4
-rw-r--r--devel/p5-Test-Fake-HTTPD/Makefile4
-rw-r--r--devel/p5-Test-Fatal/Makefile4
-rw-r--r--devel/p5-Test-File-Contents/Makefile4
-rw-r--r--devel/p5-Test-File-ShareDir/Makefile4
-rw-r--r--devel/p5-Test-Fixture-DBIC-Schema/Makefile4
-rw-r--r--devel/p5-Test-Group/Makefile4
-rw-r--r--devel/p5-Test-HTML-Tidy/Makefile4
-rw-r--r--devel/p5-Test-HexDifferences/Makefile4
-rw-r--r--devel/p5-Test-JSON/Makefile4
-rw-r--r--devel/p5-Test-Kwalitee/Makefile4
-rw-r--r--devel/p5-Test-Lazy/Makefile4
-rw-r--r--devel/p5-Test-Log-Log4perl/Makefile4
-rw-r--r--devel/p5-Test-Log4perl/Makefile4
-rw-r--r--devel/p5-Test-ManyParams/Makefile4
-rw-r--r--devel/p5-Test-Memory-Cycle/Makefile4
-rw-r--r--devel/p5-Test-Mini/Makefile4
-rw-r--r--devel/p5-Test-Mock-LWP-Dispatch/Makefile4
-rw-r--r--devel/p5-Test-Mock-LWP/Makefile4
-rw-r--r--devel/p5-Test-MockDateTime/Makefile4
-rw-r--r--devel/p5-Test-Modern/Makefile4
-rw-r--r--devel/p5-Test-Moose-More/Makefile7
-rw-r--r--devel/p5-Test-More-UTF8/Makefile4
-rw-r--r--devel/p5-Test-Net-RabbitMQ/Makefile4
-rw-r--r--devel/p5-Test-Output/Makefile4
-rw-r--r--devel/p5-Test-POE-Server-TCP/Makefile4
-rw-r--r--devel/p5-Test-Prereq/Makefile4
-rw-r--r--devel/p5-Test-Refcount/Makefile4
-rw-r--r--devel/p5-Test-Reporter-Transport-Metabase/Makefile4
-rw-r--r--devel/p5-Test-Requires-Git/Makefile4
-rw-r--r--devel/p5-Test-Roo/Makefile4
-rw-r--r--devel/p5-Test-Script/Makefile7
-rw-r--r--devel/p5-Test-Singleton/Makefile4
-rw-r--r--devel/p5-Test-Spec/Makefile4
-rw-r--r--devel/p5-Test-SubCalls/Makefile4
-rw-r--r--devel/p5-Test-TAP-HTMLMatrix/Makefile4
-rw-r--r--devel/p5-Test-TAP-Model/Makefile4
-rw-r--r--devel/p5-Test-TCP/Makefile4
-rw-r--r--devel/p5-Test-Trap/Makefile4
-rw-r--r--devel/p5-Test-Unit/Makefile4
-rw-r--r--devel/p5-Test-Version/Makefile4
-rw-r--r--devel/p5-Test-WWW-Declare/Makefile4
-rw-r--r--devel/p5-Test-WWW-Mechanize-CGIApp/Makefile4
-rw-r--r--devel/p5-Test-WWW-Mechanize-Catalyst/Makefile4
-rw-r--r--devel/p5-Test-WWW-Mechanize/Makefile4
-rw-r--r--devel/p5-Test-WWW-Selenium/Makefile4
-rw-r--r--devel/p5-Test-Warn/Makefile4
-rw-r--r--devel/p5-Test-XML/Makefile4
-rw-r--r--devel/p5-Test-YAML-Meta/Makefile4
-rw-r--r--devel/p5-Test-YAML/Makefile4
-rw-r--r--devel/p5-Test2-Harness/Makefile4
-rw-r--r--devel/p5-Test2-Suite/Makefile4
-rw-r--r--devel/p5-TheSchwartz-Simple/Makefile4
-rw-r--r--devel/p5-TheSchwartz-Worker-SendEmail/Makefile4
-rw-r--r--devel/p5-TheSchwartz/Makefile4
-rw-r--r--devel/p5-Thread-Apartment/Makefile4
-rw-r--r--devel/p5-Thrift-XS/Makefile4
-rw-r--r--devel/p5-Tie-DB_File-SplitHash/Makefile4
-rw-r--r--devel/p5-Tie-FileLRUCache/Makefile4
-rw-r--r--devel/p5-Tie-Hash-Regex/Makefile4
-rw-r--r--devel/p5-Time-Duration-Parse/Makefile4
-rw-r--r--devel/p5-Time-Piece-Range/Makefile4
-rw-r--r--devel/p5-Tree-DAG_Node/Makefile4
-rw-r--r--devel/p5-Tree-Parser/Makefile4
-rw-r--r--devel/p5-Tree-Simple-View/Makefile4
-rw-r--r--devel/p5-Tree-Simple-VisitorFactory/Makefile4
-rw-r--r--devel/p5-Type-Tie/Makefile4
-rw-r--r--devel/p5-Type-Tiny-Signatures/Makefile4
-rw-r--r--devel/p5-Type-Tiny/Makefile4
-rw-r--r--devel/p5-Types-Core/Makefile4
-rw-r--r--devel/p5-Types-Path-Tiny/Makefile4
-rw-r--r--devel/p5-Types-Serialiser/Makefile4
-rw-r--r--devel/p5-UI-Dialog/Makefile4
-rw-r--r--devel/p5-UNIVERSAL-ref/Makefile4
-rw-r--r--devel/p5-UUID-Random-Patch-UseMRS/Makefile4
-rw-r--r--devel/p5-UUID-Tiny/Makefile4
-rw-r--r--devel/p5-Unix-Groups-FFI/Makefile4
-rw-r--r--devel/p5-VCP-Dest-svk/Makefile4
-rw-r--r--devel/p5-VCP-Source-cvsbk/Makefile4
-rw-r--r--devel/p5-VCP-autrijus/Makefile4
-rw-r--r--devel/p5-VCS-Lite/Makefile4
-rw-r--r--devel/p5-Workflow/Makefile4
-rw-r--r--devel/p5-XML-Pastor/Makefile4
-rw-r--r--devel/p5-Xporter/Makefile4
-rw-r--r--devel/p5-Yada-Yada-Yada/Makefile4
-rw-r--r--devel/p5-accessors-fast/Makefile4
-rw-r--r--devel/p5-autobox-Core/Makefile4
-rw-r--r--devel/p5-autobox/Makefile4
-rw-r--r--devel/p5-capitalization/Makefile4
-rw-r--r--devel/p5-constant-def/Makefile4
-rw-r--r--devel/p5-constant-lexical/Makefile4
-rw-r--r--devel/p5-forks/Makefile4
-rw-r--r--devel/p5-github_creator/Makefile4
-rw-r--r--devel/p5-iCal-Parser/Makefile4
-rw-r--r--devel/p5-lexical-underscore/Makefile4
-rw-r--r--devel/p5-match-simple/Makefile4
-rw-r--r--devel/p5-mocked/Makefile4
-rw-r--r--devel/p5-namespace-autoclean/Makefile4
-rw-r--r--devel/p5-namespace-clean/Makefile4
-rw-r--r--devel/p5-namespace-sweep/Makefile4
-rw-r--r--devel/p5-orz/Makefile4
-rw-r--r--devel/p5-pip/Makefile4
-rw-r--r--devel/p5-self/Makefile4
-rw-r--r--devel/p5-subatom/Makefile4
-rw-r--r--devel/p5-syntax/Makefile4
-rw-r--r--dns/p5-AnyEvent-CacheDNS/Makefile4
-rw-r--r--dns/p5-BIND-Config-Parser/Makefile4
-rw-r--r--dns/p5-DNS-EasyDNS/Makefile4
-rw-r--r--dns/p5-DSC/Makefile4
-rw-r--r--dns/p5-Data-Validate-Domain/Makefile4
-rw-r--r--dns/p5-IO-Async-Resolver-DNS/Makefile4
-rw-r--r--dns/p5-Mozilla-PublicSuffix/Makefile2
-rw-r--r--dns/p5-Net-Amazon-Route53/Makefile4
-rw-r--r--dns/p5-Net-Bonjour/Makefile4
-rw-r--r--dns/p5-Net-DNS-Async/Makefile4
-rw-r--r--dns/p5-Net-DNS-Lite/Makefile4
-rw-r--r--dns/p5-Net-DNS-RR-SRV-Helper/Makefile4
-rw-r--r--dns/p5-Net-DNS-Resolver-Mock/Makefile4
-rw-r--r--dns/p5-Net-DNS-Resolver-Programmable/Makefile4
-rw-r--r--dns/p5-Net-DNS-TestNS/Makefile4
-rw-r--r--dns/p5-Net-DNS-ToolKit/Makefile4
-rw-r--r--dns/p5-Net-DNS-ZoneFile-Fast/Makefile4
-rw-r--r--dns/p5-Net-DNSBL-MultiDaemon/Makefile4
-rw-r--r--dns/p5-Net-DNSBL-Statistics/Makefile4
-rw-r--r--dns/p5-Net-Domain-ExpireDate/Makefile4
-rw-r--r--dns/p5-Net-Nslookup/Makefile4
-rw-r--r--dns/p5-Net-RBLClient/Makefile4
-rw-r--r--dns/p5-POE-Component-Client-DNS-Recursive/Makefile4
-rw-r--r--dns/p5-POE-Component-Client-DNS/Makefile4
-rw-r--r--dns/p5-POE-Component-Client-DNSBL/Makefile4
-rw-r--r--dns/p5-POE-Component-Resolver/Makefile4
-rw-r--r--dns/p5-POE-Component-Server-DNS/Makefile4
-rw-r--r--dns/p5-Tie-DNS/Makefile4
-rw-r--r--dns/p5-pgeodns/Makefile4
-rw-r--r--editors/p5-Padre/Makefile6
-rw-r--r--editors/p5-Proc-InvokeEditor/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-2CheckOut/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-Cardstream/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-Jettis/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-LinkPoint/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-Network1Financial/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-OCV/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-PayConnect/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-PaymenTech/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-SurePay/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-TCLink/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-VirtualNet/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-eSec/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment-iAuthorizer/Makefile4
-rw-r--r--finance/p5-Business-OnlinePayment/Makefile4
-rw-r--r--finance/p5-Business-Stripe/Makefile4
-rw-r--r--finance/p5-Business-TW-Invoice-U420/Makefile4
-rw-r--r--finance/p5-Business-TW-TSIB-CStorePayment/Makefile4
-rw-r--r--finance/p5-Business-TW-TSIB-VirtualAccount/Makefile4
-rw-r--r--finance/p5-Business-WorldPay-Junior/Makefile4
-rw-r--r--finance/p5-Data-Currency/Makefile4
-rw-r--r--finance/p5-Finance-Bitcoin/Makefile4
-rw-r--r--finance/p5-Finance-Currency-Convert-WebserviceX/Makefile4
-rw-r--r--finance/p5-Finance-Quote/Makefile4
-rw-r--r--finance/p5-Finance-QuoteHist/Makefile4
-rw-r--r--finance/p5-Finance-TW-EmergingQuote/Makefile4
-rw-r--r--finance/p5-Finance-TW-TSEQuote/Makefile4
-rw-r--r--finance/p5-Finance-YahooQuote/Makefile4
-rw-r--r--ftp/p5-Net-FTPSSL/Makefile4
-rw-r--r--ftp/p5-POE-Component-Client-FTP/Makefile4
-rw-r--r--ftp/p5-SOAP-Transport-FTP/Makefile4
-rw-r--r--games/p5-Baseball-Sabermetrics/Makefile4
-rw-r--r--games/p5-Games-Bingo-Bot/Makefile4
-rw-r--r--games/p5-Games-Bingo-Print/Makefile4
-rw-r--r--graphics/p5-Acme-Steganography-Image-Png/Makefile4
-rw-r--r--graphics/p5-CAD-Drawing-Template/Makefile4
-rw-r--r--graphics/p5-CAD-Drawing/Makefile4
-rw-r--r--graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile4
-rw-r--r--graphics/p5-Captcha-reCAPTCHA/Makefile4
-rw-r--r--graphics/p5-Chart-PNGgraph/Makefile4
-rw-r--r--graphics/p5-Chart/Makefile4
-rw-r--r--graphics/p5-Color-Calc/Makefile4
-rw-r--r--graphics/p5-Convert-Color-XTerm/Makefile4
-rw-r--r--graphics/p5-Data-Google-Visualization-DataSource/Makefile4
-rw-r--r--graphics/p5-Data-Google-Visualization-DataTable/Makefile4
-rw-r--r--graphics/p5-GD-Arrow/Makefile4
-rw-r--r--graphics/p5-GD-Barcode/Makefile4
-rw-r--r--graphics/p5-GD-Graph-histogram/Makefile4
-rw-r--r--graphics/p5-GD-Graph-ohlc/Makefile4
-rw-r--r--graphics/p5-GD-Graph/Makefile4
-rw-r--r--graphics/p5-GD-Graph3d/Makefile4
-rw-r--r--graphics/p5-GD-SVG/Makefile4
-rw-r--r--graphics/p5-GD-Thumbnail/Makefile4
-rw-r--r--graphics/p5-GD/Makefile4
-rw-r--r--graphics/p5-Geo-EOP/Makefile4
-rw-r--r--graphics/p5-Geo-GML/Makefile4
-rw-r--r--graphics/p5-Geo-Gpx/Makefile4
-rw-r--r--graphics/p5-Geo-Point/Makefile4
-rw-r--r--graphics/p5-Graph-ReadWrite/Makefile4
-rw-r--r--graphics/p5-Graph-SocialMap/Makefile4
-rw-r--r--graphics/p5-Graph-Writer-GraphViz/Makefile4
-rw-r--r--graphics/p5-GraphViz-Data-Structure/Makefile4
-rw-r--r--graphics/p5-GraphViz-Traverse/Makefile4
-rw-r--r--graphics/p5-GraphViz/Makefile6
-rw-r--r--graphics/p5-GraphViz2/Makefile4
-rw-r--r--graphics/p5-Graphics-Color/Makefile4
-rw-r--r--graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile4
-rw-r--r--graphics/p5-Graphics-Primitive/Makefile4
-rw-r--r--graphics/p5-Image-Base-SVG/Makefile4
-rw-r--r--graphics/p5-Image-Compare/Makefile4
-rw-r--r--graphics/p5-Image-Grab/Makefile4
-rw-r--r--graphics/p5-Image-Imgur/Makefile4
-rw-r--r--graphics/p5-Image-Info/Makefile4
-rw-r--r--graphics/p5-Image-Magick-Iterator/Makefile4
-rw-r--r--graphics/p5-Image-Math-Constrain/Makefile4
-rw-r--r--graphics/p5-Image-ObjectDetect/Makefile4
-rw-r--r--graphics/p5-Imager-Plot/Makefile4
-rw-r--r--graphics/p5-Imager-QRCode/Makefile4
-rw-r--r--graphics/p5-Layout-Manager/Makefile4
-rw-r--r--graphics/p5-SVG-Graph/Makefile4
-rw-r--r--graphics/p5-SVG-Metadata/Makefile4
-rw-r--r--graphics/p5-SWF-Builder/Makefile4
-rw-r--r--graphics/p5-SWF-File/Makefile4
-rw-r--r--graphics/p5-SpringGraph/Makefile4
-rw-r--r--graphics/p5-Tk-JPEG-Lite/Makefile4
-rw-r--r--graphics/p5-URI-GoogleChart/Makefile4
-rw-r--r--graphics/p5-Visio/Makefile4
-rw-r--r--irc/p5-AnyEvent-IRC/Makefile4
-rw-r--r--irc/p5-Bot-BasicBot/Makefile4
-rw-r--r--irc/p5-IRC-Bot-Hangman/Makefile4
-rw-r--r--irc/p5-POE-Component-IRC-Object/Makefile4
-rw-r--r--irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile4
-rw-r--r--irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile4
-rw-r--r--irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile4
-rw-r--r--irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile4
-rw-r--r--irc/p5-POE-Component-IRC-Plugin-Karma/Makefile4
-rw-r--r--irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile4
-rw-r--r--irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile4
-rw-r--r--irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile4
-rw-r--r--irc/p5-POE-Component-IRC/Makefile4
-rw-r--r--irc/p5-POE-Filter-IRCD/Makefile4
-rw-r--r--japanese/p5-Date-Japanese-Era/Makefile4
-rw-r--r--japanese/p5-DateTime-Calendar-Japanese-Era/Makefile4
-rw-r--r--japanese/p5-DateTime-Format-Japanese/Makefile4
-rw-r--r--japanese/p5-Lingua-JA-Summarize-Extract/Makefile4
-rw-r--r--lang/p5-Expect/Makefile4
-rw-r--r--lang/p5-Interpolation/Makefile4
-rw-r--r--lang/p5-JSAN/Makefile4
-rw-r--r--lang/p5-List-MoreUtils/Makefile4
-rw-r--r--lang/p5-Marpa-PP/Makefile4
-rw-r--r--lang/p5-Marpa-XS/Makefile4
-rw-r--r--lang/p5-Marpa/Makefile4
-rw-r--r--lang/p5-Perl6-Subs/Makefile4
-rw-r--r--lang/p5-Quantum-Superpositions/Makefile4
-rw-r--r--lang/p5-Switch/Makefile4
-rw-r--r--lang/p5-Try-Tiny-Retry/Makefile4
-rw-r--r--lang/p5-signatures/Makefile4
-rw-r--r--mail/p5-Dancer-Plugin-Email/Makefile4
-rw-r--r--mail/p5-Dancer2-Plugin-Email/Makefile4
-rw-r--r--mail/p5-Email-Address-List/Makefile4
-rw-r--r--mail/p5-Email-Date/Makefile4
-rw-r--r--mail/p5-Email-Delete/Makefile4
-rw-r--r--mail/p5-Email-Filter/Makefile4
-rw-r--r--mail/p5-Email-Find/Makefile4
-rw-r--r--mail/p5-Email-Folder-IMAP/Makefile4
-rw-r--r--mail/p5-Email-Folder-IMAPS/Makefile4
-rw-r--r--mail/p5-Email-Folder-POP3/Makefile4
-rw-r--r--mail/p5-Email-Folder/Makefile4
-rw-r--r--mail/p5-Email-FolderType-Net/Makefile4
-rw-r--r--mail/p5-Email-FolderType/Makefile4
-rw-r--r--mail/p5-Email-LocalDelivery-Ezmlm/Makefile4
-rw-r--r--mail/p5-Email-MIME-Attachment-Stripper/Makefile4
-rw-r--r--mail/p5-Email-MIME-CreateHTML/Makefile4
-rw-r--r--mail/p5-Email-MIME/Makefile4
-rw-r--r--mail/p5-Email-Reply/Makefile4
-rw-r--r--mail/p5-Email-Send/Makefile4
-rw-r--r--mail/p5-Email-Sender/Makefile4
-rw-r--r--mail/p5-Email-Simple-FromHandle/Makefile4
-rw-r--r--mail/p5-Email-Simple/Makefile4
-rw-r--r--mail/p5-Email-Stuffer/Makefile4
-rw-r--r--mail/p5-Email-Valid-Loose/Makefile4
-rw-r--r--mail/p5-GMail-IMAPD/Makefile4
-rw-r--r--mail/p5-LMAP-CID2SPF/Makefile4
-rw-r--r--mail/p5-MIME-EncWords/Makefile4
-rw-r--r--mail/p5-MIME-Lite/Makefile4
-rw-r--r--mail/p5-MIME-Tools/Makefile4
-rw-r--r--mail/p5-Mail-Address-MobileJp/Makefile4
-rw-r--r--mail/p5-Mail-Audit/Makefile4
-rw-r--r--mail/p5-Mail-Box-IMAP4-SSL/Makefile4
-rw-r--r--mail/p5-Mail-Box-Parser-C/Makefile4
-rw-r--r--mail/p5-Mail-CheckUser/Makefile4
-rw-r--r--mail/p5-Mail-ClamAV/Makefile4
-rw-r--r--mail/p5-Mail-DKIM/Makefile4
-rw-r--r--mail/p5-Mail-DMARC/Makefile4
-rw-r--r--mail/p5-Mail-DeliveryStatus-BounceParser/Makefile4
-rw-r--r--mail/p5-Mail-Ezmlm/Makefile4
-rw-r--r--mail/p5-Mail-Field-Received/Makefile4
-rw-r--r--mail/p5-Mail-FilterXML/Makefile4
-rw-r--r--mail/p5-Mail-Folder/Makefile4
-rw-r--r--mail/p5-Mail-Freshmeat/Makefile4
-rw-r--r--mail/p5-Mail-GnuPG/Makefile4
-rw-r--r--mail/p5-Mail-IMAPTalk/Makefile4
-rw-r--r--mail/p5-Mail-MailStats/Makefile4
-rw-r--r--mail/p5-Mail-MboxParser/Makefile4
-rw-r--r--mail/p5-Mail-OpenRelay-Simple/Makefile4
-rw-r--r--mail/p5-Mail-RBL/Makefile4
-rw-r--r--mail/p5-Mail-SPF/Makefile4
-rw-r--r--mail/p5-Mail-SRS/Makefile4
-rw-r--r--mail/p5-Mail-Spool/Makefile4
-rw-r--r--mail/p5-Mail-Transport-Dbx/Makefile4
-rw-r--r--mail/p5-Mail-Verify/Makefile4
-rw-r--r--mail/p5-Mail-Webmail-Gmail/Makefile4
-rw-r--r--mail/p5-Net-IMAP-Client/Makefile4
-rw-r--r--mail/p5-Net-IMAP-Server/Makefile4
-rw-r--r--mail/p5-Net-IMAP-Simple-SSL/Makefile4
-rw-r--r--mail/p5-Net-IMAP-Simple/Makefile4
-rw-r--r--mail/p5-Net-ManageSieve/Makefile4
-rw-r--r--mail/p5-Net-SMTP-Server/Makefile4
-rw-r--r--mail/p5-Net-SMTP-TLS/Makefile4
-rw-r--r--mail/p5-POE-Component-Client-POP3/Makefile4
-rw-r--r--mail/p5-POE-Component-Client-SMTP/Makefile4
-rw-r--r--mail/p5-POE-Component-SMTP/Makefile4
-rw-r--r--mail/p5-POE-Filter-Transparent-SMTP/Makefile4
-rw-r--r--mail/p5-Parse-Syslog-Mail/Makefile4
-rw-r--r--mail/p5-Sendmail-AccessDB/Makefile4
-rw-r--r--mail/p5-Test-Email/Makefile4
-rw-r--r--mail/p5-URI-imap/Makefile4
-rw-r--r--mail/p5-URI-imaps/Makefile4
-rw-r--r--mail/p5-WWW-GMail/Makefile4
-rw-r--r--mail/p5-WWW-Hotmail/Makefile4
-rw-r--r--mail/p5-qpsmtpd/Makefile4
-rw-r--r--math/p5-AI-Perceptron/Makefile4
-rw-r--r--math/p5-Algorithm-CurveFit/Makefile4
-rw-r--r--math/p5-Algorithm-KMeans/Makefile4
-rw-r--r--math/p5-Bit-Vector/Makefile4
-rw-r--r--math/p5-CAD-Calc/Makefile4
-rw-r--r--math/p5-Chart-Math-Axis/Makefile4
-rw-r--r--math/p5-GIS-Distance-Fast/Makefile4
-rw-r--r--math/p5-GIS-Distance/Makefile4
-rw-r--r--math/p5-Graph/Makefile4
-rw-r--r--math/p5-Math-BigInt-FastCalc/Makefile4
-rw-r--r--math/p5-Math-BigInt-GMP/Makefile4
-rw-r--r--math/p5-Math-BigInt-Lite/Makefile4
-rw-r--r--math/p5-Math-BigInt-Pari/Makefile4
-rw-r--r--math/p5-Math-Currency/Makefile4
-rw-r--r--math/p5-Math-Geometry-Planar-Offset/Makefile4
-rw-r--r--math/p5-Math-Geometry-Planar/Makefile4
-rw-r--r--math/p5-Math-Geometry-Voronoi/Makefile4
-rw-r--r--math/p5-Math-Geometry/Makefile4
-rw-r--r--math/p5-Math-MPC/Makefile4
-rw-r--r--math/p5-Math-Polygon-Tree/Makefile4
-rw-r--r--math/p5-Math-Polynomial-Solve/Makefile4
-rw-r--r--math/p5-Math-Prime-XS/Makefile4
-rw-r--r--math/p5-Math-Random-ISAAC/Makefile4
-rw-r--r--math/p5-Math-Random-MT-Auto/Makefile4
-rw-r--r--math/p5-Math-Random-OO/Makefile4
-rw-r--r--math/p5-Math-RandomOrg/Makefile4
-rw-r--r--math/p5-Math-Sequence/Makefile4
-rw-r--r--math/p5-Math-Series/Makefile4
-rw-r--r--math/p5-Math-Spline/Makefile4
-rw-r--r--math/p5-Math-Symbolic-Custom-CCompiler/Makefile4
-rw-r--r--math/p5-Math-Symbolic-Custom-Contains/Makefile4
-rw-r--r--math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile4
-rw-r--r--math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile4
-rw-r--r--math/p5-Math-Symbolic-Custom-Pattern/Makefile4
-rw-r--r--math/p5-Math-Symbolic-Custom-Simplification/Makefile4
-rw-r--r--math/p5-Math-Symbolic/Makefile4
-rw-r--r--math/p5-Math-SymbolicX-BigNum/Makefile4
-rw-r--r--math/p5-Math-SymbolicX-Complex/Makefile4
-rw-r--r--math/p5-Math-SymbolicX-Error/Makefile4
-rw-r--r--math/p5-Math-SymbolicX-Inline/Makefile4
-rw-r--r--math/p5-Math-SymbolicX-NoSimplification/Makefile4
-rw-r--r--math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile4
-rw-r--r--math/p5-Math-SymbolicX-Statistics-Distributions/Makefile4
-rw-r--r--math/p5-Number-WithError-LaTeX/Makefile4
-rw-r--r--math/p5-Number-WithError/Makefile4
-rw-r--r--math/p5-Parse-Range/Makefile4
-rw-r--r--math/p5-Set-IntSpan-Fast-XS/Makefile4
-rw-r--r--math/p5-Set-IntSpan-Fast/Makefile4
-rw-r--r--math/p5-Statistics-Basic/Makefile4
-rw-r--r--math/p5-Statistics-Contingency/Makefile4
-rw-r--r--math/p5-Statistics-TTest/Makefile4
-rw-r--r--math/p5-bignum/Makefile4
-rw-r--r--misc/p5-Array-Compare/Makefile4
-rw-r--r--misc/p5-Array-Diff/Makefile4
-rw-r--r--misc/p5-Bot-Training/Makefile4
-rw-r--r--misc/p5-Business-EDI/Makefile4
-rw-r--r--misc/p5-Business-Hours/Makefile4
-rw-r--r--misc/p5-Business-ISBN/Makefile4
-rw-r--r--misc/p5-Business-ISIN/Makefile4
-rw-r--r--misc/p5-Business-UPS/Makefile4
-rw-r--r--misc/p5-Geo-Coder-Bing/Makefile4
-rw-r--r--misc/p5-Geo-Coder-Google/Makefile4
-rw-r--r--misc/p5-Geo-Coder-Googlev3/Makefile4
-rw-r--r--misc/p5-Geo-Coder-Mapquest/Makefile4
-rw-r--r--misc/p5-Geo-Coder-Multimap/Makefile4
-rw-r--r--misc/p5-Geo-Coder-Navteq/Makefile4
-rw-r--r--misc/p5-Geo-Coder-OSM/Makefile4
-rw-r--r--misc/p5-Geo-Coder-OpenCage/Makefile4
-rw-r--r--misc/p5-Geo-Coder-Ovi/Makefile4
-rw-r--r--misc/p5-Geo-Coder-PlaceFinder/Makefile4
-rw-r--r--misc/p5-Geo-Coder-TomTom/Makefile4
-rw-r--r--misc/p5-Geo-GeoNames/Makefile4
-rw-r--r--misc/p5-Locale-SubCountry/Makefile4
-rw-r--r--misc/p5-Locale-US/Makefile4
-rw-r--r--misc/p5-Software-License-CCpack/Makefile4
-rw-r--r--misc/p5-Software-License/Makefile4
-rw-r--r--misc/p5-asterisk-perl/Makefile4
-rw-r--r--multimedia/p5-Audio-M4P/Makefile4
-rw-r--r--multimedia/p5-FFmpeg-Command/Makefile4
-rw-r--r--multimedia/p5-FLV-Info/Makefile4
-rw-r--r--multimedia/p5-MP4-Info/Makefile4
-rw-r--r--multimedia/p5-Video-OpenQuicktime/Makefile4
-rw-r--r--net-im/p5-AnyEvent-XMPP/Makefile4
-rw-r--r--net-im/p5-DJabberd/Makefile4
-rw-r--r--net-im/p5-Jabber-Lite/Makefile4
-rw-r--r--net-im/p5-Net-Async-XMPP/Makefile4
-rw-r--r--net-im/p5-Net-Jabber/Makefile4
-rw-r--r--net-im/p5-Net-OSCAR/Makefile4
-rw-r--r--net-im/p5-Net-Stomp/Makefile4
-rw-r--r--net-im/p5-Net-XMPP/Makefile4
-rw-r--r--net-im/p5-Net-XMPP2/Makefile4
-rw-r--r--net-im/p5-SOAP-Transport-JABBER/Makefile4
-rw-r--r--net-mgmt/p5-Data-Validate-IP/Makefile4
-rw-r--r--net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile4
-rw-r--r--net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile7
-rw-r--r--net-mgmt/p5-FusionInventory-Agent/Makefile4
-rw-r--r--net-mgmt/p5-GRNOC-Config/Makefile4
-rw-r--r--net-mgmt/p5-GRNOC-TL1/Makefile4
-rw-r--r--net-mgmt/p5-Monitoring-Plugin/Makefile4
-rw-r--r--net-mgmt/p5-Nagios-Object/Makefile4
-rw-r--r--net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile4
-rw-r--r--net-mgmt/p5-Nagios-Plugin-LDAP/Makefile4
-rw-r--r--net-mgmt/p5-Nagios-Plugin/Makefile4
-rw-r--r--net-mgmt/p5-Nagios-Plugins-Memcached/Makefile4
-rw-r--r--net-mgmt/p5-Net-ACL/Makefile4
-rw-r--r--net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile4
-rw-r--r--net-mgmt/p5-Net-Abuse-Utils/Makefile4
-rw-r--r--net-mgmt/p5-Net-ILO/Makefile4
-rw-r--r--net-mgmt/p5-Net-IPv6Addr/Makefile4
-rw-r--r--net-mgmt/p5-Net-SNMP/Makefile4
-rw-r--r--net-mgmt/p5-Net-SNMPTrapd/Makefile4
-rw-r--r--net-mgmt/p5-NetApp/Makefile4
-rw-r--r--net-mgmt/p5-POE-Component-SNMP/Makefile4
-rw-r--r--net-mgmt/p5-Tie-NetAddr-IP/Makefile4
-rw-r--r--net-p2p/p5-Net-BitTorrent-File/Makefile4
-rw-r--r--net-p2p/p5-Net-DirectConnect/Makefile4
-rw-r--r--net-p2p/p5-WWW-BitTorrent/Makefile4
-rw-r--r--net/p5-Acme-HTTP/Makefile4
-rw-r--r--net/p5-Amazon-SQS-Simple/Makefile4
-rw-r--r--net/p5-AnyEvent-MQTT/Makefile4
-rw-r--r--net/p5-AnyEvent-RabbitMQ/Makefile4
-rw-r--r--net/p5-AnyEvent-Twitter/Makefile4
-rw-r--r--net/p5-Apache2-SOAP/Makefile4
-rw-r--r--net/p5-BBS-Client/Makefile4
-rw-r--r--net/p5-BBS-UserInfo-Maple3/Makefile4
-rw-r--r--net/p5-BBS-UserInfo-Maple3itoc/Makefile4
-rw-r--r--net/p5-BBS-UserInfo-Ptt/Makefile4
-rw-r--r--net/p5-BBS-UserInfo-SOB/Makefile4
-rw-r--r--net/p5-BBS-UserInfo-Wretch/Makefile4
-rw-r--r--net/p5-Beanstalk-Client/Makefile4
-rw-r--r--net/p5-Daemon-Generic/Makefile4
-rw-r--r--net/p5-EasyTCP/Makefile4
-rw-r--r--net/p5-Event-tcp/Makefile4
-rw-r--r--net/p5-File-Rsync/Makefile4
-rw-r--r--net/p5-Frontier-RPC/Makefile4
-rw-r--r--net/p5-Google-SAML-Request/Makefile4
-rw-r--r--net/p5-Google-SAML-Response/Makefile4
-rw-r--r--net/p5-Growl-GNTP/Makefile4
-rw-r--r--net/p5-IO-Socket-INET6/Makefile4
-rw-r--r--net/p5-IO-Socket-Multicast6/Makefile4
-rw-r--r--net/p5-IO-Socket-Timeout/Makefile4
-rw-r--r--net/p5-IP-Country/Makefile4
-rw-r--r--net/p5-Kafka/Makefile4
-rw-r--r--net/p5-MaxMind-DB-Common/Makefile4
-rw-r--r--net/p5-MaxMind-DB-Reader/Makefile4
-rw-r--r--net/p5-MaxMind-DB-Writer/Makefile4
-rw-r--r--net/p5-Net-ACME2/Makefile4
-rw-r--r--net/p5-Net-AMQP-RabbitMQ/Makefile4
-rw-r--r--net/p5-Net-AMQP/Makefile4
-rw-r--r--net/p5-Net-Address-Ethernet/Makefile4
-rw-r--r--net/p5-Net-Address-IPv4-Local/Makefile4
-rw-r--r--net/p5-Net-Amazon-EC2/Makefile4
-rw-r--r--net/p5-Net-Amazon-MechanicalTurk/Makefile4
-rw-r--r--net/p5-Net-Amazon-S3/Makefile4
-rw-r--r--net/p5-Net-Amazon-Thumbnail/Makefile4
-rw-r--r--net/p5-Net-Amazon/Makefile4
-rw-r--r--net/p5-Net-Appliance-Phrasebook/Makefile4
-rw-r--r--net/p5-Net-Appliance-Session/Makefile4
-rw-r--r--net/p5-Net-Blogger/Makefile4
-rw-r--r--net/p5-Net-CLI-Interact/Makefile4
-rw-r--r--net/p5-Net-CascadeCopy/Makefile4
-rw-r--r--net/p5-Net-Cassandra-Easy/Makefile4
-rw-r--r--net/p5-Net-Cassandra/Makefile4
-rw-r--r--net/p5-Net-DAV-Server/Makefile4
-rw-r--r--net/p5-Net-Delicious/Makefile4
-rw-r--r--net/p5-Net-Dropbox-API/Makefile4
-rw-r--r--net/p5-Net-EPP-Proxy/Makefile4
-rw-r--r--net/p5-Net-EPP/Makefile4
-rw-r--r--net/p5-Net-FS-Flickr/Makefile4
-rw-r--r--net/p5-Net-FS-Gmail/Makefile4
-rw-r--r--net/p5-Net-Frame-Device/Makefile4
-rw-r--r--net/p5-Net-Frame-Dump/Makefile4
-rw-r--r--net/p5-Net-Frame-Layer-ICMPv6/Makefile4
-rw-r--r--net/p5-Net-Frame-Layer-IPv6/Makefile4
-rw-r--r--net/p5-Net-Frame-Simple/Makefile4
-rw-r--r--net/p5-Net-Frame/Makefile4
-rw-r--r--net/p5-Net-GitHub/Makefile4
-rw-r--r--net/p5-Net-Gnats/Makefile4
-rw-r--r--net/p5-Net-Google-Calendar/Makefile4
-rw-r--r--net/p5-Net-Google-DataAPI/Makefile4
-rw-r--r--net/p5-Net-Google-PicasaWeb/Makefile4
-rw-r--r--net/p5-Net-Google-SafeBrowsing2/Makefile4
-rw-r--r--net/p5-Net-Google-Spreadsheets/Makefile4
-rw-r--r--net/p5-Net-Google/Makefile4
-rw-r--r--net/p5-Net-HTTP-Spore-Middleware-Header/Makefile4
-rw-r--r--net/p5-Net-HTTP-Spore/Makefile4
-rw-r--r--net/p5-Net-HTTP/Makefile4
-rw-r--r--net/p5-Net-HTTPS-Any/Makefile4
-rw-r--r--net/p5-Net-HTTPS-NB/Makefile4
-rw-r--r--net/p5-Net-INET6Glue/Makefile4
-rw-r--r--net/p5-Net-IP-RangeCompare/Makefile4
-rw-r--r--net/p5-Net-IPTrie/Makefile4
-rw-r--r--net/p5-Net-Jifty/Makefile4
-rw-r--r--net/p5-Net-LDAP-Express/Makefile4
-rw-r--r--net/p5-Net-LDAP-Server/Makefile4
-rw-r--r--net/p5-Net-Libdnet/Makefile4
-rw-r--r--net/p5-Net-Libdnet6/Makefile4
-rw-r--r--net/p5-Net-LimeLight-Purge/Makefile4
-rw-r--r--net/p5-Net-MAC-Vendor/Makefile4
-rw-r--r--net/p5-Net-MQTT/Makefile4
-rw-r--r--net/p5-Net-Mosso-CloudFiles/Makefile4
-rw-r--r--net/p5-Net-MovableType/Makefile4
-rw-r--r--net/p5-Net-NBsocket/Makefile4
-rw-r--r--net/p5-Net-Nessus-XMLRPC/Makefile4
-rw-r--r--net/p5-Net-OAuth-Simple/Makefile4
-rw-r--r--net/p5-Net-OAuth/Makefile4
-rw-r--r--net/p5-Net-OAuth2/Makefile4
-rw-r--r--net/p5-Net-OpenID-Consumer/Makefile4
-rw-r--r--net/p5-Net-OpenSSH-Parallel/Makefile4
-rw-r--r--net/p5-Net-OpenSSH/Makefile4
-rw-r--r--net/p5-Net-OpenStack-Attack/Makefile4
-rw-r--r--net/p5-Net-Packet-Target/Makefile4
-rw-r--r--net/p5-Net-Packet/Makefile4
-rw-r--r--net/p5-Net-Pcap/Makefile4
-rw-r--r--net/p5-Net-PcapUtils/Makefile4
-rw-r--r--net/p5-Net-PubSubHubbub-Publisher/Makefile4
-rw-r--r--net/p5-Net-RTP/Makefile4
-rw-r--r--net/p5-Net-RabbitFoot/Makefile4
-rw-r--r--net/p5-Net-Random/Makefile4
-rw-r--r--net/p5-Net-Rendezvous-Publish/Makefile4
-rw-r--r--net/p5-Net-Riak/Makefile4
-rw-r--r--net/p5-Net-SAP/Makefile4
-rw-r--r--net/p5-Net-SCP-Expect/Makefile4
-rw-r--r--net/p5-Net-SCP/Makefile4
-rw-r--r--net/p5-Net-SDP/Makefile4
-rw-r--r--net/p5-Net-SFTP/Makefile4
-rw-r--r--net/p5-Net-SIP/Makefile4
-rw-r--r--net/p5-Net-SMS-Mollie/Makefile4
-rw-r--r--net/p5-Net-SMS-PChome/Makefile4
-rw-r--r--net/p5-Net-SPDY/Makefile4
-rw-r--r--net/p5-Net-SSH-Perl/Makefile4
-rw-r--r--net/p5-Net-STOMP-Client/Makefile4
-rw-r--r--net/p5-Net-Server-SS-PreFork/Makefile4
-rw-r--r--net/p5-Net-Server/Makefile4
-rw-r--r--net/p5-Net-Subnet/Makefile4
-rw-r--r--net/p5-Net-Telnet-Netscreen/Makefile4
-rw-r--r--net/p5-Net-TiVo/Makefile4
-rw-r--r--net/p5-Net-Todoist/Makefile4
-rw-r--r--net/p5-Net-Traceroute-PurePerl/Makefile4
-rw-r--r--net/p5-Net-Traceroute6/Makefile4
-rw-r--r--net/p5-Net-Twitter/Makefile7
-rw-r--r--net/p5-Net-VNC/Makefile4
-rw-r--r--net/p5-Net-WhitePages/Makefile4
-rw-r--r--net/p5-Net-Whois-RIPE/Makefile4
-rw-r--r--net/p5-Net-Works/Makefile4
-rw-r--r--net/p5-Net-Write/Makefile4
-rw-r--r--net/p5-Net-uFTP/Makefile4
-rw-r--r--net/p5-NetAddr-IP-Count/Makefile4
-rw-r--r--net/p5-OAI-Harvester/Makefile4
-rw-r--r--net/p5-OurNet-BBS/Makefile4
-rw-r--r--net/p5-OurNet-BBSAgent/Makefile4
-rw-r--r--net/p5-POE-Component-Client-Ident/Makefile4
-rw-r--r--net/p5-POE-Component-Client-Keepalive/Makefile4
-rw-r--r--net/p5-POE-Component-Client-Ping/Makefile4
-rw-r--r--net/p5-POE-Component-Client-Telnet/Makefile4
-rw-r--r--net/p5-POE-Component-Client-Twitter/Makefile4
-rw-r--r--net/p5-POE-Component-Client-Whois/Makefile4
-rw-r--r--net/p5-POE-Component-Generic/Makefile4
-rw-r--r--net/p5-POE-Component-Jabber/Makefile4
-rw-r--r--net/p5-POE-Component-Pcap/Makefile4
-rw-r--r--net/p5-POE-Component-PubSub/Makefile4
-rw-r--r--net/p5-POE-Component-Server-Twirc/Makefile4
-rw-r--r--net/p5-PlRPC/Makefile4
-rw-r--r--net/p5-REST-Application/Makefile4
-rw-r--r--net/p5-RPC-XML/Makefile4
-rw-r--r--net/p5-ResourcePool-Resource-Net-LDAP/Makefile4
-rw-r--r--net/p5-Rose-URI/Makefile4
-rw-r--r--net/p5-SOAP-Amazon-S3/Makefile4
-rw-r--r--net/p5-SOAP-Data-Builder/Makefile4
-rw-r--r--net/p5-SOAP-Lite/Makefile4
-rw-r--r--net/p5-SOAP-MySOAP/Makefile4
-rw-r--r--net/p5-SOAP-XML-Client/Makefile4
-rw-r--r--net/p5-SOAP/Makefile4
-rw-r--r--net/p5-Samba-LDAP/Makefile4
-rw-r--r--net/p5-Test-URI/Makefile4
-rw-r--r--net/p5-URI-FromHash/Makefile4
-rw-r--r--net/p5-URI-OpenURL/Makefile4
-rw-r--r--net/p5-URI-Query/Makefile4
-rw-r--r--net/p5-URI-SmartURI/Makefile4
-rw-r--r--net/p5-URI-Template/Makefile4
-rw-r--r--net/p5-URI-db/Makefile4
-rw-r--r--net/p5-URI-ws/Makefile4
-rw-r--r--net/p5-VM-EC2-Security-CredentialCache/Makefile4
-rw-r--r--net/p5-VM-EC2/Makefile4
-rw-r--r--net/p5-Validate-Net/Makefile4
-rw-r--r--net/p5-WebService-Dropbox/Makefile8
-rw-r--r--net/p5-WebService-Prowl/Makefile4
-rw-r--r--net/p5-What/Makefile4
-rw-r--r--net/p5-X500-DN/Makefile4
-rw-r--r--net/p5-XML-Compile-SOAP-AnyEvent/Makefile4
-rw-r--r--net/p5-XML-Compile-SOAP-Daemon/Makefile4
-rw-r--r--net/p5-XML-Compile-SOAP-WSA/Makefile4
-rw-r--r--net/p5-XML-Compile-SOAP/Makefile4
-rw-r--r--net/p5-XML-Compile-WSDL11/Makefile4
-rw-r--r--net/p5-XML-RPC-Fast/Makefile4
-rw-r--r--net/p5-XMLRPC-Lite/Makefile4
-rw-r--r--net/p5-XPC/Makefile4
-rw-r--r--net/p5-perl-ldap/Makefile4
-rw-r--r--news/p5-News-Newsrc/Makefile4
-rw-r--r--news/p5-POE-Component-Server-NNTP/Makefile4
-rw-r--r--ports-mgmt/p5-FreeBSD-Portindex/Makefile4
-rw-r--r--print/p5-PDF-Template/Makefile4
-rw-r--r--print/p5-PDFLib/Makefile4
-rw-r--r--print/p5-XML-ApacheFOP/Makefile4
-rw-r--r--print/p5-XML-Handler-AxPoint/Makefile4
-rw-r--r--russian/p5-Convert-Cyrillic/Makefile4
-rw-r--r--russian/p5-Text-Hyphen-RU/Makefile4
-rw-r--r--science/p5-Chemistry-File-PDB/Makefile4
-rw-r--r--science/p5-Chemistry-MacroMol/Makefile4
-rw-r--r--science/p5-Chemistry-Mol/Makefile4
-rw-r--r--science/p5-Geo-Coordinates-Converter-iArea/Makefile4
-rw-r--r--science/p5-Geo-Coordinates-Converter/Makefile4
-rw-r--r--science/p5-Geo-WebService-Elevation-USGS/Makefile4
-rw-r--r--security/p5-Apache-Htpasswd/Makefile4
-rw-r--r--security/p5-App-Genpass/Makefile4
-rw-r--r--security/p5-AuthCAS/Makefile4
-rw-r--r--security/p5-Authen-Captcha/Makefile4
-rw-r--r--security/p5-Authen-DecHpwd/Makefile4
-rw-r--r--security/p5-Authen-OATH/Makefile4
-rw-r--r--security/p5-Authen-PAAS/Makefile4
-rw-r--r--security/p5-Authen-Passphrase/Makefile4
-rw-r--r--security/p5-Authen-PluggableCaptcha/Makefile4
-rw-r--r--security/p5-Authen-Radius/Makefile4
-rw-r--r--security/p5-Authen-SASL-Cyrus/Makefile4
-rw-r--r--security/p5-Authen-SASL-SASLprep/Makefile4
-rw-r--r--security/p5-Authen-SASL/Makefile4
-rw-r--r--security/p5-Authen-SCRAM/Makefile4
-rw-r--r--security/p5-Authen-Simple-DBI/Makefile4
-rw-r--r--security/p5-Authen-Simple-DBM/Makefile4
-rw-r--r--security/p5-Authen-Simple-HTTP/Makefile4
-rw-r--r--security/p5-Authen-Simple-Kerberos/Makefile4
-rw-r--r--security/p5-Authen-Simple-LDAP/Makefile4
-rw-r--r--security/p5-Authen-Simple-Net/Makefile4
-rw-r--r--security/p5-Authen-Simple-PAM/Makefile4
-rw-r--r--security/p5-Authen-Simple-Passwd/Makefile4
-rw-r--r--security/p5-Authen-Simple-RADIUS/Makefile4
-rw-r--r--security/p5-Authen-Simple-SMB/Makefile4
-rw-r--r--security/p5-Authen-Simple-SSH/Makefile4
-rw-r--r--security/p5-Authen-Simple/Makefile4
-rw-r--r--security/p5-Authen-TypeKey/Makefile4
-rw-r--r--security/p5-Bytes-Random-Secure/Makefile4
-rw-r--r--security/p5-CSP/Makefile4
-rw-r--r--security/p5-Crypt-CBCeasy/Makefile4
-rw-r--r--security/p5-Crypt-Ctr/Makefile4
-rw-r--r--security/p5-Crypt-DES/Makefile4
-rw-r--r--security/p5-Crypt-DES_EDE3/Makefile4
-rw-r--r--security/p5-Crypt-Dining/Makefile4
-rw-r--r--security/p5-Crypt-Eksblowfish/Makefile4
-rw-r--r--security/p5-Crypt-HCE_SHA/Makefile4
-rw-r--r--security/p5-Crypt-Lite/Makefile4
-rw-r--r--security/p5-Crypt-OFB/Makefile4
-rw-r--r--security/p5-Crypt-OpenSSL-CA/Makefile4
-rw-r--r--security/p5-Crypt-OpenSSL-EC/Makefile4
-rw-r--r--security/p5-Crypt-OpenSSL-ECDSA/Makefile4
-rw-r--r--security/p5-Crypt-OpenSSL-PKCS10/Makefile4
-rw-r--r--security/p5-Crypt-PBKDF2/Makefile4
-rw-r--r--security/p5-Crypt-PKCS10/Makefile4
-rw-r--r--security/p5-Crypt-PWSafe3/Makefile4
-rw-r--r--security/p5-Crypt-Password-Util/Makefile4
-rw-r--r--security/p5-Crypt-Primes/Makefile4
-rw-r--r--security/p5-Crypt-RSA/Makefile4
-rw-r--r--security/p5-Crypt-Random-Seed/Makefile4
-rw-r--r--security/p5-Crypt-Random-Source/Makefile4
-rw-r--r--security/p5-Crypt-Random/Makefile4
-rw-r--r--security/p5-Crypt-SKey/Makefile4
-rw-r--r--security/p5-Crypt-Twofish_PP/Makefile4
-rw-r--r--security/p5-Crypt-X509-CRL/Makefile4
-rw-r--r--security/p5-Crypt-X509/Makefile4
-rw-r--r--security/p5-Crypt-XTEA/Makefile4
-rw-r--r--security/p5-Crypt-xDBM_File/Makefile4
-rw-r--r--security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile4
-rw-r--r--security/p5-Dancer-Plugin-Auth-Extensible/Makefile4
-rw-r--r--security/p5-Dancer-Plugin-Passphrase/Makefile4
-rw-r--r--security/p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC/Makefile4
-rw-r--r--security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Database/Makefile4
-rw-r--r--security/p5-Dancer2-Plugin-Auth-Extensible-Provider-IMAP/Makefile4
-rw-r--r--security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Usergroup/Makefile4
-rw-r--r--security/p5-Dancer2-Plugin-Passphrase/Makefile4
-rw-r--r--security/p5-Digest-Adler32/Makefile4
-rw-r--r--security/p5-Digest-Bcrypt/Makefile4
-rw-r--r--security/p5-Digest-DMAC/Makefile4
-rw-r--r--security/p5-Digest-EMAC/Makefile4
-rw-r--r--security/p5-File-KeePass-Agent/Makefile4
-rw-r--r--security/p5-File-KeePass/Makefile4
-rw-r--r--security/p5-File-Scan-ClamAV/Makefile4
-rw-r--r--security/p5-Filter-CBC/Makefile4
-rw-r--r--security/p5-Filter-Crypto/Makefile4
-rw-r--r--security/p5-GD-SecurityImage/Makefile4
-rw-r--r--security/p5-HTML-Email-Obfuscate/Makefile4
-rw-r--r--security/p5-IO-Async-SSL/Makefile4
-rw-r--r--security/p5-IO-Socket-SSL/Makefile4
-rw-r--r--security/p5-Module-Signature/Makefile6
-rw-r--r--security/p5-Net-OpenID-Common/Makefile4
-rw-r--r--security/p5-Net-OpenID-JanRain/Makefile4
-rw-r--r--security/p5-Net-OpenID-Server/Makefile4
-rw-r--r--security/p5-Net-SSH-AuthorizedKeysFile/Makefile4
-rw-r--r--security/p5-Net-SSL-ExpireDate/Makefile4
-rw-r--r--security/p5-Net-SSLGlue/Makefile4
-rw-r--r--security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile4
-rw-r--r--security/p5-Net-SinFP/Makefile4
-rw-r--r--security/p5-Nmap-Scanner/Makefile4
-rw-r--r--security/p5-OpenCA-OpenSSL/Makefile4
-rw-r--r--security/p5-OpenCA-PKCS7/Makefile4
-rw-r--r--security/p5-OpenCA-REQ/Makefile4
-rw-r--r--security/p5-OpenCA-X509/Makefile4
-rw-r--r--security/p5-POE-Component-SSLify/Makefile4
-rw-r--r--security/p5-POE-Filter-SSL/Makefile4
-rw-r--r--security/p5-Parse-Snort/Makefile4
-rw-r--r--security/p5-Sudo/Makefile4
-rw-r--r--security/p5-Tie-EncryptedHash/Makefile4
-rw-r--r--security/p5-Tree-Authz/Makefile4
-rw-r--r--security/p5-Unix-Passwd-File/Makefile7
-rw-r--r--security/p5-Yahoo-BBAuth/Makefile4
-rw-r--r--security/p5-openxpki/Makefile4
-rw-r--r--shells/p5-Bash-Completion/Makefile4
-rw-r--r--shells/p5-Term-Bash-Completion-Generator/Makefile4
-rw-r--r--shells/p5-Term-ShellUI/Makefile4
-rw-r--r--sysutils/p5-BSD-Jail-Object/Makefile4
-rw-r--r--sysutils/p5-Brackup/Makefile4
-rw-r--r--sysutils/p5-File-Listing/Makefile4
-rw-r--r--sysutils/p5-File-Stat-ModeString/Makefile4
-rw-r--r--sysutils/p5-Fuse-Simple/Makefile4
-rw-r--r--sysutils/p5-Giovanni/Makefile4
-rw-r--r--sysutils/p5-Log-Syslog-Fast/Makefile4
-rw-r--r--sysutils/p5-MogileFS-Client/Makefile4
-rw-r--r--sysutils/p5-MogileFS-Network/Makefile4
-rw-r--r--sysutils/p5-MogileFS-Server/Makefile4
-rw-r--r--sysutils/p5-MogileFS-Utils/Makefile4
-rw-r--r--sysutils/p5-Monitor-Simple/Makefile4
-rw-r--r--sysutils/p5-Rex/Makefile4
-rw-r--r--sysutils/p5-Schedule-Cron-Events/Makefile4
-rw-r--r--sysutils/p5-Sysadm-Install/Makefile4
-rw-r--r--sysutils/p5-Tail-Stat/Makefile4
-rw-r--r--sysutils/p5-Ubic/Makefile4
-rw-r--r--sysutils/p5-arclog/Makefile4
-rw-r--r--sysutils/p5-reslog/Makefile4
-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
-rw-r--r--www/p5-AMF-Perl/Makefile4
-rw-r--r--www/p5-AnyEvent-HTTP/Makefile4
-rw-r--r--www/p5-Apache-ASP/Makefile4
-rw-r--r--www/p5-Apache-AuthCookie/Makefile4
-rw-r--r--www/p5-Apache-AuthTicket/Makefile4
-rw-r--r--www/p5-Apache-Clean2/Makefile4
-rw-r--r--www/p5-Apache-ConfigParser/Makefile4
-rw-r--r--www/p5-Apache-DBI/Makefile4
-rw-r--r--www/p5-Apache-Gallery/Makefile4
-rw-r--r--www/p5-Apache-MP3/Makefile4
-rw-r--r--www/p5-Apache-ParseFormData/Makefile4
-rw-r--r--www/p5-Apache-Profiler/Makefile4
-rw-r--r--www/p5-Apache-Session-PHP/Makefile4
-rw-r--r--www/p5-Apache-Session-SQLite3/Makefile4
-rw-r--r--www/p5-Apache-Session-SharedMem/Makefile4
-rw-r--r--www/p5-Apache-Session-Wrapper/Makefile4
-rw-r--r--www/p5-Apache-Session/Makefile4
-rw-r--r--www/p5-Apache-SessionX/Makefile4
-rw-r--r--www/p5-App-Nopaste/Makefile4
-rw-r--r--www/p5-App-gist/Makefile4
-rw-r--r--www/p5-Bigtop/Makefile4
-rw-r--r--www/p5-CGI-Ajax/Makefile4
-rw-r--r--www/p5-CGI-Application-Dispatch-Server/Makefile4
-rw-r--r--www/p5-CGI-Application-Dispatch/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-AnyTemplate/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-Apache/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-Authentication/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-Authorization/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-AutoRunmode/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-DBH/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-DebugScreen/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-DevPopup/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-Forward/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-HTDot/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-HtmlTidy/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-LogDispatch/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-MessageStack/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-Redirect/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-Session/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-Stream/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-TT/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-ValidateRM/Makefile4
-rw-r--r--www/p5-CGI-Application-Plugin-ViewCode/Makefile4
-rw-r--r--www/p5-CGI-Application-Server/Makefile4
-rw-r--r--www/p5-CGI-Application/Makefile4
-rw-r--r--www/p5-CGI-ArgChecker/Makefile4
-rw-r--r--www/p5-CGI-Builder-TT2/Makefile4
-rw-r--r--www/p5-CGI-Builder/Makefile4
-rw-r--r--www/p5-CGI-Cookie-Splitter/Makefile4
-rw-r--r--www/p5-CGI-Cookie-XS/Makefile4
-rw-r--r--www/p5-CGI-EncryptForm/Makefile4
-rw-r--r--www/p5-CGI-ExtDirect/Makefile4
-rw-r--r--www/p5-CGI-Fast/Makefile4
-rw-r--r--www/p5-CGI-FormBuilder/Makefile4
-rw-r--r--www/p5-CGI-Framework/Makefile4
-rw-r--r--www/p5-CGI-Kwiki/Makefile4
-rw-r--r--www/p5-CGI-Pager/Makefile4
-rw-r--r--www/p5-CGI-Untaint-date/Makefile4
-rw-r--r--www/p5-CGI-Untaint/Makefile4
-rw-r--r--www/p5-CGI-Upload/Makefile4
-rw-r--r--www/p5-CGI-XMLApplication/Makefile4
-rw-r--r--www/p5-CIF-Client/Makefile4
-rw-r--r--www/p5-CSS-DOM/Makefile4
-rw-r--r--www/p5-CSS-Inliner/Makefile4
-rw-r--r--www/p5-Catalyst-Action-REST/Makefile4
-rw-r--r--www/p5-Catalyst-Action-RenderView/Makefile4
-rw-r--r--www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile4
-rw-r--r--www/p5-Catalyst-ActionRole-ACL/Makefile4
-rw-r--r--www/p5-Catalyst-Authentication-Credential-HTTP/Makefile4
-rw-r--r--www/p5-Catalyst-Authentication-Credential-OpenID/Makefile4
-rw-r--r--www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile4
-rw-r--r--www/p5-Catalyst-Authentication-Store-LDAP/Makefile4
-rw-r--r--www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile4
-rw-r--r--www/p5-Catalyst-Component-InstancePerContext/Makefile4
-rw-r--r--www/p5-Catalyst-Controller-ActionRole/Makefile4
-rw-r--r--www/p5-Catalyst-Controller-BindLex/Makefile4
-rw-r--r--www/p5-Catalyst-Controller-HTML-FormFu/Makefile4
-rw-r--r--www/p5-Catalyst-Controller-RateLimit/Makefile4
-rw-r--r--www/p5-Catalyst-Controller-RequestToken/Makefile4
-rw-r--r--www/p5-Catalyst-Controller-SOAP/Makefile4
-rw-r--r--www/p5-Catalyst-Devel/Makefile6
-rw-r--r--www/p5-Catalyst-DispatchType-Regex/Makefile4
-rw-r--r--www/p5-Catalyst-Engine-HTTP-Prefork/Makefile4
-rw-r--r--www/p5-Catalyst-Enzyme/Makefile4
-rw-r--r--www/p5-Catalyst-Helper-Controller-Scaffold/Makefile4
-rw-r--r--www/p5-Catalyst-Model-CDBI-Sweet/Makefile4
-rw-r--r--www/p5-Catalyst-Model-DBIC-Plain/Makefile4
-rw-r--r--www/p5-Catalyst-Model-DBIC-Schema/Makefile4
-rw-r--r--www/p5-Catalyst-Model-DynamicAdaptor/Makefile4
-rw-r--r--www/p5-Catalyst-Model-LDAP/Makefile4
-rw-r--r--www/p5-Catalyst-Model-Oryx/Makefile4
-rw-r--r--www/p5-Catalyst-Model-Tarantool/Makefile4
-rw-r--r--www/p5-Catalyst-Model-XML-Feed/Makefile4
-rw-r--r--www/p5-Catalyst-Model-Xapian/Makefile4
-rw-r--r--www/p5-Catalyst-Model-Xapian10/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Authentication/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Authorization-ACL/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-AutoCRUD/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Browser/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-C3/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Cache-Memcached/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Cache/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Captcha/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-ConfigLoader/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-CookiedSession/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-DefaultEnd/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Email/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-ErrorCatcher/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-FillInForm/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-FormBuilder/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-FormValidator/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-I18N/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Log-Dispatch/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Log-Handler/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-PageCache/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Params-Nested/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Pluggable/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Prototype/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Scheduler/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Server/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-FastMmap/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-PerUser/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-State-URI/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-File/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Setenv/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-SmartURI/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-StackTrace/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Static-Simple/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Static/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-StatusMessage/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-SubRequest/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Textile/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Unicode/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-XMLRPC/Makefile4
-rw-r--r--www/p5-Catalyst-Runtime/Makefile7
-rw-r--r--www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile4
-rw-r--r--www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile4
-rw-r--r--www/p5-Catalyst-View-ClearSilver/Makefile4
-rw-r--r--www/p5-Catalyst-View-Email/Makefile4
-rw-r--r--www/p5-Catalyst-View-GraphViz/Makefile4
-rw-r--r--www/p5-Catalyst-View-HTML-Template-Compiled/Makefile4
-rw-r--r--www/p5-Catalyst-View-HTML-Template/Makefile4
-rw-r--r--www/p5-Catalyst-View-JSON/Makefile4
-rw-r--r--www/p5-Catalyst-View-Mason/Makefile4
-rw-r--r--www/p5-Catalyst-View-RRDGraph/Makefile4
-rw-r--r--www/p5-Catalyst-View-TT-Alloy/Makefile4
-rw-r--r--www/p5-Catalyst-View-TT-ControllerLocal/Makefile4
-rw-r--r--www/p5-Catalyst-View-TT/Makefile4
-rw-r--r--www/p5-Catalyst-View-Template-Declare/Makefile4
-rw-r--r--www/p5-Catalyst-View-Templated/Makefile4
-rw-r--r--www/p5-Catalyst-View-XML-Feed/Makefile4
-rw-r--r--www/p5-Catalyst-View-XSLT/Makefile4
-rw-r--r--www/p5-CatalystX-InjectComponent/Makefile4
-rw-r--r--www/p5-CatalystX-LeakChecker/Makefile4
-rw-r--r--www/p5-CatalystX-Profile/Makefile4
-rw-r--r--www/p5-CatalystX-RoleApplicator/Makefile4
-rw-r--r--www/p5-CatalystX-SimpleLogin/Makefile4
-rw-r--r--www/p5-CatalystX-VirtualComponents/Makefile4
-rw-r--r--www/p5-Class-DBI-FromForm/Makefile4
-rw-r--r--www/p5-Dancer-Logger-Log4perl/Makefile4
-rw-r--r--www/p5-Dancer-Plugin-ExtDirect/Makefile4
-rw-r--r--www/p5-Dancer-Plugin-Feed/Makefile4
-rw-r--r--www/p5-Dancer-Plugin-FlashMessage/Makefile4
-rw-r--r--www/p5-Dancer-Plugin-RPC/Makefile4
-rw-r--r--www/p5-Dancer2-Plugin-Ajax/Makefile4
-rw-r--r--www/p5-Dancer2-Plugin-Deferred/Makefile4
-rw-r--r--www/p5-Dancer2-Plugin-Interchange6/Makefile4
-rw-r--r--www/p5-Dancer2-Plugin-Path-Class/Makefile4
-rw-r--r--www/p5-Dancer2/Makefile20
-rw-r--r--www/p5-Data-TreeDumper-Renderer-DHTML/Makefile4
-rw-r--r--www/p5-Emplacken/Makefile4
-rw-r--r--www/p5-FCGI-Async/Makefile4
-rw-r--r--www/p5-FCGI-Engine/Makefile4
-rw-r--r--www/p5-FCGI-Spawn/Makefile4
-rw-r--r--www/p5-FEAR-API/Makefile4
-rw-r--r--www/p5-Flickr-API/Makefile4
-rw-r--r--www/p5-Flickr-Upload/Makefile4
-rw-r--r--www/p5-Gantry/Makefile4
-rw-r--r--www/p5-Geo-Caching/Makefile4
-rw-r--r--www/p5-Gungho/Makefile4
-rw-r--r--www/p5-HTML-Adsense/Makefile4
-rw-r--r--www/p5-HTML-CalendarMonthSimple/Makefile4
-rw-r--r--www/p5-HTML-Chunks/Makefile4
-rw-r--r--www/p5-HTML-DOM/Makefile4
-rw-r--r--www/p5-HTML-Declare/Makefile4
-rw-r--r--www/p5-HTML-Diff/Makefile4
-rw-r--r--www/p5-HTML-Display/Makefile4
-rw-r--r--www/p5-HTML-Element-Extended/Makefile4
-rw-r--r--www/p5-HTML-Element-Library/Makefile4
-rw-r--r--www/p5-HTML-Element-Replacer/Makefile4
-rw-r--r--www/p5-HTML-Encoding/Makefile4
-rw-r--r--www/p5-HTML-FillInForm/Makefile4
-rw-r--r--www/p5-HTML-Form/Makefile4
-rw-r--r--www/p5-HTML-FormFu-Imager/Makefile4
-rw-r--r--www/p5-HTML-FormFu-Model-DBIC/Makefile4
-rw-r--r--www/p5-HTML-FormFu-MultiForm/Makefile4
-rw-r--r--www/p5-HTML-FormFu/Makefile6
-rw-r--r--www/p5-HTML-FormHandler/Makefile4
-rw-r--r--www/p5-HTML-FromANSI/Makefile4
-rw-r--r--www/p5-HTML-FromText/Makefile4
-rw-r--r--www/p5-HTML-GenToc/Makefile4
-rw-r--r--www/p5-HTML-LinkExtractor/Makefile4
-rw-r--r--www/p5-HTML-Lint/Makefile4
-rw-r--r--www/p5-HTML-Mason-PSGIHandler/Makefile4
-rw-r--r--www/p5-HTML-Mason/Makefile4
-rw-r--r--www/p5-HTML-Pager/Makefile4
-rw-r--r--www/p5-HTML-Parser-Simple/Makefile4
-rw-r--r--www/p5-HTML-PrettyPrinter/Makefile4
-rw-r--r--www/p5-HTML-Prototype/Makefile4
-rw-r--r--www/p5-HTML-RSSAutodiscovery/Makefile4
-rw-r--r--www/p5-HTML-ResolveLink/Makefile4
-rw-r--r--www/p5-HTML-RobotsMETA/Makefile4
-rw-r--r--www/p5-HTML-Scrubber/Makefile4
-rw-r--r--www/p5-HTML-Seamstress/Makefile4
-rw-r--r--www/p5-HTML-SimpleLinkExtor/Makefile4
-rw-r--r--www/p5-HTML-StickyQuery/Makefile4
-rw-r--r--www/p5-HTML-StripScripts-Parser/Makefile4
-rw-r--r--www/p5-HTML-TableExtract/Makefile4
-rw-r--r--www/p5-HTML-TableParser/Makefile4
-rw-r--r--www/p5-HTML-TableTiler/Makefile4
-rw-r--r--www/p5-HTML-TagCloud-Extended/Makefile4
-rw-r--r--www/p5-HTML-Template-Compiled/Makefile4
-rw-r--r--www/p5-HTML-Template-HashWrapper/Makefile4
-rw-r--r--www/p5-HTML-Template-JIT/Makefile4
-rw-r--r--www/p5-HTML-Template-Pluggable/Makefile4
-rw-r--r--www/p5-HTML-Toc/Makefile4
-rw-r--r--www/p5-HTML-TokeParser-Simple/Makefile4
-rw-r--r--www/p5-HTML-Tree/Makefile4
-rw-r--r--www/p5-HTML-TreeBuilder-LibXML/Makefile4
-rw-r--r--www/p5-HTML-TreeBuilder-XPath/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-DokuWiki/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-GoogleCode/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-Kwiki/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-Markdown/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-MediaWiki/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-MoinMoin/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-Oddmuse/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-PbWiki/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-PhpWiki/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-PmWiki/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-SnipSnap/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-Socialtext/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-TikiWiki/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-UseMod/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-WakkaWiki/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter-WikkaWiki/Makefile4
-rw-r--r--www/p5-HTML-WikiConverter/Makefile4
-rw-r--r--www/p5-HTTP-Async/Makefile4
-rw-r--r--www/p5-HTTP-Body/Makefile4
-rw-r--r--www/p5-HTTP-Cache-Transparent/Makefile4
-rw-r--r--www/p5-HTTP-CookieJar/Makefile4
-rw-r--r--www/p5-HTTP-Cookies-Mozilla/Makefile4
-rw-r--r--www/p5-HTTP-Cookies-iCab/Makefile4
-rw-r--r--www/p5-HTTP-Cookies-w3m/Makefile4
-rw-r--r--www/p5-HTTP-Cookies/Makefile4
-rw-r--r--www/p5-HTTP-DAV/Makefile4
-rw-r--r--www/p5-HTTP-Daemon/Makefile4
-rw-r--r--www/p5-HTTP-Engine/Makefile4
-rw-r--r--www/p5-HTTP-Entity-Parser/Makefile4
-rw-r--r--www/p5-HTTP-Headers-Fast/Makefile4
-rw-r--r--www/p5-HTTP-Link-Parser/Makefile4
-rw-r--r--www/p5-HTTP-Message/Makefile4
-rw-r--r--www/p5-HTTP-Negotiate/Makefile4
-rw-r--r--www/p5-HTTP-Proxy/Makefile4
-rw-r--r--www/p5-HTTP-ProxyPAC/Makefile4
-rw-r--r--www/p5-HTTP-Recorder/Makefile4
-rw-r--r--www/p5-HTTP-Request-AsCGI/Makefile4
-rw-r--r--www/p5-HTTP-Request-Params/Makefile4
-rw-r--r--www/p5-HTTP-Response-Encoding/Makefile4
-rw-r--r--www/p5-HTTP-Router/Makefile4
-rw-r--r--www/p5-HTTP-Server-Simple-Authen/Makefile4
-rw-r--r--www/p5-HTTP-Server-Simple-Mason/Makefile4
-rw-r--r--www/p5-HTTP-Server-Simple-PSGI/Makefile4
-rw-r--r--www/p5-HTTP-Server-Simple-Recorder/Makefile4
-rw-r--r--www/p5-HTTP-Server-Simple/Makefile4
-rw-r--r--www/p5-HTTP-Session-Store-DBI/Makefile4
-rw-r--r--www/p5-HTTP-SimpleLinkChecker/Makefile4
-rw-r--r--www/p5-HTTP-Size/Makefile4
-rw-r--r--www/p5-HTTP-Tiny-SPDY/Makefile4
-rw-r--r--www/p5-HTTP-Tiny-UA/Makefile4
-rw-r--r--www/p5-IMDB-Film/Makefile4
-rw-r--r--www/p5-Image-Delivery/Makefile4
-rw-r--r--www/p5-Interchange6/Makefile4
-rw-r--r--www/p5-JSON-API/Makefile4
-rw-r--r--www/p5-Jemplate/Makefile4
-rw-r--r--www/p5-Jifty/Makefile4
-rw-r--r--www/p5-LWP-Authen-Wsse/Makefile4
-rw-r--r--www/p5-LWP-Protocol-connect/Makefile4
-rw-r--r--www/p5-LWP-Protocol-http10/Makefile4
-rw-r--r--www/p5-LWP-Protocol-https/Makefile4
-rw-r--r--www/p5-LWP-Protocol-socks/Makefile4
-rw-r--r--www/p5-LWP-UserAgent-POE/Makefile4
-rw-r--r--www/p5-LWP-UserAgent-WithCache/Makefile4
-rw-r--r--www/p5-LWPx-ParanoidAgent/Makefile4
-rw-r--r--www/p5-Mason/Makefile4
-rw-r--r--www/p5-MasonX-Interp-WithCallbacks/Makefile4
-rw-r--r--www/p5-MasonX-Profiler/Makefile4
-rw-r--r--www/p5-MasonX-Request-WithApacheSession/Makefile4
-rw-r--r--www/p5-MasonX-WebApp/Makefile4
-rw-r--r--www/p5-Maypole/Makefile4
-rw-r--r--www/p5-MediaWiki-API/Makefile4
-rw-r--r--www/p5-MediaWiki/Makefile4
-rw-r--r--www/p5-ModPerl-VersionUtil/Makefile4
-rw-r--r--www/p5-MojoMojo/Makefile4
-rw-r--r--www/p5-MojoX-Log-Dispatch-Simple/Makefile4
-rw-r--r--www/p5-MojoX-Renderer-Xslate/Makefile4
-rw-r--r--www/p5-Mojolicious-Plugin-Authentication/Makefile4
-rw-r--r--www/p5-Mojolicious-Plugin-Database/Makefile4
-rw-r--r--www/p5-Mojolicious-Plugin-Mongodb/Makefile4
-rw-r--r--www/p5-Mojolicious-Plugin-SetUserGroup/Makefile4
-rw-r--r--www/p5-Mojolicious-Plugin-TtRenderer/Makefile4
-rw-r--r--www/p5-Mojolicious-Plugin-YamlConfig/Makefile4
-rw-r--r--www/p5-Net-Akismet/Makefile4
-rw-r--r--www/p5-Net-Amazon-AWIS/Makefile4
-rw-r--r--www/p5-Net-Async-FastCGI/Makefile4
-rw-r--r--www/p5-Net-Async-HTTP/Makefile4
-rw-r--r--www/p5-Net-Flickr-API/Makefile4
-rw-r--r--www/p5-Net-Flickr-Backup/Makefile4
-rw-r--r--www/p5-Net-Flickr-RDF/Makefile4
-rw-r--r--www/p5-Net-FreshBooks-API/Makefile4
-rw-r--r--www/p5-Net-Plurk/Makefile4
-rw-r--r--www/p5-Net-Trac/Makefile4
-rw-r--r--www/p5-Net-UPS/Makefile4
-rw-r--r--www/p5-Net-YAP/Makefile4
-rw-r--r--www/p5-Net-eBay/Makefile4
-rw-r--r--www/p5-Newsletter/Makefile4
-rw-r--r--www/p5-PHP-Session/Makefile4
-rw-r--r--www/p5-POE-Component-Client-HTTP/Makefile4
-rw-r--r--www/p5-POE-Component-Client-UserAgent/Makefile4
-rw-r--r--www/p5-POE-Component-Server-HTTP/Makefile4
-rw-r--r--www/p5-POE-Component-Server-HTTPServer/Makefile4
-rw-r--r--www/p5-POE-Component-Server-SOAP/Makefile4
-rw-r--r--www/p5-POE-Component-Server-SimpleHTTP/Makefile4
-rw-r--r--www/p5-POE-Filter-HTTP-Parser/Makefile4
-rw-r--r--www/p5-ParallelUserAgent/Makefile4
-rw-r--r--www/p5-Parse-HTTP-UserAgent/Makefile4
-rw-r--r--www/p5-Perlanet/Makefile4
-rw-r--r--www/p5-Plack-Middleware-CrossOrigin/Makefile4
-rw-r--r--www/p5-Plack-Middleware-Expires/Makefile4
-rw-r--r--www/p5-Plack-Middleware-ExtDirect/Makefile4
-rw-r--r--www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile4
-rw-r--r--www/p5-Plack-Middleware-ForceEnv/Makefile4
-rw-r--r--www/p5-Plack-Middleware-MethodOverride/Makefile4
-rw-r--r--www/p5-Plack-Middleware-NoMultipleSlashes/Makefile4
-rw-r--r--www/p5-Plack-Middleware-RemoveRedundantBody/Makefile4
-rw-r--r--www/p5-Plack-Middleware-Rewrite/Makefile4
-rw-r--r--www/p5-Plack-Middleware-Test-StashWarnings/Makefile4
-rw-r--r--www/p5-Plack-Middleware-XForwardedFor/Makefile4
-rw-r--r--www/p5-Plack-Test-ExternalServer/Makefile4
-rw-r--r--www/p5-PocketIO/Makefile4
-rw-r--r--www/p5-Pod-Site/Makefile4
-rw-r--r--www/p5-PodToHTML/Makefile4
-rw-r--r--www/p5-Protocol-HTTP2/Makefile4
-rw-r--r--www/p5-Protocol-SocketIO/Makefile4
-rw-r--r--www/p5-Protocol-XMLRPC/Makefile4
-rw-r--r--www/p5-REST-Client/Makefile4
-rw-r--r--www/p5-RPC-ExtDirect/Makefile4
-rw-r--r--www/p5-RT-Authen-ExternalAuth/Makefile5
-rw-r--r--www/p5-RT-Client-REST/Makefile4
-rw-r--r--www/p5-RT-Extension-LDAPImport/Makefile5
-rw-r--r--www/p5-RT-Extension-SLA/Makefile5
-rw-r--r--www/p5-RTx-Calendar/Makefile5
-rw-r--r--www/p5-Reaction/Makefile4
-rw-r--r--www/p5-Reddit-Client/Makefile4
-rw-r--r--www/p5-Rose-HTML-Objects/Makefile4
-rw-r--r--www/p5-Router-Simple/Makefile4
-rw-r--r--www/p5-SRU/Makefile4
-rw-r--r--www/p5-Scrappy/Makefile4
-rw-r--r--www/p5-Syntax-Highlight-HTML/Makefile4
-rw-r--r--www/p5-Syntax-Highlight-Shell/Makefile4
-rw-r--r--www/p5-Task-Catalyst/Makefile4
-rw-r--r--www/p5-Tatsumaki/Makefile4
-rw-r--r--www/p5-Template-GD/Makefile4
-rw-r--r--www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile4
-rw-r--r--www/p5-Template-Mustache/Makefile4
-rw-r--r--www/p5-Template-Plugin-Class/Makefile4
-rw-r--r--www/p5-Template-Plugin-Clickable-Email/Makefile4
-rw-r--r--www/p5-Template-Plugin-Clickable/Makefile4
-rw-r--r--www/p5-Template-Plugin-Comma/Makefile4
-rw-r--r--www/p5-Template-Plugin-FillInForm/Makefile4
-rw-r--r--www/p5-Template-Plugin-JSON/Makefile4
-rw-r--r--www/p5-Template-Plugin-JavaScript/Makefile4
-rw-r--r--www/p5-Template-Plugin-MP3/Makefile4
-rw-r--r--www/p5-Template-Plugin-Markdown/Makefile4
-rw-r--r--www/p5-Template-Plugin-StripScripts/Makefile4
-rw-r--r--www/p5-Template-Plugin-Subst/Makefile4
-rw-r--r--www/p5-Template-Provider-Encoding/Makefile4
-rw-r--r--www/p5-Template-Provider-FromDATA/Makefile4
-rw-r--r--www/p5-Template-Simple/Makefile4
-rw-r--r--www/p5-Template-Timer/Makefile4
-rw-r--r--www/p5-Template-Toolkit-Simple/Makefile4
-rw-r--r--www/p5-Template-Toolkit/Makefile4
-rw-r--r--www/p5-Test-HTTP-Server-Simple/Makefile4
-rw-r--r--www/p5-Test-HTTP/Makefile4
-rw-r--r--www/p5-Test-LWP-UserAgent/Makefile4
-rw-r--r--www/p5-Test-Nginx/Makefile4
-rw-r--r--www/p5-TestGen4Web-Runner/Makefile4
-rw-r--r--www/p5-Text-MultiMarkdown-ApacheHandler/Makefile4
-rw-r--r--www/p5-Tie-TinyURL/Makefile4
-rw-r--r--www/p5-Toader/Makefile4
-rw-r--r--www/p5-Toadfarm/Makefile4
-rw-r--r--www/p5-URI-Fetch/Makefile4
-rw-r--r--www/p5-URL-Encode/Makefile8
-rw-r--r--www/p5-W3C-LinkChecker/Makefile4
-rw-r--r--www/p5-W3C-LogValidator/Makefile4
-rw-r--r--www/p5-WWW-AtMovies-TV/Makefile4
-rw-r--r--www/p5-WWW-Babelfish/Makefile4
-rw-r--r--www/p5-WWW-Baseball-NPB/Makefile4
-rw-r--r--www/p5-WWW-Comic/Makefile4
-rw-r--r--www/p5-WWW-Contact/Makefile4
-rw-r--r--www/p5-WWW-DHL/Makefile4
-rw-r--r--www/p5-WWW-Dilbert/Makefile4
-rw-r--r--www/p5-WWW-Facebook-API/Makefile4
-rw-r--r--www/p5-WWW-FreeProxy/Makefile4
-rw-r--r--www/p5-WWW-GitHub-Gist/Makefile4
-rw-r--r--www/p5-WWW-Google-Calculator/Makefile4
-rw-r--r--www/p5-WWW-Google-News-TW/Makefile4
-rw-r--r--www/p5-WWW-Google-News/Makefile4
-rw-r--r--www/p5-WWW-Google-PageRank/Makefile4
-rw-r--r--www/p5-WWW-Google-Video/Makefile4
-rw-r--r--www/p5-WWW-HatenaDiary/Makefile4
-rw-r--r--www/p5-WWW-HatenaLogin/Makefile4
-rw-r--r--www/p5-WWW-HatenaStar/Makefile4
-rw-r--r--www/p5-WWW-Instapaper-Client/Makefile4
-rw-r--r--www/p5-WWW-LongURL/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-DecodedContent/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-FormFiller/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-GZip/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-PhantomJS/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-Pluggable/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-Plugin-phpBB/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-Shell/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-SpamCop/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-TreeBuilder/Makefile4
-rw-r--r--www/p5-WWW-Mechanize/Makefile4
-rw-r--r--www/p5-WWW-Mediawiki-Client/Makefile4
-rw-r--r--www/p5-WWW-Mixi/Makefile4
-rw-r--r--www/p5-WWW-Myspace/Makefile4
-rw-r--r--www/p5-WWW-NicoVideo-Download/Makefile4
-rw-r--r--www/p5-WWW-NioTV/Makefile4
-rw-r--r--www/p5-WWW-OpenSVN/Makefile4
-rw-r--r--www/p5-WWW-OpenSearch/Makefile4
-rw-r--r--www/p5-WWW-Pastebin-PastebinCom-Create/Makefile4
-rw-r--r--www/p5-WWW-Robot/Makefile4
-rw-r--r--www/p5-WWW-RobotRules/Makefile4
-rw-r--r--www/p5-WWW-Salesforce/Makefile4
-rw-r--r--www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile4
-rw-r--r--www/p5-WWW-Search-AltaVista/Makefile4
-rw-r--r--www/p5-WWW-Search-Google/Makefile4
-rw-r--r--www/p5-WWW-Search-MSN/Makefile4
-rw-r--r--www/p5-WWW-Search/Makefile4
-rw-r--r--www/p5-WWW-Shorten-0rz/Makefile4
-rw-r--r--www/p5-WWW-Shorten-Bitly/Makefile4
-rw-r--r--www/p5-WWW-Shorten-Googl/Makefile4
-rw-r--r--www/p5-WWW-Shorten-KUSO/Makefile4
-rw-r--r--www/p5-WWW-Shorten-Yourls/Makefile4
-rw-r--r--www/p5-WWW-Shorten-isgd/Makefile4
-rw-r--r--www/p5-WWW-Shorten/Makefile4
-rw-r--r--www/p5-WWW-SourceForge/Makefile4
-rw-r--r--www/p5-WWW-Spinn3r/Makefile4
-rw-r--r--www/p5-WWW-TWSMS/Makefile4
-rw-r--r--www/p5-WWW-TinySong/Makefile4
-rw-r--r--www/p5-WWW-Tumblr/Makefile4
-rw-r--r--www/p5-WWW-VenusEnvy/Makefile4
-rw-r--r--www/p5-WWW-WebArchive/Makefile4
-rw-r--r--www/p5-WWW-Wikipedia/Makefile4
-rw-r--r--www/p5-WWW-iTunesConnect/Makefile4
-rw-r--r--www/p5-Web-Query/Makefile4
-rw-r--r--www/p5-Web-Scraper/Makefile4
-rw-r--r--www/p5-Web-Simple/Makefile4
-rw-r--r--www/p5-Web-oEmbed/Makefile4
-rw-r--r--www/p5-WebDAO/Makefile4
-rw-r--r--www/p5-WebService-Bloglines/Makefile4
-rw-r--r--www/p5-WebService-GData/Makefile4
-rw-r--r--www/p5-WebService-Google-Reader/Makefile4
-rw-r--r--www/p5-WebService-Google-Sets/Makefile4
-rw-r--r--www/p5-WebService-IMDB/Makefile4
-rw-r--r--www/p5-WebService-ISBNDB/Makefile4
-rw-r--r--www/p5-WebService-Linode/Makefile4
-rw-r--r--www/p5-WebService-MoviePosterDB/Makefile4
-rw-r--r--www/p5-WebService-MusicBrainz/Makefile4
-rw-r--r--www/p5-WebService-MusicBrainz0/Makefile4
-rw-r--r--www/p5-WebService-NoPaste/Makefile4
-rw-r--r--www/p5-WebService-Rakuten/Makefile6
-rw-r--r--www/p5-WebService-Simple/Makefile4
-rw-r--r--www/p5-WebService-Technorati/Makefile4
-rw-r--r--www/p5-WordPress-XMLRPC/Makefile4
-rw-r--r--www/p5-Yahoo-Search/Makefile4
-rw-r--r--www/p5-chklinks/Makefile4
-rw-r--r--www/p5-libservlet/Makefile4
-rw-r--r--www/p5-webservice-validator-css-w3c/Makefile4
-rw-r--r--x11-fonts/p5-Font-TTF/Makefile4
-rw-r--r--x11-toolkits/p5-Alien-wxWidgets/Makefile4
-rw-r--r--x11-toolkits/p5-Gtk2-Chmod/Makefile4
-rw-r--r--x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile4
-rw-r--r--x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile4
-rw-r--r--x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile4
-rw-r--r--x11-toolkits/p5-Gtk2-ImageView/Makefile4
-rw-r--r--x11-toolkits/p5-Gtk2-TrayIcon/Makefile4
-rw-r--r--x11-toolkits/p5-Gtk3/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-Action/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-Autoscroll/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-ColourChooser/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-Contrib/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-CursorControl/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-DKW/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-Date/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-DynaTabFrame/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-Enscript/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-FileDialog/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-FontDialog/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-GBARR/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-Getopt/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-HistEntry/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-JComboBox/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-ResizeButton/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-Role-Dialog/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-Role-HasWidgets/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-Splashscreen/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-Sugar/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-TableMatrix/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-ToolBar/Makefile4
-rw-r--r--x11-toolkits/p5-Tk-WaitBox/Makefile4
-rw-r--r--x11-toolkits/p5-Wx/Makefile4
-rw-r--r--x11/p5-X11-IdleTime/Makefile4
-rw-r--r--x11/p5-X11-Protocol-Other/Makefile4
-rw-r--r--x11/p5-X11-XCB/Makefile4
-rw-r--r--x11/p5-X11-Xlib/Makefile4
-rw-r--r--x11/p5-XTerm-Conf/Makefile4
2492 files changed, 5022 insertions, 5029 deletions
diff --git a/archivers/p5-Archive-Any-Plugin-Rar/Makefile b/archivers/p5-Archive-Any-Plugin-Rar/Makefile
index aef14f2e2d4d..015a65b35753 100644
--- a/archivers/p5-Archive-Any-Plugin-Rar/Makefile
+++ b/archivers/p5-Archive-Any-Plugin-Rar/Makefile
@@ -14,10 +14,10 @@ COMMENT= Wrapper around Archive::Rar
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Any>=0:archivers/p5-Archive-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Any>=0:archivers/p5-Archive-Any \
p5-Archive-Rar>=0:archivers/p5-Archive-Rar \
p5-lib-abs>=0.90:devel/p5-lib-abs
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/archivers/p5-Archive-Any/Makefile b/archivers/p5-Archive-Any/Makefile
index 2e1feaaac1cc..a0cbe69968e9 100644
--- a/archivers/p5-Archive-Any/Makefile
+++ b/archivers/p5-Archive-Any/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Archive-Zip>=1.07:archivers/p5-Archive-Zip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Zip>=1.07:archivers/p5-Archive-Zip \
p5-File-MMagic>=1.27:devel/p5-File-MMagic \
p5-MIME-Types>=1.16:mail/p5-MIME-Types \
p5-Module-Find>=0.05:devel/p5-Module-Find
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic \
p5-Test-Warn>=0:devel/p5-Test-Warn
diff --git a/archivers/p5-Archive-Extract-Libarchive/Makefile b/archivers/p5-Archive-Extract-Libarchive/Makefile
index 2918cd9c78c0..04f0322ec23e 100644
--- a/archivers/p5-Archive-Extract-Libarchive/Makefile
+++ b/archivers/p5-Archive-Extract-Libarchive/Makefile
@@ -14,8 +14,8 @@ COMMENT= Generic archive extracting mechanism (using libarchive)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Object-Tiny>=0:devel/p5-Object-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Object-Tiny>=0:devel/p5-Object-Tiny
TEST_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Test-Pod>=1.04:devel/p5-Test-Pod
diff --git a/archivers/p5-Archive-Peek/Makefile b/archivers/p5-Archive-Peek/Makefile
index c19896d3cd74..8c23ccd942ef 100644
--- a/archivers/p5-Archive-Peek/Makefile
+++ b/archivers/p5-Archive-Peek/Makefile
@@ -14,10 +14,10 @@ COMMENT= Peek into archives without extracting them
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.14:devel/p5-Test-Pod
USES= perl5
diff --git a/archivers/p5-Archive-Rar/Makefile b/archivers/p5-Archive-Rar/Makefile
index 1c19cd113f8a..b922ea3733d7 100644
--- a/archivers/p5-Archive-Rar/Makefile
+++ b/archivers/p5-Archive-Rar/Makefile
@@ -14,9 +14,9 @@ COMMENT= Interface with the 'rar' command
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IPC-Run>=0:devel/p5-IPC-Run \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IPC-Run>=0:devel/p5-IPC-Run \
rar:archivers/rar
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/archivers/p5-Archive-SimpleExtractor/Makefile b/archivers/p5-Archive-SimpleExtractor/Makefile
index ef9b29e83c59..b50dc4d03f22 100644
--- a/archivers/p5-Archive-SimpleExtractor/Makefile
+++ b/archivers/p5-Archive-SimpleExtractor/Makefile
@@ -14,9 +14,9 @@ COMMENT= Simple module for extract archives
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Rar>=2.02:archivers/p5-Archive-Rar \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Rar>=2.02:archivers/p5-Archive-Rar \
p5-Archive-Zip>=1.30:archivers/p5-Archive-Zip
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
diff --git a/archivers/p5-Archive-Tar-Wrapper/Makefile b/archivers/p5-Archive-Tar-Wrapper/Makefile
index 9524df6ae2f2..73e115c2d48e 100644
--- a/archivers/p5-Archive-Tar-Wrapper/Makefile
+++ b/archivers/p5-Archive-Tar-Wrapper/Makefile
@@ -13,10 +13,10 @@ COMMENT= API wrapper around the 'tar' utility
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \
p5-IPC-Run>=0:devel/p5-IPC-Run \
p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Dumbbench>=0.111:benchmarks/p5-Dumbbench
NO_ARCH= yes
diff --git a/archivers/p5-Compress-LZW/Makefile b/archivers/p5-Compress-LZW/Makefile
index efc849995027..da620f50c71e 100644
--- a/archivers/p5-Compress-LZW/Makefile
+++ b/archivers/p5-Compress-LZW/Makefile
@@ -13,11 +13,11 @@ COMMENT= Pure perl implementation of LZW
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moo>=1.001000:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=1.001000:devel/p5-Moo \
p5-Type-Tiny>0:devel/p5-Type-Tiny \
p5-namespace-clean>0:devel/p5-namespace-clean \
p5-strictures>0:devel/p5-strictures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/archivers/p5-IO-Compress-Lzf/Makefile b/archivers/p5-IO-Compress-Lzf/Makefile
index 0c4867c0a140..99a19d6da8ce 100644
--- a/archivers/p5-IO-Compress-Lzf/Makefile
+++ b/archivers/p5-IO-Compress-Lzf/Makefile
@@ -13,9 +13,9 @@ COMMENT= Write lzf files / buffers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Compress-LZF>=0:archivers/p5-Compress-LZF \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-LZF>=0:archivers/p5-Compress-LZF \
p5-IO-Compress>=${PORTVERSION}:archivers/p5-IO-Compress
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1:devel/p5-Test-Pod
NO_ARCH= yes
diff --git a/archivers/p5-IO-Compress-Lzma/Makefile b/archivers/p5-IO-Compress-Lzma/Makefile
index 934fa5364a63..caa433cb8e4f 100644
--- a/archivers/p5-IO-Compress-Lzma/Makefile
+++ b/archivers/p5-IO-Compress-Lzma/Makefile
@@ -13,9 +13,9 @@ COMMENT= Write lzma files / buffers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Compress-Raw-Lzma>=${PORTVERSION}:archivers/p5-Compress-Raw-Lzma \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-Raw-Lzma>=${PORTVERSION}:archivers/p5-Compress-Raw-Lzma \
p5-IO-Compress>=${PORTVERSION}:archivers/p5-IO-Compress
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-String>=0:devel/p5-IO-String \
p5-Test-Pod>=1:devel/p5-Test-Pod \
p7zip>=0:archivers/p7zip
diff --git a/archivers/p5-IO-Compress-Lzop/Makefile b/archivers/p5-IO-Compress-Lzop/Makefile
index 99ef7c79ae70..a4afe5130a67 100644
--- a/archivers/p5-IO-Compress-Lzop/Makefile
+++ b/archivers/p5-IO-Compress-Lzop/Makefile
@@ -13,9 +13,9 @@ COMMENT= Write lzop files / buffers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Compress-LZO>=0:archivers/p5-Compress-LZO \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-LZO>=0:archivers/p5-Compress-LZO \
p5-IO-Compress>=${PORTVERSION}:archivers/p5-IO-Compress
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1:devel/p5-Test-Pod
NO_ARCH= yes
diff --git a/archivers/p5-IO-Compress/Makefile b/archivers/p5-IO-Compress/Makefile
index 342f0e7aad2d..05a31379d28d 100644
--- a/archivers/p5-IO-Compress/Makefile
+++ b/archivers/p5-IO-Compress/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl5 compression modules (bzip2, deflate, gzip, zlib, zip)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Compress-Raw-Bzip2>=${PORTVERSION}:archivers/p5-Compress-Raw-Bzip2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-Raw-Bzip2>=${PORTVERSION}:archivers/p5-Compress-Raw-Bzip2 \
p5-Compress-Raw-Zlib>=${PORTVERSION}:archivers/p5-Compress-Raw-Zlib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1:devel/p5-Test-Pod
NO_ARCH= yes
diff --git a/archivers/p5-POE-Filter-Bzip2/Makefile b/archivers/p5-POE-Filter-Bzip2/Makefile
index f81cc6a8e3e4..8d487c41aec1 100644
--- a/archivers/p5-POE-Filter-Bzip2/Makefile
+++ b/archivers/p5-POE-Filter-Bzip2/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Compress-Bzip2>=2.08:archivers/p5-Compress-Bzip2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-Bzip2>=2.08:archivers/p5-Compress-Bzip2 \
p5-POE>=0.38:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/archivers/p5-POE-Filter-LZF/Makefile b/archivers/p5-POE-Filter-LZF/Makefile
index 9f6781c50000..ee6a01cc15df 100644
--- a/archivers/p5-POE-Filter-LZF/Makefile
+++ b/archivers/p5-POE-Filter-LZF/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Compress-LZF>=1.51:archivers/p5-Compress-LZF \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-LZF>=1.51:archivers/p5-Compress-LZF \
p5-POE>=0.38:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/archivers/p5-POE-Filter-LZO/Makefile b/archivers/p5-POE-Filter-LZO/Makefile
index 7892728e6718..41698ac3a890 100644
--- a/archivers/p5-POE-Filter-LZO/Makefile
+++ b/archivers/p5-POE-Filter-LZO/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Compress-LZO>=1.08:archivers/p5-Compress-LZO \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-LZO>=1.08:archivers/p5-Compress-LZO \
p5-POE>=0.38:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/archivers/p5-POE-Filter-LZW/Makefile b/archivers/p5-POE-Filter-LZW/Makefile
index 0a640bb2d3d5..3019e2554d42 100644
--- a/archivers/p5-POE-Filter-LZW/Makefile
+++ b/archivers/p5-POE-Filter-LZW/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Compress-LZW>=0:archivers/p5-Compress-LZW \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-LZW>=0:archivers/p5-Compress-LZW \
p5-POE>=0.38:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/archivers/p5-POE-Filter-Zlib/Makefile b/archivers/p5-POE-Filter-Zlib/Makefile
index c829d2d29237..616e7783ba77 100644
--- a/archivers/p5-POE-Filter-Zlib/Makefile
+++ b/archivers/p5-POE-Filter-Zlib/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=0.38:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0.38:devel/p5-POE
USES= perl5
USE_PERL5= configure
diff --git a/archivers/p5-PerlIO-via-Bzip2/Makefile b/archivers/p5-PerlIO-via-Bzip2/Makefile
index 9cb39dfcc14c..2be2a8422e50 100644
--- a/archivers/p5-PerlIO-via-Bzip2/Makefile
+++ b/archivers/p5-PerlIO-via-Bzip2/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl extension to provide a PerlIO layer to bzip2/bunzip2
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2
USES= perl5
USE_PERL5= configure
diff --git a/astro/p5-Astro-ADS/Makefile b/astro/p5-Astro-ADS/Makefile
index 733f8ece82e6..fb474108b074 100644
--- a/astro/p5-Astro-ADS/Makefile
+++ b/astro/p5-Astro-ADS/Makefile
@@ -13,8 +13,8 @@ COMMENT= OO Perl interface to the ADS abstract service
LICENSE= GPLv2+
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
NO_ARCH= yes
USES= perl5
diff --git a/astro/p5-Astro-App-Satpass2/Makefile b/astro/p5-Astro-App-Satpass2/Makefile
index 4c87f41e6dd1..d6a5e96c2347 100644
--- a/astro/p5-Astro-App-Satpass2/Makefile
+++ b/astro/p5-Astro-App-Satpass2/Makefile
@@ -13,13 +13,13 @@ COMMENT= Forecast satellite visibility
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Astro-SIMBAD-Client>=0:astro/p5-Astro-SIMBAD-Client \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Astro-SIMBAD-Client>=0:astro/p5-Astro-SIMBAD-Client \
p5-Astro-satpass>=0.077:astro/p5-Astro-satpass \
p5-Clone>=0:devel/p5-Clone \
p5-File-HomeDir>=0.93:devel/p5-File-HomeDir \
p5-IPC-System-Simple>=0:devel/p5-IPC-System-Simple \
p5-Template-Toolkit>=2.21:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/astro/p5-Astro-Catalog/Makefile b/astro/p5-Astro-Catalog/Makefile
index 2a9a8820cc0e..98475e33738c 100644
--- a/astro/p5-Astro-Catalog/Makefile
+++ b/astro/p5-Astro-Catalog/Makefile
@@ -13,7 +13,8 @@ COMMENT= Generic stellar catalogue object
LICENSE= GPLv3
# p5-Astro-FITS-CFITSIO is a recommended dependency
-BUILD_DEPENDS= p5-Astro-Coords>=0.12:astro/p5-Astro-Coords \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Astro-Coords>=0.12:astro/p5-Astro-Coords \
p5-Astro-FITS-CFITSIO>=1.03:astro/p5-Astro-FITS-CFITSIO \
p5-Astro-Flux>=0.01:astro/p5-Astro-Flux \
p5-Astro-Telescope>=0.50:astro/p5-Astro-Telescope \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Astro-Coords>=0.12:astro/p5-Astro-Coords \
p5-Number-Uncertainty>=0.1:math/p5-Number-Uncertainty \
p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
p5-libwww>=5.53:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= localbase perl5
diff --git a/astro/p5-Astro-Coords/Makefile b/astro/p5-Astro-Coords/Makefile
index 786c9cde7932..119e4387a2a9 100644
--- a/astro/p5-Astro-Coords/Makefile
+++ b/astro/p5-Astro-Coords/Makefile
@@ -12,10 +12,10 @@ COMMENT= Class for handling astronomical coordinates
LICENSE= GPLv2+
-BUILD_DEPENDS= p5-Astro-PAL>=0:astro/p5-Astro-PAL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Astro-PAL>=0:astro/p5-Astro-PAL \
p5-Astro-Telescope>=0.71:astro/p5-Astro-Telescope \
p5-DateTime>=0.76:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta \
p5-Test-Pod>=1:devel/p5-Test-Pod
diff --git a/astro/p5-Astro-DSS/Makefile b/astro/p5-Astro-DSS/Makefile
index 6f532e47291c..28a38479304d 100644
--- a/astro/p5-Astro-DSS/Makefile
+++ b/astro/p5-Astro-DSS/Makefile
@@ -13,8 +13,8 @@ COMMENT= OO interface to the 1st and 2nd Digital Sky Surveys
LICENSE= GPLv2+
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
NO_ARCH= yes
USES= perl5
diff --git a/astro/p5-Astro-Flux/Makefile b/astro/p5-Astro-Flux/Makefile
index 34932a4f05b9..b45d9abe14a1 100644
--- a/astro/p5-Astro-Flux/Makefile
+++ b/astro/p5-Astro-Flux/Makefile
@@ -14,11 +14,11 @@ COMMENT= Class for handling astronomical flux quantities
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Astro-WaveBand>=0:astro/p5-Astro-WaveBand \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Astro-WaveBand>=0:astro/p5-Astro-WaveBand \
p5-DateTime>=0:devel/p5-DateTime \
p5-Misc-Quality>=0:astro/p5-Misc-Quality \
p5-Number-Uncertainty>=0:math/p5-Number-Uncertainty
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/astro/p5-Astro-SIMBAD-Client/Makefile b/astro/p5-Astro-SIMBAD-Client/Makefile
index fb42323aadbf..1156b13e149d 100644
--- a/astro/p5-Astro-SIMBAD-Client/Makefile
+++ b/astro/p5-Astro-SIMBAD-Client/Makefile
@@ -13,12 +13,12 @@ COMMENT= OO interface to SIMBAD4
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
p5-URI>=0:net/p5-URI \
p5-XML-DoubleEncodedEntities>=1:textproc/p5-XML-DoubleEncodedEntities \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-YAML>=0:textproc/p5-YAML
USES= perl5
diff --git a/astro/p5-Astro-SIMBAD/Makefile b/astro/p5-Astro-SIMBAD/Makefile
index 13c8844db059..38c9a28ce02f 100644
--- a/astro/p5-Astro-SIMBAD/Makefile
+++ b/astro/p5-Astro-SIMBAD/Makefile
@@ -13,10 +13,10 @@ COMMENT= OO Perl interface to the SIMBAD astronomical database
LICENSE= GPLv2+
-BUILD_DEPENDS= p5-HTML-Parser>=3.36:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3.36:www/p5-HTML-Parser \
p5-HTML-Tree>=3.17:www/p5-HTML-Tree \
p5-libwww>=5.53:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/astro/p5-Astro-Telescope/Makefile b/astro/p5-Astro-Telescope/Makefile
index 25a36ce3b60e..0344621a34dc 100644
--- a/astro/p5-Astro-Telescope/Makefile
+++ b/astro/p5-Astro-Telescope/Makefile
@@ -14,8 +14,8 @@ COMMENT= Class for obtaining telescope information
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Astro-PAL>=0.99:astro/p5-Astro-PAL
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Astro-PAL>=0.99:astro/p5-Astro-PAL
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/astro/p5-GPS-Babel/Makefile b/astro/p5-GPS-Babel/Makefile
index 7760839e2d22..6f609bd92788 100644
--- a/astro/p5-GPS-Babel/Makefile
+++ b/astro/p5-GPS-Babel/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl interface to gpsbabel
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Which>=0.05:sysutils/p5-File-Which \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Which>=0.05:sysutils/p5-File-Which \
p5-Geo-Gpx>=0.25:graphics/p5-Geo-Gpx
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/astro/p5-GPS/Makefile b/astro/p5-GPS/Makefile
index fb8b3ce953be..8d2a23a3982b 100644
--- a/astro/p5-GPS/Makefile
+++ b/astro/p5-GPS/Makefile
@@ -15,8 +15,8 @@ COMMENT= Perl interface to GPS receivers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Device-SerialPort>=0.07:comms/p5-Device-SerialPort
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Device-SerialPort>=0.07:comms/p5-Device-SerialPort
USES= perl5
USE_PERL5= configure
diff --git a/astro/p5-Starlink-AST/Makefile b/astro/p5-Starlink-AST/Makefile
index aed3bfd9096d..43b2f3c03e64 100644
--- a/astro/p5-Starlink-AST/Makefile
+++ b/astro/p5-Starlink-AST/Makefile
@@ -14,9 +14,9 @@ COMMENT= Interface to the Starlink AST library
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Astro-FITS-CFITSIO>=0:astro/p5-Astro-FITS-CFITSIO \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Astro-FITS-CFITSIO>=0:astro/p5-Astro-FITS-CFITSIO \
p5-Astro-FITS-Header>=0:astro/p5-Astro-FITS-Header
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
USES= perl5
diff --git a/astro/p5-Weather-Underground/Makefile b/astro/p5-Weather-Underground/Makefile
index 2dad9872db31..2ce5406d06a3 100644
--- a/astro/p5-Weather-Underground/Makefile
+++ b/astro/p5-Weather-Underground/Makefile
@@ -14,9 +14,9 @@ COMMENT= Retrieve weather information from wunderground.com
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-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/audio/p5-Audio-MPD-Common/Makefile b/audio/p5-Audio-MPD-Common/Makefile
index 9beb221c9f63..8c679af829a6 100644
--- a/audio/p5-Audio-MPD-Common/Makefile
+++ b/audio/p5-Audio-MPD-Common/Makefile
@@ -13,12 +13,12 @@ COMMENT= Bunch of common helper classes for mpd
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.92:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.92:devel/p5-Moose \
p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-Readonly>=0:devel/p5-Readonly \
p5-String-Formatter>=0:devel/p5-String-Formatter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/audio/p5-Audio-MPD/Makefile b/audio/p5-Audio-MPD/Makefile
index 5e0c4b1e0539..ad70cd3d6730 100644
--- a/audio/p5-Audio-MPD/Makefile
+++ b/audio/p5-Audio-MPD/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Audio-MPD-Common>=0:audio/p5-Audio-MPD-Common \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Audio-MPD-Common>=0:audio/p5-Audio-MPD-Common \
p5-Getopt-Euclid>=0:devel/p5-Getopt-Euclid \
p5-List-AllUtils>=0:devel/p5-List-AllUtils \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Audio-MPD-Common>=0:audio/p5-Audio-MPD-Common \
p5-MooseX-SemiAffordanceAccessor>=0:devel/p5-MooseX-SemiAffordanceAccessor \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-Proc-Daemon>=0:devel/p5-Proc-Daemon
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Corpus-Audio-MPD>=1.113282:audio/p5-Test-Corpus-Audio-MPD
NO_ARCH= yes
diff --git a/audio/p5-Audio-Musepack/Makefile b/audio/p5-Audio-Musepack/Makefile
index d4ce9f6ae8de..8b49a9ac5ad2 100644
--- a/audio/p5-Audio-Musepack/Makefile
+++ b/audio/p5-Audio-Musepack/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Interface to Musepack file information and APE tag fields
-BUILD_DEPENDS= p5-MP3-Info>=1.20:audio/p5-MP3-Info \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MP3-Info>=1.20:audio/p5-MP3-Info \
p5-Audio-Scan>=0.85:audio/p5-Audio-Scan
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/audio/p5-Audio-Scrobbler/Makefile b/audio/p5-Audio-Scrobbler/Makefile
index 32b4f38934aa..1e345c3b9f84 100644
--- a/audio/p5-Audio-Scrobbler/Makefile
+++ b/audio/p5-Audio-Scrobbler/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl interface to Last.fm and AudioScrobbler
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
p5-libwww>=5:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/audio/p5-Audio-Wav/Makefile b/audio/p5-Audio-Wav/Makefile
index 6f34744e0696..365dc5465ad9 100644
--- a/audio/p5-Audio-Wav/Makefile
+++ b/audio/p5-Audio-Wav/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl modules for reading and writing Microsoft WAV files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline>=0:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0:devel/p5-Inline \
p5-Inline-C>=0:devel/p5-Inline-C
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/audio/p5-Audio/Makefile b/audio/p5-Audio/Makefile
index 203e90390ff3..fecaffdd097e 100644
--- a/audio/p5-Audio/Makefile
+++ b/audio/p5-Audio/Makefile
@@ -14,8 +14,8 @@ COMMENT= Audio manipulation routines for perl
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-GSL>=0:math/p5-Math-GSL
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-GSL>=0:math/p5-Math-GSL
USES= perl5
USE_PERL5= configure
diff --git a/audio/p5-MP3-Find/Makefile b/audio/p5-MP3-Find/Makefile
index 96f60c1d1f23..6544335519ae 100644
--- a/audio/p5-MP3-Find/Makefile
+++ b/audio/p5-MP3-Find/Makefile
@@ -14,8 +14,8 @@ COMMENT= Search and sort MP3 files based on their ID3 tags
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MP3-Info>=0:audio/p5-MP3-Info
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MP3-Info>=0:audio/p5-MP3-Info
USES= perl5
USE_PERL5= configure
diff --git a/audio/p5-MP3-Tag-Utils/Makefile b/audio/p5-MP3-Tag-Utils/Makefile
index 3f13dbd4ccf4..a4a447a6416b 100644
--- a/audio/p5-MP3-Tag-Utils/Makefile
+++ b/audio/p5-MP3-Tag-Utils/Makefile
@@ -15,9 +15,9 @@ COMMENT= Assorted utilities for manipulating MP3 files via MP3::Tag
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MP3-Tag>=1.13:audio/p5-MP3-Tag \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MP3-Tag>=1.13:audio/p5-MP3-Tag \
p5-Text-NeatTemplate>=0.10.01:textproc/p5-Text-NeatTemplate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
USE_PERL5= configure
diff --git a/audio/p5-MusicBrainz-DiscID/Makefile b/audio/p5-MusicBrainz-DiscID/Makefile
index 38f68fcf846c..604f9a493c64 100644
--- a/audio/p5-MusicBrainz-DiscID/Makefile
+++ b/audio/p5-MusicBrainz-DiscID/Makefile
@@ -12,9 +12,9 @@ COMMENT= Perl interface for the MusicBrainz libdiscid library
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Test-Pod>=0:devel/p5-Test-Pod
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Pod>=0:devel/p5-Test-Pod
LIB_DEPENDS= libdiscid.so:audio/libdiscid
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= localbase pkgconfig perl5
USE_PERL5= configure
diff --git a/audio/p5-Net-FreeDB/Makefile b/audio/p5-Net-FreeDB/Makefile
index 8f12392bcd73..b275f8487c98 100644
--- a/audio/p5-Net-FreeDB/Makefile
+++ b/audio/p5-Net-FreeDB/Makefile
@@ -14,9 +14,9 @@ COMMENT= Get the CDID of an audio CD and query the FreeDB servers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CDDB-File>=0:audio/p5-CDDB-File \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CDDB-File>=0:audio/p5-CDDB-File \
p5-Moo>=0:devel/p5-Moo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= alias perl5
USE_PERL5= configure
diff --git a/audio/p5-Ogg-Vorbis-Header/Makefile b/audio/p5-Ogg-Vorbis-Header/Makefile
index 08ea3214d54f..a84d0784695e 100644
--- a/audio/p5-Ogg-Vorbis-Header/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header/Makefile
@@ -13,11 +13,11 @@ COMMENT= Manipulate / fetch info from Ogg-Vorbis audio files
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline>=0:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0:devel/p5-Inline \
p5-Inline-C>=0:devel/p5-Inline-C
LIB_DEPENDS= libogg.so:audio/libogg \
libvorbis.so:audio/libvorbis
-RUN_DEPENDS:= ${BUILD_DEPENDS}
MAKE_JOBS_UNSAFE= yes
USES= perl5
diff --git a/audio/p5-Test-Corpus-Audio-MPD/Makefile b/audio/p5-Test-Corpus-Audio-MPD/Makefile
index ccfa57ef9a65..0f2c81de4980 100644
--- a/audio/p5-Test-Corpus-Audio-MPD/Makefile
+++ b/audio/p5-Test-Corpus-Audio-MPD/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Automate launching of fake mdp for testing purposes
-BUILD_DEPENDS= p5-File-ShareDir-PathClass>0:devel/p5-File-ShareDir-PathClass \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-ShareDir-PathClass>0:devel/p5-File-ShareDir-PathClass \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Readonly>=0:devel/p5-Readonly
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/biology/p5-AcePerl/Makefile b/biology/p5-AcePerl/Makefile
index 5e573cd41fe4..f392a0786013 100644
--- a/biology/p5-AcePerl/Makefile
+++ b/biology/p5-AcePerl/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl5 interface to the ACEDB genome database system
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache
MAKE_JOBS_UNSAFE= yes
USES= perl5
diff --git a/biology/p5-Bio-ASN1-EntrezGene/Makefile b/biology/p5-Bio-ASN1-EntrezGene/Makefile
index 035f3aef8c3a..8b2c9e6e9b2a 100644
--- a/biology/p5-Bio-ASN1-EntrezGene/Makefile
+++ b/biology/p5-Bio-ASN1-EntrezGene/Makefile
@@ -16,8 +16,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-BioPerl>=0:biology/p5-BioPerl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-BioPerl>=0:biology/p5-BioPerl
NO_ARCH= yes
USES= perl5
diff --git a/biology/p5-Bio-Coordinate/Makefile b/biology/p5-Bio-Coordinate/Makefile
index 2fec0c96e03b..f8ef5d839cde 100644
--- a/biology/p5-Bio-Coordinate/Makefile
+++ b/biology/p5-Bio-Coordinate/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-BioPerl>=1.007000:biology/p5-BioPerl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-BioPerl>=1.007000:biology/p5-BioPerl
NO_ARCH= yes
USE_PERL5= configure
diff --git a/biology/p5-Bio-Das-Lite/Makefile b/biology/p5-Bio-Das-Lite/Makefile
index 7472b6eb4d80..330ff878a6f8 100644
--- a/biology/p5-Bio-Das-Lite/Makefile
+++ b/biology/p5-Bio-Das-Lite/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl extension for the DAS (HTTP+XML) Protocol
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Readonly>=1.03:devel/p5-Readonly \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Readonly>=1.03:devel/p5-Readonly \
p5-libwww>=0:www/p5-libwww \
p5-WWW-Curl>=4.07:www/p5-WWW-Curl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/biology/p5-Bio-Das/Makefile b/biology/p5-Bio-Das/Makefile
index 41a930813f55..b8ef669e867e 100644
--- a/biology/p5-Bio-Das/Makefile
+++ b/biology/p5-Bio-Das/Makefile
@@ -14,10 +14,10 @@ COMMENT= Client-side library for Distributed Genome Annotation System
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-BioPerl>=0:biology/p5-BioPerl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-BioPerl>=0:biology/p5-BioPerl \
p5-HTML-Parser>=3:www/p5-HTML-Parser \
p5-libwww>=5:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/biology/p5-Bio-FeatureIO/Makefile b/biology/p5-Bio-FeatureIO/Makefile
index 2f85c893b768..809eddb61c99 100644
--- a/biology/p5-Bio-FeatureIO/Makefile
+++ b/biology/p5-Bio-FeatureIO/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-BioPerl>=0:biology/p5-BioPerl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-BioPerl>=0:biology/p5-BioPerl \
p5-Tree-DAG_Node>=0:devel/p5-Tree-DAG_Node \
p5-URI>=0:net/p5-URI \
p5-XML-DOM>=0:textproc/p5-XML-DOM \
p5-XML-DOM-XPath>=0:textproc/p5-XML-DOM-XPath
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/biology/p5-Bio-GFF3/Makefile b/biology/p5-Bio-GFF3/Makefile
index 955c5700fb8c..25fe0509e0e8 100644
--- a/biology/p5-Bio-GFF3/Makefile
+++ b/biology/p5-Bio-GFF3/Makefile
@@ -14,10 +14,10 @@ COMMENT= Fast low-level functions for parsing and formatting GFF3
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-ReadBackwards>=0:devel/p5-File-ReadBackwards \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-ReadBackwards>=0:devel/p5-File-ReadBackwards \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-String>=0:devel/p5-IO-String
USES= perl5
diff --git a/biology/p5-Bio-Glite/Makefile b/biology/p5-Bio-Glite/Makefile
index ed0668d44584..58be4ad54db5 100644
--- a/biology/p5-Bio-Glite/Makefile
+++ b/biology/p5-Bio-Glite/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl Interface to G-language
-BUILD_DEPENDS= p5-libwww>=5:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=5:www/p5-libwww
USES= perl5
USE_PERL5= configure
diff --git a/biology/p5-Bio-Graphics/Makefile b/biology/p5-Bio-Graphics/Makefile
index f16627233186..9fc0800d336e 100644
--- a/biology/p5-Bio-Graphics/Makefile
+++ b/biology/p5-Bio-Graphics/Makefile
@@ -14,14 +14,14 @@ COMMENT= Generate GD Images of Bio::Seq Objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Bio-Coordinate>=1.007000:biology/p5-Bio-Coordinate \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bio-Coordinate>=1.007000:biology/p5-Bio-Coordinate \
p5-Bio-SCF>=1.01:biology/p5-Bio-SCF \
p5-BioPerl>=1.007000:biology/p5-BioPerl \
p5-CGI>=0:www/p5-CGI \
p5-GD>=2.30:graphics/p5-GD \
p5-GD-SVG>=0.32:graphics/p5-GD-SVG \
p5-Statistics-Descriptive>=2.6:math/p5-Statistics-Descriptive
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/biology/p5-Bio-MAGETAB/Makefile b/biology/p5-Bio-MAGETAB/Makefile
index ce4faf061c89..c8b95d8236ad 100644
--- a/biology/p5-Bio-MAGETAB/Makefile
+++ b/biology/p5-Bio-MAGETAB/Makefile
@@ -13,7 +13,8 @@ COMMENT= Data model and utility API for the MAGE-TAB format
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Date-Manip>=5.44:devel/p5-Date-Manip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Manip>=5.44:devel/p5-Date-Manip \
p5-DateTime>=0.43.02:devel/p5-DateTime \
p5-DateTime-Format-DateManip>=0.04:devel/p5-DateTime-Format-DateManip \
p5-Email-Valid>=0.179:mail/p5-Email-Valid \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Date-Manip>=5.44:devel/p5-Date-Manip \
p5-Parse-RecDescent>=1.965.001:devel/p5-Parse-RecDescent \
p5-Text-CSV_XS>=0.32:textproc/p5-Text-CSV_XS \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.26:devel/p5-Test-Exception
USES= perl5
diff --git a/biology/p5-Bio-NEXUS/Makefile b/biology/p5-Bio-NEXUS/Makefile
index bba1732dbd31..2559e08c1512 100644
--- a/biology/p5-Bio-NEXUS/Makefile
+++ b/biology/p5-Bio-NEXUS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Object-oriented Perl API for the NEXUS file format
-BUILD_DEPENDS= p5-Clone-PP>=1.02:devel/p5-Clone-PP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone-PP>=1.02:devel/p5-Clone-PP
TEST_DEPENDS= p5-Test-Deep>=0.106:devel/p5-Test-Deep \
p5-Test-Pod>=0:devel/p5-Test-Pod \
diff --git a/biology/p5-Bio-Phylo/Makefile b/biology/p5-Bio-Phylo/Makefile
index cf6f40d3e1bb..68512e73a70e 100644
--- a/biology/p5-Bio-Phylo/Makefile
+++ b/biology/p5-Bio-Phylo/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
p5-BioPerl>=0:biology/p5-BioPerl \
p5-GD>=0:graphics/p5-GD \
p5-Math-CDF>=0:math/p5-Math-CDF \
@@ -29,7 +30,6 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
p5-XML-Twig>=0:textproc/p5-XML-Twig \
p5-XML-XML2JSON>=0:textproc/p5-XML-XML2JSON \
p5-libxml>=0:textproc/p5-libxml
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-JSON>=0:converters/p5-JSON
NO_ARCH= yes
diff --git a/biology/p5-Bio-SCF/Makefile b/biology/p5-Bio-SCF/Makefile
index 7582862189d3..0013bfe5b43b 100644
--- a/biology/p5-Bio-SCF/Makefile
+++ b/biology/p5-Bio-SCF/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
COMMENT= Read and Update SCF Chromatographic Sequence Files
-BUILD_DEPENDS= ${LOCALBASE}/include/io_lib/scf.h:biology/iolib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${LOCALBASE}/include/io_lib/scf.h:biology/iolib
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/biology/p5-BioPerl-Run/Makefile b/biology/p5-BioPerl-Run/Makefile
index 27a06f98bcb8..7c344b617cf9 100644
--- a/biology/p5-BioPerl-Run/Makefile
+++ b/biology/p5-BioPerl-Run/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
-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-Bio-FeatureIO>=0:biology/p5-Bio-FeatureIO \
p5-BioPerl>=1.007000:biology/p5-BioPerl \
p5-Config-Any>=0:devel/p5-Config-Any \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
p5-IO-String>=0:devel/p5-IO-String \
p5-IPC-Run>=0:devel/p5-IPC-Run \
p5-XML-Twig>=0:textproc/p5-XML-Twig
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS= p5-bioperl-run-1.[13579]*
diff --git a/biology/p5-BioPerl/Makefile b/biology/p5-BioPerl/Makefile
index 55105152f73f..a6b2bbbbe69a 100644
--- a/biology/p5-BioPerl/Makefile
+++ b/biology/p5-BioPerl/Makefile
@@ -14,7 +14,8 @@ COMMENT= Collection of Perl modules for bioinformatics
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Algorithm-Munkres>=0:math/p5-Algorithm-Munkres \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Algorithm-Munkres>=0:math/p5-Algorithm-Munkres \
p5-Array-Compare>=0:misc/p5-Array-Compare \
p5-CGI>=0:www/p5-CGI \
p5-Clone>=0:devel/p5-Clone \
@@ -51,7 +52,6 @@ BUILD_DEPENDS= p5-Algorithm-Munkres>=0:math/p5-Algorithm-Munkres \
p5-YAML>=0:textproc/p5-YAML \
p5-libwww>=0:www/p5-libwww \
p5-libxml>=0:textproc/p5-libxml
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Most>=0:devel/p5-Test-Most \
p5-URI>=0:net/p5-URI
diff --git a/chinese/p5-Lingua-Han-PinYin/Makefile b/chinese/p5-Lingua-Han-PinYin/Makefile
index 3481e46cf9d7..56783675ff4c 100644
--- a/chinese/p5-Lingua-Han-PinYin/Makefile
+++ b/chinese/p5-Lingua-Han-PinYin/Makefile
@@ -13,8 +13,8 @@ COMMENT= Retrieve the Mandarin (PinYin) of Chinese character (HanZi)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Lingua-Han-Utils>=0.10:chinese/p5-Lingua-Han-Utils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-Han-Utils>=0.10:chinese/p5-Lingua-Han-Utils
NO_ARCH= yes
USES= perl5
diff --git a/chinese/p5-Lingua-Han-Utils/Makefile b/chinese/p5-Lingua-Han-Utils/Makefile
index 2c68f8e4af3c..22cf9e47be40 100644
--- a/chinese/p5-Lingua-Han-Utils/Makefile
+++ b/chinese/p5-Lingua-Han-Utils/Makefile
@@ -13,8 +13,8 @@ COMMENT= Utility tools of Chinese character(HanZi)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Encode-Detect-CJK>=0:converters/p5-Encode-Detect-CJK
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Encode-Detect-CJK>=0:converters/p5-Encode-Detect-CJK
USES= perl5
USE_PERL5= configure
diff --git a/chinese/p5-Lingua-ZH-Keywords/Makefile b/chinese/p5-Lingua-ZH-Keywords/Makefile
index 66ec892ad819..d3e30c2d39fb 100644
--- a/chinese/p5-Lingua-ZH-Keywords/Makefile
+++ b/chinese/p5-Lingua-ZH-Keywords/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Chinese Keywords Extraction via Lingua::ZH::TaBE
-BUILD_DEPENDS= p5-Lingua-ZH-TaBE>=0:chinese/p5-Lingua-ZH-TaBE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-ZH-TaBE>=0:chinese/p5-Lingua-ZH-TaBE
USES= perl5
USE_PERL5= configure
diff --git a/chinese/p5-Lingua-ZH-Summarize/Makefile b/chinese/p5-Lingua-ZH-Summarize/Makefile
index 6b30f5e42d84..44a9c3325c46 100644
--- a/chinese/p5-Lingua-ZH-Summarize/Makefile
+++ b/chinese/p5-Lingua-ZH-Summarize/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Chinese Text Summarization
-BUILD_DEPENDS= p5-Lingua-ZH-Toke>=0:chinese/p5-Lingua-ZH-Toke \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-ZH-Toke>=0:chinese/p5-Lingua-ZH-Toke \
p5-Lingua-ZH-Wrap>=0:chinese/p5-Lingua-ZH-Wrap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/chinese/p5-Lingua-ZH-Toke/Makefile b/chinese/p5-Lingua-ZH-Toke/Makefile
index 4bc297a6247f..481e31c9083d 100644
--- a/chinese/p5-Lingua-ZH-Toke/Makefile
+++ b/chinese/p5-Lingua-ZH-Toke/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Chinese Tokenizer on steroids
-BUILD_DEPENDS= p5-Lingua-ZH-TaBE>=0:chinese/p5-Lingua-ZH-TaBE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lingua-ZH-TaBE>=0:chinese/p5-Lingua-ZH-TaBE
USES= perl5
USE_PERL5= configure
diff --git a/comms/p5-Device-Modem/Makefile b/comms/p5-Device-Modem/Makefile
index 9ff82f072cc4..84655a573632 100644
--- a/comms/p5-Device-Modem/Makefile
+++ b/comms/p5-Device-Modem/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl class to interface generic modems (AT-compliant)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Device-SerialPort>=0:comms/p5-Device-SerialPort
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Device-SerialPort>=0:comms/p5-Device-SerialPort
USES= perl5 shebangfix
SHEBANG_FILES= examples/xmodem.pl \
diff --git a/comms/p5-Nexmo-SMS/Makefile b/comms/p5-Nexmo-SMS/Makefile
index fc54084404a9..674821c7083c 100644
--- a/comms/p5-Nexmo-SMS/Makefile
+++ b/comms/p5-Nexmo-SMS/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jnlin@freebsd.cs.nctu.edu.tw
COMMENT= Send SMS via http://www.nexmo.com/ API
-BUILD_DEPENDS= p5-HTTP-Message>=5.836:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=5.836:www/p5-HTTP-Message \
p5-JSON-PP>=2.26000:converters/p5-JSON-PP \
p5-libwww>=5.835:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.22:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
diff --git a/comms/p5-SMS-Send-DeviceGsm/Makefile b/comms/p5-SMS-Send-DeviceGsm/Makefile
index a83ffebc0cff..2c7aa7d941b6 100644
--- a/comms/p5-SMS-Send-DeviceGsm/Makefile
+++ b/comms/p5-SMS-Send-DeviceGsm/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= SMS::Send driver for Device::Gsm
-BUILD_DEPENDS= p5-SMS-Send>=0.04:comms/p5-SMS-Send \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SMS-Send>=0.04:comms/p5-SMS-Send \
p5-Device-Gsm>=1.45:comms/p5-Device-Gsm
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/comms/p5-SMS-Send-NexmoUnicode/Makefile b/comms/p5-SMS-Send-NexmoUnicode/Makefile
index fb386ace50c6..b33ac23f0016 100644
--- a/comms/p5-SMS-Send-NexmoUnicode/Makefile
+++ b/comms/p5-SMS-Send-NexmoUnicode/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jnlin@freebsd.cs.nctu.edu.tw
COMMENT= SMS::Send driver for www.nexmo.com (Unicode)
-BUILD_DEPENDS= p5-Nexmo-SMS>=0.04:comms/p5-Nexmo-SMS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Nexmo-SMS>=0.04:comms/p5-Nexmo-SMS \
p5-SMS-Send>=0:comms/p5-SMS-Send
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/comms/p5-SMS-Send-TW-HiAir/Makefile b/comms/p5-SMS-Send-TW-HiAir/Makefile
index 2960d5754a2d..d61ceb5c6b2e 100644
--- a/comms/p5-SMS-Send-TW-HiAir/Makefile
+++ b/comms/p5-SMS-Send-TW-HiAir/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jnlin@freebsd.cs.nctu.edu.tw
COMMENT= SMS::Send driver for http://hiair.hinet.net/
-BUILD_DEPENDS= p5-SMS-Send>=0:comms/p5-SMS-Send \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SMS-Send>=0:comms/p5-SMS-Send \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-Crypt-SSLeay>=0.51:security/p5-Crypt-SSLeay \
p5-Text-Iconv>=0:converters/p5-Text-Iconv
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/comms/p5-SMS-Send-TW-ShareSMS/Makefile b/comms/p5-SMS-Send-TW-ShareSMS/Makefile
index 030ee9c8fccb..886c793c4170 100644
--- a/comms/p5-SMS-Send-TW-ShareSMS/Makefile
+++ b/comms/p5-SMS-Send-TW-ShareSMS/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= SMS::Send driver for www.ShareSMS.com
-BUILD_DEPENDS= p5-SMS-Send>=0.03:comms/p5-SMS-Send \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SMS-Send>=0.03:comms/p5-SMS-Send \
p5-URI>=0:net/p5-URI \
p5-libwww>=2:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/comms/p5-SMS-Send/Makefile b/comms/p5-SMS-Send/Makefile
index 78c15d10d308..8721bf13e434 100644
--- a/comms/p5-SMS-Send/Makefile
+++ b/comms/p5-SMS-Send/Makefile
@@ -14,9 +14,9 @@ COMMENT= Driver-based API for sending SMS messages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Adapter>=1.05:devel/p5-Class-Adapter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Adapter>=1.05:devel/p5-Class-Adapter \
p5-Params-Util>=1.00:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/converters/p5-Boulder/Makefile b/converters/p5-Boulder/Makefile
index 3ff64c5d7cad..9dfbcf639dd4 100644
--- a/converters/p5-Boulder/Makefile
+++ b/converters/p5-Boulder/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= API for hierarchical tag/value structures
-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/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index f858bae356c7..e1e3d1150dc7 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl module to read TNEF 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-MIME-Tools>=4.109:mail/p5-MIME-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/converters/p5-Encode-compat/Makefile b/converters/p5-Encode-compat/Makefile
index fe83fbb5e6ef..39147114ba24 100644
--- a/converters/p5-Encode-compat/Makefile
+++ b/converters/p5-Encode-compat/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Compatibility interfaces for Encode.pm on Perl < 5.7.1
-BUILD_DEPENDS= p5-Text-Iconv>=0:converters/p5-Text-Iconv
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Iconv>=0:converters/p5-Text-Iconv
USES= perl5
USE_PERL5= configure
diff --git a/converters/p5-JSON-MaybeXS/Makefile b/converters/p5-JSON-MaybeXS/Makefile
index cad612c81bf4..9333fc14c9ff 100644
--- a/converters/p5-JSON-MaybeXS/Makefile
+++ b/converters/p5-JSON-MaybeXS/Makefile
@@ -13,8 +13,8 @@ COMMENT= Use Cpanel::JSON::XS with a fallback to JSON::PP
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cpanel-JSON-XS>=2.3310:converters/p5-Cpanel-JSON-XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cpanel-JSON-XS>=2.3310:converters/p5-Cpanel-JSON-XS
TEST_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Test-Without-Module>=0.17:devel/p5-Test-Without-Module
diff --git a/converters/p5-JSON-XS/Makefile b/converters/p5-JSON-XS/Makefile
index 425bb40f8f92..a410acc70e14 100644
--- a/converters/p5-JSON-XS/Makefile
+++ b/converters/p5-JSON-XS/Makefile
@@ -13,9 +13,9 @@ COMMENT= JSON serialising/deserialising, done correctly and fast
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Types-Serialiser>=0:devel/p5-Types-Serialiser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Types-Serialiser>=0:devel/p5-Types-Serialiser \
p5-common-sense>0:devel/p5-common-sense
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/converters/p5-LaTeXML/Makefile b/converters/p5-LaTeXML/Makefile
index 9af048e0db58..d666a7492b57 100644
--- a/converters/p5-LaTeXML/Makefile
+++ b/converters/p5-LaTeXML/Makefile
@@ -15,7 +15,8 @@ LICENSE= PD CC0-1.0
LICENSE_COMB= dual
LICENSE_FILE_CC0-1.0= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Text-Unidecode>=0:converters/p5-Text-Unidecode \
p5-IO-String>=0:devel/p5-IO-String \
@@ -26,7 +27,6 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
p5-XML-LibXML>=1.62:textproc/p5-XML-LibXML \
p5-XML-LibXSLT>=1.58:textproc/p5-XML-LibXSLT \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/converters/p5-Number-Nary/Makefile b/converters/p5-Number-Nary/Makefile
index fb2725baa785..94e0c528dae1 100644
--- a/converters/p5-Number-Nary/Makefile
+++ b/converters/p5-Number-Nary/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-UDCode>=0:devel/p5-UDCode
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/converters/p5-Sereal/Makefile b/converters/p5-Sereal/Makefile
index b1b90adaf1dc..c53e8000e335 100644
--- a/converters/p5-Sereal/Makefile
+++ b/converters/p5-Sereal/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl extension for fast, compact, powerful binary (de-)serialization
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Sereal-Decoder>=${PORTVERSION}:converters/p5-Sereal-Decoder \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sereal-Decoder>=${PORTVERSION}:converters/p5-Sereal-Decoder \
p5-Sereal-Encoder>=${PORTVERSION}:converters/p5-Sereal-Encoder
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-LongString>=0:devel/p5-Test-LongString \
p5-Test-Warn>=0:devel/p5-Test-Warn
diff --git a/converters/p5-Unicode-Map8/Makefile b/converters/p5-Unicode-Map8/Makefile
index 0eb29e63cc6c..10bef561e24a 100644
--- a/converters/p5-Unicode-Map8/Makefile
+++ b/converters/p5-Unicode-Map8/Makefile
@@ -14,8 +14,8 @@ COMMENT= Mapping table between 8-bit chars and Unicode
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Unicode-String>=2:converters/p5-Unicode-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Unicode-String>=2:converters/p5-Unicode-String
USES= perl5
USE_PERL5= configure
diff --git a/converters/p5-Unicode-MapUTF8/Makefile b/converters/p5-Unicode-MapUTF8/Makefile
index 6086898a750e..a8d9ff65d037 100644
--- a/converters/p5-Unicode-MapUTF8/Makefile
+++ b/converters/p5-Unicode-MapUTF8/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl class that implements conversion between arbitrary charsets
-BUILD_DEPENDS= ja-p5-Jcode>=0:japanese/p5-Jcode \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ja-p5-Jcode>=0:japanese/p5-Jcode \
p5-Unicode-Map>=0:converters/p5-Unicode-Map \
p5-Unicode-Map8>=0:converters/p5-Unicode-Map8 \
p5-Unicode-String>=0:converters/p5-Unicode-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/converters/p5-Unicode-Stringprep/Makefile b/converters/p5-Unicode-Stringprep/Makefile
index 9f4894ad8221..3d6a8d147aaa 100644
--- a/converters/p5-Unicode-Stringprep/Makefile
+++ b/converters/p5-Unicode-Stringprep/Makefile
@@ -14,8 +14,8 @@ COMMENT= Preparation of Internationalized Strings (RFC 3454)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Unicode-Normalize>=1:textproc/p5-Unicode-Normalize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Unicode-Normalize>=1:textproc/p5-Unicode-Normalize
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-Test-Pod>=1:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
diff --git a/converters/p5-WAP-wbxml/Makefile b/converters/p5-WAP-wbxml/Makefile
index 8654341667a1..97cbc93cf440 100644
--- a/converters/p5-WAP-wbxml/Makefile
+++ b/converters/p5-WAP-wbxml/Makefile
@@ -14,9 +14,9 @@ COMMENT= Binarization of XML file
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-I18N-Charset>=0:misc/p5-I18N-Charset
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= dos2unix perl5
USE_PERL5= configure
diff --git a/databases/p5-Amazon-SimpleDB/Makefile b/databases/p5-Amazon-SimpleDB/Makefile
index 0dae6394c141..3fe72d11d212 100644
--- a/databases/p5-Amazon-SimpleDB/Makefile
+++ b/databases/p5-Amazon-SimpleDB/Makefile
@@ -14,11 +14,11 @@ COMMENT= Low-level perlish interface for working with Amazon SimpleDB service
LICENSE= ART10
-BUILD_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-URI>=0:net/p5-URI \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/databases/p5-AnyEvent-BDB/Makefile b/databases/p5-AnyEvent-BDB/Makefile
index 02343c1a657c..d4645c8c365c 100644
--- a/databases/p5-AnyEvent-BDB/Makefile
+++ b/databases/p5-AnyEvent-BDB/Makefile
@@ -14,9 +14,9 @@ COMMENT= Truly asynchronous Berkeley DB access
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=3.81:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=3.81:devel/p5-AnyEvent \
p5-BDB>=1.5:databases/p5-BDB
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/databases/p5-AnyEvent-Redis/Makefile b/databases/p5-AnyEvent-Redis/Makefile
index 0c2c8c290512..f42f1b7a5ffa 100644
--- a/databases/p5-AnyEvent-Redis/Makefile
+++ b/databases/p5-AnyEvent-Redis/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= AnyEvent::Redis - Non-blocking Redis client
-BUILD_DEPENDS= p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-AnyEvent>=0:devel/p5-AnyEvent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Simple>=0.88:devel/p5-Test-Simple \
p5-Test-TCP>=1.03:devel/p5-Test-TCP \
redis>=0:databases/redis
diff --git a/databases/p5-App-Sqitch/Makefile b/databases/p5-App-Sqitch/Makefile
index 842c88e98f33..c423e901db82 100644
--- a/databases/p5-App-Sqitch/Makefile
+++ b/databases/p5-App-Sqitch/Makefile
@@ -18,7 +18,8 @@ TEST_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-Test-Dir>=0:misc/p5-Test-Dir \
p5-Test-File-Contents>=0:devel/p5-Test-File-Contents \
p5-Test-MockModule>=0:devel/p5-Test-MockModule
-BUILD_DEPENDS= p5-Clone>=0:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0:devel/p5-Clone \
p5-Config-GitLike>=1.11:devel/p5-Config-GitLike \
p5-DBI>=0:databases/p5-DBI \
p5-DateTime>=0:devel/p5-DateTime \
@@ -47,7 +48,6 @@ BUILD_DEPENDS= p5-Clone>=0:devel/p5-Clone \
p5-URI-db>=0.15:net/p5-URI-db \
p5-namespace-autoclean>=0.16:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= gettext perl5
USE_PERL5= modbuild
diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile
index 6b3ef9d7ec8a..601d8b9a93c7 100644
--- a/databases/p5-BDB/Makefile
+++ b/databases/p5-BDB/Makefile
@@ -14,8 +14,8 @@ COMMENT= Asynchronous Berkeley DB access
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-common-sense>=0:devel/p5-common-sense
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-common-sense>=0:devel/p5-common-sense
PORTSCOUT= skipv:1.801
diff --git a/databases/p5-Bucardo/Makefile b/databases/p5-Bucardo/Makefile
index d48395b464e5..bbfe5ebc4008 100644
--- a/databases/p5-Bucardo/Makefile
+++ b/databases/p5-Bucardo/Makefile
@@ -13,12 +13,12 @@ COMMENT= Asynchronous PostgreSQL replication system
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DBI>=1.51:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.51:databases/p5-DBI \
p5-DBD-Pg>=2.0:databases/p5-DBD-Pg \
p5-Encode-Locale>=0:converters/p5-Encode-Locale \
p5-boolean>=0:devel/p5-boolean \
p5-DBIx-Safe>=1.2.4:databases/p5-DBIx-Safe
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-CDB_File-Generator/Makefile b/databases/p5-CDB_File-Generator/Makefile
index c0f92310871e..0c2e09f33c2e 100644
--- a/databases/p5-CDB_File-Generator/Makefile
+++ b/databases/p5-CDB_File-Generator/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Generate massive sorted CDB files simply
-BUILD_DEPENDS= cdbmake:databases/cdb \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= cdbmake:databases/cdb \
p5-CDB_File>=0:databases/p5-CDB_File
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Cache-BDB/Makefile b/databases/p5-Cache-BDB/Makefile
index 9ec2f46ee996..120373103aea 100644
--- a/databases/p5-Cache-BDB/Makefile
+++ b/databases/p5-Cache-BDB/Makefile
@@ -14,8 +14,8 @@ COMMENT= Object caching wrapper around BerkeleyDB
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
NO_ARCH= yes
USE_PERL5= configure
diff --git a/databases/p5-Cache-Memcached-Managed/Makefile b/databases/p5-Cache-Memcached-Managed/Makefile
index 8a9459b13fbb..02b25a42c962 100644
--- a/databases/p5-Cache-Memcached-Managed/Makefile
+++ b/databases/p5-Cache-Memcached-Managed/Makefile
@@ -14,8 +14,8 @@ COMMENT= Provide API for managing cached information
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cache-Memcached>=0:databases/p5-Cache-Memcached
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Memcached>=0:databases/p5-Cache-Memcached
TEST_DEPENDS= memcached:databases/memcached
USES= perl5
diff --git a/databases/p5-Cache-Memcached-libmemcached/Makefile b/databases/p5-Cache-Memcached-libmemcached/Makefile
index 73393352fc0d..87bd0b29fc18 100644
--- a/databases/p5-Cache-Memcached-libmemcached/Makefile
+++ b/databases/p5-Cache-Memcached-libmemcached/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= dliakh@ukr.net
COMMENT= Cache::Memcached compatible interface to libmemcached
-BUILD_DEPENDS= p5-Memcached-libmemcached>=0.42.01:databases/p5-Memcached-libmemcached \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Memcached-libmemcached>=0.42.01:databases/p5-Memcached-libmemcached \
p5-Task-Weaken>=0:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Class-DBI-AsForm/Makefile b/databases/p5-Class-DBI-AsForm/Makefile
index 0aa466c5f3d4..4f389d102697 100644
--- a/databases/p5-Class-DBI-AsForm/Makefile
+++ b/databases/p5-Class-DBI-AsForm/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Produce HTML form elements for database columns
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-Class-DBI-Plugin-Type>=0:databases/p5-Class-DBI-Plugin-Type
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Class-DBI-AutoLoader/Makefile b/databases/p5-Class-DBI-AutoLoader/Makefile
index 54fbeb328fe4..cfba66d7a819 100644
--- a/databases/p5-Class-DBI-AutoLoader/Makefile
+++ b/databases/p5-Class-DBI-AutoLoader/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Generates Class::DBI subclasses dynamically
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
p5-Class-DBI-BaseDSN>=0:databases/p5-Class-DBI-BaseDSN
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Class-DBI-DDL/Makefile b/databases/p5-Class-DBI-DDL/Makefile
index 04d1616c439e..b576cc664208 100644
--- a/databases/p5-Class-DBI-DDL/Makefile
+++ b/databases/p5-Class-DBI-DDL/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= DDL for Class-DBI
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
USES= perl5
diff --git a/databases/p5-Class-DBI-LazyInflate/Makefile b/databases/p5-Class-DBI-LazyInflate/Makefile
index a6123c85b986..380ab13b6c10 100644
--- a/databases/p5-Class-DBI-LazyInflate/Makefile
+++ b/databases/p5-Class-DBI-LazyInflate/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Defer inflating of columns until they are used
-BUILD_DEPENDS= p5-Data-Lazy>=0:devel/p5-Data-Lazy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Lazy>=0:devel/p5-Data-Lazy \
p5-Class-DBI>=0:databases/p5-Class-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Class-DBI-Loader-Relationship/Makefile b/databases/p5-Class-DBI-Loader-Relationship/Makefile
index 7a6b4b699b65..95e241ea6e0b 100644
--- a/databases/p5-Class-DBI-Loader-Relationship/Makefile
+++ b/databases/p5-Class-DBI-Loader-Relationship/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Easier relationship specification in CDBI::L
-BUILD_DEPENDS= p5-Class-DBI-Loader>=0:databases/p5-Class-DBI-Loader \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI-Loader>=0:databases/p5-Class-DBI-Loader \
p5-Lingua-EN-Inflect-Number>=0:textproc/p5-Lingua-EN-Inflect-Number
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Class-DBI-Oracle/Makefile b/databases/p5-Class-DBI-Oracle/Makefile
index 946c72146dce..68caac4221e3 100644
--- a/databases/p5-Class-DBI-Oracle/Makefile
+++ b/databases/p5-Class-DBI-Oracle/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Extensions to Class::DBI for Oracle
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Class-DBI-Pg/Makefile b/databases/p5-Class-DBI-Pg/Makefile
index 56a811102454..134fdf6ab1b2 100644
--- a/databases/p5-Class-DBI-Pg/Makefile
+++ b/databases/p5-Class-DBI-Pg/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Extensions to Class::DBI for PostgreSQL
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
p5-DBD-Pg>=0:databases/p5-DBD-Pg
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
index 4e237ba7f9f6..5a94f5ecdf35 100644
--- a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
+++ b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Get COUNT(*) results with abstract SQL
-BUILD_DEPENDS= p5-Class-DBI-Plugin>=0.02:databases/p5-Class-DBI-Plugin \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI-Plugin>=0.02:databases/p5-Class-DBI-Plugin \
p5-Class-DBI>=0.95:databases/p5-Class-DBI \
p5-SQL-Abstract>=1.50:databases/p5-SQL-Abstract
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
index 45ad122c0e1b..45bb9ef2f940 100644
--- a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
+++ b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
@@ -15,10 +15,10 @@ COMMENT= Provides deep_search_where() for Class::DBI
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-DBI>=0.96:databases/p5-Class-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0.96:databases/p5-Class-DBI \
p5-Class-DBI-Plugin>=0.02:databases/p5-Class-DBI-Plugin \
p5-SQL-Abstract>=1.18:databases/p5-SQL-Abstract
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
diff --git a/databases/p5-Class-DBI-Plugin-Pager/Makefile b/databases/p5-Class-DBI-Plugin-Pager/Makefile
index f6ad4c476824..8a30e559761d 100644
--- a/databases/p5-Class-DBI-Plugin-Pager/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Pager/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl extension to paged queries for CDBI
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
p5-SQL-Abstract>=1.61:databases/p5-SQL-Abstract \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
p5-Data-Page>=0:databases/p5-Data-Page \
p5-Class-DBI-Plugin-AbstractCount>=0:databases/p5-Class-DBI-Plugin-AbstractCount
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Text-Exception>0:devel/p5-Test-Exception
USES= perl5
diff --git a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
index cfeb38bfade2..f5cf13495caf 100644
--- a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
+++ b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= More complex retrieve_all() for Class::DBI
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
USES= perl5
diff --git a/databases/p5-Class-DBI-Plugin-Type/Makefile b/databases/p5-Class-DBI-Plugin-Type/Makefile
index 5342c68ceb7c..61c8fcf0cd59 100644
--- a/databases/p5-Class-DBI-Plugin-Type/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Type/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Determine type information for columns
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
USES= perl5
diff --git a/databases/p5-Class-DBI-Plugin/Makefile b/databases/p5-Class-DBI-Plugin/Makefile
index 4846eeb3ceb7..4c6c2c5d9487 100644
--- a/databases/p5-Class-DBI-Plugin/Makefile
+++ b/databases/p5-Class-DBI-Plugin/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Abstract base class for Class::DBI plugins
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Class-DBI-Replication/Makefile b/databases/p5-Class-DBI-Replication/Makefile
index d23bf9c062a3..09b870231f1a 100644
--- a/databases/p5-Class-DBI-Replication/Makefile
+++ b/databases/p5-Class-DBI-Replication/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Class::DBI for replicated database
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Class-DBI-Sweet/Makefile b/databases/p5-Class-DBI-Sweet/Makefile
index 4a057f6fb145..05904de01ba0 100644
--- a/databases/p5-Class-DBI-Sweet/Makefile
+++ b/databases/p5-Class-DBI-Sweet/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Extra sweet features for Class::DBI
-BUILD_DEPENDS= p5-Class-DBI>=3.0.12:databases/p5-Class-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=3.0.12:databases/p5-Class-DBI \
p5-DBI>=0:databases/p5-DBI \
p5-Data-Page>=0:databases/p5-Data-Page \
p5-SQL-Abstract>=1.55:databases/p5-SQL-Abstract
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/databases/p5-Class-DBI-Untaint/Makefile b/databases/p5-Class-DBI-Untaint/Makefile
index 0088d8e9a821..9b68598586ff 100644
--- a/databases/p5-Class-DBI-Untaint/Makefile
+++ b/databases/p5-Class-DBI-Untaint/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Class::DBI constraints using CGI::Untaint
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
p5-CGI-Untaint>=0:www/p5-CGI-Untaint
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
USES= perl5
diff --git a/databases/p5-Class-DBI-mysql/Makefile b/databases/p5-Class-DBI-mysql/Makefile
index 8d4b312360b9..be21845ce3e5 100644
--- a/databases/p5-Class-DBI-mysql/Makefile
+++ b/databases/p5-Class-DBI-mysql/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Extensions to Class::DBI for MySQL
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
p5-DBD-mysql>=0:databases/p5-DBD-mysql
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Class-DBI/Makefile b/databases/p5-Class-DBI/Makefile
index 23633bc6cd5b..0c859aafbb4b 100644
--- a/databases/p5-Class-DBI/Makefile
+++ b/databases/p5-Class-DBI/Makefile
@@ -15,13 +15,13 @@ COMMENT= Simple Database Abstraction
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-Class-Trigger>=0:devel/p5-Class-Trigger \
p5-Clone>=0:devel/p5-Clone \
p5-Ima-DBI>=0:databases/p5-Ima-DBI \
p5-UNIVERSAL-moniker>=0:devel/p5-UNIVERSAL-moniker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
NO_ARCH= yes
diff --git a/databases/p5-CouchDB-View/Makefile b/databases/p5-CouchDB-View/Makefile
index 7c549a66fd12..d3767e59b492 100644
--- a/databases/p5-CouchDB-View/Makefile
+++ b/databases/p5-CouchDB-View/Makefile
@@ -14,11 +14,11 @@ COMMENT= Handle and create CouchDB views in Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-PadWalker>=0:devel/p5-PadWalker \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
NO_ARCH= yes
diff --git a/databases/p5-DBD-AnyData/Makefile b/databases/p5-DBD-AnyData/Makefile
index 95637c054d73..c1804e7c589a 100644
--- a/databases/p5-DBD-AnyData/Makefile
+++ b/databases/p5-DBD-AnyData/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= DBI access to XML, CSV, and other formats
-BUILD_DEPENDS= p5-AnyData>=0.07:devel/p5-AnyData \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyData>=0.07:devel/p5-AnyData \
p5-DBI>1:databases/p5-DBI \
p5-SQL-Statement>1:databases/p5-SQL-Statement
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index fd5747120e1b..9e8c7d3b9117 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -13,10 +13,10 @@ COMMENT= DBI driver for CSV files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=1.636:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.636:databases/p5-DBI \
p5-SQL-Statement>=1.410:databases/p5-SQL-Statement \
p5-Text-CSV_XS>=1.23:textproc/p5-Text-CSV_XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 tar:tgz
USE_PERL5= configure
diff --git a/databases/p5-DBD-Excel/Makefile b/databases/p5-DBD-Excel/Makefile
index bcb0ee5d35f9..31b1cbb9d20c 100644
--- a/databases/p5-DBD-Excel/Makefile
+++ b/databases/p5-DBD-Excel/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Class for DBI drivers that acts on Excel files
-BUILD_DEPENDS= p5-SQL-Statement>=0:databases/p5-SQL-Statement \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SQL-Statement>=0:databases/p5-SQL-Statement \
p5-Spreadsheet-ParseExcel>=0:textproc/p5-Spreadsheet-ParseExcel \
p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME}
USES= perl5
diff --git a/databases/p5-DBD-Google/Makefile b/databases/p5-DBD-Google/Makefile
index f2db29d1d549..d44339df32dc 100644
--- a/databases/p5-DBD-Google/Makefile
+++ b/databases/p5-DBD-Google/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Treat Google as a datasource for DBI
-BUILD_DEPENDS= p5-Net-Google>=0:net/p5-Net-Google \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Google>=0:net/p5-Net-Google \
p5-URI>=0:net/p5-URI \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-SQL-Statement>=0:databases/p5-SQL-Statement \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBD-InterBase/Makefile b/databases/p5-DBD-InterBase/Makefile
index fdd4b6ec2b13..1ed0122c5704 100644
--- a/databases/p5-DBD-InterBase/Makefile
+++ b/databases/p5-DBD-InterBase/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= yuri@rivera.ru
COMMENT= DBI driver for InterBase/Firebird/Yaffil RDBMS server
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
USES= perl5 firebird
USE_PERL5= patch configure
diff --git a/databases/p5-DBD-LDAP/Makefile b/databases/p5-DBD-LDAP/Makefile
index 03c121194fc3..d18beae27b2d 100644
--- a/databases/p5-DBD-LDAP/Makefile
+++ b/databases/p5-DBD-LDAP/Makefile
@@ -13,9 +13,9 @@ COMMENT= DBI interface for accessing LDAP servers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-perl-ldap>=0.01:net/p5-perl-ldap \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-perl-ldap>=0.01:net/p5-perl-ldap \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBD-Mock/Makefile b/databases/p5-DBD-Mock/Makefile
index e94f8eb9e0ce..0fbc80187525 100644
--- a/databases/p5-DBD-Mock/Makefile
+++ b/databases/p5-DBD-Mock/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Simple mock DBD implementation used for testing
-BUILD_DEPENDS= p5-DBI>=1.3:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.3:databases/p5-DBI \
p5-Test-Exception>=0.31:devel/p5-Test-Exception \
p5-Test-Simple>=0.47:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBD-Multi/Makefile b/databases/p5-DBD-Multi/Makefile
index c4c5fe4e9543..65cc95298a03 100644
--- a/databases/p5-DBD-Multi/Makefile
+++ b/databases/p5-DBD-Multi/Makefile
@@ -14,10 +14,10 @@ COMMENT= Manage Multiple Data Sources with Failover and Load Balancing
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
p5-DBI>=0:databases/p5-DBI \
p5-Sys-SigAction>=0.10:devel/p5-Sys-SigAction
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=1.09:databases/p5-DBD-SQLite \
p5-Pod-Simple>=0:textproc/p5-Pod-Simple \
diff --git a/databases/p5-DBD-ODBC/Makefile b/databases/p5-DBD-ODBC/Makefile
index e955327d900d..289115002227 100644
--- a/databases/p5-DBD-ODBC/Makefile
+++ b/databases/p5-DBD-ODBC/Makefile
@@ -13,8 +13,8 @@ COMMENT= DBD module interfacing the ODBC databases
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=1.609:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.609:databases/p5-DBI
LIB_DEPENDS= libodbc.so:databases/unixODBC
OPTIONS_DEFINE= DOCS
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index 47068005c535..7102eca7270e 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -12,8 +12,8 @@ COMMENT= Provides access to PostgreSQL databases through the DBI
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=1.614:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.614:databases/p5-DBI
USES= perl5 pgsql
USE_PERL5= configure
diff --git a/databases/p5-DBD-SQLite/Makefile b/databases/p5-DBD-SQLite/Makefile
index bf8727da9321..791332eba7dd 100644
--- a/databases/p5-DBD-SQLite/Makefile
+++ b/databases/p5-DBD-SQLite/Makefile
@@ -13,8 +13,8 @@ COMMENT= Provides access to SQLite3 databases through the DBI
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=1.57:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.57:databases/p5-DBI
PORTSCOUT= limit:^[0-9\.]*$$
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 443e3a388810..55741ebba620 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -13,9 +13,9 @@ COMMENT= Sybase DBI driver for Perl 5
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
LIB_DEPENDS= libct.so:databases/freetds
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFIGURE_ENV= SYBASE=${LOCALBASE}
USES= gettext perl5
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 52b14ce714c0..574134a79509 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -26,8 +26,7 @@ USES= mysql perl5
USE_PERL5= configure
OPTIONS_DEFINE= SSL
-SSL_BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
-SSL_RUN_DEPENDS= ${SSL_BUILD_DEPENDS}
+SSL_RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
SSL_CONFIGURE_OFF= --nossl
SSL_CONFIGURE_ON= --ssl
SSL_USES= ssl
diff --git a/databases/p5-DBICx-Sugar/Makefile b/databases/p5-DBICx-Sugar/Makefile
index d71a99a83cbd..bbe72ff85b10 100644
--- a/databases/p5-DBICx-Sugar/Makefile
+++ b/databases/p5-DBICx-Sugar/Makefile
@@ -14,9 +14,9 @@ COMMENT= Just some syntax sugar for DBIx::Class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class \
p5-SQL-Translator>=0:databases/p5-SQL-Translator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Modern>=0:devel/p5-Test-Modern \
p5-Test-Requires>=0:devel/p5-Test-Requires \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
diff --git a/databases/p5-DBICx-TestDatabase/Makefile b/databases/p5-DBICx-TestDatabase/Makefile
index 8c0faf31ab4c..25e7d3f61fa0 100644
--- a/databases/p5-DBICx-TestDatabase/Makefile
+++ b/databases/p5-DBICx-TestDatabase/Makefile
@@ -15,9 +15,9 @@ COMMENT= Module to create temporary database from a DBIx::Class::Schema
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
p5-SQL-Translator>=0:databases/p5-SQL-Translator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBIx-Class>=0.07005:databases/p5-DBIx-Class
NO_ARCH= yes
diff --git a/databases/p5-DBICx-TxnInsert/Makefile b/databases/p5-DBICx-TxnInsert/Makefile
index 5e8b0f4cad0a..143c91222c67 100644
--- a/databases/p5-DBICx-TxnInsert/Makefile
+++ b/databases/p5-DBICx-TxnInsert/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Wrap all inserts into transaction
-BUILD_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class \
p5-DBD-Mock>=0:databases/p5-DBD-Mock
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Compile>=0.08:devel/p5-Test-Compile \
p5-Test-Pod>=1.22:devel/p5-Test-Pod
diff --git a/databases/p5-DBIWrapper/Makefile b/databases/p5-DBIWrapper/Makefile
index fc28e79b2539..a93407700530 100644
--- a/databases/p5-DBIWrapper/Makefile
+++ b/databases/p5-DBIWrapper/Makefile
@@ -14,13 +14,13 @@ COMMENT= Perl extension for generic DBI database access
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
p5-IO-stringy>=0:devel/p5-IO-stringy \
p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-XML-SAX>=0:textproc/p5-XML-SAX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg \
p5-DateTime>=0:devel/p5-DateTime
diff --git a/databases/p5-DBIx-Admin-CreateTable/Makefile b/databases/p5-DBIx-Admin-CreateTable/Makefile
index 1cbe979ffd3a..200bd307108b 100644
--- a/databases/p5-DBIx-Admin-CreateTable/Makefile
+++ b/databases/p5-DBIx-Admin-CreateTable/Makefile
@@ -13,9 +13,9 @@ COMMENT= Create and drop tables, primary indexes, and sequences
LICENSE= ART20
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-Moo>=1.004002:devel/p5-Moo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Version>=1.002003:devel/p5-Test-Version
NO_ARCH= yes
diff --git a/databases/p5-DBIx-Admin-DSNManager/Makefile b/databases/p5-DBIx-Admin-DSNManager/Makefile
index a4ba46c4bfe0..f01ad330237e 100644
--- a/databases/p5-DBIx-Admin-DSNManager/Makefile
+++ b/databases/p5-DBIx-Admin-DSNManager/Makefile
@@ -13,11 +13,11 @@ COMMENT= Manage a file of DSNs, for both testing and production
LICENSE= ART20
-BUILD_DEPENDS= p5-Config-Tiny>=2.12:devel/p5-Config-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Tiny>=2.12:devel/p5-Config-Tiny \
p5-DBI>=0:databases/p5-DBI \
p5-File-Slurp>=9999.13:devel/p5-File-Slurp \
p5-Moo>=1.004002:devel/p5-Moo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Version>=1.002003:devel/p5-Test-Version \
p5-Try-Tiny>=0.06:lang/p5-Try-Tiny
diff --git a/databases/p5-DBIx-Admin-TableInfo/Makefile b/databases/p5-DBIx-Admin-TableInfo/Makefile
index 0329521f0869..21e2695ef974 100644
--- a/databases/p5-DBIx-Admin-TableInfo/Makefile
+++ b/databases/p5-DBIx-Admin-TableInfo/Makefile
@@ -14,14 +14,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-DBIx-Admin-CreateTable>=2.10:databases/p5-DBIx-Admin-CreateTable \
p5-DBIx-Admin-DSNManager>=2.01:databases/p5-DBIx-Admin-DSNManager \
p5-Data-Dumper-Concise>=2.022:devel/p5-Data-Dumper-Concise \
p5-Lingua-EN-PluralToSingular>=0.18:textproc/p5-Lingua-EN-PluralToSingular \
p5-Moo>=2.002004:devel/p5-Moo \
p5-Text-Table-Manifold>=1:textproc/p5-Text-Table-Manifold
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/databases/p5-DBIx-AnyDBD/Makefile b/databases/p5-DBIx-AnyDBD/Makefile
index 83c1c41cc40b..a25ab2c06e39 100644
--- a/databases/p5-DBIx-AnyDBD/Makefile
+++ b/databases/p5-DBIx-AnyDBD/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= DBD independent class
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBIx-Class-Candy/Makefile b/databases/p5-DBIx-Class-Candy/Makefile
index d61676fd7347..23565ef276a7 100644
--- a/databases/p5-DBIx-Class-Candy/Makefile
+++ b/databases/p5-DBIx-Class-Candy/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DBIx-Class>=0.08123:databases/p5-DBIx-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0.08123:databases/p5-DBIx-Class \
p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Fatal>=0:devel/p5-Test-Fatal
diff --git a/databases/p5-DBIx-Class-Cursor-Cached/Makefile b/databases/p5-DBIx-Class-Cursor-Cached/Makefile
index 3367000b918e..a678e79b5618 100644
--- a/databases/p5-DBIx-Class-Cursor-Cached/Makefile
+++ b/databases/p5-DBIx-Class-Cursor-Cached/Makefile
@@ -13,9 +13,9 @@ COMMENT= Cursor class with built-in caching support
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Clan>=6.0:devel/p5-Carp-Clan \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>=6.0:devel/p5-Carp-Clan \
p5-DBIx-Class>=0.08124:databases/p5-DBIx-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
diff --git a/databases/p5-DBIx-Class-DateTime-Epoch/Makefile b/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
index 7e9ffb3058b4..74e2ab493e8b 100644
--- a/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
+++ b/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
@@ -14,10 +14,10 @@ COMMENT= Automatic inflation/deflation of epoch-based DateTime objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DBIx-Class>=0.08103:databases/p5-DBIx-Class \
p5-DBIx-Class-TimeStamp>=0.07:databases/p5-DBIx-Class-TimeStamp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBICx-TestDatabase>=0:databases/p5-DBICx-TestDatabase \
p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite
diff --git a/databases/p5-DBIx-Class-DynamicDefault/Makefile b/databases/p5-DBIx-Class-DynamicDefault/Makefile
index ee24629fa4a7..1e9840f782ba 100644
--- a/databases/p5-DBIx-Class-DynamicDefault/Makefile
+++ b/databases/p5-DBIx-Class-DynamicDefault/Makefile
@@ -14,8 +14,8 @@ COMMENT= Automatically set and update fields
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBIx-Class>=0.08127:databases/p5-DBIx-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0.08127:databases/p5-DBIx-Class
TEST_DEPENDS= p5-DBICx-TestDatabase>=0:databases/p5-DBICx-TestDatabase
USES= perl5
diff --git a/databases/p5-DBIx-Class-EncodedColumn/Makefile b/databases/p5-DBIx-Class-EncodedColumn/Makefile
index ba6abc975117..aef4a503f4bd 100644
--- a/databases/p5-DBIx-Class-EncodedColumn/Makefile
+++ b/databases/p5-DBIx-Class-EncodedColumn/Makefile
@@ -13,10 +13,10 @@ COMMENT= Automatically encode columns
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class \
p5-SQL-Translator>=0.09.003:databases/p5-SQL-Translator \
p5-Sub-Name>=0.04:devel/p5-Sub-Name
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-Dir-Self>=0:devel/p5-Dir-Self \
p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/databases/p5-DBIx-Class-Loader/Makefile b/databases/p5-DBIx-Class-Loader/Makefile
index 72faaea8f34c..42a14a552617 100644
--- a/databases/p5-DBIx-Class-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Loader/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Dynamic definition of DBIx::Class sub classes
-BUILD_DEPENDS= p5-DBI>=1.3:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.3:databases/p5-DBI \
p5-DBIx-Class>=0.04001:databases/p5-DBIx-Class \
p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
p5-UNIVERSAL-require>=0.10:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
USES= perl5
diff --git a/databases/p5-DBIx-Class-QueryLog/Makefile b/databases/p5-DBIx-Class-QueryLog/Makefile
index 2605711fcb5c..f067b6ff40d5 100644
--- a/databases/p5-DBIx-Class-QueryLog/Makefile
+++ b/databases/p5-DBIx-Class-QueryLog/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DBIx-Class>=0.070000:databases/p5-DBIx-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0.070000:databases/p5-DBIx-Class \
p5-Moo>=2:devel/p5-Moo \
p5-Type-Tiny>=0:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile b/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
index a664c08ea1a4..8ddbd1f74df5 100644
--- a/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
+++ b/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Adds syntactic sugar to skip the fancy objects
-BUILD_DEPENDS= p5-DBIx-Class>=0.04001:databases/p5-DBIx-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0.04001:databases/p5-DBIx-Class
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-SQL-Translator>=0:databases/p5-SQL-Translator
diff --git a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
index 032807367d10..22aa332064f7 100644
--- a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
+++ b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
@@ -14,7 +14,8 @@ COMMENT= Like update_or_create - but recursive
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Clan>=6.04:devel/p5-Carp-Clan \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>=6.04:devel/p5-Carp-Clan \
p5-DBD-SQLite>=1.21:databases/p5-DBD-SQLite \
p5-DBIx-Class>=0.08103:databases/p5-DBIx-Class \
p5-DBIx-Class-IntrospectableM2M>=0:databases/p5-DBIx-Class-IntrospectableM2M \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Carp-Clan>=6.04:devel/p5-Carp-Clan \
p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
p5-Readonly>=1.03:devel/p5-Readonly \
p5-SQL-Translator>=0.11016:databases/p5-SQL-Translator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-MooseX-NonMoose>=0:devel/p5-MooseX-NonMoose \
p5-Test-Exception>=0:devel/p5-Test-Exception \
diff --git a/databases/p5-DBIx-Class-Schema-Config/Makefile b/databases/p5-DBIx-Class-Schema-Config/Makefile
index 3a6fefe9b51d..26d1ba868e09 100644
--- a/databases/p5-DBIx-Class-Schema-Config/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Config/Makefile
@@ -14,10 +14,10 @@ COMMENT= Credential Management for DBIx::Class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-Any>=0.23:devel/p5-Config-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Any>=0.23:devel/p5-Config-Any \
p5-DBIx-Class>=0.08100:databases/p5-DBIx-Class \
p5-File-HomeDir>0:devel/p5-File-HomeDir
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Config-Any>=0.23:devel/p5-Config-Any \
p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
p5-Test-MockObject>=1.09:devel/p5-Test-MockObject
diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index 03cd0233d462..279ef4b37420 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -13,7 +13,8 @@ COMMENT= Dynamic definition of a DBIx::Class::Schema
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
p5-Class-Accessor-Grouped>=0.10008:devel/p5-Class-Accessor-Grouped \
p5-Class-C3-Componentised>=1.0008:devel/p5-Class-C3-Componentised \
p5-Class-Inspector>=1.27:devel/p5-Class-Inspector \
@@ -30,7 +31,6 @@ BUILD_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
p5-Scope-Guard>=0:devel/p5-Scope-Guard \
p5-String-ToIdentifier-EN>=0.05:textproc/p5-String-ToIdentifier-EN \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
p5-Test-Exception>=0.31:devel/p5-Test-Exception \
p5-Test-Warn>=0.21:devel/p5-Test-Warn \
diff --git a/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile b/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
index 48555685622e..be7efcf6c2cf 100644
--- a/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
+++ b/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
@@ -13,13 +13,13 @@ COMMENT= Enhanced populate method
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Visitor>=0.27:devel/p5-Data-Visitor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Visitor>=0.27:devel/p5-Data-Visitor \
p5-DateTimeX-Easy>=0.089:devel/p5-DateTimeX-Easy \
p5-List-MoreUtils>=0.30:lang/p5-List-MoreUtils \
p5-Moo>=1.004006:devel/p5-Moo \
p5-MooX-HandlesVia>=0.001005:devel/p5-MooX-HandlesVia \
p5-Type-Tiny>=0.042:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-DBIx-Class>=0.08127:databases/p5-DBIx-Class \
p5-DateTime-Format-SQLite>=0.11:devel/p5-DateTime-Format-SQLite \
diff --git a/databases/p5-DBIx-Class-UUIDColumns/Makefile b/databases/p5-DBIx-Class-UUIDColumns/Makefile
index 6555518004be..b6ee402eb4bb 100644
--- a/databases/p5-DBIx-Class-UUIDColumns/Makefile
+++ b/databases/p5-DBIx-Class-UUIDColumns/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= DBIx::Class::UUIDColumns - Implicit uuid columns
-BUILD_DEPENDS= p5-Class-Accessor-Grouped>=0:devel/p5-Class-Accessor-Grouped \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Grouped>=0:devel/p5-Class-Accessor-Grouped \
p5-DBD-SQLite>=1.11:databases/p5-DBD-SQLite \
p5-DBIx-Class>=0.07005:databases/p5-DBIx-Class \
p5-Data-UUID>=0:devel/p5-Data-UUID
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile
index 83534326b8ff..e23da9bffbaa 100644
--- a/databases/p5-DBIx-Class/Makefile
+++ b/databases/p5-DBIx-Class/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Accessor-Grouped>=0.10012:devel/p5-Class-Accessor-Grouped \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Grouped>=0.10012:devel/p5-Class-Accessor-Grouped \
p5-Class-C3-Componentised>=1.000900:devel/p5-Class-C3-Componentised \
p5-Class-Inspector>=1.24:devel/p5-Class-Inspector \
p5-Class-Method-Modifiers>=1.06:devel/p5-Class-Method-Modifiers \
@@ -36,7 +37,6 @@ BUILD_DEPENDS= p5-Class-Accessor-Grouped>=0.10012:devel/p5-Class-Accessor-Groupe
p5-Try-Tiny>=0.07:lang/p5-Try-Tiny \
p5-namespace-clean>=0.20:devel/p5-namespace-clean \
p5-strictures>=1.003001:devel/p5-strictures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Class-DBI-Plugin-DeepAbstractSearch>=0:databases/p5-Class-DBI-Plugin-DeepAbstractSearch \
p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
p5-DateTime>=0.55:devel/p5-DateTime \
diff --git a/databases/p5-DBIx-Custom/Makefile b/databases/p5-DBIx-Custom/Makefile
index 2fe543c7146d..7a7db54304cb 100644
--- a/databases/p5-DBIx-Custom/Makefile
+++ b/databases/p5-DBIx-Custom/Makefile
@@ -14,11 +14,11 @@ COMMENT= Customizable DBI
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBD-SQLite>=1.25:databases/p5-DBD-SQLite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-SQLite>=1.25:databases/p5-DBD-SQLite \
p5-DBI>=1.60.5:databases/p5-DBI \
p5-DBIx-Connector>=0.56:databases/p5-DBIx-Connector \
p5-Object-Simple>=3.1000:devel/p5-Object-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/databases/p5-DBIx-DBSchema/Makefile b/databases/p5-DBIx-DBSchema/Makefile
index 8a605b1dccf1..cf5030b8285a 100644
--- a/databases/p5-DBIx-DBSchema/Makefile
+++ b/databases/p5-DBIx-DBSchema/Makefile
@@ -13,8 +13,8 @@ COMMENT= OO-interface to database schemas
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
OPTIONS_DEFINE= DOCS
diff --git a/databases/p5-DBIx-Handler/Makefile b/databases/p5-DBIx-Handler/Makefile
index e4a7d6607de4..8629438ddd85 100644
--- a/databases/p5-DBIx-Handler/Makefile
+++ b/databases/p5-DBIx-Handler/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DBI>=1.605:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.605:databases/p5-DBI \
p5-DBIx-TransactionManager>=1.09:databases/p5-DBIx-TransactionManager
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-Test-Requires>=0:devel/p5-Test-Requires \
p5-Test-SharedFork>=0.16:devel/p5-Test-SharedFork
diff --git a/databases/p5-DBIx-Lite/Makefile b/databases/p5-DBIx-Lite/Makefile
index 4fbec6ed7cdf..3209d12adfe0 100644
--- a/databases/p5-DBIx-Lite/Makefile
+++ b/databases/p5-DBIx-Lite/Makefile
@@ -13,10 +13,10 @@ COMMENT= Chained and minimal ORM
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBIx-Connector>=0:databases/p5-DBIx-Connector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Connector>=0:databases/p5-DBIx-Connector \
p5-Data-Page>=0:databases/p5-Data-Page \
p5-SQL-Abstract-More>=0:databases/p5-SQL-Abstract-More
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite
USES= perl5
diff --git a/databases/p5-DBIx-Log4perl/Makefile b/databases/p5-DBIx-Log4perl/Makefile
index 42257bd8466e..561dbeed082e 100644
--- a/databases/p5-DBIx-Log4perl/Makefile
+++ b/databases/p5-DBIx-Log4perl/Makefile
@@ -14,9 +14,9 @@ COMMENT= For DBI to selectively log SQL, parameters, result-sets, transactions
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=1.500:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.500:databases/p5-DBI \
p5-Log-Log4perl>=1.04:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBIx-NoSQL/Makefile b/databases/p5-DBIx-NoSQL/Makefile
index 805adb2e185f..d4497a8b0f00 100644
--- a/databases/p5-DBIx-NoSQL/Makefile
+++ b/databases/p5-DBIx-NoSQL/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Clone>=0:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0:devel/p5-Clone \
p5-DBD-SQLite>=1.44:databases/p5-DBD-SQLite \
p5-DBIx-Class>=0.08124:databases/p5-DBIx-Class \
p5-Data-GUID>=0:devel/p5-Data-GUID \
@@ -26,7 +27,6 @@ BUILD_DEPENDS= p5-Clone>=0:devel/p5-Clone \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-SQL-Translator>=0.11016:databases/p5-SQL-Translator \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Most>=0:devel/p5-Test-Most
diff --git a/databases/p5-DBIx-Password/Makefile b/databases/p5-DBIx-Password/Makefile
index 5e70fdffa477..6e5b976d44e7 100644
--- a/databases/p5-DBIx-Password/Makefile
+++ b/databases/p5-DBIx-Password/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Allows you to create a global password file for DB passwords
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBIx-Perlish/Makefile b/databases/p5-DBIx-Perlish/Makefile
index 56d26339f48a..89dbae7d1790 100644
--- a/databases/p5-DBIx-Perlish/Makefile
+++ b/databases/p5-DBIx-Perlish/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perlish interface to SQL databases
-BUILD_DEPENDS= p5-DBI>0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>0:databases/p5-DBI \
p5-PadWalker>0:devel/p5-PadWalker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBIx-Recordset/Makefile b/databases/p5-DBIx-Recordset/Makefile
index 163513010d1d..cb24d9812ef4 100644
--- a/databases/p5-DBIx-Recordset/Makefile
+++ b/databases/p5-DBIx-Recordset/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module for abstraction and simplification of database access
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
NO_ARCH= yes
USES= perl5
diff --git a/databases/p5-DBIx-RetryOverDisconnects/Makefile b/databases/p5-DBIx-RetryOverDisconnects/Makefile
index 39ffd6986852..ac6e80c401fb 100644
--- a/databases/p5-DBIx-RetryOverDisconnects/Makefile
+++ b/databases/p5-DBIx-RetryOverDisconnects/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= vovkasm@gmail.com
COMMENT= Keeps database connection persistent
-BUILD_DEPENDS= p5-DBI>0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>0:databases/p5-DBI \
p5-Exception-Class>0:devel/p5-Exception-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBIx-SQLEngine/Makefile b/databases/p5-DBIx-SQLEngine/Makefile
index 2d6342180ea9..4d7551471d5f 100644
--- a/databases/p5-DBIx-SQLEngine/Makefile
+++ b/databases/p5-DBIx-SQLEngine/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Extends DBI with high-level operations
-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-Class-MixinFactory>=0:devel/p5-Class-MixinFactory \
p5-DBI>=0:databases/p5-DBI \
p5-DBIx-AnyDBD>=0:databases/p5-DBIx-AnyDBD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBIx-SQLite-Simple/Makefile b/databases/p5-DBIx-SQLite-Simple/Makefile
index 421fec58138b..615e2ba3042e 100644
--- a/databases/p5-DBIx-SQLite-Simple/Makefile
+++ b/databases/p5-DBIx-SQLite-Simple/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
COMMENT= Easy access to SQLite databases using objects
-BUILD_DEPENDS= p5-Class-Gomor>=0:devel/p5-Class-Gomor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Gomor>=0:devel/p5-Class-Gomor \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBIx-Safe/Makefile b/databases/p5-DBIx-Safe/Makefile
index 3127ad8ed599..b3c09af3c32c 100644
--- a/databases/p5-DBIx-Safe/Makefile
+++ b/databases/p5-DBIx-Safe/Makefile
@@ -15,9 +15,9 @@ COMMENT= Safer access to your database through a DBI database handle
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DBD-Pg>=1.49:databases/p5-DBD-Pg \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-Pg>=1.49:databases/p5-DBD-Pg \
p5-DBI>=1.490:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/databases/p5-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index fa981f5545a1..59bebeef9f44 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -14,7 +14,8 @@ COMMENT= Perl extension for easy SQL SELECT Statement generation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-ReturnValue>=0:devel/p5-Class-ReturnValue \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-ReturnValue>=0:devel/p5-Class-ReturnValue \
p5-Cache-Simple-TimedExpiry>=0:devel/p5-Cache-Simple-TimedExpiry \
p5-Want>=0:devel/p5-Want \
p5-capitalization>=0:devel/p5-capitalization \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Class-ReturnValue>=0:devel/p5-Class-ReturnValue \
p5-DBIx-DBSchema>=0:databases/p5-DBIx-DBSchema \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Clone>=0:devel/p5-Clone
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
NO_ARCH= yes
diff --git a/databases/p5-DBIx-Simple/Makefile b/databases/p5-DBIx-Simple/Makefile
index ac4fd65e25c1..6f52abcfd0c3 100644
--- a/databases/p5-DBIx-Simple/Makefile
+++ b/databases/p5-DBIx-Simple/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simplified object oriented interface to Perl DBI
-BUILD_DEPENDS= p5-DBI>=1.21:databases/p5-DBI ${TEST_DEPENDS}
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.21:databases/p5-DBI ${TEST_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
OPTIONS_DEFINE= SQL_INTERP SQL_ABSTRACT DBIX_XHTML_TABLE TEXT_TABLE
diff --git a/databases/p5-DBIx-Sunny/Makefile b/databases/p5-DBIx-Sunny/Makefile
index 1a2306be0e99..be4ed804b189 100644
--- a/databases/p5-DBIx-Sunny/Makefile
+++ b/databases/p5-DBIx-Sunny/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DBI>=1.615:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.615:databases/p5-DBI \
p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-DBIx-TransactionManager>=0:databases/p5-DBIx-TransactionManager \
p5-Data-Validator>=0:devel/p5-Data-Validator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=1.31:databases/p5-DBD-SQLite \
p5-Test-Requires>=0:devel/p5-Test-Requires \
p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
diff --git a/databases/p5-DBIx-TableHash/Makefile b/databases/p5-DBIx-TableHash/Makefile
index 34e3319db2d7..11b4ea6ff80d 100644
--- a/databases/p5-DBIx-TableHash/Makefile
+++ b/databases/p5-DBIx-TableHash/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Tie a hash to a MySQL table + SQL utils
-BUILD_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-DBIx-Tree/Makefile b/databases/p5-DBIx-Tree/Makefile
index 4f3dd45ae9e7..f4de6d02468b 100644
--- a/databases/p5-DBIx-Tree/Makefile
+++ b/databases/p5-DBIx-Tree/Makefile
@@ -12,8 +12,8 @@ COMMENT= Perl module for generating a tree from a self-referential table
LICENSE= ART20
-BUILD_DEPENDS= p5-DBI>=1.622:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.622:databases/p5-DBI
TEST_DEPENDS= p5-DBD-SQLite>=1.37:databases/p5-DBD-SQLite
USES= perl5 tar:tgz
diff --git a/databases/p5-DBIx-Wrapper/Makefile b/databases/p5-DBIx-Wrapper/Makefile
index d2deb536d5b5..0b30d847a22c 100644
--- a/databases/p5-DBIx-Wrapper/Makefile
+++ b/databases/p5-DBIx-Wrapper/Makefile
@@ -13,8 +13,8 @@ COMMENT= Wrapper around Perl's DBI module
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
USES= perl5
diff --git a/databases/p5-DBIx-XHTML_Table/Makefile b/databases/p5-DBIx-XHTML_Table/Makefile
index 6e19f35f812a..53afbe62bab1 100644
--- a/databases/p5-DBIx-XHTML_Table/Makefile
+++ b/databases/p5-DBIx-XHTML_Table/Makefile
@@ -12,8 +12,8 @@ COMMENT= Create XHTML tables from SQL queries
LICENSE= ART20
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
TEST_DEPENDS= p5-HTML-TableExtract>=0:www/p5-HTML-TableExtract
NO_ARCH= yes
diff --git a/databases/p5-DBIx-XML_RDB/Makefile b/databases/p5-DBIx-XML_RDB/Makefile
index 2406d026cbd1..630c2afd5d74 100644
--- a/databases/p5-DBIx-XML_RDB/Makefile
+++ b/databases/p5-DBIx-XML_RDB/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for creating XML from existing DBI datasources
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= sql2xml.pl xml2sql.pl
diff --git a/databases/p5-DR-Tarantool/Makefile b/databases/p5-DR-Tarantool/Makefile
index 313c173c033e..300d335a8abd 100644
--- a/databases/p5-DR-Tarantool/Makefile
+++ b/databases/p5-DR-Tarantool/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl driver for Tarantool
LICENSE= ART10
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Dancer-Plugin-DBIC/Makefile b/databases/p5-Dancer-Plugin-DBIC/Makefile
index 0e32578b8323..06be1788322b 100644
--- a/databases/p5-Dancer-Plugin-DBIC/Makefile
+++ b/databases/p5-Dancer-Plugin-DBIC/Makefile
@@ -13,14 +13,14 @@ COMMENT= DBIx::Class interface for Dancer applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class\
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class\
p5-DBIx-Class-Schema-Loader>=0.07002:databases/p5-DBIx-Class-Schema-Loader\
p5-Dancer>=1.3098:www/p5-Dancer \
p5-DBICx-Sugar>=0:databases/p5-DBICx-Sugar \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Requires>=0:devel/p5-Test-Requires
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-Types-LoadableClass>0:devel/p5-MooseX-Types-LoadableClass
USES= perl5
diff --git a/databases/p5-Dancer-Plugin-Database-Core/Makefile b/databases/p5-Dancer-Plugin-Database-Core/Makefile
index 539639059395..c684208e9999 100644
--- a/databases/p5-Dancer-Plugin-Database-Core/Makefile
+++ b/databases/p5-Dancer-Plugin-Database-Core/Makefile
@@ -12,8 +12,8 @@ COMMENT= Shared core for D1 and D2 Database plugins
LICENSE= ART20
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
TEST_DEPENDS= p5-Test-Pod>=1.22:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
diff --git a/databases/p5-Dancer-Plugin-Database/Makefile b/databases/p5-Dancer-Plugin-Database/Makefile
index 252aa7cff9e3..6a64c71fddbd 100644
--- a/databases/p5-Dancer-Plugin-Database/Makefile
+++ b/databases/p5-Dancer-Plugin-Database/Makefile
@@ -13,10 +13,10 @@ COMMENT= Easy database connections for Dancer applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-Dancer>=1.3050:www/p5-Dancer \
p5-Dancer-Plugin-Database-Core>=0.16:databases/p5-Dancer-Plugin-Database-Core
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
NO_ARCH= yes
diff --git a/databases/p5-Dancer-Plugin-Redis/Makefile b/databases/p5-Dancer-Plugin-Redis/Makefile
index 331a42947c6b..4dacd49c8abb 100644
--- a/databases/p5-Dancer-Plugin-Redis/Makefile
+++ b/databases/p5-Dancer-Plugin-Redis/Makefile
@@ -14,9 +14,9 @@ COMMENT= Redis database connector for Dancer
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer>=0:www/p5-Dancer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer>=0:www/p5-Dancer \
p5-Redis>=1.9550:databases/p5-Redis
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:0.10,0.11,0.12,0.13,0.14
diff --git a/databases/p5-Dancer-Session-Memcached/Makefile b/databases/p5-Dancer-Session-Memcached/Makefile
index 32fd841d9fae..77a8ebefc543 100644
--- a/databases/p5-Dancer-Session-Memcached/Makefile
+++ b/databases/p5-Dancer-Session-Memcached/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
p5-Dancer>=0:www/p5-Dancer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/databases/p5-Dancer2-Plugin-DBIC/Makefile b/databases/p5-Dancer2-Plugin-DBIC/Makefile
index f5408f37cbe6..dd2377ad8c40 100644
--- a/databases/p5-Dancer2-Plugin-DBIC/Makefile
+++ b/databases/p5-Dancer2-Plugin-DBIC/Makefile
@@ -13,11 +13,11 @@ COMMENT= DBIx::Class interface for Dancer2 applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class\
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class\
p5-DBIx-Class-Schema-Loader>=0.07002:databases/p5-DBIx-Class-Schema-Loader\
p5-DBICx-Sugar>=0:databases/p5-DBICx-Sugar\
p5-Dancer2>=0.153002:www/p5-Dancer2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
NO_ARCH= yes
diff --git a/databases/p5-Dancer2-Plugin-Database/Makefile b/databases/p5-Dancer2-Plugin-Database/Makefile
index afef8152064d..6cb95000b072 100644
--- a/databases/p5-Dancer2-Plugin-Database/Makefile
+++ b/databases/p5-Dancer2-Plugin-Database/Makefile
@@ -13,9 +13,9 @@ COMMENT= Easy database connections for Dancer2 applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer2>=0.166001:www/p5-Dancer2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer2>=0.166001:www/p5-Dancer2 \
p5-Dancer-Plugin-Database-Core>=0.16:databases/p5-Dancer-Plugin-Database-Core
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-DBI>=0:databases/p5-DBI \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
diff --git a/databases/p5-Data-Page/Makefile b/databases/p5-Data-Page/Makefile
index 166dce4beac5..67db8c6e9533 100644
--- a/databases/p5-Data-Page/Makefile
+++ b/databases/p5-Data-Page/Makefile
@@ -14,8 +14,8 @@ COMMENT= Pager utility for Class::DBI
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/databases/p5-Data-Pageset/Makefile b/databases/p5-Data-Pageset/Makefile
index b6810e71a1f4..c5fc9405bee3 100644
--- a/databases/p5-Data-Pageset/Makefile
+++ b/databases/p5-Data-Pageset/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Page numbering and page sets
-BUILD_DEPENDS= p5-Data-Page>=2:databases/p5-Data-Page
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Page>=2:databases/p5-Data-Page
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-HTML-FormHandler-Model-DBIC/Makefile b/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
index 89d73d3593a1..59e98ceeda09 100644
--- a/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
+++ b/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= vovkasm@gmail.com
COMMENT= Model class for FormHandler unsing DBIx::Class
-BUILD_DEPENDS= p5-DBIx-Class>0:databases/p5-DBIx-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>0:databases/p5-DBIx-Class \
p5-DBIx-Class-ResultSet-RecursiveUpdate>=0.21:databases/p5-DBIx-Class-ResultSet-RecursiveUpdate \
p5-HTML-FormHandler>=0.34001:www/p5-HTML-FormHandler \
p5-Moose>=2.0007:devel/p5-Moose \
p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DateTime-Format-MySQL>0:devel/p5-DateTime-Format-MySQL \
p5-DateTime-Format-SQLite>0:devel/p5-DateTime-Format-SQLite \
p5-DateTime-Format-W3CDTF>0:devel/p5-DateTime-Format-W3CDTF
diff --git a/databases/p5-Ima-DBI/Makefile b/databases/p5-Ima-DBI/Makefile
index 75e15f0a4554..ec50846abd79 100644
--- a/databases/p5-Ima-DBI/Makefile
+++ b/databases/p5-Ima-DBI/Makefile
@@ -15,9 +15,9 @@ COMMENT= Database connection caching and organization
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBIx-ContextualFetch>=0:databases/p5-DBIx-ContextualFetch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-ContextualFetch>=0:databases/p5-DBIx-ContextualFetch \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Interchange6-Schema/Makefile b/databases/p5-Interchange6-Schema/Makefile
index cb860591899f..71e40560dad3 100644
--- a/databases/p5-Interchange6-Schema/Makefile
+++ b/databases/p5-Interchange6-Schema/Makefile
@@ -14,7 +14,8 @@ COMMENT= Database Schema for Interchange 6
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class\
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class\
p5-DBIx-Class-Schema-Config>=0:databases/p5-DBIx-Class-Schema-Config\
p5-DBIx-Class-PassphraseColumn>=0:databases/p5-DBIx-Class-PassphraseColumn\
p5-DBIx-Class-InflateColumn-Authen-Passphrase>=0:databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase\
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class\
p5-Time-Duration-Parse>=0:devel/p5-Time-Duration-Parse\
p5-Locale-SubCountry>=0:misc/p5-Locale-SubCountry\
p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite\
p5-DBIx-Class-TimeStamp>=0:databases/p5-DBIx-Class-TimeStamp\
p5-DBIx-Class-Helpers>=0:databases/p5-DBIx-Class-Helpers\
diff --git a/databases/p5-Iterator-DBI/Makefile b/databases/p5-Iterator-DBI/Makefile
index c676d23e72d6..bab3c27054d9 100644
--- a/databases/p5-Iterator-DBI/Makefile
+++ b/databases/p5-Iterator-DBI/Makefile
@@ -14,8 +14,8 @@ COMMENT= Iterator for returning DBI query results
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Iterator>=0:devel/p5-Iterator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Iterator>=0:devel/p5-Iterator
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Jifty-DBI/Makefile b/databases/p5-Jifty-DBI/Makefile
index 7e940744416d..ba94c9452ba0 100644
--- a/databases/p5-Jifty-DBI/Makefile
+++ b/databases/p5-Jifty-DBI/Makefile
@@ -13,7 +13,8 @@ COMMENT= Jifty::DBI - An object-relational persistence framework
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
p5-Cache-Simple-TimedExpiry>=0.21:devel/p5-Cache-Simple-TimedExpiry \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
@@ -37,7 +38,6 @@ BUILD_DEPENDS= p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
p5-UNIVERSAL-require>=0.11:devel/p5-UNIVERSAL-require \
p5-URI>=0:net/p5-URI \
p5-YAML-Syck>=0:textproc/p5-YAML-Syck
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Warn>=0.1:devel/p5-Test-Warn
NO_ARCH= yes
diff --git a/databases/p5-MLDBM-Sync/Makefile b/databases/p5-MLDBM-Sync/Makefile
index 8441d6cb890d..99d96d4fd388 100644
--- a/databases/p5-MLDBM-Sync/Makefile
+++ b/databases/p5-MLDBM-Sync/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= MLDBM::Sync - safe concurrent access to MLDBM databases
-BUILD_DEPENDS= p5-MLDBM>=0:databases/p5-MLDBM
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MLDBM>=0:databases/p5-MLDBM
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index dde8890ed962..63f98526dced 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -14,8 +14,8 @@ COMMENT= Store multi-level hash structure in single level tied hash
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-FreezeThaw>=0:devel/p5-FreezeThaw
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-FreezeThaw>=0:devel/p5-FreezeThaw
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-MR-Tarantool/Makefile b/databases/p5-MR-Tarantool/Makefile
index 904cd87b6721..c897c4e9fca9 100644
--- a/databases/p5-MR-Tarantool/Makefile
+++ b/databases/p5-MR-Tarantool/Makefile
@@ -14,13 +14,13 @@ COMMENT= Driver for an efficient Tarantool/Box NoSQL in-memory storage
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Class-Singleton>=0:devel/p5-Class-Singleton \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Mouse>=0:devel/p5-Mouse \
p5-String-CRC32>=0:devel/p5-String-CRC32
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/databases/p5-Mango/Makefile b/databases/p5-Mango/Makefile
index fde3e09e8509..aacb73caff7f 100644
--- a/databases/p5-Mango/Makefile
+++ b/databases/p5-Mango/Makefile
@@ -15,9 +15,9 @@ COMMENT= Pure-Perl non-blocking I/O MongoDB driver
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= mongo:databases/mongodb34 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= mongo:databases/mongodb34 \
p5-Mojolicious>=5.40:www/p5-Mojolicious
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/databases/p5-Metadata/Makefile b/databases/p5-Metadata/Makefile
index 2a21b55b4800..eb17ba8f38ea 100644
--- a/databases/p5-Metadata/Makefile
+++ b/databases/p5-Metadata/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl implementation of Dublin Core compatible metadata
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-TimeDate>=0:devel/p5-TimeDate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-TimeDate>=0:devel/p5-TimeDate
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-MySQL-Diff/Makefile b/databases/p5-MySQL-Diff/Makefile
index 48f4aabaa0a2..ce8a9ff8f24a 100644
--- a/databases/p5-MySQL-Diff/Makefile
+++ b/databases/p5-MySQL-Diff/Makefile
@@ -13,11 +13,11 @@ COMMENT= Perl module for comparing the table structure of two MySQL databases
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-DBD-mysql>=0:databases/p5-DBD-mysql \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
USE_PERL5= configure
diff --git a/databases/p5-Net-Async-CassandraCQL/Makefile b/databases/p5-Net-Async-CassandraCQL/Makefile
index 95272e5e0f11..454d440a6303 100644
--- a/databases/p5-Net-Async-CassandraCQL/Makefile
+++ b/databases/p5-Net-Async-CassandraCQL/Makefile
@@ -15,13 +15,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Compress-Snappy>0:archivers/p5-Compress-Snappy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-Snappy>0:archivers/p5-Compress-Snappy \
p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
p5-Future>=0.17:devel/p5-Future \
p5-IO-Async>=0.59:devel/p5-IO-Async \
p5-Compress-LZ4>0:archivers/p5-Compress-LZ4 \
p5-Protocol-CassandraCQL>=0.11:databases/p5-Protocol-CassandraCQL
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Identity>0:devel/p5-Test-Identity \
p5-Test-Refcount>0:devel/p5-Test-Refcount
diff --git a/databases/p5-ORLite-Migrate/Makefile b/databases/p5-ORLite-Migrate/Makefile
index 0bd072fe5ef0..f0df63096fe7 100644
--- a/databases/p5-ORLite-Migrate/Makefile
+++ b/databases/p5-ORLite-Migrate/Makefile
@@ -15,7 +15,8 @@ COMMENT= Light weight SQLite-specific schema migration
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-pushd>=1.00:devel/p5-File-pushd \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-pushd>=1.00:devel/p5-File-pushd \
p5-IPC-Run3>=0.042:devel/p5-IPC-Run3 \
p5-ORLite>=1.28:databases/p5-ORLite \
p5-Probe-Perl>=0.01:sysutils/p5-Probe-Perl \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-File-pushd>=1.00:devel/p5-File-pushd \
p5-DBD-SQLite>=1.21:databases/p5-DBD-SQLite \
p5-Params-Util>0.37:devel/p5-Params-Util \
p5-File-Which>=0.05:sysutils/p5-File-Which
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-ORLite/Makefile b/databases/p5-ORLite/Makefile
index 00f6e8374a86..74ccc3e49d31 100644
--- a/databases/p5-ORLite/Makefile
+++ b/databases/p5-ORLite/Makefile
@@ -15,11 +15,11 @@ COMMENT= Perl5 extremely light weight SQLite-specific ORM
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBD-SQLite>=1.27:databases/p5-DBD-SQLite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-SQLite>=1.27:databases/p5-DBD-SQLite \
p5-DBI>=1.60.7:databases/p5-DBI \
p5-File-Remove>=1.40:devel/p5-File-Remove \
p5-Params-Util>=0.33:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor \
p5-Test-Script>=1.06:devel/p5-Test-Script
diff --git a/databases/p5-Oryx/Makefile b/databases/p5-Oryx/Makefile
index 965954c756dc..fb2c44400e2c 100644
--- a/databases/p5-Oryx/Makefile
+++ b/databases/p5-Oryx/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Meta-Model Driven Object Persistance with Multiple Inheritance
-BUILD_DEPENDS= p5-SQL-Abstract>=0:databases/p5-SQL-Abstract \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SQL-Abstract>=0:databases/p5-SQL-Abstract \
p5-DBM-Deep>=0:databases/p5-DBM-Deep \
p5-YAML>=0:textproc/p5-YAML \
p5-Class-Date>=0:devel/p5-Class-Date \
@@ -19,7 +20,6 @@ BUILD_DEPENDS= p5-SQL-Abstract>=0:databases/p5-SQL-Abstract \
p5-Ima-DBI>=0:databases/p5-Ima-DBI \
p5-Data-Types>=0:devel/p5-Data-Types \
p5-Class-Observable>=0:devel/p5-Class-Observable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-XML-DOM-Lite>0:textproc/p5-XML-DOM-Lite \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
diff --git a/databases/p5-POE-Component-DBIAgent/Makefile b/databases/p5-POE-Component-DBIAgent/Makefile
index e3a2a9b7f890..8c711eb1aec9 100644
--- a/databases/p5-POE-Component-DBIAgent/Makefile
+++ b/databases/p5-POE-Component-DBIAgent/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= POE Component for running asynchronous DBI calls
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-POE-Component-EasyDBI/Makefile b/databases/p5-POE-Component-EasyDBI/Makefile
index d187aa324bb5..5693f094eaa6 100644
--- a/databases/p5-POE-Component-EasyDBI/Makefile
+++ b/databases/p5-POE-Component-EasyDBI/Makefile
@@ -13,11 +13,11 @@ COMMENT= POE Component for simplified DBI usage
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=1.38:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.38:databases/p5-DBI \
p5-POE>=0.3101:devel/p5-POE \
p5-Params-Util>=0:devel/p5-Params-Util \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Requires>=0.08:devel/p5-Test-Requires
USES= perl5
diff --git a/databases/p5-POE-Component-LaDBI/Makefile b/databases/p5-POE-Component-LaDBI/Makefile
index 71a07c2e309e..85fd0fab04ef 100644
--- a/databases/p5-POE-Component-LaDBI/Makefile
+++ b/databases/p5-POE-Component-LaDBI/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for asynchronous non-blocking DBI calls in POE
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure patch
diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile
index e9d4176a071c..9c0290ac75c9 100644
--- a/databases/p5-POE-Component-RRDTool/Makefile
+++ b/databases/p5-POE-Component-RRDTool/Makefile
@@ -15,9 +15,9 @@ COMMENT= POE interface to Round Robin Database Tools
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= rrdtool:databases/rrdtool \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= rrdtool:databases/rrdtool \
p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Prophet/Makefile b/databases/p5-Prophet/Makefile
index b257b2546d65..a1861a340b27 100644
--- a/databases/p5-Prophet/Makefile
+++ b/databases/p5-Prophet/Makefile
@@ -13,7 +13,8 @@ COMMENT= Distributed database system
LICENSE= MIT
-BUILD_DEPENDS= p5-Any-Moose>=0.04:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0.04:devel/p5-Any-Moose \
p5-Config-GitLike>=1.02:devel/p5-Config-GitLike \
p5-DBD-SQLite>=1:databases/p5-DBD-SQLite \
p5-DBI>=1:databases/p5-DBI \
@@ -40,7 +41,6 @@ BUILD_DEPENDS= p5-Any-Moose>=0.04:devel/p5-Any-Moose \
p5-UUID-Tiny>=1.02:devel/p5-UUID-Tiny \
p5-XML-Atom-SimpleFeed>=0:textproc/p5-XML-Atom-SimpleFeed \
p5-YAML-Syck>=0:textproc/p5-YAML-Syck
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.26:devel/p5-Test-Exception
USES= perl5
diff --git a/databases/p5-Protocol-CassandraCQL/Makefile b/databases/p5-Protocol-CassandraCQL/Makefile
index 926863de9482..5d9cd1457600 100644
--- a/databases/p5-Protocol-CassandraCQL/Makefile
+++ b/databases/p5-Protocol-CassandraCQL/Makefile
@@ -16,8 +16,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Compress-Snappy>0:archivers/p5-Compress-Snappy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-Snappy>0:archivers/p5-Compress-Snappy
TEST_DEPENDS= p5-Test-Fatal>0:devel/p5-Test-Fatal \
p5-Test-HexString>0:devel/p5-Test-HexString
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index 159ccf5bcc98..3c2c1f6fb1e0 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple interface to create and store data in RRD files
-BUILD_DEPENDS= rrdtool:databases/rrdtool
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= rrdtool:databases/rrdtool
USES= perl5
USE_PERL5= modbuild
diff --git a/databases/p5-Redis/Makefile b/databases/p5-Redis/Makefile
index ef2c7b01efa6..c5b79aa975d0 100644
--- a/databases/p5-Redis/Makefile
+++ b/databases/p5-Redis/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl binding for Redis database
LICENSE= ART20
-BUILD_DEPENDS= p5-IO-Socket-Timeout>=0.29:net/p5-IO-Socket-Timeout \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-Timeout>=0.29:net/p5-IO-Socket-Timeout \
p5-Try-Tiny>=0.24:lang/p5-Try-Tiny
-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/databases/p5-Relations-Query/Makefile b/databases/p5-Relations-Query/Makefile
index 3ff0320807f0..cf798a274c79 100644
--- a/databases/p5-Relations-Query/Makefile
+++ b/databases/p5-Relations-Query/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
COMMENT= Object for building queries with DBI/DBD::mysql
-BUILD_DEPENDS= p5-Relations>=0:databases/p5-Relations
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Relations>=0:databases/p5-Relations
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-ResourcePool-Resource-DBI/Makefile b/databases/p5-ResourcePool-Resource-DBI/Makefile
index fb2aa934ff89..0d9834627a87 100644
--- a/databases/p5-ResourcePool-Resource-DBI/Makefile
+++ b/databases/p5-ResourcePool-Resource-DBI/Makefile
@@ -13,9 +13,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= ResourcePool::Resource::DBI - A ResourcePool wrapper for DBI
-BUILD_DEPENDS= p5-ResourcePool>=0:devel/p5-ResourcePool \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ResourcePool>=0:devel/p5-ResourcePool \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Rose-DB-Object/Makefile b/databases/p5-Rose-DB-Object/Makefile
index 8a22b1d4e858..1f2300b97d9b 100644
--- a/databases/p5-Rose-DB-Object/Makefile
+++ b/databases/p5-Rose-DB-Object/Makefile
@@ -15,7 +15,8 @@ COMMENT= Extensible, high performance RDBMS-OO mapper
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
p5-Clone>=0.29:devel/p5-Clone \
p5-DBI>=1.400:databases/p5-DBI \
p5-DateTime>=0:devel/p5-DateTime \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
p5-Rose-DateTime>=0.532,1:devel/p5-Rose-DateTime \
p5-Rose-Object>=0.854:devel/p5-Rose-Object \
p5-Time-Clock>=1:devel/p5-Time-Clock
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
USES= perl5
diff --git a/databases/p5-Rose-DB/Makefile b/databases/p5-Rose-DB/Makefile
index 448b01dae671..fdfd3cca4d37 100644
--- a/databases/p5-Rose-DB/Makefile
+++ b/databases/p5-Rose-DB/Makefile
@@ -14,7 +14,8 @@ COMMENT= DBI wrapper and abstraction layer
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Bit-Vector>=6.4:math/p5-Bit-Vector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bit-Vector>=6.4:math/p5-Bit-Vector \
p5-Clone-PP>=0:devel/p5-Clone-PP \
p5-DBI>=0:databases/p5-DBI \
p5-DateTime>=0:devel/p5-DateTime \
@@ -26,7 +27,6 @@ BUILD_DEPENDS= p5-Bit-Vector>=6.4:math/p5-Bit-Vector \
p5-SQL-ReservedWords>=0:databases/p5-SQL-ReservedWords \
p5-Time-Clock>=0:devel/p5-Time-Clock \
p5-YAML-Syck>=0:textproc/p5-YAML-Syck
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:0.7591
diff --git a/databases/p5-SQL-Abstract-More/Makefile b/databases/p5-SQL-Abstract-More/Makefile
index fc3d54ddf9d1..a6c31e145dd6 100644
--- a/databases/p5-SQL-Abstract-More/Makefile
+++ b/databases/p5-SQL-Abstract-More/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/README
-BUILD_DEPENDS= p5-MRO-Compat>0:devel/p5-MRO-Compat \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MRO-Compat>0:devel/p5-MRO-Compat \
p5-Params-Validate>0:devel/p5-Params-Validate \
p5-SQL-Abstract>=1.84:databases/p5-SQL-Abstract \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Pod>=0:devel/p5-Test-Pod
diff --git a/databases/p5-SQL-Abstract/Makefile b/databases/p5-SQL-Abstract/Makefile
index a02a919224d9..194777dd51dc 100644
--- a/databases/p5-SQL-Abstract/Makefile
+++ b/databases/p5-SQL-Abstract/Makefile
@@ -15,12 +15,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge \
p5-Moo>=2.000001:devel/p5-Moo \
p5-MRO-Compat>=0.12:devel/p5-MRO-Compat \
p5-Sub-Quote>=2.000001:devel/p5-Sub-Quote \
p5-Test-Deep>=0.101:devel/p5-Test-Deep
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class \
p5-Test-Exception>=0.31:devel/p5-Test-Exception \
p5-Test-Warn>=0:devel/p5-Test-Warn
diff --git a/databases/p5-SQL-ReservedWords/Makefile b/databases/p5-SQL-ReservedWords/Makefile
index b2723c5b09fc..487fd33017cd 100644
--- a/databases/p5-SQL-ReservedWords/Makefile
+++ b/databases/p5-SQL-ReservedWords/Makefile
@@ -14,8 +14,8 @@ COMMENT= Reserved SQL words by ANSI/ISO
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index 64d34e89f7c9..047ed42f479a 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -15,10 +15,10 @@ LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/ARTISTIC-1.0
LICENSE_FILE_GPLv1+ = ${WRKSRC}/GPL-1
-BUILD_DEPENDS= p5-Clone>=0.30:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0.30:devel/p5-Clone \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Params-Util>=1.00:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index 65859d9e503c..1acf152b0382 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -13,7 +13,8 @@ COMMENT= Manipulate structured data definitions (SQL and more)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
p5-DBI>=1.54:databases/p5-DBI \
p5-File-ShareDir>=1:devel/p5-File-ShareDir \
p5-JSON>=2:converters/p5-JSON \
@@ -28,7 +29,6 @@ BUILD_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
p5-XML-LibXML>=1.69:textproc/p5-XML-LibXML \
p5-strictures>=0:devel/p5-strictures \
p5-YAML>=0.66:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-Test-Differences>=0.61:devel/p5-Test-Differences \
p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/databases/p5-SQLite-Work/Makefile b/databases/p5-SQLite-Work/Makefile
index bd850eea4362..8201ac8973cb 100644
--- a/databases/p5-SQLite-Work/Makefile
+++ b/databases/p5-SQLite-Work/Makefile
@@ -17,11 +17,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-DBI>=0:databases/p5-DBI \
p5-Getopt-ArgvFile>=0:devel/p5-Getopt-ArgvFile \
p5-Text-NeatTemplate>=0:textproc/p5-Text-NeatTemplate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:0.0202,0.0501,0.1001,0.1002,0.1003
diff --git a/databases/p5-Search-InvertedIndex/Makefile b/databases/p5-Search-InvertedIndex/Makefile
index cd2eabe10f7b..bbfd83ac2499 100644
--- a/databases/p5-Search-InvertedIndex/Makefile
+++ b/databases/p5-Search-InvertedIndex/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Manager for inverted index maps
-BUILD_DEPENDS= p5-Class-NamedParms>=0:devel/p5-Class-NamedParms \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-NamedParms>=0:devel/p5-Class-NamedParms \
p5-Class-ParmList>=0:devel/p5-Class-ParmList \
p5-Tie-DB_File-SplitHash>=0:devel/p5-Tie-DB_File-SplitHash \
p5-Tie-FileLRUCache>=0:devel/p5-Tie-FileLRUCache
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Search-Xapian10/Makefile b/databases/p5-Search-Xapian10/Makefile
index e26435249f46..218922bfcde4 100644
--- a/databases/p5-Search-Xapian10/Makefile
+++ b/databases/p5-Search-Xapian10/Makefile
@@ -15,8 +15,8 @@ COMMENT= Perl XS frontend to the Xapian C++ search library
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= xapian-core10>=1.0.22:databases/xapian-core10
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= xapian-core10>=1.0.22:databases/xapian-core10
CONFLICTS_INSTALL= p5-Search-Xapian12
diff --git a/databases/p5-Store-CouchDB/Makefile b/databases/p5-Store-CouchDB/Makefile
index ce180594c5e8..770b6722ab6f 100644
--- a/databases/p5-Store-CouchDB/Makefile
+++ b/databases/p5-Store-CouchDB/Makefile
@@ -12,14 +12,14 @@ COMMENT= Perl interface to Apache CouchDB
LICENSE= ART10
-BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-Data-Printer>=0:devel/p5-Data-Printer \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-libwww>=0:www/p5-libwww \
p5-Types-Serialiser>=0:devel/p5-Types-Serialiser \
p5-URI-Escape-XS>=0:www/p5-URI-Escape-XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/databases/p5-T2/Makefile b/databases/p5-T2/Makefile
index 3729520f1ba6..4e7df9c2d3e6 100644
--- a/databases/p5-T2/Makefile
+++ b/databases/p5-T2/Makefile
@@ -15,11 +15,11 @@ COMMENT= Object Relational mapping system
LICENSE= ART10 GPLv2
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Tangram>=0:devel/p5-Class-Tangram \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Tangram>=0:devel/p5-Class-Tangram \
p5-DBI>=0:databases/p5-DBI \
p5-Set-Object>=0:devel/p5-Set-Object \
p5-Tangram>=0:databases/p5-Tangram
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Tangram/Makefile b/databases/p5-Tangram/Makefile
index 15fd2225a3e3..1f7f0a2223d6 100644
--- a/databases/p5-Tangram/Makefile
+++ b/databases/p5-Tangram/Makefile
@@ -13,11 +13,11 @@ COMMENT= Orthogonal Object Persistence in Relational Databases
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Class-Date>=0:devel/p5-Class-Date \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Date>=0:devel/p5-Class-Date \
p5-DBI>=0:databases/p5-DBI \
p5-Data-Lazy>=0.6:devel/p5-Data-Lazy \
p5-Set-Object>=1.1:devel/p5-Set-Object
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/databases/p5-Template-DBI/Makefile b/databases/p5-Template-DBI/Makefile
index 7ffddc1ff237..b8f9266a6a28 100644
--- a/databases/p5-Template-DBI/Makefile
+++ b/databases/p5-Template-DBI/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Template::Plugin::DBI - Template interface to the DBI 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-DBI>=0:databases/p5-DBI \
p5-SQL-Statement>=1.28:databases/p5-SQL-Statement \
p5-MLDBM>=0:databases/p5-MLDBM
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Test-Cukes/Makefile b/databases/p5-Test-Cukes/Makefile
index 0f48dccb39ad..599db7c048bd 100644
--- a/databases/p5-Test-Cukes/Makefile
+++ b/databases/p5-Test-Cukes/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
COMMENT= BBD test tool inspired by Cucumber
-BUILD_DEPENDS= p5-Any-Moose>=0.10:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0.10:devel/p5-Any-Moose \
p5-Carp-Assert>=0.20:devel/p5-Carp-Assert \
p5-Exporter-Lite>=0.02:devel/p5-Exporter-Lite \
p5-Try-Tiny>=0.07:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Test-Database/Makefile b/databases/p5-Test-Database/Makefile
index 13ec56d12bab..5bc84d5a0e8e 100644
--- a/databases/p5-Test-Database/Makefile
+++ b/databases/p5-Test-Database/Makefile
@@ -14,10 +14,10 @@ COMMENT= Database handles ready for testing
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
p5-File-HomeDir>=0.84:devel/p5-File-HomeDir
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/databases/p5-Test-DatabaseRow/Makefile b/databases/p5-Test-DatabaseRow/Makefile
index 1bcdd52f5b28..1a06eda1d244 100644
--- a/databases/p5-Test-DatabaseRow/Makefile
+++ b/databases/p5-Test-DatabaseRow/Makefile
@@ -13,8 +13,8 @@ COMMENT= Simple database tests
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
NO_ARCH= yes
USES= perl5
diff --git a/databases/p5-Text-Query-SQL/Makefile b/databases/p5-Text-Query-SQL/Makefile
index c4811b8fa959..e43ba287129c 100644
--- a/databases/p5-Text-Query-SQL/Makefile
+++ b/databases/p5-Text-Query-SQL/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Text-Query-SQL provides query builders for SQL databases
-BUILD_DEPENDS= p5-Text-Query>=0:textproc/p5-Text-Query
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Query>=0:textproc/p5-Text-Query
TEST_DEPENDS= p5-DBI>=0:databases/p5-DBI
USES= perl5
diff --git a/databases/p5-mysql-genocide/Makefile b/databases/p5-mysql-genocide/Makefile
index 08074da362bf..71fc19e705b5 100644
--- a/databases/p5-mysql-genocide/Makefile
+++ b/databases/p5-mysql-genocide/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Parallel operation on MySQL processlist
-BUILD_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql
USES= perl5
USE_PERL5= configure
diff --git a/deskutils/p5-Data-ICal/Makefile b/deskutils/p5-Data-ICal/Makefile
index 269483ad06c8..9db853f27654 100644
--- a/deskutils/p5-Data-ICal/Makefile
+++ b/deskutils/p5-Data-ICal/Makefile
@@ -13,10 +13,10 @@ COMMENT= Data::ICal - Generates iCalendar (RFC 2445) calendar files
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-ReturnValue>=0:devel/p5-Class-ReturnValue \
p5-Text-vFile-asData>=0:devel/p5-Text-vFile-asData
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-LongString>=0:devel/p5-Test-LongString \
p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-Test-Pod>=1.14:devel/p5-Test-Pod \
diff --git a/deskutils/p5-Goo/Makefile b/deskutils/p5-Goo/Makefile
index 8c52360d8ea5..57db5a9ad7f9 100644
--- a/deskutils/p5-Goo/Makefile
+++ b/deskutils/p5-Goo/Makefile
@@ -14,7 +14,8 @@ COMMENT= Stick Things together with The Goo
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-Auto>=0:devel/p5-Config-Auto \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Auto>=0:devel/p5-Config-Auto \
p5-Config-Tiny>=0:devel/p5-Config-Tiny \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Config-Auto>=0:devel/p5-Config-Auto \
p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
p5-Text-FormatTable>=0:textproc/p5-Text-FormatTable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= lib/Goo/Thing/*/*.pl
diff --git a/devel/p5-AI-Pathfinding-AStar/Makefile b/devel/p5-AI-Pathfinding-AStar/Makefile
index 1c115a5d20d5..3b3a53c9959a 100644
--- a/devel/p5-AI-Pathfinding-AStar/Makefile
+++ b/devel/p5-AI-Pathfinding-AStar/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl implementation of the A* pathfinding algorithm
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Heap>=0:devel/p5-Heap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Heap>=0:devel/p5-Heap
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Acme-MetaSyntactic/Makefile b/devel/p5-Acme-MetaSyntactic/Makefile
index ddfafd6e6fb1..3cc66accccec 100644
--- a/devel/p5-Acme-MetaSyntactic/Makefile
+++ b/devel/p5-Acme-MetaSyntactic/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Agent/Makefile b/devel/p5-Agent/Makefile
index f0798e3e793f..952d5a296c95 100644
--- a/devel/p5-Agent/Makefile
+++ b/devel/p5-Agent/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl module that provides a foundation for software agent developers
LICENSE= ARTPERL10
-BUILD_DEPENDS= p5-Class-Tom>=0:devel/p5-Class-Tom
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Tom>=0:devel/p5-Class-Tom
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Algorithm-Accounting/Makefile b/devel/p5-Algorithm-Accounting/Makefile
index 45696d844605..48f3c99a1064 100644
--- a/devel/p5-Algorithm-Accounting/Makefile
+++ b/devel/p5-Algorithm-Accounting/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
COMMENT= Generate accounting statistic for general logs
-BUILD_DEPENDS= p5-Spiffy>=0:devel/p5-Spiffy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Spiffy>=0:devel/p5-Spiffy \
p5-Perl6-Form>=0:devel/p5-Perl6-Form \
p5-FreezeThaw>=0:devel/p5-FreezeThaw \
p5-Array-Compare>=0:misc/p5-Array-Compare \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-Spiffy>=0:devel/p5-Spiffy \
p5-GD-Graph>=0:graphics/p5-GD-Graph \
p5-Imager-Graph>=0:graphics/p5-Imager-Graph \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Algorithm-Annotate/Makefile b/devel/p5-Algorithm-Annotate/Makefile
index c2130c346352..2eafc7e90591 100644
--- a/devel/p5-Algorithm-Annotate/Makefile
+++ b/devel/p5-Algorithm-Annotate/Makefile
@@ -14,8 +14,8 @@ COMMENT= Represent a series of changes in annotate form
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
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Algorithm-Bucketizer/Makefile b/devel/p5-Algorithm-Bucketizer/Makefile
index c3d5518cb441..d3dd75afe0e1 100644
--- a/devel/p5-Algorithm-Bucketizer/Makefile
+++ b/devel/p5-Algorithm-Bucketizer/Makefile
@@ -14,9 +14,9 @@ COMMENT= Distribute sized items to buckets with limited size
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Algorithm-Permute>=0:devel/p5-Algorithm-Permute \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Algorithm-Permute>=0:devel/p5-Algorithm-Permute \
p5-Sysadm-Install>=0.23:sysutils/p5-Sysadm-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Algorithm-Dependency-Objects/Makefile b/devel/p5-Algorithm-Dependency-Objects/Makefile
index 9f6d21287ad7..9b07cfc59b3d 100644
--- a/devel/p5-Algorithm-Dependency-Objects/Makefile
+++ b/devel/p5-Algorithm-Dependency-Objects/Makefile
@@ -14,8 +14,8 @@ COMMENT= Implementation of an Object Dependency Algorithm
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Set-Object>=0:devel/p5-Set-Object
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Set-Object>=0:devel/p5-Set-Object
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
USES= perl5
diff --git a/devel/p5-Algorithm-Dependency/Makefile b/devel/p5-Algorithm-Dependency/Makefile
index f064870dfc28..e2dababb4f09 100644
--- a/devel/p5-Algorithm-Dependency/Makefile
+++ b/devel/p5-Algorithm-Dependency/Makefile
@@ -14,8 +14,8 @@ COMMENT= Base class for implementing various dependency trees
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Params-Util>=0.31:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Util>=0.31:devel/p5-Params-Util
TEST_DEPENDS= p5-Test-ClassAPI>=0.6:devel/p5-Test-ClassAPI
USES= perl5
diff --git a/devel/p5-Algorithm-Evolutionary/Makefile b/devel/p5-Algorithm-Evolutionary/Makefile
index 43ec0668d030..869d0b451fc0 100644
--- a/devel/p5-Algorithm-Evolutionary/Makefile
+++ b/devel/p5-Algorithm-Evolutionary/Makefile
@@ -13,7 +13,8 @@ COMMENT= Library for doing evolutionary computation in Perl
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Algorithm-Permute>=0.01:devel/p5-Algorithm-Permute \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Algorithm-Permute>=0.01:devel/p5-Algorithm-Permute \
p5-Bit-Vector>=0:math/p5-Bit-Vector \
p5-Clone>=0.31:devel/p5-Clone \
p5-GD>=2.17:graphics/p5-GD \
@@ -27,7 +28,6 @@ BUILD_DEPENDS= p5-Algorithm-Permute>=0.01:devel/p5-Algorithm-Permute \
p5-XML-Parser>=2.40:textproc/p5-XML-Parser \
p5-XML-Parser-Style-EasyTree>=0:textproc/p5-XML-Parser-Style-EasyTree \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Pod-Escapes>=0:textproc/p5-Pod-Escapes \
p5-Test-Pod>=0:devel/p5-Test-Pod
diff --git a/devel/p5-Algorithm-FloodControl/Makefile b/devel/p5-Algorithm-FloodControl/Makefile
index cafa9d55f788..db11a83aa7f3 100644
--- a/devel/p5-Algorithm-FloodControl/Makefile
+++ b/devel/p5-Algorithm-FloodControl/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Robot protection
-BUILD_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap \
p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Algorithm-IncludeExclude/Makefile b/devel/p5-Algorithm-IncludeExclude/Makefile
index c2422ffa8fda..806f7f4f9c6f 100644
--- a/devel/p5-Algorithm-IncludeExclude/Makefile
+++ b/devel/p5-Algorithm-IncludeExclude/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Build and evaluate include/exclude lists
-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/devel/p5-Algorithm-Networksort/Makefile b/devel/p5-Algorithm-Networksort/Makefile
index adce1cb1e5ca..8193fd9e44fa 100644
--- a/devel/p5-Algorithm-Networksort/Makefile
+++ b/devel/p5-Algorithm-Networksort/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=2.1600:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=2.1600:devel/p5-Moose \
p5-namespace-autoclean>=0.16:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= dos2unix perl5
diff --git a/devel/p5-Alzabo/Makefile b/devel/p5-Alzabo/Makefile
index a551cea08b51..5e4ce691bd03 100644
--- a/devel/p5-Alzabo/Makefile
+++ b/devel/p5-Alzabo/Makefile
@@ -13,12 +13,12 @@ COMMENT= Data modelling tool and RDBMS-OO mapper
OPTIONS_DEFINE= DOCS EXAMPLES
-BUILD_DEPENDS= p5-Exception-Class>=0:devel/p5-Exception-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exception-Class>=0:devel/p5-Exception-Class \
p5-Class-Factory-Util>=0:devel/p5-Class-Factory-Util \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Any-Daemon/Makefile b/devel/p5-Any-Daemon/Makefile
index 460298b8bd87..ded6767cea37 100644
--- a/devel/p5-Any-Daemon/Makefile
+++ b/devel/p5-Any-Daemon/Makefile
@@ -15,8 +15,8 @@ COMMENT= Provides basic needs for a daemon
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Report-Optional>=1.06:devel/p5-Log-Report-Optional
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Report-Optional>=1.06:devel/p5-Log-Report-Optional
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Any-Moose-Convert/Makefile b/devel/p5-Any-Moose-Convert/Makefile
index 494b0791c124..c2e49a39477a 100644
--- a/devel/p5-Any-Moose-Convert/Makefile
+++ b/devel/p5-Any-Moose-Convert/Makefile
@@ -14,8 +14,8 @@ COMMENT= Convert Moose libraries to Mouse ones, or vice versa
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PerlIO-Util>=0:devel/p5-PerlIO-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PerlIO-Util>=0:devel/p5-PerlIO-Util
TEST_DEPENDS= p5-Moose>=0.90:devel/p5-Moose \
p5-Mouse>=0.40:devel/p5-Mouse
diff --git a/devel/p5-AnyData/Makefile b/devel/p5-AnyData/Makefile
index 9029e87a82be..be87ae6756a5 100644
--- a/devel/p5-AnyData/Makefile
+++ b/devel/p5-AnyData/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-CGI>=0:www/p5-CGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI>=0:www/p5-CGI
TEST_DEPENDS= p5-Test-Output>=0:devel/p5-Test-Output
NO_ARCH= yes
diff --git a/devel/p5-AnyEvent-DBI-Abstract/Makefile b/devel/p5-AnyEvent-DBI-Abstract/Makefile
index e939cfcb01b9..b80ebc7b4bb7 100644
--- a/devel/p5-AnyEvent-DBI-Abstract/Makefile
+++ b/devel/p5-AnyEvent-DBI-Abstract/Makefile
@@ -14,9 +14,9 @@ COMMENT= AnyEvent::DBI + SQL::Abstract
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent-DBI>=0:devel/p5-AnyEvent-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent-DBI>=0:devel/p5-AnyEvent-DBI \
p5-SQL-Abstract>=0:databases/p5-SQL-Abstract
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-AnyEvent-DBI/Makefile b/devel/p5-AnyEvent-DBI/Makefile
index 1162f2dc62fe..33b9ad266bb4 100644
--- a/devel/p5-AnyEvent-DBI/Makefile
+++ b/devel/p5-AnyEvent-DBI/Makefile
@@ -14,10 +14,10 @@ COMMENT= Asynchronous DBI access
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=4.15:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=4.15:devel/p5-AnyEvent \
p5-DBI>=1.0:databases/p5-DBI \
p5-common-sense>=3.3:devel/p5-common-sense
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-AnyEvent-Gearman/Makefile b/devel/p5-AnyEvent-Gearman/Makefile
index 98180fa3709f..df76405caa55 100644
--- a/devel/p5-AnyEvent-Gearman/Makefile
+++ b/devel/p5-AnyEvent-Gearman/Makefile
@@ -14,13 +14,13 @@ COMMENT= Asynchronous Gearman client/worker module for AnyEvent applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Mouse>=0:devel/p5-Mouse \
p5-MouseX-Foreign>=0:devel/p5-MouseX-Foreign \
p5-Object-Container>=0:devel/p5-Object-Container \
p5-Object-Event>=0:devel/p5-Object-Event
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-AnyEvent-RPC/Makefile b/devel/p5-AnyEvent-RPC/Makefile
index 923012c23e37..ef098678c288 100644
--- a/devel/p5-AnyEvent-RPC/Makefile
+++ b/devel/p5-AnyEvent-RPC/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= anes@anes.su
COMMENT= Abstract framework for RPC clients
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI \
p5-AnyEvent>=5:devel/p5-AnyEvent \
p5-XML-Hash-LX>=0.05:textproc/p5-XML-Hash-LX \
p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-URI>=0:net/p5-URI \
p5-Test-NoWarnings>=1.03:devel/p5-Test-NoWarnings \
p5-Test-TCP>=0.14:devel/p5-Test-TCP \
p5-lib-abs>=0.90:devel/p5-lib-abs
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-AnyEvent-Subprocess/Makefile b/devel/p5-AnyEvent-Subprocess/Makefile
index d7b1e4d9872d..fa5ff69c0aeb 100644
--- a/devel/p5-AnyEvent-Subprocess/Makefile
+++ b/devel/p5-AnyEvent-Subprocess/Makefile
@@ -14,7 +14,8 @@ COMMENT= Flexible, OO, asynchronous process spawning and management
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=5.2:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=5.2:devel/p5-AnyEvent \
p5-EV>=4.0:devel/p5-EV \
p5-Event-Join>=0.05:devel/p5-Event-Join \
p5-IO-Tty>=0:devel/p5-IO-Tty \
@@ -29,7 +30,6 @@ BUILD_DEPENDS= p5-AnyEvent>=5.2:devel/p5-AnyEvent \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
p5-namespace-clean>0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-AnyEvent-Worker/Makefile b/devel/p5-AnyEvent-Worker/Makefile
index 9a3691f1fd37..f1b1e538a853 100644
--- a/devel/p5-AnyEvent-Worker/Makefile
+++ b/devel/p5-AnyEvent-Worker/Makefile
@@ -14,12 +14,12 @@ COMMENT= Manage blocking task in external process
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=5:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=5:devel/p5-AnyEvent \
p5-common-sense>=2:devel/p5-common-sense \
p5-Test-NoWarnings>=1.03:devel/p5-Test-NoWarnings \
p5-Test-TCP>=0.14:devel/p5-Test-TCP \
p5-lib-abs>=0.90:devel/p5-lib-abs
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-AnyMQ/Makefile b/devel/p5-AnyMQ/Makefile
index c3e33ded0eea..13a43af0e76f 100644
--- a/devel/p5-AnyMQ/Makefile
+++ b/devel/p5-AnyMQ/Makefile
@@ -15,12 +15,12 @@ COMMENT= Non-blocking message queue system based on AnyEvent
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-MouseX-NativeTraits>=0:devel/p5-MouseX-NativeTraits \
p5-MouseX-Traits>=0:devel/p5-MouseX-Traits
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-App-Build/Makefile b/devel/p5-App-Build/Makefile
index 760c0d913586..cf5a33786593 100644
--- a/devel/p5-App-Build/Makefile
+++ b/devel/p5-App-Build/Makefile
@@ -14,9 +14,9 @@ COMMENT= Build and install Perl applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-App-Options>=0:devel/p5-App-Options \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-Options>=0:devel/p5-App-Options \
p5-Module-Build>=0.28:devel/p5-Module-Build
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>=0.47:devel/p5-Test-Differences
NO_ARCH= yes
diff --git a/devel/p5-App-CLI-Extension/Makefile b/devel/p5-App-CLI-Extension/Makefile
index 740a3d71549a..42c905cf9f31 100644
--- a/devel/p5-App-CLI-Extension/Makefile
+++ b/devel/p5-App-CLI-Extension/Makefile
@@ -14,12 +14,12 @@ COMMENT= Extension for App::CLI extension module
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-App-CLI>=0.313:devel/p5-App-CLI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-CLI>=0.313:devel/p5-App-CLI \
p5-Class-Accessor-Grouped>=0.10000:devel/p5-Class-Accessor-Grouped \
p5-Error>=0.17000:lang/p5-Error \
p5-MRO-Compat>=0.11:devel/p5-MRO-Compat \
p5-UNIVERSAL-require>=0.13:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-App-Cmd/Makefile b/devel/p5-App-Cmd/Makefile
index 26cf3752fca1..d7f4b9be5baa 100644
--- a/devel/p5-App-Cmd/Makefile
+++ b/devel/p5-App-Cmd/Makefile
@@ -13,7 +13,8 @@ COMMENT= App::Cmd - Write command line apps with less suffering
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Capture-Tiny>=0.13:devel/p5-Capture-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Capture-Tiny>=0.13:devel/p5-Capture-Tiny \
p5-Class-Load>=0.06:devel/p5-Class-Load \
p5-Getopt-Long-Descriptive>=0.084:devel/p5-Getopt-Long-Descriptive \
p5-IO-TieCombine>=0:devel/p5-IO-TieCombine \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Capture-Tiny>=0.13:devel/p5-Capture-Tiny \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-Sub-Install>=0:devel/p5-Sub-Install \
p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-PathTools>=0:devel/p5-PathTools \
p5-IPC-Cmd>=0:devel/p5-IPC-Cmd
diff --git a/devel/p5-App-GitGot/Makefile b/devel/p5-App-GitGot/Makefile
index 2375346f6f9e..57444bf9f454 100644
--- a/devel/p5-App-GitGot/Makefile
+++ b/devel/p5-App-GitGot/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \
p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-Config-INI>=0:devel/p5-Config-INI \
p5-Class-Load>=0:devel/p5-Class-Load \
@@ -32,7 +33,6 @@ BUILD_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-YAML>=0:textproc/p5-YAML \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Class>=0:devel/p5-Test-Class \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-File>=0:devel/p5-Test-File
@@ -44,7 +44,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/devel/p5-App-GitHub/Makefile b/devel/p5-App-GitHub/Makefile
index 95520529a003..6eb055787f45 100644
--- a/devel/p5-App-GitHub/Makefile
+++ b/devel/p5-App-GitHub/Makefile
@@ -14,10 +14,10 @@ COMMENT= GitHub Command Tools
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON-XS>=2.3:converters/p5-JSON-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-XS>=2.3:converters/p5-JSON-XS \
p5-Moose>=0:devel/p5-Moose \
p5-Net-GitHub>=0.12:net/p5-Net-GitHub
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-App-SD/Makefile b/devel/p5-App-SD/Makefile
index 200b6e134772..9836828eec92 100644
--- a/devel/p5-App-SD/Makefile
+++ b/devel/p5-App-SD/Makefile
@@ -13,12 +13,12 @@ COMMENT= Peer-to-peer replicated distributed issue tracker
LICENSE= MIT
-BUILD_DEPENDS= p5-DateTime>=:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=:devel/p5-DateTime \
p5-DateTime-Format-Natural>=0:devel/p5-DateTime-Format-Natural \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-Prophet>=0:databases/p5-Prophet \
p5-Test-Script-Run>=0.02:devel/p5-Test-Script-Run
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-App-SVN-Bisect/Makefile b/devel/p5-App-SVN-Bisect/Makefile
index fba5408e5ce7..d57012b16767 100644
--- a/devel/p5-App-SVN-Bisect/Makefile
+++ b/devel/p5-App-SVN-Bisect/Makefile
@@ -13,10 +13,10 @@ COMMENT= Binary search through svn revisions
LICENSE= ART20
-BUILD_DEPENDS= p5-IO-All>0:devel/p5-IO-All \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-All>0:devel/p5-IO-All \
p5-YAML-Syck>0:textproc/p5-YAML-Syck \
${LOCALBASE}/bin/svn:devel/subversion
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Output>=0:devel/p5-Test-Output
diff --git a/devel/p5-App-Trace/Makefile b/devel/p5-App-Trace/Makefile
index 04c6ced5c6e3..960da52f59b9 100644
--- a/devel/p5-App-Trace/Makefile
+++ b/devel/p5-App-Trace/Makefile
@@ -14,8 +14,8 @@ COMMENT= Embedded debug statements, including call/return tracing
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-App-Options>=0:devel/p5-App-Options
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-Options>=0:devel/p5-App-Options
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-App-cpanminus-reporter/Makefile b/devel/p5-App-cpanminus-reporter/Makefile
index 60b189bac42c..b4958c2492ea 100644
--- a/devel/p5-App-cpanminus-reporter/Makefile
+++ b/devel/p5-App-cpanminus-reporter/Makefile
@@ -13,7 +13,8 @@ COMMENT= Perl extension to send cpanm output to CPAN Testers database
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-Config-Tiny>=2.08:devel/p5-Config-Tiny \
p5-CPAN-Testers-Common-Client>=0.13:devel/p5-CPAN-Testers-Common-Client \
p5-File-HomeDir>=0.58:devel/p5-File-HomeDir \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-Test-Reporter-Transport-Metabase>=0:devel/p5-Test-Reporter-Transport-Metabase \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-App-cpanoutdated/Makefile b/devel/p5-App-cpanoutdated/Makefile
index e42647069557..34d2cce76c73 100644
--- a/devel/p5-App-cpanoutdated/Makefile
+++ b/devel/p5-App-cpanoutdated/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-CPAN-DistnameInfo>=0.10:devel/p5-CPAN-DistnameInfo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CPAN-DistnameInfo>=0.10:devel/p5-CPAN-DistnameInfo \
p5-libwww>=0:www/p5-libwww \
p5-local-lib>=0:devel/p5-local-lib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-App-perlbrew/Makefile b/devel/p5-App-perlbrew/Makefile
index b536499c502e..51c44adeb27c 100644
--- a/devel/p5-App-perlbrew/Makefile
+++ b/devel/p5-App-perlbrew/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl Environment manager
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-CPAN-Perl-Releases>=3.66:devel/p5-CPAN-Perl-Releases \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CPAN-Perl-Releases>=3.66:devel/p5-CPAN-Perl-Releases \
p5-Capture-Tiny>=0.36:devel/p5-Capture-Tiny \
p5-Devel-PatchPerl>=1.52:devel/p5-Devel-PatchPerl \
p5-local-lib>=2.000014:devel/p5-local-lib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Which>=1.21:sysutils/p5-File-Which \
p5-IO-All>=0.51:devel/p5-IO-All \
p5-Path-Class>=0.33:devel/p5-Path-Class \
diff --git a/devel/p5-Array-Window/Makefile b/devel/p5-Array-Window/Makefile
index b9a9f9d38a72..73eed1dd5f5a 100644
--- a/devel/p5-Array-Window/Makefile
+++ b/devel/p5-Array-Window/Makefile
@@ -14,8 +14,8 @@ COMMENT= Calculate windows/subsets/pages of arrays
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Params-Util>=0.12:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Util>=0.12:devel/p5-Params-Util
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-B-C/Makefile b/devel/p5-B-C/Makefile
index 04652136aeb3..af3768f4f208 100644
--- a/devel/p5-B-C/Makefile
+++ b/devel/p5-B-C/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl compiler's C backend #'
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-B-Flags>=0.15:devel/p5-B-Flags \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Flags>=0.15:devel/p5-B-Flags \
p5-Opcodes>=0:devel/p5-Opcodes \
p5-IPC-Run>=0:devel/p5-IPC-Run
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= limit:^[0-9\.]*$$
diff --git a/devel/p5-B-Hooks-EndOfScope/Makefile b/devel/p5-B-Hooks-EndOfScope/Makefile
index 4503a426ea63..ba603488bf64 100644
--- a/devel/p5-B-Hooks-EndOfScope/Makefile
+++ b/devel/p5-B-Hooks-EndOfScope/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENCE
-BUILD_DEPENDS= p5-Module-Implementation>=0.05:devel/p5-Module-Implementation \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Implementation>=0.05:devel/p5-Module-Implementation \
p5-Sub-Exporter-Progressive>=0.001006:devel/p5-Sub-Exporter-Progressive \
p5-Variable-Magic>=0.48:devel/p5-Variable-Magic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-B-Hooks-OP-Annotation/Makefile b/devel/p5-B-Hooks-OP-Annotation/Makefile
index bd8f307032b1..0f2a0813a9e0 100644
--- a/devel/p5-B-Hooks-OP-Annotation/Makefile
+++ b/devel/p5-B-Hooks-OP-Annotation/Makefile
@@ -14,8 +14,8 @@ COMMENT= Annotate and delegate hooked OPs
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-ExtUtils-Depends>=0.304:devel/p5-ExtUtils-Depends
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ExtUtils-Depends>=0.304:devel/p5-ExtUtils-Depends
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-B-OPCheck/Makefile b/devel/p5-B-OPCheck/Makefile
index 587b68009871..962ae9d49a8f 100644
--- a/devel/p5-B-OPCheck/Makefile
+++ b/devel/p5-B-OPCheck/Makefile
@@ -13,10 +13,10 @@ COMMENT= PL_check hacks using Perl callbacks
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-B-Utils>=0.08:devel/p5-B-Utils \
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+ p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
+RUN_DEPENDS= p5-B-Utils>=0.08:devel/p5-B-Utils \
p5-Scope-Guard>=0:devel/p5-Scope-Guard
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-BUILD_DEPENDS+= p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-BZ-Client/Makefile b/devel/p5-BZ-Client/Makefile
index 3cdc12ef8ec0..9908e79c1557 100644
--- a/devel/p5-BZ-Client/Makefile
+++ b/devel/p5-BZ-Client/Makefile
@@ -14,11 +14,11 @@ COMMENT= Client for the Bugzilla web services API
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-Writer>=0:textproc/p5-XML-Writer \
p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601
diff --git a/devel/p5-Best/Makefile b/devel/p5-Best/Makefile
index 533b7f443439..bc451a742d07 100644
--- a/devel/p5-Best/Makefile
+++ b/devel/p5-Best/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Fallbackable module loader
-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/devel/p5-Bread-Board-Declare/Makefile b/devel/p5-Bread-Board-Declare/Makefile
index 9e32ed0252d0..e816195ee2d7 100644
--- a/devel/p5-Bread-Board-Declare/Makefile
+++ b/devel/p5-Bread-Board-Declare/Makefile
@@ -15,11 +15,11 @@ COMMENT= Create Bread::Board containers as normal Moose objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Bread-Board>=0.22:devel/p5-Bread-Board \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bread-Board>=0.22:devel/p5-Bread-Board \
p5-Class-Load>=0.07:devel/p5-Class-Load \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Moose>=2.0200:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-Bread-Board/Makefile b/devel/p5-Bread-Board/Makefile
index 834a83a0d8b5..e2f3513c3361 100644
--- a/devel/p5-Bread-Board/Makefile
+++ b/devel/p5-Bread-Board/Makefile
@@ -15,12 +15,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Moose>=2.1200:devel/p5-Moose \
p5-MooseX-Clone>=0.05:devel/p5-MooseX-Clone \
p5-MooseX-Params-Validate>=0.14:devel/p5-MooseX-Params-Validate \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Form-Sensible>=0:devel/p5-Form-Sensible \
p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
diff --git a/devel/p5-CBOR-XS/Makefile b/devel/p5-CBOR-XS/Makefile
index c28606d03f31..2d589b2598ea 100644
--- a/devel/p5-CBOR-XS/Makefile
+++ b/devel/p5-CBOR-XS/Makefile
@@ -17,9 +17,9 @@ LICENSE= GPLv3
USES= perl5
USE_PERL5= configure
-BUILD_DEPENDS= p5-Types-Serialiser>=0:devel/p5-Types-Serialiser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Types-Serialiser>=0:devel/p5-Types-Serialiser \
p5-common-sense>=0:devel/p5-common-sense
-RUN_DEPENDS:= ${BUILD_DEPENDS}
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/CBOR/XS/XS.so
diff --git a/devel/p5-CHI-Driver-DBI/Makefile b/devel/p5-CHI-Driver-DBI/Makefile
index 18ca1ed54d33..856f0ce3c0a5 100644
--- a/devel/p5-CHI-Driver-DBI/Makefile
+++ b/devel/p5-CHI-Driver-DBI/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-CHI>=0.241:devel/p5-CHI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CHI>=0.241:devel/p5-CHI \
p5-DBI>=1.26:databases/p5-DBI \
p5-Moose>=0.66:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-CPAN-Checksums/Makefile b/devel/p5-CPAN-Checksums/Makefile
index 5da4ce4e733a..3c31fabd2058 100644
--- a/devel/p5-CPAN-Checksums/Makefile
+++ b/devel/p5-CPAN-Checksums/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl module to write a CHECKSUMS file for a directory as on CPAN
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Compare>=0:devel/p5-Data-Compare \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Compare>=0:devel/p5-Data-Compare \
p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
p5-Module-Signature>=0:security/p5-Module-Signature
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-CPAN-Inject/Makefile b/devel/p5-CPAN-Inject/Makefile
index 175a90fb39ca..d8d4a14bc384 100644
--- a/devel/p5-CPAN-Inject/Makefile
+++ b/devel/p5-CPAN-Inject/Makefile
@@ -14,10 +14,10 @@ COMMENT= Base class for injecting distributions into CPAN sources
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-chmod>=0.30:devel/p5-File-chmod \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-chmod>=0.30:devel/p5-File-chmod \
p5-Params-Util>=0.21:devel/p5-Params-Util \
p5-CPAN-Checksums>=1.05:devel/p5-CPAN-Checksums
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Script-Run>=1.02:devel/p5-Test-Script-Run \
p5-File-Remove>=0.34:devel/p5-File-Remove \
p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
diff --git a/devel/p5-CPAN-Recent-Uploads/Makefile b/devel/p5-CPAN-Recent-Uploads/Makefile
index 35c3d4c99b1a..298d6ee51891 100644
--- a/devel/p5-CPAN-Recent-Uploads/Makefile
+++ b/devel/p5-CPAN-Recent-Uploads/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-URI>=1.56:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=1.56:net/p5-URI \
p5-YAML-LibYAML>=0.64:textproc/p5-YAML-LibYAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
p5-HTTP-Message>=0:www/p5-HTTP-Message
diff --git a/devel/p5-CPAN-Reporter-Smoker/Makefile b/devel/p5-CPAN-Reporter-Smoker/Makefile
index 188834325196..e02c9f5544dc 100644
--- a/devel/p5-CPAN-Reporter-Smoker/Makefile
+++ b/devel/p5-CPAN-Reporter-Smoker/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= Turnkey CPAN Testers smoking
-BUILD_DEPENDS= p5-CPAN-Reporter>0:devel/p5-CPAN-Reporter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CPAN-Reporter>0:devel/p5-CPAN-Reporter \
p5-Probe-Perl>0:sysutils/p5-Probe-Perl \
p5-Test-Reporter>0:devel/p5-Test-Reporter \
p5-Term-Title>0:devel/p5-Term-Title
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-CPAN-Reporter/Makefile b/devel/p5-CPAN-Reporter/Makefile
index 96917887dbb8..8fb6e75e9a94 100644
--- a/devel/p5-CPAN-Reporter/Makefile
+++ b/devel/p5-CPAN-Reporter/Makefile
@@ -10,14 +10,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= Adds CPAN Testers reporting to CPAN.pm
-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-Config-Tiny>=2.08:devel/p5-Config-Tiny \
p5-Devel-Autoflush>=0.04:devel/p5-Devel-Autoflush \
p5-File-HomeDir>0:devel/p5-File-HomeDir \
p5-IPC-Cmd>=0.76:devel/p5-IPC-Cmd \
p5-Probe-Perl>0:sysutils/p5-Probe-Perl \
p5-Test-Reporter>1.54:devel/p5-Test-Reporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-CPAN-SQLite/Makefile b/devel/p5-CPAN-SQLite/Makefile
index 27304e264f4c..cae8d018c187 100644
--- a/devel/p5-CPAN-SQLite/Makefile
+++ b/devel/p5-CPAN-SQLite/Makefile
@@ -15,12 +15,12 @@ COMMENT= Search CPAN using a SQLite database
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-File-HomeDir>=0:devel/p5-File-HomeDir \
p5-CPAN-DistnameInfo>=0:devel/p5-CPAN-DistnameInfo \
p5-libwww>=0:www/p5-libwww \
p5-PathTools>=0:devel/p5-PathTools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-CPAN-Site/Makefile b/devel/p5-CPAN-Site/Makefile
index 5a0a02aa3fae..76201a220188 100644
--- a/devel/p5-CPAN-Site/Makefile
+++ b/devel/p5-CPAN-Site/Makefile
@@ -14,13 +14,13 @@ COMMENT= Extend CPAN with private packages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
p5-CPAN-Checksums>=0:devel/p5-CPAN-Checksums \
p5-HTTP-Date>=0:www/p5-HTTP-Date \
p5-libwww>=0:www/p5-libwww \
p5-Log-Report>=0.25:devel/p5-Log-Report
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-CPAN-Testers-Common-Client/Makefile b/devel/p5-CPAN-Testers-Common-Client/Makefile
index 819e669256f7..5ecc7558cee7 100644
--- a/devel/p5-CPAN-Testers-Common-Client/Makefile
+++ b/devel/p5-CPAN-Testers-Common-Client/Makefile
@@ -13,12 +13,12 @@ COMMENT= Common class for CPAN::Testers clients
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-Config-Perl-V>=0:devel/p5-Config-Perl-V \
p5-Devel-Platform-Info>=0:devel/p5-Devel-Platform-Info \
p5-File-HomeDir>=0.58:devel/p5-File-HomeDir \
p5-Probe-Perl>=0:sysutils/p5-Probe-Perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-CPAN-Testers-Report/Makefile b/devel/p5-CPAN-Testers-Report/Makefile
index 97d26aa4d0bc..12ede9d9c1e4 100644
--- a/devel/p5-CPAN-Testers-Report/Makefile
+++ b/devel/p5-CPAN-Testers-Report/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= CPAN Testers report object
-BUILD_DEPENDS= p5-Metabase-Fact>0:devel/p5-Metabase-Fact
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Metabase-Fact>0:devel/p5-Metabase-Fact
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-CPAN-Uploader/Makefile b/devel/p5-CPAN-Uploader/Makefile
index bf7b40f5cc7e..58977f468067 100644
--- a/devel/p5-CPAN-Uploader/Makefile
+++ b/devel/p5-CPAN-Uploader/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Getopt-Long-Descriptive>=0.084:devel/p5-Getopt-Long-Descriptive \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Getopt-Long-Descriptive>=0.084:devel/p5-Getopt-Long-Descriptive \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-LWP-Protocol-https>=1:www/p5-LWP-Protocol-https \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-HomeDir>=0:devel/p5-File-HomeDir
NO_ARCH= yes
diff --git a/devel/p5-CPANPLUS-Dist-Build/Makefile b/devel/p5-CPANPLUS-Dist-Build/Makefile
index 88caf0514290..2b898b66edaf 100644
--- a/devel/p5-CPANPLUS-Dist-Build/Makefile
+++ b/devel/p5-CPANPLUS-Dist-Build/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-CPANPLUS>=0.84:devel/p5-CPANPLUS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CPANPLUS>=0.84:devel/p5-CPANPLUS \
p5-Module-Build>=0.32:devel/p5-Module-Build
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index e8401514bc80..fb8621ecb0fa 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -14,14 +14,14 @@ COMMENT= Ameliorated interface to the CPAN
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Extract>=0.16:archivers/p5-Archive-Extract \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Extract>=0.16:archivers/p5-Archive-Extract \
p5-Log-Message>=0.01:devel/p5-Log-Message \
p5-Module-Pluggable>=2.4:devel/p5-Module-Pluggable \
p5-Module-Signature>=0.06:security/p5-Module-Signature \
p5-Object-Accessor>=0.44:devel/p5-Object-Accessor \
p5-Package-Constants>=0.01:devel/p5-Package-Constants \
p5-Term-UI>=0.18:devel/p5-Term-UI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= TEST_REPORTER YAML
TEST_REPORTER_DESC= Send reports to cpan-testers
diff --git a/devel/p5-CPS/Makefile b/devel/p5-CPS/Makefile
index 928cc1db81c4..b69faacdb5ab 100644
--- a/devel/p5-CPS/Makefile
+++ b/devel/p5-CPS/Makefile
@@ -15,8 +15,8 @@ COMMENT= Manage flow of control in Continuation-Passing Style
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Future>0:devel/p5-Future
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Future>0:devel/p5-Future
TEST_DEPENDS= p5-Test-Identity>0:devel/p5-Test-Identity \
p5-Test-Pod>=1:devel/p5-Test-Pod \
p5-Test-Refcount>0:devel/p5-Test-Refcount \
diff --git a/devel/p5-Cache-AgainstFile/Makefile b/devel/p5-Cache-AgainstFile/Makefile
index 669a993d343d..bcf7865004cc 100644
--- a/devel/p5-Cache-AgainstFile/Makefile
+++ b/devel/p5-Cache-AgainstFile/Makefile
@@ -13,8 +13,8 @@ COMMENT= Cache data structures parsed from files, watching for updates
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Log-Trace>=0:devel/p5-Log-Trace
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Trace>=0:devel/p5-Log-Trace
TEST_DEPENDS= p5-Test-Assertions>=0:devel/p5-Test-Assertions
USES= perl5
diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile
index 9b60d87e77f8..b975c0db7f0c 100644
--- a/devel/p5-Cache-Cache/Makefile
+++ b/devel/p5-Cache-Cache/Makefile
@@ -13,11 +13,11 @@ COMMENT= Perl Cache interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cache>=0:devel/p5-Cache \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache>=0:devel/p5-Cache \
p5-Digest-SHA1>=2.02:security/p5-Digest-SHA1 \
p5-Error>=0.15:lang/p5-Error \
p5-IPC-ShareLite>=0.09:devel/p5-IPC-ShareLite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Cache-Memcached-Tie/Makefile b/devel/p5-Cache-Memcached-Tie/Makefile
index 0fb88eb9c2c9..22a12f31dbe5 100644
--- a/devel/p5-Cache-Memcached-Tie/Makefile
+++ b/devel/p5-Cache-Memcached-Tie/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Use Cache::Memcached::Fast like hash
-BUILD_DEPENDS= p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Carp-Always-Color/Makefile b/devel/p5-Carp-Always-Color/Makefile
index 650a94df6118..d94310d10e7a 100644
--- a/devel/p5-Carp-Always-Color/Makefile
+++ b/devel/p5-Carp-Always-Color/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Carp-Always>=0.10:devel/p5-Carp-Always
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Always>=0.10:devel/p5-Carp-Always
TEST_DEPENDS= p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy
NO_ARCH= yes
diff --git a/devel/p5-Carp-Assert-More/Makefile b/devel/p5-Carp-Assert-More/Makefile
index b2cdb38894c4..ec4ae8d8320b 100644
--- a/devel/p5-Carp-Assert-More/Makefile
+++ b/devel/p5-Carp-Assert-More/Makefile
@@ -12,8 +12,8 @@ COMMENT= Convenience wrappers around Carp::Assert
LICENSE= ART20
-BUILD_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-Carp-Clan-Share/Makefile b/devel/p5-Carp-Clan-Share/Makefile
index 866ccd86246b..f77a09c1be71 100644
--- a/devel/p5-Carp-Clan-Share/Makefile
+++ b/devel/p5-Carp-Clan-Share/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Share your Carp::Clan settings with your whole Clan
-BUILD_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Carp-Datum/Makefile b/devel/p5-Carp-Datum/Makefile
index cc9cf2aa9bff..ba1b7ae10d12 100644
--- a/devel/p5-Carp-Datum/Makefile
+++ b/devel/p5-Carp-Datum/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Debugging And Tracing Ultimate Module
-BUILD_DEPENDS= p5-Log-Agent>=0:devel/p5-Log-Agent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Agent>=0:devel/p5-Log-Agent \
p5-Getargs-Long>=0:devel/p5-Getargs-Long
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Carp-REPL/Makefile b/devel/p5-Carp-REPL/Makefile
index 7b10c77ad216..7f9097fc556f 100644
--- a/devel/p5-Carp-REPL/Makefile
+++ b/devel/p5-Carp-REPL/Makefile
@@ -14,13 +14,13 @@ COMMENT= Read-Eval-Print-Loop on die and/or warn
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
p5-Devel-REPL>=0:devel/p5-Devel-REPL \
p5-Devel-StackTrace-WithLexicals>=0:devel/p5-Devel-StackTrace-WithLexicals \
p5-Lexical-Persistence>=0:devel/p5-Lexical-Persistence \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Expect>=0:devel/p5-Test-Expect
NO_ARCH= yes
diff --git a/devel/p5-Class-Accessor-Children/Makefile b/devel/p5-Class-Accessor-Children/Makefile
index ddf5499324ce..cecb1a3265c9 100644
--- a/devel/p5-Class-Accessor-Children/Makefile
+++ b/devel/p5-Class-Accessor-Children/Makefile
@@ -14,8 +14,8 @@ COMMENT= Automated child-class/accessor generation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>0:devel/p5-Class-Accessor
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Class-Accessor-Complex/Makefile b/devel/p5-Class-Accessor-Complex/Makefile
index 664f8fd3af33..9e8589cbe2c4 100644
--- a/devel/p5-Class-Accessor-Complex/Makefile
+++ b/devel/p5-Class-Accessor-Complex/Makefile
@@ -14,11 +14,11 @@ COMMENT= Arrays, hashes, booleans, integers, sets, and more
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-Accessor-Installer>=0:devel/p5-Class-Accessor-Installer \
p5-Data-Miscellany>=0:devel/p5-Data-Miscellany \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Class-Accessor-Fast-Contained/Makefile b/devel/p5-Class-Accessor-Fast-Contained/Makefile
index 53d14f95ab3f..4ae7aa3a6b65 100644
--- a/devel/p5-Class-Accessor-Fast-Contained/Makefile
+++ b/devel/p5-Class-Accessor-Fast-Contained/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Fast accessors with data containment
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
TEST_DEPENDS= p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
p5-Test-Pod>=0:devel/p5-Test-Pod
diff --git a/devel/p5-Class-Accessor-Grouped/Makefile b/devel/p5-Class-Accessor-Grouped/Makefile
index 94b7490d082b..5bd6d865c6ed 100644
--- a/devel/p5-Class-Accessor-Grouped/Makefile
+++ b/devel/p5-Class-Accessor-Grouped/Makefile
@@ -15,11 +15,11 @@ COMMENT= Lets you build groups of accessors
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
p5-Class-XSAccessor>=1.19:devel/p5-Class-XSAccessor \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Sub-Name>=0.05:devel/p5-Sub-Name
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.31:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-Class-Accessor-Installer/Makefile b/devel/p5-Class-Accessor-Installer/Makefile
index 819edea23358..6d6df7a8d25f 100644
--- a/devel/p5-Class-Accessor-Installer/Makefile
+++ b/devel/p5-Class-Accessor-Installer/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Install an accessor subroutine
-BUILD_DEPENDS= p5-Sub-Name>=0:devel/p5-Sub-Name \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Name>=0:devel/p5-Sub-Name \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-Accessor-Lvalue/Makefile b/devel/p5-Class-Accessor-Lvalue/Makefile
index c38269206f00..03c6506ebfd9 100644
--- a/devel/p5-Class-Accessor-Lvalue/Makefile
+++ b/devel/p5-Class-Accessor-Lvalue/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Create Lvalue accessors
-BUILD_DEPENDS= p5-Want>=0:devel/p5-Want \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Want>=0:devel/p5-Want \
p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Class-AlzaboWrapper/Makefile b/devel/p5-Class-AlzaboWrapper/Makefile
index 32d12709b014..1de57678fbe8 100644
--- a/devel/p5-Class-AlzaboWrapper/Makefile
+++ b/devel/p5-Class-AlzaboWrapper/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Higher level wrapper around Alzabo Row and Table objects
-BUILD_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Exception-Class>=0:devel/p5-Exception-Class \
p5-Alzabo>=0:devel/p5-Alzabo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Class-AutoClass/Makefile b/devel/p5-Class-AutoClass/Makefile
index 220fb82514e9..3d5a7a541215 100644
--- a/devel/p5-Class-AutoClass/Makefile
+++ b/devel/p5-Class-AutoClass/Makefile
@@ -14,9 +14,9 @@ COMMENT= Create get and set methods and simplify object initialization
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Hash-AutoHash>=1.17:devel/p5-Hash-AutoHash \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Hash-AutoHash>=1.17:devel/p5-Hash-AutoHash \
p5-Hash-AutoHash-Args>=1.18:devel/p5-Hash-AutoHash-Args
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-stringy>=2.1:devel/p5-IO-stringy \
p5-Test-Deep>=0.110:devel/p5-Test-Deep \
p5-Test-Pod>=1.48:devel/p5-Test-Pod
diff --git a/devel/p5-Class-Base/Makefile b/devel/p5-Class-Base/Makefile
index beb3ca4902e6..ae25cf2ed49c 100644
--- a/devel/p5-Class-Base/Makefile
+++ b/devel/p5-Class-Base/Makefile
@@ -13,8 +13,8 @@ COMMENT= Useful base class for deriving other modules
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Clone>=0:devel/p5-Clone
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0:devel/p5-Clone
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Class-C3-Componentised/Makefile b/devel/p5-Class-C3-Componentised/Makefile
index 6e560dc66859..b389f31b895a 100644
--- a/devel/p5-Class-C3-Componentised/Makefile
+++ b/devel/p5-Class-C3-Componentised/Makefile
@@ -13,10 +13,10 @@ COMMENT= Load mix-ins or components to your C3-based class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-C3>=0.20:devel/p5-Class-C3 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-C3>=0.20:devel/p5-Class-C3 \
p5-Class-Inspector>=1.32:devel/p5-Class-Inspector \
p5-MRO-Compat>=0.09:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.31:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-Class-Closure/Makefile b/devel/p5-Class-Closure/Makefile
index b575912dc132..2577f597a8cb 100644
--- a/devel/p5-Class-Closure/Makefile
+++ b/devel/p5-Class-Closure/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Encapsulated, declarative classes in Perl
-BUILD_DEPENDS= p5-PadWalker>=0:devel/p5-PadWalker \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PadWalker>=0:devel/p5-PadWalker \
p5-Devel-Caller>=0:devel/p5-Devel-Caller \
p5-Sentinel>=0:devel/p5-Sentinel
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-CodeStyler/Makefile b/devel/p5-Class-CodeStyler/Makefile
index 379d83f91e8c..1c9f551b102f 100644
--- a/devel/p5-Class-CodeStyler/Makefile
+++ b/devel/p5-Class-CodeStyler/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl extension for code generation program formatting and execution
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-STL-Containers>=0:devel/p5-Class-STL-Containers
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-STL-Containers>=0:devel/p5-Class-STL-Containers
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-Component/Makefile b/devel/p5-Class-Component/Makefile
index bb49744d3be1..f93a863eef0c 100644
--- a/devel/p5-Class-Component/Makefile
+++ b/devel/p5-Class-Component/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Pluggable component framework
-BUILD_DEPENDS= p5-Carp-Clan>0:devel/p5-Carp-Clan \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>0:devel/p5-Carp-Clan \
p5-Class-Accessor>0:devel/p5-Class-Accessor \
p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
p5-Class-Inspector>0:devel/p5-Class-Inspector \
p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-Container/Makefile b/devel/p5-Class-Container/Makefile
index b9b970cb4833..64d2c1cd5263 100644
--- a/devel/p5-Class-Container/Makefile
+++ b/devel/p5-Class-Container/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Class-Date/Makefile b/devel/p5-Class-Date/Makefile
index 48ccba8682f7..eb193b6aa3a2 100644
--- a/devel/p5-Class-Date/Makefile
+++ b/devel/p5-Class-Date/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl class for easy date and time manipulation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-TimeDate>0:devel/p5-TimeDate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-TimeDate>0:devel/p5-TimeDate
TEST_DEPENDS= p5-Test-Warnings>0:devel/p5-Test-Warnings
NO_ARCH= yes
diff --git a/devel/p5-Class-Default/Makefile b/devel/p5-Class-Default/Makefile
index ec0aaf47e1f0..6206ae5065eb 100644
--- a/devel/p5-Class-Default/Makefile
+++ b/devel/p5-Class-Default/Makefile
@@ -14,8 +14,8 @@ COMMENT= Static calls apply to a default instantiation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Inspector>=0:devel/p5-Class-Inspector
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Inspector>=0:devel/p5-Class-Inspector
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-Fields/Makefile b/devel/p5-Class-Fields/Makefile
index ee70eded1acc..ed215335116e 100644
--- a/devel/p5-Class-Fields/Makefile
+++ b/devel/p5-Class-Fields/Makefile
@@ -13,8 +13,8 @@ COMMENT= Functions/methods for examining data members of a class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Class-Handle/Makefile b/devel/p5-Class-Handle/Makefile
index 0d54b9de43df..091f0df659c2 100644
--- a/devel/p5-Class-Handle/Makefile
+++ b/devel/p5-Class-Handle/Makefile
@@ -14,9 +14,9 @@ COMMENT= Create objects that are handles to classes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-ISA>=0:devel/p5-Class-ISA \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-ISA>=0:devel/p5-Class-ISA \
p5-Class-Inspector>=0:devel/p5-Class-Inspector
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-InsideOut/Makefile b/devel/p5-Class-InsideOut/Makefile
index 595c79ea4ab7..30359b71a44f 100644
--- a/devel/p5-Class-InsideOut/Makefile
+++ b/devel/p5-Class-InsideOut/Makefile
@@ -13,8 +13,8 @@ COMMENT= Safe, simple inside-out object construction kit
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-ISA>=0:devel/p5-Class-ISA
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-ISA>=0:devel/p5-Class-ISA
PORTSCOUT= skipv:1.0301
diff --git a/devel/p5-Class-Load-XS/Makefile b/devel/p5-Class-Load-XS/Makefile
index 589501ecdbeb..0833fc4a87df 100644
--- a/devel/p5-Class-Load-XS/Makefile
+++ b/devel/p5-Class-Load-XS/Makefile
@@ -12,8 +12,8 @@ COMMENT= XS implementation of parts of Class::Load
LICENSE= ART20
-BUILD_DEPENDS= p5-Class-Load>=0.20:devel/p5-Class-Load
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Load>=0.20:devel/p5-Class-Load
TEST_DEPENDS= p5-Module-Implementation>=0.04:devel/p5-Module-Implementation \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Needs>=0:devel/p5-Test-Needs \
diff --git a/devel/p5-Class-Load/Makefile b/devel/p5-Class-Load/Makefile
index 1fef23868d32..36c6e07cd41d 100644
--- a/devel/p5-Class-Load/Makefile
+++ b/devel/p5-Class-Load/Makefile
@@ -13,12 +13,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-OptList>=0.110:devel/p5-Data-OptList \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-OptList>=0.110:devel/p5-Data-OptList \
p5-Module-Implementation>=0.04:devel/p5-Module-Implementation \
p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
p5-Package-Stash>=0.14:devel/p5-Package-Stash \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Needs>=0:devel/p5-Test-Needs \
p5-Test-Without-Module>=0:devel/p5-Test-Without-Module
diff --git a/devel/p5-Class-Mix/Makefile b/devel/p5-Class-Mix/Makefile
index a956e841edaf..41b2eeff5ce8 100644
--- a/devel/p5-Class-Mix/Makefile
+++ b/devel/p5-Class-Mix/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl module for dynamic class mixing
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Params-Classify>=0:devel/p5-Params-Classify
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Classify>=0:devel/p5-Params-Classify
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/devel/p5-Class-Observable/Makefile b/devel/p5-Class-Observable/Makefile
index 08b9b5df3e28..0aa0007a746d 100644
--- a/devel/p5-Class-Observable/Makefile
+++ b/devel/p5-Class-Observable/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= hcoyote@ghostar.org
COMMENT= Allow other classes and objects to respond to events in yours
-BUILD_DEPENDS= p5-Class-ISA>=0:devel/p5-Class-ISA
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-ISA>=0:devel/p5-Class-ISA
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-ReturnValue/Makefile b/devel/p5-Class-ReturnValue/Makefile
index 916d0a7e2601..32838b1aee3d 100644
--- a/devel/p5-Class-ReturnValue/Makefile
+++ b/devel/p5-Class-ReturnValue/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Return-value object that can be treated as a boolean, array, or object
-BUILD_DEPENDS= p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-StateMachine/Makefile b/devel/p5-Class-StateMachine/Makefile
index ced9139b2f77..74af069c085a 100644
--- a/devel/p5-Class-StateMachine/Makefile
+++ b/devel/p5-Class-StateMachine/Makefile
@@ -13,10 +13,10 @@ COMMENT= Define classes for state machines
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MRO-Define>=0.01:devel/p5-MRO-Define \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MRO-Define>=0.01:devel/p5-MRO-Define \
p5-Package-Stash>=0.29:devel/p5-Package-Stash \
p5-Sub-Name>=0.05:devel/p5-Sub-Name
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-Std-Fast/Makefile b/devel/p5-Class-Std-Fast/Makefile
index e14180386bd3..9a575a62f212 100644
--- a/devel/p5-Class-Std-Fast/Makefile
+++ b/devel/p5-Class-Std-Fast/Makefile
@@ -15,8 +15,8 @@ COMMENT= Faster but less secure than Class::Std
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Std>=0.0.9:devel/p5-Class-Std
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Std>=0.0.9:devel/p5-Class-Std
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-Tangram/Makefile b/devel/p5-Class-Tangram/Makefile
index b6d1983b7d85..b4633c5b3957 100644
--- a/devel/p5-Class-Tangram/Makefile
+++ b/devel/p5-Class-Tangram/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Create constructors, accessor, update methods for objects from Tangram
-BUILD_DEPENDS= p5-Set-Object>=0:devel/p5-Set-Object \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Set-Object>=0:devel/p5-Set-Object \
p5-Date-Manip>=0:devel/p5-Date-Manip \
p5-Tangram>=0:databases/p5-Tangram
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-Unload/Makefile b/devel/p5-Class-Unload/Makefile
index c6b20174b7f6..5d3ebe276eb3 100644
--- a/devel/p5-Class-Unload/Makefile
+++ b/devel/p5-Class-Unload/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl5 module for unloading classes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Inspector>=0:devel/p5-Class-Inspector
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Inspector>=0:devel/p5-Class-Inspector
TEST_DEPENDS= p5-Test-Requires>=0:devel/p5-Test-Requires
NO_ARCH= yes
diff --git a/devel/p5-Class-Virtual/Makefile b/devel/p5-Class-Virtual/Makefile
index b4fe3325cb7a..d33c369aadb4 100644
--- a/devel/p5-Class-Virtual/Makefile
+++ b/devel/p5-Class-Virtual/Makefile
@@ -13,10 +13,10 @@ COMMENT= Base class for virtual base classes in Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-Class-ISA>=0:devel/p5-Class-ISA
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Class-Workflow/Makefile b/devel/p5-Class-Workflow/Makefile
index 7d45154d0cd7..c3b002cbbea4 100644
--- a/devel/p5-Class-Workflow/Makefile
+++ b/devel/p5-Class-Workflow/Makefile
@@ -14,12 +14,12 @@ COMMENT= Lightweight workflow system
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Compare>=0:devel/p5-Data-Compare \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Compare>=0:devel/p5-Data-Compare \
p5-Moose>=0.37:devel/p5-Moose \
p5-MooseX-Clone>=0.04:devel/p5-MooseX-Clone \
p5-Set-Object>=1.19:devel/p5-Set-Object \
p5-YAML-Syck>=0:textproc/p5-YAML-Syck
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Code-Perl/Makefile b/devel/p5-Code-Perl/Makefile
index 48aaf7b24d86..cd6db7d759f0 100644
--- a/devel/p5-Code-Perl/Makefile
+++ b/devel/p5-Code-Perl/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Produce Perl code from a tree
-BUILD_DEPENDS= p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
USES= perl5
diff --git a/devel/p5-Config-ApacheFormat/Makefile b/devel/p5-Config-ApacheFormat/Makefile
index 8fd1f6135005..bffb4c83ddf1 100644
--- a/devel/p5-Config-ApacheFormat/Makefile
+++ b/devel/p5-Config-ApacheFormat/Makefile
@@ -14,8 +14,8 @@ COMMENT= Parse a configuration file in the same syntax as the Apache web server
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Config-Auto/Makefile b/devel/p5-Config-Auto/Makefile
index 632f9f6c6375..02f2e7f68dd1 100644
--- a/devel/p5-Config-Auto/Makefile
+++ b/devel/p5-Config-Auto/Makefile
@@ -15,9 +15,9 @@ COMMENT= Magical config file parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
p5-YAML>=0.67:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-String>=0:devel/p5-IO-String
USES= perl5
diff --git a/devel/p5-Config-AutoConf/Makefile b/devel/p5-Config-AutoConf/Makefile
index f003b2f11ce3..4dd18067191c 100644
--- a/devel/p5-Config-AutoConf/Makefile
+++ b/devel/p5-Config-AutoConf/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl module to implement some of AutoConf macros
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Config-GitLike/Makefile b/devel/p5-Config-GitLike/Makefile
index ee1d2422f670..0286b8f018bb 100644
--- a/devel/p5-Config-GitLike/Makefile
+++ b/devel/p5-Config-GitLike/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple git-compatible config file parser for Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moo>=0:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=0:devel/p5-Moo \
p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-Config-INI-Reader-Ordered/Makefile b/devel/p5-Config-INI-Reader-Ordered/Makefile
index 14725973d5c7..80e26a021669 100644
--- a/devel/p5-Config-INI-Reader-Ordered/Makefile
+++ b/devel/p5-Config-INI-Reader-Ordered/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Config-INI>=0:devel/p5-Config-INI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-INI>=0:devel/p5-Config-INI
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Config-INI-Simple/Makefile b/devel/p5-Config-INI-Simple/Makefile
index 033be2b2d575..6e06ccc478f6 100644
--- a/devel/p5-Config-INI-Simple/Makefile
+++ b/devel/p5-Config-INI-Simple/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple reading and writing from an INI file
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Config-INI/Makefile b/devel/p5-Config-INI/Makefile
index 4224ec8c93fb..ff5df1633ef5 100644
--- a/devel/p5-Config-INI/Makefile
+++ b/devel/p5-Config-INI/Makefile
@@ -12,8 +12,8 @@ COMMENT= Simple .ini files emitter and parser for Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mixin-Linewise>=0.100:devel/p5-Mixin-Linewise
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mixin-Linewise>=0.100:devel/p5-Mixin-Linewise
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Config-Identity/Makefile b/devel/p5-Config-Identity/Makefile
index 0f9041cd22d0..9a0ad810d44a 100644
--- a/devel/p5-Config-Identity/Makefile
+++ b/devel/p5-Config-Identity/Makefile
@@ -13,10 +13,10 @@ COMMENT= Load (and optionally decrypt via GnuPG) user/pass identity information
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-File-Which>=0:sysutils/p5-File-Which \
p5-IPC-Run>=0:devel/p5-IPC-Run
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
NO_ARCH= yes
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index 9a636e0eeefa..0a7e44f12256 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -13,8 +13,8 @@ COMMENT= Read .ini-style configuration files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Config-IniHash/Makefile b/devel/p5-Config-IniHash/Makefile
index 81e7b8198151..72d63c6b2c56 100644
--- a/devel/p5-Config-IniHash/Makefile
+++ b/devel/p5-Config-IniHash/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl extension for reading and writing INI files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Hash-Case>=0:devel/p5-Hash-Case \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Hash-Case>=0:devel/p5-Hash-Case \
p5-Hash-WithDefaults>=0.04:devel/p5-Hash-WithDefaults \
p5-IO-stringy>=0:devel/p5-IO-stringy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= dos2unix perl5
USE_PERL5= configure
diff --git a/devel/p5-Config-JFDI/Makefile b/devel/p5-Config-JFDI/Makefile
index c44a4b199d18..bc4199e64969 100644
--- a/devel/p5-Config-JFDI/Makefile
+++ b/devel/p5-Config-JFDI/Makefile
@@ -15,7 +15,8 @@ COMMENT= Catalyst::Plugin::ConfigLoader-style layer over Config::Any
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Clan-Share>=0:devel/p5-Carp-Clan-Share \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan-Share>=0:devel/p5-Carp-Clan-Share \
p5-Hash-Merge-Simple>=0:devel/p5-Hash-Merge-Simple \
p5-Config-Any>=0:devel/p5-Config-Any \
p5-Config-General>=0:devel/p5-Config-General \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Carp-Clan-Share>=0:devel/p5-Carp-Clan-Share \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Sub-Install>=0:devel/p5-Sub-Install \
p5-Data-Visitor>=0.24:devel/p5-Data-Visitor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Most>=0:devel/p5-Test-Most
USES= perl5
diff --git a/devel/p5-Config-JSON/Makefile b/devel/p5-Config-JSON/Makefile
index a677b961884d..6302d29e5715 100644
--- a/devel/p5-Config-JSON/Makefile
+++ b/devel/p5-Config-JSON/Makefile
@@ -13,9 +13,9 @@ COMMENT= JSON based config file system
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2.16:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2.16:converters/p5-JSON \
p5-Moo>=0:devel/p5-Moo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
USES= perl5
diff --git a/devel/p5-Config-MVP-Reader-INI/Makefile b/devel/p5-Config-MVP-Reader-INI/Makefile
index 97c84d0b7b0c..9aac70629c3b 100644
--- a/devel/p5-Config-MVP-Reader-INI/Makefile
+++ b/devel/p5-Config-MVP-Reader-INI/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Config-INI>=0:devel/p5-Config-INI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-INI>=0:devel/p5-Config-INI \
p5-Config-MVP>=2:devel/p5-Config-MVP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Config-MVP/Makefile b/devel/p5-Config-MVP/Makefile
index 5c80425a5b78..e9e854a34d76 100644
--- a/devel/p5-Config-MVP/Makefile
+++ b/devel/p5-Config-MVP/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Load>=0.17:devel/p5-Class-Load \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Load>=0.17:devel/p5-Class-Load \
p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Moose>=0.91:devel/p5-Moose \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Class-Load>=0.17:devel/p5-Class-Load \
p5-Throwable>=0:devel/p5-Throwable \
p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-Config-Merge/Makefile b/devel/p5-Config-Merge/Makefile
index 24fd15dc4490..59dc026f1966 100644
--- a/devel/p5-Config-Merge/Makefile
+++ b/devel/p5-Config-Merge/Makefile
@@ -14,8 +14,8 @@ COMMENT= Load a configuration directory tree in a number of languages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-Any>=0:devel/p5-Config-Any
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Any>=0:devel/p5-Config-Any
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Config-Model-Tester/Makefile b/devel/p5-Config-Model-Tester/Makefile
index 5e3c6a02ce54..1fa38d1761b6 100644
--- a/devel/p5-Config-Model-Tester/Makefile
+++ b/devel/p5-Config-Model-Tester/Makefile
@@ -14,7 +14,8 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
# Do not add p5-Config-Model to TEST_DEPENDS to avoid cyclic dependency
-BUILD_DEPENDS= p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
p5-Log-Log4perl>=1.11:devel/p5-Log-Log4perl \
p5-Path-Tiny>=0:devel/p5-Path-Tiny \
p5-Test-Differences>=0:devel/p5-Test-Differences \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
p5-Test-Log-Log4perl>=0:devel/p5-Test-Log-Log4perl \
p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
p5-Test-Warn>=0:devel/p5-Test-Warn
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile
index 0fa521c0d589..a774c7811547 100644
--- a/devel/p5-Config-Model/Makefile
+++ b/devel/p5-Config-Model/Makefile
@@ -13,7 +13,8 @@ COMMENT= Model to create configuration validation tool
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Carp-Assert-More>=0:devel/p5-Carp-Assert-More \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Assert-More>=0:devel/p5-Carp-Assert-More \
p5-File-HomeDir>=0:devel/p5-File-HomeDir \
p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge \
p5-JSON>=0:converters/p5-JSON \
@@ -28,7 +29,6 @@ BUILD_DEPENDS= p5-Carp-Assert-More>=0:devel/p5-Carp-Assert-More \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl \
p5-Text-Levenshtein-Damerau>=0:devel/p5-Text-Levenshtein-Damerau
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Config-Model-Tester>=3.006:devel/p5-Config-Model-Tester \
p5-Test-Differences>=0:devel/p5-Test-Differences \
p5-Test-Exception>=0:devel/p5-Test-Exception \
diff --git a/devel/p5-Config-Objective/Makefile b/devel/p5-Config-Objective/Makefile
index 5dcfc8575158..90be11f2cc49 100644
--- a/devel/p5-Config-Objective/Makefile
+++ b/devel/p5-Config-Objective/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@FreeBSD.org
COMMENT= Configuration data as perl objects
-BUILD_DEPENDS= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
p5-ParseLex>=0:devel/p5-ParseLex
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Config-Validator/Makefile b/devel/p5-Config-Validator/Makefile
index 6d5a64960557..470a35eccde5 100644
--- a/devel/p5-Config-Validator/Makefile
+++ b/devel/p5-Config-Validator/Makefile
@@ -14,9 +14,9 @@ COMMENT= Schema based configuration validation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-No-Worries>=1.0:devel/p5-No-Worries \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-No-Worries>=1.0:devel/p5-No-Worries \
p5-URI>=1.67:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Connector/Makefile b/devel/p5-Connector/Makefile
index 29497025048d..ba712b6cf730 100644
--- a/devel/p5-Connector/Makefile
+++ b/devel/p5-Connector/Makefile
@@ -13,7 +13,8 @@ COMMENT= Generic connection to a hierarchical-structured data set
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= bash:shells/bash \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= bash:shells/bash \
p5-AppConfig>=0:devel/p5-AppConfig \
p5-Config-GitLike>=0:devel/p5-Config-GitLike \
p5-Config-Merge>=0:devel/p5-Config-Merge \
@@ -29,7 +30,6 @@ BUILD_DEPENDS= bash:shells/bash \
p5-YAML>=1.06:textproc/p5-YAML \
p5-libwww>=0:www/p5-libwww \
p5-perl-ldap>=0:net/p5-perl-ldap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
USES= perl5
diff --git a/devel/p5-Const-Exporter/Makefile b/devel/p5-Const-Exporter/Makefile
index 54be0805c023..0b8b086690c0 100644
--- a/devel/p5-Const-Exporter/Makefile
+++ b/devel/p5-Const-Exporter/Makefile
@@ -15,11 +15,11 @@ COMMENT= Declare constants for export
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Const-Fast>=0:devel/p5-Const-Fast \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Const-Fast>=0:devel/p5-Const-Fast \
p5-List-AllUtils>=0.10:devel/p5-List-AllUtils \
p5-Package-Stash>=0:devel/p5-Package-Stash \
p5-Ref-Util>=0:devel/p5-Ref-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Hash-Objectify>=0:devel/p5-Hash-Objectify \
p5-Test-Most>=0:devel/p5-Test-Most
diff --git a/devel/p5-Contextual-Return/Makefile b/devel/p5-Contextual-Return/Makefile
index 4572d7137add..244e6609d17a 100644
--- a/devel/p5-Contextual-Return/Makefile
+++ b/devel/p5-Contextual-Return/Makefile
@@ -14,8 +14,8 @@ COMMENT= Create context-sensitive return values
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Want>=0:devel/p5-Want
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Want>=0:devel/p5-Want
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Coro/Makefile b/devel/p5-Coro/Makefile
index 1fcbdc9af80c..1dbd2d9d3104 100644
--- a/devel/p5-Coro/Makefile
+++ b/devel/p5-Coro/Makefile
@@ -13,15 +13,15 @@ COMMENT= Coroutine process abstraction for perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=7:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+ p5-Canary-Stability>=0:devel/p5-Canary-Stability
+RUN_DEPENDS= p5-AnyEvent>=7:devel/p5-AnyEvent \
p5-AnyEvent-AIO>=1.0:devel/p5-AnyEvent-AIO \
p5-EV>=4:devel/p5-EV \
p5-Event>=1.08:devel/p5-Event \
p5-Guard>=0.5:devel/p5-Guard \
p5-IO-AIO>=3.1:devel/p5-IO-AIO \
p5-common-sense>=0:devel/p5-common-sense
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-BUILD_DEPENDS+= p5-Canary-Stability>=0:devel/p5-Canary-Stability
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/devel/p5-Curses-Application/Makefile b/devel/p5-Curses-Application/Makefile
index fd0c9c1e6ed3..618992d0c0e8 100644
--- a/devel/p5-Curses-Application/Makefile
+++ b/devel/p5-Curses-Application/Makefile
@@ -14,8 +14,8 @@ COMMENT= Curses application development framework
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Curses-Forms>=0:devel/p5-Curses-Forms
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Curses-Forms>=0:devel/p5-Curses-Forms
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Curses-Forms/Makefile b/devel/p5-Curses-Forms/Makefile
index c59514dc891d..3f9ec1c7e2a8 100644
--- a/devel/p5-Curses-Forms/Makefile
+++ b/devel/p5-Curses-Forms/Makefile
@@ -14,8 +14,8 @@ COMMENT= Provide high level APIs for rapid UI design on the console
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Curses-Widgets>=0:devel/p5-Curses-Widgets
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Curses-Widgets>=0:devel/p5-Curses-Widgets
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Curses-UI/Makefile b/devel/p5-Curses-UI/Makefile
index 3eedd7f1ab22..6041fccdea28 100644
--- a/devel/p5-Curses-UI/Makefile
+++ b/devel/p5-Curses-UI/Makefile
@@ -14,9 +14,9 @@ COMMENT= Curses based OO user interface framework
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Curses>=0:devel/p5-Curses \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Curses>=0:devel/p5-Curses \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Curses-Widgets/Makefile b/devel/p5-Curses-Widgets/Makefile
index 630eecb147c3..b16dd7e4148c 100644
--- a/devel/p5-Curses-Widgets/Makefile
+++ b/devel/p5-Curses-Widgets/Makefile
@@ -14,8 +14,8 @@ COMMENT= Curses-based widgets and functions
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Curses>=0:devel/p5-Curses
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Curses>=0:devel/p5-Curses
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Dancer-Debug/Makefile b/devel/p5-Dancer-Debug/Makefile
index 98963f0e8b64..ef5f69294b8d 100644
--- a/devel/p5-Dancer-Debug/Makefile
+++ b/devel/p5-Dancer-Debug/Makefile
@@ -14,10 +14,10 @@ COMMENT= Dancer::Debug - Extend Plack::Middleware::Debug
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
p5-Dancer>=0:www/p5-Dancer \
p5-Plack-Middleware-Debug>=0:www/p5-Plack-Middleware-Debug
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Danga-Socket/Makefile b/devel/p5-Danga-Socket/Makefile
index d4a23980545c..7dc9219ba331 100644
--- a/devel/p5-Danga-Socket/Makefile
+++ b/devel/p5-Danga-Socket/Makefile
@@ -14,9 +14,9 @@ COMMENT= Event loop and event-driven async socket base class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-KQueue>=0:devel/p5-IO-KQueue \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-KQueue>=0:devel/p5-IO-KQueue \
p5-Sys-Syscall>=0:devel/p5-Sys-Syscall
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Data-ACL/Makefile b/devel/p5-Data-ACL/Makefile
index 0756ee07caba..09e6424effc9 100644
--- a/devel/p5-Data-ACL/Makefile
+++ b/devel/p5-Data-ACL/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Data::ACL - Perl extension for simple ACL lists
-BUILD_DEPENDS= p5-Set-NestedGroups>=0:devel/p5-Set-NestedGroups
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Set-NestedGroups>=0:devel/p5-Set-NestedGroups
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Data-Bind/Makefile b/devel/p5-Data-Bind/Makefile
index 2e723c6eed4d..d4e6c8ab8f7a 100644
--- a/devel/p5-Data-Bind/Makefile
+++ b/devel/p5-Data-Bind/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to bind and alias variables
-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-Devel-Caller>0:devel/p5-Devel-Caller \
p5-Devel-LexAlias>0:devel/p5-Devel-LexAlias \
p5-Data-Capture>0:devel/p5-Data-Capture
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-Data-ClearSilver-HDF/Makefile b/devel/p5-Data-ClearSilver-HDF/Makefile
index fa801e5a9def..e520bed9b346 100644
--- a/devel/p5-Data-ClearSilver-HDF/Makefile
+++ b/devel/p5-Data-ClearSilver-HDF/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Convert from Perl Data Structure to ClearSilver HDF
-BUILD_DEPENDS= p5-ClearSilver>=0:www/p5-ClearSilver \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ClearSilver>=0:www/p5-ClearSilver \
p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Data-Compare/Makefile b/devel/p5-Data-Compare/Makefile
index 031ea9d77ab6..f4b4e3fb4824 100644
--- a/devel/p5-Data-Compare/Makefile
+++ b/devel/p5-Data-Compare/Makefile
@@ -16,8 +16,8 @@ COMMENT= Data::Compare - compare perl data structures
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Find-Rule>=0:devel/p5-File-Find-Rule
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Find-Rule>=0:devel/p5-File-Find-Rule
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Data-Domain/Makefile b/devel/p5-Data-Domain/Makefile
index 0b67d557a15f..1acb1f033df5 100644
--- a/devel/p5-Data-Domain/Makefile
+++ b/devel/p5-Data-Domain/Makefile
@@ -14,13 +14,13 @@ COMMENT= Data description and validation
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-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Scalar-Does>=0.007:devel/p5-Scalar-Does \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-experimental>=0:devel/p5-experimental
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.14:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
diff --git a/devel/p5-Data-Dump-Streamer/Makefile b/devel/p5-Data-Dump-Streamer/Makefile
index 2d7cc8d847f4..d7584ee14ae8 100644
--- a/devel/p5-Data-Dump-Streamer/Makefile
+++ b/devel/p5-Data-Dump-Streamer/Makefile
@@ -13,10 +13,10 @@ COMMENT= Stream a highly accurate breadth first data dump in Perl code
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-B-Utils>=0.05:devel/p5-B-Utils \
p5-PadWalker>=0.99:devel/p5-PadWalker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS
CONFIGURE_ARGS= DDS
diff --git a/devel/p5-Data-HexDump-Range/Makefile b/devel/p5-Data-HexDump-Range/Makefile
index 52e752d82930..ee658d1772f1 100644
--- a/devel/p5-Data-HexDump-Range/Makefile
+++ b/devel/p5-Data-HexDump-Range/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= gebhart@secnetix.de
COMMENT= Hexadecimal Range Dumper with color, bitfields and skip ranges
-BUILD_DEPENDS= p5-Readonly>=0:devel/p5-Readonly \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Readonly>=0:devel/p5-Readonly \
p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-Text-Diff>=0:textproc/p5-Text-Diff \
p5-Text-Colorizer>=0:textproc/p5-Text-Colorizer \
p5-Term-Bash-Completion-Generator>=0:shells/p5-Term-Bash-Completion-Generator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Data-JavaScript-Anon/Makefile b/devel/p5-Data-JavaScript-Anon/Makefile
index 94448a79efcc..a397b0a6d7a1 100644
--- a/devel/p5-Data-JavaScript-Anon/Makefile
+++ b/devel/p5-Data-JavaScript-Anon/Makefile
@@ -14,9 +14,9 @@ COMMENT= Dump big dumb Perl structs to anonymous JavaScript structs
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Default>=1.51:devel/p5-Class-Default \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Default>=1.51:devel/p5-Class-Default \
p5-Params-Util>=0.01:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Data-Object/Makefile b/devel/p5-Data-Object/Makefile
index 419a65174487..fa65d1bbe81b 100644
--- a/devel/p5-Data-Object/Makefile
+++ b/devel/p5-Data-Object/Makefile
@@ -13,10 +13,10 @@ COMMENT= Data Type Objects for Perl 5
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moo>=2.000001:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=2.000001:devel/p5-Moo \
p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny \
p5-Type-Tiny-Signatures>=0.05:devel/p5-Type-Tiny-Signatures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Data-ObjectDriver/Makefile b/devel/p5-Data-ObjectDriver/Makefile
index f1d27867005d..113566b1fa36 100644
--- a/devel/p5-Data-ObjectDriver/Makefile
+++ b/devel/p5-Data-ObjectDriver/Makefile
@@ -13,12 +13,12 @@ COMMENT= Simple, transparent data interface, with caching
LICENSE= ART20
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-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-Class-Trigger>=0:devel/p5-Class-Trigger \
p5-DBI>=0:databases/p5-DBI \
p5-Text-SimpleTable>=0:textproc/p5-Text-SimpleTable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/devel/p5-Data-OptList/Makefile b/devel/p5-Data-OptList/Makefile
index bd015b016610..e141d38a4d8f 100644
--- a/devel/p5-Data-OptList/Makefile
+++ b/devel/p5-Data-OptList/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Params-Util>=0.14:devel/p5-Params-Util \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Util>=0.14:devel/p5-Params-Util \
p5-Sub-Install>=0.92:devel/p5-Sub-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Data-Perl/Makefile b/devel/p5-Data-Perl/Makefile
index 26a7c099c837..58626aec4853 100644
--- a/devel/p5-Data-Perl/Makefile
+++ b/devel/p5-Data-Perl/Makefile
@@ -13,12 +13,12 @@ COMMENT= Base classes wrapping fundamental Perl data types
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Role-Tiny>=0:devel/p5-Role-Tiny \
p5-strictures>=1:devel/p5-strictures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Data-Printer/Makefile b/devel/p5-Data-Printer/Makefile
index 0631686214fa..a7f9ac4ea416 100644
--- a/devel/p5-Data-Printer/Makefile
+++ b/devel/p5-Data-Printer/Makefile
@@ -13,11 +13,11 @@ COMMENT= Colored pretty-print of Perl data structures and objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Clone-PP>=0:devel/p5-Clone-PP \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone-PP>=0:devel/p5-Clone-PP \
p5-File-HomeDir>=0.91:devel/p5-File-HomeDir \
p5-Package-Stash>=0.30:devel/p5-Package-Stash \
p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-DBI>=0:databases/p5-DBI \
p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy \
diff --git a/devel/p5-Data-Rx/Makefile b/devel/p5-Data-Rx/Makefile
index 2b9b31fec60d..1a84b5196fdc 100644
--- a/devel/p5-Data-Rx/Makefile
+++ b/devel/p5-Data-Rx/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl implementation of Rx schema system
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-JSON>=2:converters/p5-JSON \
p5-Number-Tolerant>=0:devel/p5-Number-Tolerant
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
diff --git a/devel/p5-Data-Section/Makefile b/devel/p5-Data-Section/Makefile
index b91880964332..da96393bc75d 100644
--- a/devel/p5-Data-Section/Makefile
+++ b/devel/p5-Data-Section/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
p5-Sub-Exporter>=0.979:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings
NO_ARCH= yes
diff --git a/devel/p5-Data-Serializable/Makefile b/devel/p5-Data-Serializable/Makefile
index f904678fd905..22696581083e 100644
--- a/devel/p5-Data-Serializable/Makefile
+++ b/devel/p5-Data-Serializable/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Moose>=0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-Data-Serializer-Sereal/Makefile b/devel/p5-Data-Serializer-Sereal/Makefile
index 7d9e97952746..76254e2182dc 100644
--- a/devel/p5-Data-Serializer-Sereal/Makefile
+++ b/devel/p5-Data-Serializer-Sereal/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= adamw@FreeBSD.org
COMMENT= Creates bridge between Data::Serializer and Sereal
-BUILD_DEPENDS= p5-Data-Serializer>=0:devel/p5-Data-Serializer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Serializer>=0:devel/p5-Data-Serializer \
p5-Sereal-Decoder>=0:converters/p5-Sereal-Decoder \
p5-Sereal-Encoder>=0:converters/p5-Sereal-Encoder
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Data-Stream-Bulk/Makefile b/devel/p5-Data-Stream-Bulk/Makefile
index 45dbea32df51..8cc605bb4813 100644
--- a/devel/p5-Data-Stream-Bulk/Makefile
+++ b/devel/p5-Data-Stream-Bulk/Makefile
@@ -14,11 +14,11 @@ COMMENT= N at a time iteration API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.90:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.90:devel/p5-Moose \
p5-Path-Class>0:devel/p5-Path-Class \
p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
p5-namespace-clean>0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Requires>0:devel/p5-Test-Requires
diff --git a/devel/p5-Data-Throttler/Makefile b/devel/p5-Data-Throttler/Makefile
index 11dee753cf6b..b8dd2b24d39c 100644
--- a/devel/p5-Data-Throttler/Makefile
+++ b/devel/p5-Data-Throttler/Makefile
@@ -13,11 +13,11 @@ COMMENT= Limit data throughput
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Log4perl>=1:devel/p5-Log-Log4perl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Log4perl>=1:devel/p5-Log-Log4perl \
p5-Set-IntSpan>0:math/p5-Set-IntSpan \
p5-Text-ASCIITable>0:textproc/p5-Text-ASCIITable \
p5-YAML>=0.62:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Data-Thunk/Makefile b/devel/p5-Data-Thunk/Makefile
index 86fdc9b83b0c..350a09bd3f23 100644
--- a/devel/p5-Data-Thunk/Makefile
+++ b/devel/p5-Data-Thunk/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Lazy/deferred evaluation - a sneakier Scalar::Defer
-BUILD_DEPENDS= p5-Check-ISA>=0:devel/p5-Check-ISA \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Check-ISA>=0:devel/p5-Check-ISA \
p5-Data-Swap>=0:devel/p5-Data-Swap \
p5-Devel-Refcount>=0:devel/p5-Devel-Refcount \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-UNIVERSAL-ref>=0:devel/p5-UNIVERSAL-ref \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile b/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
index 4510b3032da2..486ec98112fd 100644
--- a/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
+++ b/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= GTK renderer for Data::TreeDumper
-BUILD_DEPENDS= p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
p5-Gtk2>=0:x11-toolkits/p5-Gtk2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= gtk_test.pl
diff --git a/devel/p5-Data-TreeDumper/Makefile b/devel/p5-Data-TreeDumper/Makefile
index 32d9872044a4..b2e1c2d8ed03 100644
--- a/devel/p5-Data-TreeDumper/Makefile
+++ b/devel/p5-Data-TreeDumper/Makefile
@@ -14,12 +14,12 @@ COMMENT= Dumps a data structure in a tree fashion
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Check-ISA>=0:devel/p5-Check-ISA \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Check-ISA>=0:devel/p5-Check-ISA \
p5-Devel-Size>=0:devel/p5-Devel-Size \
p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally \
p5-Term-Size>=0:devel/p5-Term-Size \
p5-Text-Tabs+Wrap>=0:textproc/p5-Text-Tabs+Wrap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Data-Validator/Makefile b/devel/p5-Data-Validator/Makefile
index df472e74b097..2bb304c973a8 100644
--- a/devel/p5-Data-Validator/Makefile
+++ b/devel/p5-Data-Validator/Makefile
@@ -14,8 +14,8 @@ COMMENT= Rule based validator on type constraint system
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mouse>=0.93:devel/p5-Mouse
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mouse>=0.93:devel/p5-Mouse
TEST_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-Data-Visitor/Makefile b/devel/p5-Data-Visitor/Makefile
index 8b14c95ac920..b6c7db5eaa1c 100644
--- a/devel/p5-Data-Visitor/Makefile
+++ b/devel/p5-Data-Visitor/Makefile
@@ -14,12 +14,12 @@ COMMENT= Visitor style traversal of Perl data structures
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Load>=0.06:devel/p5-Class-Load \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Load>=0.06:devel/p5-Class-Load \
p5-Moose>=0.89:devel/p5-Moose \
p5-Task-Weaken>=0:devel/p5-Task-Weaken \
p5-Tie-ToObject>=0.01:devel/p5-Tie-ToObject \
p5-namespace-clean>=0.19:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Data-Alias>=0:devel/p5-Data-Alias \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-Date-Calc-Iterator/Makefile b/devel/p5-Date-Calc-Iterator/Makefile
index 4778f79dbc33..827989958f0e 100644
--- a/devel/p5-Date-Calc-Iterator/Makefile
+++ b/devel/p5-Date-Calc-Iterator/Makefile
@@ -13,9 +13,9 @@ COMMENT= Iterate over a range of dates
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-Ref-Util>=0.202:devel/p5-Ref-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Date-Calc-XS/Makefile b/devel/p5-Date-Calc-XS/Makefile
index f551c4442cbd..a94181d24d2b 100644
--- a/devel/p5-Date-Calc-XS/Makefile
+++ b/devel/p5-Date-Calc-XS/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= XS wrapper and C library plug-in for Date::Calc
-BUILD_DEPENDS= p5-Date-Calc>=6.4:devel/p5-Date-Calc \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Calc>=6.4:devel/p5-Date-Calc \
p5-Bit-Vector>=7.4:math/p5-Bit-Vector \
p5-Carp-Clan>=5.3:devel/p5-Carp-Clan
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index 42e6a208eb57..2a2a3290e606 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -13,9 +13,9 @@ COMMENT= Gregorian calendar date calculations
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Bit-Vector>=7.4:math/p5-Bit-Vector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bit-Vector>=7.4:math/p5-Bit-Vector \
p5-Carp-Clan>=6.04:devel/p5-Carp-Clan
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Date-DayOfWeek/Makefile b/devel/p5-Date-DayOfWeek/Makefile
index d638e3216a8d..88745edb8c7e 100644
--- a/devel/p5-Date-DayOfWeek/Makefile
+++ b/devel/p5-Date-DayOfWeek/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Determine the day of the week for any date
-BUILD_DEPENDS= p5-Date-Leapyear>=0:devel/p5-Date-Leapyear \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Leapyear>=0:devel/p5-Date-Leapyear \
p5-Test-Simple>=0:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Date-Holidays-DK/Makefile b/devel/p5-Date-Holidays-DK/Makefile
index 32b5591fc3cc..bdcd8336b0f9 100644
--- a/devel/p5-Date-Holidays-DK/Makefile
+++ b/devel/p5-Date-Holidays-DK/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Determine Danish public holidays
-BUILD_DEPENDS= p5-Date-Simple>=0:devel/p5-Date-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Simple>=0:devel/p5-Date-Simple \
p5-Date-Easter>=0:devel/p5-Date-Easter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Date-ISO/Makefile b/devel/p5-Date-ISO/Makefile
index 193f5a3a6d21..8db4bc0337b6 100644
--- a/devel/p5-Date-ISO/Makefile
+++ b/devel/p5-Date-ISO/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
COMMENT= Converts dates between ISO and Gregorian formats
-BUILD_DEPENDS= p5-Date-ICal>=1.54:devel/p5-Date-ICal \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-ICal>=1.54:devel/p5-Date-ICal \
p5-Date-Leapyear>=0:devel/p5-Date-Leapyear
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Date-Piece/Makefile b/devel/p5-Date-Piece/Makefile
index 75944acae87c..bdcfc70ef12c 100644
--- a/devel/p5-Date-Piece/Makefile
+++ b/devel/p5-Date-Piece/Makefile
@@ -16,8 +16,8 @@ COMMENT= Perl5 module containing date manipulation routines
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Date-Simple>=3.03:devel/p5-Date-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Simple>=3.03:devel/p5-Date-Simple
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Date-Roman/Makefile b/devel/p5-Date-Roman/Makefile
index 24f3f2e09135..4eec7ebcaf1f 100644
--- a/devel/p5-Date-Roman/Makefile
+++ b/devel/p5-Date-Roman/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= philip@FreeBSD.org
COMMENT= Perl module to play with Roman dates
-BUILD_DEPENDS= p5-Roman>=0:math/p5-Roman
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Roman>=0:math/p5-Roman
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-DateTime-Calendar-Christian/Makefile b/devel/p5-DateTime-Calendar-Christian/Makefile
index 79d680204ccd..1b5cc4a98cbc 100644
--- a/devel/p5-DateTime-Calendar-Christian/Makefile
+++ b/devel/p5-DateTime-Calendar-Christian/Makefile
@@ -15,8 +15,8 @@ LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSES/Artistic
LICENSE_FILE_GPLv1+ = ${WRKSRC}/LICENSES/Copying
-BUILD_DEPENDS= p5-DateTime-Calendar-Julian>=0.04:devel/p5-DateTime-Calendar-Julian
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime-Calendar-Julian>=0.04:devel/p5-DateTime-Calendar-Julian
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Calendar-Discordian/Makefile b/devel/p5-DateTime-Calendar-Discordian/Makefile
index 81a6cb571c08..4b8842df7e1a 100644
--- a/devel/p5-DateTime-Calendar-Discordian/Makefile
+++ b/devel/p5-DateTime-Calendar-Discordian/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Locale>=0:devel/p5-DateTime-Locale \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
index f96677aff969..64c9b373d626 100644
--- a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
+++ b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0.14:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.14:devel/p5-DateTime \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Roman>=1.22:math/p5-Roman
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Calendar-Hebrew/Makefile b/devel/p5-DateTime-Calendar-Hebrew/Makefile
index 9bb72e806804..af84d68c30e9 100644
--- a/devel/p5-DateTime-Calendar-Hebrew/Makefile
+++ b/devel/p5-DateTime-Calendar-Hebrew/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Event-Sunrise>=0:devel/p5-DateTime-Event-Sunrise
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Calendar-Julian/Makefile b/devel/p5-DateTime-Calendar-Julian/Makefile
index ed62cc403066..8a4f988dcc18 100644
--- a/devel/p5-DateTime-Calendar-Julian/Makefile
+++ b/devel/p5-DateTime-Calendar-Julian/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Calendar-Pataphysical/Makefile b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
index 530a2d3ff609..9596b1a18170 100644
--- a/devel/p5-DateTime-Calendar-Pataphysical/Makefile
+++ b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Locale>=0:devel/p5-DateTime-Locale
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockTime>=0:devel/p5-Test-MockTime
NO_ARCH= yes
diff --git a/devel/p5-DateTime-Event-Cron/Makefile b/devel/p5-DateTime-Event-Cron/Makefile
index 5cb290368c21..f33b5a83825c 100644
--- a/devel/p5-DateTime-Event-Cron/Makefile
+++ b/devel/p5-DateTime-Event-Cron/Makefile
@@ -13,10 +13,10 @@ COMMENT= DateTime extension for generating recurrence sets from crontab
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Set>=0:devel/p5-DateTime-Set \
p5-Set-Crontab>=0:devel/p5-Set-Crontab
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Event-Easter/Makefile b/devel/p5-DateTime-Event-Easter/Makefile
index 53f1975b98bd..f28961b9110f 100644
--- a/devel/p5-DateTime-Event-Easter/Makefile
+++ b/devel/p5-DateTime-Event-Easter/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Returns Easter events for DateTime objects
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Calendar-Julian>=0:devel/p5-DateTime-Calendar-Julian \
p5-DateTime-Set>=0:devel/p5-DateTime-Set \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-DateTime-Event-ICal/Makefile b/devel/p5-DateTime-Event-ICal/Makefile
index f6f300009852..d0343b8077df 100644
--- a/devel/p5-DateTime-Event-ICal/Makefile
+++ b/devel/p5-DateTime-Event-ICal/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl DateTime extension for computing rfc2445 recurrences
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Event-Recurrence>=0.11:devel/p5-DateTime-Event-Recurrence
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Event-Lunar/Makefile b/devel/p5-DateTime-Event-Lunar/Makefile
index 1bcc448267d6..47bce308cafa 100644
--- a/devel/p5-DateTime-Event-Lunar/Makefile
+++ b/devel/p5-DateTime-Event-Lunar/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= Compute Lunar Events
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Set>=0:devel/p5-DateTime-Set \
p5-DateTime-Astro>=1.00:devel/p5-DateTime-Astro \
p5-Math-Round>=0:math/p5-Math-Round
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-DateTime-Event-Random/Makefile b/devel/p5-DateTime-Event-Random/Makefile
index 5c080b198cd5..a0c2bcc98606 100644
--- a/devel/p5-DateTime-Event-Random/Makefile
+++ b/devel/p5-DateTime-Event-Random/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= DateTime extension for creating random datetimes
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Set>=0:devel/p5-DateTime-Set
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-DateTime-Event-Recurrence/Makefile b/devel/p5-DateTime-Event-Recurrence/Makefile
index f69f452b2268..3fd4ee049018 100644
--- a/devel/p5-DateTime-Event-Recurrence/Makefile
+++ b/devel/p5-DateTime-Event-Recurrence/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl DateTime extension for computing basic recurrences
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0.27:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.27:devel/p5-DateTime \
p5-DateTime-Set>=0.3600:devel/p5-DateTime-Set
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS
diff --git a/devel/p5-DateTime-Event-Sunrise/Makefile b/devel/p5-DateTime-Event-Sunrise/Makefile
index c04f7e2a0e77..0be11ec56669 100644
--- a/devel/p5-DateTime-Event-Sunrise/Makefile
+++ b/devel/p5-DateTime-Event-Sunrise/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0.21:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.21:devel/p5-DateTime \
p5-DateTime-Set>=0.1600:devel/p5-DateTime-Set \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Set-Infinite>=0:devel/p5-Set-Infinite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-DateTime-Fiscal-Year/Makefile b/devel/p5-DateTime-Fiscal-Year/Makefile
index a6eb096c6db2..acde8489fca6 100644
--- a/devel/p5-DateTime-Fiscal-Year/Makefile
+++ b/devel/p5-DateTime-Fiscal-Year/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Calculate the day or week of the Fiscal Year with an arbitrary start date
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-DateTime-Format-Baby/Makefile b/devel/p5-DateTime-Format-Baby/Makefile
index 9b839448fa8a..18667be187d9 100644
--- a/devel/p5-DateTime-Format-Baby/Makefile
+++ b/devel/p5-DateTime-Format-Baby/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0.16:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.16:devel/p5-DateTime \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Format-Builder/Makefile b/devel/p5-DateTime-Format-Builder/Makefile
index f8b84d87e8e8..7aa377e0a72b 100644
--- a/devel/p5-DateTime-Format-Builder/Makefile
+++ b/devel/p5-DateTime-Format-Builder/Makefile
@@ -14,12 +14,12 @@ COMMENT= Create DateTime parser classes and objects
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-DateTime>=0.12:devel/p5-DateTime \
p5-DateTime-Format-Strptime>=1.04:devel/p5-DateTime-Format-Strptime \
p5-Params-Validate>=0.72:devel/p5-Params-Validate \
p5-Task-Weaken>=0:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Devel-Cycle>=1.07:devel/p5-Devel-Cycle \
p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
diff --git a/devel/p5-DateTime-Format-DBI/Makefile b/devel/p5-DateTime-Format-DBI/Makefile
index 93d71324761b..72b6ed7eeaff 100644
--- a/devel/p5-DateTime-Format-DBI/Makefile
+++ b/devel/p5-DateTime-Format-DBI/Makefile
@@ -14,9 +14,9 @@ COMMENT= Find a parser class for a database connection
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=1.21:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=1.21:databases/p5-DBI \
p5-DateTime>=0.1:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
USES= perl5
diff --git a/devel/p5-DateTime-Format-DateParse/Makefile b/devel/p5-DateTime-Format-DateParse/Makefile
index 0aa372424a39..d60222d036ca 100644
--- a/devel/p5-DateTime-Format-DateParse/Makefile
+++ b/devel/p5-DateTime-Format-DateParse/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-TimeDate>=0:devel/p5-TimeDate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-DateTime-Format-Duration/Makefile b/devel/p5-DateTime-Format-Duration/Makefile
index cd0640fa8d7b..d203a43dc339 100644
--- a/devel/p5-DateTime-Format-Duration/Makefile
+++ b/devel/p5-DateTime-Format-Duration/Makefile
@@ -13,8 +13,8 @@ COMMENT= Format and parse DateTime::Durations
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
WRKSRC= ${WRKDIR}/${DISTNAME:C/a$//}
diff --git a/devel/p5-DateTime-Format-Epoch/Makefile b/devel/p5-DateTime-Format-Epoch/Makefile
index 4875a0439a26..60a0e81b1dac 100644
--- a/devel/p5-DateTime-Format-Epoch/Makefile
+++ b/devel/p5-DateTime-Format-Epoch/Makefile
@@ -13,9 +13,9 @@ COMMENT= Convert DateTimes to/from epoch seconds
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0.31:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.31:devel/p5-DateTime \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:0.801
diff --git a/devel/p5-DateTime-Format-Excel/Makefile b/devel/p5-DateTime-Format-Excel/Makefile
index 2f0ef835017d..30b1c471ffff 100644
--- a/devel/p5-DateTime-Format-Excel/Makefile
+++ b/devel/p5-DateTime-Format-Excel/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert between DateTime and Excel dates
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-DateTime-Format-IBeat/Makefile b/devel/p5-DateTime-Format-IBeat/Makefile
index fa5e7691b609..4ff6443ca3f2 100644
--- a/devel/p5-DateTime-Format-IBeat/Makefile
+++ b/devel/p5-DateTime-Format-IBeat/Makefile
@@ -16,8 +16,8 @@ LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/Artistic
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Format-ISO8601/Makefile b/devel/p5-DateTime-Format-ISO8601/Makefile
index 503010d7ae48..b430c0007488 100644
--- a/devel/p5-DateTime-Format-ISO8601/Makefile
+++ b/devel/p5-DateTime-Format-ISO8601/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0.18:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.18:devel/p5-DateTime \
p5-DateTime-Format-Builder>=0.77:devel/p5-DateTime-Format-Builder
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Format-MySQL/Makefile b/devel/p5-DateTime-Format-MySQL/Makefile
index 6e124b3c8df6..1c456500535b 100644
--- a/devel/p5-DateTime-Format-MySQL/Makefile
+++ b/devel/p5-DateTime-Format-MySQL/Makefile
@@ -13,9 +13,9 @@ COMMENT= Parse and format MySQL dates and times
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Format-Builder>=0.6:devel/p5-DateTime-Format-Builder
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-DateTime-Format-Natural/Makefile b/devel/p5-DateTime-Format-Natural/Makefile
index a25adc5c0330..98ea2777073d 100644
--- a/devel/p5-DateTime-Format-Natural/Makefile
+++ b/devel/p5-DateTime-Format-Natural/Makefile
@@ -13,14 +13,14 @@ COMMENT= Create machine readable date/time with natural parsing logic
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-boolean>=0:devel/p5-boolean \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-boolean>=0:devel/p5-boolean \
p5-Clone>=0:devel/p5-Clone \
p5-Date-Calc>=0:devel/p5-Date-Calc \
p5-DateTime>=0:devel/p5-DateTime \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Module-Util>=0:devel/p5-Module-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockTime>=0:devel/p5-Test-MockTime
USES= perl5
diff --git a/devel/p5-DateTime-Format-Oracle/Makefile b/devel/p5-DateTime-Format-Oracle/Makefile
index b1272c245445..f7001b9ec367 100644
--- a/devel/p5-DateTime-Format-Oracle/Makefile
+++ b/devel/p5-DateTime-Format-Oracle/Makefile
@@ -14,10 +14,10 @@ COMMENT= Parse and format Oracle dates and timestamps
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Convert-NLS_DATE_FORMAT>=0.03:converters/p5-Convert-NLS_DATE_FORMAT \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Convert-NLS_DATE_FORMAT>=0.03:converters/p5-Convert-NLS_DATE_FORMAT \
p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-DateTime-Format-Pg/Makefile b/devel/p5-DateTime-Format-Pg/Makefile
index ad687b8ae035..d2194368f6d6 100644
--- a/devel/p5-DateTime-Format-Pg/Makefile
+++ b/devel/p5-DateTime-Format-Pg/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0.10:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.10:devel/p5-DateTime \
p5-DateTime-Format-Builder>=0.72:devel/p5-DateTime-Format-Builder \
p5-DateTime-TimeZone>=0.05:devel/p5-DateTime-TimeZone
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Format-SQLite/Makefile b/devel/p5-DateTime-Format-SQLite/Makefile
index efacf4dd2836..f3045ad030af 100644
--- a/devel/p5-DateTime-Format-SQLite/Makefile
+++ b/devel/p5-DateTime-Format-SQLite/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Format-Strptime/Makefile b/devel/p5-DateTime-Format-Strptime/Makefile
index b69f185aac3e..ebdce1c11ca5 100644
--- a/devel/p5-DateTime-Format-Strptime/Makefile
+++ b/devel/p5-DateTime-Format-Strptime/Makefile
@@ -14,14 +14,14 @@ COMMENT= Parse and format strp and strf time patterns
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=1:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=1:devel/p5-DateTime \
p5-DateTime-Locale>=1.05:devel/p5-DateTime-Locale \
p5-DateTime-TimeZone>=2.09:devel/p5-DateTime-TimeZone \
p5-Package-DeprecationManager>=0.15:devel/p5-Package-DeprecationManager \
p5-Params-ValidationCompiler>=0:devel/p5-Params-ValidationCompiler \
p5-Specio>=0.33:devel/p5-Specio \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Warnings>=0:devel/p5-Test-Warnings
diff --git a/devel/p5-DateTime-Functions/Makefile b/devel/p5-DateTime-Functions/Makefile
index 306989521e3f..bc4814202cab 100644
--- a/devel/p5-DateTime-Functions/Makefile
+++ b/devel/p5-DateTime-Functions/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Procedural interface to DateTime functions
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-DateTime-Incomplete/Makefile b/devel/p5-DateTime-Incomplete/Makefile
index 5608ba40b31b..edf88eb362ae 100644
--- a/devel/p5-DateTime-Incomplete/Makefile
+++ b/devel/p5-DateTime-Incomplete/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Set>=0.1400:devel/p5-DateTime-Set \
p5-DateTime-Event-Recurrence>=0:devel/p5-DateTime-Event-Recurrence
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime-Locale/Makefile b/devel/p5-DateTime-Locale/Makefile
index cd669b58bf8c..7bd5d97409a7 100644
--- a/devel/p5-DateTime-Locale/Makefile
+++ b/devel/p5-DateTime-Locale/Makefile
@@ -35,7 +35,6 @@ 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
RUN_DEPENDS+= p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils
.endif
diff --git a/devel/p5-DateTime-Precise/Makefile b/devel/p5-DateTime-Precise/Makefile
index 75bab82677f7..e8adadfad370 100644
--- a/devel/p5-DateTime-Precise/Makefile
+++ b/devel/p5-DateTime-Precise/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perform common time and date operations with additional GPS operations
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-DateTime-Set/Makefile b/devel/p5-DateTime-Set/Makefile
index d5f1fbe1eb71..2ea24e31d78f 100644
--- a/devel/p5-DateTime-Set/Makefile
+++ b/devel/p5-DateTime-Set/Makefile
@@ -13,10 +13,10 @@ COMMENT= Datetime sets and set math
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0.12:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.12:devel/p5-DateTime \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Set-Infinite>=0.59:devel/p5-Set-Infinite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS
diff --git a/devel/p5-DateTime-TimeZone-LMT/Makefile b/devel/p5-DateTime-TimeZone-LMT/Makefile
index 9b2e817e229a..62b2e55a575f 100644
--- a/devel/p5-DateTime-TimeZone-LMT/Makefile
+++ b/devel/p5-DateTime-TimeZone-LMT/Makefile
@@ -13,10 +13,10 @@ COMMENT= Local Mean Time time zone for DateTime
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0.12:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.12:devel/p5-DateTime \
p5-DateTime-TimeZone>=0.13:devel/p5-DateTime-TimeZone \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/devel/p5-DateTime-TimeZone/Makefile b/devel/p5-DateTime-TimeZone/Makefile
index 97e7aa97c246..97d84891d3c7 100644
--- a/devel/p5-DateTime-TimeZone/Makefile
+++ b/devel/p5-DateTime-TimeZone/Makefile
@@ -15,13 +15,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Singleton>=1.03:devel/p5-Class-Singleton \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Singleton>=1.03:devel/p5-Class-Singleton \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Params-ValidationCompiler>=0.13:devel/p5-Params-ValidationCompiler \
p5-Specio>=0:devel/p5-Specio \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DateTime>=1.44:devel/p5-DateTime \
p5-Test-Fatal>0:devel/p5-Test-Fatal \
p5-Test-Output>0:devel/p5-Test-Output \
diff --git a/devel/p5-DateTime-Util-Calc/Makefile b/devel/p5-DateTime-Util-Calc/Makefile
index ce4f2681ebae..718060062713 100644
--- a/devel/p5-DateTime-Util-Calc/Makefile
+++ b/devel/p5-DateTime-Util-Calc/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= DateTime Calculation Utilities
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-DateTime/Makefile b/devel/p5-DateTime/Makefile
index dec2d547c801..0e42b7fbce90 100644
--- a/devel/p5-DateTime/Makefile
+++ b/devel/p5-DateTime/Makefile
@@ -14,14 +14,14 @@ LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
# Do not add p5-DateTime-Format-Strptime>=1.20.00 to TEST_DEPENDS to avoid cyclic dependency
-BUILD_DEPENDS= p5-DateTime-Locale>=1.06:devel/p5-DateTime-Locale \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime-Locale>=1.06:devel/p5-DateTime-Locale \
p5-DateTime-TimeZone>=2.02:devel/p5-DateTime-TimeZone \
p5-Params-Validate>=1.03:devel/p5-Params-Validate \
p5-Params-ValidationCompiler>=0.26:devel/p5-Params-ValidationCompiler \
p5-Specio>=0:devel/p5-Specio \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-autoclean>=0.19:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-CPAN-Meta-Check>=0.011:devel/p5-CPAN-Meta-Check \
p5-Test-Warnings>=0.005:devel/p5-Test-Warnings
diff --git a/devel/p5-DateTimeX-Easy/Makefile b/devel/p5-DateTimeX-Easy/Makefile
index 19dec5132297..fa5c4c26670a 100644
--- a/devel/p5-DateTimeX-Easy/Makefile
+++ b/devel/p5-DateTimeX-Easy/Makefile
@@ -14,13 +14,13 @@ COMMENT= Parse a date/time string using the best method available
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse \
p5-DateTime-Format-Flexible>=0:devel/p5-DateTime-Format-Flexible \
p5-DateTime-Format-ICal>=0:devel/p5-DateTime-Format-ICal \
p5-DateTime-Format-Natural>=0:devel/p5-DateTime-Format-Natural \
p5-TimeDate>=0:devel/p5-TimeDate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Most>=0:devel/p5-Test-Most
NO_ARCH= yes
diff --git a/devel/p5-Debug-Client/Makefile b/devel/p5-Debug-Client/Makefile
index 36b18d418225..a8b6a1bdcb99 100644
--- a/devel/p5-Debug-Client/Makefile
+++ b/devel/p5-Debug-Client/Makefile
@@ -13,9 +13,9 @@ COMMENT= Client for the standard Perl debugger
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PadWalker>=1.98:devel/p5-PadWalker \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PadWalker>=1.98:devel/p5-PadWalker \
p5-Term-ReadLine-Gnu>=1.20:devel/p5-Term-ReadLine-Gnu
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-HomeDir>=1:devel/p5-File-HomeDir \
p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
p5-Test-Class>=0.42:devel/p5-Test-Class \
diff --git a/devel/p5-Devel-ArgNames/Makefile b/devel/p5-Devel-ArgNames/Makefile
index cc3243f2d365..07caa022f19e 100644
--- a/devel/p5-Devel-ArgNames/Makefile
+++ b/devel/p5-Devel-ArgNames/Makefile
@@ -14,8 +14,8 @@ COMMENT= Figure out the names of variables passed into subroutines
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PadWalker>=0:devel/p5-PadWalker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PadWalker>=0:devel/p5-PadWalker
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Devel-Autoflush/Makefile b/devel/p5-Devel-Autoflush/Makefile
index 358a2fc07288..5c564bda4aea 100644
--- a/devel/p5-Devel-Autoflush/Makefile
+++ b/devel/p5-Devel-Autoflush/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= Set autoflush from the command line
-BUILD_DEPENDS= p5-IO-CaptureOutput>0:devel/p5-IO-CaptureOutput
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-CaptureOutput>0:devel/p5-IO-CaptureOutput
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Devel-CallChecker/Makefile b/devel/p5-Devel-CallChecker/Makefile
index cbf515a8ed1f..7b4708a8c920 100644
--- a/devel/p5-Devel-CallChecker/Makefile
+++ b/devel/p5-Devel-CallChecker/Makefile
@@ -13,8 +13,8 @@ COMMENT= Custom op checking attached to subroutines
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DynaLoader-Functions>=0.001:devel/p5-DynaLoader-Functions
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DynaLoader-Functions>=0.001:devel/p5-DynaLoader-Functions
TEST_DEPENDS= p5-Test-Pod>=1:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
diff --git a/devel/p5-Devel-Caller/Makefile b/devel/p5-Devel-Caller/Makefile
index c057a66df76d..662fe817866a 100644
--- a/devel/p5-Devel-Caller/Makefile
+++ b/devel/p5-Devel-Caller/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module which is meatier versions of caller
-BUILD_DEPENDS= p5-PadWalker>=0.08:devel/p5-PadWalker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PadWalker>=0.08:devel/p5-PadWalker
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
diff --git a/devel/p5-Devel-CheckOS/Makefile b/devel/p5-Devel-CheckOS/Makefile
index 4fdd325b9d50..646d83cbd23f 100644
--- a/devel/p5-Devel-CheckOS/Makefile
+++ b/devel/p5-Devel-CheckOS/Makefile
@@ -13,9 +13,9 @@ COMMENT= Check currently running OS
LICENSE= ART10 GPLv2
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Compare>=1.2100:devel/p5-Data-Compare \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Compare>=1.2100:devel/p5-Data-Compare \
p5-File-Find-Rule>=0.28:devel/p5-File-Find-Rule
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Devel-Cover/Makefile b/devel/p5-Devel-Cover/Makefile
index 95765a685687..6861622db6ba 100644
--- a/devel/p5-Devel-Cover/Makefile
+++ b/devel/p5-Devel-Cover/Makefile
@@ -14,6 +14,7 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENCE
+BUILD_DEPENDS= ${RUN_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences
USES= perl5
@@ -24,21 +25,17 @@ OPTIONS_DEFAULT=CPANCOVER HTML_REPORTS POD_COVERAGE
OPTIONS_SUB= yes
CPANCOVER_DESC= Coverage statistics on CPAN modules
-CPANCOVER_BUILD_DEPENDS= p5-Parallel-Iterator>=0:devel/p5-Parallel-Iterator \
+CPANCOVER_RUN_DEPENDS= p5-Parallel-Iterator>=0:devel/p5-Parallel-Iterator \
p5-Template-Toolkit>=2:www/p5-Template-Toolkit
-CPANCOVER_RUN_DEPENDS= ${CPANCOVER_BUILD_DEPENDS}
HTML_REPORTS_DESC= Build HTML reports with p5-HTML-Parser
-HTML_REPORTS_BUILD_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser
-HTML_REPORTS_RUN_DEPENDS= ${HTML_REPORTS_BUILD_DEPENDS}
+HTML_REPORTS_RUN_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser
POD_COVERAGE_DESC= POD coverage via p5-Pod-Coverage
-POD_COVERAGE_BUILD_DEPENDS= p5-Pod-Coverage>=0.06:devel/p5-Pod-Coverage
-POD_COVERAGE_RUN_DEPENDS= ${POD_COVERAGE_BUILD_DEPENDS}
+POD_COVERAGE_RUN_DEPENDS= p5-Pod-Coverage>=0.06:devel/p5-Pod-Coverage
SYNTAX_HIGHLIGHTING_DESC= Syntax highlighting via p5-PPI-HTML
-SYNTAX_HIGHLIGHTING_BUILD_DEPENDS= p5-PPI-HTML>=1.07:textproc/p5-PPI-HTML
-SYNTAX_HIGHLIGHTING_RUN_DEPENDS= ${SYNTAX_HIGHLIGHTING_BUILD_DEPENDS}
+SYNTAX_HIGHLIGHTING_RUN_DEPENDS= p5-PPI-HTML>=1.07:textproc/p5-PPI-HTML
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Devel/Cover/Cover.so
diff --git a/devel/p5-Devel-Events-Objects/Makefile b/devel/p5-Devel-Events-Objects/Makefile
index 86f99babf972..aa68eef63f17 100644
--- a/devel/p5-Devel-Events-Objects/Makefile
+++ b/devel/p5-Devel-Events-Objects/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module providing object tracking support for Devel::Events
-BUILD_DEPENDS= p5-Devel-Events>=0:devel/p5-Devel-Events \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Events>=0:devel/p5-Devel-Events \
p5-Task-Weaken>=0:devel/p5-Task-Weaken \
p5-Tie-RefHash-Weak>=0:devel/p5-Tie-RefHash-Weak \
p5-Variable-Magic>=0:devel/p5-Variable-Magic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Devel-Events/Makefile b/devel/p5-Devel-Events/Makefile
index 013fe75abca8..cc23a44e6b52 100644
--- a/devel/p5-Devel-Events/Makefile
+++ b/devel/p5-Devel-Events/Makefile
@@ -13,12 +13,12 @@ COMMENT= Perl5 module providing an extensible instrumentation framework
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-AttributeHelpers>=0:devel/p5-MooseX-AttributeHelpers \
p5-Set-Object>=0:devel/p5-Set-Object \
p5-Sub-Uplevel>=0:devel/p5-Sub-Uplevel \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
NO_ARCH= yes
diff --git a/devel/p5-Devel-GlobalDestruction/Makefile b/devel/p5-Devel-GlobalDestruction/Makefile
index 6f431d167321..ac0a47f4b5eb 100644
--- a/devel/p5-Devel-GlobalDestruction/Makefile
+++ b/devel/p5-Devel-GlobalDestruction/Makefile
@@ -12,8 +12,8 @@ COMMENT= Expose PL_dirty, the flag which marks global destruction
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Sub-Exporter-Progressive>=0.001011:devel/p5-Sub-Exporter-Progressive
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Exporter-Progressive>=0.001011:devel/p5-Sub-Exporter-Progressive
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Devel-KYTProf/Makefile b/devel/p5-Devel-KYTProf/Makefile
index 46f4b238c51e..bffb148a7e9a 100644
--- a/devel/p5-Devel-KYTProf/Makefile
+++ b/devel/p5-Devel-KYTProf/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl extension for simple profiler
-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-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBI>0:databases/p5-DBI \
p5-DBD-SQLite>0:databases/p5-DBD-SQLite
diff --git a/devel/p5-Devel-LeakGuard-Object/Makefile b/devel/p5-Devel-LeakGuard-Object/Makefile
index c09cf2430fae..9b26bde55881 100644
--- a/devel/p5-Devel-LeakGuard-Object/Makefile
+++ b/devel/p5-Devel-LeakGuard-Object/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= Scoped checks for object leaks
-BUILD_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences
TEST_DEPENDS= p5-latest>0:devel/p5-latest
USES= perl5
diff --git a/devel/p5-Devel-LexAlias/Makefile b/devel/p5-Devel-LexAlias/Makefile
index 260f3a89f9c5..dbd54af0c3d8 100644
--- a/devel/p5-Devel-LexAlias/Makefile
+++ b/devel/p5-Devel-LexAlias/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module which does alias lexical variables
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-Caller>=0.03:devel/p5-Devel-Caller
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Caller>=0.03:devel/p5-Devel-Caller
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Devel-NYTProf/Makefile b/devel/p5-Devel-NYTProf/Makefile
index 8833fa245a8b..2830b3a1b2d3 100644
--- a/devel/p5-Devel-NYTProf/Makefile
+++ b/devel/p5-Devel-NYTProf/Makefile
@@ -13,9 +13,9 @@ COMMENT= Powerful feature-rich Perl source code profiler
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \
p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>=0.60:devel/p5-Test-Differences
USES= perl5
diff --git a/devel/p5-Devel-OverloadInfo/Makefile b/devel/p5-Devel-OverloadInfo/Makefile
index 352bb2f591a4..9c2798930a2e 100644
--- a/devel/p5-Devel-OverloadInfo/Makefile
+++ b/devel/p5-Devel-OverloadInfo/Makefile
@@ -13,10 +13,10 @@ COMMENT= Introspect overloaded operators
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Package-Stash>=0.14:devel/p5-Package-Stash \
p5-Sub-Identify>=0:devel/p5-Sub-Identify
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-Devel-PackagePath/Makefile b/devel/p5-Devel-PackagePath/Makefile
index f579146b0ff7..22dbdcf1c40c 100644
--- a/devel/p5-Devel-PackagePath/Makefile
+++ b/devel/p5-Devel-PackagePath/Makefile
@@ -14,9 +14,9 @@ COMMENT= Inspect and manipulate a Path based on a Package name
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.64:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.64:devel/p5-Moose \
p5-MooseX-Types-Path-Class>=0.04:devel/p5-MooseX-Types-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Devel-PartialDump/Makefile b/devel/p5-Devel-PartialDump/Makefile
index dc046fd2197e..397e1040db54 100644
--- a/devel/p5-Devel-PartialDump/Makefile
+++ b/devel/p5-Devel-PartialDump/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENCE
-BUILD_DEPENDS= p5-Class-Tiny>=0:devel/p5-Class-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Tiny>=0:devel/p5-Class-Tiny \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-namespace-clean>=0.20:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Warnings>=0.009:devel/p5-Test-Warnings
NO_ARCH= yes
diff --git a/devel/p5-Devel-PatchPerl/Makefile b/devel/p5-Devel-PatchPerl/Makefile
index 4f0ef7008496..5ba2feb7d921 100644
--- a/devel/p5-Devel-PatchPerl/Makefile
+++ b/devel/p5-Devel-PatchPerl/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-pushd>=1:devel/p5-File-pushd \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-pushd>=1:devel/p5-File-pushd \
p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Devel-REPL/Makefile b/devel/p5-Devel-REPL/Makefile
index fe3160defbf0..b815e9cce0bd 100644
--- a/devel/p5-Devel-REPL/Makefile
+++ b/devel/p5-Devel-REPL/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENCE
-BUILD_DEPENDS= p5-Moose>=0.93:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.93:devel/p5-Moose \
p5-MooseX-Object-Pluggable>=0.0009:devel/p5-MooseX-Object-Pluggable \
p5-MooseX-Getopt>=0.18:devel/p5-MooseX-Getopt \
p5-namespace-autoclean>0:devel/p5-namespace-autoclean \
@@ -31,7 +32,6 @@ BUILD_DEPENDS= p5-Moose>=0.93:devel/p5-Moose \
p5-Module-Refresh>0:devel/p5-Module-Refresh \
p5-Module-Runtime>0:devel/p5-Module-Runtime \
p5-Sys-SigAction>0:devel/p5-Sys-SigAction
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Devel-Size-Report/Makefile b/devel/p5-Devel-Size-Report/Makefile
index fe2fc94e213d..2d7feb312f69 100644
--- a/devel/p5-Devel-Size-Report/Makefile
+++ b/devel/p5-Devel-Size-Report/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Extension to generate a size report for all elements in a structure
-BUILD_DEPENDS= p5-Array-RefElem>=1.00:misc/p5-Array-RefElem \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Array-RefElem>=1.00:misc/p5-Array-RefElem \
p5-Devel-Size>=0.69:devel/p5-Devel-Size
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Devel-StealthDebug/Makefile b/devel/p5-Devel-StealthDebug/Makefile
index ed8d98fab221..996c9ee5b418 100644
--- a/devel/p5-Devel-StealthDebug/Makefile
+++ b/devel/p5-Devel-StealthDebug/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple non-intrusive debug module
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Filter-Simple>=0:textproc/p5-Filter-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Filter-Simple>=0:textproc/p5-Filter-Simple
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Device-USB/Makefile b/devel/p5-Device-USB/Makefile
index e43a0b2f9eb6..c2298301e695 100644
--- a/devel/p5-Device-USB/Makefile
+++ b/devel/p5-Device-USB/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl wrapper for libusb
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline>=0:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0:devel/p5-Inline \
p5-Inline-C>=0:devel/p5-Inline-C
-RUN_DEPENDS:= ${BUILD_DEPENDS}
MAKE_JOBS_UNSAFE=yes
USES= perl5
diff --git a/devel/p5-Directory-Scratch-Structured/Makefile b/devel/p5-Directory-Scratch-Structured/Makefile
index 88497fabccc4..92f5eca696d6 100644
--- a/devel/p5-Directory-Scratch-Structured/Makefile
+++ b/devel/p5-Directory-Scratch-Structured/Makefile
@@ -14,12 +14,12 @@ COMMENT= Creates temporary files and directories from a structured description
LICENSE= ART10 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 \
p5-Sub-Install>=0:devel/p5-Sub-Install \
p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
p5-Directory-Scratch>=0:devel/p5-Directory-Scratch
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-Test-Strict>=0:devel/p5-Test-Strict \
diff --git a/devel/p5-Dist-Zilla/Makefile b/devel/p5-Dist-Zilla/Makefile
index 3eeb590a9ca4..5423ee3756dc 100644
--- a/devel/p5-Dist-Zilla/Makefile
+++ b/devel/p5-Dist-Zilla/Makefile
@@ -13,7 +13,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-App-Cmd>=0.330:devel/p5-App-Cmd \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-Cmd>=0.330:devel/p5-App-Cmd \
p5-CPAN-Uploader>=0.103004:devel/p5-CPAN-Uploader \
p5-Class-Load>=0.17:devel/p5-Class-Load \
p5-Config-MVP>=2.200011:devel/p5-Config-MVP \
@@ -54,7 +55,6 @@ BUILD_DEPENDS= p5-App-Cmd>=0.330:devel/p5-App-Cmd \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CPAN-Meta-Check>=0.011:devel/p5-CPAN-Meta-Check \
p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings \
@@ -68,7 +68,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/devel/p5-Eval-Closure/Makefile b/devel/p5-Eval-Closure/Makefile
index c7432d4b55bf..3708f252cbd7 100644
--- a/devel/p5-Eval-Closure/Makefile
+++ b/devel/p5-Eval-Closure/Makefile
@@ -13,8 +13,8 @@ COMMENT= Safely and cleanly create closures via string eval
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Try-Tiny>=0:lang/p5-Try-Tiny
TEST_DEPENDS= p5-Devel-LexAlias>=0.05:devel/p5-Devel-LexAlias \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-Eval-Context/Makefile b/devel/p5-Eval-Context/Makefile
index 2d1f72779593..47663fe7e975 100644
--- a/devel/p5-Eval-Context/Makefile
+++ b/devel/p5-Eval-Context/Makefile
@@ -15,12 +15,12 @@ COMMENT= Evaluate Perl code in context wrapper
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Package-Generator>=0:devel/p5-Package-Generator \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Package-Generator>=0:devel/p5-Package-Generator \
p5-Directory-Scratch-Structured>=0:devel/p5-Directory-Scratch-Structured \
p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
p5-Data-Compare>=0:devel/p5-Data-Compare \
p5-File-Slurp>=0:devel/p5-File-Slurp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-Test-Output>=0:devel/p5-Test-Output \
p5-Test-Warn>=0:devel/p5-Test-Warn
diff --git a/devel/p5-Event-ExecFlow/Makefile b/devel/p5-Event-ExecFlow/Makefile
index c809d9aa36f5..68e8e78b84ba 100644
--- a/devel/p5-Event-ExecFlow/Makefile
+++ b/devel/p5-Event-ExecFlow/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= API for complex flow controls with asynchronous execution of external programs
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Locale-libintl>=0:devel/p5-Locale-libintl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Event-Join/Makefile b/devel/p5-Event-Join/Makefile
index fa78c27d1a42..05f315d5a2d5 100644
--- a/devel/p5-Event-Join/Makefile
+++ b/devel/p5-Event-Join/Makefile
@@ -14,8 +14,8 @@ COMMENT= Join multiple "events" into one
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.94:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.94:devel/p5-Moose
TEST_DEPENDS= p5-Test-Exception>0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-Every/Makefile b/devel/p5-Every/Makefile
index 02676b1dac3f..9760d5238cb1 100644
--- a/devel/p5-Every/Makefile
+++ b/devel/p5-Every/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Return true every N cycles or S seconds
-BUILD_DEPENDS= p5-Devel-Callsite>=0.04:devel/p5-Devel-Callsite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Callsite>=0.04:devel/p5-Devel-Callsite
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Exception-Class/Makefile b/devel/p5-Exception-Class/Makefile
index 7e1d64d4b374..609a0dbedebb 100644
--- a/devel/p5-Exception-Class/Makefile
+++ b/devel/p5-Exception-Class/Makefile
@@ -13,9 +13,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Data-Inheritable>=0.02:devel/p5-Class-Data-Inheritable \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Data-Inheritable>=0.02:devel/p5-Class-Data-Inheritable \
p5-Devel-StackTrace>=2.00:devel/p5-Devel-StackTrace
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Expect-Simple/Makefile b/devel/p5-Expect-Simple/Makefile
index 9fa65b62c509..3731d69ac242 100644
--- a/devel/p5-Expect-Simple/Makefile
+++ b/devel/p5-Expect-Simple/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Wrapper around the Expect module
-BUILD_DEPENDS= p5-Expect>=0:lang/p5-Expect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Expect>=0:lang/p5-Expect
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-ExtUtils-CChecker/Makefile b/devel/p5-ExtUtils-CChecker/Makefile
index 08f1c03992eb..97bdfef346c7 100644
--- a/devel/p5-ExtUtils-CChecker/Makefile
+++ b/devel/p5-ExtUtils-CChecker/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-ExtUtils-CppGuess/Makefile b/devel/p5-ExtUtils-CppGuess/Makefile
index 4acd252130a6..fbff2c17286f 100644
--- a/devel/p5-ExtUtils-CppGuess/Makefile
+++ b/devel/p5-ExtUtils-CppGuess/Makefile
@@ -13,8 +13,8 @@ COMMENT= Guess C++ compiler and flags
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-ExtUtils-InstallPaths/Makefile b/devel/p5-ExtUtils-InstallPaths/Makefile
index 4c6e18180f69..cb2d68ddcfaa 100644
--- a/devel/p5-ExtUtils-InstallPaths/Makefile
+++ b/devel/p5-ExtUtils-InstallPaths/Makefile
@@ -13,8 +13,8 @@ COMMENT= Build.PL install path logic made easy
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-ExtUtils-Config>=0.002:devel/p5-ExtUtils-Config
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ExtUtils-Config>=0.002:devel/p5-ExtUtils-Config
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile b/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
index 8800424b9913..79958188aa64 100644
--- a/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
@@ -13,8 +13,8 @@ COMMENT= Cpanfile support for ExtUtils::MakeMaker
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-CPANfile>=0:devel/p5-Module-CPANfile
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-CPANfile>=0:devel/p5-Module-CPANfile
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
index 56bcb759ed02..bdb51cee0614 100644
--- a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
@@ -14,9 +14,9 @@ COMMENT= Add a Makefile target to determine test coverage using Devel::Cover
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-Cover>=0:devel/p5-Devel-Cover \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Cover>=0:devel/p5-Devel-Cover \
p5-Object-Accessor>=0:devel/p5-Object-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-FSA-Rules/Makefile b/devel/p5-FSA-Rules/Makefile
index ac88255bdb9a..e8173e54f130 100644
--- a/devel/p5-FSA-Rules/Makefile
+++ b/devel/p5-FSA-Rules/Makefile
@@ -14,9 +14,9 @@ COMMENT= Build simple rules-based state machines in Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-GraphViz>=2:graphics/p5-GraphViz \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GraphViz>=2:graphics/p5-GraphViz \
p5-Text-Tabs+Wrap>=0:textproc/p5-Text-Tabs+Wrap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-File-Attributes-Recursive/Makefile b/devel/p5-File-Attributes-Recursive/Makefile
index 120af826e107..c4a4f1ce9c80 100644
--- a/devel/p5-File-Attributes-Recursive/Makefile
+++ b/devel/p5-File-Attributes-Recursive/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Inherit file attributes from parent directories
-BUILD_DEPENDS= p5-Directory-Scratch>=0:devel/p5-Directory-Scratch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Directory-Scratch>=0:devel/p5-Directory-Scratch \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-File-Attributes>=0:devel/p5-File-Attributes
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-File-Attributes/Makefile b/devel/p5-File-Attributes/Makefile
index 7278298d42de..ae5f10b393ab 100644
--- a/devel/p5-File-Attributes/Makefile
+++ b/devel/p5-File-Attributes/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= File::Attributes - Manipulate file metadata
-BUILD_DEPENDS= p5-YAML>=0:textproc/p5-YAML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-YAML>=0:textproc/p5-YAML \
p5-Directory-Scratch>=0:devel/p5-Directory-Scratch \
p5-Best>=0:devel/p5-Best \
p5-YAML-Syck>0:textproc/p5-YAML-Syck
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-File-BOM/Makefile b/devel/p5-File-BOM/Makefile
index 53765763a7e6..8d728cc460ef 100644
--- a/devel/p5-File-BOM/Makefile
+++ b/devel/p5-File-BOM/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl module to handle Unicode byte order marks
LICENSE= ART10 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-Test-Exception>=0:devel/p5-Test-Exception
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-File-BaseDir/Makefile b/devel/p5-File-BaseDir/Makefile
index 83bf166aefcf..d0ca2d5524c3 100644
--- a/devel/p5-File-BaseDir/Makefile
+++ b/devel/p5-File-BaseDir/Makefile
@@ -13,8 +13,8 @@ COMMENT= Use the freedesktop basedir spec
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IPC-System-Simple>=0:devel/p5-IPC-System-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IPC-System-Simple>=0:devel/p5-IPC-System-Simple
TEST_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \
p5-Test-Pod>=1.00:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.00:devel/p5-Test-Pod-Coverage
diff --git a/devel/p5-File-Binary/Makefile b/devel/p5-File-Binary/Makefile
index eb06ee249146..9406ce1a97d4 100644
--- a/devel/p5-File-Binary/Makefile
+++ b/devel/p5-File-Binary/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to modify and read binary files
-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
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-File-ConfigDir/Makefile b/devel/p5-File-ConfigDir/Makefile
index 67355fd453c4..706c3866a309 100644
--- a/devel/p5-File-ConfigDir/Makefile
+++ b/devel/p5-File-ConfigDir/Makefile
@@ -13,11 +13,11 @@ COMMENT= Get directories of configuration files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-HomeDir>=0.50:devel/p5-File-HomeDir \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-HomeDir>=0.50:devel/p5-File-HomeDir \
p5-List-MoreUtils>=0.419:lang/p5-List-MoreUtils \
p5-List-MoreUtils-XS>=0.418:lang/p5-List-MoreUtils-XS \
p5-local-lib>=1.008008:devel/p5-local-lib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Without-Module>=0:devel/p5-Test-Without-Module
NO_ARCH= yes
diff --git a/devel/p5-File-CreationTime/Makefile b/devel/p5-File-CreationTime/Makefile
index 3bcadea61360..4a60be1ecf1f 100644
--- a/devel/p5-File-CreationTime/Makefile
+++ b/devel/p5-File-CreationTime/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Keeps track of file creation times
-BUILD_DEPENDS= p5-File-Attributes>=0:devel/p5-File-Attributes
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Attributes>=0:devel/p5-File-Attributes
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-File-DesktopEntry/Makefile b/devel/p5-File-DesktopEntry/Makefile
index 25a070cb182d..21066f37220a 100644
--- a/devel/p5-File-DesktopEntry/Makefile
+++ b/devel/p5-File-DesktopEntry/Makefile
@@ -13,8 +13,8 @@ COMMENT= Object to handle desktop files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-BaseDir>=0.03:devel/p5-File-BaseDir
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-BaseDir>=0.03:devel/p5-File-BaseDir
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-File-Dir-Dumper/Makefile b/devel/p5-File-Dir-Dumper/Makefile
index f4349708e756..88b9a970003f 100644
--- a/devel/p5-File-Dir-Dumper/Makefile
+++ b/devel/p5-File-Dir-Dumper/Makefile
@@ -12,12 +12,12 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= tolid@tolid.eu.org
COMMENT= Perl5 module to dump directory structures meta-data
-BUILD_DEPENDS= p5-File-Find-Object>0:devel/p5-File-Find-Object \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Find-Object>0:devel/p5-File-Find-Object \
p5-IO-String>0:devel/p5-IO-String \
p5-JSON>0:converters/p5-JSON \
p5-Class-Accessor>0:devel/p5-Class-Accessor \
p5-Devel-CheckOS>0:devel/p5-Devel-CheckOS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-File-Find-Object/Makefile b/devel/p5-File-Find-Object/Makefile
index 53870394d0ad..25e159d2a465 100644
--- a/devel/p5-File-Find-Object/Makefile
+++ b/devel/p5-File-Find-Object/Makefile
@@ -14,8 +14,8 @@ COMMENT= Object oriented File::Find replacement
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
index b9217c02e022..e273ee85073f 100644
--- a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
+++ b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
@@ -14,10 +14,10 @@ COMMENT= File::Find::Rule adapted to Filesys::Virtual
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-Filesys-Virtual>=0:devel/p5-Filesys-Virtual \
p5-Filesys-Virtual-Plain>=0:devel/p5-Filesys-Virtual-Plain
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-File-Find-Rule-Perl/Makefile b/devel/p5-File-Find-Rule-Perl/Makefile
index b8f7a539c23f..32e13d938acb 100644
--- a/devel/p5-File-Find-Rule-Perl/Makefile
+++ b/devel/p5-File-Find-Rule-Perl/Makefile
@@ -14,9 +14,9 @@ COMMENT= Common rules for searching for Perl things
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Find-Rule>=0.20:devel/p5-File-Find-Rule \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Find-Rule>=0.20:devel/p5-File-Find-Rule \
p5-Params-Util>=0.38:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-File-Find-Rule-VCS/Makefile b/devel/p5-File-Find-Rule-VCS/Makefile
index 0cf133e8d7c5..5699966596e4 100644
--- a/devel/p5-File-Find-Rule-VCS/Makefile
+++ b/devel/p5-File-Find-Rule-VCS/Makefile
@@ -14,9 +14,9 @@ COMMENT= Exclude files and directories for Version Control Systems
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Find-Rule>=0.20:devel/p5-File-Find-Rule \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Find-Rule>=0.20:devel/p5-File-Find-Rule \
p5-Text-Glob>=0.08:textproc/p5-Text-Glob
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-File-Flat/Makefile b/devel/p5-File-Flat/Makefile
index 700271ff7bed..52db4a8d2cba 100644
--- a/devel/p5-File-Flat/Makefile
+++ b/devel/p5-File-Flat/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Implements a flat filesystem
-BUILD_DEPENDS= p5-File-NCopy>=0:devel/p5-File-NCopy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-NCopy>=0:devel/p5-File-NCopy \
p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
p5-File-Remove>=0:devel/p5-File-Remove \
p5-Class-Autouse>=0:devel/p5-Class-Autouse \
p5-prefork>=0:devel/p5-prefork
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-ClassAPI>=0:devel/p5-Test-ClassAPI
USES= perl5
diff --git a/devel/p5-File-Flock/Makefile b/devel/p5-File-Flock/Makefile
index 571fd209b739..eff5d8400ee4 100644
--- a/devel/p5-File-Flock/Makefile
+++ b/devel/p5-File-Flock/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl5 module for file locking with flock
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util \
p5-IO-Event>=0.812:devel/p5-IO-Event
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Test-SharedFork>=0:devel/p5-Test-SharedFork
diff --git a/devel/p5-File-HomeDir-PathClass/Makefile b/devel/p5-File-HomeDir-PathClass/Makefile
index 5e832aac4af7..7bcb6b6d8492 100644
--- a/devel/p5-File-HomeDir-PathClass/Makefile
+++ b/devel/p5-File-HomeDir-PathClass/Makefile
@@ -13,10 +13,10 @@ COMMENT= File::HomeDir returning Path::Class objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-HomeDir>=0.93:devel/p5-File-HomeDir \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-HomeDir>=0.93:devel/p5-File-HomeDir \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/devel/p5-File-HomeDir/Makefile b/devel/p5-File-HomeDir/Makefile
index 3feb8398783c..2a278f8235f9 100644
--- a/devel/p5-File-HomeDir/Makefile
+++ b/devel/p5-File-HomeDir/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-Which>=0.05:sysutils/p5-File-Which
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Which>=0.05:sysutils/p5-File-Which
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-File-Map/Makefile b/devel/p5-File-Map/Makefile
index 27cf10821f09..87f6a04b9b81 100644
--- a/devel/p5-File-Map/Makefile
+++ b/devel/p5-File-Map/Makefile
@@ -13,9 +13,9 @@ COMMENT= Memory mapping made simple and safe
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PerlIO-Layers>=0:devel/p5-PerlIO-Layers \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PerlIO-Layers>=0:devel/p5-PerlIO-Layers \
p5-Sub-Exporter-Progressive>=0.001005:devel/p5-Sub-Exporter-Progressive
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Warnings>=0:devel/p5-Test-Warnings
diff --git a/devel/p5-File-MimeInfo/Makefile b/devel/p5-File-MimeInfo/Makefile
index 191eb5b82e3b..a583a18cb16e 100644
--- a/devel/p5-File-MimeInfo/Makefile
+++ b/devel/p5-File-MimeInfo/Makefile
@@ -13,9 +13,9 @@ COMMENT= Determine file type
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-BaseDir>=0.03:devel/p5-File-BaseDir \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-BaseDir>=0.03:devel/p5-File-BaseDir \
p5-File-DesktopEntry>=0.04:devel/p5-File-DesktopEntry
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-File-Modified/Makefile b/devel/p5-File-Modified/Makefile
index 7f346e2c0ac0..b9c675acc5b1 100644
--- a/devel/p5-File-Modified/Makefile
+++ b/devel/p5-File-Modified/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl module for checking intelligently if files have changed
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-File-Pid/Makefile b/devel/p5-File-Pid/Makefile
index 49887fb0ef81..2f3243d49a39 100644
--- a/devel/p5-File-Pid/Makefile
+++ b/devel/p5-File-Pid/Makefile
@@ -14,8 +14,8 @@ COMMENT= Pid File Manipulation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-File-Policy/Makefile b/devel/p5-File-Policy/Makefile
index 3f8896551f7b..6d2460244b37 100644
--- a/devel/p5-File-Policy/Makefile
+++ b/devel/p5-File-Policy/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple policy for file I/O functions
-BUILD_DEPENDS= p5-Log-Trace>0:devel/p5-Log-Trace \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Trace>0:devel/p5-Log-Trace \
p5-File-Slurp>0:devel/p5-File-Slurp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Assertions>0:devel/p5-Test-Assertions
USES= perl5
diff --git a/devel/p5-File-Random/Makefile b/devel/p5-File-Random/Makefile
index 398caf4bc765..92b7c7e82df8 100644
--- a/devel/p5-File-Random/Makefile
+++ b/devel/p5-File-Random/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl module for random selecting of a file
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Set-Scalar>0:devel/p5-Set-Scalar \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Set-Scalar>0:devel/p5-Set-Scalar \
p5-Want>=0:devel/p5-Want
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Class>=0.03:devel/p5-Test-Class \
p5-Test-Differences>=0.43:devel/p5-Test-Differences \
p5-Test-Exception>0.1:devel/p5-Test-Exception \
diff --git a/devel/p5-File-SearchPath/Makefile b/devel/p5-File-SearchPath/Makefile
index c07ad6bdb458..fa86670e8a4e 100644
--- a/devel/p5-File-SearchPath/Makefile
+++ b/devel/p5-File-SearchPath/Makefile
@@ -11,8 +11,8 @@ COMMENT= Search for a file in an environment variable path
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Env-Path>=0:devel/p5-Env-Path
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Env-Path>=0:devel/p5-Env-Path
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-File-Share/Makefile b/devel/p5-File-Share/Makefile
index 03dc1503882e..a2279eefc457 100644
--- a/devel/p5-File-Share/Makefile
+++ b/devel/p5-File-Share/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-ShareDir>=1.03:devel/p5-File-ShareDir
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-ShareDir>=1.03:devel/p5-File-ShareDir
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-File-ShareDir-PAR/Makefile b/devel/p5-File-ShareDir-PAR/Makefile
index 87eb8d0c5c91..7fb7d3751bd2 100644
--- a/devel/p5-File-ShareDir-PAR/Makefile
+++ b/devel/p5-File-ShareDir-PAR/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl5 File::ShareDir module with PAR support
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Inspector>=0:devel/p5-Class-Inspector \
p5-File-ShareDir>=0:devel/p5-File-ShareDir \
p5-PAR>=0:devel/p5-PAR \
p5-Params-Util>=0:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-File-ShareDir-PathClass/Makefile b/devel/p5-File-ShareDir-PathClass/Makefile
index 9be5ca903c8c..8070eeff128c 100644
--- a/devel/p5-File-ShareDir-PathClass/Makefile
+++ b/devel/p5-File-ShareDir-PathClass/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
COMMENT= File::ShareDir returning Path::Class objects
-BUILD_DEPENDS= p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-ShareDir>=0:devel/p5-File-ShareDir \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-File-ShareDir/Makefile b/devel/p5-File-ShareDir/Makefile
index 7129923919d6..db3944fb12c8 100644
--- a/devel/p5-File-ShareDir/Makefile
+++ b/devel/p5-File-ShareDir/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Inspector>=1.12:devel/p5-Class-Inspector
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Inspector>=1.12:devel/p5-Class-Inspector
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-File-Slurp-Tree/Makefile b/devel/p5-File-Slurp-Tree/Makefile
index 22696975fb68..053ac932d1ce 100644
--- a/devel/p5-File-Slurp-Tree/Makefile
+++ b/devel/p5-File-Slurp-Tree/Makefile
@@ -14,9 +14,9 @@ COMMENT= Slurp and emit file trees as nested hashes
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-Slurp>=0:devel/p5-File-Slurp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-File-Tail-Scribe/Makefile b/devel/p5-File-Tail-Scribe/Makefile
index 0d560f0bcd20..38e0eaf4050a 100644
--- a/devel/p5-File-Tail-Scribe/Makefile
+++ b/devel/p5-File-Tail-Scribe/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl Module to tail file to Scribe server
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Tail-Dir>=0:devel/p5-File-Tail-Dir \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Tail-Dir>=0:devel/p5-File-Tail-Dir \
p5-Log-Dispatch-Scribe>=0:devel/p5-Log-Dispatch-Scribe \
p5-Moose>=0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject
USES= perl5
diff --git a/devel/p5-File-Write-Rotate/Makefile b/devel/p5-File-Write-Rotate/Makefile
index 06402a1696f9..2d5c9911936e 100644
--- a/devel/p5-File-Write-Rotate/Makefile
+++ b/devel/p5-File-Write-Rotate/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-Flock-Retry>=0:devel/p5-File-Flock-Retry \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Flock-Retry>=0:devel/p5-File-Flock-Retry \
p5-Proc-PID-File>=0:devel/p5-Proc-PID-File
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Slurper>=0:devel/p5-File-Slurper \
p5-File-chdir>=0:devel/p5-File-chdir \
p5-Taint-Runtime>=0:devel/p5-Taint-Runtime \
diff --git a/devel/p5-Filesys-Virtual-Plain/Makefile b/devel/p5-Filesys-Virtual-Plain/Makefile
index cc3b2b1a36ef..a62b8d5151e3 100644
--- a/devel/p5-Filesys-Virtual-Plain/Makefile
+++ b/devel/p5-Filesys-Virtual-Plain/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Plain virtual filesystem
-BUILD_DEPENDS= p5-Filesys-Virtual>=0.05:devel/p5-Filesys-Virtual
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Filesys-Virtual>=0.05:devel/p5-Filesys-Virtual
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Filter-Template/Makefile b/devel/p5-Filter-Template/Makefile
index caa56a9e563c..9dfa766f11b8 100644
--- a/devel/p5-Filter-Template/Makefile
+++ b/devel/p5-Filter-Template/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Source filter for inline code templates (macros)
-BUILD_DEPENDS= p5-Filter>=0:devel/p5-Filter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Filter>=0:devel/p5-Filter
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Forest/Makefile b/devel/p5-Forest/Makefile
index f2e18877e9e9..30e7076fcc6e 100644
--- a/devel/p5-Forest/Makefile
+++ b/devel/p5-Forest/Makefile
@@ -15,9 +15,9 @@ COMMENT= Collection of n-ary tree related modules
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=2:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=2:devel/p5-Moose \
p5-MooseX-Clone>=0.05:devel/p5-MooseX-Clone
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Path-Class>=0:devel/p5-Path-Class \
p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/devel/p5-Form-Sensible/Makefile b/devel/p5-Form-Sensible/Makefile
index 46960de55e76..d2df3510bcd5 100644
--- a/devel/p5-Form-Sensible/Makefile
+++ b/devel/p5-Form-Sensible/Makefile
@@ -13,14 +13,14 @@ COMMENT= Sensible way to handle form based user interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Format-Natural>=0:devel/p5-DateTime-Format-Natural \
p5-DateTime-Set>=0:devel/p5-DateTime-Set \
p5-File-ShareDir>=0:devel/p5-File-ShareDir \
p5-Moose>=2:devel/p5-Moose \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Geo-JSON/Makefile b/devel/p5-Geo-JSON/Makefile
index f1b7c50a524b..9ff2e43b66cd 100644
--- a/devel/p5-Geo-JSON/Makefile
+++ b/devel/p5-Geo-JSON/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl OO interface for geojson
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON \
p5-Moo>=1.004003:devel/p5-Moo \
p5-Type-Tiny>=0:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Class-Load>=0:devel/p5-Class-Load \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
diff --git a/devel/p5-Geo-ShapeFile/Makefile b/devel/p5-Geo-ShapeFile/Makefile
index 7f791022a2f8..768265d47ad6 100644
--- a/devel/p5-Geo-ShapeFile/Makefile
+++ b/devel/p5-Geo-ShapeFile/Makefile
@@ -13,9 +13,9 @@ COMMENT= Extension for handling ESRI GIS Shapefiles
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tree-R>0:devel/p5-Tree-R \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tree-R>0:devel/p5-Tree-R \
p5-autovivification>0:devel/p5-autovivification
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= dos2unix perl5
diff --git a/devel/p5-Getargs-Long/Makefile b/devel/p5-Getargs-Long/Makefile
index 51781346de06..b3a1d826fe65 100644
--- a/devel/p5-Getargs-Long/Makefile
+++ b/devel/p5-Getargs-Long/Makefile
@@ -13,9 +13,9 @@ COMMENT= Parse routine arguments
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Agent>=0.105:devel/p5-Log-Agent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Agent>=0.105:devel/p5-Log-Agent \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Compile>=0:devel/p5-Test-Compile
USES= perl5
diff --git a/devel/p5-Getopt-Compact-WithCmd/Makefile b/devel/p5-Getopt-Compact-WithCmd/Makefile
index 95f622c39f0f..1f00160c2c3d 100644
--- a/devel/p5-Getopt-Compact-WithCmd/Makefile
+++ b/devel/p5-Getopt-Compact-WithCmd/Makefile
@@ -14,8 +14,8 @@ COMMENT= Sub-command friendly, like Getopt::Compact
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Text-Table>=0:textproc/p5-Text-Table
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Table>=0:textproc/p5-Text-Table
TEST_DEPENDS= p5-Test-Output>=0:devel/p5-Test-Output \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-Getopt-Long-Descriptive/Makefile b/devel/p5-Getopt-Long-Descriptive/Makefile
index 82ce4ecad85a..12e061d99fac 100644
--- a/devel/p5-Getopt-Long-Descriptive/Makefile
+++ b/devel/p5-Getopt-Long-Descriptive/Makefile
@@ -14,9 +14,9 @@ COMMENT= Getopt::Long with usage text
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Params-Validate>=0.97:devel/p5-Params-Validate \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Validate>=0.97:devel/p5-Params-Validate \
p5-Sub-Exporter>=0.972:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Warnings>=0.005:devel/p5-Test-Warnings
diff --git a/devel/p5-Git-PurePerl/Makefile b/devel/p5-Git-PurePerl/Makefile
index c2771f7c83aa..3bb152e593e9 100644
--- a/devel/p5-Git-PurePerl/Makefile
+++ b/devel/p5-Git-PurePerl/Makefile
@@ -13,7 +13,8 @@ COMMENT= Pure Perl interface to Git repositories
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
p5-Config-GitLike>=0:devel/p5-Config-GitLike \
p5-Data-Stream-Bulk>=0:devel/p5-Data-Stream-Bulk \
p5-DateTime>=0:devel/p5-DateTime \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-utf8>=0:devel/p5-Test-utf8
USES= perl5
diff --git a/devel/p5-Git-Repository-Plugin-Log/Makefile b/devel/p5-Git-Repository-Plugin-Log/Makefile
index 7c5b7eb49af2..44e56202d136 100644
--- a/devel/p5-Git-Repository-Plugin-Log/Makefile
+++ b/devel/p5-Git-Repository-Plugin-Log/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Git-Repository>=1.309:devel/p5-Git-Repository
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Git-Repository>=1.309:devel/p5-Git-Repository
TEST_DEPENDS= p5-Test-Requires-Git>=0:devel/p5-Test-Requires-Git
NO_ARCH= yes
diff --git a/devel/p5-Git-Repository/Makefile b/devel/p5-Git-Repository/Makefile
index 02d64cd947d5..0b920d69d028 100644
--- a/devel/p5-Git-Repository/Makefile
+++ b/devel/p5-Git-Repository/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= git:devel/git \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= git:devel/git \
p5-Git-Version-Compare>=1.001:devel/p5-Git-Version-Compare \
p5-System-Command>=1.118:devel/p5-System-Command \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Requires-Git>=1.005:devel/p5-Test-Requires-Git
NO_ARCH= yes
diff --git a/devel/p5-Git-Sub/Makefile b/devel/p5-Git-Sub/Makefile
index 9c17e3295fe8..60eb880b6552 100644
--- a/devel/p5-Git-Sub/Makefile
+++ b/devel/p5-Git-Sub/Makefile
@@ -13,9 +13,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \
p5-System-Sub>=0.162800:devel/p5-System-Sub
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile
index a9fa2b13db12..e487c022e902 100644
--- a/devel/p5-Glib2/Makefile
+++ b/devel/p5-Glib2/Makefile
@@ -15,9 +15,9 @@ COMMENT= This module provides access to Glib and GObject libraries
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-ExtUtils-Depends>=0.300:devel/p5-ExtUtils-Depends \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ExtUtils-Depends>=0.300:devel/p5-ExtUtils-Depends \
p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_GNOME= glib20
USES= perl5
diff --git a/devel/p5-Google-ProtocolBuffers/Makefile b/devel/p5-Google-ProtocolBuffers/Makefile
index b7d06e4f20dc..8dd7f7cf4d4c 100644
--- a/devel/p5-Google-ProtocolBuffers/Makefile
+++ b/devel/p5-Google-ProtocolBuffers/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple interface to Google Protocol Buffers
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-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Gravatar-URL/Makefile b/devel/p5-Gravatar-URL/Makefile
index 8e500ca0148d..be510ed82afe 100644
--- a/devel/p5-Gravatar-URL/Makefile
+++ b/devel/p5-Gravatar-URL/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Make URLs for Gravatars from an email address
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Warn>=0:devel/p5-Test-Warn
diff --git a/devel/p5-HOP-Lexer/Makefile b/devel/p5-HOP-Lexer/Makefile
index 63c2a426d4ee..46db460a2810 100644
--- a/devel/p5-HOP-Lexer/Makefile
+++ b/devel/p5-HOP-Lexer/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= Higher Order Perl Lexer
-BUILD_DEPENDS= p5-HOP-Stream>=0.01:devel/p5-HOP-Stream
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HOP-Stream>=0.01:devel/p5-HOP-Stream
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Hash-AutoHash-Args/Makefile b/devel/p5-Hash-AutoHash-Args/Makefile
index 2e6cb692c5d5..c8ff9b061377 100644
--- a/devel/p5-Hash-AutoHash-Args/Makefile
+++ b/devel/p5-Hash-AutoHash-Args/Makefile
@@ -14,8 +14,8 @@ COMMENT= Object-oriented processing of keyword-based argument lists
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Hash-AutoHash>=1.17:devel/p5-Hash-AutoHash
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Hash-AutoHash>=1.17:devel/p5-Hash-AutoHash
TEST_DEPENDS= p5-Test-Deep>=0.110:devel/p5-Test-Deep \
p5-Test-Pod>=1.48:devel/p5-Test-Pod
diff --git a/devel/p5-Hash-AutoHash/Makefile b/devel/p5-Hash-AutoHash/Makefile
index c109e9d05590..2eb696852ca0 100644
--- a/devel/p5-Hash-AutoHash/Makefile
+++ b/devel/p5-Hash-AutoHash/Makefile
@@ -14,9 +14,9 @@ COMMENT= Object-oriented access to real and tied hashes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-List-MoreUtils>=0.33:lang/p5-List-MoreUtils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-MoreUtils>=0.33:lang/p5-List-MoreUtils \
p5-Tie-ToObject>=0.03:devel/p5-Tie-ToObject
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0.11:devel/p5-Test-Deep \
p5-Tie-Hash-MultiValue>=1.02:devel/p5-Tie-Hash-MultiValue
diff --git a/devel/p5-Hash-Case/Makefile b/devel/p5-Hash-Case/Makefile
index 5561b4655cfe..454a64290e0e 100644
--- a/devel/p5-Hash-Case/Makefile
+++ b/devel/p5-Hash-Case/Makefile
@@ -15,8 +15,8 @@ COMMENT= Base class for hashes with key-casing requirements
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Report>=0.26:devel/p5-Log-Report
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Report>=0.26:devel/p5-Log-Report
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Hash-Objectify/Makefile b/devel/p5-Hash-Objectify/Makefile
index da373653c573..764ba8a7b0e3 100644
--- a/devel/p5-Hash-Objectify/Makefile
+++ b/devel/p5-Hash-Objectify/Makefile
@@ -13,8 +13,8 @@ COMMENT= Create objects from hashes on the fly
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-Hash-Slice/Makefile b/devel/p5-Hash-Slice/Makefile
index da6f5e0940ba..95248d3b9e62 100644
--- a/devel/p5-Hash-Slice/Makefile
+++ b/devel/p5-Hash-Slice/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Make a hash from a deep slice of another hash
-BUILD_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
p5-Clone>=0.09:devel/p5-Clone
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Most>=0:devel/p5-Test-Most
USES= perl5
diff --git a/devel/p5-Heap-Simple-Perl/Makefile b/devel/p5-Heap-Simple-Perl/Makefile
index acd880705d5d..43c1e5364db1 100644
--- a/devel/p5-Heap-Simple-Perl/Makefile
+++ b/devel/p5-Heap-Simple-Perl/Makefile
@@ -14,8 +14,8 @@ COMMENT= Pure perl implementation of the Heap::Simple interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Heap-Simple>=0:devel/p5-Heap-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Heap-Simple>=0:devel/p5-Heap-Simple
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Heap-Simple-XS/Makefile b/devel/p5-Heap-Simple-XS/Makefile
index 3e91400ca587..7e725b9f15c0 100644
--- a/devel/p5-Heap-Simple-XS/Makefile
+++ b/devel/p5-Heap-Simple-XS/Makefile
@@ -14,8 +14,8 @@ COMMENT= XS implementation of the Heap::Simple interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Heap-Simple>=0:devel/p5-Heap-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Heap-Simple>=0:devel/p5-Heap-Simple
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-IO-All-LWP/Makefile b/devel/p5-IO-All-LWP/Makefile
index d38206d82e0f..6d4d8edb987d 100644
--- a/devel/p5-IO-All-LWP/Makefile
+++ b/devel/p5-IO-All-LWP/Makefile
@@ -14,9 +14,9 @@ COMMENT= IO::All interface to LWP
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-All>=0.30:devel/p5-IO-All \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-All>=0.30:devel/p5-IO-All \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5 shebangfix
diff --git a/devel/p5-IO-All/Makefile b/devel/p5-IO-All/Makefile
index 30ac7e01a3e5..6a8119c8e15a 100644
--- a/devel/p5-IO-All/Makefile
+++ b/devel/p5-IO-All/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-ReadBackwards>=0:devel/p5-File-ReadBackwards \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-ReadBackwards>=0:devel/p5-File-ReadBackwards \
p5-IO-String>=1.08:devel/p5-IO-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-MimeInfo>=0:devel/p5-File-MimeInfo \
p5-MLDBM>=0:databases/p5-MLDBM
diff --git a/devel/p5-IO-Any/Makefile b/devel/p5-IO-Any/Makefile
index 4bc2c15f7bc0..46a35947fc0b 100644
--- a/devel/p5-IO-Any/Makefile
+++ b/devel/p5-IO-Any/Makefile
@@ -14,11 +14,11 @@ COMMENT= IO::Any opens anything
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-IO-String>=0:devel/p5-IO-String \
p5-IO-stringy>=0:devel/p5-IO-stringy \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Test-Differences>=0:devel/p5-Test-Differences \
p5-Test-Distribution>=0:devel/p5-Test-Distribution \
diff --git a/devel/p5-IO-Async/Makefile b/devel/p5-IO-Async/Makefile
index bd33aff7c2b2..6a321627bfcc 100644
--- a/devel/p5-IO-Async/Makefile
+++ b/devel/p5-IO-Async/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Future>=0.33:devel/p5-Future \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Future>=0.33:devel/p5-Future \
p5-Struct-Dumb>0:devel/p5-Struct-Dumb
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Identity>=0:devel/p5-Test-Identity \
p5-Test-Pod>=1:devel/p5-Test-Pod \
diff --git a/devel/p5-IO-Digest/Makefile b/devel/p5-IO-Digest/Makefile
index b5eaaf455a10..f895c93ff6aa 100644
--- a/devel/p5-IO-Digest/Makefile
+++ b/devel/p5-IO-Digest/Makefile
@@ -14,8 +14,8 @@ COMMENT= Calculate digests while reading or writing
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PerlIO-via-dynamic>=0:devel/p5-PerlIO-via-dynamic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PerlIO-via-dynamic>=0:devel/p5-PerlIO-via-dynamic
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-IO-Event/Makefile b/devel/p5-IO-Event/Makefile
index 83a4365241e3..8b073babed78 100644
--- a/devel/p5-IO-Event/Makefile
+++ b/devel/p5-IO-Event/Makefile
@@ -14,8 +14,8 @@ COMMENT= Tied Filehandles for Nonblocking IO with Object Callbacks
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
TEST_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent
OPTIONS_DEFINE= ANYEVENT EVENT
diff --git a/devel/p5-IO-Pager/Makefile b/devel/p5-IO-Pager/Makefile
index 8bd081427c89..30aba40bf7c8 100644
--- a/devel/p5-IO-Pager/Makefile
+++ b/devel/p5-IO-Pager/Makefile
@@ -13,8 +13,8 @@ COMMENT= Select a pager, optionally pipe it output if destination is a TTY
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-IO-Prompt/Makefile b/devel/p5-IO-Prompt/Makefile
index e7844e560532..bb032c3a2ffe 100644
--- a/devel/p5-IO-Prompt/Makefile
+++ b/devel/p5-IO-Prompt/Makefile
@@ -13,9 +13,9 @@ COMMENT= Interactively prompt for user input
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Term-ReadKey>0:devel/p5-Term-ReadKey \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ReadKey>0:devel/p5-Term-ReadKey \
p5-Want>0:devel/p5-Want
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-IO-Prompter/Makefile b/devel/p5-IO-Prompter/Makefile
index 0ef643f74dd1..76ea156dc20b 100644
--- a/devel/p5-IO-Prompter/Makefile
+++ b/devel/p5-IO-Prompter/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= zi@FreeBSD.org
COMMENT= Prompt for input, read it, clean it, return it
-BUILD_DEPENDS= p5-Contextual-Return>0:devel/p5-Contextual-Return
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Contextual-Return>0:devel/p5-Contextual-Return
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-IO-Pty-Easy/Makefile b/devel/p5-IO-Pty-Easy/Makefile
index 7a1616f06066..edd596da23d4 100644
--- a/devel/p5-IO-Pty-Easy/Makefile
+++ b/devel/p5-IO-Pty-Easy/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-IO-Tty>=0:devel/p5-IO-Tty
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Tty>=0:devel/p5-IO-Tty
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-IO-YAML/Makefile b/devel/p5-IO-YAML/Makefile
index 1aafe87f7244..0693de2883a8 100644
--- a/devel/p5-IO-YAML/Makefile
+++ b/devel/p5-IO-YAML/Makefile
@@ -13,9 +13,9 @@ COMMENT= Read and write YAML streams incrementally
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-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-IOC/Makefile b/devel/p5-IOC/Makefile
index 48c2645a9b8a..85fcb5d8956a 100644
--- a/devel/p5-IOC/Makefile
+++ b/devel/p5-IOC/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Lightweight IOC (Inversion of Control) framework
-BUILD_DEPENDS= p5-Class-Throwable>=0:devel/p5-Class-Throwable \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Throwable>=0:devel/p5-Class-Throwable \
p5-XML-SAX>=0:textproc/p5-XML-SAX \
p5-Class-StrongSingleton>=0:devel/p5-Class-StrongSingleton \
p5-Class-Interfaces>=0:devel/p5-Class-Interfaces
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-IPC-Cache/Makefile b/devel/p5-IPC-Cache/Makefile
index 868ac7a70a48..9c6a3942aac0 100644
--- a/devel/p5-IPC-Cache/Makefile
+++ b/devel/p5-IPC-Cache/Makefile
@@ -13,8 +13,8 @@ COMMENT= Persist data across processes via shared memory
LICENSE= GPLv1
-BUILD_DEPENDS= p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-IPC-DirQueue/Makefile b/devel/p5-IPC-DirQueue/Makefile
index bb2b013c5251..e97e1a79995b 100644
--- a/devel/p5-IPC-DirQueue/Makefile
+++ b/devel/p5-IPC-DirQueue/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= IPC::DirQueue - disk-based many-to-many task queue
-BUILD_DEPENDS= p5-POE>0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>0:devel/p5-POE
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-IPC-Mmap-Share/Makefile b/devel/p5-IPC-Mmap-Share/Makefile
index 9bac4bbf726d..3280ca363de9 100644
--- a/devel/p5-IPC-Mmap-Share/Makefile
+++ b/devel/p5-IPC-Mmap-Share/Makefile
@@ -14,8 +14,8 @@ COMMENT= Safely share structures among processes using anonymous mmap
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IPC-Mmap>=0:devel/p5-IPC-Mmap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IPC-Mmap>=0:devel/p5-IPC-Mmap
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-IPC-PubSub/Makefile b/devel/p5-IPC-PubSub/Makefile
index c45c21839a33..02ff41daae8c 100644
--- a/devel/p5-IPC-PubSub/Makefile
+++ b/devel/p5-IPC-PubSub/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Interprocess Publish/Subscribe channels
-BUILD_DEPENDS= p5-DBM-Deep>=1:databases/p5-DBM-Deep \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBM-Deep>=1:databases/p5-DBM-Deep \
p5-Class-Accessor>0:devel/p5-Class-Accessor \
p5-Data-UUID>0:devel/p5-Data-UUID
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-IPC-Run/Makefile b/devel/p5-IPC-Run/Makefile
index 95211fb61db8..c350be14705f 100644
--- a/devel/p5-IPC-Run/Makefile
+++ b/devel/p5-IPC-Run/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-IO-Tty>=1.08:devel/p5-IO-Tty
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Tty>=1.08:devel/p5-IO-Tty
TEST_DEPENDS= p5-Readonly>=0:devel/p5-Readonly
NO_ARCH= yes
diff --git a/devel/p5-IPC-SharedCache/Makefile b/devel/p5-IPC-SharedCache/Makefile
index 5f058c17fcc0..e49019e7baaf 100644
--- a/devel/p5-IPC-SharedCache/Makefile
+++ b/devel/p5-IPC-SharedCache/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module for managing a SysV IPC shared memory cache
-BUILD_DEPENDS= p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-IPC-ShellCmd/Makefile b/devel/p5-IPC-ShellCmd/Makefile
index 845b9edc6968..09bf527478b0 100644
--- a/devel/p5-IPC-ShellCmd/Makefile
+++ b/devel/p5-IPC-ShellCmd/Makefile
@@ -15,9 +15,9 @@ COMMENT= Run a command with a given environment and capture output
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
sudo:security/sudo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Import-Base/Makefile b/devel/p5-Import-Base/Makefile
index 19b2639eebae..0b4eb4a92f77 100644
--- a/devel/p5-Import-Base/Makefile
+++ b/devel/p5-Import-Base/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Import-Into>=1.002005:devel/p5-Import-Into \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Import-Into>=1.002005:devel/p5-Import-Into \
p5-Module-Runtime>=0:devel/p5-Module-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Dancer2-Plugin-Ajax>=0:www/p5-Dancer2-Plugin-Ajax \
p5-Dancer2>=0:www/p5-Dancer2 \
p5-Moo>=0:devel/p5-Moo
diff --git a/devel/p5-Import-Into/Makefile b/devel/p5-Import-Into/Makefile
index 3b94aee3e1a9..446ac10b6559 100644
--- a/devel/p5-Import-Into/Makefile
+++ b/devel/p5-Import-Into/Makefile
@@ -15,8 +15,8 @@ COMMENT= Import packages into other packages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Runtime>=0:devel/p5-Module-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Runtime>=0:devel/p5-Module-Runtime
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Inline-ASM/Makefile b/devel/p5-Inline-ASM/Makefile
index 47343ef4bed7..61246bcef541 100644
--- a/devel/p5-Inline-ASM/Makefile
+++ b/devel/p5-Inline-ASM/Makefile
@@ -14,8 +14,8 @@ COMMENT= Write Perl Subroutines in assembler
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline-C>=0.42:devel/p5-Inline-C
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline-C>=0.42:devel/p5-Inline-C
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Inline-Filters/Makefile b/devel/p5-Inline-Filters/Makefile
index 601d1dcd28f3..3411e9d95e01 100644
--- a/devel/p5-Inline-Filters/Makefile
+++ b/devel/p5-Inline-Filters/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Inline>=0.42:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0.42:devel/p5-Inline \
p5-Inline-C>=0.76:devel/p5-Inline-C
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index a2dac8869ef6..de07ac7ef745 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -13,9 +13,9 @@ COMMENT= Write Perl subroutines and classes in Java
LICENSE= ARTPERL10
-BUILD_DEPENDS= p5-Inline>=0.68:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0.68:devel/p5-Inline \
p5-Inline-C>=0.62:devel/p5-Inline-C
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/devel/p5-Inline-Python/Makefile b/devel/p5-Inline-Python/Makefile
index 16cd55d4e1d0..cb6d88ad9269 100644
--- a/devel/p5-Inline-Python/Makefile
+++ b/devel/p5-Inline-Python/Makefile
@@ -13,8 +13,8 @@ COMMENT= Write Perl Subroutines in Python
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline>=0.46:devel/p5-Inline
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0.46:devel/p5-Inline
TEST_DEPENDS= p5-Proc-ProcessTable>=0.53:devel/p5-Proc-ProcessTable \
p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
diff --git a/devel/p5-Inline-TT/Makefile b/devel/p5-Inline-TT/Makefile
index 00918d7f6e1d..0b3e0cf8c384 100644
--- a/devel/p5-Inline-TT/Makefile
+++ b/devel/p5-Inline-TT/Makefile
@@ -14,9 +14,9 @@ COMMENT= Provides inline support for template toolkit 2.x
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline>=0.42:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0.42:devel/p5-Inline \
p5-Template-Toolkit>=2:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Inline-Tcl/Makefile b/devel/p5-Inline-Tcl/Makefile
index b7541f8c8c90..3c8a9361e38a 100644
--- a/devel/p5-Inline-Tcl/Makefile
+++ b/devel/p5-Inline-Tcl/Makefile
@@ -13,8 +13,8 @@ COMMENT= Write Perl subroutines in Tcl
LICENSE= ARTPERL10
-BUILD_DEPENDS= p5-Inline>=0:devel/p5-Inline
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0:devel/p5-Inline
USES= perl5 tcl
USE_PERL5= configure
diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile
index a9174a3e22af..9efff79b2868 100644
--- a/devel/p5-Inline/Makefile
+++ b/devel/p5-Inline/Makefile
@@ -14,8 +14,8 @@ COMMENT= Write Perl subroutines in other programming languages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Parse-RecDescent>=1.800:devel/p5-Parse-RecDescent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Parse-RecDescent>=1.800:devel/p5-Parse-RecDescent
TEST_DEPENDS= p5-Inline-Files>=0:devel/p5-Inline-Files \
p5-Test-Warn>=0.23:devel/p5-Test-Warn
diff --git a/devel/p5-InlineX-C2XS/Makefile b/devel/p5-InlineX-C2XS/Makefile
index ed91f54b5dc0..b7d2aa06cafd 100644
--- a/devel/p5-InlineX-C2XS/Makefile
+++ b/devel/p5-InlineX-C2XS/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module to create an XS file from an Inline C file
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline-C>=0.54:devel/p5-Inline-C
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline-C>=0.54:devel/p5-Inline-C
TEST_DEPENDS= p5-Test-Warn>=0.23:devel/p5-Test-Warn
NO_ARCH= yes
diff --git a/devel/p5-InlineX-CPP2XS/Makefile b/devel/p5-InlineX-CPP2XS/Makefile
index 73b8b4b04c10..d6876d49c03c 100644
--- a/devel/p5-InlineX-CPP2XS/Makefile
+++ b/devel/p5-InlineX-CPP2XS/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert from Inline C++ code to XS
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline>=0.50:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0.50:devel/p5-Inline \
p5-Inline-CPP>=0.39:devel/p5-Inline-CPP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Warn>=0.24:devel/p5-Test-Warn
NO_ARCH= yes
diff --git a/devel/p5-Input-Validator/Makefile b/devel/p5-Input-Validator/Makefile
index 267fa09ffbda..afd651d3b020 100644
--- a/devel/p5-Input-Validator/Makefile
+++ b/devel/p5-Input-Validator/Makefile
@@ -13,9 +13,9 @@ COMMENT= Input validator that just validates input
LICENSE= ART20
-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-String-CamelCase>=0:textproc/p5-String-CamelCase
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Iodef-Pb-Simple/Makefile b/devel/p5-Iodef-Pb-Simple/Makefile
index 6efff6a841ae..be00980ccd32 100644
--- a/devel/p5-Iodef-Pb-Simple/Makefile
+++ b/devel/p5-Iodef-Pb-Simple/Makefile
@@ -14,7 +14,8 @@ COMMENT= Perl extension providing high level API access to Iodef-Pb
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0.34:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.34:devel/p5-Class-Accessor \
p5-Compress-Snappy>=0.18:archivers/p5-Compress-Snappy \
p5-DateTime>=0.61:devel/p5-DateTime \
p5-DateTime-Format-DateParse>=0.05:devel/p5-DateTime-Format-DateParse \
@@ -29,7 +30,6 @@ BUILD_DEPENDS= p5-Class-Accessor>=0.34:devel/p5-Class-Accessor \
p5-Regexp-Common-net-CIDR>=0.02:textproc/p5-Regexp-Common-net-CIDR \
p5-Snort-Rule>=1.07:security/p5-Snort-Rule \
p5-Text-Table>=1.126:textproc/p5-Text-Table
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Iterator-IO/Makefile b/devel/p5-Iterator-IO/Makefile
index b074ad6557c9..d9d8ab89a04b 100644
--- a/devel/p5-Iterator-IO/Makefile
+++ b/devel/p5-Iterator-IO/Makefile
@@ -14,8 +14,8 @@ COMMENT= Filesystem and stream iterators
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Iterator>=0:devel/p5-Iterator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Iterator>=0:devel/p5-Iterator
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Iterator-Misc/Makefile b/devel/p5-Iterator-Misc/Makefile
index 26f53574de95..cc23f85f780e 100644
--- a/devel/p5-Iterator-Misc/Makefile
+++ b/devel/p5-Iterator-Misc/Makefile
@@ -14,8 +14,8 @@ COMMENT= Miscellaneous iterator functions
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Iterator>=0:devel/p5-Iterator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Iterator>=0:devel/p5-Iterator
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Iterator-Util/Makefile b/devel/p5-Iterator-Util/Makefile
index d99f7736b29d..3481406c3657 100644
--- a/devel/p5-Iterator-Util/Makefile
+++ b/devel/p5-Iterator-Util/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Essential utilities for the Iterator class
-BUILD_DEPENDS= p5-Iterator>=0:devel/p5-Iterator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Iterator>=0:devel/p5-Iterator
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Iterator/Makefile b/devel/p5-Iterator/Makefile
index 4ccde0a71ec3..54928d02c6b3 100644
--- a/devel/p5-Iterator/Makefile
+++ b/devel/p5-Iterator/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= General-purpose iterator class
-BUILD_DEPENDS= p5-Exception-Class>=0:devel/p5-Exception-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exception-Class>=0:devel/p5-Exception-Class
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-JIRA-REST/Makefile b/devel/p5-JIRA-REST/Makefile
index fd68a09632da..cfb7f3b74901 100644
--- a/devel/p5-JIRA-REST/Makefile
+++ b/devel/p5-JIRA-REST/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Config-Identity>=0.0019:devel/p5-Config-Identity \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Identity>=0.0019:devel/p5-Config-Identity \
p5-HTML-TreeBuilder-LibXML>=0:www/p5-HTML-TreeBuilder-LibXML \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-JSON>=0:converters/p5-JSON \
p5-REST-Client>=0:www/p5-REST-Client \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-JQuery/Makefile b/devel/p5-JQuery/Makefile
index dd1eee0ac46f..720a6f9d3538 100644
--- a/devel/p5-JQuery/Makefile
+++ b/devel/p5-JQuery/Makefile
@@ -15,12 +15,12 @@ COMMENT= Interface to Jquery, a language based on JavaScript
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-CSS>=0:textproc/p5-CSS \
p5-HTML-Table>=0:www/p5-HTML-Table \
p5-IO-String>=0:devel/p5-IO-String \
p5-XML-Writer>=0:textproc/p5-XML-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= modbuild
USES= perl5 shebangfix
diff --git a/devel/p5-JSON-Hyper/Makefile b/devel/p5-JSON-Hyper/Makefile
index 499732521962..1fb7a5a345bc 100644
--- a/devel/p5-JSON-Hyper/Makefile
+++ b/devel/p5-JSON-Hyper/Makefile
@@ -13,11 +13,11 @@ COMMENT= Extract links from JSON objects
LICENSE= MIT
-BUILD_DEPENDS= p5-JSON>=2.0:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2.0:converters/p5-JSON \
p5-JSON-Path>=0:devel/p5-JSON-Path \
p5-URI>=1.30:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-JSON-Path/Makefile b/devel/p5-JSON-Path/Makefile
index e4a3ffedac85..486ab00d45b8 100644
--- a/devel/p5-JSON-Path/Makefile
+++ b/devel/p5-JSON-Path/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert \
p5-Exporter-Easy>=0:devel/p5-Exporter-Easy \
p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert \
p5-Readonly>=0:devel/p5-Readonly \
p5-Scalar-List-Utils>=1.48:lang/p5-Scalar-List-Utils \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-JSON>=0:converters/p5-JSON \
p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Most>=0:devel/p5-Test-Most \
diff --git a/devel/p5-JSON-RPC-Common/Makefile b/devel/p5-JSON-RPC-Common/Makefile
index 2bccc4bbb257..fa3ccf797873 100644
--- a/devel/p5-JSON-RPC-Common/Makefile
+++ b/devel/p5-JSON-RPC-Common/Makefile
@@ -15,14 +15,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-libwww>=5:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=5:www/p5-libwww \
p5-Moose>=0.81:devel/p5-Moose \
p5-JSON>=2.11:converters/p5-JSON \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-Try-Tiny>0:lang/p5-Try-Tiny \
p5-URI>0:net/p5-URI \
p5-namespace-clean>=0.20:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-JSON-RPC-Dispatcher/Makefile b/devel/p5-JSON-RPC-Dispatcher/Makefile
index cb3ae4bb1433..7506d2595c81 100644
--- a/devel/p5-JSON-RPC-Dispatcher/Makefile
+++ b/devel/p5-JSON-RPC-Dispatcher/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-JSON>=2.16:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2.16:converters/p5-JSON \
p5-Log-Any>=0.11:devel/p5-Log-Any \
p5-Moose>=0.93:devel/p5-Moose \
p5-Plack>=0.9913:www/p5-Plack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-JSON-RPC/Makefile b/devel/p5-JSON-RPC/Makefile
index 93586b254210..af59911ad634 100644
--- a/devel/p5-JSON-RPC/Makefile
+++ b/devel/p5-JSON-RPC/Makefile
@@ -15,14 +15,14 @@ COMMENT= Perl implementation of JSON-RPC 1.1 protocol
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-JSON>=0:converters/p5-JSON \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Plack>=0:www/p5-Plack \
p5-Router-Simple>=0:www/p5-Router-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-JSON-Schema/Makefile b/devel/p5-JSON-Schema/Makefile
index 75dfe794094d..416a6ddc363f 100644
--- a/devel/p5-JSON-Schema/Makefile
+++ b/devel/p5-JSON-Schema/Makefile
@@ -12,7 +12,8 @@ COMMENT= Validate JSON against a schema
LICENSE= MIT
-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-JSON>=2.0:converters/p5-JSON \
p5-JSON-Path>=0:devel/p5-JSON-Path \
p5-JSON-Hyper>=0:devel/p5-JSON-Hyper \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
p5-libwww>=0:www/p5-libwww \
p5-autovivification>=0:devel/p5-autovivification \
p5-match-simple>=0:devel/p5-match-simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Lexical-Import/Makefile b/devel/p5-Lexical-Import/Makefile
index d6ca38ca78d3..fda60a6751d0 100644
--- a/devel/p5-Lexical-Import/Makefile
+++ b/devel/p5-Lexical-Import/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Clean imports from package-exporting modules
-BUILD_DEPENDS= p5-Lexical-Var>=0.006:devel/p5-Lexical-Var \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lexical-Var>=0.006:devel/p5-Lexical-Var \
p5-Module-Runtime>=0.011:devel/p5-Module-Runtime \
p5-Params-Classify>=0:devel/p5-Params-Classify
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
diff --git a/devel/p5-Lexical-Persistence/Makefile b/devel/p5-Lexical-Persistence/Makefile
index 3aeaab0328a1..bcb18c69f96c 100644
--- a/devel/p5-Lexical-Persistence/Makefile
+++ b/devel/p5-Lexical-Persistence/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Devel-LexAlias>=0.04:devel/p5-Devel-LexAlias \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-LexAlias>=0.04:devel/p5-Devel-LexAlias \
p5-PadWalker>=1.1:devel/p5-PadWalker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-List-AllUtils/Makefile b/devel/p5-List-AllUtils/Makefile
index 7665fa1c43ca..0450b66896d8 100644
--- a/devel/p5-List-AllUtils/Makefile
+++ b/devel/p5-List-AllUtils/Makefile
@@ -12,10 +12,10 @@ COMMENT= Combines List::Util and List::MoreUtils in one bite-sized package
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-List-SomeUtils>=0.50:devel/p5-List-SomeUtils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-SomeUtils>=0.50:devel/p5-List-SomeUtils \
p5-List-UtilsBy>=0.10:devel/p5-List-UtilsBy \
p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-List-Objects-Types/Makefile b/devel/p5-List-Objects-Types/Makefile
index ddc4ddce17d1..fdc4e9daf2d0 100644
--- a/devel/p5-List-Objects-Types/Makefile
+++ b/devel/p5-List-Objects-Types/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-List-Objects-WithUtils>=2:devel/p5-List-Objects-WithUtils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-Objects-WithUtils>=2:devel/p5-List-Objects-WithUtils \
p5-Type-Tiny>=0.022:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-List-Objects-WithUtils/Makefile b/devel/p5-List-Objects-WithUtils/Makefile
index 12d0a4bb7ac8..3423f1112b87 100644
--- a/devel/p5-List-Objects-WithUtils/Makefile
+++ b/devel/p5-List-Objects-WithUtils/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
p5-List-UtilsBy>=0.09:devel/p5-List-UtilsBy \
p5-List-UtilsBy-XS>=0.03:devel/p5-List-UtilsBy-XS \
p5-Module-Runtime>=0.013:devel/p5-Module-Runtime \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
p5-Type-Tie>=0.004:devel/p5-Type-Tie \
p5-autobox>=0:devel/p5-autobox \
p5-strictures>=2:devel/p5-strictures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-List-SomeUtils/Makefile b/devel/p5-List-SomeUtils/Makefile
index eb3f30a7065f..c5cdee0a4851 100644
--- a/devel/p5-List-SomeUtils/Makefile
+++ b/devel/p5-List-SomeUtils/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-List-SomeUtils-XS>=0:devel/p5-List-SomeUtils-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-SomeUtils-XS>=0:devel/p5-List-SomeUtils-XS \
p5-Module-Implementation>=0:devel/p5-Module-Implementation
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Log-Accounting-SVK/Makefile b/devel/p5-Log-Accounting-SVK/Makefile
index 5d59aebe61e4..154504aea15d 100644
--- a/devel/p5-Log-Accounting-SVK/Makefile
+++ b/devel/p5-Log-Accounting-SVK/Makefile
@@ -14,12 +14,12 @@ COMMENT= Perl module for accounting SVK repository
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= svk>=0:devel/svk \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= svk>=0:devel/svk \
p5-Spiffy>=0:devel/p5-Spiffy \
p5-Graph-SocialMap>=0:graphics/p5-Graph-SocialMap \
p5-Graph-Writer-GraphViz>=0:graphics/p5-Graph-Writer-GraphViz \
p5-Algorithm-Accounting>=0:devel/p5-Algorithm-Accounting
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Log-Accounting-SVN/Makefile b/devel/p5-Log-Accounting-SVN/Makefile
index 5c46b29b2e21..18115ba1cc81 100644
--- a/devel/p5-Log-Accounting-SVN/Makefile
+++ b/devel/p5-Log-Accounting-SVN/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl module for accounting SVN repository
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-subversion>=0:devel/p5-subversion \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \
p5-SVN-Log>=0:devel/p5-SVN-Log \
p5-Algorithm-Accounting>=0:devel/p5-Algorithm-Accounting \
p5-Test-Simple>=0:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Log-Agent-Logger/Makefile b/devel/p5-Log-Agent-Logger/Makefile
index 122529f48959..1e292f90a7fc 100644
--- a/devel/p5-Log-Agent-Logger/Makefile
+++ b/devel/p5-Log-Agent-Logger/Makefile
@@ -12,8 +12,8 @@ COMMENT= Log::Agent::Logger - a logging interface for perl
LICENSE= ART20
-BUILD_DEPENDS= p5-Log-Agent>=0.208:devel/p5-Log-Agent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Agent>=0.208:devel/p5-Log-Agent
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Log-Any-Adapter-Log4perl/Makefile b/devel/p5-Log-Any-Adapter-Log4perl/Makefile
index f429453b907c..5932c0464197 100644
--- a/devel/p5-Log-Any-Adapter-Log4perl/Makefile
+++ b/devel/p5-Log-Any-Adapter-Log4perl/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Log-Any>=1.03:devel/p5-Log-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Any>=1.03:devel/p5-Log-Any \
p5-Log-Log4perl>=1.32:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Log-Any-App/Makefile b/devel/p5-Log-Any-App/Makefile
index d318e8580cf4..c4494ad26795 100644
--- a/devel/p5-Log-Any-App/Makefile
+++ b/devel/p5-Log-Any-App/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-File-Write-Rotate>=0.29:devel/p5-File-Write-Rotate \
p5-IO-Socket-UNIX-Util>=0:net/p5-IO-Socket-UNIX-Util \
p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-File-HomeDir>=0:devel/p5-File-HomeDir \
p5-Log-Dispatch-ArrayWithLimits>=0:devel/p5-Log-Dispatch-ArrayWithLimits \
p5-Log-Dispatch-Dir>=0.08:devel/p5-Log-Dispatch-Dir \
p5-Log-Dispatch-FileWriteRotate>=0.04:devel/p5-Log-Dispatch-FileWriteRotate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Slurper>=0:devel/p5-File-Slurper
NO_ARCH= yes
diff --git a/devel/p5-Log-Any-IfLOG/Makefile b/devel/p5-Log-Any-IfLOG/Makefile
index 9a980b621e59..3fa543ec75ea 100644
--- a/devel/p5-Log-Any-IfLOG/Makefile
+++ b/devel/p5-Log-Any-IfLOG/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Log-Any>=0:devel/p5-Log-Any
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Any>=0:devel/p5-Log-Any
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Log-Dispatch-Array/Makefile b/devel/p5-Log-Dispatch-Array/Makefile
index 671515428787..0cc5d8d745f6 100644
--- a/devel/p5-Log-Dispatch-Array/Makefile
+++ b/devel/p5-Log-Dispatch-Array/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
NO_ARCH= yes
diff --git a/devel/p5-Log-Dispatch-Colorful/Makefile b/devel/p5-Log-Dispatch-Colorful/Makefile
index 649f12749475..81d55b50ec88 100644
--- a/devel/p5-Log-Dispatch-Colorful/Makefile
+++ b/devel/p5-Log-Dispatch-Colorful/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl extension for logging to screen
-BUILD_DEPENDS= p5-Filter>0:devel/p5-Filter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Filter>0:devel/p5-Filter \
p5-IO-stringy>=0:devel/p5-IO-stringy \
p5-Log-Dispatch>0:devel/p5-Log-Dispatch \
p5-Params-Validate>0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Log-Dispatch-Config/Makefile b/devel/p5-Log-Dispatch-Config/Makefile
index 2dcc0dd905e3..6fa98ee9523f 100644
--- a/devel/p5-Log-Dispatch-Config/Makefile
+++ b/devel/p5-Log-Dispatch-Config/Makefile
@@ -14,10 +14,10 @@ COMMENT= Log4j equivalent for Perl
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-AppConfig>=1.52:devel/p5-AppConfig \
p5-Log-Dispatch>=2:devel/p5-Log-Dispatch
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Log-Dispatch-Configurator-Any/Makefile b/devel/p5-Log-Dispatch-Configurator-Any/Makefile
index 78df9c4472c5..6f489ced94c4 100644
--- a/devel/p5-Log-Dispatch-Configurator-Any/Makefile
+++ b/devel/p5-Log-Dispatch-Configurator-Any/Makefile
@@ -13,10 +13,10 @@ COMMENT= Configurator implementation with Config::Any
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-Any>=0.15:devel/p5-Config-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Any>=0.15:devel/p5-Config-Any \
p5-Log-Dispatch>=2.23:devel/p5-Log-Dispatch \
p5-Log-Dispatch-Config>=0:devel/p5-Log-Dispatch-Config
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Config-Tiny>=0:devel/p5-Config-Tiny \
p5-Test-Pod>=1.14:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
diff --git a/devel/p5-Log-Dispatch-DBI/Makefile b/devel/p5-Log-Dispatch-DBI/Makefile
index dad438100865..90d291201cb0 100644
--- a/devel/p5-Log-Dispatch-DBI/Makefile
+++ b/devel/p5-Log-Dispatch-DBI/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= gebhart@secnetix.de
COMMENT= Log::Dispatch output class for logging to database via DBI interface
-BUILD_DEPENDS= p5-Log-Dispatch>=2.0:devel/p5-Log-Dispatch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Dispatch>=2.0:devel/p5-Log-Dispatch \
p5-DBI>0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-CSV>0:databases/p5-DBD-CSV
USES= perl5
diff --git a/devel/p5-Log-Dispatch-Dir/Makefile b/devel/p5-Log-Dispatch-Dir/Makefile
index d50b74eb9794..46d2d701cb64 100644
--- a/devel/p5-Log-Dispatch-Dir/Makefile
+++ b/devel/p5-Log-Dispatch-Dir/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-Slurper>=0:devel/p5-File-Slurper \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Slurper>=0:devel/p5-File-Slurper \
p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Probe-Perl>=0:sysutils/p5-Probe-Perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-LibMagic>=0:devel/p5-File-LibMagic \
p5-Media-Type-Simple>=0:devel/p5-Media-Type-Simple
diff --git a/devel/p5-Log-Dispatch-Email-EmailSend/Makefile b/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
index ec1ab9e39afc..22a6788b4e9e 100644
--- a/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
+++ b/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
@@ -14,11 +14,11 @@ COMMENT= Subclass of Log-Dispatch-Email that uses Email-Send
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Email-Send>=2.0:mail/p5-Email-Send \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Send>=2.0:mail/p5-Email-Send \
p5-Email-Simple>=2.100:mail/p5-Email-Simple \
p5-Log-Dispatch>=2.0:devel/p5-Log-Dispatch \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Log-Dispatch-File-Stamped/Makefile b/devel/p5-Log-Dispatch-File-Stamped/Makefile
index e0fd403af14b..856e40dffd95 100644
--- a/devel/p5-Log-Dispatch-File-Stamped/Makefile
+++ b/devel/p5-Log-Dispatch-File-Stamped/Makefile
@@ -14,10 +14,10 @@ COMMENT= Logging to date/time stamped files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Dispatch>=2.38:devel/p5-Log-Dispatch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Dispatch>=2.38:devel/p5-Log-Dispatch \
p5-Params-Validate>0:devel/p5-Params-Validate \
p5-namespace-clean>0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Path-Tiny>0:devel/p5-Path-Tiny \
p5-Test-CheckDeps>=0.002:devel/p5-Test-CheckDeps \
p5-Test-Deep>0:devel/p5-Test-Deep \
diff --git a/devel/p5-Log-Dispatch-FileRotate/Makefile b/devel/p5-Log-Dispatch-FileRotate/Makefile
index ef39878c6e10..18ca1a54afa8 100644
--- a/devel/p5-Log-Dispatch-FileRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileRotate/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \
p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Path-Tiny>=0.018:devel/p5-Path-Tiny \
p5-Test-Warn>=0:devel/p5-Test-Warn
diff --git a/devel/p5-Log-Dispatch-FileShared/Makefile b/devel/p5-Log-Dispatch-FileShared/Makefile
index ef5d5fd6af25..a77aed387d87 100644
--- a/devel/p5-Log-Dispatch-FileShared/Makefile
+++ b/devel/p5-Log-Dispatch-FileShared/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Log::Dispatch output class for logging to shared files
-BUILD_DEPENDS= p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Log-Dispatch-FileWriteRotate/Makefile b/devel/p5-Log-Dispatch-FileWriteRotate/Makefile
index 92bf63d9b088..be0f25d7304a 100644
--- a/devel/p5-Log-Dispatch-FileWriteRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileWriteRotate/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-Write-Rotate>=0.29:devel/p5-File-Write-Rotate \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Write-Rotate>=0.29:devel/p5-File-Write-Rotate \
p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Log-Dispatch-Perl/Makefile b/devel/p5-Log-Dispatch-Perl/Makefile
index 5b5ae920aaaf..34145c705ae5 100644
--- a/devel/p5-Log-Dispatch-Perl/Makefile
+++ b/devel/p5-Log-Dispatch-Perl/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Log::Dispatch plug-in using core Perl functions for logging
-BUILD_DEPENDS= p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Log-Dispatch-Scribe/Makefile b/devel/p5-Log-Dispatch-Scribe/Makefile
index 5018fd1812c3..14590857aa39 100644
--- a/devel/p5-Log-Dispatch-Scribe/Makefile
+++ b/devel/p5-Log-Dispatch-Scribe/Makefile
@@ -13,8 +13,8 @@ COMMENT= Logging via Facebook's Scribe server software #'
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Dispatch>0:devel/p5-Log-Dispatch
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Dispatch>0:devel/p5-Log-Dispatch
TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject \
p5-Test-Timer>=0:devel/p5-Test-Timer
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index 6fd25278dd49..de821d3b3ab9 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -12,14 +12,14 @@ COMMENT= Suite of OO modules for logging messages to multiple outputs
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
p5-Dist-CheckConflicts>=0.02:devel/p5-Dist-CheckConflicts \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Params-ValidationCompiler>=0:devel/p5-Params-ValidationCompiler \
p5-Specio>=0.32:devel/p5-Specio \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-Log-Dispatchouli/Makefile b/devel/p5-Log-Dispatchouli/Makefile
index a7d8deda2071..2ba79f5687cd 100644
--- a/devel/p5-Log-Dispatchouli/Makefile
+++ b/devel/p5-Log-Dispatchouli/Makefile
@@ -16,14 +16,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
p5-Log-Dispatch-Array>=0:devel/p5-Log-Dispatch-Array \
p5-Params-Util>=0:devel/p5-Params-Util \
p5-String-Flogger>=0:textproc/p5-String-Flogger \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-Sub-Exporter-GlobExporter>=0.002:devel/p5-Sub-Exporter-GlobExporter \
p5-Try-Tiny>=0.04:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Fatal>=0:devel/p5-Test-Fatal
diff --git a/devel/p5-Log-Handler/Makefile b/devel/p5-Log-Handler/Makefile
index 1e4bfcd9a89b..54e95357c573 100644
--- a/devel/p5-Log-Handler/Makefile
+++ b/devel/p5-Log-Handler/Makefile
@@ -13,8 +13,8 @@ COMMENT= Object-oriented handler for logging, tracing, and debugging in Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate
TEST_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-Email-Date>=0:mail/p5-Email-Date
diff --git a/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile b/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
index 5724790e81ec..5bd63841e658 100644
--- a/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
+++ b/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= Perl module which allows logging to RabbitMQ via log4perl
-BUILD_DEPENDS= ${LOCALBASE}/bin/l4p-tmpl:devel/p5-Log-Log4perl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${LOCALBASE}/bin/l4p-tmpl:devel/p5-Log-Log4perl \
p5-Net-AMQP-RabbitMQ>=2.30000:net/p5-Net-AMQP-RabbitMQ \
p5-Readonly>0:devel/p5-Readonly
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Log-Message-Simple/Makefile b/devel/p5-Log-Message-Simple/Makefile
index d8bedbae4300..16c17df2b933 100644
--- a/devel/p5-Log-Message-Simple/Makefile
+++ b/devel/p5-Log-Message-Simple/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Provides standardized logging facilities using the Log::Message module
-BUILD_DEPENDS= p5-Log-Message>=0:devel/p5-Log-Message
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Message>=0:devel/p5-Log-Message
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Log-Message/Makefile b/devel/p5-Log-Message/Makefile
index b6d9876e52c0..a48fbbc601e7 100644
--- a/devel/p5-Log-Message/Makefile
+++ b/devel/p5-Log-Message/Makefile
@@ -15,10 +15,10 @@ COMMENT= Powerful and flexible message logging mechanism
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Params-Check>=0:devel/p5-Params-Check \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Check>=0:devel/p5-Params-Check \
p5-Module-Load>=0:devel/p5-Module-Load \
p5-Locale-Maketext-Simple>=0:devel/p5-Locale-Maketext-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Log-Report-Optional/Makefile b/devel/p5-Log-Report-Optional/Makefile
index 6f339ed8d481..17cab0512706 100644
--- a/devel/p5-Log-Report-Optional/Makefile
+++ b/devel/p5-Log-Report-Optional/Makefile
@@ -13,8 +13,8 @@ COMMENT= Log::Report or ::Minimal
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-String-Print>=0.91:textproc/p5-String-Print
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-String-Print>=0.91:textproc/p5-String-Print
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Log-Report/Makefile b/devel/p5-Log-Report/Makefile
index 9eaf411d9ec2..9636f8afec72 100644
--- a/devel/p5-Log-Report/Makefile
+++ b/devel/p5-Log-Report/Makefile
@@ -13,10 +13,10 @@ COMMENT= Report a problem, pluggable handlers and language support
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-GlobalDestruction>=0.09:devel/p5-Devel-GlobalDestruction \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-GlobalDestruction>=0.09:devel/p5-Devel-GlobalDestruction \
p5-Log-Report-Optional>=1.03:devel/p5-Log-Report-Optional \
p5-String-Print>=0.91:textproc/p5-String-Print
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Log-TraceMessages/Makefile b/devel/p5-Log-TraceMessages/Makefile
index ed53e3db0896..f11a3a7dd89f 100644
--- a/devel/p5-Log-TraceMessages/Makefile
+++ b/devel/p5-Log-TraceMessages/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for trace messages used in debugging
-BUILD_DEPENDS= p5-HTML-FromText>=0:www/p5-HTML-FromText
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-FromText>=0:www/p5-HTML-FromText
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Luka/Makefile b/devel/p5-Luka/Makefile
index b1f3b825cb17..8a22bcf68697 100644
--- a/devel/p5-Luka/Makefile
+++ b/devel/p5-Luka/Makefile
@@ -15,7 +15,8 @@ COMMENT= Exception handling and reporting framework
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Std>=0:devel/p5-Class-Std \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Std>=0:devel/p5-Class-Std \
p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
p5-Error>=0:lang/p5-Error \
p5-Exception-Class>=0:devel/p5-Exception-Class \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Class-Std>=0:devel/p5-Class-Std \
p5-Sub-Uplevel>=0:devel/p5-Sub-Uplevel \
p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long \
p5-What>=0:net/p5-What
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USE_PERL5= configure
diff --git a/devel/p5-MRO-Compat/Makefile b/devel/p5-MRO-Compat/Makefile
index dac8c8bd09f3..d34f44299e1e 100644
--- a/devel/p5-MRO-Compat/Makefile
+++ b/devel/p5-MRO-Compat/Makefile
@@ -14,8 +14,8 @@ COMMENT= Add mro::* interface compatibility for Perls < 5.9.5
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-C3>=0.19:devel/p5-Class-C3
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-C3>=0.19:devel/p5-Class-C3
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Mac-PropertyList/Makefile b/devel/p5-Mac-PropertyList/Makefile
index 0de059dcb9ab..dd1810cf907f 100644
--- a/devel/p5-Mac-PropertyList/Makefile
+++ b/devel/p5-Mac-PropertyList/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl extension for parsing Mac OS X property lists
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-Entities>=0:textproc/p5-XML-Entities
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Entities>=0:textproc/p5-XML-Entities
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Media-Type-Simple/Makefile b/devel/p5-Media-Type-Simple/Makefile
index 45f680c7c5e2..a98ece290cbc 100644
--- a/devel/p5-Media-Type-Simple/Makefile
+++ b/devel/p5-Media-Type-Simple/Makefile
@@ -14,10 +14,10 @@ COMMENT= MIME Media Types and their file extensions
LICENSE= ART20
-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-File-Share>=0:devel/p5-File-Share \
p5-File-ShareDir>=0:devel/p5-File-ShareDir
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-MetaCPAN-Client/Makefile b/devel/p5-MetaCPAN-Client/Makefile
index 92cb46ef8fd1..27c40ad7aa37 100644
--- a/devel/p5-MetaCPAN-Client/Makefile
+++ b/devel/p5-MetaCPAN-Client/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-IO-Socket-SSL>=1.42:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=1.42:security/p5-IO-Socket-SSL \
p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
p5-Moo>=0:devel/p5-Moo \
p5-Net-SSLeay>=1.49:security/p5-Net-SSLeay \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-IO-Socket-SSL>=1.42:security/p5-IO-Socket-SSL \
p5-Safe-Isa>=0:devel/p5-Safe-Isa \
p5-Type-Tiny>=0:devel/p5-Type-Tiny \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Needs>=0.002005:devel/p5-Test-Needs
diff --git a/devel/p5-Metabase-Fact/Makefile b/devel/p5-Metabase-Fact/Makefile
index a348b8cdbd76..2847f0f9e773 100644
--- a/devel/p5-Metabase-Fact/Makefile
+++ b/devel/p5-Metabase-Fact/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= Metabase Facts
-BUILD_DEPENDS= p5-JSON>=2.0:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2.0:converters/p5-JSON \
p5-Data-GUID>=0:devel/p5-Data-GUID \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-CPAN-DistnameInfo>0:devel/p5-CPAN-DistnameInfo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Method-Signatures-Simple/Makefile b/devel/p5-Method-Signatures-Simple/Makefile
index 95c4e9c6eb4f..482cd6cef82f 100644
--- a/devel/p5-Method-Signatures-Simple/Makefile
+++ b/devel/p5-Method-Signatures-Simple/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Basic method declarations with signatures, without source filters
-BUILD_DEPENDS= p5-Devel-Declare>=0:devel/p5-Devel-Declare
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Declare>=0:devel/p5-Devel-Declare
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Method-Signatures/Makefile b/devel/p5-Method-Signatures/Makefile
index 848c84eb0846..cf9649112890 100644
--- a/devel/p5-Method-Signatures/Makefile
+++ b/devel/p5-Method-Signatures/Makefile
@@ -15,14 +15,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Any-Moose>=0.11:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0.11:devel/p5-Any-Moose \
p5-Const-Fast>=0.006:devel/p5-Const-Fast \
p5-Devel-Declare>=0.006002:devel/p5-Devel-Declare \
p5-Lexical-SealRequireHints>=0.008:devel/p5-Lexical-SealRequireHints \
p5-Mouse>=0.64:devel/p5-Mouse \
p5-PPI>=1.203:textproc/p5-PPI \
p5-Sub-Name>=0.03:devel/p5-Sub-Name
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.29:devel/p5-Test-Exception \
p5-Test-Warn>=0.10:devel/p5-Test-Warn
diff --git a/devel/p5-Minilla/Makefile b/devel/p5-Minilla/Makefile
index 8f1b51c27bbf..53df345208f5 100644
--- a/devel/p5-Minilla/Makefile
+++ b/devel/p5-Minilla/Makefile
@@ -17,7 +17,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= git>=0:devel/git \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= git>=0:devel/git \
tree>=0:sysutils/tree \
p5-App-cpanminus>=1.6902:devel/p5-App-cpanminus \
p5-CPAN-Uploader>=0:devel/p5-CPAN-Uploader \
@@ -36,7 +37,6 @@ BUILD_DEPENDS= git>=0:devel/git \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-URI>=0:net/p5-URI \
p5-Version-Next>=0:textproc/p5-Version-Next
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
p5-JSON>=0:converters/p5-JSON \
p5-Test-Output>=0:devel/p5-Test-Output \
diff --git a/devel/p5-Mixin-Event-Dispatch/Makefile b/devel/p5-Mixin-Event-Dispatch/Makefile
index 723665520bec..c620ad22dc84 100644
--- a/devel/p5-Mixin-Event-Dispatch/Makefile
+++ b/devel/p5-Mixin-Event-Dispatch/Makefile
@@ -14,8 +14,8 @@ COMMENT= Mixin methods for simple event/message dispatch framework
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-List-UtilsBy>=0:devel/p5-List-UtilsBy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-UtilsBy>=0:devel/p5-List-UtilsBy
TEST_DEPENDS= p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
p5-Test-Fatal>=0.010:devel/p5-Test-Fatal \
p5-Test-Refcount>=0.07:devel/p5-Test-Refcount
diff --git a/devel/p5-Mixin-Linewise/Makefile b/devel/p5-Mixin-Linewise/Makefile
index a06ebf255d4f..a697a5a83bae 100644
--- a/devel/p5-Mixin-Linewise/Makefile
+++ b/devel/p5-Mixin-Linewise/Makefile
@@ -13,9 +13,9 @@ COMMENT= Write your linewise code for handles; this does the rest
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PerlIO-utf8_strict>=0:devel/p5-PerlIO-utf8_strict \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PerlIO-utf8_strict>=0:devel/p5-PerlIO-utf8_strict \
p5-Sub-Exporter>=0.900:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Mock-Quick/Makefile b/devel/p5-Mock-Quick/Makefile
index 30d6846ece73..bc9d38fd85b7 100644
--- a/devel/p5-Mock-Quick/Makefile
+++ b/devel/p5-Mock-Quick/Makefile
@@ -14,8 +14,8 @@ COMMENT= Quickly mock objects and classes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Exporter-Declare>=0.103:devel/p5-Exporter-Declare
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exporter-Declare>=0.103:devel/p5-Exporter-Declare
TEST_DEPENDS= p5-Fennec-Lite>=0.004:devel/p5-Fennec-Lite \
p5-Test-Exception>=0.29:devel/p5-Test-Exception
diff --git a/devel/p5-Module-Build-Convert/Makefile b/devel/p5-Module-Build-Convert/Makefile
index a5ed95dfd277..90c07d54c03f 100644
--- a/devel/p5-Module-Build-Convert/Makefile
+++ b/devel/p5-Module-Build-Convert/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Makefile.PL to Build.PL converter
-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-File-Slurp>=0:devel/p5-File-Slurp \
p5-IO-Prompt>=0:devel/p5-IO-Prompt \
p5-PPI>=0:textproc/p5-PPI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.14:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
diff --git a/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile b/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile
index a2433ba3f9ac..7daa83eb3bd6 100644
--- a/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile
+++ b/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile
@@ -13,10 +13,10 @@ COMMENT= Make README.mkdn from POD
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
p5-Module-Build-Pluggable>=0.09:devel/p5-Module-Build-Pluggable \
p5-Pod-Markdown>=0:textproc/p5-Pod-Markdown
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= modbuild
USES= perl5
diff --git a/devel/p5-Module-Build-Pluggable/Makefile b/devel/p5-Module-Build-Pluggable/Makefile
index ba263d8edb46..bc330ab0c332 100644
--- a/devel/p5-Module-Build-Pluggable/Makefile
+++ b/devel/p5-Module-Build-Pluggable/Makefile
@@ -13,11 +13,11 @@ COMMENT= Module::Build meets plugins
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
p5-Data-OptList>=0:devel/p5-Data-OptList \
p5-Test-SharedFork>=0:devel/p5-Test-SharedFork
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= modbuild
USES= perl5
diff --git a/devel/p5-Module-Build-Tiny/Makefile b/devel/p5-Module-Build-Tiny/Makefile
index 5ee80c236d64..29a26c3448d1 100644
--- a/devel/p5-Module-Build-Tiny/Makefile
+++ b/devel/p5-Module-Build-Tiny/Makefile
@@ -18,10 +18,10 @@ COMMENT= Tiny replacement for Module::Build
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-ExtUtils-Config>=0.003:devel/p5-ExtUtils-Config \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ExtUtils-Config>=0.003:devel/p5-ExtUtils-Config \
p5-ExtUtils-Helpers>=0.020:devel/p5-ExtUtils-Helpers \
p5-ExtUtils-InstallPaths>=0.002:devel/p5-ExtUtils-InstallPaths
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuildtiny
diff --git a/devel/p5-Module-Build-XSUtil/Makefile b/devel/p5-Module-Build-XSUtil/Makefile
index 54bb5682a358..b871a05e6c88 100644
--- a/devel/p5-Module-Build-XSUtil/Makefile
+++ b/devel/p5-Module-Build-XSUtil/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Devel-CheckCompiler>=0:devel/p5-Devel-CheckCompiler
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-CheckCompiler>=0:devel/p5-Devel-CheckCompiler
TEST_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-Cwd-Guard>=0:devel/p5-Cwd-Guard \
p5-File-Copy-Recursive-Reduced>=0.002:devel/p5-File-Copy-Recursive-Reduced
diff --git a/devel/p5-Module-CPANTS-Analyse/Makefile b/devel/p5-Module-CPANTS-Analyse/Makefile
index 0e42125ac2e3..59666ea37905 100644
--- a/devel/p5-Module-CPANTS-Analyse/Makefile
+++ b/devel/p5-Module-CPANTS-Analyse/Makefile
@@ -14,7 +14,9 @@ COMMENT= Generate Kwalitee ratings for a distribution
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Any-Lite>=0.06:archivers/p5-Archive-Any-Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+ p5-ExtUtils-MakeMaker-CPANfile>=0.06:devel/p5-ExtUtils-MakeMaker-CPANfile
+RUN_DEPENDS= p5-Archive-Any-Lite>=0.06:archivers/p5-Archive-Any-Lite \
p5-Array-Diff>=0.04:misc/p5-Array-Diff \
p5-CPAN-DistnameInfo>=0.06:devel/p5-CPAN-DistnameInfo \
p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
@@ -26,9 +28,7 @@ BUILD_DEPENDS= p5-Archive-Any-Lite>=0.06:archivers/p5-Archive-Any-Lite \
p5-Set-Scalar>=0:devel/p5-Set-Scalar \
p5-Software-License>=0.103008:misc/p5-Software-License \
p5-Software-License-CCpack>=0:misc/p5-Software-License-CCpack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings
-BUILD_DEPENDS+= p5-ExtUtils-MakeMaker-CPANfile>=0.06:devel/p5-ExtUtils-MakeMaker-CPANfile
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Module-CheckDeps/Makefile b/devel/p5-Module-CheckDeps/Makefile
index 687bb73f28c8..593f07a48f8d 100644
--- a/devel/p5-Module-CheckDeps/Makefile
+++ b/devel/p5-Module-CheckDeps/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-PPI>=0:textproc/p5-PPI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PPI>=0:textproc/p5-PPI
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Module-CheckVersion/Makefile b/devel/p5-Module-CheckVersion/Makefile
index fd0e240ea5f2..121fd09d73ad 100644
--- a/devel/p5-Module-CheckVersion/Makefile
+++ b/devel/p5-Module-CheckVersion/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Module-Compile/Makefile b/devel/p5-Module-Compile/Makefile
index 283cc9d00c1e..3e686a1339ca 100644
--- a/devel/p5-Module-Compile/Makefile
+++ b/devel/p5-Module-Compile/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Provide a system for writing modules that compile other Perl modules
-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/devel/p5-Module-Extract-Use/Makefile b/devel/p5-Module-Extract-Use/Makefile
index e5be00771c76..4b004d1e7563 100644
--- a/devel/p5-Module-Extract-Use/Makefile
+++ b/devel/p5-Module-Extract-Use/Makefile
@@ -14,8 +14,8 @@ COMMENT= Pull out the modules a module explicitly uses
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-PPI>=0:textproc/p5-PPI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PPI>=0:textproc/p5-PPI
TEST_DEPENDS= p5-Test-Pod>0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>0:devel/p5-Test-Pod-Coverage
diff --git a/devel/p5-Module-Extract/Makefile b/devel/p5-Module-Extract/Makefile
index 191a396c0655..aa187f60e40d 100644
--- a/devel/p5-Module-Extract/Makefile
+++ b/devel/p5-Module-Extract/Makefile
@@ -14,8 +14,8 @@ COMMENT= Base class for working with Perl distributions
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Extract>=0:archivers/p5-Archive-Extract
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Extract>=0:archivers/p5-Archive-Extract
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Module-ExtractUse/Makefile b/devel/p5-Module-ExtractUse/Makefile
index d9fce9302b84..25e287710b51 100644
--- a/devel/p5-Module-ExtractUse/Makefile
+++ b/devel/p5-Module-ExtractUse/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Parse-RecDescent>=1.967:devel/p5-Parse-RecDescent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Parse-RecDescent>=1.967:devel/p5-Parse-RecDescent \
p5-Pod-Strip>=0:textproc/p5-Pod-Strip
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-UNIVERSAL-require>=0.11:devel/p5-UNIVERSAL-require \
p5-Test-Deep>0:devel/p5-Test-Deep
diff --git a/devel/p5-Module-Implementation/Makefile b/devel/p5-Module-Implementation/Makefile
index 35a5f75a81ce..2f26ddad34af 100644
--- a/devel/p5-Module-Implementation/Makefile
+++ b/devel/p5-Module-Implementation/Makefile
@@ -13,9 +13,9 @@ COMMENT= Loads one of several alternate underlying implementations for a module
LICENSE= ART20
-BUILD_DEPENDS= p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0.006:devel/p5-Test-Fatal \
p5-Test-NoTabs>=0:devel/p5-Test-NoTabs \
p5-Test-Requires>=0:devel/p5-Test-Requires \
diff --git a/devel/p5-Module-Info-File/Makefile b/devel/p5-Module-Info-File/Makefile
index b6478a8049eb..7cd9363be0f0 100644
--- a/devel/p5-Module-Info-File/Makefile
+++ b/devel/p5-Module-Info-File/Makefile
@@ -13,9 +13,9 @@ COMMENT= Retrieves module information from a file or script
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Module-Info>=0.20:devel/p5-Module-Info \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Info>=0.20:devel/p5-Module-Info \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Module-Info/Makefile b/devel/p5-Module-Info/Makefile
index eaaa411edc08..a5798fe83bf6 100644
--- a/devel/p5-Module-Info/Makefile
+++ b/devel/p5-Module-Info/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Provides information about Perl modules
-BUILD_DEPENDS= p5-PathTools>=0:devel/p5-PathTools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PathTools>=0:devel/p5-PathTools
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Module-Inspector/Makefile b/devel/p5-Module-Inspector/Makefile
index c0f92dc57bbf..b653b2ad39be 100644
--- a/devel/p5-Module-Inspector/Makefile
+++ b/devel/p5-Module-Inspector/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
COMMENT= Integrated API for inspecting Perl distributions
-BUILD_DEPENDS= p5-File-Find-Rule-VCS>=0:devel/p5-File-Find-Rule-VCS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Find-Rule-VCS>=0:devel/p5-File-Find-Rule-VCS \
p5-File-Find-Rule-Perl>=0:devel/p5-File-Find-Rule-Perl \
p5-Module-Extract>=0:devel/p5-Module-Extract \
p5-Module-Manifest>=0:devel/p5-Module-Manifest \
@@ -19,7 +20,6 @@ BUILD_DEPENDS= p5-File-Find-Rule-VCS>=0:devel/p5-File-Find-Rule-VCS \
p5-PPI>=0:textproc/p5-PPI \
p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
p5-Params-Util>=0:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Module-Install-ReadmeFromPod/Makefile b/devel/p5-Module-Install-ReadmeFromPod/Makefile
index 3a7188dca462..abd3e8c26b91 100644
--- a/devel/p5-Module-Install-ReadmeFromPod/Makefile
+++ b/devel/p5-Module-Install-ReadmeFromPod/Makefile
@@ -12,10 +12,10 @@ COMMENT= Automatically generate README from POD during installation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Install>=1.00:devel/p5-Module-Install \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Install>=1.00:devel/p5-Module-Install \
p5-IO-All>=0:devel/p5-IO-All \
p5-Pod-Markdown>=2.0:textproc/p5-Pod-Markdown
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Capture-Tiny>=0.05:devel/p5-Capture-Tiny \
p5-Test-InDistDir>=0:devel/p5-Test-InDistDir
diff --git a/devel/p5-Module-Install-Template/Makefile b/devel/p5-Module-Install-Template/Makefile
index 829655836088..b3d6dab40ef4 100644
--- a/devel/p5-Module-Install-Template/Makefile
+++ b/devel/p5-Module-Install-Template/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Treat module source code as a template
-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-Module-Install>=0:devel/p5-Module-Install \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Module-Install-TestBase/Makefile b/devel/p5-Module-Install-TestBase/Makefile
index 39a4825df963..a97c45ab7cf6 100644
--- a/devel/p5-Module-Install-TestBase/Makefile
+++ b/devel/p5-Module-Install-TestBase/Makefile
@@ -14,9 +14,9 @@ COMMENT= Module::Install Support for Test::Base
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Install>=1.10:devel/p5-Module-Install \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Install>=1.10:devel/p5-Module-Install \
p5-Test-Base>=0.86:devel/p5-Test-Base
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Module-Install-XSUtil/Makefile b/devel/p5-Module-Install-XSUtil/Makefile
index 07c02c540e9f..d227222266e6 100644
--- a/devel/p5-Module-Install-XSUtil/Makefile
+++ b/devel/p5-Module-Install-XSUtil/Makefile
@@ -14,8 +14,8 @@ COMMENT= Utility functions for XS modules
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Install>=0.91:devel/p5-Module-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Install>=0.91:devel/p5-Module-Install
TEST_DEPENDS= p5-B-Hooks-OP-Annotation>=0.43:devel/p5-B-Hooks-OP-Annotation
NO_ARCH= yes
diff --git a/devel/p5-Module-Install/Makefile b/devel/p5-Module-Install/Makefile
index 2bf84346dbc3..ebad8eef9f2b 100644
--- a/devel/p5-Module-Install/Makefile
+++ b/devel/p5-Module-Install/Makefile
@@ -13,12 +13,12 @@ COMMENT= Standalone, extensible Perl module installer
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Remove>=1.42:devel/p5-File-Remove \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Remove>=1.42:devel/p5-File-Remove \
p5-JSON>=2.14:converters/p5-JSON \
p5-Module-ScanDeps>=1.09:devel/p5-Module-ScanDeps \
p5-PAR-Dist>=0.29:devel/p5-PAR-Dist \
p5-YAML-Tiny>=1.38:textproc/p5-YAML-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Module-Manifest/Makefile b/devel/p5-Module-Manifest/Makefile
index 497af7df7663..f4d1a17a3f40 100644
--- a/devel/p5-Module-Manifest/Makefile
+++ b/devel/p5-Module-Manifest/Makefile
@@ -13,9 +13,9 @@ COMMENT= Parse and examine a Perl distribution MANIFEST file
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-Test-Warn>=0:devel/p5-Test-Warn
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-Module-Math-Depends/Makefile b/devel/p5-Module-Math-Depends/Makefile
index 48832ae695e4..c6500a5f11f6 100644
--- a/devel/p5-Module-Math-Depends/Makefile
+++ b/devel/p5-Module-Math-Depends/Makefile
@@ -14,8 +14,8 @@ COMMENT= Convenience object for manipulating module dependencies
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Params-Util>=0:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Util>=0:devel/p5-Params-Util
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Module-Pluggable-Fast/Makefile b/devel/p5-Module-Pluggable-Fast/Makefile
index cfbd179aa9ff..7fd1c0a74ecb 100644
--- a/devel/p5-Module-Pluggable-Fast/Makefile
+++ b/devel/p5-Module-Pluggable-Fast/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Fast plugins with instantiation
-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
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Module-Release/Makefile b/devel/p5-Module-Release/Makefile
index 5b6a24774afc..90434a1f280e 100644
--- a/devel/p5-Module-Release/Makefile
+++ b/devel/p5-Module-Release/Makefile
@@ -13,7 +13,8 @@ COMMENT= Upload files to CPAN and SourceForge
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-CACertOrg-CA>=0:security/p5-CACertOrg-CA \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CACertOrg-CA>=0:security/p5-CACertOrg-CA \
p5-ConfigReader-Simple>=0:devel/p5-ConfigReader-Simple \
p5-DateTime>=0:devel/p5-DateTime \
p5-IO-Null>=0:devel/p5-IO-Null \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-CACertOrg-CA>=0:security/p5-CACertOrg-CA \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
p5-URI>=0:net/p5-URI \
p5-libwww>=6.02:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-Test-Output>=0:devel/p5-Test-Output \
p5-Test-Pod>=1:devel/p5-Test-Pod \
diff --git a/devel/p5-Module-Runtime-Conflicts/Makefile b/devel/p5-Module-Runtime-Conflicts/Makefile
index 0ccb610b83b2..d3c44aab0c83 100644
--- a/devel/p5-Module-Runtime-Conflicts/Makefile
+++ b/devel/p5-Module-Runtime-Conflicts/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENCE
-BUILD_DEPENDS= p5-Dist-CheckConflicts>=0:devel/p5-Dist-CheckConflicts \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dist-CheckConflicts>=0:devel/p5-Dist-CheckConflicts \
p5-Module-Runtime>=0:devel/p5-Module-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Module-Starter-PBP/Makefile b/devel/p5-Module-Starter-PBP/Makefile
index 71619b362fd9..e76f6dbc9f79 100644
--- a/devel/p5-Module-Starter-PBP/Makefile
+++ b/devel/p5-Module-Starter-PBP/Makefile
@@ -15,8 +15,8 @@ COMMENT= Create a module as recommended in "Perl Best Practices"
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Starter>=0:devel/p5-Module-Starter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Starter>=0:devel/p5-Module-Starter
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Module-Starter/Makefile b/devel/p5-Module-Starter/Makefile
index 567e8f668554..14ab8d7ac8e9 100644
--- a/devel/p5-Module-Starter/Makefile
+++ b/devel/p5-Module-Starter/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Module-Runtime>=0:devel/p5-Module-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Runtime>=0:devel/p5-Module-Runtime
PORTSCOUT= skipv:1.470
diff --git a/devel/p5-Mojolicious-Plugin-NYTProf/Makefile b/devel/p5-Mojolicious-Plugin-NYTProf/Makefile
index 6a50c7664e81..d127d6405f63 100644
--- a/devel/p5-Mojolicious-Plugin-NYTProf/Makefile
+++ b/devel/p5-Mojolicious-Plugin-NYTProf/Makefile
@@ -13,10 +13,10 @@ COMMENT= Auto handling of Devel::NYTProf in your Mojolicious app
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-NYTProf>=5.07:devel/p5-Devel-NYTProf \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-NYTProf>=5.07:devel/p5-Devel-NYTProf \
p5-File-Which>=1.09:sysutils/p5-File-Which \
p5-Mojolicious>=6.00:www/p5-Mojolicious
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Algorithm-Combinatorics>=0:math/p5-Algorithm-Combinatorics \
p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/devel/p5-Moo/Makefile b/devel/p5-Moo/Makefile
index 75d6ad7a5ac6..45f56aa3b0f2 100644
--- a/devel/p5-Moo/Makefile
+++ b/devel/p5-Moo/Makefile
@@ -14,12 +14,12 @@ COMMENT= Minimalist Object Orientation (with Moose compatibility)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Method-Modifiers>=1.10:devel/p5-Class-Method-Modifiers \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Method-Modifiers>=1.10:devel/p5-Class-Method-Modifiers \
p5-Devel-GlobalDestruction>=0.11:devel/p5-Devel-GlobalDestruction \
p5-Module-Runtime>=0.014:devel/p5-Module-Runtime \
p5-Role-Tiny>=2.000004:devel/p5-Role-Tiny \
p5-Sub-Quote>=2.003001:devel/p5-Sub-Quote
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0.003:devel/p5-Test-Fatal \
${XS_BUILD_DEPENDS}
diff --git a/devel/p5-MooX-Cmd/Makefile b/devel/p5-MooX-Cmd/Makefile
index bcea296977df..5e522be1b0d1 100644
--- a/devel/p5-MooX-Cmd/Makefile
+++ b/devel/p5-MooX-Cmd/Makefile
@@ -13,13 +13,13 @@ COMMENT= Giving an easy Moo style way to make command organized CLI apps
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-TieCombine>=0:devel/p5-IO-TieCombine \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-TieCombine>=0:devel/p5-IO-TieCombine \
p5-Module-Pluggable>=4.8:devel/p5-Module-Pluggable \
p5-Moo>=0.009013:devel/p5-Moo \
p5-Package-Stash>=0.33:devel/p5-Package-Stash \
p5-Regexp-Common>=2011121001:textproc/p5-Regexp-Common \
p5-Test-LoadAllModules>=0.021:devel/p5-Test-LoadAllModules
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-TieCombine>=0:devel/p5-IO-TieCombine
USES= perl5
diff --git a/devel/p5-MooX-ConfigFromFile/Makefile b/devel/p5-MooX-ConfigFromFile/Makefile
index 464c2891aca1..c62afe3af224 100644
--- a/devel/p5-MooX-ConfigFromFile/Makefile
+++ b/devel/p5-MooX-ConfigFromFile/Makefile
@@ -13,12 +13,12 @@ COMMENT= Moo eXtension for initializing objects from config file
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-Any>=0:devel/p5-Config-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Any>=0:devel/p5-Config-Any \
p5-File-Find-Rule>=0.30:devel/p5-File-Find-Rule \
p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
p5-Moo>=1.003000:devel/p5-Moo \
p5-MooX-File-ConfigDir>=0.002:devel/p5-MooX-File-ConfigDir
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-MooX-File-ConfigDir/Makefile b/devel/p5-MooX-File-ConfigDir/Makefile
index c03e97b48022..d36e878361dc 100644
--- a/devel/p5-MooX-File-ConfigDir/Makefile
+++ b/devel/p5-MooX-File-ConfigDir/Makefile
@@ -13,9 +13,9 @@ COMMENT= Moo eXtension for File::ConfigDir
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-ConfigDir>=0.018:devel/p5-File-ConfigDir \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-ConfigDir>=0.018:devel/p5-File-ConfigDir \
p5-Moo>=1.003000:devel/p5-Moo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-MooX-HandlesVia/Makefile b/devel/p5-MooX-HandlesVia/Makefile
index add79502c45c..2dd87e80fafc 100644
--- a/devel/p5-MooX-HandlesVia/Makefile
+++ b/devel/p5-MooX-HandlesVia/Makefile
@@ -12,9 +12,9 @@ COMMENT= NativeTrait-like behavior for Moo
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Perl>=0.002006:devel/p5-Data-Perl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Perl>=0.002006:devel/p5-Data-Perl \
p5-Moo>=1.003000:devel/p5-Moo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-MooX-Types-MooseLike>=0.23:devel/p5-MooX-Types-MooseLike
diff --git a/devel/p5-MooX-Options/Makefile b/devel/p5-MooX-Options/Makefile
index 4ebabff80363..19c9691b8f95 100644
--- a/devel/p5-MooX-Options/Makefile
+++ b/devel/p5-MooX-Options/Makefile
@@ -12,7 +12,8 @@ COMMENT= Option keywords to your object (Mo/Moo/Moose)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Record>=0:devel/p5-Data-Record \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Record>=0:devel/p5-Data-Record \
p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive \
p5-JSON>=0:converters/p5-JSON \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Data-Record>=0:devel/p5-Data-Record \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
p5-Term-Size-Any>=0:devel/p5-Term-Size-Any \
p5-Unicode-LineBreak>=0:textproc/p5-Unicode-LineBreak
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-Mo>=0:devel/p5-Mo \
p5-Moose>=0:devel/p5-Moose \
diff --git a/devel/p5-MooX-StrictConstructor/Makefile b/devel/p5-MooX-StrictConstructor/Makefile
index 33035e7649da..24c20d227084 100644
--- a/devel/p5-MooX-StrictConstructor/Makefile
+++ b/devel/p5-MooX-StrictConstructor/Makefile
@@ -13,10 +13,10 @@ COMMENT= Make your Moo-based object constructors blow up on unknown attributes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
p5-Moo>=1.001000:devel/p5-Moo \
p5-strictures>=1:devel/p5-strictures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-MooX-Thunking/Makefile b/devel/p5-MooX-Thunking/Makefile
index 18ef8039a094..544f8fa7286e 100644
--- a/devel/p5-MooX-Thunking/Makefile
+++ b/devel/p5-MooX-Thunking/Makefile
@@ -12,9 +12,9 @@ COMMENT= Allow Moo attributes to be thunked
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moo>=0:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=0:devel/p5-Moo \
p5-Type-Tiny>=0:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-MooX-TypeTiny/Makefile b/devel/p5-MooX-TypeTiny/Makefile
index c7200d3e2670..a9b0c013a246 100644
--- a/devel/p5-MooX-TypeTiny/Makefile
+++ b/devel/p5-MooX-TypeTiny/Makefile
@@ -13,9 +13,9 @@ COMMENT= Optimized type checks for Moo + Type::Tiny
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moo>=1.004003:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=1.004003:devel/p5-Moo \
p5-Type-Tiny>=1.000002:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/devel/p5-MooX-Types-MooseLike-Numeric/Makefile b/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
index 8de69f2648fb..6de829381987 100644
--- a/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
+++ b/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
@@ -13,9 +13,9 @@ COMMENT= Moo types for numbers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moo>=1.004002:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=1.004002:devel/p5-Moo \
p5-MooX-Types-MooseLike>=0.23:devel/p5-MooX-Types-MooseLike
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-MooX-Types-MooseLike/Makefile b/devel/p5-MooX-Types-MooseLike/Makefile
index 05c72d4aaf3a..3ac0f3c87855 100644
--- a/devel/p5-MooX-Types-MooseLike/Makefile
+++ b/devel/p5-MooX-Types-MooseLike/Makefile
@@ -13,8 +13,8 @@ COMMENT= Some Moosish types and a typer builder
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Runtime>=0.014:devel/p5-Module-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Runtime>=0.014:devel/p5-Module-Runtime
TEST_DEPENDS= p5-Moo>=1.004002:devel/p5-Moo \
p5-Set-Object>=1:devel/p5-Set-Object \
p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
diff --git a/devel/p5-Moos/Makefile b/devel/p5-Moos/Makefile
index a854f5f0f553..bceb33d2f4e3 100644
--- a/devel/p5-Moos/Makefile
+++ b/devel/p5-Moos/Makefile
@@ -15,9 +15,9 @@ COMMENT= Moo s{imple,peedy,ingle}
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-XSAccessor>=1.07:devel/p5-Class-XSAccessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-XSAccessor>=1.07:devel/p5-Class-XSAccessor \
p5-Role-Tiny>=1.002.000:devel/p5-Role-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Sub-Identify>=0.04:devel/p5-Sub-Identify \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
diff --git a/devel/p5-Moose-Autobox/Makefile b/devel/p5-Moose-Autobox/Makefile
index 4175f9878196..6e87d4673c92 100644
--- a/devel/p5-Moose-Autobox/Makefile
+++ b/devel/p5-Moose-Autobox/Makefile
@@ -15,10 +15,10 @@ COMMENT= Autoboxed wrappers for Native Perl datatypes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-autobox>=2.23:devel/p5-autobox \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-autobox>=2.23:devel/p5-autobox \
p5-Moose>=0.42:devel/p5-Moose \
p5-Syntax-Keyword-Junction>=0:devel/p5-Syntax-Keyword-Junction
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.21:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-Moose-Policy/Makefile b/devel/p5-Moose-Policy/Makefile
index 0436635441b1..702fa0b6539e 100644
--- a/devel/p5-Moose-Policy/Makefile
+++ b/devel/p5-Moose-Policy/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Moose-mounted police
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-Moose-Test/Makefile b/devel/p5-Moose-Test/Makefile
index f40a402a70ef..75767970e12c 100644
--- a/devel/p5-Moose-Test/Makefile
+++ b/devel/p5-Moose-Test/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Test Runner for the Moose test suite
-BUILD_DEPENDS= p5-Mouse>=0:devel/p5-Mouse \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mouse>=0:devel/p5-Mouse \
p5-Path-Class>=0:devel/p5-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile
index 94d36b2417ce..8a4f2b08ca45 100644
--- a/devel/p5-Moose/Makefile
+++ b/devel/p5-Moose/Makefile
@@ -16,7 +16,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
# Do not add p5-Data-Visitor to TEST_DEPENDS to avoid cyclic dependency
-BUILD_DEPENDS= p5-Class-Load>=0.09:devel/p5-Class-Load \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Load>=0.09:devel/p5-Class-Load \
p5-Class-Load-XS>=0.01:devel/p5-Class-Load-XS \
p5-Data-OptList>=0.107:devel/p5-Data-OptList \
p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
@@ -35,7 +36,6 @@ BUILD_DEPENDS= p5-Class-Load>=0.09:devel/p5-Class-Load \
p5-Sub-Identify>=0:devel/p5-Sub-Identify \
p5-Sub-Name>=0.20,1:devel/p5-Sub-Name \
p5-Try-Tiny>=0.17:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CPAN-Meta-Check>=0.011:devel/p5-CPAN-Meta-Check \
p5-DBM-Deep>=0:databases/p5-DBM-Deep \
p5-DateTime-Calendar-Mayan>=0:devel/p5-DateTime-Calendar-Mayan \
diff --git a/devel/p5-MooseX-App-Cmd/Makefile b/devel/p5-MooseX-App-Cmd/Makefile
index d83e499c5d53..b2c3f11b8bfc 100644
--- a/devel/p5-MooseX-App-Cmd/Makefile
+++ b/devel/p5-MooseX-App-Cmd/Makefile
@@ -13,13 +13,13 @@ COMMENT= Mashes up MooseX::Getopt and App::Cmd
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-App-Cmd>=0.321:devel/p5-App-Cmd \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-Cmd>=0.321:devel/p5-App-Cmd \
p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
p5-MooseX-NonMoose>=0:devel/p5-MooseX-NonMoose \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-ConfigFromFile>=0:devel/p5-MooseX-ConfigFromFile \
p5-Test-Output>=0:devel/p5-Test-Output \
p5-YAML>=0:textproc/p5-YAML
diff --git a/devel/p5-MooseX-App/Makefile b/devel/p5-MooseX-App/Makefile
index 4c8c601b070c..239a1e953583 100644
--- a/devel/p5-MooseX-App/Makefile
+++ b/devel/p5-MooseX-App/Makefile
@@ -13,14 +13,14 @@ COMMENT= Write user-friendly command line apps with even less suffering
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-Any>=0:devel/p5-Config-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Any>=0:devel/p5-Config-Any \
p5-IO-Interactive>=0:devel/p5-IO-Interactive \
p5-Moose>=2:devel/p5-Moose \
p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Pod-Elemental>=0:textproc/p5-Pod-Elemental \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Most>=0:devel/p5-Test-Most \
p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
@@ -31,7 +31,8 @@ USES= perl5
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 502502
-BUILD_DEPENDS+= p5-Scalar-List-Utils>=1.44:lang/p5-Scalar-List-Utils
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS+= p5-Scalar-List-Utils>=1.44:lang/p5-Scalar-List-Utils
RUN_DEPENDS+= p5-Scalar-List-Utils>=1.44:lang/p5-Scalar-List-Utils
.endif
diff --git a/devel/p5-MooseX-ArrayRef/Makefile b/devel/p5-MooseX-ArrayRef/Makefile
index b3114eb1bf0c..0e4adc507ab4 100644
--- a/devel/p5-MooseX-ArrayRef/Makefile
+++ b/devel/p5-MooseX-ArrayRef/Makefile
@@ -13,8 +13,8 @@ COMMENT= Moose blessed array references
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=2.00:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=2.00:devel/p5-Moose
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-MooseX-Attribute-Chained/Makefile b/devel/p5-MooseX-Attribute-Chained/Makefile
index 2873c187e7a9..c95d0f02cd73 100644
--- a/devel/p5-MooseX-Attribute-Chained/Makefile
+++ b/devel/p5-MooseX-Attribute-Chained/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/devel/p5-MooseX-Attribute-ENV/Makefile b/devel/p5-MooseX-Attribute-ENV/Makefile
index bb3b0f2e7b51..af434519aa8f 100644
--- a/devel/p5-MooseX-Attribute-ENV/Makefile
+++ b/devel/p5-MooseX-Attribute-ENV/Makefile
@@ -14,8 +14,8 @@ COMMENT= Set default of an attribute to a value from %ENV
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=1.19:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=1.19:devel/p5-Moose
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-MooseX-AttributeHelpers/Makefile b/devel/p5-MooseX-AttributeHelpers/Makefile
index 366ced09fa6f..81c0e49bf400 100644
--- a/devel/p5-MooseX-AttributeHelpers/Makefile
+++ b/devel/p5-MooseX-AttributeHelpers/Makefile
@@ -13,8 +13,8 @@ COMMENT= Extend your attribute interfaces
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.56:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.56:devel/p5-Moose
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-MooseX-AttributeShortcuts/Makefile b/devel/p5-MooseX-AttributeShortcuts/Makefile
index 371a3c7ffe05..46e4b6391854 100644
--- a/devel/p5-MooseX-AttributeShortcuts/Makefile
+++ b/devel/p5-MooseX-AttributeShortcuts/Makefile
@@ -12,7 +12,8 @@ COMMENT= Shorthand for common attribute options
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=1.14:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=1.14:devel/p5-Moose \
p5-MooseX-Meta-TypeConstraint-Mooish>=0:devel/p5-MooseX-Meta-TypeConstraint-Mooish \
p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-Moose>=1.14:devel/p5-Moose \
p5-MooseX-Util>=0:devel/p5-MooseX-Util \
p5-aliased>=0:devel/p5-aliased \
p5-namespace-autoclean>=0.24:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
diff --git a/devel/p5-MooseX-AuthorizedMethods/Makefile b/devel/p5-MooseX-AuthorizedMethods/Makefile
index dfd79639f7e1..ba3166a9aa9e 100644
--- a/devel/p5-MooseX-AuthorizedMethods/Makefile
+++ b/devel/p5-MooseX-AuthorizedMethods/Makefile
@@ -14,9 +14,9 @@ COMMENT= Syntax sugar for authorized methods
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=1.21:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=1.21:devel/p5-Moose \
p5-aliased>=0:devel/p5-aliased
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-MooseX-ClassAttribute/Makefile b/devel/p5-MooseX-ClassAttribute/Makefile
index b088a36e47f0..da800ca667a6 100644
--- a/devel/p5-MooseX-ClassAttribute/Makefile
+++ b/devel/p5-MooseX-ClassAttribute/Makefile
@@ -14,11 +14,11 @@ COMMENT= Declare class attributes Moose-style
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=2:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=2:devel/p5-Moose \
p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils \
p5-namespace-autoclean>=0.11:devel/p5-namespace-autoclean \
p5-namespace-clean>=0.20:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
p5-MooseX-Role-Strict>=0:devel/p5-MooseX-Role-Strict \
p5-Test-Requires>=0.05:devel/p5-Test-Requires \
diff --git a/devel/p5-MooseX-Daemonize/Makefile b/devel/p5-MooseX-Daemonize/Makefile
index 66a817b2335e..9c9ab5ab2e8f 100644
--- a/devel/p5-MooseX-Daemonize/Makefile
+++ b/devel/p5-MooseX-Daemonize/Makefile
@@ -13,12 +13,12 @@ COMMENT= Role for daemonizing your Moose based application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.33:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+ p5-Devel-CheckOS>=1.63:devel/p5-Devel-CheckOS
+RUN_DEPENDS= p5-Moose>=0.33:devel/p5-Moose \
p5-MooseX-Getopt>=0.07:devel/p5-MooseX-Getopt \
p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
-BUILD_DEPENDS+= p5-Devel-CheckOS>=1.63:devel/p5-Devel-CheckOS
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-MooseX-Declare/Makefile b/devel/p5-MooseX-Declare/Makefile
index d36c6b256620..57a5c8b8f04b 100644
--- a/devel/p5-MooseX-Declare/Makefile
+++ b/devel/p5-MooseX-Declare/Makefile
@@ -13,7 +13,8 @@ COMMENT= Declarative syntax for Moose
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Moose>=0.90:devel/p5-Moose \
p5-MooseX-Method-Signatures>=0.36:devel/p5-MooseX-Method-Signatures \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
p5-aliased>=0:devel/p5-aliased \
p5-namespace-autoclean>=0.16:devel/p5-namespace-autoclean \
p5-namespace-clean>=0.19:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/devel/p5-MooseX-FollowPBP/Makefile b/devel/p5-MooseX-FollowPBP/Makefile
index a4283ad6d9b0..5c97442464fa 100644
--- a/devel/p5-MooseX-FollowPBP/Makefile
+++ b/devel/p5-MooseX-FollowPBP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Name your accessors get_foo() and set_foo()
-BUILD_DEPENDS= p5-Moose>=1.16:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=1.16:devel/p5-Moose
LICENSE= ART20
diff --git a/devel/p5-MooseX-Getopt/Makefile b/devel/p5-MooseX-Getopt/Makefile
index dbd987a93b4d..3e2ab2b500ab 100644
--- a/devel/p5-MooseX-Getopt/Makefile
+++ b/devel/p5-MooseX-Getopt/Makefile
@@ -15,13 +15,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Getopt-Long-Descriptive>=0.081:devel/p5-Getopt-Long-Descriptive \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Getopt-Long-Descriptive>=0.081:devel/p5-Getopt-Long-Descriptive \
p5-Moose>=0.56:devel/p5-Moose \
p5-MooseX-ConfigFromFile>=0:devel/p5-MooseX-ConfigFromFile \
p5-MooseX-Role-Parameterized>=1.01:devel/p5-MooseX-Role-Parameterized \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-SimpleConfig>=0.07:devel/p5-MooseX-SimpleConfig \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Path-Tiny>=0.009:devel/p5-Path-Tiny \
diff --git a/devel/p5-MooseX-Has-Options/Makefile b/devel/p5-MooseX-Has-Options/Makefile
index ce8cd3a50dce..f0b4b052365b 100644
--- a/devel/p5-MooseX-Has-Options/Makefile
+++ b/devel/p5-MooseX-Has-Options/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= MooseX::Has::Options - Succinct options for Moose
-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-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Package-Stash>=0.18:devel/p5-Package-Stash \
p5-String-RewritePrefix>=0:textproc/p5-String-RewritePrefix \
p5-Moose>=0:devel/p5-Moose \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Most>=0:devel/p5-Test-Most
USES= perl5
diff --git a/devel/p5-MooseX-Has-Sugar/Makefile b/devel/p5-MooseX-Has-Sugar/Makefile
index 94fcd7e9eab5..2a802964d21a 100644
--- a/devel/p5-MooseX-Has-Sugar/Makefile
+++ b/devel/p5-MooseX-Has-Sugar/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive
TEST_DEPENDS= p5-MooseX-Types>=0.44:devel/p5-MooseX-Types \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-namespace-clean>=0:devel/p5-namespace-clean
diff --git a/devel/p5-MooseX-InsideOut/Makefile b/devel/p5-MooseX-InsideOut/Makefile
index 71e1438ef1e1..3c66ffa4250c 100644
--- a/devel/p5-MooseX-InsideOut/Makefile
+++ b/devel/p5-MooseX-InsideOut/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Inside-out objects with Moose
-BUILD_DEPENDS= p5-Hash-Util-FieldHash-Compat>=0:devel/p5-Hash-Util-FieldHash-Compat \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Hash-Util-FieldHash-Compat>=0:devel/p5-Hash-Util-FieldHash-Compat \
p5-Moose>=2:devel/p5-Moose \
p5-namespace-clean>=0.11:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-MooseX-LazyRequire/Makefile b/devel/p5-MooseX-LazyRequire/Makefile
index 97a611a77b45..e01c47583cf8 100644
--- a/devel/p5-MooseX-LazyRequire/Makefile
+++ b/devel/p5-MooseX-LazyRequire/Makefile
@@ -12,10 +12,10 @@ COMMENT= Required attributes which fail only when trying to use them
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.94:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.94:devel/p5-Moose \
p5-aliased>=0.30:devel/p5-aliased \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/devel/p5-MooseX-Log-Log4perl/Makefile b/devel/p5-MooseX-Log-Log4perl/Makefile
index 63b2ff92f42f..098b73655ecb 100644
--- a/devel/p5-MooseX-Log-Log4perl/Makefile
+++ b/devel/p5-MooseX-Log-Log4perl/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Logging role for Moose based on Log::Log4perl
-BUILD_DEPENDS= p5-Any-Moose>=0.12:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0.12:devel/p5-Any-Moose \
p5-Log-Log4perl>=1.13:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-stringy>=0:devel/p5-IO-stringy \
p5-Moose>=0.65:devel/p5-Moose
diff --git a/devel/p5-MooseX-MarkAsMethods/Makefile b/devel/p5-MooseX-MarkAsMethods/Makefile
index c19ede1aa142..21fc922ba8ba 100644
--- a/devel/p5-MooseX-MarkAsMethods/Makefile
+++ b/devel/p5-MooseX-MarkAsMethods/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Mark overload code symbols as methods
-BUILD_DEPENDS= p5-B-Hooks-EndOfScope>=0:devel/p5-B-Hooks-EndOfScope \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Hooks-EndOfScope>=0:devel/p5-B-Hooks-EndOfScope \
p5-Moose>=0.94:devel/p5-Moose \
p5-namespace-autoclean>=0.12:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile b/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
index 6d3d6b20fd14..3ad72915ddf6 100644
--- a/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
+++ b/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile b/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile
index 4b014eaa37e7..7ac7a132c137 100644
--- a/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile
+++ b/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile
@@ -11,10 +11,10 @@ COMMENT= Translate Moo-style constraints to Moose-style
LICENSE= LGPL21
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-autoclean>=0.24:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Moose-More>=0.028:devel/p5-Test-Moose-More \
diff --git a/devel/p5-MooseX-MetaDescription/Makefile b/devel/p5-MooseX-MetaDescription/Makefile
index 19a35410f337..ca8da7fed994 100644
--- a/devel/p5-MooseX-MetaDescription/Makefile
+++ b/devel/p5-MooseX-MetaDescription/Makefile
@@ -14,8 +14,8 @@ COMMENT= Framework for adding additional metadata to Moose classes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.4:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.4:devel/p5-Moose
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USE_PERL5= configure
diff --git a/devel/p5-MooseX-Method-Signatures/Makefile b/devel/p5-MooseX-Method-Signatures/Makefile
index d57353886b24..01298e50177c 100644
--- a/devel/p5-MooseX-Method-Signatures/Makefile
+++ b/devel/p5-MooseX-Method-Signatures/Makefile
@@ -13,7 +13,8 @@ COMMENT= Method declarations with type constraints and no source filter
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-B-Hooks-EndOfScope>=0.10:devel/p5-B-Hooks-EndOfScope \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Hooks-EndOfScope>=0.10:devel/p5-B-Hooks-EndOfScope \
p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
p5-Context-Preserve>=0:devel/p5-Context-Preserve \
p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
@@ -28,7 +29,6 @@ BUILD_DEPENDS= p5-B-Hooks-EndOfScope>=0.10:devel/p5-B-Hooks-EndOfScope \
p5-aliased>=0:devel/p5-aliased \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
p5-namespace-clean>=0.19:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Eval-Closure>=0:devel/p5-Eval-Closure \
p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Fatal>=0:devel/p5-Test-Fatal
diff --git a/devel/p5-MooseX-MethodAttributes/Makefile b/devel/p5-MooseX-MethodAttributes/Makefile
index 7440544d3a29..3748838f3478 100644
--- a/devel/p5-MooseX-MethodAttributes/Makefile
+++ b/devel/p5-MooseX-MethodAttributes/Makefile
@@ -13,10 +13,10 @@ COMMENT= Code attribute introspection
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.98:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.98:devel/p5-Moose \
p5-MooseX-Types>=0.21:devel/p5-MooseX-Types \
p5-namespace-autoclean>=0.08:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-MooseX-NonMoose/Makefile b/devel/p5-MooseX-NonMoose/Makefile
index 0470b91b1806..50cf7943a952 100644
--- a/devel/p5-MooseX-NonMoose/Makefile
+++ b/devel/p5-MooseX-NonMoose/Makefile
@@ -15,11 +15,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Moose>=2:devel/p5-Moose \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-InsideOut>=0:devel/p5-MooseX-InsideOut \
p5-Test-Fatal>=0:devel/p5-Test-Fatal
diff --git a/devel/p5-MooseX-Object-Pluggable/Makefile b/devel/p5-MooseX-Object-Pluggable/Makefile
index 09e912eba7bc..154021b32977 100644
--- a/devel/p5-MooseX-Object-Pluggable/Makefile
+++ b/devel/p5-MooseX-Object-Pluggable/Makefile
@@ -15,12 +15,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/devel/p5-MooseX-OneArgNew/Makefile b/devel/p5-MooseX-OneArgNew/Makefile
index 60c2588622a1..8a8b0e6e36c8 100644
--- a/devel/p5-MooseX-OneArgNew/Makefile
+++ b/devel/p5-MooseX-OneArgNew/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Role-Parameterized>=1.01:devel/p5-MooseX-Role-Parameterized \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-MooseX-POE/Makefile b/devel/p5-MooseX-POE/Makefile
index 9dcbf92cd19a..ec778f3acbd2 100644
--- a/devel/p5-MooseX-POE/Makefile
+++ b/devel/p5-MooseX-POE/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=2.0002:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=2.0002:devel/p5-Moose \
p5-POE>=1.310:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-Declare>=0:devel/p5-MooseX-Declare \
p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
diff --git a/devel/p5-MooseX-Params-Validate/Makefile b/devel/p5-MooseX-Params-Validate/Makefile
index 5d6200530320..264e7e6c9c7b 100644
--- a/devel/p5-MooseX-Params-Validate/Makefile
+++ b/devel/p5-MooseX-Params-Validate/Makefile
@@ -13,11 +13,11 @@ COMMENT= Extension of Params::Validate for using Moose types
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-Caller>=0:devel/p5-Devel-Caller \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Caller>=0:devel/p5-Devel-Caller \
p5-Moose>=0.58:devel/p5-Moose \
p5-Params-Validate>=0.88:devel/p5-Params-Validate \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/devel/p5-MooseX-RelatedClassRoles/Makefile b/devel/p5-MooseX-RelatedClassRoles/Makefile
index 79b0eb2be3d2..5ed22609e65e 100644
--- a/devel/p5-MooseX-RelatedClassRoles/Makefile
+++ b/devel/p5-MooseX-RelatedClassRoles/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Apply roles to a class related to yours
-BUILD_DEPENDS= p5-Moose>=2:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=2:devel/p5-Moose \
p5-MooseX-Role-Parameterized>=0.04:devel/p5-MooseX-Role-Parameterized
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-MooseX-Role-Loggable/Makefile b/devel/p5-MooseX-Role-Loggable/Makefile
index 273e2721e666..ce25ec82c25c 100644
--- a/devel/p5-MooseX-Role-Loggable/Makefile
+++ b/devel/p5-MooseX-Role-Loggable/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Log-Dispatchouli>=0:devel/p5-Log-Dispatchouli \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Dispatchouli>=0:devel/p5-Log-Dispatchouli \
p5-Moo>=1.000001:devel/p5-Moo \
p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike \
p5-Safe-Isa>=0:devel/p5-Safe-Isa \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-MooseX-Role-Matcher/Makefile b/devel/p5-MooseX-Role-Matcher/Makefile
index eaf9a5a78c7d..2e871e7eb037 100644
--- a/devel/p5-MooseX-Role-Matcher/Makefile
+++ b/devel/p5-MooseX-Role-Matcher/Makefile
@@ -14,9 +14,9 @@ COMMENT= Generic object matching based on attributes and methods
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-MooseX-Role-Parameterized>=0.03:devel/p5-MooseX-Role-Parameterized
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
USE_PERL5= configure
diff --git a/devel/p5-MooseX-Role-Parameterized/Makefile b/devel/p5-MooseX-Role-Parameterized/Makefile
index d5c556a8d51c..734a6a1d5a7c 100644
--- a/devel/p5-MooseX-Role-Parameterized/Makefile
+++ b/devel/p5-MooseX-Role-Parameterized/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Moose>=2.0300:devel/p5-Moose \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
p5-namespace-clean>=0.19:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CPAN-Meta-Check>=0.011:devel/p5-CPAN-Meta-Check \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-MooseX-Role-Strict/Makefile b/devel/p5-MooseX-Role-Strict/Makefile
index 88a4381795bc..75c097bc4ac2 100644
--- a/devel/p5-MooseX-Role-Strict/Makefile
+++ b/devel/p5-MooseX-Role-Strict/Makefile
@@ -14,8 +14,8 @@ COMMENT= Use strict 'roles'
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.89:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.89:devel/p5-Moose
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-MooseX-Runnable/Makefile b/devel/p5-MooseX-Runnable/Makefile
index 6ae39bd52fc4..078869c3bf60 100644
--- a/devel/p5-MooseX-Runnable/Makefile
+++ b/devel/p5-MooseX-Runnable/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-List-SomeUtils>=0:devel/p5-List-SomeUtils \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Class-Load>=0:devel/p5-Class-Load \
p5-Params-Util>=0:devel/p5-Params-Util \
p5-Path-Tiny>=0:devel/p5-Path-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-TableDriven>=0:devel/p5-Test-TableDriven
diff --git a/devel/p5-MooseX-SemiAffordanceAccessor/Makefile b/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
index 97b1f0bddd95..2d1f584443d2 100644
--- a/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
+++ b/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
@@ -14,8 +14,8 @@ COMMENT= Name your accessors foo() and set_foo()
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0.94:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.94:devel/p5-Moose
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-MooseX-SetOnce/Makefile b/devel/p5-MooseX-SetOnce/Makefile
index 1cc4a3233e63..22c9234cc0f4 100644
--- a/devel/p5-MooseX-SetOnce/Makefile
+++ b/devel/p5-MooseX-SetOnce/Makefile
@@ -14,8 +14,8 @@ COMMENT= Write-once, read-many attributes for Moose
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.90:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.90:devel/p5-Moose
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/devel/p5-MooseX-Singleton/Makefile b/devel/p5-MooseX-Singleton/Makefile
index 038f1c401215..aaea353bd467 100644
--- a/devel/p5-MooseX-Singleton/Makefile
+++ b/devel/p5-MooseX-Singleton/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=1.10:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=1.10:devel/p5-Moose
TEST_DEPENDS= p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Requires>=0:devel/p5-Test-Requires \
diff --git a/devel/p5-MooseX-Storage/Makefile b/devel/p5-MooseX-Storage/Makefile
index 5912e0428359..909619a5ddf8 100644
--- a/devel/p5-MooseX-Storage/Makefile
+++ b/devel/p5-MooseX-Storage/Makefile
@@ -13,11 +13,11 @@ COMMENT= Serialization framework for Moose classes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON-MaybeXS>=1.001000:converters/p5-JSON-MaybeXS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-MaybeXS>=1.001000:converters/p5-JSON-MaybeXS \
p5-Moose>=0.99:devel/p5-Moose \
p5-String-RewritePrefix>=0.004:textproc/p5-String-RewritePrefix \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-stringy>=0:devel/p5-IO-stringy \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Test-Deep>=0:devel/p5-Test-Deep \
diff --git a/devel/p5-MooseX-StrictConstructor/Makefile b/devel/p5-MooseX-StrictConstructor/Makefile
index fadd60f5bf6f..f9d61a8469dd 100644
--- a/devel/p5-MooseX-StrictConstructor/Makefile
+++ b/devel/p5-MooseX-StrictConstructor/Makefile
@@ -12,9 +12,9 @@ COMMENT= Make your MooseX object constructors blow up on unknown attributes
LICENSE= ART20
-BUILD_DEPENDS= p5-Moose>=0.94:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.94:devel/p5-Moose \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/devel/p5-MooseX-TraitFor-Meta-Class-BetterAnonClassNames/Makefile b/devel/p5-MooseX-TraitFor-Meta-Class-BetterAnonClassNames/Makefile
index 99952689efb2..21dc09d897a3 100644
--- a/devel/p5-MooseX-TraitFor-Meta-Class-BetterAnonClassNames/Makefile
+++ b/devel/p5-MooseX-TraitFor-Meta-Class-BetterAnonClassNames/Makefile
@@ -13,10 +13,10 @@ COMMENT= Metaclass trait to demystify generated anonymous class names
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-autobox-Core>=0:devel/p5-autobox-Core \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
p5-Test-Moose-More>=0:devel/p5-Test-Moose-More
diff --git a/devel/p5-MooseX-Traits-Pluggable/Makefile b/devel/p5-MooseX-Traits-Pluggable/Makefile
index 33d07010b374..d79188e0116b 100644
--- a/devel/p5-MooseX-Traits-Pluggable/Makefile
+++ b/devel/p5-MooseX-Traits-Pluggable/Makefile
@@ -14,12 +14,12 @@ COMMENT= Trait loading and resolution for Moose
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= \
p5-Moose>=0:devel/p5-Moose \
p5-Class-Load>=0:devel/p5-Class-Load \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-MooseX-Traits/Makefile b/devel/p5-MooseX-Traits/Makefile
index 8750fa811dc1..e83b1efe4c82 100644
--- a/devel/p5-MooseX-Traits/Makefile
+++ b/devel/p5-MooseX-Traits/Makefile
@@ -13,11 +13,11 @@ COMMENT= Moose eXtension to automatically apply roles at object creation time
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-Moose>=0:devel/p5-Moose \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-MooseX-TransactionalMethods/Makefile b/devel/p5-MooseX-TransactionalMethods/Makefile
index 252ebbb77a38..95910ab07e83 100644
--- a/devel/p5-MooseX-TransactionalMethods/Makefile
+++ b/devel/p5-MooseX-TransactionalMethods/Makefile
@@ -13,10 +13,10 @@ COMMENT= Syntax sugar for transactional methods
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=1.21:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=1.21:devel/p5-Moose \
p5-Sub-Name>=0:devel/p5-Sub-Name \
p5-aliased>=0:devel/p5-aliased
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-MooseX-Types-Common/Makefile b/devel/p5-MooseX-Types-Common/Makefile
index 7265d930b5b9..0837527d2cd4 100644
--- a/devel/p5-MooseX-Types-Common/Makefile
+++ b/devel/p5-MooseX-Types-Common/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0.39:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.39:devel/p5-Moose \
p5-MooseX-Types>=0.04:devel/p5-MooseX-Types
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Warnings>=0.005:devel/p5-Test-Warnings
diff --git a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
index 9c167dbd1d03..c880ad9b9640 100644
--- a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
@@ -14,14 +14,14 @@ COMMENT= DateTime related constraints and coercions for Moose
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0.43:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.43:devel/p5-DateTime \
p5-DateTime-Locale>=0.40:devel/p5-DateTime-Locale \
p5-DateTime-TimeZone>=0.96:devel/p5-DateTime-TimeZone \
p5-Moose>=0.41:devel/p5-Moose \
p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
p5-Olson-Abbreviations>=0.03:devel/p5-Olson-Abbreviations \
p5-namespace-clean>=0.08:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.27:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
index d617e47232d8..ecffb8dd5c90 100644
--- a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
@@ -14,14 +14,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-DateTime>=0.43.02:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.43.02:devel/p5-DateTime \
p5-DateTimeX-Easy>=0.085:devel/p5-DateTimeX-Easy \
p5-Moose>=0.41:devel/p5-Moose \
p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
p5-MooseX-Types-DateTime>=0.06:devel/p5-MooseX-Types-DateTime \
p5-Time-Duration-Parse>=0.06:devel/p5-Time-Duration-Parse \
p5-namespace-clean>=0.19:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-MooseX-Types-DateTime/Makefile b/devel/p5-MooseX-Types-DateTime/Makefile
index 3671390e7cad..38760f7311f9 100644
--- a/devel/p5-MooseX-Types-DateTime/Makefile
+++ b/devel/p5-MooseX-Types-DateTime/Makefile
@@ -15,13 +15,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENCE
-BUILD_DEPENDS= p5-DateTime>=0.43.02:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.43.02:devel/p5-DateTime \
p5-DateTime-Locale>=0.40.01:devel/p5-DateTime-Locale \
p5-DateTime-TimeZone>=0.95:devel/p5-DateTime-TimeZone \
p5-Moose>=0.41:devel/p5-Moose \
p5-MooseX-Types>=0.30:devel/p5-MooseX-Types \
p5-namespace-clean>=0.19:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-MooseX-Types-DateTimeX/Makefile b/devel/p5-MooseX-Types-DateTimeX/Makefile
index b0b9fee88ae1..f82d0cafe294 100644
--- a/devel/p5-MooseX-Types-DateTimeX/Makefile
+++ b/devel/p5-MooseX-Types-DateTimeX/Makefile
@@ -14,13 +14,13 @@ COMMENT= Extensions to MooseX::Types::DateTime::ButMaintained
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTimeX-Easy>=0.085:devel/p5-DateTimeX-Easy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTimeX-Easy>=0.085:devel/p5-DateTimeX-Easy \
p5-Moose>=0.41:devel/p5-Moose \
p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
p5-MooseX-Types-DateTime-ButMaintained>=0.04:devel/p5-MooseX-Types-DateTime-ButMaintained \
p5-Time-Duration-Parse>=0.06:devel/p5-Time-Duration-Parse \
p5-namespace-clean>=0.08:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-MooseX-Types-JSON/Makefile b/devel/p5-MooseX-Types-JSON/Makefile
index 51acfc5fc39d..0645e4830057 100644
--- a/devel/p5-MooseX-Types-JSON/Makefile
+++ b/devel/p5-MooseX-Types-JSON/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-JSON>=2.00:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2.00:converters/p5-JSON \
p5-Moose>=0.82:devel/p5-Moose \
p5-MooseX-Types>=0.15:devel/p5-MooseX-Types
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.00:devel/p5-Test-Pod
NO_ARCH= yes
diff --git a/devel/p5-MooseX-Types-Perl/Makefile b/devel/p5-MooseX-Types-Perl/Makefile
index 622334643beb..1281d3c301ae 100644
--- a/devel/p5-MooseX-Types-Perl/Makefile
+++ b/devel/p5-MooseX-Types-Perl/Makefile
@@ -14,9 +14,9 @@ COMMENT= Moose types that check against Perl syntax
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-Params-Util>=0:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-MooseX-Types-Set-Object/Makefile b/devel/p5-MooseX-Types-Set-Object/Makefile
index c9b12a0b6b5e..eb0c1e915923 100644
--- a/devel/p5-MooseX-Types-Set-Object/Makefile
+++ b/devel/p5-MooseX-Types-Set-Object/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0.50:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.50:devel/p5-Moose \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-Set-Object>=0:devel/p5-Set-Object
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-MooseX-Types-Signal/Makefile b/devel/p5-MooseX-Types-Signal/Makefile
index 2a05d0295ca3..ca248f510243 100644
--- a/devel/p5-MooseX-Types-Signal/Makefile
+++ b/devel/p5-MooseX-Types-Signal/Makefile
@@ -14,8 +14,8 @@ COMMENT= Type to represent valid UNIX or Perl signals
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MooseX-Types>0:devel/p5-MooseX-Types
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MooseX-Types>0:devel/p5-MooseX-Types
TEST_DEPENDS= p5-Test-Exception>0:devel/p5-Test-Exception \
p5-Moose>0:devel/p5-Moose
diff --git a/devel/p5-MooseX-Types-Structured/Makefile b/devel/p5-MooseX-Types-Structured/Makefile
index 7f5878cfd2bb..a6300f6ed854 100644
--- a/devel/p5-MooseX-Types-Structured/Makefile
+++ b/devel/p5-MooseX-Types-Structured/Makefile
@@ -13,12 +13,12 @@ COMMENT= Moose Type Constraint classes for Structured Types
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-PartialDump>=0.13:devel/p5-Devel-PartialDump \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-PartialDump>=0.13:devel/p5-Devel-PartialDump \
p5-Moose>=1.08:devel/p5-Moose \
p5-MooseX-Types>=0.22:devel/p5-MooseX-Types \
p5-Sub-Exporter>=0.982:devel/p5-Sub-Exporter \
p5-namespace-clean>=0.19:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Needs>=0:devel/p5-Test-Needs
diff --git a/devel/p5-MooseX-Types-URI/Makefile b/devel/p5-MooseX-Types-URI/Makefile
index 7a934c383874..557561e034c9 100644
--- a/devel/p5-MooseX-Types-URI/Makefile
+++ b/devel/p5-MooseX-Types-URI/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Types>=0.40:devel/p5-MooseX-Types \
p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
p5-URI>=0:net/p5-URI \
p5-URI-FromHash>=0:net/p5-URI-FromHash \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuildtiny
diff --git a/devel/p5-MooseX-Types/Makefile b/devel/p5-MooseX-Types/Makefile
index 35d8db1c12e9..270eea8af81e 100644
--- a/devel/p5-MooseX-Types/Makefile
+++ b/devel/p5-MooseX-Types/Makefile
@@ -13,7 +13,8 @@ COMMENT= Organise your Moose types in libraries
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Clan>=6.00:devel/p5-Carp-Clan \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>=6.00:devel/p5-Carp-Clan \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Moose>=1.06:devel/p5-Moose \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Carp-Clan>=6.00:devel/p5-Carp-Clan \
p5-Sub-Name>=0:devel/p5-Sub-Name \
p5-namespace-autoclean>=0.08:devel/p5-namespace-autoclean \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Module-Metadata>=0:devel/p5-Module-Metadata \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-MooseX-Util/Makefile b/devel/p5-MooseX-Util/Makefile
index 267bd2dc8742..a5e46a816899 100644
--- a/devel/p5-MooseX-Util/Makefile
+++ b/devel/p5-MooseX-Util/Makefile
@@ -14,11 +14,11 @@ COMMENT= Moose::Util extensions
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-MooseX-TraitFor-Meta-Class-BetterAnonClassNames>=0.002001:devel/p5-MooseX-TraitFor-Meta-Class-BetterAnonClassNames \
p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
p5-Test-Moose-More>=0.016:devel/p5-Test-Moose-More \
p5-Test-Requires>=0:devel/p5-Test-Requires \
diff --git a/devel/p5-MouseX-App-Cmd/Makefile b/devel/p5-MouseX-App-Cmd/Makefile
index 99313efbc10f..a1798d4f9a1f 100644
--- a/devel/p5-MouseX-App-Cmd/Makefile
+++ b/devel/p5-MouseX-App-Cmd/Makefile
@@ -13,14 +13,14 @@ COMMENT= Mashes up MouseX::Getopt and App::Cmd
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-App-Cmd>=0.321:devel/p5-App-Cmd \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-Cmd>=0.321:devel/p5-App-Cmd \
p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive \
p5-Mouse>=0:devel/p5-Mouse \
p5-MouseX-ConfigFromFile>=0:devel/p5-MouseX-ConfigFromFile \
p5-MouseX-Getopt>=0:devel/p5-MouseX-Getopt \
p5-YAML>=0:textproc/p5-YAML \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Output>=0:devel/p5-Test-Output
USE_PERL5= configure
diff --git a/devel/p5-MouseX-ConfigFromFile/Makefile b/devel/p5-MouseX-ConfigFromFile/Makefile
index 236734b25ae8..4b4569c33a9a 100644
--- a/devel/p5-MouseX-ConfigFromFile/Makefile
+++ b/devel/p5-MouseX-ConfigFromFile/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= Abstract Mouse role for setting attributes from a configfile
-BUILD_DEPENDS= p5-Filter>=0:devel/p5-Filter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Filter>=0:devel/p5-Filter \
p5-Mouse>=0.19:devel/p5-Mouse \
p5-MouseX-Types-Path-Class>=0.05:devel/p5-MouseX-Types-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-MouseX-Foreign/Makefile b/devel/p5-MouseX-Foreign/Makefile
index 84a018d1706a..acba2cb4e300 100644
--- a/devel/p5-MouseX-Foreign/Makefile
+++ b/devel/p5-MouseX-Foreign/Makefile
@@ -14,8 +14,8 @@ COMMENT= Extends non-Mouse classes as well as Mouse classes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mouse>=0.77:devel/p5-Mouse
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mouse>=0.77:devel/p5-Mouse
TEST_DEPENDS= p5-Any-Moose>=0.15:devel/p5-Any-Moose \
p5-Moose>=0:devel/p5-Moose \
p5-Test-Exception>=0:devel/p5-Test-Exception \
diff --git a/devel/p5-MouseX-NativeTraits/Makefile b/devel/p5-MouseX-NativeTraits/Makefile
index 4e31d88ac050..c223a66802fd 100644
--- a/devel/p5-MouseX-NativeTraits/Makefile
+++ b/devel/p5-MouseX-NativeTraits/Makefile
@@ -14,8 +14,8 @@ COMMENT= Extend your attribute interfaces for Mouse
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mouse>=0.82:devel/p5-Mouse
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mouse>=0.82:devel/p5-Mouse
TEST_DEPENDS= p5-Any-Moose>=0.13:devel/p5-Any-Moose \
p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
diff --git a/devel/p5-MouseX-StrictConstructor/Makefile b/devel/p5-MouseX-StrictConstructor/Makefile
index 8ec75ed6e536..6df17dcbee06 100644
--- a/devel/p5-MouseX-StrictConstructor/Makefile
+++ b/devel/p5-MouseX-StrictConstructor/Makefile
@@ -15,8 +15,8 @@ COMMENT= Make your object constructors blow up on unknown attributes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mouse>=0.62:devel/p5-Mouse
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mouse>=0.62:devel/p5-Mouse
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-MouseX-Traits/Makefile b/devel/p5-MouseX-Traits/Makefile
index 041c08ecbb7f..ee92e9d11419 100644
--- a/devel/p5-MouseX-Traits/Makefile
+++ b/devel/p5-MouseX-Traits/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Automatically apply roles at object creation time
-BUILD_DEPENDS= p5-Mouse>=0.81:devel/p5-Mouse
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mouse>=0.81:devel/p5-Mouse
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USE_PERL5= configure
diff --git a/devel/p5-MouseX-Types-Path-Class/Makefile b/devel/p5-MouseX-Types-Path-Class/Makefile
index d3dd57a119ab..a478191895f2 100644
--- a/devel/p5-MouseX-Types-Path-Class/Makefile
+++ b/devel/p5-MouseX-Types-Path-Class/Makefile
@@ -15,11 +15,11 @@ COMMENT= Path::Class type library for Mouse
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mouse>=0.39:devel/p5-Mouse \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mouse>=0.39:devel/p5-Mouse \
p5-MouseX-Types>=0.02:devel/p5-MouseX-Types \
p5-Path-Class>0:devel/p5-Path-Class \
p5-MouseX-Getopt>=0.22:devel/p5-MouseX-Getopt
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-UseAllModules>0:devel/p5-Test-UseAllModules
diff --git a/devel/p5-Net-DBus/Makefile b/devel/p5-Net-DBus/Makefile
index 9b5c0ec1a7ae..f7b95ae885d0 100644
--- a/devel/p5-Net-DBus/Makefile
+++ b/devel/p5-Net-DBus/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl extension for the DBus message system
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-Grove>=0:textproc/p5-XML-Grove \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Grove>=0:textproc/p5-XML-Grove \
p5-XML-Twig>=0:textproc/p5-XML-Twig
LIB_DEPENDS= libdbus-1.so:devel/dbus
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 pkgconfig
USE_PERL5= configure
diff --git a/devel/p5-Number-Tolerant/Makefile b/devel/p5-Number-Tolerant/Makefile
index 52a85e0408bd..c3e705693753 100644
--- a/devel/p5-Number-Tolerant/Makefile
+++ b/devel/p5-Number-Tolerant/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Sub-Exporter>=0.950:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Exporter>=0.950:devel/p5-Sub-Exporter
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-OLE-Storage_Lite/Makefile b/devel/p5-OLE-Storage_Lite/Makefile
index 1e055b99f563..3f63c2d85a0f 100644
--- a/devel/p5-OLE-Storage_Lite/Makefile
+++ b/devel/p5-OLE-Storage_Lite/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module for OLE document interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Object-Array/Makefile b/devel/p5-Object-Array/Makefile
index 15f8219b4438..4ad5c7a6e864 100644
--- a/devel/p5-Object-Array/Makefile
+++ b/devel/p5-Object-Array/Makefile
@@ -14,10 +14,10 @@ COMMENT= Array references with accessors
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-Sub-Install>=0:devel/p5-Sub-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Object-Authority/Makefile b/devel/p5-Object-Authority/Makefile
index b168c3fe6eb4..52283473fcb5 100644
--- a/devel/p5-Object-Authority/Makefile
+++ b/devel/p5-Object-Authority/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module that adds an AUTHORITY method to your class
-BUILD_DEPENDS= p5-Object-Role>=0:devel/p5-Object-Role
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Object-Role>=0:devel/p5-Object-Role
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-Object-Container/Makefile b/devel/p5-Object-Container/Makefile
index 263beca90dd7..0d5584c9a871 100644
--- a/devel/p5-Object-Container/Makefile
+++ b/devel/p5-Object-Container/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple object container
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
TEST_DEPENDS= p5-Test-Requires>=0:devel/p5-Test-Requires
PORTSCOUT= limit:^[0-9]*.[0-9][0-9]$$
diff --git a/devel/p5-Object-Event/Makefile b/devel/p5-Object-Event/Makefile
index 613ea8501e7e..fa0c556ae393 100644
--- a/devel/p5-Object-Event/Makefile
+++ b/devel/p5-Object-Event/Makefile
@@ -15,9 +15,9 @@ COMMENT= Class that provides an event callback interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=3.5:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=3.5:devel/p5-AnyEvent \
p5-common-sense>=0:devel/p5-common-sense
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Object-InsideOut/Makefile b/devel/p5-Object-InsideOut/Makefile
index c5cfe00e5664..7a032e98032f 100644
--- a/devel/p5-Object-InsideOut/Makefile
+++ b/devel/p5-Object-InsideOut/Makefile
@@ -14,9 +14,9 @@ COMMENT= Comprehensive inside-out object support module
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Exception-Class>=1.32:devel/p5-Exception-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exception-Class>=1.32:devel/p5-Exception-Class \
p5-Want>=0.21:devel/p5-Want
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Object-Pluggable/Makefile b/devel/p5-Object-Pluggable/Makefile
index 4c3b070ecafe..2dc2b990af2f 100644
--- a/devel/p5-Object-Pluggable/Makefile
+++ b/devel/p5-Object-Pluggable/Makefile
@@ -15,8 +15,8 @@ COMMENT= Base class for creating plugin-enabled objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Task-Weaken>=0:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Task-Weaken>=0:devel/p5-Task-Weaken
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Object-Role/Makefile b/devel/p5-Object-Role/Makefile
index d157b572cfd3..1de50b866582 100644
--- a/devel/p5-Object-Role/Makefile
+++ b/devel/p5-Object-Role/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Sub-Name>=0:devel/p5-Sub-Name
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Name>=0:devel/p5-Sub-Name
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Olson-Abbreviations/Makefile b/devel/p5-Olson-Abbreviations/Makefile
index b7c81fdcae1b..46570a2f02ec 100644
--- a/devel/p5-Olson-Abbreviations/Makefile
+++ b/devel/p5-Olson-Abbreviations/Makefile
@@ -15,10 +15,10 @@ COMMENT= Globally unique timezones abbreviation handling
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-ClassAttribute>=0.25:devel/p5-MooseX-ClassAttribute \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile
index 96195002560f..ab1f1dccbc0d 100644
--- a/devel/p5-PAR/Makefile
+++ b/devel/p5-PAR/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Archive-Zip>=1:archivers/p5-Archive-Zip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Zip>=1:archivers/p5-Archive-Zip \
p5-PAR-Dist>=0.32:devel/p5-PAR-Dist
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-POE-API-Hooks/Makefile b/devel/p5-POE-API-Hooks/Makefile
index 14122bc3b1af..fb7776ad8c9b 100644
--- a/devel/p5-POE-API-Hooks/Makefile
+++ b/devel/p5-POE-API-Hooks/Makefile
@@ -15,9 +15,9 @@ COMMENT= Implement lightweight hooks into POE
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-API-Peek/Makefile b/devel/p5-POE-API-Peek/Makefile
index 5696d1407b86..01d6b0f4e6d0 100644
--- a/devel/p5-POE-API-Peek/Makefile
+++ b/devel/p5-POE-API-Peek/Makefile
@@ -16,9 +16,9 @@ COMMENT= Peek into the internals of a running POE environment
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=1.311:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.311:devel/p5-POE \
p5-Devel-Size>0:devel/p5-Devel-Size
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Component-Daemon/Makefile b/devel/p5-POE-Component-Daemon/Makefile
index bca490163d1b..28cfedc4f98b 100644
--- a/devel/p5-POE-Component-Daemon/Makefile
+++ b/devel/p5-POE-Component-Daemon/Makefile
@@ -14,8 +14,8 @@ COMMENT= Handles all the housework for a daemon in POE
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE>=1:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1:devel/p5-POE
USES= perl5 shebangfix
SHEBANG_FILES= eg/forking eg/preforking
diff --git a/devel/p5-POE-Component-DebugShell/Makefile b/devel/p5-POE-Component-DebugShell/Makefile
index 8de89bcd0958..da6c90e981be 100644
--- a/devel/p5-POE-Component-DebugShell/Makefile
+++ b/devel/p5-POE-Component-DebugShell/Makefile
@@ -14,9 +14,9 @@ COMMENT= Interactive peeking into a running POE application
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-POE-API-Peek>=0:devel/p5-POE-API-Peek
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Distribution>=0:devel/p5-Test-Distribution
USES= perl5
diff --git a/devel/p5-POE-Component-DirWatch/Makefile b/devel/p5-POE-Component-DirWatch/Makefile
index 524420377c50..b7a9ab5cba44 100644
--- a/devel/p5-POE-Component-DirWatch/Makefile
+++ b/devel/p5-POE-Component-DirWatch/Makefile
@@ -13,11 +13,11 @@ COMMENT= POE directory watcher
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE>=0.12:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0.12:devel/p5-POE \
p5-Path-Class>0:devel/p5-Path-Class \
p5-MooseX-Types-Path-Class>0:devel/p5-MooseX-Types-Path-Class \
p5-File-Signature>0:sysutils/p5-File-Signature
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Component-Hailo/Makefile b/devel/p5-POE-Component-Hailo/Makefile
index 07b2c55eb44b..c3d990afc532 100644
--- a/devel/p5-POE-Component-Hailo/Makefile
+++ b/devel/p5-POE-Component-Hailo/Makefile
@@ -15,9 +15,9 @@ COMMENT= Non-blocking wrapper around Hailo
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-Hailo>=0:textproc/p5-Hailo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Component-IKC/Makefile b/devel/p5-POE-Component-IKC/Makefile
index 8f3a9132fa1b..222de7518576 100644
--- a/devel/p5-POE-Component-IKC/Makefile
+++ b/devel/p5-POE-Component-IKC/Makefile
@@ -13,10 +13,10 @@ COMMENT= POE Inter-Kernel Communication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-Size>=0.77:devel/p5-Devel-Size \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Size>=0.77:devel/p5-Devel-Size \
p5-POE>=1.311:devel/p5-POE \
p5-Data-Dump>=1:devel/p5-Data-Dump
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Component-JobQueue/Makefile b/devel/p5-POE-Component-JobQueue/Makefile
index cae47badc464..aa9d9424488d 100644
--- a/devel/p5-POE-Component-JobQueue/Makefile
+++ b/devel/p5-POE-Component-JobQueue/Makefile
@@ -12,8 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
MAINTAINER= perl@FreeBSD.org
COMMENT= POE component to manage queues and worker pools
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Component-Logger/Makefile b/devel/p5-POE-Component-Logger/Makefile
index 8721062db2f4..13b602feed28 100644
--- a/devel/p5-POE-Component-Logger/Makefile
+++ b/devel/p5-POE-Component-Logger/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= POE logging class
-BUILD_DEPENDS= p5-POE>=1.293:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.293:devel/p5-POE \
p5-Log-Dispatch>=2.26:devel/p5-Log-Dispatch \
p5-Log-Dispatch-Config>=1.03:devel/p5-Log-Dispatch-Config
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
USES= perl5
diff --git a/devel/p5-POE-Component-Pluggable/Makefile b/devel/p5-POE-Component-Pluggable/Makefile
index 3c40c1a8b29e..f2afa660e287 100644
--- a/devel/p5-POE-Component-Pluggable/Makefile
+++ b/devel/p5-POE-Component-Pluggable/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=1.004:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.004:devel/p5-POE \
p5-Task-Weaken>=0:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-POE-Component-RSS/Makefile b/devel/p5-POE-Component-RSS/Makefile
index dd7264e4ca39..9c267cfc254b 100644
--- a/devel/p5-POE-Component-RSS/Makefile
+++ b/devel/p5-POE-Component-RSS/Makefile
@@ -14,9 +14,9 @@ COMMENT= Module for event based RSS parsing
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-XML-RSS>=0:textproc/p5-XML-RSS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Component-RSSAggregator/Makefile b/devel/p5-POE-Component-RSSAggregator/Makefile
index d75d008eccbf..077db491b4e2 100644
--- a/devel/p5-POE-Component-RSSAggregator/Makefile
+++ b/devel/p5-POE-Component-RSSAggregator/Makefile
@@ -14,11 +14,11 @@ COMMENT= Watch Muliple RSS Feeds for New Headlines
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE-Component-Client-DNS>=0.98:dns/p5-POE-Component-Client-DNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE-Component-Client-DNS>=0.98:dns/p5-POE-Component-Client-DNS \
p5-POE-Component-Client-HTTP>=0.51:www/p5-POE-Component-Client-HTTP \
p5-XML-RSS-Feed>=0:textproc/p5-XML-RSS-Feed \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Component-Schedule/Makefile b/devel/p5-POE-Component-Schedule/Makefile
index 874711f262fc..09cbb72832a4 100644
--- a/devel/p5-POE-Component-Schedule/Makefile
+++ b/devel/p5-POE-Component-Schedule/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Schedule POE Events using a cron spec
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-DateTime-Set>=0:devel/p5-DateTime-Set
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-POE-Component-Server-XMLRPC/Makefile b/devel/p5-POE-Component-Server-XMLRPC/Makefile
index 13fc7c01ab2c..c53d5c34cc9b 100644
--- a/devel/p5-POE-Component-Server-XMLRPC/Makefile
+++ b/devel/p5-POE-Component-Server-XMLRPC/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jesper@jdn.dk
COMMENT= POE Component to create XMLRPC Servers
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \
p5-SOAP-Lite>=0:net/p5-SOAP-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Component-Syndicator/Makefile b/devel/p5-POE-Component-Syndicator/Makefile
index faaf7e5d8a8b..244866660edc 100644
--- a/devel/p5-POE-Component-Syndicator/Makefile
+++ b/devel/p5-POE-Component-Syndicator/Makefile
@@ -15,10 +15,10 @@ COMMENT= POE component base class which implements the Observer pattern
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE>=1.311:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.311:devel/p5-POE \
p5-Object-Pluggable>=1.29:devel/p5-Object-Pluggable \
p5-Test-Simple>=0:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Component-TSTP/Makefile b/devel/p5-POE-Component-TSTP/Makefile
index 31aff41de5fe..16f3e8d784eb 100644
--- a/devel/p5-POE-Component-TSTP/Makefile
+++ b/devel/p5-POE-Component-TSTP/Makefile
@@ -14,8 +14,8 @@ COMMENT= POE component to correctly handle Ctrl-Z in your program
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Devel-Profiler/Makefile b/devel/p5-POE-Devel-Profiler/Makefile
index 0752f38f9f51..9c1ea3a86689 100644
--- a/devel/p5-POE-Devel-Profiler/Makefile
+++ b/devel/p5-POE-Devel-Profiler/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Profiles POE programs
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-Loop-Glib/Makefile b/devel/p5-POE-Loop-Glib/Makefile
index ed228f326c90..65c7250a4164 100644
--- a/devel/p5-POE-Loop-Glib/Makefile
+++ b/devel/p5-POE-Loop-Glib/Makefile
@@ -14,9 +14,9 @@ COMMENT= Bridge that supports Glib event loop from POE
LICENSE= GPLv2
-BUILD_DEPENDS= p5-POE>=1.288:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.288:devel/p5-POE \
p5-Glib2>=1.222:devel/p5-Glib2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= examples/gtk2_counter.pl
diff --git a/devel/p5-POE-Loop-Tk/Makefile b/devel/p5-POE-Loop-Tk/Makefile
index 2fd58642d7bf..351968d1d592 100644
--- a/devel/p5-POE-Loop-Tk/Makefile
+++ b/devel/p5-POE-Loop-Tk/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Bridge that allows POE to be driven by Tk
-BUILD_DEPENDS= p5-POE>=1.356:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.356:devel/p5-POE \
p5-Tk>=804.031:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-POE-Quickie/Makefile b/devel/p5-POE-Quickie/Makefile
index 059f761f27da..fbbb15e47fdf 100644
--- a/devel/p5-POE-Quickie/Makefile
+++ b/devel/p5-POE-Quickie/Makefile
@@ -15,8 +15,8 @@ LICENSE= GPLv1 ART10
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=1.350:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.350:devel/p5-POE
TEST_DEPENDS= p5-Capture-Tiny>=0.07:devel/p5-Capture-Tiny \
p5-Test-Deep>=0:devel/p5-Test-Deep
diff --git a/devel/p5-POE-Stage/Makefile b/devel/p5-POE-Stage/Makefile
index cf9b4d1a0edd..49c08253bdfc 100644
--- a/devel/p5-POE-Stage/Makefile
+++ b/devel/p5-POE-Stage/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Base class for formalized POE components
-BUILD_DEPENDS= p5-POE>=1.351:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.351:devel/p5-POE \
p5-PadWalker>=1.93:devel/p5-PadWalker \
p5-Net-DNS>=0.68:dns/p5-Net-DNS \
p5-Devel-LexAlias>=0.04:devel/p5-Devel-LexAlias \
p5-Lexical-Persistence>=1.020:devel/p5-Lexical-Persistence \
p5-Attribute-Handlers>=0.93:devel/p5-Attribute-Handlers
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE-XS-Queue-Array/Makefile b/devel/p5-POE-XS-Queue-Array/Makefile
index 957d4ec92f36..b5c2aff201ad 100644
--- a/devel/p5-POE-XS-Queue-Array/Makefile
+++ b/devel/p5-POE-XS-Queue-Array/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= XS implementation of POE::Queue::Array
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index 30ff4a79634e..6a09421262a6 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -13,7 +13,8 @@ COMMENT= Multitasking and networking framework for perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Curses>=1.08:devel/p5-Curses \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Curses>=1.08:devel/p5-Curses \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-IO-Pipely>=0.005:devel/p5-IO-Pipely \
p5-IO-Tty>=1.08:devel/p5-IO-Tty \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Curses>=1.08:devel/p5-Curses \
p5-Term-ReadKey>=2.21:devel/p5-Term-ReadKey \
p5-URI>=1.30:net/p5-URI \
p5-libwww>=5.79:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= EXAMPLES
diff --git a/devel/p5-Package-DeprecationManager/Makefile b/devel/p5-Package-DeprecationManager/Makefile
index 4a60fc752070..4494ede623ce 100644
--- a/devel/p5-Package-DeprecationManager/Makefile
+++ b/devel/p5-Package-DeprecationManager/Makefile
@@ -14,11 +14,11 @@ COMMENT= Manage deprecation warnings for your distribution
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Package-Stash>0:devel/p5-Package-Stash \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Package-Stash>0:devel/p5-Package-Stash \
p5-Params-Util>0:devel/p5-Params-Util \
p5-Sub-Install>0:devel/p5-Sub-Install \
p5-Sub-Name>=0:devel/p5-Sub-Name
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>0:devel/p5-Test-Fatal \
p5-Test-Warnings>0:devel/p5-Test-Warnings
diff --git a/devel/p5-Package-Stash/Makefile b/devel/p5-Package-Stash/Makefile
index 3f165a768835..3211314d7c8d 100644
--- a/devel/p5-Package-Stash/Makefile
+++ b/devel/p5-Package-Stash/Makefile
@@ -14,10 +14,10 @@ COMMENT= Routines for manipulating stashes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dist-CheckConflicts>=0.02:devel/p5-Dist-CheckConflicts \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dist-CheckConflicts>=0.02:devel/p5-Dist-CheckConflicts \
p5-Module-Implementation>=0.06:devel/p5-Module-Implementation \
p5-Package-Stash-XS>=0.22:devel/p5-Package-Stash-XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/devel/p5-Package-Variant/Makefile b/devel/p5-Package-Variant/Makefile
index d8a4223dcd22..3f5c32f37b08 100644
--- a/devel/p5-Package-Variant/Makefile
+++ b/devel/p5-Package-Variant/Makefile
@@ -14,10 +14,10 @@ COMMENT= Parameterizable packages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Import-Into>=1:devel/p5-Import-Into \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Import-Into>=1:devel/p5-Import-Into \
p5-Module-Runtime>=0.013:devel/p5-Module-Runtime \
p5-strictures>=2:devel/p5-strictures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Moo>=0:devel/p5-Moo \
p5-Test-Fatal>=0:devel/p5-Test-Fatal
diff --git a/devel/p5-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile
index 0f3d950b67c9..912e37b86b3c 100644
--- a/devel/p5-Params-Validate/Makefile
+++ b/devel/p5-Params-Validate/Makefile
@@ -13,8 +13,8 @@ COMMENT= Validate method/function parameters
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Module-Implementation>=0.04:devel/p5-Module-Implementation
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Implementation>=0.04:devel/p5-Module-Implementation
TEST_DEPENDS= p5-Readonly>=0:devel/p5-Readonly \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Requires>0:devel/p5-Test-Requires \
diff --git a/devel/p5-Paranoid-Log-Email/Makefile b/devel/p5-Paranoid-Log-Email/Makefile
index 84ecf18c58a6..14d21067f2a0 100644
--- a/devel/p5-Paranoid-Log-Email/Makefile
+++ b/devel/p5-Paranoid-Log-Email/Makefile
@@ -12,8 +12,8 @@ COMMENT= SMTP support for Paranoid::Log
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Paranoid>=2:devel/p5-Paranoid
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Paranoid>=2:devel/p5-Paranoid
NO_ARCH= YES
USES= perl5
diff --git a/devel/p5-Paranoid-Log-Syslog/Makefile b/devel/p5-Paranoid-Log-Syslog/Makefile
index ae339c672be6..2c40905332d7 100644
--- a/devel/p5-Paranoid-Log-Syslog/Makefile
+++ b/devel/p5-Paranoid-Log-Syslog/Makefile
@@ -12,9 +12,9 @@ COMMENT= Syslog support for Paranoid::Log
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Paranoid>=2:devel/p5-Paranoid \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Paranoid>=2:devel/p5-Paranoid \
p5-Unix-Syslog>0:sysutils/p5-Unix-Syslog
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= YES
USES= perl5
diff --git a/devel/p5-Paranoid/Makefile b/devel/p5-Paranoid/Makefile
index d2661bd30e8c..aac13210b943 100644
--- a/devel/p5-Paranoid/Makefile
+++ b/devel/p5-Paranoid/Makefile
@@ -13,8 +13,8 @@ COMMENT= Paranoia support for safer programs
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Socket6>=0.23:net/p5-Socket6
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Socket6>=0.23:net/p5-Socket6
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Parse-CPAN-Packages-Fast/Makefile b/devel/p5-Parse-CPAN-Packages-Fast/Makefile
index 663284e6f5c3..08cd1f8cb661 100644
--- a/devel/p5-Parse-CPAN-Packages-Fast/Makefile
+++ b/devel/p5-Parse-CPAN-Packages-Fast/Makefile
@@ -13,8 +13,8 @@ COMMENT= Parse CPAN package index
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CPAN-DistnameInfo>=0:devel/p5-CPAN-DistnameInfo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CPAN-DistnameInfo>=0:devel/p5-CPAN-DistnameInfo
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Parse-CPAN-Packages/Makefile b/devel/p5-Parse-CPAN-Packages/Makefile
index 05d33c9318d2..e3e0f72d49f5 100644
--- a/devel/p5-Parse-CPAN-Packages/Makefile
+++ b/devel/p5-Parse-CPAN-Packages/Makefile
@@ -14,12 +14,12 @@ COMMENT= Parse 02packages.details.txt.gz from CPAN
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Peek>0:archivers/p5-Archive-Peek \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Peek>0:archivers/p5-Archive-Peek \
p5-CPAN-DistnameInfo>0:devel/p5-CPAN-DistnameInfo \
p5-Moo>=0:devel/p5-Moo \
p5-PPI>0:textproc/p5-PPI \
p5-Type-Tiny>0:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-InDistDir>0:devel/p5-Test-InDistDir \
p5-File-Slurp>0:devel/p5-File-Slurp
diff --git a/devel/p5-Parse-ErrorString-Perl/Makefile b/devel/p5-Parse-ErrorString-Perl/Makefile
index 0fd8673290e7..3b5392abccfe 100644
--- a/devel/p5-Parse-ErrorString-Perl/Makefile
+++ b/devel/p5-Parse-ErrorString-Perl/Makefile
@@ -13,10 +13,10 @@ COMMENT= Parse error messages from the Perl interpreter
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-XSAccessor>0:devel/p5-Class-XSAccessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-XSAccessor>0:devel/p5-Class-XSAccessor \
p5-Module-Install>0:devel/p5-Module-Install \
p5-Pod-POM>=0.27:textproc/p5-Pod-POM
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>0:devel/p5-Test-Differences
NO_ARCH= YES
diff --git a/devel/p5-Parse-Method-Signatures/Makefile b/devel/p5-Parse-Method-Signatures/Makefile
index f73620e41463..ecd28efea634 100644
--- a/devel/p5-Parse-Method-Signatures/Makefile
+++ b/devel/p5-Parse-Method-Signatures/Makefile
@@ -13,7 +13,8 @@ COMMENT= Perl6 like method signature parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Load>=0.19:devel/p5-Class-Load \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Load>=0.19:devel/p5-Class-Load \
p5-List-MoreUtils>=0.20:lang/p5-List-MoreUtils \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Traits>=0.06:devel/p5-MooseX-Traits \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Class-Load>=0.19:devel/p5-Class-Load \
p5-MooseX-Types-Structured>=0:devel/p5-MooseX-Types-Structured \
p5-PPI>=1.203:textproc/p5-PPI \
p5-namespace-clean>=0.10:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-aliased>=0:devel/p5-aliased
diff --git a/devel/p5-Parse-PlainConfig/Makefile b/devel/p5-Parse-PlainConfig/Makefile
index 34e9880a78a9..1b307f8665cd 100644
--- a/devel/p5-Parse-PlainConfig/Makefile
+++ b/devel/p5-Parse-PlainConfig/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-EHierarchy>=2.00:devel/p5-Class-EHierarchy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-EHierarchy>=2.00:devel/p5-Class-EHierarchy \
p5-Paranoid>=2.05:devel/p5-Paranoid
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-ParseLex/Makefile b/devel/p5-ParseLex/Makefile
index 2b628df64b47..ad1cc73fd4bc 100644
--- a/devel/p5-ParseLex/Makefile
+++ b/devel/p5-ParseLex/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@FreeBSD.org
COMMENT= Object-oriented generator of lexical analyzers
-BUILD_DEPENDS= p5-ParseTemplate>=3.01:devel/p5-ParseTemplate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ParseTemplate>=3.01:devel/p5-ParseTemplate
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Path-Class-File-Lockable/Makefile b/devel/p5-Path-Class-File-Lockable/Makefile
index 0b2fedf5bf95..9e1c7b2c3a4c 100644
--- a/devel/p5-Path-Class-File-Lockable/Makefile
+++ b/devel/p5-Path-Class-File-Lockable/Makefile
@@ -15,9 +15,9 @@ COMMENT= Lock your files with Path::Class::File
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-NFSLock>0:devel/p5-File-NFSLock \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-NFSLock>0:devel/p5-File-NFSLock \
p5-Path-Class>0:devel/p5-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Path-Dispatcher-Declarative/Makefile b/devel/p5-Path-Dispatcher-Declarative/Makefile
index 3d82a3465528..13d71e4a0f94 100644
--- a/devel/p5-Path-Dispatcher-Declarative/Makefile
+++ b/devel/p5-Path-Dispatcher-Declarative/Makefile
@@ -14,10 +14,10 @@ COMMENT= Sugary dispatcher for perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Path-Dispatcher>=1.02:devel/p5-Path-Dispatcher \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Path-Dispatcher>=1.02:devel/p5-Path-Dispatcher \
p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Path-Dispatcher/Makefile b/devel/p5-Path-Dispatcher/Makefile
index 732222daa261..23800efee2c0 100644
--- a/devel/p5-Path-Dispatcher/Makefile
+++ b/devel/p5-Path-Dispatcher/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl flexible and extensible dispatch
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>=0.12:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0.12:devel/p5-Any-Moose \
p5-Try-Tiny>=0.02:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/devel/p5-Path-FindDev/Makefile b/devel/p5-Path-FindDev/Makefile
index 0ad09bbb7b73..3e3bc56f18db 100644
--- a/devel/p5-Path-FindDev/Makefile
+++ b/devel/p5-Path-FindDev/Makefile
@@ -16,10 +16,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Tiny>=0.010:devel/p5-Class-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Tiny>=0.010:devel/p5-Class-Tiny \
p5-Path-IsDev>=0.2.2:devel/p5-Path-IsDev \
p5-Path-Tiny>=0.054:devel/p5-Path-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Perl-Critic-Deprecated/Makefile b/devel/p5-Perl-Critic-Deprecated/Makefile
index 4fdf28d3f84a..de352b2276cf 100644
--- a/devel/p5-Perl-Critic-Deprecated/Makefile
+++ b/devel/p5-Perl-Critic-Deprecated/Makefile
@@ -14,8 +14,8 @@ COMMENT= Policies that are no longer included with 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/devel/p5-Perl-PrereqScanner/Makefile b/devel/p5-Perl-PrereqScanner/Makefile
index c5c98718f990..5cd01670b0c3 100644
--- a/devel/p5-Perl-PrereqScanner/Makefile
+++ b/devel/p5-Perl-PrereqScanner/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Getopt-Long-Descriptive>=0:devel/p5-Getopt-Long-Descriptive \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Getopt-Long-Descriptive>=0:devel/p5-Getopt-Long-Descriptive \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Module-Path>=0:devel/p5-Module-Path \
p5-Moose>=0:devel/p5-Moose \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Getopt-Long-Descriptive>=0:devel/p5-Getopt-Long-Descriptive \
p5-Params-Util>=0:devel/p5-Params-Util \
p5-String-RewritePrefix>=0.005:textproc/p5-String-RewritePrefix \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Try-Tiny>=0:lang/p5-Try-Tiny
NO_ARCH= yes
diff --git a/devel/p5-Perl6-Builtins/Makefile b/devel/p5-Perl6-Builtins/Makefile
index 6ce396b03c73..7c4ddbe1e548 100644
--- a/devel/p5-Perl6-Builtins/Makefile
+++ b/devel/p5-Perl6-Builtins/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Provide Perl 5 versions of the new Perl 6 builtins
-BUILD_DEPENDS= p5-Contextual-Return>=0:devel/p5-Contextual-Return
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Contextual-Return>=0:devel/p5-Contextual-Return
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Perl6-Export-Attrs/Makefile b/devel/p5-Perl6-Export-Attrs/Makefile
index 2bc49fa5cb34..533235f12bda 100644
--- a/devel/p5-Perl6-Export-Attrs/Makefile
+++ b/devel/p5-Perl6-Export-Attrs/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl 6 'is export(...)' trait as a Perl 5 attribute
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PadWalker>=0:devel/p5-PadWalker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PadWalker>=0:devel/p5-PadWalker
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Perl6-Form/Makefile b/devel/p5-Perl6-Form/Makefile
index 98a3a398db17..a542e38e180d 100644
--- a/devel/p5-Perl6-Form/Makefile
+++ b/devel/p5-Perl6-Form/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
COMMENT= Implements the Perl 6 'form' built-in
-BUILD_DEPENDS= p5-Perl6-Export>=0:devel/p5-Perl6-Export
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Perl6-Export>=0:devel/p5-Perl6-Export
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Perl6-Rules/Makefile b/devel/p5-Perl6-Rules/Makefile
index 0900988444fb..b8e9cc0ae2fc 100644
--- a/devel/p5-Perl6-Rules/Makefile
+++ b/devel/p5-Perl6-Rules/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Implements (most of) the Perl 6 regex syntax
-BUILD_DEPENDS= p5-Attribute-Handlers>=0:devel/p5-Attribute-Handlers \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Attribute-Handlers>=0:devel/p5-Attribute-Handlers \
p5-Filter-Simple>=0:textproc/p5-Filter-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Perl6-Slurp/Makefile b/devel/p5-Perl6-Slurp/Makefile
index f5892d281d9c..4d08af2e1f88 100644
--- a/devel/p5-Perl6-Slurp/Makefile
+++ b/devel/p5-Perl6-Slurp/Makefile
@@ -13,8 +13,8 @@ COMMENT= Implements the Perl6 'slurp' built-in
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Perl6-Export>=0.07:devel/p5-Perl6-Export
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Perl6-Export>=0.07:devel/p5-Perl6-Export
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Pipeline/Makefile b/devel/p5-Pipeline/Makefile
index 4113a60b4fa1..74c2556824ae 100644
--- a/devel/p5-Pipeline/Makefile
+++ b/devel/p5-Pipeline/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= rouslan@rshell.net
COMMENT= Pipeline - Generic pipeline interface
-BUILD_DEPENDS= p5-Class-ISA>=0:devel/p5-Class-ISA \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-ISA>=0:devel/p5-Class-ISA \
p5-Error>=0:lang/p5-Error \
p5-IO-Null>=0:devel/p5-IO-Null \
p5-IO-String>=0:devel/p5-IO-String \
p5-Data-UUID>=0:devel/p5-Data-UUID \
p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Pithub/Makefile b/devel/p5-Pithub/Makefile
index 1766893afa87..d150a5a15fef 100644
--- a/devel/p5-Pithub/Makefile
+++ b/devel/p5-Pithub/Makefile
@@ -15,14 +15,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Array-Iterator>=0:devel/p5-Array-Iterator \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Array-Iterator>=0:devel/p5-Array-Iterator \
p5-Cache-LRU>=0:devel/p5-Cache-LRU \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
p5-Moo>=0:devel/p5-Moo \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Import-Into>=0:devel/p5-Import-Into \
p5-Path-Tiny>=0:devel/p5-Path-Tiny \
p5-Test-Most>=0:devel/p5-Test-Most
diff --git a/devel/p5-Pod-Coverage-Moose/Makefile b/devel/p5-Pod-Coverage-Moose/Makefile
index ff487f3e7ede..97a9d7dea6a3 100644
--- a/devel/p5-Pod-Coverage-Moose/Makefile
+++ b/devel/p5-Pod-Coverage-Moose/Makefile
@@ -13,10 +13,10 @@ COMMENT= Pod::Coverage extension for Moose
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=2.1300:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=2.1300:devel/p5-Moose \
p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
p5-namespace-autoclean>=0.08:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Requires>=0:devel/p5-Test-Requires
NO_ARCH= yes
diff --git a/devel/p5-Pod-Coverage-TrustPod/Makefile b/devel/p5-Pod-Coverage-TrustPod/Makefile
index 30ebb1744dc7..4e8b5980f4a1 100644
--- a/devel/p5-Pod-Coverage-TrustPod/Makefile
+++ b/devel/p5-Pod-Coverage-TrustPod/Makefile
@@ -14,10 +14,10 @@ COMMENT= Declare trusted symbol names in POD
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
p5-Pod-Eventual>=0:textproc/p5-Pod-Eventual
TEST_DEPENDS= p5-Test-Pod>=1.41:devel/p5-Test-Pod
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Pod-Usage/Makefile b/devel/p5-Pod-Usage/Makefile
index c0abc7f498b9..0cd8794cae2f 100644
--- a/devel/p5-Pod-Usage/Makefile
+++ b/devel/p5-Pod-Usage/Makefile
@@ -13,8 +13,8 @@ COMMENT= Print a usage message from embedded pod documentation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-podlators>=4:textproc/p5-podlators
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-podlators>=4:textproc/p5-podlators
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Proc-WaitStat/Makefile b/devel/p5-Proc-WaitStat/Makefile
index 8fdd5cc88d0c..6d335cbd29cb 100644
--- a/devel/p5-Proc-WaitStat/Makefile
+++ b/devel/p5-Proc-WaitStat/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Interpret and act on wait() status values
-BUILD_DEPENDS= p5-IPC-Signal>=0:devel/p5-IPC-Signal
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IPC-Signal>=0:devel/p5-IPC-Signal
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Progress-Any/Makefile b/devel/p5-Progress-Any/Makefile
index ab387a6e95fe..cb7f09097ac2 100644
--- a/devel/p5-Progress-Any/Makefile
+++ b/devel/p5-Progress-Any/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Time-Duration>=0:devel/p5-Time-Duration
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Time-Duration>=0:devel/p5-Time-Duration
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile
index 0d45ad9dce30..46cfc0ba5129 100644
--- a/devel/p5-Project-Gantt/Makefile
+++ b/devel/p5-Project-Gantt/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Create Gantt charts to manage project scheduling
-BUILD_DEPENDS= p5-Class-Date>=0:devel/p5-Class-Date \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Date>=0:devel/p5-Class-Date \
convert:graphics/ImageMagick
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-RPSL-Parser/Makefile b/devel/p5-RPSL-Parser/Makefile
index 72e0e2150ec8..8375fd8aaef5 100644
--- a/devel/p5-RPSL-Parser/Makefile
+++ b/devel/p5-RPSL-Parser/Makefile
@@ -15,8 +15,8 @@ COMMENT= Router Policy Specification Language (RFC2622) Parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0.31:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.31:devel/p5-Class-Accessor
PORTSCOUT= skipv:0.039001,0.039_001,0.19,0.28,0.29,0.32,0.38,0.39
diff --git a/devel/p5-RRDTool-OO/Makefile b/devel/p5-RRDTool-OO/Makefile
index e71b0de6adcb..d8ccf3f79465 100644
--- a/devel/p5-RRDTool-OO/Makefile
+++ b/devel/p5-RRDTool-OO/Makefile
@@ -14,9 +14,9 @@ COMMENT= RRDTool::OO - Object-oriented interface to RRDTool
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= rrdtool>=0:databases/rrdtool \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= rrdtool>=0:databases/rrdtool \
p5-Log-Log4perl>=0.40:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Rcs-Agent/Makefile b/devel/p5-Rcs-Agent/Makefile
index accc6967443b..758520b967a2 100644
--- a/devel/p5-Rcs-Agent/Makefile
+++ b/devel/p5-Rcs-Agent/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= nick@foobar.org
COMMENT= Perl module for RCS archive manipulation
-BUILD_DEPENDS= p5-String-ShellQuote>1.00:textproc/p5-String-ShellQuote
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-String-ShellQuote>1.00:textproc/p5-String-ShellQuote
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Readonly-XS/Makefile b/devel/p5-Readonly-XS/Makefile
index f8332cb6be7f..4519361158d3 100644
--- a/devel/p5-Readonly-XS/Makefile
+++ b/devel/p5-Readonly-XS/Makefile
@@ -14,8 +14,8 @@ COMMENT= Companion module for Readonly.pm, to speed up read-only scalar variable
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Readonly>=1.02:devel/p5-Readonly
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Readonly>=1.02:devel/p5-Readonly
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Ref-Util/Makefile b/devel/p5-Ref-Util/Makefile
index 1322c0e3393e..f433d12695e4 100644
--- a/devel/p5-Ref-Util/Makefile
+++ b/devel/p5-Ref-Util/Makefile
@@ -13,8 +13,8 @@ COMMENT= Utility functions for checking references
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Ref-Util-XS>=0:devel/p5-Ref-Util-XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Ref-Util-XS>=0:devel/p5-Ref-Util-XS
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Reflex/Makefile b/devel/p5-Reflex/Makefile
index 2b9b45e90103..95c41972a256 100644
--- a/devel/p5-Reflex/Makefile
+++ b/devel/p5-Reflex/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=2.0203:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=2.0203:devel/p5-Moose \
p5-MooseX-Role-Parameterized>=0.23:devel/p5-MooseX-Role-Parameterized \
p5-POE>=1.294:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5 shebangfix
diff --git a/devel/p5-Reply/Makefile b/devel/p5-Reply/Makefile
index 09c053264ad8..dd5a6561b7db 100644
--- a/devel/p5-Reply/Makefile
+++ b/devel/p5-Reply/Makefile
@@ -14,7 +14,8 @@ COMMENT= Lightweight, extensible REPL for Perl
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Config-INI-Reader-Ordered>=0:devel/p5-Config-INI-Reader-Ordered \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-INI-Reader-Ordered>=0:devel/p5-Config-INI-Reader-Ordered \
p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
p5-Eval-Closure>=0.11:devel/p5-Eval-Closure \
p5-File-HomeDir>=0:devel/p5-File-HomeDir \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Config-INI-Reader-Ordered>=0:devel/p5-Config-INI-Reader-Ordere
p5-Package-Stash>=0:devel/p5-Package-Stash \
p5-PadWalker>=0:devel/p5-PadWalker \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Return-MultiLevel/Makefile b/devel/p5-Return-MultiLevel/Makefile
index fc679cfd7336..f61c11c7b3f7 100644
--- a/devel/p5-Return-MultiLevel/Makefile
+++ b/devel/p5-Return-MultiLevel/Makefile
@@ -14,9 +14,9 @@ COMMENT= Return across multiple call levels
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Munge>=0.07:devel/p5-Data-Munge \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Munge>=0.07:devel/p5-Data-Munge \
p5-Scope-Upper>=0.29:devel/p5-Scope-Upper
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-Return-Type/Makefile b/devel/p5-Return-Type/Makefile
index 18c96310f66c..e2c7c8a90286 100644
--- a/devel/p5-Return-Type/Makefile
+++ b/devel/p5-Return-Type/Makefile
@@ -16,8 +16,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Type-Tiny>=0:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Type-Tiny>=0:devel/p5-Type-Tiny
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-Rinci/Makefile b/devel/p5-Rinci/Makefile
index 0fe36f2ee5a3..2634cc4048ea 100644
--- a/devel/p5-Rinci/Makefile
+++ b/devel/p5-Rinci/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-Sah-Normalize>=0:devel/p5-Data-Sah-Normalize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Sah-Normalize>=0:devel/p5-Data-Sah-Normalize
TEST_DEPENDS= p5-DefHash>=1.0.6:devel/p5-DefHash \
p5-Sah>=0.9.36:devel/p5-Sah
diff --git a/devel/p5-Role-HasMessage/Makefile b/devel/p5-Role-HasMessage/Makefile
index cf4c9ae2e38f..2c5a91d7cbe6 100644
--- a/devel/p5-Role-HasMessage/Makefile
+++ b/devel/p5-Role-HasMessage/Makefile
@@ -15,12 +15,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
p5-String-Errf>=0:devel/p5-String-Errf \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Role-Identifiable/Makefile b/devel/p5-Role-Identifiable/Makefile
index a7f23bd85f5b..9bcaf5e44cad 100644
--- a/devel/p5-Role-Identifiable/Makefile
+++ b/devel/p5-Role-Identifiable/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Role-Tiny/Makefile b/devel/p5-Role-Tiny/Makefile
index 2fae312f3e07..6171ead27121 100644
--- a/devel/p5-Role-Tiny/Makefile
+++ b/devel/p5-Role-Tiny/Makefile
@@ -14,8 +14,8 @@ COMMENT= Roles, like a nouvelle cusine portion size slice of Moose
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Method-Modifiers>=1.05:devel/p5-Class-Method-Modifiers
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Method-Modifiers>=1.05:devel/p5-Class-Method-Modifiers
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Rose-DateTime/Makefile b/devel/p5-Rose-DateTime/Makefile
index e40ce7db15b6..0a6f26cc3e9f 100644
--- a/devel/p5-Rose-DateTime/Makefile
+++ b/devel/p5-Rose-DateTime/Makefile
@@ -15,9 +15,9 @@ COMMENT= DateTime helper functions and objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-Rose-Object>=0.82:devel/p5-Rose-Object
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-RunApp/Makefile b/devel/p5-RunApp/Makefile
index 653bac6546b5..eff9af20565d 100644
--- a/devel/p5-RunApp/Makefile
+++ b/devel/p5-RunApp/Makefile
@@ -15,10 +15,10 @@ COMMENT= Generic module to run web-applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-App-Control>=0:devel/p5-App-Control \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-Control>=0:devel/p5-App-Control \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-SOAP-WSDL/Makefile b/devel/p5-SOAP-WSDL/Makefile
index cd0917e55f18..ea184f623ad4 100644
--- a/devel/p5-SOAP-WSDL/Makefile
+++ b/devel/p5-SOAP-WSDL/Makefile
@@ -13,7 +13,8 @@ COMMENT= Perl module for SOAP with WSDL support
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Load>=0.20:devel/p5-Class-Load \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Load>=0.20:devel/p5-Class-Load \
p5-Class-Std-Fast>=0.0.5:devel/p5-Class-Std-Fast \
p5-Template-Toolkit>=2.18:www/p5-Template-Toolkit \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Class-Load>=0.20:devel/p5-Class-Load \
p5-URI>=0:net/p5-URI \
p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-SPOPS/Makefile b/devel/p5-SPOPS/Makefile
index 69ac97267816..71d6906564dc 100644
--- a/devel/p5-SPOPS/Makefile
+++ b/devel/p5-SPOPS/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv2+
LICENSE_COMB= dual
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Class-Accessor>=0.17:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.17:devel/p5-Class-Accessor \
p5-Class-Date>=1:devel/p5-Class-Date \
p5-Class-Factory>=1:devel/p5-Class-Factory \
p5-Class-Fields>=0.140:devel/p5-Class-Fields \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Class-Accessor>=0.17:devel/p5-Class-Accessor \
p5-Devel-StackTrace>=0.90:devel/p5-Devel-StackTrace \
p5-Log-Dispatch>=2:devel/p5-Log-Dispatch \
p5-Log-Log4perl>=0.35:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-SUPER/Makefile b/devel/p5-SUPER/Makefile
index b15289690e9d..a4830c07ed24 100644
--- a/devel/p5-SUPER/Makefile
+++ b/devel/p5-SUPER/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
COMMENT= Perl module control superclass method dispatch
-BUILD_DEPENDS= p5-Sub-Identify>=0.04:devel/p5-Sub-Identify
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Identify>=0.04:devel/p5-Sub-Identify
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-SVN-ACL/Makefile b/devel/p5-SVN-ACL/Makefile
index 18a7a7039539..d9070f17cfc5 100644
--- a/devel/p5-SVN-ACL/Makefile
+++ b/devel/p5-SVN-ACL/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple ACL frontend for subversion
-BUILD_DEPENDS= p5-subversion>=0:devel/p5-subversion \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 tar:tgz
USE_PERL5= configure
diff --git a/devel/p5-SVN-Access/Makefile b/devel/p5-SVN-Access/Makefile
index a86c233fd7da..f044747d7dbc 100644
--- a/devel/p5-SVN-Access/Makefile
+++ b/devel/p5-SVN-Access/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl extension to manipulate SVN Access files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tie-IxHash>=1.21:devel/p5-Tie-IxHash \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tie-IxHash>=1.21:devel/p5-Tie-IxHash \
p5-subversion>=0:devel/p5-subversion
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-SVN-Agent/Makefile b/devel/p5-SVN-Agent/Makefile
index 88b56f042c16..44aefcd324f1 100644
--- a/devel/p5-SVN-Agent/Makefile
+++ b/devel/p5-SVN-Agent/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
COMMENT= Simple svn manipulation
-BUILD_DEPENDS= p5-subversion>=0:devel/p5-subversion \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-File-Slurp>=0:devel/p5-File-Slurp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-SVN-Dumpfile/Makefile b/devel/p5-SVN-Dumpfile/Makefile
index ef1dc772ee5f..62b34da933bb 100644
--- a/devel/p5-SVN-Dumpfile/Makefile
+++ b/devel/p5-SVN-Dumpfile/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension to access and manipulate Subversion dumpfiles
-BUILD_DEPENDS= p5-Data-GUID>=0:devel/p5-Data-GUID \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-GUID>=0:devel/p5-Data-GUID \
p5-TimeDate>=2.27:devel/p5-TimeDate \
p5-Readonly>=1.03:devel/p5-Readonly
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-SVN-Hook/Makefile b/devel/p5-SVN-Hook/Makefile
index 2fb50c677c4f..9acfce94726e 100644
--- a/devel/p5-SVN-Hook/Makefile
+++ b/devel/p5-SVN-Hook/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl module for managing Subversion hook scripts
LICENSE= APACHE20
-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
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-SVN-Hooks/Makefile b/devel/p5-SVN-Hooks/Makefile
index 5cf7f8d4cc12..f44bd3bcd351 100644
--- a/devel/p5-SVN-Hooks/Makefile
+++ b/devel/p5-SVN-Hooks/Makefile
@@ -13,13 +13,13 @@ COMMENT= Framework for implementing Subversion hooks
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Util>=0:devel/p5-Data-Util \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Util>=0:devel/p5-Data-Util \
p5-SVN-Look>=0:devel/p5-SVN-Look \
p5-SVN-Notify>=0:devel/p5-SVN-Notify \
p5-XMLRPC-Lite>0:net/p5-XMLRPC-Lite \
p5-JIRA-REST>0:devel/p5-JIRA-REST \
subversion>=1.4.0:devel/subversion
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-URI>=0:net/p5-URI
USES= perl5
diff --git a/devel/p5-SVN-Log/Makefile b/devel/p5-SVN-Log/Makefile
index 3be582a4e4ca..c5e50afea7a5 100644
--- a/devel/p5-SVN-Log/Makefile
+++ b/devel/p5-SVN-Log/Makefile
@@ -14,9 +14,9 @@ COMMENT= SVN::Log - Extract change logs from a Subversion server
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-subversion>=0:devel/p5-subversion \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \
p5-Test-Simple>=0:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-SVN-Look/Makefile b/devel/p5-SVN-Look/Makefile
index 783db2931d38..c0c28b6241e7 100644
--- a/devel/p5-SVN-Look/Makefile
+++ b/devel/p5-SVN-Look/Makefile
@@ -14,10 +14,10 @@ COMMENT= Caching wrapper around the svnlook command
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
subversion>=1.7.0:devel/subversion
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-SVN-Mirror/Makefile b/devel/p5-SVN-Mirror/Makefile
index 7cc2dce1fc1a..e17fe5beaf21 100644
--- a/devel/p5-SVN-Mirror/Makefile
+++ b/devel/p5-SVN-Mirror/Makefile
@@ -14,7 +14,8 @@ COMMENT= Mirror remote subversion repository to local
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-UUID>=0:devel/p5-Data-UUID \
p5-File-chdir>=0:devel/p5-File-chdir \
p5-SVN-Simple>=0:devel/p5-SVN-Simple \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-URI>=0:net/p5-URI \
p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
p5-subversion>=0:devel/p5-subversion
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-SVN-Notify-Config/Makefile b/devel/p5-SVN-Notify-Config/Makefile
index fb0278347355..eb6592a79ff4 100644
--- a/devel/p5-SVN-Notify-Config/Makefile
+++ b/devel/p5-SVN-Notify-Config/Makefile
@@ -15,10 +15,10 @@ COMMENT= Perl module for config-driven Subversion notification
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= ${LOCALBASE}/bin/svnlook:devel/subversion \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${LOCALBASE}/bin/svnlook:devel/subversion \
p5-SVN-Notify>=2.70:devel/p5-SVN-Notify \
p5-YAML>=0.62:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0.1:devel/p5-Test-Deep
USES= perl5
diff --git a/devel/p5-SVN-Notify-Mirror/Makefile b/devel/p5-SVN-Notify-Mirror/Makefile
index af78240092a5..6fd0428b9aab 100644
--- a/devel/p5-SVN-Notify-Mirror/Makefile
+++ b/devel/p5-SVN-Notify-Mirror/Makefile
@@ -15,9 +15,9 @@ COMMENT= Keep a mirrored working copy of a repository path
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-SVN-Notify>=2.83:devel/p5-SVN-Notify \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SVN-Notify>=2.83:devel/p5-SVN-Notify \
p5-YAML>=0.81:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-SVN-Notify/Makefile b/devel/p5-SVN-Notify/Makefile
index 28d6a0881cb9..552cc1ab78c8 100644
--- a/devel/p5-SVN-Notify/Makefile
+++ b/devel/p5-SVN-Notify/Makefile
@@ -13,11 +13,11 @@ COMMENT= Subversion activity notification
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Email-Address-XS>=1.03:mail/p5-Email-Address-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Address-XS>=1.03:mail/p5-Email-Address-XS \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-Net-SMTP-TLS>=0:mail/p5-Net-SMTP-TLS \
p5-Text-Trac>=0.10:textproc/p5-Text-Trac
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-SVN-S4/Makefile b/devel/p5-SVN-S4/Makefile
index eefe4834cd49..cc18e0a072f5 100644
--- a/devel/p5-SVN-S4/Makefile
+++ b/devel/p5-SVN-S4/Makefile
@@ -13,11 +13,11 @@ COMMENT= Wrapper for subversion program
LICENSE= ART20 LGPL3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Tiny>=0:devel/p5-Config-Tiny \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-IO-AIO>=0:devel/p5-IO-AIO \
p5-subversion>=0:devel/p5-subversion
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-SVN-Simple/Makefile b/devel/p5-SVN-Simple/Makefile
index f74bb1fd7be2..b4200d139554 100644
--- a/devel/p5-SVN-Simple/Makefile
+++ b/devel/p5-SVN-Simple/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple interface to SVN::Delta::Editor
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-subversion>=0:devel/p5-subversion
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-SVN-Statistics/Makefile b/devel/p5-SVN-Statistics/Makefile
index 81a519874dee..8581d6fcb9d0 100644
--- a/devel/p5-SVN-Statistics/Makefile
+++ b/devel/p5-SVN-Statistics/Makefile
@@ -15,11 +15,11 @@ COMMENT= SVN::Statistics - perl module to create subversion statistics
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-subversion>=0:devel/p5-subversion \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \
p5-RRDTool-OO>=0:devel/p5-RRDTool-OO \
p5-Data-Dumper-Simple>=0:devel/p5-Data-Dumper-Simple \
p5-IO-Toolkit>=0:devel/p5-IO-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Scalar-Defer/Makefile b/devel/p5-Scalar-Defer/Makefile
index ae68334d1e79..bbc6665998ed 100644
--- a/devel/p5-Scalar-Defer/Makefile
+++ b/devel/p5-Scalar-Defer/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Calculate values on demand
-BUILD_DEPENDS= p5-Class-InsideOut>=0:devel/p5-Class-InsideOut \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-InsideOut>=0:devel/p5-Class-InsideOut \
p5-Exporter-Lite>=0:devel/p5-Exporter-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Scalar-Does/Makefile b/devel/p5-Scalar-Does/Makefile
index bf6dcad98be3..ab08646cfc52 100644
--- a/devel/p5-Scalar-Does/Makefile
+++ b/devel/p5-Scalar-Does/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
p5-Type-Tiny>=0.004:devel/p5-Type-Tiny \
p5-URI>=0:net/p5-URI \
p5-lexical-underscore>=0:devel/p5-lexical-underscore \
p5-namespace-clean>=0.19:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-All>=0:devel/p5-IO-All \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile
index b13b46f9e0fb..77274d6dc00e 100644
--- a/devel/p5-Sepia/Makefile
+++ b/devel/p5-Sepia/Makefile
@@ -12,14 +12,14 @@ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ashish@FreeBSD.org
COMMENT= Simple Emacs-Perl Interface
-BUILD_DEPENDS= p5-Devel-Size>=0:devel/p5-Devel-Size \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Size>=0:devel/p5-Devel-Size \
p5-IO-stringy>=0:devel/p5-IO-stringy \
p5-PadWalker>=0:devel/p5-PadWalker \
p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
p5-libwww>=0:www/p5-libwww \
p5-Module-Info>=0:devel/p5-Module-Info \
p5-BSD-Resource>=0:devel/p5-BSD-Resource
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= emacs gmake makeinfo perl5
USE_PERL5= configure
diff --git a/devel/p5-Set-Array/Makefile b/devel/p5-Set-Array/Makefile
index bcda41b14258..3e3979279d36 100644
--- a/devel/p5-Set-Array/Makefile
+++ b/devel/p5-Set-Array/Makefile
@@ -14,9 +14,9 @@ COMMENT= Arrays as objects with set operations
LICENSE= ART10
-BUILD_DEPENDS= p5-Try-Tiny>=0.11:lang/p5-Try-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Try-Tiny>=0.11:lang/p5-Try-Tiny \
p5-Want>=0:devel/p5-Want
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Pod>=0:devel/p5-Test-Pod
diff --git a/devel/p5-Set-ConsistentHash/Makefile b/devel/p5-Set-ConsistentHash/Makefile
index 3107a9bc60d9..cc39a8c88663 100644
--- a/devel/p5-Set-ConsistentHash/Makefile
+++ b/devel/p5-Set-ConsistentHash/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Library for doing consistent hashing
-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/devel/p5-Shell-Base/Makefile b/devel/p5-Shell-Base/Makefile
index bf84198c23ae..845e16b8ee46 100644
--- a/devel/p5-Shell-Base/Makefile
+++ b/devel/p5-Shell-Base/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl module implementing a simple command shell
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Term-Size>=0:devel/p5-Term-Size \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-Size>=0:devel/p5-Term-Size \
p5-Text-Shellwords>=0:textproc/p5-Text-Shellwords
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-ShipIt-Step-Manifest/Makefile b/devel/p5-ShipIt-Step-Manifest/Makefile
index b8efbe7bc93a..3e51e25568eb 100644
--- a/devel/p5-ShipIt-Step-Manifest/Makefile
+++ b/devel/p5-ShipIt-Step-Manifest/Makefile
@@ -15,9 +15,9 @@ COMMENT= ShipIt step for recreating the MANIFEST
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dist-Joseki>=0:devel/p5-Dist-Joseki \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dist-Joseki>=0:devel/p5-Dist-Joseki \
p5-ShipIt>=0:devel/p5-ShipIt
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Specio/Makefile b/devel/p5-Specio/Makefile
index 1b5dcb5a41be..f22f632891c1 100644
--- a/devel/p5-Specio/Makefile
+++ b/devel/p5-Specio/Makefile
@@ -14,14 +14,14 @@ COMMENT= Type constraints and coercions for Perl
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
p5-Eval-Closure>=0:devel/p5-Eval-Closure \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Role-Tiny>=1.003003:devel/p5-Role-Tiny \
p5-Sub-Quote>=0:devel/p5-Sub-Quote \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Needs>=0:devel/p5-Test-Needs \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
diff --git a/devel/p5-Spoon/Makefile b/devel/p5-Spoon/Makefile
index 29326587cce8..9b74658da076 100644
--- a/devel/p5-Spoon/Makefile
+++ b/devel/p5-Spoon/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Spiffy Application Building Framework
-BUILD_DEPENDS= p5-Spiffy>=0:devel/p5-Spiffy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Spiffy>=0:devel/p5-Spiffy \
p5-IO-All>=0:devel/p5-IO-All \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-String-Checker/Makefile b/devel/p5-String-Checker/Makefile
index 3d4edaf04fcd..dbcbe8d2ec31 100644
--- a/devel/p5-String-Checker/Makefile
+++ b/devel/p5-String-Checker/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module implementing an extensible string validation interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-String-Diff/Makefile b/devel/p5-String-Diff/Makefile
index e412209137b1..ec803da5fa65 100644
--- a/devel/p5-String-Diff/Makefile
+++ b/devel/p5-String-Diff/Makefile
@@ -13,8 +13,8 @@ COMMENT= Simple diff to String
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
TEST_DEPENDS= p5-Test-Base>=0:devel/p5-Test-Base \
p5-YAML>=0:textproc/p5-YAML
diff --git a/devel/p5-Sub-Alias/Makefile b/devel/p5-Sub-Alias/Makefile
index 2c34874a66dd..f5a18b479288 100644
--- a/devel/p5-Sub-Alias/Makefile
+++ b/devel/p5-Sub-Alias/Makefile
@@ -14,10 +14,10 @@ COMMENT= Simple subroutine alias
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Devel-BeginLift>=0:devel/p5-Devel-BeginLift \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-BeginLift>=0:devel/p5-Devel-BeginLift \
p5-Devel-Declare>=0:devel/p5-Devel-Declare \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Sub-Exporter-GlobExporter/Makefile b/devel/p5-Sub-Exporter-GlobExporter/Makefile
index 88c501fbfa6a..195bf1c2f062 100644
--- a/devel/p5-Sub-Exporter-GlobExporter/Makefile
+++ b/devel/p5-Sub-Exporter-GlobExporter/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Sub-Exporter-Lexical/Makefile b/devel/p5-Sub-Exporter-Lexical/Makefile
index dd67fbb2aa90..fb2d16346115 100644
--- a/devel/p5-Sub-Exporter-Lexical/Makefile
+++ b/devel/p5-Sub-Exporter-Lexical/Makefile
@@ -14,12 +14,12 @@ COMMENT= Export lexically-available subs with Sub::Exporter
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-B-Hooks-EndOfScope>=0:devel/p5-B-Hooks-EndOfScope \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Hooks-EndOfScope>=0:devel/p5-B-Hooks-EndOfScope \
p5-Lexical-Var>=0:devel/p5-Lexical-Var \
p5-Sub-Exporter>=0.978:devel/p5-Sub-Exporter \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Sub-Exporter-Progressive/Makefile b/devel/p5-Sub-Exporter-Progressive/Makefile
index 2f03a4c60904..5f2b144e7fcb 100644
--- a/devel/p5-Sub-Exporter-Progressive/Makefile
+++ b/devel/p5-Sub-Exporter-Progressive/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Sub-Exporter/Makefile b/devel/p5-Sub-Exporter/Makefile
index 356071a2cc00..4966db698839 100644
--- a/devel/p5-Sub-Exporter/Makefile
+++ b/devel/p5-Sub-Exporter/Makefile
@@ -14,10 +14,10 @@ COMMENT= Sophisticated exporter for custom-built routines
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-OptList>=0.100:devel/p5-Data-OptList \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-OptList>=0.100:devel/p5-Data-OptList \
p5-Params-Util>=0.14:devel/p5-Params-Util \
p5-Sub-Install>=0.920:devel/p5-Sub-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Sub-Info/Makefile b/devel/p5-Sub-Info/Makefile
index d8e490c7dd91..2db358fecb9b 100644
--- a/devel/p5-Sub-Info/Makefile
+++ b/devel/p5-Sub-Info/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Importer>=0.024:devel/p5-Importer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Importer>=0.024:devel/p5-Importer
TEST_DEPENDS= p5-Test-Simple>=1.302072:devel/p5-Test-Simple
USES= perl5
diff --git a/devel/p5-Sub-Multi/Makefile b/devel/p5-Sub-Multi/Makefile
index 9166fbc0cf0b..30da8e7f8ae0 100644
--- a/devel/p5-Sub-Multi/Makefile
+++ b/devel/p5-Sub-Multi/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Data::Bind-based multi-sub dispatch
-BUILD_DEPENDS= p5-Class-Multimethods-Pure>=0.11:devel/p5-Class-Multimethods-Pure \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Multimethods-Pure>=0.11:devel/p5-Class-Multimethods-Pure \
p5-Data-Bind>=0.26:devel/p5-Data-Bind
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-Sub-Signatures/Makefile b/devel/p5-Sub-Signatures/Makefile
index 34caf3289b7d..177e67e7db7c 100644
--- a/devel/p5-Sub-Signatures/Makefile
+++ b/devel/p5-Sub-Signatures/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Use proper signatures for subroutines, including dispatching
-BUILD_DEPENDS= p5-Sub-Uplevel>=0.12:devel/p5-Sub-Uplevel
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Uplevel>=0.12:devel/p5-Sub-Uplevel
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-Sub-WrapPackages/Makefile b/devel/p5-Sub-WrapPackages/Makefile
index 7d8cd5bb77d8..679a797bcb15 100644
--- a/devel/p5-Sub-WrapPackages/Makefile
+++ b/devel/p5-Sub-WrapPackages/Makefile
@@ -13,10 +13,10 @@ COMMENT= Add pre- and post-execution wrappers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-Caller-IgnoreNamespaces>=1:devel/p5-Devel-Caller-IgnoreNamespaces \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Caller-IgnoreNamespaces>=1:devel/p5-Devel-Caller-IgnoreNamespaces \
p5-Hook-LexWrap>=0:devel/p5-Hook-LexWrap \
p5-Sub-Prototype>=0.02:devel/p5-Sub-Prototype
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Syntax-Keyword-Gather/Makefile b/devel/p5-Syntax-Keyword-Gather/Makefile
index f25c07dd9a01..356ec1be3e61 100644
--- a/devel/p5-Syntax-Keyword-Gather/Makefile
+++ b/devel/p5-Syntax-Keyword-Gather/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Syntax-Keyword-Junction/Makefile b/devel/p5-Syntax-Keyword-Junction/Makefile
index 695fde0e0bcd..8fb4ecd58a5e 100644
--- a/devel/p5-Syntax-Keyword-Junction/Makefile
+++ b/devel/p5-Syntax-Keyword-Junction/Makefile
@@ -12,9 +12,9 @@ COMMENT= Perl6 style Junction operators in Perl5
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-syntax>=0:devel/p5-syntax \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-syntax>=0:devel/p5-syntax \
p5-Sub-Exporter-Progressive>=0.001006:devel/p5-Sub-Exporter-Progressive
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Sys-Info-Driver-BSD/Makefile b/devel/p5-Sys-Info-Driver-BSD/Makefile
index 2edf1dd3d192..309ddc6f751a 100644
--- a/devel/p5-Sys-Info-Driver-BSD/Makefile
+++ b/devel/p5-Sys-Info-Driver-BSD/Makefile
@@ -14,10 +14,10 @@ COMMENT= BSD driver for Sys::Info
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-BSD-Sysctl>=0.08:sysutils/p5-BSD-Sysctl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-BSD-Sysctl>=0.08:sysutils/p5-BSD-Sysctl \
p5-Sys-Info-Base>=0.7801:devel/p5-Sys-Info-Base \
p5-Unix-Processors>=0:sysutils/p5-Unix-Processors
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
p5-Test-Sys-Info>=0.20:devel/p5-Test-Sys-Info
diff --git a/devel/p5-Sys-Info/Makefile b/devel/p5-Sys-Info/Makefile
index 62cc74b59419..9651cffebf5d 100644
--- a/devel/p5-Sys-Info/Makefile
+++ b/devel/p5-Sys-Info/Makefile
@@ -14,9 +14,9 @@ COMMENT= Fetch information from the host system
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Sys-Info-Base>=0.7800:devel/p5-Sys-Info-Base \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sys-Info-Base>=0.7800:devel/p5-Sys-Info-Base \
p5-Sys-Info-Driver-BSD>=0.7800:devel/p5-Sys-Info-Driver-BSD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
p5-Test-Sys-Info>=0.20:devel/p5-Test-Sys-Info
diff --git a/devel/p5-System-Info/Makefile b/devel/p5-System-Info/Makefile
index 5ee2195fa3a2..e346b312652b 100644
--- a/devel/p5-System-Info/Makefile
+++ b/devel/p5-System-Info/Makefile
@@ -13,9 +13,9 @@ COMMENT= Extract system info for reporting
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Test-Simple>=0.88:devel/p5-Test-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Simple>=0.88:devel/p5-Test-Simple \
p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5 tar:tgz
diff --git a/devel/p5-TAP-SimpleOutput/Makefile b/devel/p5-TAP-SimpleOutput/Makefile
index 17ca8fc1bd0a..45dabc18be70 100644
--- a/devel/p5-TAP-SimpleOutput/Makefile
+++ b/devel/p5-TAP-SimpleOutput/Makefile
@@ -12,10 +12,10 @@ COMMENT= Simple closure-driven TAP generator
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-Perl-Version>=0:devel/p5-Perl-Version \
p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Term-Animation/Makefile b/devel/p5-Term-Animation/Makefile
index d05336f3d659..87a4cf1f65e5 100644
--- a/devel/p5-Term-Animation/Makefile
+++ b/devel/p5-Term-Animation/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= fjoe@FreeBSD.org
COMMENT= ASCII sprite animation framework
-BUILD_DEPENDS= p5-Curses>=0:devel/p5-Curses
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Curses>=0:devel/p5-Curses
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Term-Clui/Makefile b/devel/p5-Term-Clui/Makefile
index a9c5b83d6902..52edb51d9805 100644
--- a/devel/p5-Term-Clui/Makefile
+++ b/devel/p5-Term-Clui/Makefile
@@ -12,10 +12,10 @@ COMMENT= Perl module offering a Command-Line User Interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Term-Size>=0:devel/p5-Term-Size \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-Size>=0:devel/p5-Term-Size \
p5-Term-ReadKey>=2.14:devel/p5-Term-ReadKey \
p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Term-Menus/Makefile b/devel/p5-Term-Menus/Makefile
index fb8d67a48a47..bb165a7230dd 100644
--- a/devel/p5-Term-Menus/Makefile
+++ b/devel/p5-Term-Menus/Makefile
@@ -13,13 +13,13 @@ COMMENT= Create Powerful Terminal, Console, and CMD Environment Menus
LICENSE= AGPLv3
-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-Data-Dump-Streamer>0:devel/p5-Data-Dump-Streamer \
p5-Devel-Symdump>0:devel/p5-Devel-Symdump \
p5-PadWalker>0:devel/p5-PadWalker \
p5-Term-RawInput>=1.20:devel/p5-Term-RawInput \
p5-Term-ReadKey>0:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Term-ProgressBar-Quiet/Makefile b/devel/p5-Term-ProgressBar-Quiet/Makefile
index 991ffe86c6f2..6c9faf411b3c 100644
--- a/devel/p5-Term-ProgressBar-Quiet/Makefile
+++ b/devel/p5-Term-ProgressBar-Quiet/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl extension to display a progress bar, if interactive
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar \
p5-Test-MockObject>0:devel/p5-Test-MockObject \
p5-IO-Interactive>=0:devel/p5-IO-Interactive
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Term-ProgressBar-Simple/Makefile b/devel/p5-Term-ProgressBar-Simple/Makefile
index e87275d8cac1..457f4222aaed 100644
--- a/devel/p5-Term-ProgressBar-Simple/Makefile
+++ b/devel/p5-Term-ProgressBar-Simple/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simpler Term::ProgressBar interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Term-ProgressBar-Quiet>=0:devel/p5-Term-ProgressBar-Quiet
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ProgressBar-Quiet>=0:devel/p5-Term-ProgressBar-Quiet
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Term-ProgressBar/Makefile b/devel/p5-Term-ProgressBar/Makefile
index 13c696630d37..59d5c1e64c2e 100644
--- a/devel/p5-Term-ProgressBar/Makefile
+++ b/devel/p5-Term-ProgressBar/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl extension to display a progress bar
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-MethodMaker>=1.02:devel/p5-Class-MethodMaker \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-MethodMaker>=1.02:devel/p5-Class-MethodMaker \
p5-Term-ReadKey>=2.14:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Capture-Tiny>=0.13:devel/p5-Capture-Tiny \
p5-Test-Exception>=0.31:devel/p5-Test-Exception \
p5-Test-Warnings>=0:devel/p5-Test-Warnings
diff --git a/devel/p5-Term-Prompt/Makefile b/devel/p5-Term-Prompt/Makefile
index da2a6ac86794..e313c370f449 100644
--- a/devel/p5-Term-Prompt/Makefile
+++ b/devel/p5-Term-Prompt/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for prompting a user for information
-BUILD_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index 1a7fb7686b88..0980a8707724 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -14,8 +14,8 @@ COMMENT= Interactive question-response user interface module
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Array-PrintCols>=0:misc/p5-Array-PrintCols
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Array-PrintCols>=0:misc/p5-Array-PrintCols
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Term-RawInput/Makefile b/devel/p5-Term-RawInput/Makefile
index 6212f63a6129..69adee6dc2e4 100644
--- a/devel/p5-Term-RawInput/Makefile
+++ b/devel/p5-Term-RawInput/Makefile
@@ -13,8 +13,8 @@ COMMENT= Drop-in replacement for <STDIN> with handling of non-standard keys
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Term-ReadLine-Perl/Makefile b/devel/p5-Term-ReadLine-Perl/Makefile
index da2a1c2ac369..2c3c45d8c9d8 100644
--- a/devel/p5-Term-ReadLine-Perl/Makefile
+++ b/devel/p5-Term-ReadLine-Perl/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Quick implementation of the minimal interface to Readline libraries
-BUILD_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Term-ReadLine-Zoid/Makefile b/devel/p5-Term-ReadLine-Zoid/Makefile
index b3278ede6ff2..f8c6480dc1c0 100644
--- a/devel/p5-Term-ReadLine-Zoid/Makefile
+++ b/devel/p5-Term-ReadLine-Zoid/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Provides an interactive input buffer written in plain PERL
-BUILD_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Term-Shell/Makefile b/devel/p5-Term-Shell/Makefile
index c3f2f1f65344..7fbd35584dd5 100644
--- a/devel/p5-Term-Shell/Makefile
+++ b/devel/p5-Term-Shell/Makefile
@@ -13,9 +13,9 @@ COMMENT= Write command-line shells in Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
p5-Text-Autoformat>=0:textproc/p5-Text-Autoformat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Term-Size-Any/Makefile b/devel/p5-Term-Size-Any/Makefile
index 626061543f90..0dd2ab07a61c 100644
--- a/devel/p5-Term-Size-Any/Makefile
+++ b/devel/p5-Term-Size-Any/Makefile
@@ -14,9 +14,9 @@ COMMENT= Retrieve terminal size
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-Hide>=0:devel/p5-Devel-Hide \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Hide>=0:devel/p5-Devel-Hide \
p5-Term-Size-Perl>=0:devel/p5-Term-Size-Perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
p5-Test-Pod>=1.18:devel/p5-Test-Pod
diff --git a/devel/p5-Term-Table/Makefile b/devel/p5-Term-Table/Makefile
index 6e0752b81936..0915506851fc 100644
--- a/devel/p5-Term-Table/Makefile
+++ b/devel/p5-Term-Table/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Importer>=0.024:devel/p5-Importer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Importer>=0.024:devel/p5-Importer
TEST_DEPENDS= p5-Test-Simple>=1.302097:devel/p5-Test-Simple
NO_ARCH= yes
diff --git a/devel/p5-Term-UI/Makefile b/devel/p5-Term-UI/Makefile
index 6fbdeb8e16e8..bfebd2bb44e2 100644
--- a/devel/p5-Term-UI/Makefile
+++ b/devel/p5-Term-UI/Makefile
@@ -14,8 +14,8 @@ COMMENT= Term::ReadLine UI made easy
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Message-Simple>=0:devel/p5-Log-Message-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Message-Simple>=0:devel/p5-Log-Message-Simple
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Term-VT102-Boundless/Makefile b/devel/p5-Term-VT102-Boundless/Makefile
index 2b62ab4ba2e7..c930e489a351 100644
--- a/devel/p5-Term-VT102-Boundless/Makefile
+++ b/devel/p5-Term-VT102-Boundless/Makefile
@@ -14,8 +14,8 @@ COMMENT= Subclass to emulate boundless DEC VT102 terminal
LICENSE= ART10 GPLv1 MIT
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Term-VT102>=0:devel/p5-Term-VT102
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-VT102>=0:devel/p5-Term-VT102
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Term-Visual/Makefile b/devel/p5-Term-Visual/Makefile
index b1ddbcac4b16..e6ecd0964761 100644
--- a/devel/p5-Term-Visual/Makefile
+++ b/devel/p5-Term-Visual/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Split-terminal user interface
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-Curses>=0:devel/p5-Curses
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Able-Runner/Makefile b/devel/p5-Test-Able-Runner/Makefile
index cf1459557038..0de672cc6ee4 100644
--- a/devel/p5-Test-Able-Runner/Makefile
+++ b/devel/p5-Test-Able-Runner/Makefile
@@ -14,10 +14,10 @@ COMMENT= Use Test::Able without a bunch of boilerplate
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Pluggable>=3.6:devel/p5-Module-Pluggable \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Pluggable>=3.6:devel/p5-Module-Pluggable \
p5-Moose>=0.94:devel/p5-Moose \
p5-Test-Able>=0.09:devel/p5-Test-Able
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Test-Able/Makefile b/devel/p5-Test-Able/Makefile
index 029f5daec74c..ebac0e9a7306 100644
--- a/devel/p5-Test-Able/Makefile
+++ b/devel/p5-Test-Able/Makefile
@@ -14,8 +14,8 @@ COMMENT= Xunit with Moose
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.94:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.94:devel/p5-Moose
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Test-Aggregate/Makefile b/devel/p5-Test-Aggregate/Makefile
index 38740ea8bd04..2df43531fd13 100644
--- a/devel/p5-Test-Aggregate/Makefile
+++ b/devel/p5-Test-Aggregate/Makefile
@@ -13,10 +13,10 @@ COMMENT= Aggregate Perl tests for better performance
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Test-Most>=0.21:devel/p5-Test-Most \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Most>=0.21:devel/p5-Test-Most \
p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings \
p5-Test-Trap>0:devel/p5-Test-Trap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-Bits/Makefile b/devel/p5-Test-Bits/Makefile
index 75c58a1f8480..e17411da1696 100644
--- a/devel/p5-Test-Bits/Makefile
+++ b/devel/p5-Test-Bits/Makefile
@@ -14,8 +14,8 @@ COMMENT= Provides a bits_is() subroutine for testing binary data
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-List-AllUtils>=0:devel/p5-List-AllUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-AllUtils>=0:devel/p5-List-AllUtils
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-Test-CPAN-Meta-YAML/Makefile b/devel/p5-Test-CPAN-Meta-YAML/Makefile
index 0df4a4adce2a..63cdbd42bdeb 100644
--- a/devel/p5-Test-CPAN-Meta-YAML/Makefile
+++ b/devel/p5-Test-CPAN-Meta-YAML/Makefile
@@ -12,8 +12,8 @@ COMMENT= Validate a META.yml file within a CPAN distribution
LICENSE= ART20
-BUILD_DEPENDS= p5-Test-YAML-Valid>=0.03:devel/p5-Test-YAML-Valid
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-YAML-Valid>=0.03:devel/p5-Test-YAML-Valid
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Test-CheckDeps/Makefile b/devel/p5-Test-CheckDeps/Makefile
index 7a9d42985269..8c2e26fc1b4f 100644
--- a/devel/p5-Test-CheckDeps/Makefile
+++ b/devel/p5-Test-CheckDeps/Makefile
@@ -14,8 +14,8 @@ COMMENT= Check for presence of dependencies
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CPAN-Meta-Check>=0.007:devel/p5-CPAN-Meta-Check
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CPAN-Meta-Check>=0.007:devel/p5-CPAN-Meta-Check
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-Class-Most/Makefile b/devel/p5-Test-Class-Most/Makefile
index 62c885b6c189..0a737f8d5745 100644
--- a/devel/p5-Test-Class-Most/Makefile
+++ b/devel/p5-Test-Class-Most/Makefile
@@ -15,9 +15,9 @@ COMMENT= Test Classes the easy way
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Test-Class>=0.38:devel/p5-Test-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Class>=0.38:devel/p5-Test-Class \
p5-Test-Most>=0.31:devel/p5-Test-Most
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Test-Class/Makefile b/devel/p5-Test-Class/Makefile
index 83a484d0fa89..665880a94cb9 100644
--- a/devel/p5-Test-Class/Makefile
+++ b/devel/p5-Test-Class/Makefile
@@ -13,8 +13,8 @@ COMMENT= Easily create test classes in an xUnit style
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MRO-Compat>=0.11:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MRO-Compat>=0.11:devel/p5-MRO-Compat
TEST_DEPENDS= p5-Contextual-Return>=0:devel/p5-Contextual-Return \
p5-Test-Exception>=0.25:devel/p5-Test-Exception
diff --git a/devel/p5-Test-ClassAPI/Makefile b/devel/p5-Test-ClassAPI/Makefile
index 76f968db3dc6..ad62ead855d2 100644
--- a/devel/p5-Test-ClassAPI/Makefile
+++ b/devel/p5-Test-ClassAPI/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Inspector>=1.12:devel/p5-Class-Inspector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Inspector>=1.12:devel/p5-Class-Inspector \
p5-Config-Tiny>=2.00:devel/p5-Config-Tiny \
p5-Params-Util>=1.00:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-Classy/Makefile b/devel/p5-Test-Classy/Makefile
index 1e9ccf273068..1d6cb7605f26 100644
--- a/devel/p5-Test-Classy/Makefile
+++ b/devel/p5-Test-Classy/Makefile
@@ -15,13 +15,13 @@ COMMENT= Write your unit tests in other modules than *.t
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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-Class-Inspector>=0:devel/p5-Class-Inspector \
p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-Module-Find>=0.05:devel/p5-Module-Find \
p5-Sub-Install>=0.920:devel/p5-Sub-Install \
p5-Term-Encoding>=0:devel/p5-Term-Encoding
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-UseAllModules>=0.09:devel/p5-Test-UseAllModules
USES= perl5
diff --git a/devel/p5-Test-CleanNamespaces/Makefile b/devel/p5-Test-CleanNamespaces/Makefile
index 6584231d55e0..0d7857b1021a 100644
--- a/devel/p5-Test-CleanNamespaces/Makefile
+++ b/devel/p5-Test-CleanNamespaces/Makefile
@@ -13,10 +13,10 @@ COMMENT= Check for uncleaned imports
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Runtime>0:devel/p5-Module-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Runtime>0:devel/p5-Module-Runtime \
p5-Package-Stash>=0.14:devel/p5-Package-Stash \
p5-Sub-Identify>0:devel/p5-Sub-Identify
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-pushd>0:devel/p5-File-pushd \
p5-Test-Deep>0:devel/p5-Test-Deep \
p5-Test-Needs>0:devel/p5-Test-Needs \
diff --git a/devel/p5-Test-Compile/Makefile b/devel/p5-Test-Compile/Makefile
index 17ee8457d708..6482ebd33bab 100644
--- a/devel/p5-Test-Compile/Makefile
+++ b/devel/p5-Test-Compile/Makefile
@@ -15,9 +15,9 @@ COMMENT= Check whether Perl module files compile correctly
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-CheckOS>=0:devel/p5-Devel-CheckOS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-CheckOS>=0:devel/p5-Devel-CheckOS \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-DBIx-Class/Makefile b/devel/p5-Test-DBIx-Class/Makefile
index ea4d75a366f4..f8b5404cc071 100644
--- a/devel/p5-Test-DBIx-Class/Makefile
+++ b/devel/p5-Test-DBIx-Class/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Config-Any>=0.19:devel/p5-Config-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Any>=0.19:devel/p5-Config-Any \
p5-DBIx-Class>=0.08123:databases/p5-DBIx-Class \
p5-DBIx-Class-Schema-PopulateMore>=0.16:databases/p5-DBIx-Class-Schema-PopulateMore \
p5-DBIx-Class-TimeStamp>=0.13:databases/p5-DBIx-Class-TimeStamp \
@@ -31,7 +32,6 @@ BUILD_DEPENDS= p5-Config-Any>=0.19:devel/p5-Config-Any \
p5-SQL-Translator>=0.11006:databases/p5-SQL-Translator \
p5-Sub-Exporter>=0.982:devel/p5-Sub-Exporter \
p5-Test-Deep>=0.106:devel/p5-Test-Deep
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-Types-LoadableClass>=0:devel/p5-MooseX-Types-LoadableClass \
p5-Test-Differences>=0:devel/p5-Test-Differences \
p5-Test-mysqld>=0:databases/p5-Test-mysqld
diff --git a/devel/p5-Test-Dependencies/Makefile b/devel/p5-Test-Dependencies/Makefile
index 338c1e8dee5e..6fd5eace01a6 100644
--- a/devel/p5-Test-Dependencies/Makefile
+++ b/devel/p5-Test-Dependencies/Makefile
@@ -13,11 +13,11 @@ COMMENT= Ensure that your Makefile.PL specifies all module dependencies
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Find-Rule-Perl>=0:devel/p5-File-Find-Rule-Perl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Find-Rule-Perl>=0:devel/p5-File-Find-Rule-Perl \
p5-IPC-Cmd>=0:devel/p5-IPC-Cmd \
p5-Pod-Strip>=0:textproc/p5-Pod-Strip \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Needs>=0:devel/p5-Test-Needs
USES= perl5
diff --git a/devel/p5-Test-DependentModules/Makefile b/devel/p5-Test-DependentModules/Makefile
index 3508adcd45fd..cc1214b7768f 100644
--- a/devel/p5-Test-DependentModules/Makefile
+++ b/devel/p5-Test-DependentModules/Makefile
@@ -14,7 +14,8 @@ COMMENT= Test all modules which depend on your module
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-File-chdir>=0:devel/p5-File-chdir \
p5-Parallel-ForkManager>=0.7.6:devel/p5-Parallel-ForkManager \
p5-IO-Handle-Util>=0:devel/p5-IO-Handle-Util \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
p5-MetaCPAN-Client>=0:devel/p5-MetaCPAN-Client \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
p5-Module-Build>=0:devel/p5-Module-Build \
p5-Module-Build-Tiny>=0:devel/p5-Module-Build-Tiny
diff --git a/devel/p5-Test-Differences/Makefile b/devel/p5-Test-Differences/Makefile
index b77294a17669..3ccff890f7c8 100644
--- a/devel/p5-Test-Differences/Makefile
+++ b/devel/p5-Test-Differences/Makefile
@@ -15,8 +15,8 @@ COMMENT= Test::Differences - Test strings and data structures for differences
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Text-Diff>=1.43:textproc/p5-Text-Diff
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Diff>=1.43:textproc/p5-Text-Diff
TEST_DEPENDS= p5-Capture-Tiny>=0.24:devel/p5-Capture-Tiny
PORTSCOUT= skipv:0.4801
diff --git a/devel/p5-Test-Distribution/Makefile b/devel/p5-Test-Distribution/Makefile
index 9e1acd2377d9..c8cab4e05920 100644
--- a/devel/p5-Test-Distribution/Makefile
+++ b/devel/p5-Test-Distribution/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Test::Distribution - Perform tests on all modules of a distribution
-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-Pod-Coverage>=0:devel/p5-Pod-Coverage \
p5-Test-Pod>=0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Test-Exception/Makefile b/devel/p5-Test-Exception/Makefile
index 4e2377d0f683..c184f46ebb2a 100644
--- a/devel/p5-Test-Exception/Makefile
+++ b/devel/p5-Test-Exception/Makefile
@@ -13,8 +13,8 @@ COMMENT= Test functions for exception based code
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Sub-Uplevel>=0.18:devel/p5-Sub-Uplevel
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Uplevel>=0.18:devel/p5-Sub-Uplevel
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-Expect/Makefile b/devel/p5-Test-Expect/Makefile
index 19823c1c4e6b..1648d3666f60 100644
--- a/devel/p5-Test-Expect/Makefile
+++ b/devel/p5-Test-Expect/Makefile
@@ -13,9 +13,9 @@ COMMENT= Automated driving and testing of terminal-based programs
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
p5-Expect-Simple>=0:devel/p5-Expect-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-FailWarnings/Makefile b/devel/p5-Test-FailWarnings/Makefile
index 54ff41bc7763..24eee796d020 100644
--- a/devel/p5-Test-FailWarnings/Makefile
+++ b/devel/p5-Test-FailWarnings/Makefile
@@ -13,8 +13,8 @@ COMMENT= Add test failures if warnings are caught
LICENSE= APACHE20
-BUILD_DEPENDS= p5-Capture-Tiny>=0.21:devel/p5-Capture-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Capture-Tiny>=0.21:devel/p5-Capture-Tiny
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Fake-HTTPD/Makefile b/devel/p5-Test-Fake-HTTPD/Makefile
index 3b25c17c6625..137ed2153bdb 100644
--- a/devel/p5-Test-Fake-HTTPD/Makefile
+++ b/devel/p5-Test-Fake-HTTPD/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
p5-Plack>=0:www/p5-Plack \
p5-Test-SharedFork>=0.29:devel/p5-Test-SharedFork \
p5-Test-TCP>=0:devel/p5-Test-TCP \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-TCP>=0:devel/p5-Test-TCP \
p5-Test-UseAllModules>=0:devel/p5-Test-UseAllModules \
diff --git a/devel/p5-Test-Fatal/Makefile b/devel/p5-Test-Fatal/Makefile
index ff17d015eba8..ced6163b21d0 100644
--- a/devel/p5-Test-Fatal/Makefile
+++ b/devel/p5-Test-Fatal/Makefile
@@ -13,8 +13,8 @@ COMMENT= Incredibly simple helpers for testing code with exceptions
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Try-Tiny>=0.07:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Try-Tiny>=0.07:lang/p5-Try-Tiny
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-File-Contents/Makefile b/devel/p5-Test-File-Contents/Makefile
index a2c2cdff9cc8..000978687f5d 100644
--- a/devel/p5-Test-File-Contents/Makefile
+++ b/devel/p5-Test-File-Contents/Makefile
@@ -13,8 +13,8 @@ COMMENT= Test routines for examining the contents of files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Text-Diff>=0.35:textproc/p5-Text-Diff
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Diff>=0.35:textproc/p5-Text-Diff
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Test-File-ShareDir/Makefile b/devel/p5-Test-File-ShareDir/Makefile
index 1eadb77c9b90..fef1a7957b55 100644
--- a/devel/p5-Test-File-ShareDir/Makefile
+++ b/devel/p5-Test-File-ShareDir/Makefile
@@ -13,12 +13,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Tiny>=0:devel/p5-Class-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Tiny>=0:devel/p5-Class-Tiny \
p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
p5-File-ShareDir>=1.00:devel/p5-File-ShareDir \
p5-Path-Tiny>=0.018:devel/p5-Path-Tiny \
p5-Scope-Guard>=0:devel/p5-Scope-Guard
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-Test-Fixture-DBIC-Schema/Makefile b/devel/p5-Test-Fixture-DBIC-Schema/Makefile
index 2a0585e2ae94..67c8e8cc053a 100644
--- a/devel/p5-Test-Fixture-DBIC-Schema/Makefile
+++ b/devel/p5-Test-Fixture-DBIC-Schema/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Module providing a DBIx::Class::Schema fixture data loader
-BUILD_DEPENDS= p5-DBIx-Class>=0.07005:databases/p5-DBIx-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0.07005:databases/p5-DBIx-Class \
p5-Kwalify>=1.19:textproc/p5-Kwalify \
p5-Params-Validate>=0.15:devel/p5-Params-Validate \
p5-YAML-Syck>=0.95:textproc/p5-YAML-Syck
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>0:databases/p5-DBD-SQLite
USES= perl5
diff --git a/devel/p5-Test-Group/Makefile b/devel/p5-Test-Group/Makefile
index fcc669822899..7bfcbf044eb0 100644
--- a/devel/p5-Test-Group/Makefile
+++ b/devel/p5-Test-Group/Makefile
@@ -12,9 +12,9 @@ COMMENT= Group together related tests in a test suite
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-Test-Cmd>=0:devel/p5-Test-Cmd
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/devel/p5-Test-HTML-Tidy/Makefile b/devel/p5-Test-HTML-Tidy/Makefile
index a1246b1e1e25..c8e967f9e21e 100644
--- a/devel/p5-Test-HTML-Tidy/Makefile
+++ b/devel/p5-Test-HTML-Tidy/Makefile
@@ -14,8 +14,8 @@ COMMENT= Test::More-style wrapper around HTML::Tidy
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Tidy>=0:textproc/p5-HTML-Tidy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Tidy>=0:textproc/p5-HTML-Tidy
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-HexDifferences/Makefile b/devel/p5-Test-HexDifferences/Makefile
index ec9f9cbbb0ac..9125223b3eb4 100644
--- a/devel/p5-Test-HexDifferences/Makefile
+++ b/devel/p5-Test-HexDifferences/Makefile
@@ -13,11 +13,11 @@ COMMENT= Test binary as hexadecimal string
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-Test-Differences>=0.60:devel/p5-Test-Differences \
p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-Text-Diff>=0:textproc/p5-Text-Diff
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Test-JSON/Makefile b/devel/p5-Test-JSON/Makefile
index a65b923c2ffb..f22ebcb1b9cd 100644
--- a/devel/p5-Test-JSON/Makefile
+++ b/devel/p5-Test-JSON/Makefile
@@ -14,9 +14,9 @@ COMMENT= Test JSON data
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Test-Differences>=0.47:devel/p5-Test-Differences \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Differences>=0.47:devel/p5-Test-Differences \
p5-JSON-Any>=1.20:converters/p5-JSON-Any
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-Kwalitee/Makefile b/devel/p5-Test-Kwalitee/Makefile
index c92f64e61d7d..5ba18c2b10dc 100644
--- a/devel/p5-Test-Kwalitee/Makefile
+++ b/devel/p5-Test-Kwalitee/Makefile
@@ -13,8 +13,8 @@ COMMENT= Test the Kwalitee of a distribution before you release it
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-CPANTS-Analyse>=0.92:devel/p5-Module-CPANTS-Analyse
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-CPANTS-Analyse>=0.92:devel/p5-Module-CPANTS-Analyse
TEST_DEPENDS= p5-CPAN-Meta-Check>=0.011:devel/p5-CPAN-Meta-Check \
p5-Test-Deep>0:devel/p5-Test-Deep \
p5-Test-Warnings>=0.009:devel/p5-Test-Warnings
diff --git a/devel/p5-Test-Lazy/Makefile b/devel/p5-Test-Lazy/Makefile
index 79757b44f881..376af2934039 100644
--- a/devel/p5-Test-Lazy/Makefile
+++ b/devel/p5-Test-Lazy/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Quick and easy way to compose and run tests with useful output
-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-Test-Deep>0:devel/p5-Test-Deep
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Log-Log4perl/Makefile b/devel/p5-Test-Log-Log4perl/Makefile
index 6509565fb0fd..9a8ad2698f85 100644
--- a/devel/p5-Test-Log-Log4perl/Makefile
+++ b/devel/p5-Test-Log-Log4perl/Makefile
@@ -13,8 +13,8 @@ COMMENT= Test log4perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USE_PERL5= configure
diff --git a/devel/p5-Test-Log4perl/Makefile b/devel/p5-Test-Log4perl/Makefile
index a7b5c64afd62..9fca4ceb6a1b 100644
--- a/devel/p5-Test-Log4perl/Makefile
+++ b/devel/p5-Test-Log4perl/Makefile
@@ -14,11 +14,11 @@ COMMENT= Test::Log4perl - test Log::Log4perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Lingua-EN-Numbers-Ordinate>=0:textproc/p5-Lingua-EN-Numbers-Ordinate \
p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-ManyParams/Makefile b/devel/p5-Test-ManyParams/Makefile
index dfd19d8d01cf..f7afd784e230 100644
--- a/devel/p5-Test-ManyParams/Makefile
+++ b/devel/p5-Test-ManyParams/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl module to test many params as one test
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Set-CrossProduct>0:devel/p5-Set-CrossProduct \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Set-CrossProduct>0:devel/p5-Set-CrossProduct \
p5-Test-Differences>0:devel/p5-Test-Differences \
p5-Test-Exception>0:devel/p5-Test-Exception
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Memory-Cycle/Makefile b/devel/p5-Test-Memory-Cycle/Makefile
index 7253dd5b65d9..242e7c808615 100644
--- a/devel/p5-Test-Memory-Cycle/Makefile
+++ b/devel/p5-Test-Memory-Cycle/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Check for memory leaks and circular memory references
-BUILD_DEPENDS= p5-Devel-Cycle>=0:devel/p5-Devel-Cycle \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Cycle>=0:devel/p5-Devel-Cycle \
p5-PadWalker>=0:devel/p5-PadWalker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Mini/Makefile b/devel/p5-Test-Mini/Makefile
index 5064802bc400..cf4ed3ca07d1 100644
--- a/devel/p5-Test-Mini/Makefile
+++ b/devel/p5-Test-Mini/Makefile
@@ -12,7 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kurt.lidl@cello.com
COMMENT= Provides lightweight unit testing framework
-BUILD_DEPENDS= p5-Data-Inspect>=0.03:devel/p5-Data-Inspect \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Inspect>=0.03:devel/p5-Data-Inspect \
p5-Exception-Class>=1.30:devel/p5-Exception-Class \
p5-IO-stringy>=2.110:devel/p5-IO-stringy \
p5-MRO-Compat>=0.10:devel/p5-MRO-Compat \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-Data-Inspect>=0.03:devel/p5-Data-Inspect \
p5-Try-Tiny>=0.04:lang/p5-Try-Tiny \
p5-aliased>=0.30:devel/p5-aliased \
p5-namespace-clean>=0.14:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Mock-LWP-Dispatch/Makefile b/devel/p5-Test-Mock-LWP-Dispatch/Makefile
index ce8c0f89e414..98562c9ab871 100644
--- a/devel/p5-Test-Mock-LWP-Dispatch/Makefile
+++ b/devel/p5-Test-Mock-LWP-Dispatch/Makefile
@@ -13,10 +13,10 @@ COMMENT= Mocks LWP::UserAgent and dispatches your requests/responses
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-Test-MockObject>=0:devel/p5-Test-MockObject \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Moose>=0:devel/p5-Moose \
p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/devel/p5-Test-Mock-LWP/Makefile b/devel/p5-Test-Mock-LWP/Makefile
index b90d6f9ddbf8..9d5cd83e361d 100644
--- a/devel/p5-Test-Mock-LWP/Makefile
+++ b/devel/p5-Test-Mock-LWP/Makefile
@@ -14,8 +14,8 @@ COMMENT= Easy mocking of LWP packages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Test-MockObject>=1.08:devel/p5-Test-MockObject
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-MockObject>=1.08:devel/p5-Test-MockObject
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Test-MockDateTime/Makefile b/devel/p5-Test-MockDateTime/Makefile
index 4b116585518c..379f30b05c8c 100644
--- a/devel/p5-Test-MockDateTime/Makefile
+++ b/devel/p5-Test-MockDateTime/Makefile
@@ -12,8 +12,8 @@ COMMENT= Mock DateTime->now calls during tests
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Modern/Makefile b/devel/p5-Test-Modern/Makefile
index f537f9768830..0f192fbf1b77 100644
--- a/devel/p5-Test-Modern/Makefile
+++ b/devel/p5-Test-Modern/Makefile
@@ -14,14 +14,14 @@ COMMENT= Precision testing for modern perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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-Import-Into>=1:devel/p5-Import-Into \
p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
p5-Test-API>=0.004:devel/p5-Test-API \
p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Fatal>0:devel/p5-Test-Fatal \
p5-Test-Warnings>0:devel/p5-Test-Warnings
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Moose>=0:devel/p5-Moose
USES= perl5
diff --git a/devel/p5-Test-Moose-More/Makefile b/devel/p5-Test-Moose-More/Makefile
index f11060a031f8..c145042442c5 100644
--- a/devel/p5-Test-Moose-More/Makefile
+++ b/devel/p5-Test-Moose-More/Makefile
@@ -12,12 +12,12 @@ COMMENT= More tools for testing Moose packages
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-OptList>=0:devel/p5-Data-OptList \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-OptList>=0:devel/p5-Data-OptList \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Moose>=0:devel/p5-Moose \
p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive \
p5-Syntax-Keyword-Junction>=0:devel/p5-Syntax-Keyword-Junction
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-TAP-SimpleOutput>=0.009:devel/p5-TAP-SimpleOutput \
p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
@@ -29,7 +29,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/devel/p5-Test-More-UTF8/Makefile b/devel/p5-Test-More-UTF8/Makefile
index cd1743de474a..7417f8e33384 100644
--- a/devel/p5-Test-More-UTF8/Makefile
+++ b/devel/p5-Test-More-UTF8/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Enhancing Test::More for UTF-8-based projects
-BUILD_DEPENDS= p5-Test-Simple>=0:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Simple>=0:devel/p5-Test-Simple
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Net-RabbitMQ/Makefile b/devel/p5-Test-Net-RabbitMQ/Makefile
index eb1056b178d3..fb8b1fdc82b9 100644
--- a/devel/p5-Test-Net-RabbitMQ/Makefile
+++ b/devel/p5-Test-Net-RabbitMQ/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= Perl mock RabbitMQ implementation for use when testing
-BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0:devel/p5-Moose
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/devel/p5-Test-Output/Makefile b/devel/p5-Test-Output/Makefile
index 14aeafe6542d..1e4d12da658c 100644
--- a/devel/p5-Test-Output/Makefile
+++ b/devel/p5-Test-Output/Makefile
@@ -14,8 +14,8 @@ COMMENT= Utilities to test STDOUT and STDERR messages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Capture-Tiny>=0.17:devel/p5-Capture-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Capture-Tiny>=0.17:devel/p5-Capture-Tiny
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-POE-Server-TCP/Makefile b/devel/p5-Test-POE-Server-TCP/Makefile
index 26429bd2fe52..0128033e2e42 100644
--- a/devel/p5-Test-POE-Server-TCP/Makefile
+++ b/devel/p5-Test-POE-Server-TCP/Makefile
@@ -13,8 +13,8 @@ COMMENT= POE Component providing TCP server services for test cases
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE>=1.004:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.004:devel/p5-POE
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Prereq/Makefile b/devel/p5-Test-Prereq/Makefile
index e14a8ca3edc2..8550cb57139a 100644
--- a/devel/p5-Test-Prereq/Makefile
+++ b/devel/p5-Test-Prereq/Makefile
@@ -13,9 +13,9 @@ COMMENT= Check if Makefile.PL has the right pre-requisites
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Extract-Use>0:devel/p5-Module-Extract-Use \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Extract-Use>0:devel/p5-Module-Extract-Use \
p5-Module-Build>=0.4220:devel/p5-Module-Build
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>0:devel/p5-Test-Pod-Coverage
diff --git a/devel/p5-Test-Refcount/Makefile b/devel/p5-Test-Refcount/Makefile
index d8d1baf46b79..58b9b1dd78bf 100644
--- a/devel/p5-Test-Refcount/Makefile
+++ b/devel/p5-Test-Refcount/Makefile
@@ -14,8 +14,8 @@ COMMENT= Assert reference counts on objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-MAT>=0:devel/p5-Devel-MAT
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-MAT>=0:devel/p5-Devel-MAT
TEST_DEPENDS= p5-Test-Pod>=1:devel/p5-Test-Pod
USE_PERL5= configure
diff --git a/devel/p5-Test-Reporter-Transport-Metabase/Makefile b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
index 24fa68b17361..1ebb06f682f5 100644
--- a/devel/p5-Test-Reporter-Transport-Metabase/Makefile
+++ b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= Metabase transport for Test::Reporter
-BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON \
p5-Config-Perl-V>0:devel/p5-Config-Perl-V \
p5-CPAN-Testers-Report>0:devel/p5-CPAN-Testers-Report \
p5-Metabase-Fact>0:devel/p5-Metabase-Fact \
p5-Metabase-Client-Simple>0:devel/p5-Metabase-Client-Simple \
p5-Test-Reporter>>1.54:devel/p5-Test-Reporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Requires-Git/Makefile b/devel/p5-Test-Requires-Git/Makefile
index 4b5b7cc5890d..b222b8b2ddb6 100644
--- a/devel/p5-Test-Requires-Git/Makefile
+++ b/devel/p5-Test-Requires-Git/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Git-Version-Compare>=1.003:devel/p5-Git-Version-Compare
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Git-Version-Compare>=1.003:devel/p5-Git-Version-Compare
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Test-Roo/Makefile b/devel/p5-Test-Roo/Makefile
index c6ffbdd3feff..2742ccc3f158 100644
--- a/devel/p5-Test-Roo/Makefile
+++ b/devel/p5-Test-Roo/Makefile
@@ -11,8 +11,8 @@ COMMENT= Composable, reusable tests with roles and Moo
LICENSE= APACHE20
-BUILD_DEPENDS= p5-Moo>=0:devel/p5-Moo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=0:devel/p5-Moo
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-Script/Makefile b/devel/p5-Test-Script/Makefile
index a7a22b7beae5..e1e64047f657 100644
--- a/devel/p5-Test-Script/Makefile
+++ b/devel/p5-Test-Script/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-Probe-Perl>=0.01:sysutils/p5-Probe-Perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test2-Suite>=0.000060:devel/p5-Test2-Suite
NO_ARCH= yes
@@ -26,7 +26,8 @@ USE_PERL5= configure
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 502501
-BUILD_DEPENDS+= p5-Test-Simple>=1.302015:devel/p5-Test-Simple
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS+= p5-Test-Simple>=1.302015:devel/p5-Test-Simple
RUN_DEPENDS+= p5-Test-Simple>=1.302015:devel/p5-Test-Simple
.endif
diff --git a/devel/p5-Test-Singleton/Makefile b/devel/p5-Test-Singleton/Makefile
index faaa26c1e329..54505072b0da 100644
--- a/devel/p5-Test-Singleton/Makefile
+++ b/devel/p5-Test-Singleton/Makefile
@@ -15,8 +15,8 @@ COMMENT= Test for Singleton classes
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Class-Singleton>=0:devel/p5-Class-Singleton
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Singleton>=0:devel/p5-Class-Singleton
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Test-Spec/Makefile b/devel/p5-Test-Spec/Makefile
index 7d557e79d5b9..d11137b3f3c3 100644
--- a/devel/p5-Test-Spec/Makefile
+++ b/devel/p5-Test-Spec/Makefile
@@ -13,11 +13,11 @@ COMMENT= Write tests in a declarative specification style
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Package-Stash>=0.23:devel/p5-Package-Stash \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Package-Stash>=0.23:devel/p5-Package-Stash \
p5-Test-Deep>=0.103:devel/p5-Test-Deep \
p5-Test-Trap>=0:devel/p5-Test-Trap \
p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Test-SubCalls/Makefile b/devel/p5-Test-SubCalls/Makefile
index 9f04c71c495f..f18266336211 100644
--- a/devel/p5-Test-SubCalls/Makefile
+++ b/devel/p5-Test-SubCalls/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Hook-LexWrap>=0.20:devel/p5-Hook-LexWrap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Hook-LexWrap>=0.20:devel/p5-Hook-LexWrap
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-TAP-HTMLMatrix/Makefile b/devel/p5-Test-TAP-HTMLMatrix/Makefile
index 7b07ac989207..0abfcac63b67 100644
--- a/devel/p5-Test-TAP-HTMLMatrix/Makefile
+++ b/devel/p5-Test-TAP-HTMLMatrix/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Creates colorful matrix of Test::Harness test run results
-BUILD_DEPENDS= p5-Test-TAP-Model>=0:devel/p5-Test-TAP-Model \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-TAP-Model>=0:devel/p5-Test-TAP-Model \
p5-Petal>=0:textproc/p5-Petal \
p5-Petal-Utils>=0:textproc/p5-Petal-Utils \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-TAP-Model/Makefile b/devel/p5-Test-TAP-Model/Makefile
index 8bab777e2666..efc286faf63f 100644
--- a/devel/p5-Test-TAP-Model/Makefile
+++ b/devel/p5-Test-TAP-Model/Makefile
@@ -14,9 +14,9 @@ COMMENT= Accessible result collector for Test::Harness::Straps runs
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Method-Alias>=0:devel/p5-Method-Alias \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Method-Alias>=0:devel/p5-Method-Alias \
p5-Test-Harness-Straps>=0.30:devel/p5-Test-Harness-Straps
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-TCP/Makefile b/devel/p5-Test-TCP/Makefile
index 81ecb8436af7..cfe472e238f7 100644
--- a/devel/p5-Test-TCP/Makefile
+++ b/devel/p5-Test-TCP/Makefile
@@ -12,8 +12,8 @@ COMMENT= Perl extension for testing TCP program
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Test-SharedFork>=0.19:devel/p5-Test-SharedFork
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-SharedFork>=0.19:devel/p5-Test-SharedFork
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-Trap/Makefile b/devel/p5-Test-Trap/Makefile
index 66d15e8f8ad5..0175c8409055 100644
--- a/devel/p5-Test-Trap/Makefile
+++ b/devel/p5-Test-Trap/Makefile
@@ -14,8 +14,8 @@ COMMENT= Trap exit codes, exceptions, output, etc
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Dump>=0:devel/p5-Data-Dump
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Dump>=0:devel/p5-Data-Dump
TEST_DEPENDS= p5-Test-Refcount>=0:devel/p5-Test-Refcount
NO_ARCH= yes
diff --git a/devel/p5-Test-Unit/Makefile b/devel/p5-Test-Unit/Makefile
index 2cc89ccfc16d..f30cf7307dab 100644
--- a/devel/p5-Test-Unit/Makefile
+++ b/devel/p5-Test-Unit/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= PerlUnit testing framework
-BUILD_DEPENDS= p5-Class-Inner>=0:devel/p5-Class-Inner \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Inner>=0:devel/p5-Class-Inner \
p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
p5-Error>=0:lang/p5-Error
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= TestLister.pl
diff --git a/devel/p5-Test-Version/Makefile b/devel/p5-Test-Version/Makefile
index d8871a388400..223d43d7ab9d 100644
--- a/devel/p5-Test-Version/Makefile
+++ b/devel/p5-Test-Version/Makefile
@@ -13,8 +13,8 @@ COMMENT= Check to see that version in modules are sane
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-Find-Rule-Perl>=0:devel/p5-File-Find-Rule-Perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Find-Rule-Perl>=0:devel/p5-File-Find-Rule-Perl
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-Test-WWW-Declare/Makefile b/devel/p5-Test-WWW-Declare/Makefile
index 93202e28831c..25b7af4560d1 100644
--- a/devel/p5-Test-WWW-Declare/Makefile
+++ b/devel/p5-Test-WWW-Declare/Makefile
@@ -14,8 +14,8 @@ COMMENT= Declarative testing for your web app
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile b/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
index 81cfee9227d5..35c62d475335 100644
--- a/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
@@ -14,10 +14,10 @@ COMMENT= Test::WWW::Mechanize for CGIApp
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-HTTP-Request-AsCGI>=0:www/p5-HTTP-Request-AsCGI \
p5-Test-WWW-Mechanize>=1.14:devel/p5-Test-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile b/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
index abf8956034d1..977aa8b947cc 100644
--- a/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
@@ -13,12 +13,12 @@ COMMENT= Test::WWW::Mechanize for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.9000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.9000:www/p5-Catalyst-Runtime \
p5-Moose>=0.67:devel/p5-Moose \
p5-Test-WWW-Mechanize>=1.14:devel/p5-Test-WWW-Mechanize \
p5-WWW-Mechanize>=1.54:www/p5-WWW-Mechanize \
p5-namespace-clean>=0.09:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
p5-Test-Exception>=0:devel/p5-Test-Exception \
diff --git a/devel/p5-Test-WWW-Mechanize/Makefile b/devel/p5-Test-WWW-Mechanize/Makefile
index cd8730f3997e..122522589311 100644
--- a/devel/p5-Test-WWW-Mechanize/Makefile
+++ b/devel/p5-Test-WWW-Mechanize/Makefile
@@ -12,14 +12,14 @@ COMMENT= Testing-specific WWW::Mechanize subclass
LICENSE= ART20
-BUILD_DEPENDS= p5-Carp-Assert-More>=0:devel/p5-Carp-Assert-More \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Assert-More>=0:devel/p5-Carp-Assert-More \
p5-HTML-Form>=0:www/p5-HTML-Form \
p5-HTTP-Server-Simple>=0.42:www/p5-HTTP-Server-Simple \
p5-Test-LongString>=0.15:devel/p5-Test-LongString \
p5-URI>=0:net/p5-URI \
p5-WWW-Mechanize>=1.68:www/p5-WWW-Mechanize \
p5-libwww>=6.02:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= limit:^[0-9\.]*$$
diff --git a/devel/p5-Test-WWW-Selenium/Makefile b/devel/p5-Test-WWW-Selenium/Makefile
index b92ea713e128..9583bc782115 100644
--- a/devel/p5-Test-WWW-Selenium/Makefile
+++ b/devel/p5-Test-WWW-Selenium/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl driver and test library for Selenium Remote Control (SRC)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-Devel-REPL>=0:devel/p5-Devel-REPL
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Mock-LWP>=0:devel/p5-Test-Mock-LWP \
diff --git a/devel/p5-Test-Warn/Makefile b/devel/p5-Test-Warn/Makefile
index 69c2902aabcd..4278c39f8110 100644
--- a/devel/p5-Test-Warn/Makefile
+++ b/devel/p5-Test-Warn/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl extension to test methods for warnings
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Sub-Uplevel>=0.12:devel/p5-Sub-Uplevel
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Sub-Uplevel>=0.12:devel/p5-Sub-Uplevel
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-XML/Makefile b/devel/p5-Test-XML/Makefile
index 3241efb0813a..231b5a4c856c 100644
--- a/devel/p5-Test-XML/Makefile
+++ b/devel/p5-Test-XML/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Compare XML in perl tests
-BUILD_DEPENDS= p5-XML-SemanticDiff>=0:textproc/p5-XML-SemanticDiff \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-SemanticDiff>=0:textproc/p5-XML-SemanticDiff \
p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Test-YAML-Meta/Makefile b/devel/p5-Test-YAML-Meta/Makefile
index 3be585060e10..73305564fc78 100644
--- a/devel/p5-Test-YAML-Meta/Makefile
+++ b/devel/p5-Test-YAML-Meta/Makefile
@@ -12,9 +12,9 @@ COMMENT= Validation of the META.yml file in a distribution
LICENSE= ART20
-BUILD_DEPENDS= p5-Test-YAML-Valid>=0:devel/p5-Test-YAML-Valid \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-YAML-Valid>=0:devel/p5-Test-YAML-Valid \
p5-Test-CPAN-Meta-YAML>=0.17:devel/p5-Test-CPAN-Meta-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test-YAML/Makefile b/devel/p5-Test-YAML/Makefile
index 99c5c85e1d7a..28b4b4da541b 100644
--- a/devel/p5-Test-YAML/Makefile
+++ b/devel/p5-Test-YAML/Makefile
@@ -13,9 +13,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= bash:shells/bash \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= bash:shells/bash \
p5-Test-Base>=0.89:devel/p5-Test-Base
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS_INSTALL= p5-YAML-0.*
diff --git a/devel/p5-Test2-Harness/Makefile b/devel/p5-Test2-Harness/Makefile
index 7ec687dc8a8c..3d55d4cc7f9a 100644
--- a/devel/p5-Test2-Harness/Makefile
+++ b/devel/p5-Test2-Harness/Makefile
@@ -15,14 +15,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-UUID>=1.148:devel/p5-Data-UUID \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-UUID>=1.148:devel/p5-Data-UUID \
p5-Importer>=0.024:devel/p5-Importer \
p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
p5-Term-Table>=0.011:devel/p5-Term-Table \
p5-Test-Simple>=1.302133:devel/p5-Test-Simple \
p5-Test2-Suite>=0.000105:devel/p5-Test2-Suite \
p5-goto-file>=0.005:devel/p5-goto-file
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Test2-Suite/Makefile b/devel/p5-Test2-Suite/Makefile
index 5660104442c9..669f8cc1b20b 100644
--- a/devel/p5-Test2-Suite/Makefile
+++ b/devel/p5-Test2-Suite/Makefile
@@ -15,13 +15,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Importer>=0.024:devel/p5-Importer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Importer>=0.024:devel/p5-Importer \
p5-Module-Pluggable>=2.7:devel/p5-Module-Pluggable \
p5-Scope-Guard>=0:devel/p5-Scope-Guard \
p5-Sub-Info>=0.002:devel/p5-Sub-Info \
p5-Term-Table>=0.002:devel/p5-Term-Table \
p5-Test-Simple>=1.302136:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-TheSchwartz-Simple/Makefile b/devel/p5-TheSchwartz-Simple/Makefile
index 71ae273767a7..a37c91221e94 100644
--- a/devel/p5-TheSchwartz-Simple/Makefile
+++ b/devel/p5-TheSchwartz-Simple/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= DBI only job dispatcher for TheSchwartz
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-TheSchwartz-Worker-SendEmail/Makefile b/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
index 0d777b31ba8b..f5d17d064561 100644
--- a/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
+++ b/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= TheSchwartz Worker Task to Send Email
-BUILD_DEPENDS= p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \
p5-Net-DNS>=0.66_1:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-TheSchwartz/Makefile b/devel/p5-TheSchwartz/Makefile
index bece6710ab67..7196835108bd 100644
--- a/devel/p5-TheSchwartz/Makefile
+++ b/devel/p5-TheSchwartz/Makefile
@@ -14,8 +14,8 @@ COMMENT= Reliable job queue
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-ObjectDriver>=0.04:devel/p5-Data-ObjectDriver
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-ObjectDriver>=0.04:devel/p5-Data-ObjectDriver
OPTIONS_DEFINE= DOCS
diff --git a/devel/p5-Thread-Apartment/Makefile b/devel/p5-Thread-Apartment/Makefile
index bcddb86652a7..d79cd6c3dbce 100644
--- a/devel/p5-Thread-Apartment/Makefile
+++ b/devel/p5-Thread-Apartment/Makefile
@@ -16,10 +16,10 @@ LICENSE_NAME= Academic Free License version 2.1
LICENSE_FILE= ${WRKSRC}/License.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-BUILD_DEPENDS= p5-Class-ISA>=0.32:devel/p5-Class-ISA \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-ISA>=0.32:devel/p5-Class-ISA \
p5-Class-Inspector>=1.08:devel/p5-Class-Inspector \
p5-Thread-Queue-Duplex>=0.92:devel/p5-Thread-Queue-Duplex
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Thrift-XS/Makefile b/devel/p5-Thrift-XS/Makefile
index 838d1f3a18ee..03f353c8aa8a 100644
--- a/devel/p5-Thrift-XS/Makefile
+++ b/devel/p5-Thrift-XS/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Faster Thrift binary protocol encoding and decoding
-BUILD_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-IO-String>=0:devel/p5-IO-String \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
p5-Test-BinaryData>=0:devel/p5-Test-BinaryData \
p5-Test-Pod>=1.14:devel/p5-Test-Pod \
diff --git a/devel/p5-Tie-DB_File-SplitHash/Makefile b/devel/p5-Tie-DB_File-SplitHash/Makefile
index 07d139d05f64..6cd81f101b72 100644
--- a/devel/p5-Tie-DB_File-SplitHash/Makefile
+++ b/devel/p5-Tie-DB_File-SplitHash/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Wrapper around the DB_File Berkeley database system
-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= modbuild
diff --git a/devel/p5-Tie-FileLRUCache/Makefile b/devel/p5-Tie-FileLRUCache/Makefile
index e887b2785bf4..135df3a97035 100644
--- a/devel/p5-Tie-FileLRUCache/Makefile
+++ b/devel/p5-Tie-FileLRUCache/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Lightweight but robust filesystem based persistent LRU cache
-BUILD_DEPENDS= p5-Class-NamedParms>=0:devel/p5-Class-NamedParms \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-NamedParms>=0:devel/p5-Class-NamedParms \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-Class-ParmList>=0:devel/p5-Class-ParmList
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Tie-Hash-Regex/Makefile b/devel/p5-Tie-Hash-Regex/Makefile
index 3dd407025997..a35ed606d680 100644
--- a/devel/p5-Tie-Hash-Regex/Makefile
+++ b/devel/p5-Tie-Hash-Regex/Makefile
@@ -13,8 +13,8 @@ COMMENT= Match hash keys using Regular Expressions
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Attribute-Handlers>=0:devel/p5-Attribute-Handlers
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Attribute-Handlers>=0:devel/p5-Attribute-Handlers
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Time-Duration-Parse/Makefile b/devel/p5-Time-Duration-Parse/Makefile
index 98ebac141cd6..32dff9a5148e 100644
--- a/devel/p5-Time-Duration-Parse/Makefile
+++ b/devel/p5-Time-Duration-Parse/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Exporter-Lite>=0.02:devel/p5-Exporter-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exporter-Lite>=0.02:devel/p5-Exporter-Lite
TEST_DEPENDS= p5-Time-Duration>=1.0.6:devel/p5-Time-Duration
NO_ARCH= yes
diff --git a/devel/p5-Time-Piece-Range/Makefile b/devel/p5-Time-Piece-Range/Makefile
index e273f3fd5894..717b05aa1cf3 100644
--- a/devel/p5-Time-Piece-Range/Makefile
+++ b/devel/p5-Time-Piece-Range/Makefile
@@ -13,8 +13,8 @@ COMMENT= Time::Piece::Range - deal with a range of Time::Piece objects
LICENSE= GPLv2+
-BUILD_DEPENDS= p5-Date-Range>=0:devel/p5-Date-Range
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Range>=0:devel/p5-Date-Range
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-Tree-DAG_Node/Makefile b/devel/p5-Tree-DAG_Node/Makefile
index 979645ecfb9d..8a570b3b7893 100644
--- a/devel/p5-Tree-DAG_Node/Makefile
+++ b/devel/p5-Tree-DAG_Node/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-Slurp-Tiny>=0.003:devel/p5-File-Slurp-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Slurp-Tiny>=0.003:devel/p5-File-Slurp-Tiny
NO_ARCH= yes
USES= perl5 tar:tgz
diff --git a/devel/p5-Tree-Parser/Makefile b/devel/p5-Tree-Parser/Makefile
index 55a627fb5666..84d9d7db5e19 100644
--- a/devel/p5-Tree-Parser/Makefile
+++ b/devel/p5-Tree-Parser/Makefile
@@ -14,9 +14,9 @@ COMMENT= Module to parse formatted files into tree structures
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Array-Iterator>=0:devel/p5-Array-Iterator \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Array-Iterator>=0:devel/p5-Array-Iterator \
p5-Tree-Simple>=0:devel/p5-Tree-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-Tree-Simple-View/Makefile b/devel/p5-Tree-Simple-View/Makefile
index 605a1fde80f7..7d58134c8cad 100644
--- a/devel/p5-Tree-Simple-View/Makefile
+++ b/devel/p5-Tree-Simple-View/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Throwable>=0.10:devel/p5-Class-Throwable \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Throwable>=0.10:devel/p5-Class-Throwable \
p5-Tree-Simple>=1.31:devel/p5-Tree-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.15:devel/p5-Test-Exception \
p5-Test-LongString>=0:devel/p5-Test-LongString
diff --git a/devel/p5-Tree-Simple-VisitorFactory/Makefile b/devel/p5-Tree-Simple-VisitorFactory/Makefile
index 54f242380adf..2a8820cf1b4d 100644
--- a/devel/p5-Tree-Simple-VisitorFactory/Makefile
+++ b/devel/p5-Tree-Simple-VisitorFactory/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Tree-Simple>=1.22:devel/p5-Tree-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tree-Simple>=1.22:devel/p5-Tree-Simple
TEST_DEPENDS= p5-Test-Exception>=0.15:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/devel/p5-Type-Tie/Makefile b/devel/p5-Type-Tie/Makefile
index 63f297f6bd36..472b945695e0 100644
--- a/devel/p5-Type-Tie/Makefile
+++ b/devel/p5-Type-Tie/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
p5-Hash-FieldHash>=0:devel/p5-Hash-FieldHash
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-Type-Tiny>=0.004:devel/p5-Type-Tiny
diff --git a/devel/p5-Type-Tiny-Signatures/Makefile b/devel/p5-Type-Tiny-Signatures/Makefile
index 624ceb186fa9..11b4776efb6f 100644
--- a/devel/p5-Type-Tiny-Signatures/Makefile
+++ b/devel/p5-Type-Tiny-Signatures/Makefile
@@ -14,9 +14,9 @@ COMMENT= Method/Function Signatures w/Type::Tiny Constraints
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny \
p5-Function-Parameters>=1.0605:devel/p5-Function-Parameters
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-Type-Tiny/Makefile b/devel/p5-Type-Tiny/Makefile
index 11224ae8377a..c772e32d6f7a 100644
--- a/devel/p5-Type-Tiny/Makefile
+++ b/devel/p5-Type-Tiny/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny
TEST_DEPENDS= p5-Class-InsideOut>=0:devel/p5-Class-InsideOut \
p5-Function-Parameters>=0:devel/p5-Function-Parameters \
p5-JSON>=0:converters/p5-JSON \
diff --git a/devel/p5-Types-Core/Makefile b/devel/p5-Types-Core/Makefile
index ec3e03bfc89b..9e12a6c79448 100644
--- a/devel/p5-Types-Core/Makefile
+++ b/devel/p5-Types-Core/Makefile
@@ -14,9 +14,9 @@ COMMENT= Core types defined as tests and literals
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Xporter>=0.0.8:devel/p5-Xporter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Xporter>=0.0.8:devel/p5-Xporter \
p5-mem>=0.4.5:devel/p5-mem
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Types-Path-Tiny/Makefile b/devel/p5-Types-Path-Tiny/Makefile
index 9fd645337757..be5e6419ec99 100644
--- a/devel/p5-Types-Path-Tiny/Makefile
+++ b/devel/p5-Types-Path-Tiny/Makefile
@@ -14,9 +14,9 @@ COMMENT= Path::Tiny types and coercions for Moose and Moo
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Path-Tiny>=0:devel/p5-Path-Tiny \
p5-Type-Tiny>=0.008:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-pushd>=0:devel/p5-File-pushd
NO_ARCH= yes
diff --git a/devel/p5-Types-Serialiser/Makefile b/devel/p5-Types-Serialiser/Makefile
index 8db7bca3a27d..17689d575aaf 100644
--- a/devel/p5-Types-Serialiser/Makefile
+++ b/devel/p5-Types-Serialiser/Makefile
@@ -15,8 +15,8 @@ COMMENT= Simple data types for common serialisation formats
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-common-sense>=0:devel/p5-common-sense
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-common-sense>=0:devel/p5-common-sense
USE_PERL5= configure
USES= perl5
diff --git a/devel/p5-UI-Dialog/Makefile b/devel/p5-UI-Dialog/Makefile
index bc8e1dec6af5..83d6116c51dc 100644
--- a/devel/p5-UI-Dialog/Makefile
+++ b/devel/p5-UI-Dialog/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl wrapper for the various dialog applications
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-String-ShellQuote>=0:textproc/p5-String-ShellQuote
-RUN_DEPENDS:= ${BUILD_DEPENDS}
RUN_DEPENDS+= cdialog:devel/cdialog
OPTIONS_DEFINE= KDE NEWT X11 ZENITY
diff --git a/devel/p5-UNIVERSAL-ref/Makefile b/devel/p5-UNIVERSAL-ref/Makefile
index 3a18a2e4969f..14978d9477a3 100644
--- a/devel/p5-UNIVERSAL-ref/Makefile
+++ b/devel/p5-UNIVERSAL-ref/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Turns ref() into a multimethod
-BUILD_DEPENDS= p5-B-Utils>=0:devel/p5-B-Utils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Utils>=0:devel/p5-B-Utils
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-UUID-Random-Patch-UseMRS/Makefile b/devel/p5-UUID-Random-Patch-UseMRS/Makefile
index e61620c44d89..df75ffae5ce8 100644
--- a/devel/p5-UUID-Random-Patch-UseMRS/Makefile
+++ b/devel/p5-UUID-Random-Patch-UseMRS/Makefile
@@ -14,9 +14,9 @@ COMMENT= Make UUID::Random use Math::Random::Secure::rand()
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Random-Secure>=0:math/p5-Math-Random-Secure \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Random-Secure>=0:math/p5-Math-Random-Secure \
p5-UUID-Random>=0:devel/p5-UUID-Random
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= modbuild
USES= perl5
diff --git a/devel/p5-UUID-Tiny/Makefile b/devel/p5-UUID-Tiny/Makefile
index e721f5c577ef..d9f3d4ab14f0 100644
--- a/devel/p5-UUID-Tiny/Makefile
+++ b/devel/p5-UUID-Tiny/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Pure Perl UUID Support With Functional Interface
-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/devel/p5-Unix-Groups-FFI/Makefile b/devel/p5-Unix-Groups-FFI/Makefile
index 952129876820..f5980215b6e7 100644
--- a/devel/p5-Unix-Groups-FFI/Makefile
+++ b/devel/p5-Unix-Groups-FFI/Makefile
@@ -13,8 +13,8 @@ COMMENT= Interface to Unix group syscalls
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-FFI-Platypus>=0.20:devel/p5-FFI-Platypus
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-FFI-Platypus>=0.20:devel/p5-FFI-Platypus
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-VCP-Dest-svk/Makefile b/devel/p5-VCP-Dest-svk/Makefile
index b4726b6b2d71..bfaf1ec62e36 100644
--- a/devel/p5-VCP-Dest-svk/Makefile
+++ b/devel/p5-VCP-Dest-svk/Makefile
@@ -15,11 +15,11 @@ COMMENT= VCP destination driver for svn/svk
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
p5-YAML>=0:textproc/p5-YAML \
p5-subversion>=0:devel/p5-subversion \
svk>=0:devel/svk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-VCP-Source-cvsbk/Makefile b/devel/p5-VCP-Source-cvsbk/Makefile
index 80897e470130..0774e51cb3a2 100644
--- a/devel/p5-VCP-Source-cvsbk/Makefile
+++ b/devel/p5-VCP-Source-cvsbk/Makefile
@@ -15,9 +15,9 @@ COMMENT= VCP source driver for bk exported cvs repository
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
p5-Module-Install>0:devel/p5-Module-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-VCP-autrijus/Makefile b/devel/p5-VCP-autrijus/Makefile
index 0ea2e01d99d0..ffce440c347f 100644
--- a/devel/p5-VCP-autrijus/Makefile
+++ b/devel/p5-VCP-autrijus/Makefile
@@ -14,7 +14,8 @@ DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-snapshot-${PORTVERSION:C/\.([^.]*)$/-\1/}
MAINTAINER= perl@FreeBSD.org
COMMENT= Tool for copying files between various SCM repositories
-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-AutoWriter>=0:textproc/p5-XML-AutoWriter \
p5-Text-Diff>=0:textproc/p5-Text-Diff \
p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-Regexp-Shellish>=0:devel/p5-Regexp-Shellish \
p5-BFD>=0:devel/p5-BFD \
p5-Text-Table>=0:textproc/p5-Text-Table
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-VCS-Lite/Makefile b/devel/p5-VCS-Lite/Makefile
index dbdae219b379..9d550a52331c 100644
--- a/devel/p5-VCS-Lite/Makefile
+++ b/devel/p5-VCS-Lite/Makefile
@@ -12,8 +12,8 @@ COMMENT= Minimal version control system
LICENSE= ART20
-BUILD_DEPENDS= p5-Algorithm-Diff>=1.13:devel/p5-Algorithm-Diff
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Algorithm-Diff>=1.13:devel/p5-Algorithm-Diff
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Workflow/Makefile b/devel/p5-Workflow/Makefile
index 81b086a758c6..139231d0a488 100644
--- a/devel/p5-Workflow/Makefile
+++ b/devel/p5-Workflow/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Accessor>=0.18:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.18:devel/p5-Class-Accessor \
p5-Class-Factory>=1:devel/p5-Class-Factory \
p5-Class-Observable>=1.04:devel/p5-Class-Observable \
p5-DBI>=0:databases/p5-DBI \
@@ -27,7 +28,6 @@ BUILD_DEPENDS= p5-Class-Accessor>=0.18:devel/p5-Class-Accessor \
p5-Log-Log4perl>=0.34:devel/p5-Log-Log4perl \
p5-SPOPS>=0:devel/p5-SPOPS \
p5-XML-Simple>=2:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-Mock>=0.1:databases/p5-DBD-Mock \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Pod-Coverage-TrustPod>=0:devel/p5-Pod-Coverage-TrustPod \
diff --git a/devel/p5-XML-Pastor/Makefile b/devel/p5-XML-Pastor/Makefile
index 92626796caa8..d22df8d0e763 100644
--- a/devel/p5-XML-Pastor/Makefile
+++ b/devel/p5-XML-Pastor/Makefile
@@ -14,14 +14,14 @@ COMMENT= Generate Perl classes with XML bindings from a W3C XSD schema
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-Data-HashArray>=0:devel/p5-Data-HashArray \
p5-File-chdir>=0:devel/p5-File-chdir \
p5-URI>=0:net/p5-URI \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/devel/p5-Xporter/Makefile b/devel/p5-Xporter/Makefile
index 65032b60dceb..0648143bc16c 100644
--- a/devel/p5-Xporter/Makefile
+++ b/devel/p5-Xporter/Makefile
@@ -15,8 +15,8 @@ COMMENT= Alternative Exporter with persistant defaults and auto-ISA
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-mem>=0.4.5:devel/p5-mem
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-mem>=0.4.5:devel/p5-mem
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-Yada-Yada-Yada/Makefile b/devel/p5-Yada-Yada-Yada/Makefile
index 8c5ed900135e..57c7ecce5a44 100644
--- a/devel/p5-Yada-Yada-Yada/Makefile
+++ b/devel/p5-Yada-Yada-Yada/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Adds a Yada-Yada-Yada operator (...) to Perl 5
-BUILD_DEPENDS= p5-Filter-Simple>=0:textproc/p5-Filter-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Filter-Simple>=0:textproc/p5-Filter-Simple
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-accessors-fast/Makefile b/devel/p5-accessors-fast/Makefile
index b2562780d7d3..0d5deb1d043a 100644
--- a/devel/p5-accessors-fast/Makefile
+++ b/devel/p5-accessors-fast/Makefile
@@ -15,10 +15,10 @@ COMMENT= Wrap fastest Class::Accessor::* into pragma
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS \
p5-constant-def>=0.01:devel/p5-constant-def \
p5-Class-C3>=0:devel/p5-Class-C3
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-lib-abs>=0.90:devel/p5-lib-abs
diff --git a/devel/p5-autobox-Core/Makefile b/devel/p5-autobox-Core/Makefile
index c78dd67a3c04..a445a20ff04d 100644
--- a/devel/p5-autobox-Core/Makefile
+++ b/devel/p5-autobox-Core/Makefile
@@ -13,9 +13,9 @@ COMMENT= Core functions exposed as methods in primitive types
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Want>=0.26:devel/p5-Want \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Want>=0.26:devel/p5-Want \
p5-autobox>=2.71:devel/p5-autobox
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-autobox/Makefile b/devel/p5-autobox/Makefile
index 980597e65983..4e9e481d13ec 100644
--- a/devel/p5-autobox/Makefile
+++ b/devel/p5-autobox/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bill.brinzer@gmail.com
COMMENT= Call methods on native Perl types
-BUILD_DEPENDS= p5-Scope-Guard>=0.20:devel/p5-Scope-Guard
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Scope-Guard>=0.20:devel/p5-Scope-Guard
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-capitalization/Makefile b/devel/p5-capitalization/Makefile
index db3ce53d5165..0cd35f196586 100644
--- a/devel/p5-capitalization/Makefile
+++ b/devel/p5-capitalization/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Perl module which allows you to use familiar style on method naming
-BUILD_DEPENDS= p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
p5-Test-Simple>=0:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-constant-def/Makefile b/devel/p5-constant-def/Makefile
index c64d72b80a0a..b0d728e01cc9 100644
--- a/devel/p5-constant-def/Makefile
+++ b/devel/p5-constant-def/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mons@cpan.org
COMMENT= Declare only undeclared constants
-BUILD_DEPENDS= p5-ex-lib>=0.06:devel/p5-ex-lib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ex-lib>=0.06:devel/p5-ex-lib
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-constant-lexical/Makefile b/devel/p5-constant-lexical/Makefile
index f20ab853a5fa..a196084b0289 100644
--- a/devel/p5-constant-lexical/Makefile
+++ b/devel/p5-constant-lexical/Makefile
@@ -15,9 +15,9 @@ COMMENT= Perl pragma to declare lexical compile-time constants
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Lexical-Var>=0:devel/p5-Lexical-Var \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Lexical-Var>=0:devel/p5-Lexical-Var \
p5-Sub-Delete>=0:devel/p5-Sub-Delete
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-forks/Makefile b/devel/p5-forks/Makefile
index a8a7adda3c84..54d5dd249c75 100644
--- a/devel/p5-forks/Makefile
+++ b/devel/p5-forks/Makefile
@@ -14,12 +14,12 @@ COMMENT= Drop-in replacement for Perl threads using fork()
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Acme-Damn>=0:devel/p5-Acme-Damn \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Acme-Damn>=0:devel/p5-Acme-Damn \
p5-Attribute-Handlers>=0:devel/p5-Attribute-Handlers \
p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
p5-List-MoreUtils>=:lang/p5-List-MoreUtils \
p5-Sys-SigAction>=0.11:devel/p5-Sys-SigAction
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-github_creator/Makefile b/devel/p5-github_creator/Makefile
index 77e742b83d2b..9ab4030af591 100644
--- a/devel/p5-github_creator/Makefile
+++ b/devel/p5-github_creator/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Create a Github repository for your Perl module
-BUILD_DEPENDS= p5-Config-IniFiles>0:devel/p5-Config-IniFiles \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-IniFiles>0:devel/p5-Config-IniFiles \
p5-File-Find-Closures>0:devel/p5-File-Find-Closures \
p5-Log-Log4perl>0:devel/p5-Log-Log4perl \
p5-WWW-Mechanize>0:www/p5-WWW-Mechanize \
p5-YAML>0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Output>=0:devel/p5-Test-Output
USES= perl5
diff --git a/devel/p5-iCal-Parser/Makefile b/devel/p5-iCal-Parser/Makefile
index 4e496f625249..2b70b6ff2d4f 100644
--- a/devel/p5-iCal-Parser/Makefile
+++ b/devel/p5-iCal-Parser/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Parse iCalendar files into a data structure
-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-FreezeThaw>=0.4300:devel/p5-FreezeThaw \
p5-DateTime-Format-ICal>=0.08:devel/p5-DateTime-Format-ICal \
p5-Text-vFile-asData>=0.02:devel/p5-Text-vFile-asData
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-lexical-underscore/Makefile b/devel/p5-lexical-underscore/Makefile
index 6f3626b8b406..263363fa5719 100644
--- a/devel/p5-lexical-underscore/Makefile
+++ b/devel/p5-lexical-underscore/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-PadWalker>=0:devel/p5-PadWalker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PadWalker>=0:devel/p5-PadWalker
NO_ARCH= yes
USE_PERL5= configure
diff --git a/devel/p5-match-simple/Makefile b/devel/p5-match-simple/Makefile
index b48cb6599832..f33a54dc2202 100644
--- a/devel/p5-match-simple/Makefile
+++ b/devel/p5-match-simple/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
p5-Sub-Infix>=0.004:devel/p5-Sub-Infix
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/devel/p5-mocked/Makefile b/devel/p5-mocked/Makefile
index ef66ccd1084e..e922f1a36cc0 100644
--- a/devel/p5-mocked/Makefile
+++ b/devel/p5-mocked/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= mocked - use mocked libraries in unit tests
-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-Exception>0:devel/p5-Test-Exception
USES= perl5
diff --git a/devel/p5-namespace-autoclean/Makefile b/devel/p5-namespace-autoclean/Makefile
index 389e1b2d7c46..7ca15b9a0117 100644
--- a/devel/p5-namespace-autoclean/Makefile
+++ b/devel/p5-namespace-autoclean/Makefile
@@ -13,10 +13,10 @@ COMMENT= Keep imports out of your namespace
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-B-Hooks-EndOfScope>=0.12:devel/p5-B-Hooks-EndOfScope \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Hooks-EndOfScope>=0.12:devel/p5-B-Hooks-EndOfScope \
p5-Sub-Identify>=0:devel/p5-Sub-Identify \
p5-namespace-clean>=0.20:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Moo>=0:devel/p5-Moo \
p5-Moose>=2:devel/p5-Moose \
p5-Mouse>=0:devel/p5-Mouse \
diff --git a/devel/p5-namespace-clean/Makefile b/devel/p5-namespace-clean/Makefile
index 5f33ccc78e7c..6500bfcd66da 100644
--- a/devel/p5-namespace-clean/Makefile
+++ b/devel/p5-namespace-clean/Makefile
@@ -13,9 +13,9 @@ COMMENT= Keep imports and functions out of your namespace
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-B-Hooks-EndOfScope>=0.12:devel/p5-B-Hooks-EndOfScope \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Hooks-EndOfScope>=0.12:devel/p5-B-Hooks-EndOfScope \
p5-Package-Stash>=0.23:devel/p5-Package-Stash
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-namespace-sweep/Makefile b/devel/p5-namespace-sweep/Makefile
index 7c9e11dcf7cf..1ed3322986c7 100644
--- a/devel/p5-namespace-sweep/Makefile
+++ b/devel/p5-namespace-sweep/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Sweep up imported subs in your classes
-BUILD_DEPENDS= p5-B-Hooks-EndOfScope>=0.09:devel/p5-B-Hooks-EndOfScope \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Hooks-EndOfScope>=0.09:devel/p5-B-Hooks-EndOfScope \
p5-Package-Stash>=0.33:devel/p5-Package-Stash \
p5-Sub-Identify>=0.04:devel/p5-Sub-Identify \
p5-Sub-Name>=0:devel/p5-Sub-Name
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-orz/Makefile b/devel/p5-orz/Makefile
index 865efc29fcae..d55668efd47f 100644
--- a/devel/p5-orz/Makefile
+++ b/devel/p5-orz/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Method of annotation as /* */ in perl
-BUILD_DEPENDS= p5-Module-Compile>=0.21:devel/p5-Module-Compile
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Compile>=0.21:devel/p5-Module-Compile
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-pip/Makefile b/devel/p5-pip/Makefile
index 5f15b53c1e9b..f78c0dd3a8b7 100644
--- a/devel/p5-pip/Makefile
+++ b/devel/p5-pip/Makefile
@@ -15,7 +15,8 @@ COMMENT= Perl Installation Program
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Archive-Zip>=1.29:archivers/p5-Archive-Zip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Archive-Zip>=1.29:archivers/p5-Archive-Zip \
p5-CPAN-Inject>=0.07:devel/p5-CPAN-Inject \
p5-File-Which>=1.08:sysutils/p5-File-Which \
p5-File-pushd>=0.32:devel/p5-File-pushd \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Archive-Zip>=1.29:archivers/p5-Archive-Zip \
p5-Params-Util>=1.00:devel/p5-Params-Util \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-LWP-Online>=0:www/p5-LWP-Online \
p5-Test-Script>=0:devel/p5-Test-Script \
p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2
diff --git a/devel/p5-self/Makefile b/devel/p5-self/Makefile
index 321e008017ca..1dfb13e56c20 100644
--- a/devel/p5-self/Makefile
+++ b/devel/p5-self/Makefile
@@ -14,11 +14,11 @@ COMMENT= Provides "self" and "args" keywords in your OO program
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-B-Hooks-Parser>=0.08:devel/p5-B-Hooks-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Hooks-Parser>=0.08:devel/p5-B-Hooks-Parser \
p5-B-OPCheck>=0.27:devel/p5-B-OPCheck \
p5-Devel-Declare>=0.003004:devel/p5-Devel-Declare \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/devel/p5-subatom/Makefile b/devel/p5-subatom/Makefile
index e98bad7dd328..362bdf1c18ef 100644
--- a/devel/p5-subatom/Makefile
+++ b/devel/p5-subatom/Makefile
@@ -14,8 +14,8 @@ COMMENT= Produce an atom feed from subversion commits
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/README
-BUILD_DEPENDS= p5-XML-Atom-SimpleFeed>=0.80:textproc/p5-XML-Atom-SimpleFeed
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Atom-SimpleFeed>=0.80:textproc/p5-XML-Atom-SimpleFeed
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/devel/p5-syntax/Makefile b/devel/p5-syntax/Makefile
index 96af3c503800..3e7e84fda36e 100644
--- a/devel/p5-syntax/Makefile
+++ b/devel/p5-syntax/Makefile
@@ -15,9 +15,9 @@ COMMENT= Activate syntax extensions in Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-OptList>=0.104:devel/p5-Data-OptList \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-OptList>=0.104:devel/p5-Data-OptList \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/dns/p5-AnyEvent-CacheDNS/Makefile b/dns/p5-AnyEvent-CacheDNS/Makefile
index f2ee2ca62dad..4de0b49d1dca 100644
--- a/dns/p5-AnyEvent-CacheDNS/Makefile
+++ b/dns/p5-AnyEvent-CacheDNS/Makefile
@@ -13,8 +13,8 @@ COMMENT= Simple DNS resolver with caching
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/dns/p5-BIND-Config-Parser/Makefile b/dns/p5-BIND-Config-Parser/Makefile
index 2867086561da..5f48ca516136 100644
--- a/dns/p5-BIND-Config-Parser/Makefile
+++ b/dns/p5-BIND-Config-Parser/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Parse BIND Config files
-BUILD_DEPENDS= p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
USES= perl5
USE_PERL5= configure
diff --git a/dns/p5-DNS-EasyDNS/Makefile b/dns/p5-DNS-EasyDNS/Makefile
index 099237bda3a6..60ab938cdc7c 100644
--- a/dns/p5-DNS-EasyDNS/Makefile
+++ b/dns/p5-DNS-EasyDNS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Update your EasyDNS dynamic DNS entries
-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= configure
diff --git a/dns/p5-DSC/Makefile b/dns/p5-DSC/Makefile
index fa921d55af09..82ca9dc53164 100644
--- a/dns/p5-DSC/Makefile
+++ b/dns/p5-DSC/Makefile
@@ -12,7 +12,8 @@ COMMENT= DNS Statistics Presenter Perl Library
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ploticus>=2.40:math/ploticus \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ploticus>=2.40:math/ploticus \
p5-CGI-Untaint>=1.26:www/p5-CGI-Untaint \
p5-File-NFSLock>=1.21:devel/p5-File-NFSLock \
p5-Hash-Merge>=0.299:textproc/p5-Hash-Merge \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= ploticus>=2.40:math/ploticus \
p5-URI>=1.73:net/p5-URI \
p5-XML-Simple>=2.24:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/dns/p5-Data-Validate-Domain/Makefile b/dns/p5-Data-Validate-Domain/Makefile
index e3f4cea0a526..27f6ac57c97c 100644
--- a/dns/p5-Data-Validate-Domain/Makefile
+++ b/dns/p5-Data-Validate-Domain/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Data::Validate::Domain - domain validation methods
-BUILD_DEPENDS= p5-Net-Domain-TLD>=0:dns/p5-Net-Domain-TLD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Domain-TLD>=0:dns/p5-Net-Domain-TLD
USES= perl5
USE_PERL5= configure
diff --git a/dns/p5-IO-Async-Resolver-DNS/Makefile b/dns/p5-IO-Async-Resolver-DNS/Makefile
index fdbb91cd3b73..e4960ad66781 100644
--- a/dns/p5-IO-Async-Resolver-DNS/Makefile
+++ b/dns/p5-IO-Async-Resolver-DNS/Makefile
@@ -13,11 +13,11 @@ COMMENT= Resolve DNS queries using IO::Async
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Future>=0:devel/p5-Future \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Future>=0:devel/p5-Future \
p5-IO-Async>=0.52:devel/p5-IO-Async \
p5-List-UtilsBy>=0.07:devel/p5-List-UtilsBy \
p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/dns/p5-Mozilla-PublicSuffix/Makefile b/dns/p5-Mozilla-PublicSuffix/Makefile
index 871f27307f1e..86a5649e656f 100644
--- a/dns/p5-Mozilla-PublicSuffix/Makefile
+++ b/dns/p5-Mozilla-PublicSuffix/Makefile
@@ -15,8 +15,8 @@ COMMENT= Get public suffix of domain name via Mozilla Public Suffix List
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${RUN_DEPENDS}
PATCH_DEPENDS= public_suffix_list>=0:dns/public_suffix_list
+BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-URI>=0:net/p5-URI
USES= perl5
diff --git a/dns/p5-Net-Amazon-Route53/Makefile b/dns/p5-Net-Amazon-Route53/Makefile
index dbc902622af6..3f0671cba915 100644
--- a/dns/p5-Net-Amazon-Route53/Makefile
+++ b/dns/p5-Net-Amazon-Route53/Makefile
@@ -14,13 +14,13 @@ COMMENT= Manage your DNS entries on Amazon's Route53 service
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-Mouse>=0:devel/p5-Mouse \
p5-XML-Bare>=0:textproc/p5-XML-Bare \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS= py[23][0-9]-boto-devel-[0-9]*
diff --git a/dns/p5-Net-Bonjour/Makefile b/dns/p5-Net-Bonjour/Makefile
index 1848ac6b4a8e..ba0d3de8f160 100644
--- a/dns/p5-Net-Bonjour/Makefile
+++ b/dns/p5-Net-Bonjour/Makefile
@@ -14,8 +14,8 @@ COMMENT= Module for DNS service discovery
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-DNS>=0.5:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0.5:dns/p5-Net-DNS
USES= perl5
USE_PERL5= configure
diff --git a/dns/p5-Net-DNS-Async/Makefile b/dns/p5-Net-DNS-Async/Makefile
index 110c06fa748a..44ed8a954d81 100644
--- a/dns/p5-Net-DNS-Async/Makefile
+++ b/dns/p5-Net-DNS-Async/Makefile
@@ -14,8 +14,8 @@ COMMENT= Asynchronous DNS helper for high volume applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
USES= perl5
USE_PERL5= configure
diff --git a/dns/p5-Net-DNS-Lite/Makefile b/dns/p5-Net-DNS-Lite/Makefile
index fa2a88766450..97a36866dc11 100644
--- a/dns/p5-Net-DNS-Lite/Makefile
+++ b/dns/p5-Net-DNS-Lite/Makefile
@@ -14,8 +14,8 @@ COMMENT= Pure-Perl DNS resolver with support for timeout
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
TEST_DEPENDS= p5-Cache-LRU>=0:devel/p5-Cache-LRU \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/dns/p5-Net-DNS-RR-SRV-Helper/Makefile b/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
index 7f3b373d756d..7b818e97bfd4 100644
--- a/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
+++ b/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= vvelox@vvelox.net
COMMENT= Orders SRV records by priority and weight for Net::DNS
-BUILD_DEPENDS= p5-Net-DNS>=0.68:dns/p5-Net-DNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0.68:dns/p5-Net-DNS \
p5-Sort-Naturally>=1.03:textproc/p5-Sort-Naturally
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/dns/p5-Net-DNS-Resolver-Mock/Makefile b/dns/p5-Net-DNS-Resolver-Mock/Makefile
index 768b64511c87..b70608e3e245 100644
--- a/dns/p5-Net-DNS-Resolver-Mock/Makefile
+++ b/dns/p5-Net-DNS-Resolver-Mock/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
NO_ARCH= yes
USE_PERL5= configure
diff --git a/dns/p5-Net-DNS-Resolver-Programmable/Makefile b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
index eec132b8647a..7235bddfd385 100644
--- a/dns/p5-Net-DNS-Resolver-Programmable/Makefile
+++ b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv2+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-DNS>=0.69:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0.69:dns/p5-Net-DNS
NO_ARCH= yes
USES= perl5
diff --git a/dns/p5-Net-DNS-TestNS/Makefile b/dns/p5-Net-DNS-TestNS/Makefile
index 80139f404680..98f11f78f33c 100644
--- a/dns/p5-Net-DNS-TestNS/Makefile
+++ b/dns/p5-Net-DNS-TestNS/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Perl extension for simulating simple Nameservers
-BUILD_DEPENDS= p5-Net-DNS>=0.64:dns/p5-Net-DNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0.64:dns/p5-Net-DNS \
p5-XML-LibXML>=1.53:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/dns/p5-Net-DNS-ToolKit/Makefile b/dns/p5-Net-DNS-ToolKit/Makefile
index 530ef817a517..f82e6085d4f4 100644
--- a/dns/p5-Net-DNS-ToolKit/Makefile
+++ b/dns/p5-Net-DNS-ToolKit/Makefile
@@ -14,9 +14,9 @@ COMMENT= Tools for working with DNS packets
LICENSE= ART10 GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
p5-NetAddr-IP>=1.30:net-mgmt/p5-NetAddr-IP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
MAKE_JOBS_UNSAFE= yes
USES= perl5
diff --git a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
index b773ef3e7839..453681ca9606 100644
--- a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
@@ -12,9 +12,9 @@ COMMENT= Perl module to parse BIND8/9 zone files
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= p5-Net-DNS>=0.65:dns/p5-Net-DNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0.65:dns/p5-Net-DNS \
p5-Net-DNS-SEC>=0.15:dns/p5-Net-DNS-SEC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/dns/p5-Net-DNSBL-MultiDaemon/Makefile b/dns/p5-Net-DNSBL-MultiDaemon/Makefile
index 715324f7c671..1091766d7f23 100644
--- a/dns/p5-Net-DNSBL-MultiDaemon/Makefile
+++ b/dns/p5-Net-DNSBL-MultiDaemon/Makefile
@@ -14,14 +14,14 @@ COMMENT= Net::DNSBL::MultiDaemon - multi DNSBL prioritization
LICENSE= ART10 GPLv1 GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-SafeDO>=0.12:devel/p5-File-SafeDO \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-SafeDO>=0.12:devel/p5-File-SafeDO \
p5-Geo-IP-PurePerl>=1.10:net/p5-Geo-IP-PurePerl \
p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
p5-Net-DNS-ToolKit>=0.47:dns/p5-Net-DNS-ToolKit \
p5-Net-NBsocket>=0.23:net/p5-Net-NBsocket \
p5-NetAddr-IP>=4.067:net-mgmt/p5-NetAddr-IP \
p5-Unix-Syslog>=0.97:sysutils/p5-Unix-Syslog
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= RHBL
OPTIONS_DEFAULT=RHBL
diff --git a/dns/p5-Net-DNSBL-Statistics/Makefile b/dns/p5-Net-DNSBL-Statistics/Makefile
index 1ab45a8a82bd..512e75455256 100644
--- a/dns/p5-Net-DNSBL-Statistics/Makefile
+++ b/dns/p5-Net-DNSBL-Statistics/Makefile
@@ -14,10 +14,10 @@ COMMENT= Gather DNSBL Statistics
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
p5-Net-DNS-ToolKit>=0.41:dns/p5-Net-DNS-ToolKit \
p5-Net-DNSBL-MultiDaemon>=0.26:dns/p5-Net-DNSBL-MultiDaemon
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/dns/p5-Net-Domain-ExpireDate/Makefile b/dns/p5-Net-Domain-ExpireDate/Makefile
index ccd1bb23aba5..0bd613cd2452 100644
--- a/dns/p5-Net-Domain-ExpireDate/Makefile
+++ b/dns/p5-Net-Domain-ExpireDate/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module obtain expiration date of domain names
-BUILD_DEPENDS= p5-Net-Whois-Raw>=0:net/p5-Net-Whois-Raw
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Whois-Raw>=0:net/p5-Net-Whois-Raw
NO_ARCH= yes
USES= perl5
diff --git a/dns/p5-Net-Nslookup/Makefile b/dns/p5-Net-Nslookup/Makefile
index ac2a394e0cec..91a0868a1eba 100644
--- a/dns/p5-Net-Nslookup/Makefile
+++ b/dns/p5-Net-Nslookup/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Provides the capabilities of the standard tool nslookup(1)
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
USES= perl5
USE_PERL5= configure
diff --git a/dns/p5-Net-RBLClient/Makefile b/dns/p5-Net-RBLClient/Makefile
index f669e6907966..f973afffdcae 100644
--- a/dns/p5-Net-RBLClient/Makefile
+++ b/dns/p5-Net-RBLClient/Makefile
@@ -14,8 +14,8 @@ COMMENT= Queries multiple Realtime Blackhole Lists in parallel
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
NO_ARCH= yes
USE_PERL5= configure
diff --git a/dns/p5-POE-Component-Client-DNS-Recursive/Makefile b/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
index 8662d5afacee..16730b1b689f 100644
--- a/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
+++ b/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \
p5-Net-IP-Minimal>=0:net/p5-Net-IP-Minimal \
p5-POE>=1.004:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/dns/p5-POE-Component-Client-DNS/Makefile b/dns/p5-POE-Component-Client-DNS/Makefile
index 68c26e1f7c0a..cc8f49fa77a9 100644
--- a/dns/p5-POE-Component-Client-DNS/Makefile
+++ b/dns/p5-POE-Component-Client-DNS/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-DNS>=0.65:dns/p5-Net-DNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0.65:dns/p5-Net-DNS \
p5-POE>=1.249:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>=1.02:devel/p5-Test-NoWarnings
NO_ARCH= yes
diff --git a/dns/p5-POE-Component-Client-DNSBL/Makefile b/dns/p5-POE-Component-Client-DNSBL/Makefile
index 12b0914ecbbe..7a81ffa817e0 100644
--- a/dns/p5-POE-Component-Client-DNSBL/Makefile
+++ b/dns/p5-POE-Component-Client-DNSBL/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl POE component that provides non-blocking DNSBL lookups
-BUILD_DEPENDS= p5-POE>=1.004:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.004:devel/p5-POE \
p5-Net-IP-Minimal>=0:net/p5-Net-IP-Minimal \
p5-POE-Component-Client-DNS>=0:dns/p5-POE-Component-Client-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/dns/p5-POE-Component-Resolver/Makefile b/dns/p5-POE-Component-Resolver/Makefile
index 8270e0311492..f408f1f594a3 100644
--- a/dns/p5-POE-Component-Resolver/Makefile
+++ b/dns/p5-POE-Component-Resolver/Makefile
@@ -16,8 +16,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=1.311:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.311:devel/p5-POE
NO_ARCH= yes
USES= perl5
diff --git a/dns/p5-POE-Component-Server-DNS/Makefile b/dns/p5-POE-Component-Server-DNS/Makefile
index dfc5182d1254..baae718d444e 100644
--- a/dns/p5-POE-Component-Server-DNS/Makefile
+++ b/dns/p5-POE-Component-Server-DNS/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-DNS>=0.58:dns/p5-Net-DNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0.58:dns/p5-Net-DNS \
p5-POE>=0.38:devel/p5-POE \
p5-POE-Component-Client-DNS>=1.051:dns/p5-POE-Component-Client-DNS \
p5-POE-Component-Client-DNS-Recursive>=1.04:dns/p5-POE-Component-Client-DNS-Recursive \
p5-POE-Component-Generic>=0.0910:net/p5-POE-Component-Generic \
p5-POE-Filter-DNS-TCP>=0.04:dns/p5-POE-Filter-DNS-TCP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/dns/p5-Tie-DNS/Makefile b/dns/p5-Tie-DNS/Makefile
index f78ac5c6b9c1..72b2f5d568ef 100644
--- a/dns/p5-Tie-DNS/Makefile
+++ b/dns/p5-Tie-DNS/Makefile
@@ -14,9 +14,9 @@ COMMENT= Tie interface to Net::DNS
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \
p5-Tie-Cache>=0:devel/p5-Tie-Cache
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-CheckManifest>=0:devel/p5-Test-CheckManifest \
p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic
diff --git a/dns/p5-pgeodns/Makefile b/dns/p5-pgeodns/Makefile
index 4a51db74b732..7d9955b328cc 100644
--- a/dns/p5-pgeodns/Makefile
+++ b/dns/p5-pgeodns/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Geographic NameServer
-BUILD_DEPENDS= p5-Geo-IP>=0:net/p5-Geo-IP \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Geo-IP>=0:net/p5-Geo-IP \
p5-JSON>=0:converters/p5-JSON \
p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Warn>=0:devel/p5-Test-Warn
USES= perl5
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index 7d847df9781a..689c0d284898 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -17,7 +17,9 @@ LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/Artistic
LICENSE_FILE_GPLv1+ = ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Algorithm-Diff>=1.19:devel/p5-Algorithm-Diff \
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+ p5-Module-Build>=0.36:devel/p5-Module-Build
+RUN_DEPENDS= p5-Algorithm-Diff>=1.19:devel/p5-Algorithm-Diff \
p5-App-cpanminus>=0.9923:devel/p5-App-cpanminus \
p5-CGI>=3.47:www/p5-CGI \
p5-Capture-Tiny>0:devel/p5-Capture-Tiny \
@@ -64,8 +66,6 @@ BUILD_DEPENDS= p5-Algorithm-Diff>=1.19:devel/p5-Algorithm-Diff \
p5-Wx>=0.9700:x11-toolkits/p5-Wx \
p5-YAML-Tiny>=1.32:textproc/p5-YAML-Tiny \
p5-libwww>=5.815:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-BUILD_DEPENDS+= p5-Module-Build>=0.36:devel/p5-Module-Build
USES= compiler:c++11-lib dos2unix gettext perl5
USE_PERL5= configure
diff --git a/editors/p5-Proc-InvokeEditor/Makefile b/editors/p5-Proc-InvokeEditor/Makefile
index 78c6d39c665c..581f73a77e5e 100644
--- a/editors/p5-Proc-InvokeEditor/Makefile
+++ b/editors/p5-Proc-InvokeEditor/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Assert>=0:devel/p5-Carp-Assert
NO_ARCH= yes
USES= perl5
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
index c36a4eadb726..2bdaf0347e3a 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for 2CheckOut authorization service
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure patch
diff --git a/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile b/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
index cb5dda9873e3..2c7429b60fa4 100644
--- a/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
+++ b/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
@@ -13,13 +13,13 @@ COMMENT= Business::OnlinePayment backend module for Authorize.Net
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Business-OnlinePayment>=3:finance/p5-Business-OnlinePayment \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-OnlinePayment>=3:finance/p5-Business-OnlinePayment \
p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-XML-Writer>=0:textproc/p5-XML-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile b/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
index e6015a8f55d8..a20942801c11 100644
--- a/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
+++ b/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for Bank of America eStores
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-Cardstream/Makefile b/finance/p5-Business-OnlinePayment-Cardstream/Makefile
index 9d06108b9c97..d8419f931325 100644
--- a/finance/p5-Business-OnlinePayment-Cardstream/Makefile
+++ b/finance/p5-Business-OnlinePayment-Cardstream/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for Cardstream
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-Jettis/Makefile b/finance/p5-Business-OnlinePayment-Jettis/Makefile
index 05ee34cab873..2118d2f638eb 100644
--- a/finance/p5-Business-OnlinePayment-Jettis/Makefile
+++ b/finance/p5-Business-OnlinePayment-Jettis/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for Jettis
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
index bc6a97b1f461..983eacdd91e2 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for LinkPoint
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
index 6fdb124dfcca..b50658f70433 100644
--- a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
+++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for MerchantCommerce authorization service
-BUILD_DEPENDS= p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-Network1Financial/Makefile b/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
index 5bab6fcefdf2..086a33f4cae0 100644
--- a/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
+++ b/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
@@ -14,9 +14,9 @@ COMMENT= Business::OnlinePayment backend module for Network1 Financial
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-OCV/Makefile b/finance/p5-Business-OnlinePayment-OCV/Makefile
index 7770a13709af..3396d8d2c30e 100644
--- a/finance/p5-Business-OnlinePayment-OCV/Makefile
+++ b/finance/p5-Business-OnlinePayment-OCV/Makefile
@@ -14,9 +14,9 @@ COMMENT= Business::OnlinePayment backend module for OCV
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Business-OCV>=0:finance/p5-Business-OCV \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-OCV>=0:finance/p5-Business-OCV \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-PayConnect/Makefile b/finance/p5-Business-OnlinePayment-PayConnect/Makefile
index 1ed2d6ece8d6..76da44e52667 100644
--- a/finance/p5-Business-OnlinePayment-PayConnect/Makefile
+++ b/finance/p5-Business-OnlinePayment-PayConnect/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for PaymentOne PayConnect
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-PaymenTech/Makefile b/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
index d289ce5a600a..0e28414e998b 100644
--- a/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
+++ b/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
@@ -13,11 +13,11 @@ COMMENT= PaymenTech backend for Business::OnlinePayment
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
p5-Module-Install>=0:devel/p5-Module-Install \
p5-Net-HTTPS-Any>=0.10:net/p5-Net-HTTPS-Any \
p5-XML-Simple>=0:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile b/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
index e1158f44f345..ebe9cec43ef6 100644
--- a/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
+++ b/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for PaymentsGateway.net ACH Direct
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-SurePay/Makefile b/finance/p5-Business-OnlinePayment-SurePay/Makefile
index 0e8aec2f09a5..fca290c2a7d2 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/Makefile
+++ b/finance/p5-Business-OnlinePayment-SurePay/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for SurePay authorization service
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure patch
diff --git a/finance/p5-Business-OnlinePayment-TCLink/Makefile b/finance/p5-Business-OnlinePayment-TCLink/Makefile
index 2617e105d8b5..57839d4b0be9 100644
--- a/finance/p5-Business-OnlinePayment-TCLink/Makefile
+++ b/finance/p5-Business-OnlinePayment-TCLink/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for TrustCommerce
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
p5-Net-TCLink>=0:net/p5-Net-TCLink
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-VirtualNet/Makefile b/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
index 12fdff292fff..eda67e594497 100644
--- a/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
+++ b/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for Vital VirtualNet
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
p5-TimeDate>=0:devel/p5-TimeDate \
p5-File-CounterFile>=0:misc/p5-File-CounterFile \
p5-String-Parity>=0:devel/p5-String-Parity \
p5-String-LRC>=0:devel/p5-String-LRC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-eSec/Makefile b/finance/p5-Business-OnlinePayment-eSec/Makefile
index 6133dbc7ea32..35c6b390133a 100644
--- a/finance/p5-Business-OnlinePayment-eSec/Makefile
+++ b/finance/p5-Business-OnlinePayment-eSec/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Business::OnlinePayment backend module for eSec
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
index 85176d451887..f4f6ef489493 100644
--- a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
+++ b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
@@ -14,8 +14,8 @@ COMMENT= Business::OnlinePayment backend module for iAuthorizer
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/finance/p5-Business-OnlinePayment/Makefile b/finance/p5-Business-OnlinePayment/Makefile
index ebd30c08b205..e8c22670ccaf 100644
--- a/finance/p5-Business-OnlinePayment/Makefile
+++ b/finance/p5-Business-OnlinePayment/Makefile
@@ -14,9 +14,9 @@ COMMENT= Generic interface for processing online credit card payments
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-HTTPS-Any>=0:net/p5-Net-HTTPS-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-HTTPS-Any>=0:net/p5-Net-HTTPS-Any \
p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= limit:^[0-9\.]*$$
diff --git a/finance/p5-Business-Stripe/Makefile b/finance/p5-Business-Stripe/Makefile
index ca4387f1ebc7..57045ebaa4ca 100644
--- a/finance/p5-Business-Stripe/Makefile
+++ b/finance/p5-Business-Stripe/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl5 module interface for the Stripe.com payment system
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=0.0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0.0:www/p5-HTTP-Message \
p5-JSON>=0.0:converters/p5-JSON \
p5-libwww>0.0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-TW-Invoice-U420/Makefile b/finance/p5-Business-TW-Invoice-U420/Makefile
index 4573fa898ac2..b34cecebee02 100644
--- a/finance/p5-Business-TW-Invoice-U420/Makefile
+++ b/finance/p5-Business-TW-Invoice-U420/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Print Taiwan Unified Invoice with U420 printer
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-TW-TSIB-CStorePayment/Makefile b/finance/p5-Business-TW-TSIB-CStorePayment/Makefile
index f5c95ec571b4..e571049385db 100644
--- a/finance/p5-Business-TW-TSIB-CStorePayment/Makefile
+++ b/finance/p5-Business-TW-TSIB-CStorePayment/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Module for Taishin Bank Convenient Store Payment Management
-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>=0:devel/p5-DateTime \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile b/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile
index 8b8331bbb963..1b022ee02cbd 100644
--- a/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile
+++ b/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile
@@ -14,9 +14,9 @@ COMMENT= Module for Taishin Bank Virtual Account Management
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-DateTime>=0:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Business-WorldPay-Junior/Makefile b/finance/p5-Business-WorldPay-Junior/Makefile
index acb00a9309ae..5be61809602d 100644
--- a/finance/p5-Business-WorldPay-Junior/Makefile
+++ b/finance/p5-Business-WorldPay-Junior/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl module to handle WorldPay Junior for payment services
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure patch
diff --git a/finance/p5-Data-Currency/Makefile b/finance/p5-Data-Currency/Makefile
index 6854b130b97a..8cfc43e31985 100644
--- a/finance/p5-Data-Currency/Makefile
+++ b/finance/p5-Data-Currency/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Container class for currency conversion/formatting
-BUILD_DEPENDS= p5-Class-Accessor-Grouped>=0:devel/p5-Class-Accessor-Grouped \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Grouped>=0:devel/p5-Class-Accessor-Grouped \
p5-Class-Inspector>=0:devel/p5-Class-Inspector \
p5-Finance-Currency-Convert-WebserviceX>=0:finance/p5-Finance-Currency-Convert-WebserviceX \
p5-Locale-Codes>=0:misc/p5-Locale-Codes \
p5-Locale-Currency-Format>=0:finance/p5-Locale-Currency-Format
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Finance-Bitcoin/Makefile b/finance/p5-Finance-Bitcoin/Makefile
index b6bf30d23bcc..c2384072ee5f 100644
--- a/finance/p5-Finance-Bitcoin/Makefile
+++ b/finance/p5-Finance-Bitcoin/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Perl interface to a bitcoin instance
-BUILD_DEPENDS= p5-JSON-RPC>=0.96:devel/p5-JSON-RPC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-RPC>=0.96:devel/p5-JSON-RPC \
p5-Class-Accessor>=0.34:devel/p5-Class-Accessor \
p5-Module-Signature>=0.66:security/p5-Module-Signature \
p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-Object-AUTHORITY>=0:devel/p5-Object-Authority
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
index 50473841765f..c1a2cede80d1 100644
--- a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
+++ b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
@@ -14,9 +14,9 @@ COMMENT= Lightweight currency conversion using WebserviceX.NET
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-Module-Install>=0.65:devel/p5-Module-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/finance/p5-Finance-Quote/Makefile b/finance/p5-Finance-Quote/Makefile
index e8e8a093fe6f..f7e11997cd51 100644
--- a/finance/p5-Finance-Quote/Makefile
+++ b/finance/p5-Finance-Quote/Makefile
@@ -13,7 +13,8 @@ COMMENT= Get stock and mutual fund quotes from various exchanges
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-CGI>=0:www/p5-CGI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI>=0:www/p5-CGI \
p5-DateTime>=0:devel/p5-DateTime \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-HTML-TableExtract>=0:www/p5-HTML-TableExtract \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-CGI>=0:www/p5-CGI \
p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Kwalitee>=0:devel/p5-Test-Kwalitee \
p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic
diff --git a/finance/p5-Finance-QuoteHist/Makefile b/finance/p5-Finance-QuoteHist/Makefile
index 5063d3a99b77..626ec412037d 100644
--- a/finance/p5-Finance-QuoteHist/Makefile
+++ b/finance/p5-Finance-QuoteHist/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \
p5-HTML-TableExtract>=2.07:www/p5-HTML-TableExtract \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
p5-Text-CSV>=0:textproc/p5-Text-CSV \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/finance/p5-Finance-TW-EmergingQuote/Makefile b/finance/p5-Finance-TW-EmergingQuote/Makefile
index eed9261df59b..bccde2e55211 100644
--- a/finance/p5-Finance-TW-EmergingQuote/Makefile
+++ b/finance/p5-Finance-TW-EmergingQuote/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Check stock quotes from Taiwan Emerging Stock
-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= configure
diff --git a/finance/p5-Finance-TW-TSEQuote/Makefile b/finance/p5-Finance-TW-TSEQuote/Makefile
index 45c709f6e4c9..5f843aba35c2 100644
--- a/finance/p5-Finance-TW-TSEQuote/Makefile
+++ b/finance/p5-Finance-TW-TSEQuote/Makefile
@@ -13,13 +13,13 @@ COMMENT= Check stock quotes from Taiwan Security Exchange
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-App-Cache>=0:devel/p5-App-Cache \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-Cache>=0:devel/p5-App-Cache \
p5-HTML-TableExtract>=0:www/p5-HTML-TableExtract \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
p5-URI>=0:net/p5-URI \
p5-YAML>=0:textproc/p5-YAML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/finance/p5-Finance-YahooQuote/Makefile b/finance/p5-Finance-YahooQuote/Makefile
index ad7aa998d557..4b0688e4cf0d 100644
--- a/finance/p5-Finance-YahooQuote/Makefile
+++ b/finance/p5-Finance-YahooQuote/Makefile
@@ -12,9 +12,9 @@ COMMENT= Get stock quotes from Yahoo! Finance
LICENSE= GPLv2+
-BUILD_DEPENDS= p5-HTML-Parser>=2.2:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=2.2:www/p5-HTML-Parser \
p5-libwww>=1.62:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/ftp/p5-Net-FTPSSL/Makefile b/ftp/p5-Net-FTPSSL/Makefile
index a97fe14d3c07..75cb060b6f14 100644
--- a/ftp/p5-Net-FTPSSL/Makefile
+++ b/ftp/p5-Net-FTPSSL/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-IO-Socket-SSL>=1.26:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=1.26:security/p5-IO-Socket-SSL \
p5-Net-SSLeay>=0:security/p5-Net-SSLeay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/ftp/p5-POE-Component-Client-FTP/Makefile b/ftp/p5-POE-Component-Client-FTP/Makefile
index e9c1e6cb7c65..8cd11435c898 100644
--- a/ftp/p5-POE-Component-Client-FTP/Makefile
+++ b/ftp/p5-POE-Component-Client-FTP/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=0.38:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0.38:devel/p5-POE
TEST_DEPENDS= p5-Test-POE-Client-TCP>=0.1:devel/p5-Test-POE-Client-TCP \
p5-Test-POE-Server-TCP>=0.16:devel/p5-Test-POE-Server-TCP
diff --git a/ftp/p5-SOAP-Transport-FTP/Makefile b/ftp/p5-SOAP-Transport-FTP/Makefile
index 57e996568dbf..f98c6eb6f38d 100644
--- a/ftp/p5-SOAP-Transport-FTP/Makefile
+++ b/ftp/p5-SOAP-Transport-FTP/Makefile
@@ -13,8 +13,8 @@ COMMENT= FTP Client support for SOAP::Lite
LICENSE= ART10
-BUILD_DEPENDS= p5-SOAP-Lite>=0.711:net/p5-SOAP-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SOAP-Lite>=0.711:net/p5-SOAP-Lite
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/games/p5-Baseball-Sabermetrics/Makefile b/games/p5-Baseball-Sabermetrics/Makefile
index e16b22d44efd..7042524e4061 100644
--- a/games/p5-Baseball-Sabermetrics/Makefile
+++ b/games/p5-Baseball-Sabermetrics/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Baseball Statistics Module
-BUILD_DEPENDS= p5-Data-Serializer>=0.29:devel/p5-Data-Serializer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Serializer>=0.29:devel/p5-Data-Serializer \
p5-HTML-TableExtract>=2.08:www/p5-HTML-TableExtract \
p5-libwww>=5.801:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/games/p5-Games-Bingo-Bot/Makefile b/games/p5-Games-Bingo-Bot/Makefile
index 61fae013216f..c2e2762a6fde 100644
--- a/games/p5-Games-Bingo-Bot/Makefile
+++ b/games/p5-Games-Bingo-Bot/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple class holding IRC related methods for bingo
-BUILD_DEPENDS= p5-Games-Bingo>=0:games/p5-Games-Bingo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Games-Bingo>=0:games/p5-Games-Bingo
USES= perl5 shebangfix
SHEBANG_FILES= bin/bingobot.pl
diff --git a/games/p5-Games-Bingo-Print/Makefile b/games/p5-Games-Bingo-Print/Makefile
index a49012184018..35dc64bd474f 100644
--- a/games/p5-Games-Bingo-Print/Makefile
+++ b/games/p5-Games-Bingo-Print/Makefile
@@ -13,9 +13,9 @@ COMMENT= Games::Bingo::Print - PDF Generation Class
LICENSE= ART10
-BUILD_DEPENDS= p5-Games-Bingo>=0:games/p5-Games-Bingo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Games-Bingo>=0:games/p5-Games-Bingo \
p5-PDFLib>=0:print/p5-PDFLib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic \
p5-Test-Pod>=0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
diff --git a/graphics/p5-Acme-Steganography-Image-Png/Makefile b/graphics/p5-Acme-Steganography-Image-Png/Makefile
index 4a84234ac57c..4830548fba85 100644
--- a/graphics/p5-Acme-Steganography-Image-Png/Makefile
+++ b/graphics/p5-Acme-Steganography-Image-Png/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Hide data (badly) in Png images
-BUILD_DEPENDS= p5-Imager>=0:graphics/p5-Imager \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Imager>=0:graphics/p5-Imager \
p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-CAD-Drawing-Template/Makefile b/graphics/p5-CAD-Drawing-Template/Makefile
index 8f2372a8da13..3b7fc38dfe84 100644
--- a/graphics/p5-CAD-Drawing-Template/Makefile
+++ b/graphics/p5-CAD-Drawing-Template/Makefile
@@ -14,9 +14,9 @@ COMMENT= Replace tags with text and geometry
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CAD-Calc>=0:math/p5-CAD-Calc \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CAD-Calc>=0:math/p5-CAD-Calc \
p5-CAD-Drawing>=0:graphics/p5-CAD-Drawing
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile
index 40ce70bd30e1..28b6cb64aabc 100644
--- a/graphics/p5-CAD-Drawing/Makefile
+++ b/graphics/p5-CAD-Drawing/Makefile
@@ -14,13 +14,13 @@ COMMENT= Methods to create, load, and save vector graphics
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CAD-Calc>=0:math/p5-CAD-Calc \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CAD-Calc>=0:math/p5-CAD-Calc \
p5-Math-Geometry-Planar>=0:math/p5-Math-Geometry-Planar \
p5-Math-MatrixReal>=0:math/p5-Math-MatrixReal \
p5-Math-Vec>=0:math/p5-Math-Vec \
p5-Stream>=0:devel/p5-Stream \
convert:graphics/ImageMagick
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile b/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile
index 8bd1213356fb..0426a067d602 100644
--- a/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile
+++ b/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= gerard@seibercom.net
COMMENT= Perl implementation of the reCAPTCHA Mailhide API
-BUILD_DEPENDS= p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
p5-HTML-Tiny>=0.904:textproc/p5-HTML-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Captcha-reCAPTCHA/Makefile b/graphics/p5-Captcha-reCAPTCHA/Makefile
index 708bf12c8a9f..cb03759a760d 100644
--- a/graphics/p5-Captcha-reCAPTCHA/Makefile
+++ b/graphics/p5-Captcha-reCAPTCHA/Makefile
@@ -15,9 +15,9 @@ COMMENT= Perl implementation of the reCAPTCHA API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Tiny>=0:textproc/p5-HTML-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Tiny>=0:textproc/p5-HTML-Tiny \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/graphics/p5-Chart-PNGgraph/Makefile b/graphics/p5-Chart-PNGgraph/Makefile
index edd9e3dd3019..2d29bf6506f9 100644
--- a/graphics/p5-Chart-PNGgraph/Makefile
+++ b/graphics/p5-Chart-PNGgraph/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl module for generating presentation graphics (i.e., charts)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-GD>=0:graphics/p5-GD \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD>=0:graphics/p5-GD \
p5-GD-Graph>=0:graphics/p5-GD-Graph
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Chart/Makefile b/graphics/p5-Chart/Makefile
index 749d4e0e253c..cfc69dcc581e 100644
--- a/graphics/p5-Chart/Makefile
+++ b/graphics/p5-Chart/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl5 interface to build chart graphics
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-GD>=2:graphics/p5-GD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD>=2:graphics/p5-GD
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Color-Calc/Makefile b/graphics/p5-Color-Calc/Makefile
index d1adef567390..1437ac23dfc2 100644
--- a/graphics/p5-Color-Calc/Makefile
+++ b/graphics/p5-Color-Calc/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
COMMENT= Simple calculations with RGB colors
-BUILD_DEPENDS= p5-Graphics-ColorNames-WWW>=1.13:graphics/p5-Graphics-ColorNames-WWW
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Graphics-ColorNames-WWW>=1.13:graphics/p5-Graphics-ColorNames-WWW
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Convert-Color-XTerm/Makefile b/graphics/p5-Convert-Color-XTerm/Makefile
index 4bba89ea00e0..4ac000ac830b 100644
--- a/graphics/p5-Convert-Color-XTerm/Makefile
+++ b/graphics/p5-Convert-Color-XTerm/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Convert-Color>=0.06:graphics/p5-Convert-Color
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Convert-Color>=0.06:graphics/p5-Convert-Color
NO_ARCH= yes
USE_PERL5= configure
diff --git a/graphics/p5-Data-Google-Visualization-DataSource/Makefile b/graphics/p5-Data-Google-Visualization-DataSource/Makefile
index 3ab55b1851ee..87dfab0d69ef 100644
--- a/graphics/p5-Data-Google-Visualization-DataSource/Makefile
+++ b/graphics/p5-Data-Google-Visualization-DataSource/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Clone>=0:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0:devel/p5-Clone \
p5-Data-Google-Visualization-DataTable>=0:graphics/p5-Data-Google-Visualization-DataTable \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Moose>=0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/graphics/p5-Data-Google-Visualization-DataTable/Makefile b/graphics/p5-Data-Google-Visualization-DataTable/Makefile
index 754b797ca208..e8fd3c076a36 100644
--- a/graphics/p5-Data-Google-Visualization-DataTable/Makefile
+++ b/graphics/p5-Data-Google-Visualization-DataTable/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-JSON-XS>=2.0:converters/p5-JSON-XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-XS>=2.0:converters/p5-JSON-XS
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-GD-Arrow/Makefile b/graphics/p5-GD-Arrow/Makefile
index 38bbc4c02681..851ba4fc26b9 100644
--- a/graphics/p5-GD-Arrow/Makefile
+++ b/graphics/p5-GD-Arrow/Makefile
@@ -14,8 +14,8 @@ COMMENT= Draw arrows using GD
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-GD>=0:graphics/p5-GD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD>=0:graphics/p5-GD
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-GD-Barcode/Makefile b/graphics/p5-GD-Barcode/Makefile
index 6bf4b388fec7..0fe0c07e4c5d 100644
--- a/graphics/p5-GD-Barcode/Makefile
+++ b/graphics/p5-GD-Barcode/Makefile
@@ -14,8 +14,8 @@ COMMENT= GD::Barcode - Create barcode image with GD
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-GD>=0:graphics/p5-GD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD>=0:graphics/p5-GD
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-GD-Graph-histogram/Makefile b/graphics/p5-GD-Graph-histogram/Makefile
index 5624aef6a56f..f6e57ddba258 100644
--- a/graphics/p5-GD-Graph-histogram/Makefile
+++ b/graphics/p5-GD-Graph-histogram/Makefile
@@ -16,8 +16,8 @@ COMMENT= Histogram plotting module for perl5
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-GD-Graph>=0:graphics/p5-GD-Graph
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD-Graph>=0:graphics/p5-GD-Graph
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-GD-Graph-ohlc/Makefile b/graphics/p5-GD-Graph-ohlc/Makefile
index caab72e5f04e..0818ccf19b11 100644
--- a/graphics/p5-GD-Graph-ohlc/Makefile
+++ b/graphics/p5-GD-Graph-ohlc/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Create charts displaying the open, high, low, and close
-BUILD_DEPENDS= p5-GD-Graph>=0:graphics/p5-GD-Graph \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD-Graph>=0:graphics/p5-GD-Graph \
p5-Test-Simple>=0:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-GD-Graph/Makefile b/graphics/p5-GD-Graph/Makefile
index 444388bd643d..539f7c715111 100644
--- a/graphics/p5-GD-Graph/Makefile
+++ b/graphics/p5-GD-Graph/Makefile
@@ -14,9 +14,9 @@ COMMENT= Graph plotting module for perl5
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-GD>=0:graphics/p5-GD \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD>=0:graphics/p5-GD \
p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-Test-Exception>=0.40:devel/p5-Test-Exception
diff --git a/graphics/p5-GD-Graph3d/Makefile b/graphics/p5-GD-Graph3d/Makefile
index f55373288671..3a3514fbca77 100644
--- a/graphics/p5-GD-Graph3d/Makefile
+++ b/graphics/p5-GD-Graph3d/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Creates 3D charts with GD::Graph and GD
-BUILD_DEPENDS= p5-GD-Graph>=0:graphics/p5-GD-Graph
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD-Graph>=0:graphics/p5-GD-Graph
USES= perl5 dos2unix
USE_PERL5= configure
diff --git a/graphics/p5-GD-SVG/Makefile b/graphics/p5-GD-SVG/Makefile
index 8da7c71b41b3..d8d8b1635d87 100644
--- a/graphics/p5-GD-SVG/Makefile
+++ b/graphics/p5-GD-SVG/Makefile
@@ -14,9 +14,9 @@ COMMENT= Seamlessly enable SVG output from scripts written using GD
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-GD>=0:graphics/p5-GD \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD>=0:graphics/p5-GD \
p5-SVG>=0:textproc/p5-SVG
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-GD-Thumbnail/Makefile b/graphics/p5-GD-Thumbnail/Makefile
index f2c07ed3e185..fd7294da143b 100644
--- a/graphics/p5-GD-Thumbnail/Makefile
+++ b/graphics/p5-GD-Thumbnail/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Thumbnail maker for GD
-BUILD_DEPENDS= p5-GD>=0:graphics/p5-GD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD>=0:graphics/p5-GD
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 8670fdba861d..d8ff0c838b64 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -12,9 +12,9 @@ COMMENT= Perl5 interface to Gd Graphics Library version2
LICENSE= ART20 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig
LIB_DEPENDS= libgd.so:graphics/gd
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Geo-EOP/Makefile b/graphics/p5-Geo-EOP/Makefile
index 7cf96dedbb27..1c64fa84a008 100644
--- a/graphics/p5-Geo-EOP/Makefile
+++ b/graphics/p5-Geo-EOP/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl Module to Process Earth Observation Products Meta-data
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Geo-GML>=0.13:graphics/p5-Geo-GML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Geo-GML>=0.13:graphics/p5-Geo-GML \
p5-XML-Compile>=1.50:textproc/p5-XML-Compile \
p5-XML-Compile-Cache>=0.14:textproc/p5-XML-Compile-Cache
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.26:devel/p5-Test-Pod
NO_ARCH= yes
diff --git a/graphics/p5-Geo-GML/Makefile b/graphics/p5-Geo-GML/Makefile
index 0eaa91f1351d..82a1d66fad58 100644
--- a/graphics/p5-Geo-GML/Makefile
+++ b/graphics/p5-Geo-GML/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl Module to Process Geography Markup Language
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Report>=1.25:devel/p5-Log-Report \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Report>=1.25:devel/p5-Log-Report \
p5-XML-Compile>=1.59:textproc/p5-XML-Compile \
p5-XML-Compile-Cache>=1.05:textproc/p5-XML-Compile-Cache
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/graphics/p5-Geo-Gpx/Makefile b/graphics/p5-Geo-Gpx/Makefile
index df4766642646..d955dc1a74ea 100644
--- a/graphics/p5-Geo-Gpx/Makefile
+++ b/graphics/p5-Geo-Gpx/Makefile
@@ -14,12 +14,12 @@ COMMENT= Perl Module to Create and Parse GPX Files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
p5-ExtUtils-MakeMaker-Coverage>=0:devel/p5-ExtUtils-MakeMaker-Coverage \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-TimeDate>=0:devel/p5-TimeDate \
p5-XML-Descent>=0:textproc/p5-XML-Descent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/graphics/p5-Geo-Point/Makefile b/graphics/p5-Geo-Point/Makefile
index 050b770a6a67..c43b7afe4b23 100644
--- a/graphics/p5-Geo-Point/Makefile
+++ b/graphics/p5-Geo-Point/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl Module Tries To Abstract Coordinate Systems
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Geo-Distance>=0.06:math/p5-Geo-Distance \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Geo-Distance>=0.06:math/p5-Geo-Distance \
p5-Geo-Proj4>=1.01:graphics/p5-Geo-Proj4 \
p5-Math-Polygon>=1.01:math/p5-Math-Polygon
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/graphics/p5-Graph-ReadWrite/Makefile b/graphics/p5-Graph-ReadWrite/Makefile
index 031e8aa8bed2..290f8f49cb39 100644
--- a/graphics/p5-Graph-ReadWrite/Makefile
+++ b/graphics/p5-Graph-ReadWrite/Makefile
@@ -13,11 +13,11 @@ COMMENT= Reading and Writing a variety of graph file formats
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Graph>=0.50:math/p5-Graph \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Graph>=0.50:math/p5-Graph \
p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-XML-Writer>=0:textproc/p5-XML-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/graphics/p5-Graph-SocialMap/Makefile b/graphics/p5-Graph-SocialMap/Makefile
index 49c0bb6ee22f..364ea18a2f32 100644
--- a/graphics/p5-Graph-SocialMap/Makefile
+++ b/graphics/p5-Graph-SocialMap/Makefile
@@ -14,12 +14,12 @@ COMMENT= Easy tool to create social network maps
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Graph>=0:math/p5-Graph \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Graph>=0:math/p5-Graph \
p5-Graph-Writer-GraphViz>=0:graphics/p5-Graph-Writer-GraphViz \
p5-Quantum-Superpositions>=0:lang/p5-Quantum-Superpositions \
p5-Spiffy>=0:devel/p5-Spiffy \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Graph-Writer-GraphViz/Makefile b/graphics/p5-Graph-Writer-GraphViz/Makefile
index 7c7587a3bd37..06ecb5ad8419 100644
--- a/graphics/p5-Graph-Writer-GraphViz/Makefile
+++ b/graphics/p5-Graph-Writer-GraphViz/Makefile
@@ -14,11 +14,11 @@ COMMENT= GraphViz Writer for Graph object
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Graph>=0.54:math/p5-Graph \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Graph>=0.54:math/p5-Graph \
p5-Graph-ReadWrite>=0:graphics/p5-Graph-ReadWrite \
p5-GraphViz>=2.02:graphics/p5-GraphViz \
p5-IO-All>=0.30:devel/p5-IO-All
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/graphics/p5-GraphViz-Data-Structure/Makefile b/graphics/p5-GraphViz-Data-Structure/Makefile
index 6dd7dd702d40..74893ac73bcd 100644
--- a/graphics/p5-GraphViz-Data-Structure/Makefile
+++ b/graphics/p5-GraphViz-Data-Structure/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Visualise data structures
-BUILD_DEPENDS= dot:graphics/graphviz \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= dot:graphics/graphviz \
p5-GraphViz>=0:graphics/p5-GraphViz
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-GraphViz-Traverse/Makefile b/graphics/p5-GraphViz-Traverse/Makefile
index 44d03604f25d..c24bf11544f9 100644
--- a/graphics/p5-GraphViz-Traverse/Makefile
+++ b/graphics/p5-GraphViz-Traverse/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Build a GraphViz object via callback traversal
-BUILD_DEPENDS= p5-GraphViz>=0:graphics/p5-GraphViz
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GraphViz>=0:graphics/p5-GraphViz
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile
index 2c93a2e86b04..7ea3725bd516 100644
--- a/graphics/p5-GraphViz/Makefile
+++ b/graphics/p5-GraphViz/Makefile
@@ -13,12 +13,12 @@ COMMENT= GraphViz - Perl interface to the GraphViz graphing tool
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= dot:graphics/graphviz \
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+ p5-File-Which>=1.09:sysutils/p5-File-Which
+RUN_DEPENDS= dot:graphics/graphviz \
p5-IPC-Run>=0.60:devel/p5-IPC-Run \
p5-Parse-RecDescent>=1.965.001:devel/p5-Parse-RecDescent \
p5-XML-Twig>=3.52:textproc/p5-XML-Twig
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-BUILD_DEPENDS+= p5-File-Which>=1.09:sysutils/p5-File-Which
TEST_DEPENDS= p5-Test2-Suite>=0.000030:devel/p5-Test2-Suite
NO_ARCH= yes
diff --git a/graphics/p5-GraphViz2/Makefile b/graphics/p5-GraphViz2/Makefile
index 9b02e426311d..383c264510a3 100644
--- a/graphics/p5-GraphViz2/Makefile
+++ b/graphics/p5-GraphViz2/Makefile
@@ -14,7 +14,8 @@ COMMENT= Wrapper for AT&T Graphviz
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= dot:graphics/graphviz \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= dot:graphics/graphviz \
p5-Algorithm-Dependency>=1.110:devel/p5-Algorithm-Dependency \
p5-Capture-Tiny>=0.36:devel/p5-Capture-Tiny \
p5-Class-ISA>=0.36:devel/p5-Class-ISA \
@@ -41,7 +42,6 @@ BUILD_DEPENDS= dot:graphics/graphviz \
p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny \
p5-XML-Bare>=0:textproc/p5-XML-Bare \
p5-XML-Tiny>=2.06:textproc/p5-XML-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.48:devel/p5-Test-Pod
OPTIONS_DEFINE= EXAMPLES
diff --git a/graphics/p5-Graphics-Color/Makefile b/graphics/p5-Graphics-Color/Makefile
index d58505218dec..c69813f2a1b5 100644
--- a/graphics/p5-Graphics-Color/Makefile
+++ b/graphics/p5-Graphics-Color/Makefile
@@ -13,13 +13,13 @@ COMMENT= Device and library agnostic color spaces
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Color-Library>=0.020:graphics/p5-Color-Library \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Color-Library>=0.020:graphics/p5-Color-Library \
p5-Moose>=0.74:devel/p5-Moose \
p5-MooseX-Aliases>=0.03:devel/p5-MooseX-Aliases \
p5-MooseX-Clone>=0.03:devel/p5-MooseX-Clone \
p5-MooseX-Storage>=0.23:devel/p5-MooseX-Storage \
p5-MooseX-Types>=0.19:devel/p5-MooseX-Types
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
USES= perl5
diff --git a/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile b/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
index 561b499ab69b..303895a1f032 100644
--- a/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
+++ b/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Cairo>=0:graphics/p5-Cairo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cairo>=0:graphics/p5-Cairo \
p5-Graphics-Primitive>=0:graphics/p5-Graphics-Primitive \
p5-Moose>=0:devel/p5-Moose \
p5-Text-Flow>=0:textproc/p5-Text-Flow
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Graphics-Color>=0:graphics/p5-Graphics-Color
NO_ARCH= yes
diff --git a/graphics/p5-Graphics-Primitive/Makefile b/graphics/p5-Graphics-Primitive/Makefile
index f526c143c7fd..ad774689e50a 100644
--- a/graphics/p5-Graphics-Primitive/Makefile
+++ b/graphics/p5-Graphics-Primitive/Makefile
@@ -14,14 +14,14 @@ COMMENT= Device and library agnostic graphic primitives
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Forest>=0.06:devel/p5-Forest \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Forest>=0.06:devel/p5-Forest \
p5-Geometry-Primitive>=0.16:graphics/p5-Geometry-Primitive \
p5-Graphics-Color>=0.20:graphics/p5-Graphics-Color \
p5-JSON-Any>=1.22:converters/p5-JSON-Any \
p5-Moose>=0.90:devel/p5-Moose \
p5-MooseX-Clone>=0.04:devel/p5-MooseX-Clone \
p5-MooseX-Storage>=0.17:devel/p5-MooseX-Storage
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Image-Base-SVG/Makefile b/graphics/p5-Image-Base-SVG/Makefile
index b7918dba1dcd..a77f755d275c 100644
--- a/graphics/p5-Image-Base-SVG/Makefile
+++ b/graphics/p5-Image-Base-SVG/Makefile
@@ -14,10 +14,10 @@ COMMENT= SVG image file output
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Image-Base>=0:graphics/p5-Image-Base \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Image-Base>=0:graphics/p5-Image-Base \
p5-SVG>=2.38:textproc/p5-SVG \
p5-SVG-Parser>=0:textproc/p5-SVG-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/graphics/p5-Image-Compare/Makefile b/graphics/p5-Image-Compare/Makefile
index 3d0fe594b99c..0596d56d4362 100644
--- a/graphics/p5-Image-Compare/Makefile
+++ b/graphics/p5-Image-Compare/Makefile
@@ -13,10 +13,10 @@ COMMENT= Compare two images in a variety of ways
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Imager>=0:graphics/p5-Imager \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Imager>=0:graphics/p5-Imager \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-CheckManifest>=0:devel/p5-Test-CheckManifest \
p5-Test-Pod>=1.26:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
diff --git a/graphics/p5-Image-Grab/Makefile b/graphics/p5-Image-Grab/Makefile
index 8c9baf7cc333..3a3d8f697113 100644
--- a/graphics/p5-Image-Grab/Makefile
+++ b/graphics/p5-Image-Grab/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl extension for Grabbing images off the Internet
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-HTML-Tree>=0:www/p5-HTML-Tree \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Image-Imgur/Makefile b/graphics/p5-Image-Imgur/Makefile
index 3c9c4dd1d67a..cafbbd91e22f 100644
--- a/graphics/p5-Image-Imgur/Makefile
+++ b/graphics/p5-Image-Imgur/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl extension for uploading images to http://imgur.com
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-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/graphics/p5-Image-Info/Makefile b/graphics/p5-Image-Info/Makefile
index 4f358ef54a0c..cd73363a5b37 100644
--- a/graphics/p5-Image-Info/Makefile
+++ b/graphics/p5-Image-Info/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl module for getting image information
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-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-XML-Simple>=0:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile
index 066169b46650..7d00771500bc 100644
--- a/graphics/p5-Image-Magick-Iterator/Makefile
+++ b/graphics/p5-Image-Magick-Iterator/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Sequentially read Image::Magick object from a filehandle
-BUILD_DEPENDS= ImageMagick>=0:graphics/ImageMagick \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ImageMagick>=0:graphics/ImageMagick \
p5-Image-PBMlib>=1.05:graphics/p5-Image-PBMlib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/graphics/p5-Image-Math-Constrain/Makefile b/graphics/p5-Image-Math-Constrain/Makefile
index 596ea99a43fb..6de86de9123f 100644
--- a/graphics/p5-Image-Math-Constrain/Makefile
+++ b/graphics/p5-Image-Math-Constrain/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
COMMENT= Scaling math used in image size constraining (such as thumbnails)
-BUILD_DEPENDS= p5-PathTools>=3.25:devel/p5-PathTools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PathTools>=3.25:devel/p5-PathTools
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Image-ObjectDetect/Makefile b/graphics/p5-Image-ObjectDetect/Makefile
index 4f4f6c7f2eb6..7e525901f8e1 100644
--- a/graphics/p5-Image-ObjectDetect/Makefile
+++ b/graphics/p5-Image-ObjectDetect/Makefile
@@ -14,8 +14,8 @@ COMMENT= Detects objects from picture using opencv
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv
USE_PERL5= configure
USES= perl5 pkgconfig
diff --git a/graphics/p5-Imager-Plot/Makefile b/graphics/p5-Imager-Plot/Makefile
index 219e1236ddf0..55c9fab17526 100644
--- a/graphics/p5-Imager-Plot/Makefile
+++ b/graphics/p5-Imager-Plot/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl extension for generating fancy graphic plots in color
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Imager>=0:graphics/p5-Imager
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Imager>=0:graphics/p5-Imager
USES= perl5 shebangfix
SHEBANG_FILES= plot.pl
diff --git a/graphics/p5-Imager-QRCode/Makefile b/graphics/p5-Imager-QRCode/Makefile
index 3113dd86c8ca..94fe0535c286 100644
--- a/graphics/p5-Imager-QRCode/Makefile
+++ b/graphics/p5-Imager-QRCode/Makefile
@@ -13,8 +13,8 @@ COMMENT= Generate QR Code with Imager using libqrencode
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Imager>=0.55:graphics/p5-Imager
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Imager>=0.55:graphics/p5-Imager
MAKE_JOBS_UNSAFE= yes
USES= localbase perl5
diff --git a/graphics/p5-Layout-Manager/Makefile b/graphics/p5-Layout-Manager/Makefile
index 719318f9c5fb..eb7476d8f624 100644
--- a/graphics/p5-Layout-Manager/Makefile
+++ b/graphics/p5-Layout-Manager/Makefile
@@ -15,10 +15,10 @@ COMMENT= 2D Layout Management
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Geometry-Primitive>=0.16:graphics/p5-Geometry-Primitive \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Geometry-Primitive>=0.16:graphics/p5-Geometry-Primitive \
p5-Graphics-Primitive>=0.43:graphics/p5-Graphics-Primitive \
p5-Moose>=0.79:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-SVG-Graph/Makefile b/graphics/p5-SVG-Graph/Makefile
index d3907f261623..eb9d9e0a0c94 100644
--- a/graphics/p5-SVG-Graph/Makefile
+++ b/graphics/p5-SVG-Graph/Makefile
@@ -14,11 +14,11 @@ COMMENT= Visualize your data in Scalable Vector Graphics (SVG) format
LICENSE= ART20
-BUILD_DEPENDS= p5-Math-Spline>=0:math/p5-Math-Spline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Spline>=0:math/p5-Math-Spline \
p5-SVG>=0:textproc/p5-SVG \
p5-Statistics-Descriptive>=0:math/p5-Statistics-Descriptive \
p5-Tree-DAG_Node>=0:devel/p5-Tree-DAG_Node
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/graphics/p5-SVG-Metadata/Makefile b/graphics/p5-SVG-Metadata/Makefile
index 698811608801..f75bee889f8f 100644
--- a/graphics/p5-SVG-Metadata/Makefile
+++ b/graphics/p5-SVG-Metadata/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to capture metadata info about an SVG file
-BUILD_DEPENDS= xml_grep:textproc/p5-XML-Twig
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= xml_grep:textproc/p5-XML-Twig
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-SWF-Builder/Makefile b/graphics/p5-SWF-Builder/Makefile
index efe758ba917d..170894196eb8 100644
--- a/graphics/p5-SWF-Builder/Makefile
+++ b/graphics/p5-SWF-Builder/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Create SWF movie
-BUILD_DEPENDS= p5-SWF-File>=0:graphics/p5-SWF-File \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SWF-File>=0:graphics/p5-SWF-File \
p5-Math-Bezier-Convert>=0:math/p5-Math-Bezier-Convert \
p5-Font-TTF>=0:x11-fonts/p5-Font-TTF
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= dos2unix perl5 shebangfix
SHEBANG_FILES= lib/SWF/Builder/ActionScript/Compiler.pm
diff --git a/graphics/p5-SWF-File/Makefile b/graphics/p5-SWF-File/Makefile
index 7b03b9f44c1d..054e2e11354c 100644
--- a/graphics/p5-SWF-File/Makefile
+++ b/graphics/p5-SWF-File/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Manipulating Flash movie (SWF) files
-BUILD_DEPENDS= p5-Data-TemporaryBag>=0:devel/p5-Data-TemporaryBag
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-TemporaryBag>=0:devel/p5-Data-TemporaryBag
USES= perl5 dos2unix
USE_PERL5= configure
diff --git a/graphics/p5-SpringGraph/Makefile b/graphics/p5-SpringGraph/Makefile
index 7e247d29f111..03919c8fe8c1 100644
--- a/graphics/p5-SpringGraph/Makefile
+++ b/graphics/p5-SpringGraph/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
COMMENT= Directed graph alternative to GraphViz
-BUILD_DEPENDS= p5-GD>=1:graphics/p5-GD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD>=1:graphics/p5-GD
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Tk-JPEG-Lite/Makefile b/graphics/p5-Tk-JPEG-Lite/Makefile
index 49de41f47ff4..ede4b395ee9e 100644
--- a/graphics/p5-Tk-JPEG-Lite/Makefile
+++ b/graphics/p5-Tk-JPEG-Lite/Makefile
@@ -12,8 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/00$//}
MAINTAINER= perl@FreeBSD.org
COMMENT= Very simplistic image viewer that loads JPEG images
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
USES= jpeg perl5
USE_PERL5= configure
diff --git a/graphics/p5-URI-GoogleChart/Makefile b/graphics/p5-URI-GoogleChart/Makefile
index 8c895c645daa..65c42b833808 100644
--- a/graphics/p5-URI-GoogleChart/Makefile
+++ b/graphics/p5-URI-GoogleChart/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Generate Google Chart URIs
-BUILD_DEPENDS= p5-URI>0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>0:net/p5-URI
USES= perl5
USE_PERL5= configure
diff --git a/graphics/p5-Visio/Makefile b/graphics/p5-Visio/Makefile
index b5cfd73f6693..19bf3b2d607f 100644
--- a/graphics/p5-Visio/Makefile
+++ b/graphics/p5-Visio/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension manipulating XML based Visio files
-BUILD_DEPENDS= p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/irc/p5-AnyEvent-IRC/Makefile b/irc/p5-AnyEvent-IRC/Makefile
index e82c3800707a..5673a3615d84 100644
--- a/irc/p5-AnyEvent-IRC/Makefile
+++ b/irc/p5-AnyEvent-IRC/Makefile
@@ -14,9 +14,9 @@ COMMENT= Event system independent IRC protocol module
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Object-Event>=0.7:devel/p5-Object-Event
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/irc/p5-Bot-BasicBot/Makefile b/irc/p5-Bot-BasicBot/Makefile
index cb345cc4c702..760e280248f6 100644
--- a/irc/p5-Bot-BasicBot/Makefile
+++ b/irc/p5-Bot-BasicBot/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-POE-Component-IRC>=6.90:irc/p5-POE-Component-IRC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/irc/p5-IRC-Bot-Hangman/Makefile b/irc/p5-IRC-Bot-Hangman/Makefile
index 5609c4e4c3a1..50b09fc1652c 100644
--- a/irc/p5-IRC-Bot-Hangman/Makefile
+++ b/irc/p5-IRC-Bot-Hangman/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= IRC hangman bot
-BUILD_DEPENDS= p5-Bot-BasicBot>=0:irc/p5-Bot-BasicBot \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bot-BasicBot>=0:irc/p5-Bot-BasicBot \
p5-Games-GuessWord>=0:games/p5-Games-GuessWord \
p5-Module-Find>=0:devel/p5-Module-Find \
p5-Chatbot-Eliza>=0:misc/p5-Chatbot-Eliza \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/irc/p5-POE-Component-IRC-Object/Makefile b/irc/p5-POE-Component-IRC-Object/Makefile
index d177762f091d..36a2f9931993 100644
--- a/irc/p5-POE-Component-IRC-Object/Makefile
+++ b/irc/p5-POE-Component-IRC-Object/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Slightly simpler OO interface to POE::Component::IRC
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-POE-Component-IRC>=0:irc/p5-POE-Component-IRC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
#PLIST_SUB= EXAMPLESDIR="share/examples/${PORTNAME}"
USES= perl5
diff --git a/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile b/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile
index 7e8d9778b31c..1256bf7af154 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile
@@ -15,10 +15,10 @@ COMMENT= POE::Component::IRC plugin tthat provides blowfish encryption
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE>=0.37:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0.37:devel/p5-POE \
p5-POE-Component-IRC>=5.07:irc/p5-POE-Component-IRC \
p5-Crypt-Blowfish_PP>=1.12:security/p5-Crypt-Blowfish_PP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PLIST_SUB= EXAMPLESDIR="share/examples/${PORTNAME}"
diff --git a/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile b/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile
index 5bb594685a7d..79120c09a01f 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Dev-Bollocks>=0.06:textproc/p5-Dev-Bollocks \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dev-Bollocks>=0.06:textproc/p5-Dev-Bollocks \
p5-POE>=0:devel/p5-POE \
p5-POE-Component-IRC>=0:irc/p5-POE-Component-IRC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= EXAMPLES
diff --git a/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile b/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile
index 9001fe69836d..16e6e2fc16dc 100644
--- a/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-POE-Component-IRC>=0:irc/p5-POE-Component-IRC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= EXAMPLES
diff --git a/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile b/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile
index 4ee5ce7d705a..bd1064202d9a 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile
@@ -15,12 +15,12 @@ COMMENT= PoCo-IRC plugin for a Hailo conversation simulator
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IRC-Utils>=0.05:irc/p5-IRC-Utils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IRC-Utils>=0.05:irc/p5-IRC-Utils \
p5-Math-Random-OO>=0.21:math/p5-Math-Random-OO \
p5-POE>=0:devel/p5-POE \
p5-POE-Component-Hailo>=0:devel/p5-POE-Component-Hailo \
p5-POE-Component-IRC>=6.22:irc/p5-POE-Component-IRC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Script>=1.07:devel/p5-Test-Script
USES= perl5
diff --git a/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile b/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile
index 98d749267355..70f84927ff44 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile
@@ -14,11 +14,11 @@ COMMENT= PoCo-IRC plugin that keeps track of karma
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-DBI>=0:databases/p5-DBI \
p5-POE-Component-IRC>=6.22:irc/p5-POE-Component-IRC \
p5-Moose>=0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject
USES= perl5
diff --git a/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile b/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile
index 6003a40f962c..374e63439f9c 100644
--- a/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Math-Random>=0.69:math/p5-Math-Random \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Random>=0.69:math/p5-Math-Random \
p5-POE>=0:devel/p5-POE \
p5-POE-Component-IRC>=0:irc/p5-POE-Component-IRC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5 shebangfix
diff --git a/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile b/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile
index 723629d04a7a..0e1f9ed2ec1f 100644
--- a/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= POE::Component::IRC plugin for IRC based DNS queries
-BUILD_DEPENDS= p5-Net-IP>=1.25:net-mgmt/p5-Net-IP \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-IP>=1.25:net-mgmt/p5-Net-IP \
p5-POE-Component-Client-DNS>=1.00:dns/p5-POE-Component-Client-DNS \
p5-POE-Component-IRC>=0:irc/p5-POE-Component-IRC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PLIST_SUB= EXAMPLESDIR="share/examples/${PORTNAME}"
USES= perl5
diff --git a/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile b/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile
index df95778cb17d..a783aa2d7252 100644
--- a/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-POE>=1.004:devel/p5-POE \
p5-POE-Component-Client-HTTP>=0.73:www/p5-POE-Component-Client-HTTP \
p5-POE-Component-IRC>=5.07:irc/p5-POE-Component-IRC \
p5-XML-RSS>=1.1:textproc/p5-XML-RSS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/irc/p5-POE-Component-IRC/Makefile b/irc/p5-POE-Component-IRC/Makefile
index 8b75c1078d8f..680c36596a17 100644
--- a/irc/p5-POE-Component-IRC/Makefile
+++ b/irc/p5-POE-Component-IRC/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-IRC-Utils>=0.12:irc/p5-IRC-Utils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IRC-Utils>=0.12:irc/p5-IRC-Utils \
p5-POE>=1.311:devel/p5-POE \
p5-POE-Component-Client-DNS>=0.99:dns/p5-POE-Component-Client-DNS \
p5-POE-Component-SSLify>=0:security/p5-POE-Component-SSLify \
p5-POE-Component-Syndicator>=0.01:devel/p5-POE-Component-Syndicator \
p5-POE-Filter-IRCD>=2.42:irc/p5-POE-Filter-IRCD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>=0.610:devel/p5-Test-Differences
OPTIONS_DEFINE= EXAMPLES
diff --git a/irc/p5-POE-Filter-IRCD/Makefile b/irc/p5-POE-Filter-IRCD/Makefile
index 59d3efd4f328..a54912912e3b 100644
--- a/irc/p5-POE-Filter-IRCD/Makefile
+++ b/irc/p5-POE-Filter-IRCD/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE
USES= perl5
USE_PERL5= configure
diff --git a/japanese/p5-Date-Japanese-Era/Makefile b/japanese/p5-Date-Japanese-Era/Makefile
index 649277c4b3e5..79d801a0ecfc 100644
--- a/japanese/p5-Date-Japanese-Era/Makefile
+++ b/japanese/p5-Date-Japanese-Era/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= CPAN
MAINTAINER= perl@FreeBSD.org
COMMENT= Conversion between Japanese Era / Gregorian calendar
-BUILD_DEPENDS= p5-Date-Calc>=0:devel/p5-Date-Calc \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Calc>=0:devel/p5-Date-Calc \
ja-p5-Lingua-JA-Numbers>=0:japanese/p5-Lingua-JA-Numbers
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
index e2f7b5093b6c..bf0604939fb9 100644
--- a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
+++ b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
@@ -13,14 +13,14 @@ COMMENT= DateTime Extension for Japanese Eras
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-Module-Install>=0.91:devel/p5-Module-Install \
p5-DateTime>=0:devel/p5-DateTime \
p5-File-ShareDir>=0:devel/p5-File-ShareDir \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-YAML-Tiny>=1.38:textproc/p5-YAML-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-YAML>=0:textproc/p5-YAML
USES= perl5
diff --git a/japanese/p5-DateTime-Format-Japanese/Makefile b/japanese/p5-DateTime-Format-Japanese/Makefile
index 9ee28036a0ca..d44afc88c2b5 100644
--- a/japanese/p5-DateTime-Format-Japanese/Makefile
+++ b/japanese/p5-DateTime-Format-Japanese/Makefile
@@ -11,12 +11,12 @@ MASTER_SITE_SUBDIR= CPAN:DMAKI
MAINTAINER= markun@onohara.to
COMMENT= Japanese DateTime Formatter
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Calendar-Japanese>=0.05:devel/p5-DateTime-Calendar-Japanese \
ja-p5-DateTime-Calendar-Japanese-Era>=0.08000:japanese/p5-DateTime-Calendar-Japanese-Era \
p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
index 193c64956aca..7493f50bed7f 100644
--- a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
+++ b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES= CPAN
MAINTAINER= markun@onohara.to
COMMENT= Summary generator for Japanese
-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-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
p5-Module-Install>=0:devel/p5-Module-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/lang/p5-Expect/Makefile b/lang/p5-Expect/Makefile
index 4b7322cb4ea5..24d6ec5f50bd 100644
--- a/lang/p5-Expect/Makefile
+++ b/lang/p5-Expect/Makefile
@@ -12,8 +12,8 @@ COMMENT= Perl module inspired by the Tcl version of Expect
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Tty>=1.11:devel/p5-IO-Tty
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Tty>=1.11:devel/p5-IO-Tty
NO_ARCH= yes
USES= perl5
diff --git a/lang/p5-Interpolation/Makefile b/lang/p5-Interpolation/Makefile
index 960c2ef33b20..ef25dfae2299 100644
--- a/lang/p5-Interpolation/Makefile
+++ b/lang/p5-Interpolation/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Implement arbitrary string interpolation semantics for Perl
-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/lang/p5-JSAN/Makefile b/lang/p5-JSAN/Makefile
index 5054a185978a..320eb7ffa88f 100644
--- a/lang/p5-JSAN/Makefile
+++ b/lang/p5-JSAN/Makefile
@@ -12,7 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= JavaScript Archive Network (JSAN) Shell
-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-DBI-DATA-Schema>=0:databases/p5-Class-DBI-DATA-Schema \
p5-Class-DBI-Loader>=0:databases/p5-Class-DBI-Loader \
p5-Class-DBI-SQLite>=0:databases/p5-Class-DBI-SQLite \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-XML-XPath>=0:textproc/p5-XML-XPath \
p5-YAML>=0:textproc/p5-YAML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/lang/p5-List-MoreUtils/Makefile b/lang/p5-List-MoreUtils/Makefile
index fb2a1b9c7c1c..478f738a7f3f 100644
--- a/lang/p5-List-MoreUtils/Makefile
+++ b/lang/p5-List-MoreUtils/Makefile
@@ -13,9 +13,9 @@ COMMENT= Provide the stuff missing in List::Util
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Exporter-Tiny>=0.038:devel/p5-Exporter-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exporter-Tiny>=0.038:devel/p5-Exporter-Tiny \
p5-List-MoreUtils-XS>=0.426:lang/p5-List-MoreUtils-XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace
NO_ARCH= yes
diff --git a/lang/p5-Marpa-PP/Makefile b/lang/p5-Marpa-PP/Makefile
index 69bb04e71330..bd8b1716a077 100644
--- a/lang/p5-Marpa-PP/Makefile
+++ b/lang/p5-Marpa-PP/Makefile
@@ -16,9 +16,9 @@ COMMENT= Pure Perl version of Marpa
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
-BUILD_DEPENDS= p5-PPI>=1.206:textproc/p5-PPI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PPI>=1.206:textproc/p5-PPI \
p5-Task-Weaken>=0:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Weaken>=3.004000:devel/p5-Test-Weaken
NO_ARCH= yes
diff --git a/lang/p5-Marpa-XS/Makefile b/lang/p5-Marpa-XS/Makefile
index 844d6140d6e0..66bcc705f47e 100644
--- a/lang/p5-Marpa-XS/Makefile
+++ b/lang/p5-Marpa-XS/Makefile
@@ -15,11 +15,11 @@ COMMENT= XS version of Marpa
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
-BUILD_DEPENDS= p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
p5-Glib2>=1.223:devel/p5-Glib2 \
p5-PPI>=1.206:textproc/p5-PPI \
p5-Task-Weaken>=0:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Weaken>=3.004000:devel/p5-Test-Weaken
USE_PERL5= modbuild
diff --git a/lang/p5-Marpa/Makefile b/lang/p5-Marpa/Makefile
index 60f91db126eb..1a055a1aaa9a 100644
--- a/lang/p5-Marpa/Makefile
+++ b/lang/p5-Marpa/Makefile
@@ -17,9 +17,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-PPI>=1.206:textproc/p5-PPI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/lang/p5-Perl6-Subs/Makefile b/lang/p5-Perl6-Subs/Makefile
index 42103f1a9436..effb1f627841 100644
--- a/lang/p5-Perl6-Subs/Makefile
+++ b/lang/p5-Perl6-Subs/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl6::Subs - Define your subroutines in the Perl 6 style
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
USES= perl5
USE_PERL5= configure
diff --git a/lang/p5-Quantum-Superpositions/Makefile b/lang/p5-Quantum-Superpositions/Makefile
index 5864b399664f..b5d695888d05 100644
--- a/lang/p5-Quantum-Superpositions/Makefile
+++ b/lang/p5-Quantum-Superpositions/Makefile
@@ -13,8 +13,8 @@ COMMENT= QM-like superpositions in Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Multimethods>=0:devel/p5-Class-Multimethods
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Multimethods>=0:devel/p5-Class-Multimethods
USES= perl5
USE_PERL5= configure
diff --git a/lang/p5-Switch/Makefile b/lang/p5-Switch/Makefile
index fcdf17ab2e36..83cb3328d5c6 100644
--- a/lang/p5-Switch/Makefile
+++ b/lang/p5-Switch/Makefile
@@ -15,8 +15,8 @@ COMMENT= Switch - A switch statement for Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Filter>0:devel/p5-Filter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Filter>0:devel/p5-Filter
USES= perl5
USE_PERL5= configure
diff --git a/lang/p5-Try-Tiny-Retry/Makefile b/lang/p5-Try-Tiny-Retry/Makefile
index da6f56220ba4..805ef9bdf376 100644
--- a/lang/p5-Try-Tiny-Retry/Makefile
+++ b/lang/p5-Try-Tiny-Retry/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Extends Try::Tiny to allow retries
-BUILD_DEPENDS= p5-Try-Tiny>0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Try-Tiny>0:lang/p5-Try-Tiny
USES= perl5
USE_PERL5= configure
diff --git a/lang/p5-signatures/Makefile b/lang/p5-signatures/Makefile
index 60550f3f72f5..7ef03357634f 100644
--- a/lang/p5-signatures/Makefile
+++ b/lang/p5-signatures/Makefile
@@ -13,12 +13,12 @@ COMMENT= Subroutine signatures for Perl with no source filter
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-B-Hooks-EndOfScope>=0.08:devel/p5-B-Hooks-EndOfScope \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Hooks-EndOfScope>=0.08:devel/p5-B-Hooks-EndOfScope \
p5-B-Hooks-OP-Check>=0.17:devel/p5-B-Hooks-OP-Check \
p5-B-Hooks-OP-PPAddr>=0.03:devel/p5-B-Hooks-OP-PPAddr \
p5-B-Hooks-Parser>=0.15:devel/p5-B-Hooks-Parser \
p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Dancer-Plugin-Email/Makefile b/mail/p5-Dancer-Plugin-Email/Makefile
index c3ecaba259ad..45b8518d9891 100644
--- a/mail/p5-Dancer-Plugin-Email/Makefile
+++ b/mail/p5-Dancer-Plugin-Email/Makefile
@@ -12,12 +12,12 @@ COMMENT= Simple email handling for Dancer applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer>=0:www/p5-Dancer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer>=0:www/p5-Dancer \
p5-Email-Date-Format>=0:mail/p5-Email-Date-Format \
p5-Email-Sender>=0:mail/p5-Email-Sender \
p5-File-Type>=0:devel/p5-File-Type \
p5-MIME-Tools>=0:mail/p5-MIME-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/mail/p5-Dancer2-Plugin-Email/Makefile b/mail/p5-Dancer2-Plugin-Email/Makefile
index 1ad9aae2632c..e8147ac79af7 100644
--- a/mail/p5-Dancer2-Plugin-Email/Makefile
+++ b/mail/p5-Dancer2-Plugin-Email/Makefile
@@ -13,14 +13,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Dancer2>=0.200000:www/p5-Dancer2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer2>=0.200000:www/p5-Dancer2 \
p5-Email-Date-Format>=0:mail/p5-Email-Date-Format \
p5-Email-Sender>=0:mail/p5-Email-Sender \
p5-File-Type>=0:devel/p5-File-Type \
p5-IO-Socket-SSL>=2.000:security/p5-IO-Socket-SSL \
p5-MIME-Tools>=0:mail/p5-MIME-Tools \
p5-Module-Runtime>=0:devel/p5-Module-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-Plack>=1.0029:www/p5-Plack
diff --git a/mail/p5-Email-Address-List/Makefile b/mail/p5-Email-Address-List/Makefile
index 15b89907f001..d9cfcb2ad61d 100644
--- a/mail/p5-Email-Address-List/Makefile
+++ b/mail/p5-Email-Address-List/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= matthew@FreeBSD.org
COMMENT= RFC-close address list parsing
-BUILD_DEPENDS= p5-Email-Address>0:mail/p5-Email-Address
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Address>0:mail/p5-Email-Address
NO_ARCH= yes
diff --git a/mail/p5-Email-Date/Makefile b/mail/p5-Email-Date/Makefile
index 676c9282f223..331dcf28b975 100644
--- a/mail/p5-Email-Date/Makefile
+++ b/mail/p5-Email-Date/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-Abstract>=2.10:mail/p5-Email-Abstract \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Abstract>=2.10:mail/p5-Email-Abstract \
p5-Email-Date-Format>=1:mail/p5-Email-Date-Format \
p5-Email-Simple>=1.9:mail/p5-Email-Simple \
p5-TimeDate>=1.16:devel/p5-TimeDate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Email-Delete/Makefile b/mail/p5-Email-Delete/Makefile
index 195bcbf96d3a..0cfbef78151f 100644
--- a/mail/p5-Email-Delete/Makefile
+++ b/mail/p5-Email-Delete/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-Folder>=0:mail/p5-Email-Folder \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Folder>=0:mail/p5-Email-Folder \
p5-Email-FolderType>=0:mail/p5-Email-FolderType \
p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
p5-Email-Simple>=0:mail/p5-Email-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Email-Filter/Makefile b/mail/p5-Email-Filter/Makefile
index 4f37c1bb5ca6..4155d206623f 100644
--- a/mail/p5-Email-Filter/Makefile
+++ b/mail/p5-Email-Filter/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Trigger>=0:devel/p5-Class-Trigger \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Trigger>=0:devel/p5-Class-Trigger \
p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
p5-Email-Simple>=0:mail/p5-Email-Simple \
p5-IPC-Run>=0:devel/p5-IPC-Run
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 5dd2b8c0b324..dbd3a30d56f6 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -14,8 +14,8 @@ COMMENT= Find RFC 822 email addresses in plain text
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Email-Valid>=0:mail/p5-Email-Valid
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Valid>=0:mail/p5-Email-Valid
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Email-Folder-IMAP/Makefile b/mail/p5-Email-Folder-IMAP/Makefile
index d970335f45b7..91628dabdb99 100644
--- a/mail/p5-Email-Folder-IMAP/Makefile
+++ b/mail/p5-Email-Folder-IMAP/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-Folder>=0:mail/p5-Email-Folder \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Folder>=0:mail/p5-Email-Folder \
p5-Email-FolderType-Net>=0:mail/p5-Email-FolderType-Net \
p5-Net-IMAP-Simple>=0.95:mail/p5-Net-IMAP-Simple \
p5-URI>=0:net/p5-URI \
p5-URI-imap>=0:mail/p5-URI-imap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Email-Folder-IMAPS/Makefile b/mail/p5-Email-Folder-IMAPS/Makefile
index 2a41fa07629d..4580253df868 100644
--- a/mail/p5-Email-Folder-IMAPS/Makefile
+++ b/mail/p5-Email-Folder-IMAPS/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-Folder-IMAP>=1.102:mail/p5-Email-Folder-IMAP \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Folder-IMAP>=1.102:mail/p5-Email-Folder-IMAP \
p5-Net-IMAP-Simple-SSL>=1.3:mail/p5-Net-IMAP-Simple-SSL \
p5-URI-imap>=0:mail/p5-URI-imap \
p5-URI-imaps>=0:mail/p5-URI-imaps
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Email-Folder-POP3/Makefile b/mail/p5-Email-Folder-POP3/Makefile
index 8291bbc3b0dc..1f6ee5d2d101 100644
--- a/mail/p5-Email-Folder-POP3/Makefile
+++ b/mail/p5-Email-Folder-POP3/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-Folder>=0:mail/p5-Email-Folder \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Folder>=0:mail/p5-Email-Folder \
p5-Email-FolderType-Net>=0:mail/p5-Email-FolderType-Net \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Email-Folder/Makefile b/mail/p5-Email-Folder/Makefile
index bee1297ee64e..db6955d156e5 100644
--- a/mail/p5-Email-Folder/Makefile
+++ b/mail/p5-Email-Folder/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-FolderType>=0.600:mail/p5-Email-FolderType \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-FolderType>=0.600:mail/p5-Email-FolderType \
p5-Email-Simple>=0:mail/p5-Email-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Email-FolderType-Net/Makefile b/mail/p5-Email-FolderType-Net/Makefile
index 21e962b78688..071c421df41a 100644
--- a/mail/p5-Email-FolderType-Net/Makefile
+++ b/mail/p5-Email-FolderType-Net/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-FolderType>=0.800:mail/p5-Email-FolderType \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-FolderType>=0.800:mail/p5-Email-FolderType \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Email-FolderType/Makefile b/mail/p5-Email-FolderType/Makefile
index 28fb776b06c7..a843c6b531d5 100644
--- a/mail/p5-Email-FolderType/Makefile
+++ b/mail/p5-Email-FolderType/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Module-Pluggable>0:devel/p5-Module-Pluggable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Pluggable>0:devel/p5-Module-Pluggable
TEST_DEPENDS= p5-Capture-Tiny>0:devel/p5-Capture-Tiny
NO_ARCH= yes
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
index 97f7c4d6264c..e0b0f73c60e7 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Deliver mail into ezmlm archives
-BUILD_DEPENDS= p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
p5-Email-FolderType>=0:mail/p5-Email-FolderType
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/Makefile b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
index d7adaafed80f..1954049a253f 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/Makefile
+++ b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-MIME>=1.861:mail/p5-Email-MIME \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-MIME>=1.861:mail/p5-Email-MIME \
p5-Email-MIME-ContentType>=1.016:mail/p5-Email-MIME-ContentType
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Email-MIME-CreateHTML/Makefile b/mail/p5-Email-MIME-CreateHTML/Makefile
index 2cd585768fe3..49960aec1193 100644
--- a/mail/p5-Email-MIME-CreateHTML/Makefile
+++ b/mail/p5-Email-MIME-CreateHTML/Makefile
@@ -13,7 +13,8 @@ COMMENT= Multipart HTML Email builder
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Data-Serializer>=0:devel/p5-Data-Serializer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Serializer>=0:devel/p5-Data-Serializer \
p5-Email-MIME>=0:mail/p5-Email-MIME \
p5-File-Policy>=0:devel/p5-File-Policy \
p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Data-Serializer>=0:devel/p5-Data-Serializer \
p5-MIME-Types>=2.17:mail/p5-MIME-Types \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Email-Address>=0:mail/p5-Email-Address \
p5-Email-Send>=0:mail/p5-Email-Send \
p5-File-Slurp>=0:devel/p5-File-Slurp \
diff --git a/mail/p5-Email-MIME/Makefile b/mail/p5-Email-MIME/Makefile
index 8b14d8da66e3..dc67e6922c12 100644
--- a/mail/p5-Email-MIME/Makefile
+++ b/mail/p5-Email-MIME/Makefile
@@ -13,14 +13,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-Address-XS>=0:mail/p5-Email-Address-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Address-XS>=0:mail/p5-Email-Address-XS \
p5-Email-MIME-ContentType>=1.022:mail/p5-Email-MIME-ContentType \
p5-Email-MIME-Encodings>=1.314:mail/p5-Email-MIME-Encodings \
p5-Email-MessageID>=0:mail/p5-Email-MessageID \
p5-Email-Simple>=2.212:mail/p5-Email-Simple \
p5-MIME-Types>=1.13:mail/p5-MIME-Types \
p5-Module-Runtime>=0:devel/p5-Module-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Email-Reply/Makefile b/mail/p5-Email-Reply/Makefile
index 3f456717ad70..d7e782606249 100644
--- a/mail/p5-Email-Reply/Makefile
+++ b/mail/p5-Email-Reply/Makefile
@@ -13,10 +13,10 @@ COMMENT= Email::Reply - Reply to a Message
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Email-Abstract>=2.01:mail/p5-Email-Abstract \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Abstract>=2.01:mail/p5-Email-Abstract \
p5-Email-Address>=1.800:mail/p5-Email-Address \
p5-Email-MIME>=1.82:mail/p5-Email-MIME
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
USES= perl5
diff --git a/mail/p5-Email-Send/Makefile b/mail/p5-Email-Send/Makefile
index f9e9505c0944..e68c9077995d 100644
--- a/mail/p5-Email-Send/Makefile
+++ b/mail/p5-Email-Send/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Email::Send - Simply Sending Email
-BUILD_DEPENDS= p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
p5-Email-Address>=1.800:mail/p5-Email-Address \
p5-Email-Simple>=1.92:mail/p5-Email-Simple \
p5-Return-Value>=1.28:devel/p5-Return-Value \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Email-Sender/Makefile b/mail/p5-Email-Sender/Makefile
index 01438b124c17..c15c007e6caf 100644
--- a/mail/p5-Email-Sender/Makefile
+++ b/mail/p5-Email-Sender/Makefile
@@ -14,7 +14,8 @@ COMMENT= Library for sending email
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Email-Abstract>=3.006:mail/p5-Email-Abstract \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Abstract>=3.006:mail/p5-Email-Abstract \
p5-Email-Address>=0:mail/p5-Email-Address \
p5-Email-Simple>=1.998:mail/p5-Email-Simple \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Email-Abstract>=3.006:mail/p5-Email-Abstract \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-Throwable>=0.200003:devel/p5-Throwable \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Capture-Tiny>=0.08:devel/p5-Capture-Tiny
NO_ARCH= yes
diff --git a/mail/p5-Email-Simple-FromHandle/Makefile b/mail/p5-Email-Simple-FromHandle/Makefile
index addf7f404dc5..e647b0703633 100644
--- a/mail/p5-Email-Simple-FromHandle/Makefile
+++ b/mail/p5-Email-Simple-FromHandle/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl library for making email objects from a filehandle
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Email-Simple>=0:mail/p5-Email-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Simple>=0:mail/p5-Email-Simple \
p5-IO-String>=0:devel/p5-IO-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile
index 25cc72b6ad91..0e097b5022bb 100644
--- a/mail/p5-Email-Simple/Makefile
+++ b/mail/p5-Email-Simple/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-Date-Format>=0:mail/p5-Email-Date-Format
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Date-Format>=0:mail/p5-Email-Date-Format
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Email-Stuffer/Makefile b/mail/p5-Email-Stuffer/Makefile
index c6d5713ee980..bd489e6e8adb 100644
--- a/mail/p5-Email-Stuffer/Makefile
+++ b/mail/p5-Email-Stuffer/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= zi@FreeBSD.org
COMMENT= More casual approach to creating and sending Email
-BUILD_DEPENDS= p5-Params-Util>=0.23:devel/p5-Params-Util \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Util>=0.23:devel/p5-Params-Util \
p5-File-Type>=0.22:devel/p5-File-Type \
p5-Email-MIME>=1.901:mail/p5-Email-MIME \
p5-Email-Sender>=0:mail/p5-Email-Sender
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Email-Valid-Loose/Makefile b/mail/p5-Email-Valid-Loose/Makefile
index 3cec5a6fd2eb..a1ef40e5720f 100644
--- a/mail/p5-Email-Valid-Loose/Makefile
+++ b/mail/p5-Email-Valid-Loose/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Variation of Email::Valid which allows dot before at mark
-BUILD_DEPENDS= p5-Email-Valid>=0:mail/p5-Email-Valid
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Valid>=0:mail/p5-Email-Valid
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-GMail-IMAPD/Makefile b/mail/p5-GMail-IMAPD/Makefile
index 7a5eca1c737d..59092413ee65 100644
--- a/mail/p5-GMail-IMAPD/Makefile
+++ b/mail/p5-GMail-IMAPD/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mashtizadeh@gmail.com
COMMENT= Perl IMAP4 gateway to Google's webmail service
-BUILD_DEPENDS= p5-Mail-Webmail-Gmail>=0:mail/p5-Mail-Webmail-Gmail
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Webmail-Gmail>=0:mail/p5-Mail-Webmail-Gmail
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-LMAP-CID2SPF/Makefile b/mail/p5-LMAP-CID2SPF/Makefile
index bbba42e14b39..0cb7b6ce0487 100644
--- a/mail/p5-LMAP-CID2SPF/Makefile
+++ b/mail/p5-LMAP-CID2SPF/Makefile
@@ -14,8 +14,8 @@ COMMENT= Module to convert between Microsoft's Caller-ID and SPF #'
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 shebangfix
USE_PERL5= configure
diff --git a/mail/p5-MIME-EncWords/Makefile b/mail/p5-MIME-EncWords/Makefile
index c735c588d4ce..902503a86df8 100644
--- a/mail/p5-MIME-EncWords/Makefile
+++ b/mail/p5-MIME-EncWords/Makefile
@@ -13,8 +13,8 @@ COMMENT= Deal with RFC 2047 encoded words (improved)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MIME-Charset>=1.010.1:mail/p5-MIME-Charset
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MIME-Charset>=1.010.1:mail/p5-MIME-Charset
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-MIME-Lite/Makefile b/mail/p5-MIME-Lite/Makefile
index 92c34a5e4350..989ed1234a31 100644
--- a/mail/p5-MIME-Lite/Makefile
+++ b/mail/p5-MIME-Lite/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-Date-Format>=1.000:mail/p5-Email-Date-Format \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Date-Format>=1.000:mail/p5-Email-Date-Format \
p5-MIME-Types>=1.28:mail/p5-MIME-Types \
p5-Mail-Tools>=1.62:mail/p5-Mail-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index 418b2604f443..a776ce2ae9d7 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -16,9 +16,9 @@ COMMENT= Set of perl5 modules for MIME
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Convert-BinHex>=0:converters/p5-Convert-BinHex \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Convert-BinHex>=0:converters/p5-Convert-BinHex \
p5-Mail-Tools>=1.05:mail/p5-Mail-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
NO_ARCH= yes
diff --git a/mail/p5-Mail-Address-MobileJp/Makefile b/mail/p5-Mail-Address-MobileJp/Makefile
index b5fd33598b54..5c7c6ec3485d 100644
--- a/mail/p5-Mail-Address-MobileJp/Makefile
+++ b/mail/p5-Mail-Address-MobileJp/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Utility to detect an e-mail is mobile one or not
-BUILD_DEPENDS= p5-Mail-Tools>=0:mail/p5-Mail-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Tools>=0:mail/p5-Mail-Tools
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index 0fd4d7880278..21d7f0fc3e0a 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-HomeDir>=0.61:devel/p5-File-HomeDir \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-HomeDir>=0.61:devel/p5-File-HomeDir \
p5-File-Tempdir>=0:devel/p5-File-Tempdir \
p5-MIME-Tools>=0:mail/p5-MIME-Tools \
p5-Mail-Tools>=0:mail/p5-Mail-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Mail-POP3Client>=0:mail/p5-Mail-POP3Client \
p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
diff --git a/mail/p5-Mail-Box-IMAP4-SSL/Makefile b/mail/p5-Mail-Box-IMAP4-SSL/Makefile
index 51edae964689..56a42f8f6278 100644
--- a/mail/p5-Mail-Box-IMAP4-SSL/Makefile
+++ b/mail/p5-Mail-Box-IMAP4-SSL/Makefile
@@ -11,10 +11,10 @@ COMMENT= Missing part of Mail::Box::IMAP4
LICENSE= APACHE20
-BUILD_DEPENDS= p5-Mail-Box>=0:mail/p5-Mail-Box \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Box>=0:mail/p5-Mail-Box \
p5-superclass>=0.003:devel/p5-superclass \
p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Probe-Perl>=0:sysutils/p5-Probe-Perl \
p5-Proc-Background>=1.08:devel/p5-Proc-Background
diff --git a/mail/p5-Mail-Box-Parser-C/Makefile b/mail/p5-Mail-Box-Parser-C/Makefile
index 3c3e2554aee4..db5679cbf7a9 100644
--- a/mail/p5-Mail-Box-Parser-C/Makefile
+++ b/mail/p5-Mail-Box-Parser-C/Makefile
@@ -13,8 +13,8 @@ COMMENT= Parsing folders for Mail::Box with C routines
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mail-Box>=0:mail/p5-Mail-Box
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Box>=0:mail/p5-Mail-Box
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-CheckUser/Makefile b/mail/p5-Mail-CheckUser/Makefile
index a2ab14902ccf..8b88e4ffa0f0 100644
--- a/mail/p5-Mail-CheckUser/Makefile
+++ b/mail/p5-Mail-CheckUser/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bra@fsn.hu
COMMENT= Perl module to check email addresses for validity
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index 5f16a854168c..947c2a629b0a 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl extension for the clamav virus scanner
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline>=0:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0:devel/p5-Inline \
p5-Inline-C>=0:devel/p5-Inline-C \
clamscan:security/clamav
-RUN_DEPENDS:= ${BUILD_DEPENDS}
MAKE_JOBS_UNSAFE= yes
USES= perl5
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index 4fc1575d2680..bbcce9c9ee43 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl5 module to process and/or create DKIM email
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
p5-Mail-Tools>=0:mail/p5-Mail-Tools \
p5-Net-DNS>=0:dns/p5-Net-DNS \
p5-Net-DNS-Resolver-Mock>=0:dns/p5-Net-DNS-Resolver-Mock
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-RequiresInternet>=0:devel/p5-Test-RequiresInternet \
p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
diff --git a/mail/p5-Mail-DMARC/Makefile b/mail/p5-Mail-DMARC/Makefile
index 1d495c00d37e..a1da37486121 100644
--- a/mail/p5-Mail-DMARC/Makefile
+++ b/mail/p5-Mail-DMARC/Makefile
@@ -12,7 +12,8 @@ COMMENT= Perl5 module to process and/or create DKIM email
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
p5-Config-Tiny>=0:devel/p5-Config-Tiny \
p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install \
@@ -38,7 +39,6 @@ BUILD_DEPENDS= p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
p5-Net-DNS>=0:dns/p5-Net-DNS \
p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
USE_PERL5= configure
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
index 59c67f03e029..996ebcee2b93 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-MIME-Tools>=5.418:mail/p5-MIME-Tools \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MIME-Tools>=5.418:mail/p5-MIME-Tools \
p5-Mail-Tools>=2.04:mail/p5-Mail-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index ab42aa652ece..433765cb006d 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -15,9 +15,9 @@ COMMENT= Perl module to allow object methods for ezmlm-idx mailing lists
LICENSE= BSD3CLAUSE GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= ${EZMLM_DIR}/bin/ezmlm-idx:mail/ezmlm-idx \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${EZMLM_DIR}/bin/ezmlm-idx:mail/ezmlm-idx \
p5-Crypt-GPG>=0:security/p5-Crypt-GPG
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Mail-Field-Received/Makefile b/mail/p5-Mail-Field-Received/Makefile
index 0c1d42f9f136..6309749b4ab7 100644
--- a/mail/p5-Mail-Field-Received/Makefile
+++ b/mail/p5-Mail-Field-Received/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl5 modules for parsing of `Received' headers in e-mails
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mail-Tools>0:mail/p5-Mail-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Tools>0:mail/p5-Mail-Tools
TEST_DEPENDS= p5-Test-Differences>0:devel/p5-Test-Differences
diff --git a/mail/p5-Mail-FilterXML/Makefile b/mail/p5-Mail-FilterXML/Makefile
index 7006a66a0ce3..8a4c161a3c8d 100644
--- a/mail/p5-Mail-FilterXML/Makefile
+++ b/mail/p5-Mail-FilterXML/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module that allows writing mail filter rules in XML
-BUILD_DEPENDS= p5-Mail-Audit>=0:mail/p5-Mail-Audit \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Audit>=0:mail/p5-Mail-Audit \
p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= mailfilter.pl
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index 9476ae4f67da..41069661f1b6 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -12,11 +12,11 @@ DISTNAME= MailFolder-${PORTVERSION}
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module for a folder-independant interface to email folders
-BUILD_DEPENDS= p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Tools>=0:mail/p5-Mail-Tools \
p5-TimeDate>=0:devel/p5-TimeDate \
p5-File-Sync>=0:devel/p5-File-Sync \
p5-MIME-Tools>=0:mail/p5-MIME-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-Freshmeat/Makefile b/mail/p5-Mail-Freshmeat/Makefile
index 69acdf7c7c2e..7f77c0392044 100644
--- a/mail/p5-Mail-Freshmeat/Makefile
+++ b/mail/p5-Mail-Freshmeat/Makefile
@@ -15,8 +15,8 @@ COMMENT= Perl module to parse daily newsletters from freshmeat.net
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mail-Tools>=0:mail/p5-Mail-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Tools>=0:mail/p5-Mail-Tools
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-GnuPG/Makefile b/mail/p5-Mail-GnuPG/Makefile
index 9339a12880a8..406a7b397db4 100644
--- a/mail/p5-Mail-GnuPG/Makefile
+++ b/mail/p5-Mail-GnuPG/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl5 interface to process and/or create PGP email
-BUILD_DEPENDS= p5-GnuPG-Interface>=0:security/p5-GnuPG-Interface \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GnuPG-Interface>=0:security/p5-GnuPG-Interface \
p5-MIME-Tools>=0:mail/p5-MIME-Tools \
p5-Mail-Tools>=0:mail/p5-Mail-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Mail-IMAPTalk/Makefile b/mail/p5-Mail-IMAPTalk/Makefile
index 303169199d41..cf7f5dd65daf 100644
--- a/mail/p5-Mail-IMAPTalk/Makefile
+++ b/mail/p5-Mail-IMAPTalk/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL \
p5-Encode-IMAPUTF7>=0:converters/p5-Encode-IMAPUTF7
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index f6a6aad6529c..59c2d5949acc 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to detect newer messages in procmail-generated mailboxes
-BUILD_DEPENDS= p5-AppConfig>=0:devel/p5-AppConfig
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AppConfig>=0:devel/p5-AppConfig
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-MboxParser/Makefile b/mail/p5-Mail-MboxParser/Makefile
index e506cdaab221..4b30ee594451 100644
--- a/mail/p5-Mail-MboxParser/Makefile
+++ b/mail/p5-Mail-MboxParser/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Module for working with UNIX-flavoured mailboxes
-BUILD_DEPENDS= p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MIME-Tools>=0:mail/p5-MIME-Tools \
p5-Mail-Mbox-MessageParser>=0:mail/p5-Mail-Mbox-MessageParser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-OpenRelay-Simple/Makefile b/mail/p5-Mail-OpenRelay-Simple/Makefile
index 2fe0165d0788..50fb1cdb640b 100644
--- a/mail/p5-Mail-OpenRelay-Simple/Makefile
+++ b/mail/p5-Mail-OpenRelay-Simple/Makefile
@@ -13,9 +13,9 @@ COMMENT= Check if a mail server runs as an open relay
LICENSE= ART10
-BUILD_DEPENDS= p5-Class-Accessor>=0.25:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.25:devel/p5-Class-Accessor \
p5-Net-Telnet>=3.03:net/p5-Net-Telnet
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-RBL/Makefile b/mail/p5-Mail-RBL/Makefile
index 2a7cab301bee..71b4eb6013fc 100644
--- a/mail/p5-Mail-RBL/Makefile
+++ b/mail/p5-Mail-RBL/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension to access RBL-style host verification services
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \
p5-NetAddr-IP>0:net-mgmt/p5-NetAddr-IP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index 091cc8b8dc26..723fa9a6260a 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -15,12 +15,12 @@ COMMENT= Object-oriented implementation of Sender Policy Framework
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Error>=0:lang/p5-Error \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Error>=0:lang/p5-Error \
p5-Net-DNS>=0.62:dns/p5-Net-DNS \
p5-Net-DNS-Resolver-Programmable>=0.003:dns/p5-Net-DNS-Resolver-Programmable \
p5-NetAddr-IP>=4:net-mgmt/p5-NetAddr-IP \
p5-URI>=1.13:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1:devel/p5-Test-Pod
CONFIGURE_ARGS= --install_path sbin=${PREFIX}/sbin
diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile
index 3e8c76a36e97..5ac78d9ad55b 100644
--- a/mail/p5-Mail-SRS/Makefile
+++ b/mail/p5-Mail-SRS/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Sender Rewriting Scheme
-BUILD_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-MLDBM>=0:databases/p5-MLDBM
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 333cae930131..aeb2badc99a4 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Pure Perl implementation of mail spooling, unspooling, and sending
-BUILD_DEPENDS= p5-File-NFSLock>=0:devel/p5-File-NFSLock \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-NFSLock>=0:devel/p5-File-NFSLock \
p5-Mail-Tools>=0:mail/p5-Mail-Tools \
p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-Transport-Dbx/Makefile b/mail/p5-Mail-Transport-Dbx/Makefile
index f5d3b21b6b0c..b7f9941ecac2 100644
--- a/mail/p5-Mail-Transport-Dbx/Makefile
+++ b/mail/p5-Mail-Transport-Dbx/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Mail::Transport::Dbx - Parse Outlook Express mailboxes
-#BUILD_DEPENDS= p5-ExtUtils-Constant>0:devel/p5-ExtUtils-Constant
-#RUN_DEPENDS:= ${BUILD_DEPENDS}
+#BUILD_DEPENDS= ${RUN_DEPENDS}
+#RUN_DEPENDS= p5-ExtUtils-Constant>0:devel/p5-ExtUtils-Constant
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index e49cf3d5c174..bc76f6bba00f 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to verify email addresses
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-Webmail-Gmail/Makefile b/mail/p5-Mail-Webmail-Gmail/Makefile
index b1600dab9160..2956355e647d 100644
--- a/mail/p5-Mail-Webmail-Gmail/Makefile
+++ b/mail/p5-Mail-Webmail-Gmail/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to Google webmail service
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Net-IMAP-Client/Makefile b/mail/p5-Net-IMAP-Client/Makefile
index 9c1395fa0ec5..5c082668f2d1 100644
--- a/mail/p5-Net-IMAP-Client/Makefile
+++ b/mail/p5-Net-IMAP-Client/Makefile
@@ -14,9 +14,9 @@ COMMENT= Not so simple IMAP client library
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Net-IMAP-Server/Makefile b/mail/p5-Net-IMAP-Server/Makefile
index 4bd243c5a3b9..ccee5cf12cb0 100644
--- a/mail/p5-Net-IMAP-Server/Makefile
+++ b/mail/p5-Net-IMAP-Server/Makefile
@@ -13,7 +13,8 @@ COMMENT= Single-threaded multiplexing IMAP server implementation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>0:devel/p5-AnyEvent \
p5-Class-Accessor>0:devel/p5-Class-Accessor \
p5-Coro>0:devel/p5-Coro \
p5-DateTime>0:devel/p5-DateTime \
@@ -27,7 +28,6 @@ BUILD_DEPENDS= p5-AnyEvent>0:devel/p5-AnyEvent \
p5-Net-Server-Coro>=0.6:net/p5-Net-Server-Coro \
p5-Regexp-Common>0:textproc/p5-Regexp-Common \
p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL
NO_ARCH= yes
diff --git a/mail/p5-Net-IMAP-Simple-SSL/Makefile b/mail/p5-Net-IMAP-Simple-SSL/Makefile
index 283b5b7947e3..b8c5f13e96d4 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/Makefile
+++ b/mail/p5-Net-IMAP-Simple-SSL/Makefile
@@ -14,9 +14,9 @@ COMMENT= SSL support for Net::IMAP::Simple
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-Net-IMAP-Simple>=0:mail/p5-Net-IMAP-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Net-IMAP-Simple/Makefile b/mail/p5-Net-IMAP-Simple/Makefile
index 906f3348179f..c3b98a6b0676 100644
--- a/mail/p5-Net-IMAP-Simple/Makefile
+++ b/mail/p5-Net-IMAP-Simple/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl extension for simple IMAP account handling
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:1.20271
diff --git a/mail/p5-Net-ManageSieve/Makefile b/mail/p5-Net-ManageSieve/Makefile
index 813c9fc3f49b..a03b7089bafd 100644
--- a/mail/p5-Net-ManageSieve/Makefile
+++ b/mail/p5-Net-ManageSieve/Makefile
@@ -13,8 +13,8 @@ COMMENT= ManageSieve Protocol Client
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index 3f30adc03faf..c438a4304481 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -15,8 +15,8 @@ COMMENT= Native Perl SMTP Server
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Net-SMTP-TLS/Makefile b/mail/p5-Net-SMTP-TLS/Makefile
index bd253c4431e4..4d1184ebdea8 100644
--- a/mail/p5-Net-SMTP-TLS/Makefile
+++ b/mail/p5-Net-SMTP-TLS/Makefile
@@ -14,10 +14,10 @@ COMMENT= SMTP client supporting TLS and AUTH
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-Net-SSLeay>=0:security/p5-Net-SSLeay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index 4d55e1422962..acd6fc4e0d64 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/p5-POE-Component-Client-POP3/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Implement a POP3 client POE component
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE
USES= perl5 shebangfix
SHEBANG_FILES= samples/test.perl samples/term.perl
diff --git a/mail/p5-POE-Component-Client-SMTP/Makefile b/mail/p5-POE-Component-Client-SMTP/Makefile
index 535fd4373d29..fb47230618ac 100644
--- a/mail/p5-POE-Component-Client-SMTP/Makefile
+++ b/mail/p5-POE-Component-Client-SMTP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= SMTP client POE component
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-POE-Filter-Transparent-SMTP>=0:mail/p5-POE-Filter-Transparent-SMTP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/mail/p5-POE-Component-SMTP/Makefile b/mail/p5-POE-Component-SMTP/Makefile
index 58269ec531c8..893cceceefe4 100644
--- a/mail/p5-POE-Component-SMTP/Makefile
+++ b/mail/p5-POE-Component-SMTP/Makefile
@@ -14,10 +14,10 @@ COMMENT= SMTP Protocol Implementation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-POE-Session-MultiDispatch>=0:devel/p5-POE-Session-MultiDispatch \
p5-Mail-Tools>=0:mail/p5-Mail-Tools
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-POE-Filter-Transparent-SMTP/Makefile b/mail/p5-POE-Filter-Transparent-SMTP/Makefile
index 096599e1596c..2635640d3da8 100644
--- a/mail/p5-POE-Filter-Transparent-SMTP/Makefile
+++ b/mail/p5-POE-Filter-Transparent-SMTP/Makefile
@@ -12,8 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
MAINTAINER= perl@FreeBSD.org
COMMENT= SMTP transparency POE filter
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Parse-Syslog-Mail/Makefile b/mail/p5-Parse-Syslog-Mail/Makefile
index 5d233ac4428b..d0fcee05d45d 100644
--- a/mail/p5-Parse-Syslog-Mail/Makefile
+++ b/mail/p5-Parse-Syslog-Mail/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Parse log messages generated by various MTAs
-BUILD_DEPENDS= p5-Parse-Syslog>=0:textproc/p5-Parse-Syslog
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Parse-Syslog>=0:textproc/p5-Parse-Syslog
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
index ac3294a84fcc..62d7c2f59ddc 100644
--- a/mail/p5-Sendmail-AccessDB/Makefile
+++ b/mail/p5-Sendmail-AccessDB/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Perl5 interface to the Sendmail access.db list
-BUILD_DEPENDS= p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Test-Email/Makefile b/mail/p5-Test-Email/Makefile
index b57b3a8d7446..8f46b3e3ccb3 100644
--- a/mail/p5-Test-Email/Makefile
+++ b/mail/p5-Test-Email/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= matthew@FreeBSD.org
COMMENT= Test Email Contents
-BUILD_DEPENDS= p5-Mail-POP3Client>=2:mail/p5-Mail-POP3Client \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-POP3Client>=2:mail/p5-Mail-POP3Client \
p5-Mail-Sendmail>=0.79:mail/p5-Mail-Sendmail \
p5-MIME-Tools>=5.4:mail/p5-MIME-Tools \
p5-Test-Simple>=0.7:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/mail/p5-URI-imap/Makefile b/mail/p5-URI-imap/Makefile
index 9ee2c7293769..fde8634904e3 100644
--- a/mail/p5-URI-imap/Makefile
+++ b/mail/p5-URI-imap/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= URI::imap - Support IMAP URI
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-URI-imaps/Makefile b/mail/p5-URI-imaps/Makefile
index 554fc442db63..e61089bd3edf 100644
--- a/mail/p5-URI-imaps/Makefile
+++ b/mail/p5-URI-imaps/Makefile
@@ -14,8 +14,8 @@ COMMENT= Support IMAPS URI
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI
NO_ARCH= yes
USES= perl5
diff --git a/mail/p5-WWW-GMail/Makefile b/mail/p5-WWW-GMail/Makefile
index 8945a88eb141..cdb51886c28c 100644
--- a/mail/p5-WWW-GMail/Makefile
+++ b/mail/p5-WWW-GMail/Makefile
@@ -15,9 +15,9 @@ COMMENT= This module simplifies access to gmail
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-WWW-Hotmail/Makefile b/mail/p5-WWW-Hotmail/Makefile
index fd8f6b50c72c..9f186e3dc05a 100644
--- a/mail/p5-WWW-Hotmail/Makefile
+++ b/mail/p5-WWW-Hotmail/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= This module simplifies access to hotmail
-BUILD_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-Mail-Audit>=0:mail/p5-Mail-Audit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile
index c50346a003a0..f01382697302 100644
--- a/mail/p5-qpsmtpd/Makefile
+++ b/mail/p5-qpsmtpd/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= noc-ports@biglist.com
COMMENT= Flexible SMTP daemon written in Perl and featuring a plugin API
-BUILD_DEPENDS= spamd:mail/spamassassin \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= spamd:mail/spamassassin \
p5-Mail-Tools>=0:mail/p5-Mail-Tools \
p5-Net-DNS>=0.39:dns/p5-Net-DNS \
p5-Net-IP>=0:net-mgmt/p5-Net-IP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= MODPERL DOCS EXAMPLES
OPTIONS_DEFAULT=MODPERL
diff --git a/math/p5-AI-Perceptron/Makefile b/math/p5-AI-Perceptron/Makefile
index f2326719ae30..2171209629ef 100644
--- a/math/p5-AI-Perceptron/Makefile
+++ b/math/p5-AI-Perceptron/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module for introducing to internal operations of neural networks
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-accessors>=0:devel/p5-accessors
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-accessors>=0:devel/p5-accessors
USES= perl5
USE_PERL5= modbuild
diff --git a/math/p5-Algorithm-CurveFit/Makefile b/math/p5-Algorithm-CurveFit/Makefile
index 8a97dc9f80f3..e343472665aa 100644
--- a/math/p5-Algorithm-CurveFit/Makefile
+++ b/math/p5-Algorithm-CurveFit/Makefile
@@ -14,9 +14,9 @@ COMMENT= Nonlinear Least Squares Fitting
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-MatrixReal>=0:math/p5-Math-MatrixReal \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-MatrixReal>=0:math/p5-Math-MatrixReal \
p5-Math-Symbolic>=0:math/p5-Math-Symbolic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/math/p5-Algorithm-KMeans/Makefile b/math/p5-Algorithm-KMeans/Makefile
index 5c445bc66523..b103d9a37901 100644
--- a/math/p5-Algorithm-KMeans/Makefile
+++ b/math/p5-Algorithm-KMeans/Makefile
@@ -13,10 +13,10 @@ COMMENT= Clustering multi-dimensional data with a pure-Perl implementation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Graphics-GnuplotIF>=1.4:graphics/p5-Graphics-GnuplotIF \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Graphics-GnuplotIF>=1.4:graphics/p5-Graphics-GnuplotIF \
p5-Math-GSL>=0.26:math/p5-Math-GSL \
p5-Math-Random>=0.71:math/p5-Math-Random
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Bit-Vector/Makefile b/math/p5-Bit-Vector/Makefile
index ae2b11ddbdc9..28390cf6bffc 100644
--- a/math/p5-Bit-Vector/Makefile
+++ b/math/p5-Bit-Vector/Makefile
@@ -13,8 +13,8 @@ COMMENT= Library of advanced math functions that includes a Perl OO module
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Clan>=5.3:devel/p5-Carp-Clan
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>=5.3:devel/p5-Carp-Clan
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-CAD-Calc/Makefile b/math/p5-CAD-Calc/Makefile
index 525c9dbb6b0a..8b6060e64f4b 100644
--- a/math/p5-CAD-Calc/Makefile
+++ b/math/p5-CAD-Calc/Makefile
@@ -14,10 +14,10 @@ COMMENT= Generic cad-related geometry calculations
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Geometry-Planar-Offset>=0:math/p5-Math-Geometry-Planar-Offset \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Geometry-Planar-Offset>=0:math/p5-Math-Geometry-Planar-Offset \
p5-Math-Round-Var>=0:math/p5-Math-Round-Var \
p5-Math-Vec>=0:math/p5-Math-Vec
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/math/p5-Chart-Math-Axis/Makefile b/math/p5-Chart-Math-Axis/Makefile
index 448465e0e500..1332afcaea5f 100644
--- a/math/p5-Chart-Math-Axis/Makefile
+++ b/math/p5-Chart-Math-Axis/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Implements an algorithm to find good values for chart axis
-BUILD_DEPENDS= p5-Params-Util>=0.15:devel/p5-Params-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Util>=0.15:devel/p5-Params-Util
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-GIS-Distance-Fast/Makefile b/math/p5-GIS-Distance-Fast/Makefile
index e092190a6098..f6d0319e49e0 100644
--- a/math/p5-GIS-Distance-Fast/Makefile
+++ b/math/p5-GIS-Distance-Fast/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= C implementation of GIS::Distance formulas
-BUILD_DEPENDS= p5-GIS-Distance>=0.07:math/p5-GIS-Distance
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GIS-Distance>=0.07:math/p5-GIS-Distance
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-GIS-Distance/Makefile b/math/p5-GIS-Distance/Makefile
index 9d566941d00b..df1b0de5aace 100644
--- a/math/p5-GIS-Distance/Makefile
+++ b/math/p5-GIS-Distance/Makefile
@@ -15,12 +15,12 @@ COMMENT= Calculate geographic distances
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Measure>=0:devel/p5-Class-Measure \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Measure>=0:devel/p5-Class-Measure \
p5-Moo>=1.006000:devel/p5-Moo \
p5-Type-Tiny>=1:devel/p5-Type-Tiny \
p5-namespace-clean>=0:devel/p5-namespace-clean \
p5-strictures>=1:devel/p5-strictures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/math/p5-Graph/Makefile b/math/p5-Graph/Makefile
index f0250e57b775..7e01c290642b 100644
--- a/math/p5-Graph/Makefile
+++ b/math/p5-Graph/Makefile
@@ -14,8 +14,8 @@ COMMENT= Graph, the Perl module for graph operations
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Heap>=0:devel/p5-Heap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Heap>=0:devel/p5-Heap
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-BigInt-FastCalc/Makefile b/math/p5-Math-BigInt-FastCalc/Makefile
index f4a4d6bcc597..a44bf5c44c2a 100644
--- a/math/p5-Math-BigInt-FastCalc/Makefile
+++ b/math/p5-Math-BigInt-FastCalc/Makefile
@@ -13,8 +13,8 @@ COMMENT= Math::BigInt::Calc with some XS for more speed
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-BigInt>=1.999812:math/p5-Math-BigInt
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-BigInt>=1.999812:math/p5-Math-BigInt
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-BigInt-GMP/Makefile b/math/p5-Math-BigInt-GMP/Makefile
index 80ca30540c6a..ea0c89d8adc1 100644
--- a/math/p5-Math-BigInt-GMP/Makefile
+++ b/math/p5-Math-BigInt-GMP/Makefile
@@ -13,9 +13,9 @@ COMMENT= Math::BigInt::GMP - Use the GMP library for Math::BigInt routines
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-BigInt>=1.999812:math/p5-Math-BigInt
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-BigInt>=1.999812:math/p5-Math-BigInt
LIB_DEPENDS= libgmp.so:math/gmp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= localbase perl5
diff --git a/math/p5-Math-BigInt-Lite/Makefile b/math/p5-Math-BigInt-Lite/Makefile
index 50c8e16de85d..2b81a7f16370 100644
--- a/math/p5-Math-BigInt-Lite/Makefile
+++ b/math/p5-Math-BigInt-Lite/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Math-BigInt>=1.999812:math/p5-Math-BigInt
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-BigInt>=1.999812:math/p5-Math-BigInt
NO_ARCH= yes
USE_PERL5= configure
diff --git a/math/p5-Math-BigInt-Pari/Makefile b/math/p5-Math-BigInt-Pari/Makefile
index 5ac475d5d8cc..8014f2025970 100644
--- a/math/p5-Math-BigInt-Pari/Makefile
+++ b/math/p5-Math-BigInt-Pari/Makefile
@@ -13,9 +13,9 @@ COMMENT= Use Math::Pari for Math::BigInt routines
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-BigInt>=1.999812:math/p5-Math-BigInt \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-BigInt>=1.999812:math/p5-Math-BigInt \
p5-Math-Pari>=2.010709:math/p5-Math-Pari
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/math/p5-Math-Currency/Makefile b/math/p5-Math-Currency/Makefile
index 4c41c8895dd1..e63906135cc5 100644
--- a/math/p5-Math-Currency/Makefile
+++ b/math/p5-Math-Currency/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Math-FixedPrecision>=0:math/p5-Math-FixedPrecision
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-FixedPrecision>=0:math/p5-Math-FixedPrecision
TEST_DEPENDS= p5-Test-More-UTF8>=0:devel/p5-Test-More-UTF8
NO_ARCH= yes
diff --git a/math/p5-Math-Geometry-Planar-Offset/Makefile b/math/p5-Math-Geometry-Planar-Offset/Makefile
index bbc2c164c9e5..e19560cbbd1b 100644
--- a/math/p5-Math-Geometry-Planar-Offset/Makefile
+++ b/math/p5-Math-Geometry-Planar-Offset/Makefile
@@ -14,8 +14,8 @@ COMMENT= Calculate offset polygons
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-YAML>=0:textproc/p5-YAML
USES= perl5
USE_PERL5= modbuild
diff --git a/math/p5-Math-Geometry-Planar/Makefile b/math/p5-Math-Geometry-Planar/Makefile
index 888950ab72c4..4651ceccc38b 100644
--- a/math/p5-Math-Geometry-Planar/Makefile
+++ b/math/p5-Math-Geometry-Planar/Makefile
@@ -14,9 +14,9 @@ COMMENT= Collection of planar geometry functions
LICENSE= ART10
-BUILD_DEPENDS= p5-Math-Geometry-Planar-GPC>=0:math/p5-Math-Geometry-Planar-GPC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Geometry-Planar-GPC>=0:math/p5-Math-Geometry-Planar-GPC \
p5-Math-Geometry-Planar-Offset>=0:math/p5-Math-Geometry-Planar-Offset
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-Geometry-Voronoi/Makefile b/math/p5-Math-Geometry-Voronoi/Makefile
index 48a23c13662e..66e42916859b 100644
--- a/math/p5-Math-Geometry-Voronoi/Makefile
+++ b/math/p5-Math-Geometry-Voronoi/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl Module to compute Voronoi diagrams from sets of points
-BUILD_DEPENDS= p5-Class-Accessor>=0.18:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.18:devel/p5-Class-Accessor \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-Geometry/Makefile b/math/p5-Math-Geometry/Makefile
index bdcc8275d7c2..5b8bfa589bdb 100644
--- a/math/p5-Math-Geometry/Makefile
+++ b/math/p5-Math-Geometry/Makefile
@@ -14,8 +14,8 @@ COMMENT= Geometry related functions
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Matrix>=0:math/p5-Math-Matrix
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Matrix>=0:math/p5-Math-Matrix
NO_ARCH= yes
USE_PERL5= configure
diff --git a/math/p5-Math-MPC/Makefile b/math/p5-Math-MPC/Makefile
index 5e973f11aea5..198c2add70e4 100644
--- a/math/p5-Math-MPC/Makefile
+++ b/math/p5-Math-MPC/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl interface to MPC Library
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-MPFR>=3.23:math/p5-Math-MPFR
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-MPFR>=3.23:math/p5-Math-MPFR
LIB_DEPENDS= libgmp.so:math/gmp \
libmpc.so:math/mpc \
libmpfr.so:math/mpfr
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= localbase perl5
diff --git a/math/p5-Math-Polygon-Tree/Makefile b/math/p5-Math-Polygon-Tree/Makefile
index b6a1e491ea66..38c7b760a853 100644
--- a/math/p5-Math-Polygon-Tree/Makefile
+++ b/math/p5-Math-Polygon-Tree/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Class for fast check if point is inside polygon
-BUILD_DEPENDS= p5-Test-Simple>=0:devel/p5-Test-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Simple>=0:devel/p5-Test-Simple \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Math-Geometry-Planar-GPC-PolygonXS>=0:math/p5-Math-Geometry-Planar-GPC-PolygonXS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS:= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
USES= perl5
diff --git a/math/p5-Math-Polynomial-Solve/Makefile b/math/p5-Math-Polynomial-Solve/Makefile
index 896b0db9d1d7..87f5629b640f 100644
--- a/math/p5-Math-Polynomial-Solve/Makefile
+++ b/math/p5-Math-Polynomial-Solve/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Math-Utils>=1.06:math/p5-Math-Utils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Utils>=1.06:math/p5-Math-Utils
NO_ARCH= yes
USES= dos2unix perl5
diff --git a/math/p5-Math-Prime-XS/Makefile b/math/p5-Math-Prime-XS/Makefile
index 7b204595cd9b..1ced2d8b14cd 100644
--- a/math/p5-Math-Prime-XS/Makefile
+++ b/math/p5-Math-Prime-XS/Makefile
@@ -13,9 +13,9 @@ COMMENT= Detect and calculate prime numbers with deterministic tests
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-boolean>=0:devel/p5-boolean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.14:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
diff --git a/math/p5-Math-Random-ISAAC/Makefile b/math/p5-Math-Random-ISAAC/Makefile
index cfa0518d830e..46ee36c3ad2a 100644
--- a/math/p5-Math-Random-ISAAC/Makefile
+++ b/math/p5-Math-Random-ISAAC/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
COMMENT= Perl interface to the ISAAC PRNG Algorithm
-BUILD_DEPENDS= p5-Math-Random-ISAAC-XS>0:math/p5-Math-Random-ISAAC-XS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Random-ISAAC-XS>0:math/p5-Math-Random-ISAAC-XS
TEST_DEPENDS= p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
NO_ARCH= yes
diff --git a/math/p5-Math-Random-MT-Auto/Makefile b/math/p5-Math-Random-MT-Auto/Makefile
index 608d2fec35f3..dcce7d82c558 100644
--- a/math/p5-Math-Random-MT-Auto/Makefile
+++ b/math/p5-Math-Random-MT-Auto/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Auto-seeded Mersenne Twister PRNGs
-BUILD_DEPENDS= p5-Exception-Class>=1.32:devel/p5-Exception-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exception-Class>=1.32:devel/p5-Exception-Class \
p5-Object-InsideOut>=3.88:devel/p5-Object-InsideOut
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-libwww>=0:www/p5-libwww
USES= perl5
diff --git a/math/p5-Math-Random-OO/Makefile b/math/p5-Math-Random-OO/Makefile
index 812fd7dd8335..ce133b5657af 100644
--- a/math/p5-Math-Random-OO/Makefile
+++ b/math/p5-Math-Random-OO/Makefile
@@ -13,9 +13,9 @@ COMMENT= Consistent object-oriented interface for generating random numbers
LICENSE= APACHE20
-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-Params-Validate>=0.76:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockRandom>=0.95:devel/p5-Test-MockRandom \
p5-Test-Number-Delta>=0.14:devel/p5-Test-Number-Delta
diff --git a/math/p5-Math-RandomOrg/Makefile b/math/p5-Math-RandomOrg/Makefile
index cb821341d8ae..8fb3c6479239 100644
--- a/math/p5-Math-RandomOrg/Makefile
+++ b/math/p5-Math-RandomOrg/Makefile
@@ -14,8 +14,8 @@ COMMENT= Retrieve random numbers and data from random.org
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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= configure
diff --git a/math/p5-Math-Sequence/Makefile b/math/p5-Math-Sequence/Makefile
index f74df6d30f4e..57845e2ca764 100644
--- a/math/p5-Math-Sequence/Makefile
+++ b/math/p5-Math-Sequence/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl extension dealing with mathematic sequences
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-Series/Makefile b/math/p5-Math-Series/Makefile
index 792d4a8f29cf..86e6bb757912 100644
--- a/math/p5-Math-Series/Makefile
+++ b/math/p5-Math-Series/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl extension dealing with mathematic series
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
p5-Math-Sequence>=0:math/p5-Math-Sequence
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-Spline/Makefile b/math/p5-Math-Spline/Makefile
index 4d16517f8409..2d333a7fea27 100644
--- a/math/p5-Math-Spline/Makefile
+++ b/math/p5-Math-Spline/Makefile
@@ -14,8 +14,8 @@ COMMENT= Cubic Spline Interpolation of data
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Derivative>=0:math/p5-Math-Derivative
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Derivative>=0:math/p5-Math-Derivative
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-Symbolic-Custom-CCompiler/Makefile b/math/p5-Math-Symbolic-Custom-CCompiler/Makefile
index 9f83d0bc5996..f1af7617af35 100644
--- a/math/p5-Math-Symbolic-Custom-CCompiler/Makefile
+++ b/math/p5-Math-Symbolic-Custom-CCompiler/Makefile
@@ -14,10 +14,10 @@ COMMENT= Compile Math::Symbolic trees to C
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Symbolic>=0.509:math/p5-Math-Symbolic \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0.509:math/p5-Math-Symbolic \
p5-Inline>=0.44:devel/p5-Inline \
p5-Inline-C>=0.44:devel/p5-Inline-C
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-Symbolic-Custom-Contains/Makefile b/math/p5-Math-Symbolic-Custom-Contains/Makefile
index 69bb160feced..c513879fd7cf 100644
--- a/math/p5-Math-Symbolic-Custom-Contains/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Contains/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Find subtrees in Math::Symbolic expressions
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
USES= perl5
USE_PERL5= modbuild
diff --git a/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile b/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
index 7fa1bdfd5f35..cb57f829d3ea 100644
--- a/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
+++ b/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Calculate Gaussian Error Propagation
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile b/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile
index 6e717ebc4fa6..afb2e5bda6ec 100644
--- a/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile
+++ b/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Math::Symbolic LaTeX output
-BUILD_DEPENDS= p5-Math-Symbolic>=0.201:math/p5-Math-Symbolic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0.201:math/p5-Math-Symbolic
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-Symbolic-Custom-Pattern/Makefile b/math/p5-Math-Symbolic-Custom-Pattern/Makefile
index cb431b829d10..ff93775041a4 100644
--- a/math/p5-Math-Symbolic-Custom-Pattern/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Pattern/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Pattern matching on Math::Symbolic trees
-BUILD_DEPENDS= p5-Math-Symbolic>=0.510:math/p5-Math-Symbolic \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0.510:math/p5-Math-Symbolic \
p5-Clone>=0:devel/p5-Clone
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.0:devel/p5-Test-Pod-Coverage
diff --git a/math/p5-Math-Symbolic-Custom-Simplification/Makefile b/math/p5-Math-Symbolic-Custom-Simplification/Makefile
index 32fb5b49e1f9..0e94454922df 100644
--- a/math/p5-Math-Symbolic-Custom-Simplification/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Simplification/Makefile
@@ -14,8 +14,8 @@ COMMENT= User defined simplification routines
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-Symbolic/Makefile b/math/p5-Math-Symbolic/Makefile
index c515161a2998..309fb4237f2a 100644
--- a/math/p5-Math-Symbolic/Makefile
+++ b/math/p5-Math-Symbolic/Makefile
@@ -15,8 +15,8 @@ COMMENT= Symbolic calculations
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
USES= perl5 shebangfix
SHEBANG_FILES= compile_yapp_parser.pl
diff --git a/math/p5-Math-SymbolicX-BigNum/Makefile b/math/p5-Math-SymbolicX-BigNum/Makefile
index fb628dea8ff2..cb17a9941ce9 100644
--- a/math/p5-Math-SymbolicX-BigNum/Makefile
+++ b/math/p5-Math-SymbolicX-BigNum/Makefile
@@ -14,9 +14,9 @@ COMMENT= Big number support for the Math::Symbolic parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
p5-Math-SymbolicX-ParserExtensionFactory>=0:math/p5-Math-SymbolicX-ParserExtensionFactory
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-SymbolicX-Complex/Makefile b/math/p5-Math-SymbolicX-Complex/Makefile
index 437b0fd0967e..2a8a510164b1 100644
--- a/math/p5-Math-SymbolicX-Complex/Makefile
+++ b/math/p5-Math-SymbolicX-Complex/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Complex number support for the Math::Symbolic parser
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
p5-Math-SymbolicX-ParserExtensionFactory>=0:math/p5-Math-SymbolicX-ParserExtensionFactory
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-SymbolicX-Error/Makefile b/math/p5-Math-SymbolicX-Error/Makefile
index a826335a93fd..276bf169496a 100644
--- a/math/p5-Math-SymbolicX-Error/Makefile
+++ b/math/p5-Math-SymbolicX-Error/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Parser extension for dealing with numeric errors
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
p5-Math-SymbolicX-ParserExtensionFactory>=0:math/p5-Math-SymbolicX-ParserExtensionFactory \
p5-Number-WithError>=0:math/p5-Number-WithError
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-SymbolicX-Inline/Makefile b/math/p5-Math-SymbolicX-Inline/Makefile
index 80b5195fd960..745250bd49b2 100644
--- a/math/p5-Math-SymbolicX-Inline/Makefile
+++ b/math/p5-Math-SymbolicX-Inline/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Inlined Math::Symbolic functions
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
p5-Math-Symbolic-Custom-Contains>=0:math/p5-Math-Symbolic-Custom-Contains
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-SymbolicX-NoSimplification/Makefile b/math/p5-Math-SymbolicX-NoSimplification/Makefile
index 363267abcae3..4e94500bb917 100644
--- a/math/p5-Math-SymbolicX-NoSimplification/Makefile
+++ b/math/p5-Math-SymbolicX-NoSimplification/Makefile
@@ -14,8 +14,8 @@ COMMENT= Turn off Math::Symbolic simplification
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile b/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
index 732a013f6220..d5ee9859ee14 100644
--- a/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
+++ b/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Generate parser extensions
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile b/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
index 4c07b3e2a932..4e6f9a320034 100644
--- a/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
+++ b/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
@@ -14,9 +14,9 @@ COMMENT= Statistical distributions
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
p5-Math-SymbolicX-ParserExtensionFactory>=0:math/p5-Math-SymbolicX-ParserExtensionFactory
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-LectroTest>=0:devel/p5-Test-LectroTest
USES= perl5
diff --git a/math/p5-Number-WithError-LaTeX/Makefile b/math/p5-Number-WithError-LaTeX/Makefile
index d0dc2ce434f8..558c9e6db44e 100644
--- a/math/p5-Number-WithError-LaTeX/Makefile
+++ b/math/p5-Number-WithError-LaTeX/Makefile
@@ -14,11 +14,11 @@ COMMENT= LaTeX output for Number::WithError
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-prefork>=0:devel/p5-prefork \
p5-Number-WithError>=0:math/p5-Number-WithError \
p5-TeX-Encode>=0:textproc/p5-TeX-Encode
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-LectroTest>=0:devel/p5-Test-LectroTest
USES= perl5
diff --git a/math/p5-Number-WithError/Makefile b/math/p5-Number-WithError/Makefile
index 5e226b57a291..992c538568a6 100644
--- a/math/p5-Number-WithError/Makefile
+++ b/math/p5-Number-WithError/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Numbers with error propagation and scientific rounding
-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-prefork>=0:devel/p5-prefork
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-LectroTest>=0:devel/p5-Test-LectroTest
diff --git a/math/p5-Parse-Range/Makefile b/math/p5-Parse-Range/Makefile
index 99a15ffd29e1..2f7df2c79768 100644
--- a/math/p5-Parse-Range/Makefile
+++ b/math/p5-Parse-Range/Makefile
@@ -15,8 +15,8 @@ COMMENT= Parses range definitions and returns an array
LICENSE= ART10 BSD3CLAUSE
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils
USES= perl5
USE_PERL5= modbuild
diff --git a/math/p5-Set-IntSpan-Fast-XS/Makefile b/math/p5-Set-IntSpan-Fast-XS/Makefile
index 2de391589f2a..f1b65e70d345 100644
--- a/math/p5-Set-IntSpan-Fast-XS/Makefile
+++ b/math/p5-Set-IntSpan-Fast-XS/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Faster Set::IntSpan::Fast
-BUILD_DEPENDS= p5-Data-Swap>=0.07:devel/p5-Data-Swap \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Swap>=0.07:devel/p5-Data-Swap \
p5-Set-IntSpan-Fast>=1.13:math/p5-Set-IntSpan-Fast
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Set-IntSpan-Fast/Makefile b/math/p5-Set-IntSpan-Fast/Makefile
index 8a1cf67c25f2..0096afd4ca16 100644
--- a/math/p5-Set-IntSpan-Fast/Makefile
+++ b/math/p5-Set-IntSpan-Fast/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Fast handling of sets containing integer spans
-BUILD_DEPENDS= p5-Data-Types>=0:devel/p5-Data-Types
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Types>=0:devel/p5-Data-Types
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Statistics-Basic/Makefile b/math/p5-Statistics-Basic/Makefile
index 17abd2ac488b..8515d9add4f5 100644
--- a/math/p5-Statistics-Basic/Makefile
+++ b/math/p5-Statistics-Basic/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Collection of basic statistics modules
-BUILD_DEPENDS= p5-Number-Format>=1.61:textproc/p5-Number-Format
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Number-Format>=1.61:textproc/p5-Number-Format
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Statistics-Contingency/Makefile b/math/p5-Statistics-Contingency/Makefile
index 237b485d14df..001ab60eba0e 100644
--- a/math/p5-Statistics-Contingency/Makefile
+++ b/math/p5-Statistics-Contingency/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Calculate precision, recall, F1, accuracy, etc
-BUILD_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-Statistics-TTest/Makefile b/math/p5-Statistics-TTest/Makefile
index def02e6a2a4c..9c301335e768 100644
--- a/math/p5-Statistics-TTest/Makefile
+++ b/math/p5-Statistics-TTest/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to perform T-test on 2 independent samples
-BUILD_DEPENDS= p5-Statistics-Descriptive>=0:math/p5-Statistics-Descriptive \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Statistics-Descriptive>=0:math/p5-Statistics-Descriptive \
p5-Statistics-Distributions>=0.07:math/p5-Statistics-Distributions
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/math/p5-bignum/Makefile b/math/p5-bignum/Makefile
index ce2ff077082a..22b26575e1ab 100644
--- a/math/p5-bignum/Makefile
+++ b/math/p5-bignum/Makefile
@@ -13,8 +13,8 @@ COMMENT= Transparent BigNumber/BigRational support for Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-BigInt>=1.999812:math/p5-Math-BigInt
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-BigInt>=1.999812:math/p5-Math-BigInt
NO_ARCH= yes
USES= perl5
diff --git a/misc/p5-Array-Compare/Makefile b/misc/p5-Array-Compare/Makefile
index 8cbfd0335b78..d9b1890c7312 100644
--- a/misc/p5-Array-Compare/Makefile
+++ b/misc/p5-Array-Compare/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl extension for comparing arrays
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moo>0:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>0:devel/p5-Moo \
p5-Type-Tiny>0:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
NO_ARCH= yes
diff --git a/misc/p5-Array-Diff/Makefile b/misc/p5-Array-Diff/Makefile
index 17cd4473ab97..c199eb48bab8 100644
--- a/misc/p5-Array-Diff/Makefile
+++ b/misc/p5-Array-Diff/Makefile
@@ -14,9 +14,9 @@ COMMENT= Diff two arrays
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Algorithm-Diff>=1.19:devel/p5-Algorithm-Diff \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Algorithm-Diff>=1.19:devel/p5-Algorithm-Diff \
p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/misc/p5-Bot-Training/Makefile b/misc/p5-Bot-Training/Makefile
index 9dda454b2695..9b57e259782d 100644
--- a/misc/p5-Bot-Training/Makefile
+++ b/misc/p5-Bot-Training/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-Class-Load>=0:devel/p5-Class-Load \
p5-Dir-Self>=0:devel/p5-Dir-Self \
p5-File-ShareDir>=0:devel/p5-File-ShareDir \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-Moose>=0.82:devel/p5-Moose \
p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/misc/p5-Business-EDI/Makefile b/misc/p5-Business-EDI/Makefile
index 6f7472aaf0fd..094894d98d18 100644
--- a/misc/p5-Business-EDI/Makefile
+++ b/misc/p5-Business-EDI/Makefile
@@ -15,12 +15,12 @@ COMMENT= Class for generating EDI objects and subobjects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Exporter-Easy>=0.14:devel/p5-Exporter-Easy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exporter-Easy>=0.14:devel/p5-Exporter-Easy \
p5-File-Find-Rule>=0.32:devel/p5-File-Find-Rule \
p5-JSON-XS>=2.01:converters/p5-JSON-XS \
p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
p5-UNIVERSAL-require>=0.10:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/atz-${PORTNAME}-327e01f
diff --git a/misc/p5-Business-Hours/Makefile b/misc/p5-Business-Hours/Makefile
index 304fdf217dc4..33981db23bbe 100644
--- a/misc/p5-Business-Hours/Makefile
+++ b/misc/p5-Business-Hours/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= matthew@FreeBSD.org
COMMENT= Calculate business hours during a time period
-BUILD_DEPENDS= p5-Set-IntSpan>1.12:math/p5-Set-IntSpan
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Set-IntSpan>1.12:math/p5-Set-IntSpan
TEST_DEPENDS= p5-Test-Pod>-1.0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>0:devel/p5-Test-Pod-Coverage
diff --git a/misc/p5-Business-ISBN/Makefile b/misc/p5-Business-ISBN/Makefile
index c2aaa7f1279a..108838c9beaf 100644
--- a/misc/p5-Business-ISBN/Makefile
+++ b/misc/p5-Business-ISBN/Makefile
@@ -14,8 +14,8 @@ COMMENT= Work with International Standard Book Numbers
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Business-ISBN-Data>=20140910.002:misc/p5-Business-ISBN-Data
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-ISBN-Data>=20140910.002:misc/p5-Business-ISBN-Data
TEST_DEPENDS= p5-GD-Barcode>=0:graphics/p5-GD-Barcode
OPTIONS_DEFINE= BARCODE XISBN
diff --git a/misc/p5-Business-ISIN/Makefile b/misc/p5-Business-ISIN/Makefile
index d22ee01c9f23..03f34687682b 100644
--- a/misc/p5-Business-ISIN/Makefile
+++ b/misc/p5-Business-ISIN/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Validate International Securities Identification Numbers
-BUILD_DEPENDS= p5-Locale-Codes>=0:misc/p5-Locale-Codes
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Locale-Codes>=0:misc/p5-Locale-Codes
USES= perl5 tar:tgz
USE_PERL5= configure
diff --git a/misc/p5-Business-UPS/Makefile b/misc/p5-Business-UPS/Makefile
index a6d2d89ccfc0..9b5663839dd9 100644
--- a/misc/p5-Business-UPS/Makefile
+++ b/misc/p5-Business-UPS/Makefile
@@ -14,8 +14,8 @@ COMMENT= UPS Interface Module
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
NO_ARCH= yes
USES= perl5
diff --git a/misc/p5-Geo-Coder-Bing/Makefile b/misc/p5-Geo-Coder-Bing/Makefile
index a1bf1d5e09d4..974ea6e295ee 100644
--- a/misc/p5-Geo-Coder-Bing/Makefile
+++ b/misc/p5-Geo-Coder-Bing/Makefile
@@ -13,12 +13,12 @@ COMMENT= Geocode addresses with the Bing Maps API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2:converters/p5-JSON \
p5-JSON-XS>=2:converters/p5-JSON-XS \
p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
p5-URI>=1.36:net/p5-URI \
p5-libwww>=6.02:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Geo-Coder-Google/Makefile b/misc/p5-Geo-Coder-Google/Makefile
index e3703b8707fd..12b8cb8d71fc 100644
--- a/misc/p5-Geo-Coder-Google/Makefile
+++ b/misc/p5-Geo-Coder-Google/Makefile
@@ -13,12 +13,12 @@ COMMENT= Google Maps Geocoding API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-JSON>=2.27:converters/p5-JSON \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-URI>=0:net/p5-URI \
p5-libwww>=5.5:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
PORTSCOUT= limit:^[0-9\.]*$$
diff --git a/misc/p5-Geo-Coder-Googlev3/Makefile b/misc/p5-Geo-Coder-Googlev3/Makefile
index d27350d96e7e..cdc0a6ff21f8 100644
--- a/misc/p5-Geo-Coder-Googlev3/Makefile
+++ b/misc/p5-Geo-Coder-Googlev3/Makefile
@@ -13,10 +13,10 @@ COMMENT= Google Maps v3 Geocoding API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Geo-Coder-Mapquest/Makefile b/misc/p5-Geo-Coder-Mapquest/Makefile
index 9859b1609954..11ab03ec07de 100644
--- a/misc/p5-Geo-Coder-Mapquest/Makefile
+++ b/misc/p5-Geo-Coder-Mapquest/Makefile
@@ -14,12 +14,12 @@ COMMENT= Geocode addresses with Mapquest
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2:converters/p5-JSON \
p5-JSON-XS>=2:converters/p5-JSON-XS \
p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
p5-URI>=1.36:net/p5-URI \
p5-libwww>=6.02:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Geo-Coder-Multimap/Makefile b/misc/p5-Geo-Coder-Multimap/Makefile
index 3956e50436c9..d18e6d952acd 100644
--- a/misc/p5-Geo-Coder-Multimap/Makefile
+++ b/misc/p5-Geo-Coder-Multimap/Makefile
@@ -14,11 +14,11 @@ COMMENT= Geocode addresses with the Multimap Open API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2:converters/p5-JSON \
p5-JSON-XS>=2:converters/p5-JSON-XS \
p5-URI>=1.36:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Geo-Coder-Navteq/Makefile b/misc/p5-Geo-Coder-Navteq/Makefile
index b4877194d1d6..816f49e2ae0f 100644
--- a/misc/p5-Geo-Coder-Navteq/Makefile
+++ b/misc/p5-Geo-Coder-Navteq/Makefile
@@ -14,10 +14,10 @@ COMMENT= Geocode addresses with the Navteq MapTP AJAX API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=1.36:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=1.36:net/p5-URI \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Geo-Coder-OSM/Makefile b/misc/p5-Geo-Coder-OSM/Makefile
index 642208d39da6..dec688aafa8e 100644
--- a/misc/p5-Geo-Coder-OSM/Makefile
+++ b/misc/p5-Geo-Coder-OSM/Makefile
@@ -14,11 +14,11 @@ COMMENT= Geocode addresses with the OpenStreetMap Nominatim API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2:converters/p5-JSON \
p5-JSON-XS>=2:converters/p5-JSON-XS \
p5-URI>=1.36:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Geo-Coder-OpenCage/Makefile b/misc/p5-Geo-Coder-OpenCage/Makefile
index 5483d91be85c..382882fb74d5 100644
--- a/misc/p5-Geo-Coder-OpenCage/Makefile
+++ b/misc/p5-Geo-Coder-OpenCage/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-JSON>=2.94:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2.94:converters/p5-JSON \
p5-JSON-XS>=3.04:converters/p5-JSON-XS \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.32:devel/p5-Test-Exception \
p5-Test-Pod>=1.51:devel/p5-Test-Pod \
p5-Test-Warn>=0:devel/p5-Test-Warn
diff --git a/misc/p5-Geo-Coder-Ovi/Makefile b/misc/p5-Geo-Coder-Ovi/Makefile
index 391cbb165aaf..3371c93a0c52 100644
--- a/misc/p5-Geo-Coder-Ovi/Makefile
+++ b/misc/p5-Geo-Coder-Ovi/Makefile
@@ -14,11 +14,11 @@ COMMENT= Geocode addresses with the Ovi Maps API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2:converters/p5-JSON \
p5-JSON-XS>=2:converters/p5-JSON-XS \
p5-URI>=1.36:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Geo-Coder-PlaceFinder/Makefile b/misc/p5-Geo-Coder-PlaceFinder/Makefile
index dab16d7ba960..daa1fea0fca6 100644
--- a/misc/p5-Geo-Coder-PlaceFinder/Makefile
+++ b/misc/p5-Geo-Coder-PlaceFinder/Makefile
@@ -14,11 +14,11 @@ COMMENT= Geocode addresses with Yahoo PlaceFinder
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2:converters/p5-JSON \
p5-JSON-XS>=2:converters/p5-JSON-XS \
p5-URI>=1.36:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Geo-Coder-TomTom/Makefile b/misc/p5-Geo-Coder-TomTom/Makefile
index e7e54b754d19..753320898a8e 100644
--- a/misc/p5-Geo-Coder-TomTom/Makefile
+++ b/misc/p5-Geo-Coder-TomTom/Makefile
@@ -13,12 +13,12 @@ COMMENT= Geocode addresses with the TomTom route planner
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2:converters/p5-JSON \
p5-JSON-XS>=2:converters/p5-JSON-XS \
p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
p5-URI>=1.36:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Geo-GeoNames/Makefile b/misc/p5-Geo-GeoNames/Makefile
index e69fb629a340..29572fd06816 100644
--- a/misc/p5-Geo-GeoNames/Makefile
+++ b/misc/p5-Geo-GeoNames/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perform geographical queries using GeoNames Web Services
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-JSON>=1.14:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=1.14:converters/p5-JSON \
p5-Mojolicious>=0:www/p5-Mojolicious \
p5-XML-Simple>=2.13:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Locale-SubCountry/Makefile b/misc/p5-Locale-SubCountry/Makefile
index d225bfd1053d..906ffb473fd7 100644
--- a/misc/p5-Locale-SubCountry/Makefile
+++ b/misc/p5-Locale-SubCountry/Makefile
@@ -13,8 +13,8 @@ COMMENT= Convert state, province, county etc. names to/from code
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=1:converters/p5-JSON
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=1:converters/p5-JSON
NO_ARCH= yes
USES= dos2unix perl5
diff --git a/misc/p5-Locale-US/Makefile b/misc/p5-Locale-US/Makefile
index ec05f1de3fc9..a2d27b064df7 100644
--- a/misc/p5-Locale-US/Makefile
+++ b/misc/p5-Locale-US/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-Section-Simple>=0:devel/p5-Data-Section-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Section-Simple>=0:devel/p5-Data-Section-Simple
NO_ARCH= yes
USES= perl5
diff --git a/misc/p5-Software-License-CCpack/Makefile b/misc/p5-Software-License-CCpack/Makefile
index 35dd9ecbab23..78c05b786858 100644
--- a/misc/p5-Software-License-CCpack/Makefile
+++ b/misc/p5-Software-License-CCpack/Makefile
@@ -13,8 +13,8 @@ COMMENT= Software::License pack for Creative Commons licenses
LICENSE= LGPL3
-BUILD_DEPENDS= p5-Software-License>=0:misc/p5-Software-License
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Software-License>=0:misc/p5-Software-License
TEST_DEPENDS= p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps
NO_ARCH= yes
diff --git a/misc/p5-Software-License/Makefile b/misc/p5-Software-License/Makefile
index a6c33d6c3b8c..7205c03616b1 100644
--- a/misc/p5-Software-License/Makefile
+++ b/misc/p5-Software-License/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-Section>=0:devel/p5-Data-Section \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Section>=0:devel/p5-Data-Section \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Text-Template>=0:textproc/p5-Text-Template
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Try-Tiny>=0:lang/p5-Try-Tiny
NO_ARCH= yes
diff --git a/misc/p5-asterisk-perl/Makefile b/misc/p5-asterisk-perl/Makefile
index 8f03746478c6..ea191bdc32d1 100644
--- a/misc/p5-asterisk-perl/Makefile
+++ b/misc/p5-asterisk-perl/Makefile
@@ -14,8 +14,8 @@ COMMENT= Asterisk perl library
LICENSE= ART10
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet
NO_ARCH= yes
USES= perl5
diff --git a/multimedia/p5-Audio-M4P/Makefile b/multimedia/p5-Audio-M4P/Makefile
index 692014c110ef..dece4414ca42 100644
--- a/multimedia/p5-Audio-M4P/Makefile
+++ b/multimedia/p5-Audio-M4P/Makefile
@@ -13,10 +13,10 @@ COMMENT= M4P / MP4 / m4a Quicktime audio and video tools
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
p5-Tree-Simple>=0:devel/p5-Tree-Simple \
p5-Tree-Simple-View>=0:devel/p5-Tree-Simple-View
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
USES= perl5
diff --git a/multimedia/p5-FFmpeg-Command/Makefile b/multimedia/p5-FFmpeg-Command/Makefile
index 99851c20235e..b79e19b0b45d 100644
--- a/multimedia/p5-FFmpeg-Command/Makefile
+++ b/multimedia/p5-FFmpeg-Command/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Wrapper class for ffmpeg command line utility
-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-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
p5-IPC-Run>=0:devel/p5-IPC-Run
-RUN_DEPENDS:= ${BUILD_DEPENDS}
RUN_DEPENDS+= ffmpeg:multimedia/ffmpeg
USES= perl5
diff --git a/multimedia/p5-FLV-Info/Makefile b/multimedia/p5-FLV-Info/Makefile
index 4898e67ee409..38397cdcb378 100644
--- a/multimedia/p5-FLV-Info/Makefile
+++ b/multimedia/p5-FLV-Info/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Extract metadata from Flash Video files
-BUILD_DEPENDS= p5-AMF-Perl>=0.15:www/p5-AMF-Perl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AMF-Perl>=0.15:www/p5-AMF-Perl \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Readonly>=0:devel/p5-Readonly \
p5-SWF-File>=0.033:graphics/p5-SWF-File
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/multimedia/p5-MP4-Info/Makefile b/multimedia/p5-MP4-Info/Makefile
index 244f3db2e780..56791bb47f88 100644
--- a/multimedia/p5-MP4-Info/Makefile
+++ b/multimedia/p5-MP4-Info/Makefile
@@ -14,8 +14,8 @@ COMMENT= Fetch info from MPEG-4 files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-String>=0:devel/p5-IO-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-String>=0:devel/p5-IO-String
NO_ARCH= yes
USES= perl5
diff --git a/multimedia/p5-Video-OpenQuicktime/Makefile b/multimedia/p5-Video-OpenQuicktime/Makefile
index c79746f84bd3..c1a6103e658e 100644
--- a/multimedia/p5-Video-OpenQuicktime/Makefile
+++ b/multimedia/p5-Video-OpenQuicktime/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Interface to the OpenQuicktime library
-BUILD_DEPENDS= p5-Inline>=0:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0:devel/p5-Inline \
p5-Inline-C>=0.01:devel/p5-Inline-C
LIB_DEPENDS= libopenquicktime.so:multimedia/openquicktime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
MAKE_JOBS_UNSAFE= yes
diff --git a/net-im/p5-AnyEvent-XMPP/Makefile b/net-im/p5-AnyEvent-XMPP/Makefile
index 0f3533426c8c..920775082aff 100644
--- a/net-im/p5-AnyEvent-XMPP/Makefile
+++ b/net-im/p5-AnyEvent-XMPP/Makefile
@@ -14,14 +14,14 @@ COMMENT= Implementation of the XMPP Protocol
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Authen-SASL>=0:security/p5-Authen-SASL \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-Net-LibIDN>=0:dns/p5-Net-LibIDN \
p5-Object-Event>=0.7:devel/p5-Object-Event \
p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-XML-Writer>=0:textproc/p5-XML-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net-im/p5-DJabberd/Makefile b/net-im/p5-DJabberd/Makefile
index 592bb8eae4c6..dbc9d7df387f 100644
--- a/net-im/p5-DJabberd/Makefile
+++ b/net-im/p5-DJabberd/Makefile
@@ -12,7 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Scalable, extensible Jabber/XMPP server framework
-BUILD_DEPENDS= p5-Danga-Socket>=0:devel/p5-Danga-Socket \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Danga-Socket>=0:devel/p5-Danga-Socket \
p5-XML-SAX>=0:textproc/p5-XML-SAX \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-Net-DNS>=0:dns/p5-Net-DNS \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-Danga-Socket>=0:devel/p5-Danga-Socket \
p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-Unicode-Stringprep>=0:converters/p5-Unicode-Stringprep
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Digest-SHA1>=0:security/p5-Digest-SHA1
PORTSCOUT= limit:^[0-9\.]*$$
diff --git a/net-im/p5-Jabber-Lite/Makefile b/net-im/p5-Jabber-Lite/Makefile
index dced6f66b162..18a4da475352 100644
--- a/net-im/p5-Jabber-Lite/Makefile
+++ b/net-im/p5-Jabber-Lite/Makefile
@@ -15,11 +15,11 @@ COMMENT= Standalone library for communicating with Jabber servers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net-im/p5-Net-Async-XMPP/Makefile b/net-im/p5-Net-Async-XMPP/Makefile
index a62b69542a16..14b160969eb6 100644
--- a/net-im/p5-Net-Async-XMPP/Makefile
+++ b/net-im/p5-Net-Async-XMPP/Makefile
@@ -15,14 +15,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Future>=0.29:devel/p5-Future \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Future>=0.29:devel/p5-Future \
p5-IO-Async>=0.60:devel/p5-IO-Async \
p5-IO-Async-Resolver-DNS>=0.04:dns/p5-IO-Async-Resolver-DNS \
p5-IO-Async-SSL>=0.14:security/p5-IO-Async-SSL \
p5-Mixin-Event-Dispatch>=1:devel/p5-Mixin-Event-Dispatch \
p5-Protocol-XMPP>=0.006:net-im/p5-Protocol-XMPP \
p5-curry>=0:devel/p5-curry
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
p5-Test-Fatal>=0.010:devel/p5-Test-Fatal
diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile
index d3aa86077f2e..d815af153c3f 100644
--- a/net-im/p5-Net-Jabber/Makefile
+++ b/net-im/p5-Net-Jabber/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR= jabber
MAINTAINER= perl@FreeBSD.org
COMMENT= Net::Jabber provides Perl Developer access to the Jabber protocol
-BUILD_DEPENDS= p5-Net-XMPP>=0:net-im/p5-Net-XMPP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-XMPP>=0:net-im/p5-Net-XMPP
USES= perl5
USE_PERL5= configure
diff --git a/net-im/p5-Net-OSCAR/Makefile b/net-im/p5-Net-OSCAR/Makefile
index 48b6b55b18b4..470ed89d82ed 100644
--- a/net-im/p5-Net-OSCAR/Makefile
+++ b/net-im/p5-Net-OSCAR/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for the AOL Instant Messenger OSCAR protocol
-BUILD_DEPENDS= p5-SOCKS>=0:net/p5-Socks \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SOCKS>=0:net/p5-Socks \
p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net-im/p5-Net-Stomp/Makefile b/net-im/p5-Net-Stomp/Makefile
index be6823caffe5..5a63d4cd459f 100644
--- a/net-im/p5-Net-Stomp/Makefile
+++ b/net-im/p5-Net-Stomp/Makefile
@@ -13,8 +13,8 @@ COMMENT= Streaming Text Orientated Messaging Protocol Client
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Fatal>=0:devel/p5-Test-Fatal
diff --git a/net-im/p5-Net-XMPP/Makefile b/net-im/p5-Net-XMPP/Makefile
index dec298e22c2d..c6006bf47acd 100644
--- a/net-im/p5-Net-XMPP/Makefile
+++ b/net-im/p5-Net-XMPP/Makefile
@@ -14,9 +14,9 @@ COMMENT= Net::XMPP provides Perl Developer access to the XMPP protocol
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Authen-SASL>=2.12:security/p5-Authen-SASL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-SASL>=2.12:security/p5-Authen-SASL \
p5-XML-Stream>=1.24:textproc/p5-XML-Stream
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-LWP-Online>=1.07:www/p5-LWP-Online \
p5-YAML-Tiny>=1.41:textproc/p5-YAML-Tiny
diff --git a/net-im/p5-Net-XMPP2/Makefile b/net-im/p5-Net-XMPP2/Makefile
index 51e57dd42171..cfda92a08b0b 100644
--- a/net-im/p5-Net-XMPP2/Makefile
+++ b/net-im/p5-Net-XMPP2/Makefile
@@ -15,7 +15,8 @@ COMMENT= Implementation of the XMPP Protocol
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Authen-SASL>=0:security/p5-Authen-SASL \
p5-BS-Event>=0:devel/p5-BS-Event \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Object-Event>=0:devel/p5-Object-Event \
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/net-im/p5-SOAP-Transport-JABBER/Makefile b/net-im/p5-SOAP-Transport-JABBER/Makefile
index 0f5f91263951..8c498925143e 100644
--- a/net-im/p5-SOAP-Transport-JABBER/Makefile
+++ b/net-im/p5-SOAP-Transport-JABBER/Makefile
@@ -13,9 +13,9 @@ COMMENT= Jabber-based transport backend for SOAP::Lite
LICENSE= ART10
-BUILD_DEPENDS= p5-Net-Jabber>=0:net-im/p5-Net-Jabber \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Jabber>=0:net-im/p5-Net-Jabber \
p5-SOAP-Lite>=0.711:net/p5-SOAP-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/net-mgmt/p5-Data-Validate-IP/Makefile b/net-mgmt/p5-Data-Validate-IP/Makefile
index 6b57034a8264..77cdecb3352a 100644
--- a/net-mgmt/p5-Data-Validate-IP/Makefile
+++ b/net-mgmt/p5-Data-Validate-IP/Makefile
@@ -15,8 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-NetAddr-IP>=4:net-mgmt/p5-NetAddr-IP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-NetAddr-IP>=4:net-mgmt/p5-NetAddr-IP
TEST_DEPENDS= p5-Test-Requires>=0:devel/p5-Test-Requires \
p5-Test-Taint>=0:devel/p5-Test-Taint
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
index e0976ecfa005..005b9145103d 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
@@ -15,12 +15,12 @@ COMMENT= Network discovery support for FusionInventory Agent
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-FusionInventory-Agent>=2.2.0:net-mgmt/p5-FusionInventory-Agent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-FusionInventory-Agent>=2.2.0:net-mgmt/p5-FusionInventory-Agent \
p5-Net-IP>=0:net-mgmt/p5-Net-IP \
p5-Net-NBName>=0:net/p5-Net-NBName \
p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
p5-XML-TreePP>=0.26:textproc/p5-XML-TreePP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile
index 40f87277a274..75d614d300ef 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile
@@ -15,15 +15,12 @@ COMMENT= SNMP support for FusionInventory Agent
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
-DEPRECATED= No longer needed
-EXPIRATION_DATE= 2018-10-22
-
-BUILD_DEPENDS= p5-FusionInventory-Agent>=0:net-mgmt/p5-FusionInventory-Agent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-FusionInventory-Agent>=0:net-mgmt/p5-FusionInventory-Agent \
p5-Net-IP>=0:net-mgmt/p5-Net-IP \
p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
p5-XML-Simple>=0:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net-mgmt/p5-FusionInventory-Agent/Makefile b/net-mgmt/p5-FusionInventory-Agent/Makefile
index 8447ab748370..4d7953728859 100644
--- a/net-mgmt/p5-FusionInventory-Agent/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent/Makefile
@@ -14,13 +14,13 @@ COMMENT= Agent for OCS Inventory server and FusionInventory for GLPI servers
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \
p5-libwww>=0:www/p5-libwww \
p5-Net-IP>=0:net-mgmt/p5-Net-IP \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
p5-Text-Template>=0:textproc/p5-Text-Template \
p5-XML-TreePP>=0:textproc/p5-XML-TreePP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
p5-POE-Component-Client-Ping>=0:net/p5-POE-Component-Client-Ping \
p5-HTTP-Proxy>=0:www/p5-HTTP-Proxy \
diff --git a/net-mgmt/p5-GRNOC-Config/Makefile b/net-mgmt/p5-GRNOC-Config/Makefile
index e1885856042c..70db7f9631bb 100644
--- a/net-mgmt/p5-GRNOC-Config/Makefile
+++ b/net-mgmt/p5-GRNOC-Config/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
COMMENT= Module to allow everyone to access config files
-BUILD_DEPENDS= p5-XML-LibXML>=2:textproc/p5-XML-LibXML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=2:textproc/p5-XML-LibXML \
p5-XML-XPath>=1:textproc/p5-XML-XPath \
p5-XML-Simple>=2:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/net-mgmt/p5-GRNOC-TL1/Makefile b/net-mgmt/p5-GRNOC-TL1/Makefile
index 4f7c76d9d052..8d2b4a0137e8 100644
--- a/net-mgmt/p5-GRNOC-TL1/Makefile
+++ b/net-mgmt/p5-GRNOC-TL1/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
COMMENT= Retrieve data from different models of TL1 devices
-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-Net-SSH-Expect>0:net/p5-Net-SSH-Expect \
p5-Net-Telnet>0:net/p5-Net-Telnet
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net-mgmt/p5-Monitoring-Plugin/Makefile b/net-mgmt/p5-Monitoring-Plugin/Makefile
index d28299bd3411..afeb37340c6d 100644
--- a/net-mgmt/p5-Monitoring-Plugin/Makefile
+++ b/net-mgmt/p5-Monitoring-Plugin/Makefile
@@ -14,11 +14,11 @@ COMMENT= Modules to streamline writing Monitoring plugins
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-Params-Validate>=0:devel/p5-Params-Validate \
p5-Math-Calc-Units>=0:math/p5-Math-Calc-Units \
p5-Config-Tiny>=0:devel/p5-Config-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net-mgmt/p5-Nagios-Object/Makefile b/net-mgmt/p5-Nagios-Object/Makefile
index 06c4c60ee1e9..53ac77fa4fe9 100644
--- a/net-mgmt/p5-Nagios-Object/Makefile
+++ b/net-mgmt/p5-Nagios-Object/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Perl objects to represent Nagios configuration
-BUILD_DEPENDS= p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Exception>=0.31:devel/p5-Test-Exception \
p5-Module-Build>=0.3607:devel/p5-Module-Build \
p5-List-Compare>=0.37:misc/p5-List-Compare \
p5-Test-NoWarnings>=1.01:devel/p5-Test-NoWarnings
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile b/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile
index 9fd45a59f97f..d8bf37b6e1e8 100644
--- a/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= thompsa@FreeBSD.org
COMMENT= Module to check beanstalkd via nagios
-BUILD_DEPENDS= p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
p5-Beanstalk-Client>=0:net/p5-Beanstalk-Client
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile b/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
index 1c6b57f52351..4572ac3caf18 100644
--- a/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
@@ -18,10 +18,10 @@ NO_ARCH= yes
USES= perl5
USE_PERL5= configure
-BUILD_DEPENDS= p5-perl-ldap>=0:net/p5-perl-ldap \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-perl-ldap>=0:net/p5-perl-ldap \
p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
p5-DateTime>=0:devel/p5-DateTime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
post-patch:
@${FIND} ${WRKSRC} -name "*.orig" -delete
diff --git a/net-mgmt/p5-Nagios-Plugin/Makefile b/net-mgmt/p5-Nagios-Plugin/Makefile
index a5e183223756..dd2dfdf22681 100644
--- a/net-mgmt/p5-Nagios-Plugin/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= gjb@FreeBSD.org
COMMENT= Modules to streamline writing Nagios plugins
-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-Params-Validate>=0:devel/p5-Params-Validate \
p5-Math-Calc-Units>=0:math/p5-Math-Calc-Units \
p5-Config-Tiny>=0:devel/p5-Config-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
index 88ede00d4fbc..c721be05fed5 100644
--- a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
+++ b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
@@ -14,10 +14,10 @@ COMMENT= Module to check memcached via nagios
USES= perl5 shebangfix
USE_PERL5= configure
-BUILD_DEPENDS= p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
p5-Carp-Clan>=0:devel/p5-Carp-Clan
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTDOCS= Changes README
diff --git a/net-mgmt/p5-Net-ACL/Makefile b/net-mgmt/p5-Net-ACL/Makefile
index f4e2007efddc..7ff71c345e40 100644
--- a/net-mgmt/p5-Net-ACL/Makefile
+++ b/net-mgmt/p5-Net-ACL/Makefile
@@ -14,10 +14,10 @@ COMMENT= Class representing a generic access-list/route-map
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cisco-Reconfig>=0.05:net-mgmt/p5-Cisco-Reconfig \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cisco-Reconfig>=0.05:net-mgmt/p5-Cisco-Reconfig \
p5-IO-String>=1.02:devel/p5-IO-String \
p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Signature>=1.04:devel/p5-Test-Signature
NO_ARCH= yes
diff --git a/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile b/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile
index 7600f3bdbd22..abb91ec93bb0 100644
--- a/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile
+++ b/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile
@@ -12,8 +12,8 @@ COMMENT= Routines useful for checking data against the spamhaus blacklists
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-DNS>=0.72:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0.72:dns/p5-Net-DNS
USES= perl5
USE_PERL5= configure
diff --git a/net-mgmt/p5-Net-Abuse-Utils/Makefile b/net-mgmt/p5-Net-Abuse-Utils/Makefile
index 46b63aaced48..05c819b67c68 100644
--- a/net-mgmt/p5-Net-Abuse-Utils/Makefile
+++ b/net-mgmt/p5-Net-Abuse-Utils/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Email-Address-XS>=0:mail/p5-Email-Address-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Address-XS>=0:mail/p5-Email-Address-XS \
p5-Net-DNS>=0:dns/p5-Net-DNS \
p5-Net-IP>=0:net-mgmt/p5-Net-IP \
p5-Net-Whois-IP>=1.11:net/p5-Net-Whois-IP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net-mgmt/p5-Net-ILO/Makefile b/net-mgmt/p5-Net-ILO/Makefile
index 7acc68d9fbe1..016c14d9057b 100644
--- a/net-mgmt/p5-Net-ILO/Makefile
+++ b/net-mgmt/p5-Net-ILO/Makefile
@@ -14,9 +14,9 @@ COMMENT= Interface to HP Integrated Lights-Out
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
p5-XML-Simple>0:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/net-mgmt/p5-Net-IPv6Addr/Makefile b/net-mgmt/p5-Net-IPv6Addr/Makefile
index 7a890b117929..0df95d6d5a9d 100644
--- a/net-mgmt/p5-Net-IPv6Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv6Addr/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl extension for manipulating IPv6 addresses
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Base85>=0.2:math/p5-Math-Base85 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Base85>=0.2:math/p5-Math-Base85 \
p5-Net-IPv4Addr>=0.10:net-mgmt/p5-Net-IPv4Addr
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile
index b7668bb3cbd9..a110c180bf85 100644
--- a/net-mgmt/p5-Net-SNMP/Makefile
+++ b/net-mgmt/p5-Net-SNMP/Makefile
@@ -17,10 +17,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Crypt-DES>=0:security/p5-Crypt-DES \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-DES>=0:security/p5-Crypt-DES \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-Digest-HMAC>=0:security/p5-Digest-HMAC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net-mgmt/p5-Net-SNMPTrapd/Makefile b/net-mgmt/p5-Net-SNMPTrapd/Makefile
index bd84d1563e1d..eb8c789556fa 100644
--- a/net-mgmt/p5-Net-SNMPTrapd/Makefile
+++ b/net-mgmt/p5-Net-SNMPTrapd/Makefile
@@ -13,8 +13,8 @@ COMMENT= SNMP Trap Listener in Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Convert-ASN1>=0.22:converters/p5-Convert-ASN1
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Convert-ASN1>=0.22:converters/p5-Convert-ASN1
USES= perl5
USE_PERL5= configure
diff --git a/net-mgmt/p5-NetApp/Makefile b/net-mgmt/p5-NetApp/Makefile
index 689b3b9ba3c4..6dd91fb036b3 100644
--- a/net-mgmt/p5-NetApp/Makefile
+++ b/net-mgmt/p5-NetApp/Makefile
@@ -14,13 +14,13 @@ COMMENT= Perl interface to manage NetApp NAS devices
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Std>=0:devel/p5-Class-Std \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Std>=0:devel/p5-Class-Std \
p5-Clone>=0:devel/p5-Clone \
p5-IPC-Cmd>=0:devel/p5-IPC-Cmd \
p5-Net-Telnet>=0:net/p5-Net-Telnet \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/net-mgmt/p5-POE-Component-SNMP/Makefile b/net-mgmt/p5-POE-Component-SNMP/Makefile
index 049c0932bcee..683f73130ddc 100644
--- a/net-mgmt/p5-POE-Component-SNMP/Makefile
+++ b/net-mgmt/p5-POE-Component-SNMP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Event-driven SNMP interface
-BUILD_DEPENDS= p5-POE>=0.31:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0.31:devel/p5-POE \
p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net-mgmt/p5-Tie-NetAddr-IP/Makefile b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
index 36d378897f6f..0f9540a95ddb 100644
--- a/net-mgmt/p5-Tie-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Tie::NetAddr::IP - Implements a Hash where the key is a subnet
-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/net-p2p/p5-Net-BitTorrent-File/Makefile b/net-p2p/p5-Net-BitTorrent-File/Makefile
index a1e46f3f93ef..1ffb93f177cc 100644
--- a/net-p2p/p5-Net-BitTorrent-File/Makefile
+++ b/net-p2p/p5-Net-BitTorrent-File/Makefile
@@ -15,9 +15,9 @@ COMMENT= Perl5 module for handles loading and saving of .torrent file
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Convert-Bencode>=0:converters/p5-Convert-Bencode \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Convert-Bencode>=0:converters/p5-Convert-Bencode \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net-p2p/p5-Net-DirectConnect/Makefile b/net-p2p/p5-Net-DirectConnect/Makefile
index f5e09da53bbc..f9fe3f0abe9e 100644
--- a/net-p2p/p5-Net-DirectConnect/Makefile
+++ b/net-p2p/p5-Net-DirectConnect/Makefile
@@ -14,7 +14,8 @@ COMMENT= Perl Direct Connect lib and client
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-DBI>=0:databases/p5-DBI \
p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-lib-abs>=0:devel/p5-lib-abs \
p5-MIME-Base32>=0:converters/p5-MIME-Base32 \
p5-Sys-Sendfile-FreeBSD>=0:devel/p5-Sys-Sendfile-FreeBSD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net-p2p/p5-WWW-BitTorrent/Makefile b/net-p2p/p5-WWW-BitTorrent/Makefile
index 077e4253879e..cf5b29086fc5 100644
--- a/net-p2p/p5-WWW-BitTorrent/Makefile
+++ b/net-p2p/p5-WWW-BitTorrent/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Search and Download .torrent(s) files from BitTorrents boards
-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 shebangfix
SHEBANG_FILES= bittorrent.pl
diff --git a/net/p5-Acme-HTTP/Makefile b/net/p5-Acme-HTTP/Makefile
index c447608d5c43..909b60e14697 100644
--- a/net/p5-Acme-HTTP/Makefile
+++ b/net/p5-Acme-HTTP/Makefile
@@ -13,9 +13,9 @@ COMMENT= High-level access to Net::HTTP::NB and Net::HTTPS::NB
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-HTTP>=0:net/p5-Net-HTTP \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-HTTP>=0:net/p5-Net-HTTP \
p5-Net-HTTPS-NB>=0:net/p5-Net-HTTPS-NB
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-Amazon-SQS-Simple/Makefile b/net/p5-Amazon-SQS-Simple/Makefile
index 0e2ee23b7ea1..80261f36c7ca 100644
--- a/net/p5-Amazon-SQS-Simple/Makefile
+++ b/net/p5-Amazon-SQS-Simple/Makefile
@@ -15,11 +15,11 @@ COMMENT= OO API for accessing the Amazon Simple Queue Service
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-URI>=0:net/p5-URI \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-AnyEvent-MQTT/Makefile b/net/p5-AnyEvent-MQTT/Makefile
index 9595953dbe40..d2b39eac8247 100644
--- a/net/p5-AnyEvent-MQTT/Makefile
+++ b/net/p5-AnyEvent-MQTT/Makefile
@@ -15,12 +15,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-MQTT>=0:net/p5-Net-MQTT \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-MQTT>=0:net/p5-Net-MQTT \
p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
p5-Sub-Name>=0:devel/p5-Sub-Name
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Pod-Usage>=0:devel/p5-Pod-Usage
USES= perl5
diff --git a/net/p5-AnyEvent-RabbitMQ/Makefile b/net/p5-AnyEvent-RabbitMQ/Makefile
index dbba798a9ad3..3dd87154a4ad 100644
--- a/net/p5-AnyEvent-RabbitMQ/Makefile
+++ b/net/p5-AnyEvent-RabbitMQ/Makefile
@@ -14,14 +14,14 @@ COMMENT= Asynchronous and multi channel Perl AMQP client
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
p5-File-ShareDir>=0:devel/p5-File-ShareDir \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Net-AMQP>=0.6:net/p5-Net-AMQP \
p5-Readonly>=1.03:devel/p5-Readonly \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/net/p5-AnyEvent-Twitter/Makefile b/net/p5-AnyEvent-Twitter/Makefile
index a53f2f90a869..4d32358f9471 100644
--- a/net/p5-AnyEvent-Twitter/Makefile
+++ b/net/p5-AnyEvent-Twitter/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Implementation of the Twitter API for AnyEvent
-BUILD_DEPENDS= p5-AnyEvent>=5.34:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=5.34:devel/p5-AnyEvent \
p5-AnyEvent-HTTP>=2.12:www/p5-AnyEvent-HTTP \
p5-JSON>=2.53:converters/p5-JSON \
p5-Net-OAuth>=0.27:net/p5-Net-OAuth \
p5-URI>=1.58:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Apache2-SOAP/Makefile b/net/p5-Apache2-SOAP/Makefile
index 7631f4f75e04..871e0d70a4a8 100644
--- a/net/p5-Apache2-SOAP/Makefile
+++ b/net/p5-Apache2-SOAP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= numisemis@yahoo.com
COMMENT= Apache2 mod_perl2 SOAP Server
-BUILD_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
p5-SOAP-Lite>=0:net/p5-SOAP-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= apache:2.2+ perl5
USE_PERL5= configure
diff --git a/net/p5-BBS-Client/Makefile b/net/p5-BBS-Client/Makefile
index 6deb536a1c4b..f4e48bf31d9a 100644
--- a/net/p5-BBS-Client/Makefile
+++ b/net/p5-BBS-Client/Makefile
@@ -15,8 +15,8 @@ COMMENT= Client Module For BBS Systems
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-BBS-UserInfo-Maple3/Makefile b/net/p5-BBS-UserInfo-Maple3/Makefile
index 23e3e3a4c0d7..7aa0e0ab3a23 100644
--- a/net/p5-BBS-UserInfo-Maple3/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3/Makefile
@@ -15,8 +15,8 @@ COMMENT= Get user information of Maple3-style BBS
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Expect>=0:lang/p5-Expect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Expect>=0:lang/p5-Expect
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-BBS-UserInfo-Maple3itoc/Makefile b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
index 9947bec9884f..b7d2230edadc 100644
--- a/net/p5-BBS-UserInfo-Maple3itoc/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
@@ -15,8 +15,8 @@ COMMENT= Get user information of Maple3itoc-style BBS
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Expect>=0:lang/p5-Expect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Expect>=0:lang/p5-Expect
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-BBS-UserInfo-Ptt/Makefile b/net/p5-BBS-UserInfo-Ptt/Makefile
index b50f37ca9c70..700a6cdb5e0f 100644
--- a/net/p5-BBS-UserInfo-Ptt/Makefile
+++ b/net/p5-BBS-UserInfo-Ptt/Makefile
@@ -15,8 +15,8 @@ COMMENT= Get user information of PTT-style BBS
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Expect>=0:lang/p5-Expect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Expect>=0:lang/p5-Expect
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-BBS-UserInfo-SOB/Makefile b/net/p5-BBS-UserInfo-SOB/Makefile
index ac580cd71129..d9d3d7f2162d 100644
--- a/net/p5-BBS-UserInfo-SOB/Makefile
+++ b/net/p5-BBS-UserInfo-SOB/Makefile
@@ -15,8 +15,8 @@ COMMENT= Get user information of SOB-style BBS
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Expect>=0:lang/p5-Expect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Expect>=0:lang/p5-Expect
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-BBS-UserInfo-Wretch/Makefile b/net/p5-BBS-UserInfo-Wretch/Makefile
index 78a90f382749..3170de388215 100644
--- a/net/p5-BBS-UserInfo-Wretch/Makefile
+++ b/net/p5-BBS-UserInfo-Wretch/Makefile
@@ -15,8 +15,8 @@ COMMENT= Get user information of Wretch-style BBS
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Expect>=0:lang/p5-Expect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Expect>=0:lang/p5-Expect
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-Beanstalk-Client/Makefile b/net/p5-Beanstalk-Client/Makefile
index 06967ad5b741..7779efce629c 100644
--- a/net/p5-Beanstalk-Client/Makefile
+++ b/net/p5-Beanstalk-Client/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= vsevolod@FreeBSD.org
COMMENT= Perl API for beanstalkd, a distributed queue daemon
-BUILD_DEPENDS= p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Error>=0:lang/p5-Error
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Daemon-Generic/Makefile b/net/p5-Daemon-Generic/Makefile
index 71f1aaca0471..f88bc8443e9d 100644
--- a/net/p5-Daemon-Generic/Makefile
+++ b/net/p5-Daemon-Generic/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= danilo@FreeBSD.org
COMMENT= Framework to provide start/stop/reload for a daemon
-BUILD_DEPENDS= p5-File-Flock>=0:devel/p5-File-Flock \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Flock>=0:devel/p5-File-Flock \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Event>=0:devel/p5-Event \
p5-Eval-LineNumbers>=0:devel/p5-Eval-LineNumbers
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-EasyTCP/Makefile b/net/p5-EasyTCP/Makefile
index 79fed74451d3..b7f84cf88e24 100644
--- a/net/p5-EasyTCP/Makefile
+++ b/net/p5-EasyTCP/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Easily create TCP/IP clients and servers
-BUILD_DEPENDS= p5-Crypt-RSA>=0:security/p5-Crypt-RSA
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-RSA>=0:security/p5-Crypt-RSA
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Event-tcp/Makefile b/net/p5-Event-tcp/Makefile
index 4e2fe23996f5..1e5cfeb5d461 100644
--- a/net/p5-Event-tcp/Makefile
+++ b/net/p5-Event-tcp/Makefile
@@ -14,9 +14,9 @@ COMMENT= Glue code to build client-server style TCP-based services
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Event>=0:devel/p5-Event \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Event>=0:devel/p5-Event \
p5-Ioctl>=0:devel/p5-Ioctl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-File-Rsync/Makefile b/net/p5-File-Rsync/Makefile
index c2ea2d593c29..18aeac45c9f1 100644
--- a/net/p5-File-Rsync/Makefile
+++ b/net/p5-File-Rsync/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl convenience wrapper for the rsync(1) program
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= rsync:net/rsync \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= rsync:net/rsync \
p5-IPC-Run3>=0.042:devel/p5-IPC-Run3
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Frontier-RPC/Makefile b/net/p5-Frontier-RPC/Makefile
index 1cbb27820003..09a43cff45f7 100644
--- a/net/p5-Frontier-RPC/Makefile
+++ b/net/p5-Frontier-RPC/Makefile
@@ -13,9 +13,9 @@ DISTNAME= ${PORTNAME}-0.07b4
MAINTAINER= perl@FreeBSD.org
COMMENT= Frontier::RPC implements UserLand Software's XML RPC
-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-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Google-SAML-Request/Makefile b/net/p5-Google-SAML-Request/Makefile
index 72b8635c282b..64560f40e1b6 100644
--- a/net/p5-Google-SAML-Request/Makefile
+++ b/net/p5-Google-SAML-Request/Makefile
@@ -13,10 +13,10 @@ COMMENT= Create or parse Google SAML requests
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-URI>0:net/p5-URI \
p5-XML-Simple>0:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/net/p5-Google-SAML-Response/Makefile b/net/p5-Google-SAML-Response/Makefile
index 553e02f7ce3f..05043936f727 100644
--- a/net/p5-Google-SAML-Response/Makefile
+++ b/net/p5-Google-SAML-Response/Makefile
@@ -13,7 +13,8 @@ COMMENT= SAML responses for Google SSO implementation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-OpenSSL-Bignum>=0:security/p5-Crypt-OpenSSL-Bignum \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-OpenSSL-Bignum>=0:security/p5-Crypt-OpenSSL-Bignum \
p5-Crypt-OpenSSL-DSA>=0:security/p5-Crypt-OpenSSL-DSA \
p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
p5-File-Which>=0:sysutils/p5-File-Which \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Crypt-OpenSSL-Bignum>=0:security/p5-Crypt-OpenSSL-Bignum \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-TimeDate>=0:devel/p5-TimeDate \
p5-XML-CanonicalizeXML>=0:textproc/p5-XML-CanonicalizeXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/net/p5-Growl-GNTP/Makefile b/net/p5-Growl-GNTP/Makefile
index 70b1230b753e..0c2b08a97a5d 100644
--- a/net/p5-Growl-GNTP/Makefile
+++ b/net/p5-Growl-GNTP/Makefile
@@ -13,9 +13,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Crypt-CBC>=2.29:security/p5-Crypt-CBC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-CBC>=2.29:security/p5-Crypt-CBC \
p5-Data-UUID>=0.149:devel/p5-Data-UUID
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuildtiny
diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile
index 832f86222239..af3dc3f41c66 100644
--- a/net/p5-IO-Socket-INET6/Makefile
+++ b/net/p5-IO-Socket-INET6/Makefile
@@ -15,8 +15,8 @@ COMMENT= Perl module with object interface to AF_INET6 domain sockets
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Socket6>=0.12:net/p5-Socket6
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Socket6>=0.12:net/p5-Socket6
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-IO-Socket-Multicast6/Makefile b/net/p5-IO-Socket-Multicast6/Makefile
index faf3b2c2fd4b..37ddab8ab488 100644
--- a/net/p5-IO-Socket-Multicast6/Makefile
+++ b/net/p5-IO-Socket-Multicast6/Makefile
@@ -14,11 +14,11 @@ COMMENT= Send and receive IPv4 and IPv6 multicast messages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Interface>=1.01:net/p5-IO-Interface \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Interface>=1.01:net/p5-IO-Interface \
p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
p5-Socket-Multicast6>=0.01:net/p5-Socket-Multicast6 \
p5-Socket6>=0.19:net/p5-Socket6
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/net/p5-IO-Socket-Timeout/Makefile b/net/p5-IO-Socket-Timeout/Makefile
index 2092e9ca90f0..bc61f3a7076c 100644
--- a/net/p5-IO-Socket-Timeout/Makefile
+++ b/net/p5-IO-Socket-Timeout/Makefile
@@ -13,8 +13,8 @@ COMMENT= IO::Socket with read/write timeout
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PerlIO-via-Timeout>=0.32:devel/p5-PerlIO-via-Timeout
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PerlIO-via-Timeout>=0.32:devel/p5-PerlIO-via-Timeout
NO_ARCH= yes
diff --git a/net/p5-IP-Country/Makefile b/net/p5-IP-Country/Makefile
index abca0c6b9f21..07b7c5027fcc 100644
--- a/net/p5-IP-Country/Makefile
+++ b/net/p5-IP-Country/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= dikshie@lapi.itb.ac.id
COMMENT= Fast lookup of country codes from IP addresses
-BUILD_DEPENDS= p5-Geography-Countries>=0:misc/p5-Geography-Countries
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Geography-Countries>=0:misc/p5-Geography-Countries
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Kafka/Makefile b/net/p5-Kafka/Makefile
index 0f0a57b851c5..db14bd01aad5 100644
--- a/net/p5-Kafka/Makefile
+++ b/net/p5-Kafka/Makefile
@@ -15,7 +15,8 @@ COMMENT= Apache Kafka interface for Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Compress-Snappy>=0:archivers/p5-Compress-Snappy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-Snappy>=0:archivers/p5-Compress-Snappy \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-Const-Fast>=0:devel/p5-Const-Fast \
p5-Data-Compare>=0:devel/p5-Data-Compare \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Compress-Snappy>=0:archivers/p5-Compress-Snappy \
p5-Sys-SigAction>=0:devel/p5-Sys-SigAction \
p5-Scalar-Util-Numeric>=0:devel/p5-Scalar-Util-Numeric \
p5-Data-HexDump-Range>=0:devel/p5-Data-HexDump-Range
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-MaxMind-DB-Common/Makefile b/net/p5-MaxMind-DB-Common/Makefile
index 7a3d167156d9..fef02f367048 100644
--- a/net/p5-MaxMind-DB-Common/Makefile
+++ b/net/p5-MaxMind-DB-Common/Makefile
@@ -15,13 +15,13 @@ COMMENT= Code shared by the DB reader and writer modules
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-Dumper-Concise>=0:devel/p5-Data-Dumper-Concise \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Dumper-Concise>=0:devel/p5-Data-Dumper-Concise \
p5-DateTime>=0:devel/p5-DateTime \
p5-List-AllUtils>=0:devel/p5-List-AllUtils \
p5-Moo>=0:devel/p5-Moo \
p5-MooX-StrictConstructor>=0:devel/p5-MooX-StrictConstructor \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-MaxMind-DB-Reader/Makefile b/net/p5-MaxMind-DB-Reader/Makefile
index cfbd74dc5bec..ae36baaa1282 100644
--- a/net/p5-MaxMind-DB-Reader/Makefile
+++ b/net/p5-MaxMind-DB-Reader/Makefile
@@ -14,7 +14,8 @@ COMMENT= Read MaxMind DB files
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-IEEE754>=0:devel/p5-Data-IEEE754 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-IEEE754>=0:devel/p5-Data-IEEE754 \
p5-Data-Printer>=0:devel/p5-Data-Printer \
p5-Data-Validate-IP>=0.25:net-mgmt/p5-Data-Validate-IP \
p5-DateTime>=0:devel/p5-DateTime \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Data-IEEE754>=0:devel/p5-Data-IEEE754 \
p5-MooX-StrictConstructor>=0:devel/p5-MooX-StrictConstructor \
p5-Role-Tiny>=0:devel/p5-Role-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Path-Class>=0.27:devel/p5-Path-Class \
p5-Test-Bits>=0:devel/p5-Test-Bits \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
diff --git a/net/p5-MaxMind-DB-Writer/Makefile b/net/p5-MaxMind-DB-Writer/Makefile
index 83a164b9b9f7..c76941e57d5e 100644
--- a/net/p5-MaxMind-DB-Writer/Makefile
+++ b/net/p5-MaxMind-DB-Writer/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-Dumper-Concise>=0:devel/p5-Data-Dumper-Concise \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Dumper-Concise>=0:devel/p5-Data-Dumper-Concise \
p5-Data-IEEE754>=0:devel/p5-Data-IEEE754 \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-Math-Int128>=0.21:math/p5-Math-Int128 \
@@ -30,7 +31,6 @@ BUILD_DEPENDS= p5-Data-Dumper-Concise>=0:devel/p5-Data-Dumper-Concise \
p5-Sereal-Encoder>=3.002:converters/p5-Sereal-Encoder \
p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Data-Printer>=0:devel/p5-Data-Printer \
p5-Devel-Refcount>=0:devel/p5-Devel-Refcount \
p5-List-AllUtils>=0:devel/p5-List-AllUtils \
diff --git a/net/p5-Net-ACME2/Makefile b/net/p5-Net-ACME2/Makefile
index 5827872e7232..f873eff745c3 100644
--- a/net/p5-Net-ACME2/Makefile
+++ b/net/p5-Net-ACME2/Makefile
@@ -11,7 +11,8 @@ COMMENT= Interface to the Let's Encrypt ACMEv2 API
LICENSE= ART20
-BUILD_DEPENDS= p5-Call-Context>=0.02:devel/p5-Call-Context \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Call-Context>=0.02:devel/p5-Call-Context \
p5-Crypt-Format>=0.06:security/p5-Crypt-Format \
p5-Crypt-Perl>=0.17:security/p5-Crypt-Perl \
p5-Crypt-OpenSSL-Bignum>=0.06:security/p5-Crypt-OpenSSL-Bignum \
@@ -27,7 +28,6 @@ BUILD_DEPENDS= p5-Call-Context>=0.02:devel/p5-Call-Context \
p5-Test-Exception>=0.43:devel/p5-Test-Exception \
p5-Test-NoWarnings>=1.04:devel/p5-Test-NoWarnings \
p5-X-Tiny>=0.13:devel/p5-X-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-AMQP-RabbitMQ/Makefile b/net/p5-Net-AMQP-RabbitMQ/Makefile
index 2d6a1b6ed6a1..7c4e73423972 100644
--- a/net/p5-Net-AMQP-RabbitMQ/Makefile
+++ b/net/p5-Net-AMQP-RabbitMQ/Makefile
@@ -12,8 +12,8 @@ COMMENT= Interact with RabbitMQ over AMQP using librabbitmq
NOT_FOR_ARCHS= mips mips64
NOT_FOR_ARCHS_REASON= Endianness not known
-BUILD_DEPENDS= p5-Math-Int64>0.34:math/p5-Math-Int64
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Int64>0.34:math/p5-Math-Int64
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-AMQP/Makefile b/net/p5-Net-AMQP/Makefile
index 67158de457d7..90cddade1b4e 100644
--- a/net/p5-Net-AMQP/Makefile
+++ b/net/p5-Net-AMQP/Makefile
@@ -14,11 +14,11 @@ COMMENT= Advanced Message Queue Protocol (de)serialization and representation
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-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
USES= perl5
diff --git a/net/p5-Net-Address-Ethernet/Makefile b/net/p5-Net-Address-Ethernet/Makefile
index 0d5ac00d9efa..971e59afc1b6 100644
--- a/net/p5-Net-Address-Ethernet/Makefile
+++ b/net/p5-Net-Address-Ethernet/Makefile
@@ -13,10 +13,10 @@ COMMENT= Find hardware ethernet address
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Env-Path>=0:devel/p5-Env-Path \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Env-Path>=0:devel/p5-Env-Path \
p5-Net-Ifconfig-Wrapper>=0:net/p5-Net-Ifconfig-Wrapper \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-Address-IPv4-Local/Makefile b/net/p5-Net-Address-IPv4-Local/Makefile
index 346c57dd959e..8084c0086afa 100644
--- a/net/p5-Net-Address-IPv4-Local/Makefile
+++ b/net/p5-Net-Address-IPv4-Local/Makefile
@@ -14,8 +14,8 @@ COMMENT= Class for discovering the local system's IP address
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Error>=0:lang/p5-Error
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Error>=0:lang/p5-Error
USES= perl5
USE_PERL5= modbuild
diff --git a/net/p5-Net-Amazon-EC2/Makefile b/net/p5-Net-Amazon-EC2/Makefile
index 2e3f0fbe483a..742e7993597e 100644
--- a/net/p5-Net-Amazon-EC2/Makefile
+++ b/net/p5-Net-Amazon-EC2/Makefile
@@ -13,13 +13,13 @@ COMMENT= Perl interface to the Amazon Elastic Compute Cloud
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
p5-Moose>=0.38:devel/p5-Moose \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-XML-Simple>=2.18:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww \
p5-Test-Exception>=0.31:devel/p5-Test-Exception
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/net/p5-Net-Amazon-MechanicalTurk/Makefile b/net/p5-Net-Amazon-MechanicalTurk/Makefile
index 9538784c5b7b..18ce5142e315 100644
--- a/net/p5-Net-Amazon-MechanicalTurk/Makefile
+++ b/net/p5-Net-Amazon-MechanicalTurk/Makefile
@@ -13,14 +13,14 @@ COMMENT= Perl interface to the Amazon Mechanical Turk
LICENSE= APACHE20
-BUILD_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-IO-String>=0:devel/p5-IO-String \
p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
p5-Net-SSLeay>=1.33:security/p5-Net-SSLeay \
p5-URI>=0:net/p5-URI \
p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-libwww>=6:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
USE_PERL5= configure
diff --git a/net/p5-Net-Amazon-S3/Makefile b/net/p5-Net-Amazon-S3/Makefile
index 0b7d3bf9757e..8d7ab516aed8 100644
--- a/net/p5-Net-Amazon-S3/Makefile
+++ b/net/p5-Net-Amazon-S3/Makefile
@@ -13,7 +13,8 @@ COMMENT= Use the Amazon S3 - Simple Storage Service
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-Stream-Bulk>=0.06:devel/p5-Data-Stream-Bulk \
p5-DateTime-Format-HTTP>=0:devel/p5-DateTime-Format-HTTP \
p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
@@ -32,7 +33,6 @@ BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-VM-EC2-Security-CredentialCache>=0:net/p5-VM-EC2-Security-CredentialCache \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-libwww>=6.03:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-LoadAllModules>=0:devel/p5-Test-LoadAllModules \
p5-Test-MockTime>=0:devel/p5-Test-MockTime \
diff --git a/net/p5-Net-Amazon-Thumbnail/Makefile b/net/p5-Net-Amazon-Thumbnail/Makefile
index a92372d436e0..159bd8a216bb 100644
--- a/net/p5-Net-Amazon-Thumbnail/Makefile
+++ b/net/p5-Net-Amazon-Thumbnail/Makefile
@@ -14,12 +14,12 @@ COMMENT= Perl interface to Amazon Alexa Site Thumbnail web service
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-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-URI>=0:net/p5-URI \
p5-XML-XPath>=0:textproc/p5-XML-XPath \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.15:devel/p5-Test-Exception
USES= perl5
diff --git a/net/p5-Net-Amazon/Makefile b/net/p5-Net-Amazon/Makefile
index 36f33fad844e..7c0e3667221f 100644
--- a/net/p5-Net-Amazon/Makefile
+++ b/net/p5-Net-Amazon/Makefile
@@ -14,11 +14,11 @@ COMMENT= Framework for accessing amazon.com via SOAP and XML/HTTP
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
p5-URI>=0:net/p5-URI \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Appliance-Phrasebook/Makefile b/net/p5-Net-Appliance-Phrasebook/Makefile
index bafdb9163468..7ea59b478956 100644
--- a/net/p5-Net-Appliance-Phrasebook/Makefile
+++ b/net/p5-Net-Appliance-Phrasebook/Makefile
@@ -14,11 +14,11 @@ 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-Data-Phrasebook>=0:textproc/p5-Data-Phrasebook \
p5-Data-Phrasebook-Loader-YAML>=0:textproc/p5-Data-Phrasebook-Loader-YAML \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-Appliance-Session/Makefile b/net/p5-Net-Appliance-Session/Makefile
index a5d2ed3b950a..b0bf0122ab49 100644
--- a/net/p5-Net-Appliance-Session/Makefile
+++ b/net/p5-Net-Appliance-Session/Makefile
@@ -13,14 +13,14 @@ COMMENT= Run command-line sessions to network appliances
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Prompt-Tiny>=0:devel/p5-IO-Prompt-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Prompt-Tiny>=0:devel/p5-IO-Prompt-Tiny \
p5-Moo>=0:devel/p5-Moo \
p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike \
p5-Net-CLI-Interact>=2.300002:net/p5-Net-CLI-Interact \
p5-Term-ReadPassword>=0:devel/p5-Term-ReadPassword \
p5-Text-Glob>=0:textproc/p5-Text-Glob \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-Blogger/Makefile b/net/p5-Net-Blogger/Makefile
index a3cec61f7439..f4c18452931d 100644
--- a/net/p5-Net-Blogger/Makefile
+++ b/net/p5-Net-Blogger/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= OOP-ish interface for accessing a weblog via the XML-RPC API
-BUILD_DEPENDS= p5-Error>=0:lang/p5-Error \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Error>=0:lang/p5-Error \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww \
p5-SOAP-Lite>0.55:net/p5-SOAP-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
USES= perl5
diff --git a/net/p5-Net-CLI-Interact/Makefile b/net/p5-Net-CLI-Interact/Makefile
index de07ba59620f..1ec79d498108 100644
--- a/net/p5-Net-CLI-Interact/Makefile
+++ b/net/p5-Net-CLI-Interact/Makefile
@@ -13,7 +13,8 @@ COMMENT= Toolkit for CLI Automation
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-Class-Mix>=0:devel/p5-Class-Mix \
p5-Config-Any>=0.27:devel/p5-Config-Any \
p5-File-ShareDir>=1:devel/p5-File-ShareDir \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Class-Load>=0:devel/p5-Class-Load \
p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike \
p5-Net-Telnet>=0:net/p5-Net-Telnet \
p5-Path-Class>=0:devel/p5-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/net/p5-Net-CascadeCopy/Makefile b/net/p5-Net-CascadeCopy/Makefile
index d82c0a855ba2..605c1df73530 100644
--- a/net/p5-Net-CascadeCopy/Makefile
+++ b/net/p5-Net-CascadeCopy/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Rapidly propagate files to many servers in multiple locations
-BUILD_DEPENDS= p5-Class-Std-Utils>=v0.0.0:devel/p5-Class-Std-Utils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Std-Utils>=v0.0.0:devel/p5-Class-Std-Utils \
p5-Mouse>=0:devel/p5-Mouse \
p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
p5-Proc-Queue>=0:devel/p5-Proc-Queue
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences
USES= perl5
diff --git a/net/p5-Net-Cassandra-Easy/Makefile b/net/p5-Net-Cassandra-Easy/Makefile
index 77e7859d8f7a..8fb5fb09fce0 100644
--- a/net/p5-Net-Cassandra-Easy/Makefile
+++ b/net/p5-Net-Cassandra-Easy/Makefile
@@ -14,12 +14,12 @@ COMMENT= Perlish interface to the Cassandra database
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-Bit-Vector>=0:math/p5-Bit-Vector \
p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
p5-Modern-Perl>=0:lang/p5-Modern-Perl \
p5-Moose>=0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
USE_PERL5= configure
diff --git a/net/p5-Net-Cassandra/Makefile b/net/p5-Net-Cassandra/Makefile
index a224e8482a33..36339e4952db 100644
--- a/net/p5-Net-Cassandra/Makefile
+++ b/net/p5-Net-Cassandra/Makefile
@@ -14,9 +14,9 @@ COMMENT= Interface to Cassandra
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-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-Net-DAV-Server/Makefile b/net/p5-Net-DAV-Server/Makefile
index ab570af8237b..b93bb4601523 100644
--- a/net/p5-Net-DAV-Server/Makefile
+++ b/net/p5-Net-DAV-Server/Makefile
@@ -12,7 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
MAINTAINER= perl@FreeBSD.org
COMMENT= Provide a DAV Server
-BUILD_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-DBI>=0:databases/p5-DBI \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-File-Find-Rule-Filesys-Virtual>=0:devel/p5-File-Find-Rule-Filesys-Virtual \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-URI>=0:net/p5-URI \
p5-XML-LibXML>=1.62000:textproc/p5-XML-LibXML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/net/p5-Net-Delicious/Makefile b/net/p5-Net-Delicious/Makefile
index 36b8c56b7a5e..4b0016ab64da 100644
--- a/net/p5-Net-Delicious/Makefile
+++ b/net/p5-Net-Delicious/Makefile
@@ -13,7 +13,8 @@ COMMENT= OOP for managing posts on del.icio.us
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-Simple>=2:devel/p5-Config-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Simple>=2:devel/p5-Config-Simple \
p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-IO-stringy>=2.1:devel/p5-IO-stringy \
p5-Log-Dispatch>=2:devel/p5-Log-Dispatch \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Config-Simple>=2:devel/p5-Config-Simple \
p5-XML-Simple>=2:textproc/p5-XML-Simple \
p5-YAML>=0.35:textproc/p5-YAML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-Dropbox-API/Makefile b/net/p5-Net-Dropbox-API/Makefile
index 6743931d1d30..9f8349bccf4a 100644
--- a/net/p5-Net-Dropbox-API/Makefile
+++ b/net/p5-Net-Dropbox-API/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Dropbox API interface
-BUILD_DEPENDS= p5-Data-Random>=0:devel/p5-Data-Random \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Random>=0:devel/p5-Data-Random \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-JSON>=0:converters/p5-JSON \
p5-Mouse>=0:devel/p5-Mouse \
p5-Net-OAuth>=0:net/p5-Net-OAuth \
p5-common-sense>=0:devel/p5-common-sense \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-EPP-Proxy/Makefile b/net/p5-Net-EPP-Proxy/Makefile
index 3d754d1a5926..b067c3bb73cc 100644
--- a/net/p5-Net-EPP-Proxy/Makefile
+++ b/net/p5-Net-EPP-Proxy/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Proxy server for the EPP protocol
-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-IO-Multiplex>=0:devel/p5-IO-Multiplex \
p5-Net-EPP>=0.03:net/p5-Net-EPP \
p5-Net-Server>=0:net/p5-Net-Server \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-EPP/Makefile b/net/p5-Net-EPP/Makefile
index 4c36b790de27..8e2d7c711828 100644
--- a/net/p5-Net-EPP/Makefile
+++ b/net/p5-Net-EPP/Makefile
@@ -13,10 +13,10 @@ COMMENT= Client library for the TCP transport for EPP
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Digest-SHA1>=2.12:security/p5-Digest-SHA1 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-SHA1>=2.12:security/p5-Digest-SHA1 \
p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-FS-Flickr/Makefile b/net/p5-Net-FS-Flickr/Makefile
index cdb70a95e532..32e05e26e766 100644
--- a/net/p5-Net-FS-Flickr/Makefile
+++ b/net/p5-Net-FS-Flickr/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Perl interface for store and retrieve files on Flickr
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-Acme-Steganography-Image-Png>=0:graphics/p5-Acme-Steganography-Image-Png \
p5-Flickr-Upload>=0:www/p5-Flickr-Upload
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/net/p5-Net-FS-Gmail/Makefile b/net/p5-Net-FS-Gmail/Makefile
index 389a062472d3..4ef8f0bdd0d1 100644
--- a/net/p5-Net-FS-Gmail/Makefile
+++ b/net/p5-Net-FS-Gmail/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Perl interface for store and retrieve files on Gmail
-BUILD_DEPENDS= p5-Mail-Webmail-Gmail>=0:mail/p5-Mail-Webmail-Gmail \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Webmail-Gmail>=0:mail/p5-Mail-Webmail-Gmail \
p5-Time-modules>=0:devel/p5-Time-modules \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Frame-Device/Makefile b/net/p5-Net-Frame-Device/Makefile
index f52f4e02e2b1..9953f155e38d 100644
--- a/net/p5-Net-Frame-Device/Makefile
+++ b/net/p5-Net-Frame-Device/Makefile
@@ -11,13 +11,13 @@ COMMENT= Get network device and gateway information
LICENSE= ART10
-BUILD_DEPENDS= p5-Net-Write>=1.05:net/p5-Net-Write \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Write>=1.05:net/p5-Net-Write \
p5-Net-Frame-Dump>=1.08:net/p5-Net-Frame-Dump \
p5-Net-Frame-Simple>=1.07:net/p5-Net-Frame-Simple \
p5-Net-Frame-Layer-IPv6>=1.07:net/p5-Net-Frame-Layer-IPv6 \
p5-Net-Frame-Layer-ICMPv6>=1.09:net/p5-Net-Frame-Layer-ICMPv6 \
p5-Net-Libdnet6>=0.27:net/p5-Net-Libdnet6
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Frame-Dump/Makefile b/net/p5-Net-Frame-Dump/Makefile
index 666ff3c47925..631e74170562 100644
--- a/net/p5-Net-Frame-Dump/Makefile
+++ b/net/p5-Net-Frame-Dump/Makefile
@@ -13,10 +13,10 @@ COMMENT= Tcpdump like perl implementation
LICENSE= ART10
LICENSE_FILE= ${WRKSRC}/LICENSE.Artistic
-BUILD_DEPENDS= p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
p5-Net-Frame>=0:net/p5-Net-Frame \
p5-Net-Pcap>=0.12:net/p5-Net-Pcap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-Frame-Layer-ICMPv6/Makefile b/net/p5-Net-Frame-Layer-ICMPv6/Makefile
index 02c74988d01d..491dd5a640e0 100644
--- a/net/p5-Net-Frame-Layer-ICMPv6/Makefile
+++ b/net/p5-Net-Frame-Layer-ICMPv6/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= spry@anarchy.in.the.ph
COMMENT= Perl encoding/decoding implementation of the ICMPv6 layer
-BUILD_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
p5-Net-Frame>=0:net/p5-Net-Frame \
p5-Net-Pcap>=0.12:net/p5-Net-Pcap \
p5-Class-Gomor>=1.00:devel/p5-Class-Gomor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Frame-Layer-IPv6/Makefile b/net/p5-Net-Frame-Layer-IPv6/Makefile
index 525c264498ab..f54f82982a24 100644
--- a/net/p5-Net-Frame-Layer-IPv6/Makefile
+++ b/net/p5-Net-Frame-Layer-IPv6/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= spry@anarchy.in.the.ph
COMMENT= Perl encoding/decoding implementation of the IPv6 layer
-BUILD_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
p5-Net-Frame>=0:net/p5-Net-Frame \
p5-Net-Pcap>=0.12:net/p5-Net-Pcap \
p5-Class-Gomor>=1.00:devel/p5-Class-Gomor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Frame-Simple/Makefile b/net/p5-Net-Frame-Simple/Makefile
index 734a071ed402..fa3e3ff750ee 100644
--- a/net/p5-Net-Frame-Simple/Makefile
+++ b/net/p5-Net-Frame-Simple/Makefile
@@ -12,9 +12,9 @@ COMMENT= Base framework for frame crafting
LICENSE= ART10
LICENSE_FILE= ${WRKSRC}/LICENSE.Artistic
-BUILD_DEPENDS= p5-Class-Gomor>=1.03:devel/p5-Class-Gomor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Gomor>=1.03:devel/p5-Class-Gomor \
p5-Net-Frame>=1.16:net/p5-Net-Frame
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Frame/Makefile b/net/p5-Net-Frame/Makefile
index c9b7c05983e5..58452b9c51fe 100644
--- a/net/p5-Net-Frame/Makefile
+++ b/net/p5-Net-Frame/Makefile
@@ -13,11 +13,11 @@ COMMENT= Base framework for frame crafting
LICENSE= ART10
LICENSE_FILE= ${WRKSRC}/LICENSE.Artistic
-BUILD_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
p5-Net-IPv6Addr>=0:net-mgmt/p5-Net-IPv6Addr \
p5-Socket6>=0:net/p5-Socket6
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-GitHub/Makefile b/net/p5-Net-GitHub/Makefile
index 1cc0d29e65be..6696b2f0c0e7 100644
--- a/net/p5-Net-GitHub/Makefile
+++ b/net/p5-Net-GitHub/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Cache-LRU>=0:devel/p5-Cache-LRU \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-LRU>=0:devel/p5-Cache-LRU \
p5-HTTP-Message>0:www/p5-HTTP-Message \
p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Cache-LRU>=0:devel/p5-Cache-LRU \
p5-Type-Tiny>=0:devel/p5-Type-Tiny \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-Gnats/Makefile b/net/p5-Net-Gnats/Makefile
index 584d6462abc2..f631c7a21bbb 100644
--- a/net/p5-Net-Gnats/Makefile
+++ b/net/p5-Net-Gnats/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl interface to GNU Gnats daemon
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-strictures>=0:devel/p5-strictures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-strictures>=0:devel/p5-strictures
TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject
NO_ARCH= yes
diff --git a/net/p5-Net-Google-Calendar/Makefile b/net/p5-Net-Google-Calendar/Makefile
index 00337b2e7f1a..b7b76ad6da24 100644
--- a/net/p5-Net-Google-Calendar/Makefile
+++ b/net/p5-Net-Google-Calendar/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mhsin@mhsin.org
COMMENT= Programmatic access to Google's Calendar API
-BUILD_DEPENDS= p5-XML-Atom>=0.37:textproc/p5-XML-Atom \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Atom>=0.37:textproc/p5-XML-Atom \
p5-libwww>=0:www/p5-libwww \
p5-URI>=0:net/p5-URI \
p5-DateTime>=0:devel/p5-DateTime \
p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
p5-Net-Google-AuthSub>=0:net/p5-Net-Google-AuthSub
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/net/p5-Net-Google-DataAPI/Makefile b/net/p5-Net-Google-DataAPI/Makefile
index 045bbfc9234e..a44d079c9ce4 100644
--- a/net/p5-Net-Google-DataAPI/Makefile
+++ b/net/p5-Net-Google-DataAPI/Makefile
@@ -12,7 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
MAINTAINER= gunter@six-two.net
COMMENT= Base implementations for modules to negotiate with Google Data APIs
-BUILD_DEPENDS= p5-Any-Moose>=0.04:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0.04:devel/p5-Any-Moose \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
p5-Lingua-EN-Inflect-Number>=0:textproc/p5-Lingua-EN-Inflect-Number \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Any-Moose>=0.04:devel/p5-Any-Moose \
p5-XML-Atom>=0:textproc/p5-XML-Atom \
p5-libwww>=0:www/p5-libwww \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-MockModule>=0:devel/p5-Test-MockModule \
p5-Test-MockObject>=0:devel/p5-Test-MockObject \
diff --git a/net/p5-Net-Google-PicasaWeb/Makefile b/net/p5-Net-Google-PicasaWeb/Makefile
index f2790207eca3..fc22e52e5dfe 100644
--- a/net/p5-Net-Google-PicasaWeb/Makefile
+++ b/net/p5-Net-Google-PicasaWeb/Makefile
@@ -14,14 +14,14 @@ COMMENT= Use Google Picasa Web API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Prompt>=0:devel/p5-IO-Prompt \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Prompt>=0:devel/p5-IO-Prompt \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Role-Matcher>=0:devel/p5-MooseX-Role-Matcher \
p5-Net-Google-AuthSub>=0:net/p5-Net-Google-AuthSub \
p5-URI>=0:net/p5-URI \
p5-XML-Twig>=3.30:textproc/p5-XML-Twig \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Able>=0.09:devel/p5-Test-Able \
p5-Test-Able-Runner>=1.000:devel/p5-Test-Able-Runner \
p5-Test-Mock-LWP>=0:devel/p5-Test-Mock-LWP
diff --git a/net/p5-Net-Google-SafeBrowsing2/Makefile b/net/p5-Net-Google-SafeBrowsing2/Makefile
index 5396a1c285ec..c06d55fd51b2 100644
--- a/net/p5-Net-Google-SafeBrowsing2/Makefile
+++ b/net/p5-Net-Google-SafeBrowsing2/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ale@biancalanas.net
COMMENT= Perl extension for the Google Safe Browsing v2 API
-BUILD_DEPENDS= p5-libwww>=5:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=5:www/p5-libwww \
p5-URI>=1:net/p5-URI \
p5-Net-IPAddress>=1:net-mgmt/p5-Net-IPAddress \
p5-Text-Trim>=1:textproc/p5-Text-Trim \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-libwww>=5:www/p5-libwww \
p5-String-HexConvert>=0.01:textproc/p5-String-HexConvert \
p5-File-Slurp>9:devel/p5-File-Slurp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= MySQL SQLite Postgres
diff --git a/net/p5-Net-Google-Spreadsheets/Makefile b/net/p5-Net-Google-Spreadsheets/Makefile
index d9713de49bca..a96e9e3600b3 100644
--- a/net/p5-Net-Google-Spreadsheets/Makefile
+++ b/net/p5-Net-Google-Spreadsheets/Makefile
@@ -12,13 +12,13 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
MAINTAINER= gunter@six-two.net
COMMENT= Perl module for using Google Spreadsheets API
-BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-Mouse>=0.51:devel/p5-Mouse \
p5-Net-Google-AuthSub>=0:net/p5-Net-Google-AuthSub \
p5-Net-Google-DataAPI>=0.27:net/p5-Net-Google-DataAPI \
p5-URI>=0:net/p5-URI \
p5-XML-Atom>=0:textproc/p5-XML-Atom
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-MockModule>=0:devel/p5-Test-MockModule \
p5-Test-MockObject>=0:devel/p5-Test-MockObject
diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile
index c6200470bb8c..bdf4f2e6ae25 100644
--- a/net/p5-Net-Google/Makefile
+++ b/net/p5-Net-Google/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple OOP-ish interface to the Google SOAP API
-BUILD_DEPENDS= p5-SOAP-Lite>=0:net/p5-SOAP-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SOAP-Lite>=0:net/p5-SOAP-Lite
USES= perl5
USE_PERL5= modbuild
diff --git a/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile b/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile
index 30b261b57b94..5509d1354d7c 100644
--- a/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile
+++ b/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile
@@ -14,9 +14,9 @@ COMMENT= Spore Middleware to add header on each request
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-Net-HTTP-Spore>=0:net/p5-Net-HTTP-Spore
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/net/p5-Net-HTTP-Spore/Makefile b/net/p5-Net-HTTP-Spore/Makefile
index de6b5e220cf5..aaa4074ff4f9 100644
--- a/net/p5-Net-HTTP-Spore/Makefile
+++ b/net/p5-Net-HTTP-Spore/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-HTTP-Message>=0:www/p5-HTTP-Message \
p5-IO-All>=0:devel/p5-IO-All \
p5-JSON>=0:converters/p5-JSON \
@@ -27,7 +28,6 @@ BUILD_DEPENDS= p5-Class-Load>=0:devel/p5-Class-Load \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-YAML>=0:textproc/p5-YAML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/net/p5-Net-HTTP/Makefile b/net/p5-Net-HTTP/Makefile
index 7abc59b55ed9..653031b62b11 100644
--- a/net/p5-Net-HTTP/Makefile
+++ b/net/p5-Net-HTTP/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-IO-Socket-SSL>=1.38:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=1.38:security/p5-IO-Socket-SSL \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-HTTPS-Any/Makefile b/net/p5-Net-HTTPS-Any/Makefile
index 8e0304f4d7a8..60825ccd74f1 100644
--- a/net/p5-Net-HTTPS-Any/Makefile
+++ b/net/p5-Net-HTTPS-Any/Makefile
@@ -13,10 +13,10 @@ COMMENT= Simple HTTPS class using whichever underlying SSL module is available
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
p5-URI>=0:net/p5-URI \
p5-Net-SSLeay>=1.30:security/p5-Net-SSLeay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-HTTPS-NB/Makefile b/net/p5-Net-HTTPS-NB/Makefile
index 61c663f2dd3b..15d86360dee8 100644
--- a/net/p5-Net-HTTPS-NB/Makefile
+++ b/net/p5-Net-HTTPS-NB/Makefile
@@ -13,9 +13,9 @@ COMMENT= Non-blocking HTTPS client
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>=0.98:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=0.98:security/p5-IO-Socket-SSL \
p5-Net-HTTP>=0:net/p5-Net-HTTP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-Net-INET6Glue/Makefile b/net/p5-Net-INET6Glue/Makefile
index efb12c1526d8..acf5c4a6591c 100644
--- a/net/p5-Net-INET6Glue/Makefile
+++ b/net/p5-Net-INET6Glue/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ume@FreeBSD.org
COMMENT= Make common modules IPv6 ready by hotpatching
-BUILD_DEPENDS= p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-IP-RangeCompare/Makefile b/net/p5-Net-IP-RangeCompare/Makefile
index 5a8f96e5d783..f1ea980082e3 100644
--- a/net/p5-Net-IP-RangeCompare/Makefile
+++ b/net/p5-Net-IP-RangeCompare/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl extension for IP Range Comparisons
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-IPV4-Range-Parse>=0.05:net/p5-Data-IPV4-Range-Parse \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-IPV4-Range-Parse>=0.05:net/p5-Data-IPV4-Range-Parse \
p5-Data-Range-Compare>=1.030:devel/p5-Data-Range-Compare
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-Net-IPTrie/Makefile b/net/p5-Net-IPTrie/Makefile
index 2874d2366c1b..892679210ae9 100644
--- a/net/p5-Net-IPTrie/Makefile
+++ b/net/p5-Net-IPTrie/Makefile
@@ -14,8 +14,8 @@ COMMENT= Module for building IPv4 and IPv6 address space hierarchies
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-NetAddr-IP>=4.00.7:net-mgmt/p5-NetAddr-IP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-NetAddr-IP>=4.00.7:net-mgmt/p5-NetAddr-IP
USES= perl5
USE_PERL5= modbuild
diff --git a/net/p5-Net-Jifty/Makefile b/net/p5-Net-Jifty/Makefile
index 7e4ef4283b83..1abb836fed4e 100644
--- a/net/p5-Net-Jifty/Makefile
+++ b/net/p5-Net-Jifty/Makefile
@@ -14,7 +14,8 @@ COMMENT= Perl interface to online Jifty applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>=0.04:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0.04:devel/p5-Any-Moose \
p5-DateTime>=0:devel/p5-DateTime \
p5-Email-Address>=0:mail/p5-Email-Address \
p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Any-Moose>=0.04:devel/p5-Any-Moose \
p5-URI>=0:net/p5-URI \
p5-YAML>=0:textproc/p5-YAML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject
USES= perl5
diff --git a/net/p5-Net-LDAP-Express/Makefile b/net/p5-Net-LDAP-Express/Makefile
index adf7815afde9..57bdd0c63035 100644
--- a/net/p5-Net-LDAP-Express/Makefile
+++ b/net/p5-Net-LDAP-Express/Makefile
@@ -14,8 +14,8 @@ COMMENT= Module to simplify connecting up to a LDAP server
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-perl-ldap>=0.23:net/p5-perl-ldap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-perl-ldap>=0.23:net/p5-perl-ldap
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-LDAP-Server/Makefile b/net/p5-Net-LDAP-Server/Makefile
index c88fdae45d7d..05524474ceac 100644
--- a/net/p5-Net-LDAP-Server/Makefile
+++ b/net/p5-Net-LDAP-Server/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
COMMENT= Perl module for LDAP server side protocol handling
-BUILD_DEPENDS= p5-Convert-ASN1>=0.22:converters/p5-Convert-ASN1 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Convert-ASN1>=0.22:converters/p5-Convert-ASN1 \
p5-perl-ldap>=0.39:net/p5-perl-ldap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Libdnet/Makefile b/net/p5-Net-Libdnet/Makefile
index 4c5d585a1f21..5f0a39045f8f 100644
--- a/net/p5-Net-Libdnet/Makefile
+++ b/net/p5-Net-Libdnet/Makefile
@@ -13,9 +13,9 @@ COMMENT= Libdnet interface
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= p5-Class-Gomor>=0:devel/p5-Class-Gomor
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Gomor>=0:devel/p5-Class-Gomor
LIB_DEPENDS= libdnet.so:net/libdnet
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFIGURE_ARGS= INC='-I${LOCALBASE}/include'
USES= perl5
diff --git a/net/p5-Net-Libdnet6/Makefile b/net/p5-Net-Libdnet6/Makefile
index f74606b1a353..38f2a8c5e36b 100644
--- a/net/p5-Net-Libdnet6/Makefile
+++ b/net/p5-Net-Libdnet6/Makefile
@@ -11,9 +11,9 @@ COMMENT= Add IPv6 support to Net::Libdnet
LICENSE= ART10
-BUILD_DEPENDS= p5-Net-Libdnet>=0.98:net/p5-Net-Libdnet \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Libdnet>=0.98:net/p5-Net-Libdnet \
p5-Net-IPv6Addr>=0.2:net-mgmt/p5-Net-IPv6Addr
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-LimeLight-Purge/Makefile b/net/p5-Net-LimeLight-Purge/Makefile
index 080792aec706..94726f93033f 100644
--- a/net/p5-Net-LimeLight-Purge/Makefile
+++ b/net/p5-Net-LimeLight-Purge/Makefile
@@ -14,11 +14,11 @@ COMMENT= LimeLight Purge Service API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime-Format-ISO8601>=0.06:devel/p5-DateTime-Format-ISO8601 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime-Format-ISO8601>=0.06:devel/p5-DateTime-Format-ISO8601 \
p5-Moose>=0.72:devel/p5-Moose \
p5-MooseX-AttributeHelpers>=0.14:devel/p5-MooseX-AttributeHelpers \
p5-SOAP-Lite>=0.710.08:net/p5-SOAP-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-Net-MAC-Vendor/Makefile b/net/p5-Net-MAC-Vendor/Makefile
index d7661a09af25..c5b2b6e5b514 100644
--- a/net/p5-Net-MAC-Vendor/Makefile
+++ b/net/p5-Net-MAC-Vendor/Makefile
@@ -15,8 +15,8 @@ COMMENT= Look up the vendor for a MAC
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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= configure
diff --git a/net/p5-Net-MQTT/Makefile b/net/p5-Net-MQTT/Makefile
index b506df13a87e..276039ebfaeb 100644
--- a/net/p5-Net-MQTT/Makefile
+++ b/net/p5-Net-MQTT/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
p5-Net-Pcap>=0:net/p5-Net-Pcap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Pod-Usage>=0:devel/p5-Pod-Usage
USES= perl5
diff --git a/net/p5-Net-Mosso-CloudFiles/Makefile b/net/p5-Net-Mosso-CloudFiles/Makefile
index 07c745b771a9..1b5fdf935486 100644
--- a/net/p5-Net-Mosso-CloudFiles/Makefile
+++ b/net/p5-Net-Mosso-CloudFiles/Makefile
@@ -14,7 +14,8 @@ COMMENT= Perl interface to the Mosso CloudFiles service
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-Data-Stream-Bulk>=0:devel/p5-Data-Stream-Bulk \
p5-DateTime-Format-HTTP>=0:devel/p5-DateTime-Format-HTTP \
p5-Digest-MD5-File>=0:security/p5-Digest-MD5-File \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/net/p5-Net-MovableType/Makefile b/net/p5-Net-MovableType/Makefile
index f472514b0854..af9858377a3c 100644
--- a/net/p5-Net-MovableType/Makefile
+++ b/net/p5-Net-MovableType/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Lightweight MovableType client Perl module
-BUILD_DEPENDS= p5-SOAP-Lite>=0:net/p5-SOAP-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SOAP-Lite>=0:net/p5-SOAP-Lite
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-NBsocket/Makefile b/net/p5-Net-NBsocket/Makefile
index f4abbfb752b0..66021ce4738d 100644
--- a/net/p5-Net-NBsocket/Makefile
+++ b/net/p5-Net-NBsocket/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Non-Blocking Sockets
-BUILD_DEPENDS= p5-NetAddr-IP>=4.049:net-mgmt/p5-NetAddr-IP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-NetAddr-IP>=4.049:net-mgmt/p5-NetAddr-IP
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Nessus-XMLRPC/Makefile b/net/p5-Net-Nessus-XMLRPC/Makefile
index da5d849e6c04..829eb861d2c0 100644
--- a/net/p5-Net-Nessus-XMLRPC/Makefile
+++ b/net/p5-Net-Nessus-XMLRPC/Makefile
@@ -15,11 +15,11 @@ COMMENT= Perl5 interface for communication with Nessus scanner over XMLRPC
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-OAuth-Simple/Makefile b/net/p5-Net-OAuth-Simple/Makefile
index 75eac297f352..d6e18c99db30 100644
--- a/net/p5-Net-OAuth-Simple/Makefile
+++ b/net/p5-Net-OAuth-Simple/Makefile
@@ -13,12 +13,12 @@ COMMENT= Simple wrapper around the OAuth protocol
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-SSLeay>=0.57:security/p5-Crypt-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-SSLeay>=0.57:security/p5-Crypt-SSLeay \
p5-libwww>=5.825:www/p5-libwww \
p5-Net-OAuth>=0.27:net/p5-Net-OAuth \
p5-URI>=1.37:net/p5-URI \
p5-Test-Simple>=0.86:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-OAuth/Makefile b/net/p5-Net-OAuth/Makefile
index f0ebb21c94e1..93e1dd6d8e7b 100644
--- a/net/p5-Net-OAuth/Makefile
+++ b/net/p5-Net-OAuth/Makefile
@@ -14,11 +14,11 @@ COMMENT= Implementation of the OAuth protocol
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0.31:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.31:devel/p5-Class-Accessor \
p5-Class-Data-Inheritable>=0.06:devel/p5-Class-Data-Inheritable \
p5-Digest-HMAC>=1.01:security/p5-Digest-HMAC \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Warn>=0.21:devel/p5-Test-Warn
USE_PERL5= modbuild
diff --git a/net/p5-Net-OAuth2/Makefile b/net/p5-Net-OAuth2/Makefile
index a1d0180c777a..d6e695f1348e 100644
--- a/net/p5-Net-OAuth2/Makefile
+++ b/net/p5-Net-OAuth2/Makefile
@@ -13,11 +13,11 @@ COMMENT= OAuth 2.0 for Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-JSON>=0:converters/p5-JSON \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Mock-LWP-Dispatch>=0:devel/p5-Test-Mock-LWP-Dispatch \
p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-Test-Pod>=1.22:devel/p5-Test-Pod \
diff --git a/net/p5-Net-OpenID-Consumer/Makefile b/net/p5-Net-OpenID-Consumer/Makefile
index 8f44e5826524..4264dbb72d44 100644
--- a/net/p5-Net-OpenID-Consumer/Makefile
+++ b/net/p5-Net-OpenID-Consumer/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-JSON>=0:converters/p5-JSON \
p5-Net-OpenID-Common>=1.18:security/p5-Net-OpenID-Common \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CGI>=0:www/p5-CGI
NO_ARCH= yes
diff --git a/net/p5-Net-OpenSSH-Parallel/Makefile b/net/p5-Net-OpenSSH-Parallel/Makefile
index c2fecb11da30..93511ae3ffc7 100644
--- a/net/p5-Net-OpenSSH-Parallel/Makefile
+++ b/net/p5-Net-OpenSSH-Parallel/Makefile
@@ -13,8 +13,8 @@ COMMENT= Run SSH jobs in parallel
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-OpenSSH>=0.39:net/p5-Net-OpenSSH
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-OpenSSH>=0.39:net/p5-Net-OpenSSH
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-Net-OpenSSH/Makefile b/net/p5-Net-OpenSSH/Makefile
index bbdf1de71d32..c74f5bd1ff88 100644
--- a/net/p5-Net-OpenSSH/Makefile
+++ b/net/p5-Net-OpenSSH/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl SSH client package implemented on top of OpenSSH
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Tty>=0:devel/p5-IO-Tty
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Tty>=0:devel/p5-IO-Tty
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-OpenStack-Attack/Makefile b/net/p5-Net-OpenStack-Attack/Makefile
index 2ab3a3d7f63b..45ab72a15fd2 100644
--- a/net/p5-Net-OpenStack-Attack/Makefile
+++ b/net/p5-Net-OpenStack-Attack/Makefile
@@ -13,13 +13,13 @@ COMMENT= Tools for stress testing an OpenStack deployment
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-App-Rad>=0:devel/p5-App-Rad \
p5-HTTP-Async>=0:www/p5-HTTP-Async \
p5-JSON>=0:converters/p5-JSON \
p5-Net-HTTPS-NB>=0:net/p5-Net-HTTPS-NB \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-Net-Packet-Target/Makefile b/net/p5-Net-Packet-Target/Makefile
index 7bd1b847ca0e..7e67fbb4def1 100644
--- a/net/p5-Net-Packet-Target/Makefile
+++ b/net/p5-Net-Packet-Target/Makefile
@@ -14,9 +14,9 @@ COMMENT= Target object for all Net-Packet related stuff
LICENSE= ART10
LICENSE_FILE= ${WRKSRC}/LICENSE.Artistic
-BUILD_DEPENDS= p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
p5-Net-Packet>=3.00:net/p5-Net-Packet
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Packet/Makefile b/net/p5-Net-Packet/Makefile
index c36c6968e8c9..0d8bd147c99d 100644
--- a/net/p5-Net-Packet/Makefile
+++ b/net/p5-Net-Packet/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= netpkt@gomor.org
COMMENT= Send and receive frames from layer 2 to layer 7
-BUILD_DEPENDS= p5-Bit-Vector>=6.4:math/p5-Bit-Vector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bit-Vector>=6.4:math/p5-Bit-Vector \
p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
p5-Net-IPv6Addr>=0.2:net-mgmt/p5-Net-IPv6Addr \
p5-Net-Libdnet>=0.01:net/p5-Net-Libdnet \
p5-Net-Write>=1.00:net/p5-Net-Write \
p5-Net-Pcap>=0.14:net/p5-Net-Pcap \
p5-Socket6>=0.19:net/p5-Socket6
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile
index 352085d004b0..7fb919b7db9b 100644
--- a/net/p5-Net-Pcap/Makefile
+++ b/net/p5-Net-Pcap/Makefile
@@ -13,8 +13,8 @@ COMMENT= Interface to pcap(3) LBL packet capture library
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Interface>=0:net/p5-IO-Interface
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Interface>=0:net/p5-IO-Interface
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/net/p5-Net-PcapUtils/Makefile b/net/p5-Net-PcapUtils/Makefile
index 8a575d25060e..75c5aaa27706 100644
--- a/net/p5-Net-PcapUtils/Makefile
+++ b/net/p5-Net-PcapUtils/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Utility routines for Net::Pcap module
-BUILD_DEPENDS= p5-Net-Pcap>=0:net/p5-Net-Pcap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Pcap>=0:net/p5-Net-Pcap
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-PubSubHubbub-Publisher/Makefile b/net/p5-Net-PubSubHubbub-Publisher/Makefile
index fd37a72e2f66..2d2a8c90c0b8 100644
--- a/net/p5-Net-PubSubHubbub-Publisher/Makefile
+++ b/net/p5-Net-PubSubHubbub-Publisher/Makefile
@@ -14,8 +14,8 @@ COMMENT= Client library to ping a PubSubHubbub hub
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-Net-RTP/Makefile b/net/p5-Net-RTP/Makefile
index 501c0733ea90..fe561354632b 100644
--- a/net/p5-Net-RTP/Makefile
+++ b/net/p5-Net-RTP/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Send and receive RTP packets (RFC3550)
-BUILD_DEPENDS= p5-IO-Socket-Multicast6>=0.02:net/p5-IO-Socket-Multicast6 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-Multicast6>=0.02:net/p5-IO-Socket-Multicast6 \
p5-IO-Socket-Multicast>=1.00:net/p5-IO-Socket-Multicast \
p5-IO-Socket-INET6>=1.20:net/p5-IO-Socket-INET6 \
p5-Socket6>=0.19:net/p5-Socket6
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/net/p5-Net-RabbitFoot/Makefile b/net/p5-Net-RabbitFoot/Makefile
index ad492983aa46..710950a635ee 100644
--- a/net/p5-Net-RabbitFoot/Makefile
+++ b/net/p5-Net-RabbitFoot/Makefile
@@ -14,7 +14,8 @@ COMMENT= Synchronous interface to AnyEvent::RabbitMQ
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent-RabbitMQ>=0:net/p5-AnyEvent-RabbitMQ \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent-RabbitMQ>=0:net/p5-AnyEvent-RabbitMQ \
p5-Config-Any>=0:devel/p5-Config-Any \
p5-Coro>=0:devel/p5-Coro \
p5-JSON-XS>=0:converters/p5-JSON-XS \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-AnyEvent-RabbitMQ>=0:net/p5-AnyEvent-RabbitMQ \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-App-Cmd>=0:devel/p5-MooseX-App-Cmd \
p5-MooseX-ConfigFromFile>=0:devel/p5-MooseX-ConfigFromFile
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/net/p5-Net-Random/Makefile b/net/p5-Net-Random/Makefile
index 76759f3b0bc4..ea5c9f35333e 100644
--- a/net/p5-Net-Random/Makefile
+++ b/net/p5-Net-Random/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl5 module to get random data from online sources
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject
PORTSCOUT= skipv:2.21,2.22
diff --git a/net/p5-Net-Rendezvous-Publish/Makefile b/net/p5-Net-Rendezvous-Publish/Makefile
index d4f6de78d08c..0c9a8362dfaa 100644
--- a/net/p5-Net-Rendezvous-Publish/Makefile
+++ b/net/p5-Net-Rendezvous-Publish/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= Publish Rendezvous services
-BUILD_DEPENDS= p5-Class-Accessor-Lvalue>=0:devel/p5-Class-Accessor-Lvalue
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Lvalue>=0:devel/p5-Class-Accessor-Lvalue
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Riak/Makefile b/net/p5-Net-Riak/Makefile
index 0084402acab0..c888e8ecd415 100644
--- a/net/p5-Net-Riak/Makefile
+++ b/net/p5-Net-Riak/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-Dump>=0:devel/p5-Data-Dump \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-Google-ProtocolBuffers>=0:devel/p5-Google-ProtocolBuffers \
p5-JSON>=0:converters/p5-JSON \
p5-Moose>=0:devel/p5-Moose \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-MooseX-Types-Structured>=0:devel/p5-MooseX-Types-Structured \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-SAP/Makefile b/net/p5-Net-SAP/Makefile
index b85828fefd8e..16b1b532fd22 100644
--- a/net/p5-Net-SAP/Makefile
+++ b/net/p5-Net-SAP/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Session Announcement Protocol (rfc2974) packet parser
-BUILD_DEPENDS= p5-IO-Interface>=0:net/p5-IO-Interface \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Interface>=0:net/p5-IO-Interface \
p5-IO-Socket-Multicast6>=0:net/p5-IO-Socket-Multicast6 \
p5-Net-SDP>=0:net/p5-Net-SDP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/net/p5-Net-SCP-Expect/Makefile b/net/p5-Net-SCP-Expect/Makefile
index f9ffca7ed661..50b2e4958cfb 100644
--- a/net/p5-Net-SCP-Expect/Makefile
+++ b/net/p5-Net-SCP-Expect/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= numisemis@yahoo.com
COMMENT= Perl5 wrapper for scp that allows passwords via Expect
-BUILD_DEPENDS= p5-Expect>=1.14:lang/p5-Expect \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Expect>=1.14:lang/p5-Expect \
p5-Net-IPv6Addr>=0:net-mgmt/p5-Net-IPv6Addr \
p5-Term-ReadPassword>=0.01:devel/p5-Term-ReadPassword
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-SCP/Makefile b/net/p5-Net-SCP/Makefile
index 85dbed69d0d1..d325fb7f4346 100644
--- a/net/p5-Net-SCP/Makefile
+++ b/net/p5-Net-SCP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl5 module to access and use scp protocol
-BUILD_DEPENDS= p5-Net-SSH>=0:net/p5-Net-SSH \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-SSH>=0:net/p5-Net-SSH \
p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-SDP/Makefile b/net/p5-Net-SDP/Makefile
index 2044675f5480..af0b52fd0f5f 100644
--- a/net/p5-Net-SDP/Makefile
+++ b/net/p5-Net-SDP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Session Description Protocol (RFC 2327) packet parser/generator
-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/net/p5-Net-SFTP/Makefile b/net/p5-Net-SFTP/Makefile
index b461e1d98742..25808b22e4c4 100644
--- a/net/p5-Net-SFTP/Makefile
+++ b/net/p5-Net-SFTP/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-SSH-Perl>=0:net/p5-Net-SSH-Perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-SSH-Perl>=0:net/p5-Net-SSH-Perl
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-SIP/Makefile b/net/p5-Net-SIP/Makefile
index 8d4ae44b76c8..e160c36a4cb5 100644
--- a/net/p5-Net-SIP/Makefile
+++ b/net/p5-Net-SIP/Makefile
@@ -13,8 +13,8 @@ COMMENT= Framework SIP (Voice Over IP, RFC3261)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-DNS>=0.56:dns/p5-Net-DNS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-DNS>=0.56:dns/p5-Net-DNS
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-SMS-Mollie/Makefile b/net/p5-Net-SMS-Mollie/Makefile
index 9df0404c4b37..94337aabb4e3 100644
--- a/net/p5-Net-SMS-Mollie/Makefile
+++ b/net/p5-Net-SMS-Mollie/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-XML-Simple>=0:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Simple>=0:textproc/p5-XML-Simple
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-SMS-PChome/Makefile b/net/p5-Net-SMS-PChome/Makefile
index 862c6d653c86..0b4ea8691c88 100644
--- a/net/p5-Net-SMS-PChome/Makefile
+++ b/net/p5-Net-SMS-PChome/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Send SMS messages via the sms.pchome.com.tw service
-BUILD_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-HTML-TagParser>=0:www/p5-HTML-TagParser \
p5-Date-Calc>=0:devel/p5-Date-Calc
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-SPDY/Makefile b/net/p5-Net-SPDY/Makefile
index f07d65e2b08c..e85c81fa82db 100644
--- a/net/p5-Net-SPDY/Makefile
+++ b/net/p5-Net-SPDY/Makefile
@@ -15,9 +15,9 @@ COMMENT= SPDY protocol client and server implementation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Pod>=0:devel/p5-Test-Pod
diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index 237163d0d61e..177a83dd37ca 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Crypt-Curve25519>=0.05:security/p5-Crypt-Curve25519 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Curve25519>=0.05:security/p5-Crypt-Curve25519 \
p5-Crypt-DES>0:security/p5-Crypt-DES \
p5-Crypt-DSA>=0.11:security/p5-Crypt-DSA \
p5-Crypt-IDEA>=0:security/p5-Crypt-IDEA \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Crypt-Curve25519>=0.05:security/p5-Crypt-Curve25519 \
p5-File-HomeDir>=0:devel/p5-File-HomeDir \
p5-Math-GMP>=1.04:math/p5-Math-GMP \
p5-String-CRC32>=1.2:devel/p5-String-CRC32
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFIGURE_ENV= PERL_MM_USE_DEFAULT="1"
USES= compiler:c11 perl5
diff --git a/net/p5-Net-STOMP-Client/Makefile b/net/p5-Net-STOMP-Client/Makefile
index 224f44947de4..f6e9bcd59260 100644
--- a/net/p5-Net-STOMP-Client/Makefile
+++ b/net/p5-Net-STOMP-Client/Makefile
@@ -12,9 +12,9 @@ COMMENT= Streaming Text Orientated Messaging Protocol Client
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-No-Worries>=0:devel/p5-No-Worries \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-No-Worries>=0:devel/p5-No-Worries \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Server-SS-PreFork/Makefile b/net/p5-Net-Server-SS-PreFork/Makefile
index 72b9801e1e15..d84094ab9070 100644
--- a/net/p5-Net-Server-SS-PreFork/Makefile
+++ b/net/p5-Net-Server-SS-PreFork/Makefile
@@ -14,9 +14,9 @@ COMMENT= Hot-deployable variant of Net::Server::PreFork
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-Server>0:net/p5-Net-Server \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Server>0:net/p5-Net-Server \
p5-Server-Starter>=0.02:net/p5-Server-Starter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-HTTP-Server-Simple>0:www/p5-HTTP-Server-Simple \
p5-Test-SharedFork>0:devel/p5-Test-SharedFork \
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile
index 0a1ec05f1f54..26252eb0a0f9 100644
--- a/net/p5-Net-Server/Makefile
+++ b/net/p5-Net-Server/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-IO-Multiplex>=1.05:devel/p5-IO-Multiplex
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Multiplex>=1.05:devel/p5-IO-Multiplex
OPTIONS_DEFINE= IPV6
diff --git a/net/p5-Net-Subnet/Makefile b/net/p5-Net-Subnet/Makefile
index 14fae6d602a0..c19a75c2340a 100644
--- a/net/p5-Net-Subnet/Makefile
+++ b/net/p5-Net-Subnet/Makefile
@@ -13,8 +13,8 @@ COMMENT= Fast IP-in-subnet matcher for IPv4 and IPv6, CIDR or mask
LICENSE= ART10
-BUILD_DEPENDS= p5-Socket6>=0.23:net/p5-Socket6
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Socket6>=0.23:net/p5-Socket6
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Telnet-Netscreen/Makefile b/net/p5-Net-Telnet-Netscreen/Makefile
index a8c03bdf4a8a..59e39b7564a9 100644
--- a/net/p5-Net-Telnet-Netscreen/Makefile
+++ b/net/p5-Net-Telnet-Netscreen/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Perl interface for interact with a Netscreen firewall
-BUILD_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-TiVo/Makefile b/net/p5-Net-TiVo/Makefile
index b549607f0409..0e9af139c332 100644
--- a/net/p5-Net-TiVo/Makefile
+++ b/net/p5-Net-TiVo/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= eg@fbsd.lt
COMMENT= Framework for accessing TiVo using XML/HTTP
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Todoist/Makefile b/net/p5-Net-Todoist/Makefile
index 128557291f31..1c36fa0b7c05 100644
--- a/net/p5-Net-Todoist/Makefile
+++ b/net/p5-Net-Todoist/Makefile
@@ -14,9 +14,9 @@ COMMENT= Todoist API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-Net-Traceroute-PurePerl/Makefile b/net/p5-Net-Traceroute-PurePerl/Makefile
index 1be9a6d02fd9..5545c6b28d62 100644
--- a/net/p5-Net-Traceroute-PurePerl/Makefile
+++ b/net/p5-Net-Traceroute-PurePerl/Makefile
@@ -14,8 +14,8 @@ COMMENT= Traceroute(1) functionality in perl via raw sockets
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-Traceroute>=0:net/p5-Net-Traceroute
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Traceroute>=0:net/p5-Net-Traceroute
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Traceroute6/Makefile b/net/p5-Net-Traceroute6/Makefile
index 4bbee4dea4cc..b88bd8398d05 100644
--- a/net/p5-Net-Traceroute6/Makefile
+++ b/net/p5-Net-Traceroute6/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl module to parse traceroute6(8) output
LICENSE= MIT
-BUILD_DEPENDS= p5-Socket6>=0:net/p5-Socket6
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Socket6>=0:net/p5-Socket6
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Twitter/Makefile b/net/p5-Net-Twitter/Makefile
index e8ce9484e09f..837135cfe999 100644
--- a/net/p5-Net-Twitter/Makefile
+++ b/net/p5-Net-Twitter/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
p5-Class-Load>=0:devel/p5-Class-Load \
p5-Data-Visitor>=0:devel/p5-Data-Visitor \
p5-DateTime>=0.51:devel/p5-DateTime \
@@ -33,7 +34,6 @@ BUILD_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
p5-URI>=1.40:net/p5-URI \
p5-libwww>=2.032:www/p5-libwww \
p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Warn>=0:devel/p5-Test-Warn
@@ -45,7 +45,8 @@ USE_PERL5= configure
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 502502
-BUILD_DEPENDS+= p5-ExtUtils-MakeMaker>=7.11.01:devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS+= p5-ExtUtils-MakeMaker>=7.11.01:devel/p5-ExtUtils-MakeMaker
.endif
.include <bsd.port.post.mk>
diff --git a/net/p5-Net-VNC/Makefile b/net/p5-Net-VNC/Makefile
index 0e1fff54009a..600c737f1009 100644
--- a/net/p5-Net-VNC/Makefile
+++ b/net/p5-Net-VNC/Makefile
@@ -14,10 +14,10 @@ COMMENT= Simple VNC 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-Crypt-DES>=0:security/p5-Crypt-DES \
p5-Image-Imlib2>=0:graphics/p5-Image-Imlib2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-Net-WhitePages/Makefile b/net/p5-Net-WhitePages/Makefile
index 602c2bc647b2..0fe55f2833bb 100644
--- a/net/p5-Net-WhitePages/Makefile
+++ b/net/p5-Net-WhitePages/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= vvelox@vvelox.net
COMMENT= Provides access to the XML API for WhitePages.com
-BUILD_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Whois-RIPE/Makefile b/net/p5-Net-Whois-RIPE/Makefile
index 3328c6d52fd3..15a0eac91aaa 100644
--- a/net/p5-Net-Whois-RIPE/Makefile
+++ b/net/p5-Net-Whois-RIPE/Makefile
@@ -14,8 +14,8 @@ COMMENT= Implementation of RIPE Whois
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Iterator-Util>=0:devel/p5-Iterator-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Iterator-Util>=0:devel/p5-Iterator-Util
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
diff --git a/net/p5-Net-Works/Makefile b/net/p5-Net-Works/Makefile
index 229264b9228e..09b87488a069 100644
--- a/net/p5-Net-Works/Makefile
+++ b/net/p5-Net-Works/Makefile
@@ -12,11 +12,11 @@ COMMENT= APIs for IP addresses and networks
LICENSE= ART20
-BUILD_DEPENDS= p5-List-AllUtils>=0.03:devel/p5-List-AllUtils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-AllUtils>=0.03:devel/p5-List-AllUtils \
p5-Math-Int128>=0.07:math/p5-Math-Int128 \
p5-namespace-autoclean>=0.13:devel/p5-namespace-autoclean \
p5-Moo>=0:devel/p5-Moo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/net/p5-Net-Write/Makefile b/net/p5-Net-Write/Makefile
index 9e6120769fd2..11233b395702 100644
--- a/net/p5-Net-Write/Makefile
+++ b/net/p5-Net-Write/Makefile
@@ -14,10 +14,10 @@ COMMENT= Interface to open and send raw frames to the network
LICENSE= ART10
LICENSE_FILE= ${WRKSRC}/LICENSE.Artistic
-BUILD_DEPENDS= p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
p5-Socket6>=0.19:net/p5-Socket6 \
p5-Net-Pcap>=0.14:net/p5-Net-Pcap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-uFTP/Makefile b/net/p5-Net-uFTP/Makefile
index 4f52d4d3096c..3edd3cb41b87 100644
--- a/net/p5-Net-uFTP/Makefile
+++ b/net/p5-Net-uFTP/Makefile
@@ -15,12 +15,12 @@ COMMENT= Universal interface for FTP-like modules (FTP, SFTP, SCP)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS \
p5-File-Stat-ModeString>=0:sysutils/p5-File-Stat-ModeString \
p5-Net-FTP-AutoReconnect>=0:net/p5-Net-FTP-AutoReconnect \
p5-Net-SSH2>=0:net/p5-Net-SSH2 \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-NetAddr-IP-Count/Makefile b/net/p5-NetAddr-IP-Count/Makefile
index 536502345c63..0d70bbf35146 100644
--- a/net/p5-NetAddr-IP-Count/Makefile
+++ b/net/p5-NetAddr-IP-Count/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= NetAddr::IP::Count - Count hosts in named subnets
-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/net/p5-OAI-Harvester/Makefile b/net/p5-OAI-Harvester/Makefile
index 11fbc7bd5c93..091bb7b7c225 100644
--- a/net/p5-OAI-Harvester/Makefile
+++ b/net/p5-OAI-Harvester/Makefile
@@ -15,11 +15,11 @@ COMMENT= Perl module to harvest using the OAI protocol
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=1.30:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=1.30:net/p5-URI \
p5-XML-SAX>=0.12:textproc/p5-XML-SAX \
p5-XML-SAX-Base>=1.04:textproc/p5-XML-SAX-Base \
p5-libwww>=2.0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer
diff --git a/net/p5-OurNet-BBS/Makefile b/net/p5-OurNet-BBS/Makefile
index 25f6c7dbb49f..e39cd0091a85 100644
--- a/net/p5-OurNet-BBS/Makefile
+++ b/net/p5-OurNet-BBS/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Component Object Model for BBS systems
-BUILD_DEPENDS= p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
p5-Crypt-DES>=0:security/p5-Crypt-DES \
p5-Crypt-GOST>=0:security/p5-Crypt-GOST \
@@ -36,7 +37,6 @@ BUILD_DEPENDS= p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
p5-OurNet-BBSAgent>=0:net/p5-OurNet-BBSAgent \
p5-PlRPC>=0:net/p5-PlRPC \
p5-enum>=0:devel/p5-enum
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:1.67
diff --git a/net/p5-OurNet-BBSAgent/Makefile b/net/p5-OurNet-BBSAgent/Makefile
index 150819d44af7..efa52a9de662 100644
--- a/net/p5-OurNet-BBSAgent/Makefile
+++ b/net/p5-OurNet-BBSAgent/Makefile
@@ -14,8 +14,8 @@ COMMENT= Scriptable telnet-based virtual users
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-POE-Component-Client-Ident/Makefile b/net/p5-POE-Component-Client-Ident/Makefile
index 44a3013c6c16..772624aba154 100644
--- a/net/p5-POE-Component-Client-Ident/Makefile
+++ b/net/p5-POE-Component-Client-Ident/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= POE component for non-blocking ident lookups
-BUILD_DEPENDS= p5-POE>=0.9999:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0.9999:devel/p5-POE
TEST_DEPENDS= p5-Test-POE-Server-TCP>=0:devel/p5-Test-POE-Server-TCP
USES= perl5
diff --git a/net/p5-POE-Component-Client-Keepalive/Makefile b/net/p5-POE-Component-Client-Keepalive/Makefile
index 66e5478582b0..f9eb0afb8c22 100644
--- a/net/p5-POE-Component-Client-Keepalive/Makefile
+++ b/net/p5-POE-Component-Client-Keepalive/Makefile
@@ -16,10 +16,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-IP-Minimal>=0.02:net/p5-Net-IP-Minimal \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-IP-Minimal>=0.02:net/p5-Net-IP-Minimal \
p5-POE>=1.311:devel/p5-POE \
p5-POE-Component-Resolver>=0.917:dns/p5-POE-Component-Resolver
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-POE-Component-Client-Ping/Makefile b/net/p5-POE-Component-Client-Ping/Makefile
index 153a5a896a50..4241f1616467 100644
--- a/net/p5-POE-Component-Client-Ping/Makefile
+++ b/net/p5-POE-Component-Client-Ping/Makefile
@@ -13,8 +13,8 @@ COMMENT= POE component for non-blocking/concurrent ICMP ping
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE>=1.0070:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.0070:devel/p5-POE
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-POE-Component-Client-Telnet/Makefile b/net/p5-POE-Component-Client-Telnet/Makefile
index 413b0c5f3508..fce33001cc8b 100644
--- a/net/p5-POE-Component-Client-Telnet/Makefile
+++ b/net/p5-POE-Component-Client-Telnet/Makefile
@@ -14,10 +14,10 @@ COMMENT= POE component that provides non-blocking access to Net::Telnet
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
p5-Net-Telnet>=0:net/p5-Net-Telnet \
p5-POE>=0.31:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-POE-Component-Client-Twitter/Makefile b/net/p5-POE-Component-Client-Twitter/Makefile
index 47bc2fec8694..50c816ac11a5 100644
--- a/net/p5-POE-Component-Client-Twitter/Makefile
+++ b/net/p5-POE-Component-Client-Twitter/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= POE chat component for twitter.com
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-JSON-Any>=0:converters/p5-JSON-Any \
p5-POE>=0:devel/p5-POE \
p5-POE-Component-Client-HTTP>=0:www/p5-POE-Component-Client-HTTP \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-Test-Base>=0:devel/p5-Test-Base \
p5-Module-Install-TestBase>=0:devel/p5-Module-Install-TestBase \
p5-Module-Install>=0:devel/p5-Module-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-POE-Component-Client-Whois/Makefile b/net/p5-POE-Component-Client-Whois/Makefile
index 51bc1aed6cec..e46a5a86cbc1 100644
--- a/net/p5-POE-Component-Client-Whois/Makefile
+++ b/net/p5-POE-Component-Client-Whois/Makefile
@@ -13,9 +13,9 @@ COMMENT= One shot non-blocking RFC 812 WHOIS query
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-Netmask>=1.9012:net-mgmt/p5-Net-Netmask \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Netmask>=1.9012:net-mgmt/p5-Net-Netmask \
p5-POE>=1.004:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-POE-Component-Generic/Makefile b/net/p5-POE-Component-Generic/Makefile
index 6d7c00a92c23..f214db1846de 100644
--- a/net/p5-POE-Component-Generic/Makefile
+++ b/net/p5-POE-Component-Generic/Makefile
@@ -13,10 +13,10 @@ COMMENT= Provides non-blocking access to a blocking object
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
p5-Net-SSH2>=0:net/p5-Net-SSH2 \
p5-POE>=0.31:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-POE-Component-Jabber/Makefile b/net/p5-POE-Component-Jabber/Makefile
index a2d7374a17fb..959b67cfea05 100644
--- a/net/p5-POE-Component-Jabber/Makefile
+++ b/net/p5-POE-Component-Jabber/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= POE Component for communicating over Jabber
-BUILD_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-Filter-Template>=0:devel/p5-Filter-Template \
p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
@@ -19,7 +20,6 @@ BUILD_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL \
p5-POE-Component-SSLify>=0:security/p5-POE-Component-SSLify \
p5-POE-Filter-XML>=0:textproc/p5-POE-Filter-XML \
p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= examples/*
diff --git a/net/p5-POE-Component-Pcap/Makefile b/net/p5-POE-Component-Pcap/Makefile
index b909cdfbc31b..b9743b4a7ca2 100644
--- a/net/p5-POE-Component-Pcap/Makefile
+++ b/net/p5-POE-Component-Pcap/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= POE component for non-blocking use of Net::Pcap
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-Net-Pcap>=0:net/p5-Net-Pcap \
p5-NetPacket>=0:net/p5-NetPacket
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-POE-Component-PubSub/Makefile b/net/p5-POE-Component-PubSub/Makefile
index 2c01016957f4..cd4b29cfc520 100644
--- a/net/p5-POE-Component-PubSub/Makefile
+++ b/net/p5-POE-Component-PubSub/Makefile
@@ -14,7 +14,8 @@ COMMENT= Generic publish/subscribe POE::Component
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0.79:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.79:devel/p5-Moose \
p5-MooseX-Declare>=0.22:devel/p5-MooseX-Declare \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-MooseX-Types-Set-Object>=0.02:devel/p5-MooseX-Types-Set-Object \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Moose>=0.79:devel/p5-Moose \
p5-POE-API-Peek>=2.15:devel/p5-POE-API-Peek \
p5-POEx-Role-SessionInstantiation>=0.01:devel/p5-POEx-Role-SessionInstantiation \
p5-signatures>=0.05:lang/p5-signatures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-POE-Component-Server-Twirc/Makefile b/net/p5-POE-Component-Server-Twirc/Makefile
index fa90ac714611..db8abdb7af2a 100644
--- a/net/p5-POE-Component-Server-Twirc/Makefile
+++ b/net/p5-POE-Component-Server-Twirc/Makefile
@@ -13,7 +13,8 @@ COMMENT= Twitter/IRC gateway
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-AnyEvent-Twitter>=0:net/p5-AnyEvent-Twitter \
p5-AnyEvent-Twitter-Stream>=0:net/p5-AnyEvent-Twitter-Stream \
p5-Config-Any>=0:devel/p5-Config-Any \
@@ -34,7 +35,6 @@ BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
p5-String-Truncate>=0:textproc/p5-String-Truncate \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index d3bf4a19a186..644804202c6e 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module for writing RPC servers and clients
-BUILD_DEPENDS= p5-Net-Daemon>=0:net/p5-Net-Daemon
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Daemon>=0:net/p5-Net-Daemon
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-REST-Application/Makefile b/net/p5-REST-Application/Makefile
index 1a138a7821b3..0b40c269583e 100644
--- a/net/p5-REST-Application/Makefile
+++ b/net/p5-REST-Application/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Framework for building RESTful web-applications
-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/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile
index 1e17dd382403..cd1032857667 100644
--- a/net/p5-RPC-XML/Makefile
+++ b/net/p5-RPC-XML/Makefile
@@ -13,9 +13,9 @@ COMMENT= XML-RPC client and server library for Perl
LICENSE= ART20 LGPL21
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-XML-Parser>=2.31:textproc/p5-XML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-Parser>=2.31:textproc/p5-XML-Parser \
p5-libwww>=5.834:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DateTime-Format-ISO8601>=0.07:devel/p5-DateTime-Format-ISO8601
NO_ARCH= yes
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
index 1ce652fcd65b..5fb0d96bc8cb 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
@@ -13,9 +13,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= ResourcePool wrapper for Net::LDAP
-BUILD_DEPENDS= p5-ResourcePool>=0:devel/p5-ResourcePool \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ResourcePool>=0:devel/p5-ResourcePool \
p5-perl-ldap>=0:net/p5-perl-ldap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Rose-URI/Makefile b/net/p5-Rose-URI/Makefile
index 06f1ecb62090..15eeb9d5dc20 100644
--- a/net/p5-Rose-URI/Makefile
+++ b/net/p5-Rose-URI/Makefile
@@ -14,9 +14,9 @@ COMMENT= Easy and efficient manipulation of URI components
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Rose-Object>=0.854:devel/p5-Rose-Object \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Rose-Object>=0.854:devel/p5-Rose-Object \
p5-URI>0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-SOAP-Amazon-S3/Makefile b/net/p5-SOAP-Amazon-S3/Makefile
index caddd44c15ef..20186f87d539 100644
--- a/net/p5-SOAP-Amazon-S3/Makefile
+++ b/net/p5-SOAP-Amazon-S3/Makefile
@@ -13,10 +13,10 @@ COMMENT= Module for interfacing with Amazon S3 through SOAP
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-SOAP-MySOAP>=0:net/p5-SOAP-MySOAP \
p5-XML-MyXML>=0:textproc/p5-XML-MyXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-SOAP-Data-Builder/Makefile b/net/p5-SOAP-Data-Builder/Makefile
index 11db24a3c894..8e64860f86a9 100644
--- a/net/p5-SOAP-Data-Builder/Makefile
+++ b/net/p5-SOAP-Data-Builder/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Wrapper simplifying SOAP::Data and SOAP::Serialiser
-BUILD_DEPENDS= p5-SOAP-Lite>=0:net/p5-SOAP-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SOAP-Lite>=0:net/p5-SOAP-Lite
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index 02db8b8035c6..31077bab35cd 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Inspector>=0:devel/p5-Class-Inspector \
p5-IO-SessionData>=1.03:devel/p5-IO-SessionData \
p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Class-Inspector>=0:devel/p5-Class-Inspector \
p5-XML-Parser>=2.23:textproc/p5-XML-Parser \
p5-XML-Parser-Lite>=0.715:textproc/p5-XML-Parser-Lite \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject \
p5-Test-Warn>=0:devel/p5-Test-Warn \
p5-Test-XML>=0:devel/p5-Test-XML
diff --git a/net/p5-SOAP-MySOAP/Makefile b/net/p5-SOAP-MySOAP/Makefile
index 58c479151e74..ad2eb777249f 100644
--- a/net/p5-SOAP-MySOAP/Makefile
+++ b/net/p5-SOAP-MySOAP/Makefile
@@ -14,8 +14,8 @@ COMMENT= Extremely basic SOAP client module
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-SOAP-XML-Client/Makefile b/net/p5-SOAP-XML-Client/Makefile
index 8c3debbd798f..9e4e0a5544cb 100644
--- a/net/p5-SOAP-XML-Client/Makefile
+++ b/net/p5-SOAP-XML-Client/Makefile
@@ -14,12 +14,12 @@ COMMENT= Simple frame work for talking with web services
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-File-Slurp>=0:devel/p5-File-Slurp \
p5-SOAP-Data-Builder>=0.8:net/p5-SOAP-Data-Builder \
p5-SOAP-Lite>=0.67:net/p5-SOAP-Lite \
p5-XML-LibXML>=0.6:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:2.26
diff --git a/net/p5-SOAP/Makefile b/net/p5-SOAP/Makefile
index 4417b7776825..5bfc0d608987 100644
--- a/net/p5-SOAP/Makefile
+++ b/net/p5-SOAP/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl modules providing an API to the Simple Object Access Protocol
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-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS= p5-SOAP-Lite-[0-9]*
diff --git a/net/p5-Samba-LDAP/Makefile b/net/p5-Samba-LDAP/Makefile
index b51ef35ff1e8..9ee144681404 100644
--- a/net/p5-Samba-LDAP/Makefile
+++ b/net/p5-Samba-LDAP/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Manage a Samba PDC with an LDAP Backend
-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-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Readonly>=0:devel/p5-Readonly \
p5-Class-Base>=0:devel/p5-Class-Base \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-Regexp-DefaultFlags>=0:textproc/p5-Regexp-DefaultFlags \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
p5-Unicode-MapUTF8>=0:converters/p5-Unicode-MapUTF8
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Test-URI/Makefile b/net/p5-Test-URI/Makefile
index 7da5c892ed31..339cc0ed1d18 100644
--- a/net/p5-Test-URI/Makefile
+++ b/net/p5-Test-URI/Makefile
@@ -13,8 +13,8 @@ COMMENT= Check Uniform Resource Identifiers
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-URI-FromHash/Makefile b/net/p5-URI-FromHash/Makefile
index 19cc011338b3..7d746eee37a9 100644
--- a/net/p5-URI-FromHash/Makefile
+++ b/net/p5-URI-FromHash/Makefile
@@ -12,9 +12,9 @@ COMMENT= Create URI from hash of components
LICENSE= ART20
-BUILD_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-URI>=1.68:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-URI-OpenURL/Makefile b/net/p5-URI-OpenURL/Makefile
index 1ea1792af95c..7cfd2264cdc0 100644
--- a/net/p5-URI-OpenURL/Makefile
+++ b/net/p5-URI-OpenURL/Makefile
@@ -14,8 +14,8 @@ COMMENT= Parse and construct OpenURL's (NISO Z39.88-2004)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-URI-Query/Makefile b/net/p5-URI-Query/Makefile
index f1fa044f6a39..259c2fa6ec08 100644
--- a/net/p5-URI-Query/Makefile
+++ b/net/p5-URI-Query/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Clone>=0:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0:devel/p5-Clone \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-URI-SmartURI/Makefile b/net/p5-URI-SmartURI/Makefile
index 09fcb465ddae..bb4eddb1e288 100644
--- a/net/p5-URI-SmartURI/Makefile
+++ b/net/p5-URI-SmartURI/Makefile
@@ -14,14 +14,14 @@ COMMENT= Subclassable and hostless URIs
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-C3-Componentised>=0:devel/p5-Class-C3-Componentised \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-C3-Componentised>=0:devel/p5-Class-C3-Componentised \
p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
p5-Moose>=0:devel/p5-Moose \
p5-URI>=1.51:net/p5-URI \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>0:devel/p5-Test-Fatal \
p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
diff --git a/net/p5-URI-Template/Makefile b/net/p5-URI-Template/Makefile
index 424ee5c8a121..e81439989eff 100644
--- a/net/p5-URI-Template/Makefile
+++ b/net/p5-URI-Template/Makefile
@@ -13,8 +13,8 @@ COMMENT= Object for handling URI templates
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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-JSON>=0:converters/p5-JSON
USES= perl5
diff --git a/net/p5-URI-db/Makefile b/net/p5-URI-db/Makefile
index 10a6bd839d8e..d9751fe9b3b4 100644
--- a/net/p5-URI-db/Makefile
+++ b/net/p5-URI-db/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl5 module representing database URIs
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=1.40:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=1.40:net/p5-URI \
p5-URI-Nested>=0.10:net/p5-URI-Nested
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/net/p5-URI-ws/Makefile b/net/p5-URI-ws/Makefile
index 8a01eb8bd879..81817e8bea95 100644
--- a/net/p5-URI-ws/Makefile
+++ b/net/p5-URI-ws/Makefile
@@ -13,8 +13,8 @@ COMMENT= WebSocket support for URI package
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI
USE_PERL5= configure
USES= perl5
diff --git a/net/p5-VM-EC2-Security-CredentialCache/Makefile b/net/p5-VM-EC2-Security-CredentialCache/Makefile
index 060787db9cc4..0398eaa5624b 100644
--- a/net/p5-VM-EC2-Security-CredentialCache/Makefile
+++ b/net/p5-VM-EC2-Security-CredentialCache/Makefile
@@ -13,9 +13,9 @@ COMMENT= Cache credentials respecting expriation time for IAM roles
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
p5-VM-EC2>=0:net/p5-VM-EC2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-VM-EC2/Makefile b/net/p5-VM-EC2/Makefile
index 26abaacb54c7..1bf4370eed73 100644
--- a/net/p5-VM-EC2/Makefile
+++ b/net/p5-VM-EC2/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-AnyEvent-CacheDNS>=0.08:dns/p5-AnyEvent-CacheDNS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent-CacheDNS>=0.08:dns/p5-AnyEvent-CacheDNS \
p5-AnyEvent-HTTP>=2.15:www/p5-AnyEvent-HTTP \
p5-AnyEvent>=7.04:devel/p5-AnyEvent \
p5-JSON>=0:converters/p5-JSON \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-AnyEvent-CacheDNS>=0.08:dns/p5-AnyEvent-CacheDNS \
p5-URI>=1.40:net/p5-URI \
p5-XML-Simple>=2.18:textproc/p5-XML-Simple \
p5-libwww>=5.835:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/net/p5-Validate-Net/Makefile b/net/p5-Validate-Net/Makefile
index a8fe64899333..0e75b44bec93 100644
--- a/net/p5-Validate-Net/Makefile
+++ b/net/p5-Validate-Net/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Format validation and more for Net:: related strings
-BUILD_DEPENDS= p5-Class-Default>=0:devel/p5-Class-Default
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Default>=0:devel/p5-Class-Default
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-WebService-Dropbox/Makefile b/net/p5-WebService-Dropbox/Makefile
index 9aa73ddd184b..3bc0b6be4c65 100644
--- a/net/p5-WebService-Dropbox/Makefile
+++ b/net/p5-WebService-Dropbox/Makefile
@@ -14,14 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-MY_DEPENDS= p5-HTTP-Message>=6.06:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=6.06:www/p5-HTTP-Message \
p5-JSON>=2.59:converters/p5-JSON \
p5-LWP-Protocol-https>=6.04:www/p5-LWP-Protocol-https \
p5-Net-OAuth>=0.28:net/p5-Net-OAuth \
p5-URI>=1.60:net/p5-URI \
p5-libwww>=6.05:www/p5-libwww
-BUILD_DEPENDS= ${MY_DEPENDS}
-RUN_DEPENDS= ${MY_DEPENDS}
OPTIONS_DEFINE= FURL
OPTIONS_DEFAULT=FURL
@@ -31,9 +30,8 @@ USES= perl5
USE_PERL5= modbuildtiny
NO_ARCH= yes
-FURL_BUILD_DEPENDS= p5-Furl>=2.19:www/p5-Furl \
+FURL_RUN_DEPENDS= p5-Furl>=2.19:www/p5-Furl \
p5-IO-Socket-SSL>=1.954:security/p5-IO-Socket-SSL \
p5-JSON-XS>=3.02:converters/p5-JSON-XS
-FURL_RUN_DEPENDS= ${FURL_BUILD_DEPENDS}
.include <bsd.port.mk>
diff --git a/net/p5-WebService-Prowl/Makefile b/net/p5-WebService-Prowl/Makefile
index dae9ea6a9f30..3c259931c4a6 100644
--- a/net/p5-WebService-Prowl/Makefile
+++ b/net/p5-WebService-Prowl/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
p5-XML-Simple>=0:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuildtiny
diff --git a/net/p5-What/Makefile b/net/p5-What/Makefile
index 4d398b1d67ff..4afe74bb5e64 100644
--- a/net/p5-What/Makefile
+++ b/net/p5-What/Makefile
@@ -15,9 +15,9 @@ COMMENT= Find out about running services
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Error>=0:lang/p5-Error \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Error>=0:lang/p5-Error \
p5-Exception-Class>=1.21:devel/p5-Exception-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Pod>=1:devel/p5-Test-Pod
diff --git a/net/p5-X500-DN/Makefile b/net/p5-X500-DN/Makefile
index 7ebc114e8b41..445581b67918 100644
--- a/net/p5-X500-DN/Makefile
+++ b/net/p5-X500-DN/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Handle X.500 DNs (Distinguished Names), parse, and format them
-BUILD_DEPENDS= p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-XML-Compile-SOAP-AnyEvent/Makefile b/net/p5-XML-Compile-SOAP-AnyEvent/Makefile
index 0e9e2cbe699b..4437e7a74c0b 100644
--- a/net/p5-XML-Compile-SOAP-AnyEvent/Makefile
+++ b/net/p5-XML-Compile-SOAP-AnyEvent/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Exchange XML via AnyEvent::HTTP
-BUILD_DEPENDS= p5-AnyEvent-HTTP>=1.46:www/p5-AnyEvent-HTTP \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent-HTTP>=1.46:www/p5-AnyEvent-HTTP \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-Log-Report>=1.05:devel/p5-Log-Report \
p5-XML-Compile-SOAP>=3.05:net/p5-XML-Compile-SOAP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
diff --git a/net/p5-XML-Compile-SOAP-Daemon/Makefile b/net/p5-XML-Compile-SOAP-Daemon/Makefile
index 8f41437aafb4..b1ab739e29d9 100644
--- a/net/p5-XML-Compile-SOAP-Daemon/Makefile
+++ b/net/p5-XML-Compile-SOAP-Daemon/Makefile
@@ -13,12 +13,12 @@ COMMENT= Base class for SOAP message servers
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Report>=1.23:devel/p5-Log-Report \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Report>=1.23:devel/p5-Log-Report \
p5-XML-Compile>=1.44:textproc/p5-XML-Compile \
p5-XML-Compile-Cache>=0.991:textproc/p5-XML-Compile-Cache \
p5-XML-Compile-SOAP>=3.00:net/p5-XML-Compile-SOAP \
p5-XML-Compile-WSDL11>=3.00:net/p5-XML-Compile-WSDL11
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-XML-Compile-Tester>=0.90:devel/p5-XML-Compile-Tester
NO_ARCH= yes
diff --git a/net/p5-XML-Compile-SOAP-WSA/Makefile b/net/p5-XML-Compile-SOAP-WSA/Makefile
index 9dcf603e4ab9..53713d0dfba7 100644
--- a/net/p5-XML-Compile-SOAP-WSA/Makefile
+++ b/net/p5-XML-Compile-SOAP-WSA/Makefile
@@ -14,13 +14,13 @@ COMMENT= SOAP message messages with WSA fields
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-Server>=0.97:net/p5-Net-Server \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Server>=0.97:net/p5-Net-Server \
p5-libwww>=5.803:www/p5-libwww \
p5-Log-Report>=0.22:devel/p5-Log-Report \
p5-XML-Compile-SOAP>=2.10:net/p5-XML-Compile-SOAP \
p5-XML-Compile>=1.01:textproc/p5-XML-Compile \
p5-XML-Compile-Cache>=0.91:textproc/p5-XML-Compile-Cache
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-XML-Compile-SOAP/Makefile b/net/p5-XML-Compile-SOAP/Makefile
index 37eb754b937a..80fc19b32ff0 100644
--- a/net/p5-XML-Compile-SOAP/Makefile
+++ b/net/p5-XML-Compile-SOAP/Makefile
@@ -13,13 +13,13 @@ COMMENT= Base-class for SOAP implementations
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-Log-Report>=1.05:devel/p5-Log-Report \
p5-Net-HTTP>=6.16:net/p5-Net-HTTP \
p5-XML-Compile>=1.58:textproc/p5-XML-Compile \
p5-XML-Compile-Cache>=1.03:textproc/p5-XML-Compile-Cache \
p5-libwww>=6.08:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-XML-Compile-Tester>=0.90:devel/p5-XML-Compile-Tester
NO_ARCH= yes
diff --git a/net/p5-XML-Compile-WSDL11/Makefile b/net/p5-XML-Compile-WSDL11/Makefile
index 68350ca6632b..d69a88ce4fae 100644
--- a/net/p5-XML-Compile-WSDL11/Makefile
+++ b/net/p5-XML-Compile-WSDL11/Makefile
@@ -13,11 +13,11 @@ COMMENT= Create SOAP messages defined by WSDL 1.1
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Report>=1.05:devel/p5-Log-Report \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Report>=1.05:devel/p5-Log-Report \
p5-XML-Compile>=1.48:textproc/p5-XML-Compile \
p5-XML-Compile-Cache>=1.03:textproc/p5-XML-Compile-Cache \
p5-XML-Compile-SOAP>=3.23:net/p5-XML-Compile-SOAP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/net/p5-XML-RPC-Fast/Makefile b/net/p5-XML-RPC-Fast/Makefile
index b19412a82b56..817e7203e0a5 100644
--- a/net/p5-XML-RPC-Fast/Makefile
+++ b/net/p5-XML-RPC-Fast/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mons@cpan.org
COMMENT= Fast and modular implementation for an XML-RPC client and server
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-WWW-Curl>=0:www/p5-WWW-Curl \
p5-XML-Hash-LX>=0.05:textproc/p5-XML-Hash-LX \
p5-XML-LibXML>=1.58:textproc/p5-XML-LibXML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
diff --git a/net/p5-XMLRPC-Lite/Makefile b/net/p5-XMLRPC-Lite/Makefile
index 4ec7783bfea7..910318290b7c 100644
--- a/net/p5-XMLRPC-Lite/Makefile
+++ b/net/p5-XMLRPC-Lite/Makefile
@@ -12,9 +12,9 @@ COMMENT= Client and server side XMLRPC implementation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-SOAP-Lite>=1.11:net/p5-SOAP-Lite
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SOAP-Lite>=1.11:net/p5-SOAP-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFIGURE_ARGS= --noprompt
INSTALL_TARGET= pure_install
diff --git a/net/p5-XPC/Makefile b/net/p5-XPC/Makefile
index 1f5a33e6a716..52c36af8a819 100644
--- a/net/p5-XPC/Makefile
+++ b/net/p5-XPC/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= XML Procedure Call (XPC)
-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-libwww>=0:www/p5-libwww \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-perl-ldap/Makefile b/net/p5-perl-ldap/Makefile
index 72a6db54c1a0..42ce8e999690 100644
--- a/net/p5-perl-ldap/Makefile
+++ b/net/p5-perl-ldap/Makefile
@@ -15,14 +15,14 @@ COMMENT= Client interface to LDAP (includes Net::LDAP)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-SASL>=2.00:security/p5-Authen-SASL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-SASL>=2.00:security/p5-Authen-SASL \
p5-Convert-ASN1>=0.20:converters/p5-Convert-ASN1 \
p5-IO-Socket-SSL>=1.26:security/p5-IO-Socket-SSL \
p5-Text-Soundex>=0:textproc/p5-Text-Soundex \
p5-URI>=1.10:net/p5-URI \
p5-XML-SAX-Base>0:textproc/p5-XML-SAX-Base \
p5-XML-SAX-Writer>0:textproc/p5-XML-SAX-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= LWP
LWP_DESC= LDAP support via LWP
diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile
index 386addf72159..2fc53a347f9b 100644
--- a/news/p5-News-Newsrc/Makefile
+++ b/news/p5-News-Newsrc/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Manage newsrc files
-BUILD_DEPENDS= p5-Set-IntSpan>=0:math/p5-Set-IntSpan
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Set-IntSpan>=0:math/p5-Set-IntSpan
USES= perl5
USE_PERL5= configure
diff --git a/news/p5-POE-Component-Server-NNTP/Makefile b/news/p5-POE-Component-Server-NNTP/Makefile
index 905ccd1894a4..1e1ee47062b6 100644
--- a/news/p5-POE-Component-Server-NNTP/Makefile
+++ b/news/p5-POE-Component-Server-NNTP/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=0.38:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0.38:devel/p5-POE \
p5-POE-Component-Client-NNTP>=1.05:news/p5-POE-Component-Client-NNTP \
p5-POE-Component-Pluggable>=0.03:devel/p5-POE-Component-Pluggable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/ports-mgmt/p5-FreeBSD-Portindex/Makefile b/ports-mgmt/p5-FreeBSD-Portindex/Makefile
index 4c3f701837b9..cc4d54299b10 100644
--- a/ports-mgmt/p5-FreeBSD-Portindex/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Portindex/Makefile
@@ -12,8 +12,8 @@ COMMENT= Incremental FreeBSD ports INDEX file generation
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= p5-BerkeleyDB>0:databases/p5-BerkeleyDB
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-BerkeleyDB>0:databases/p5-BerkeleyDB
USES= perl5 tar:xz
USE_PERL5= configure
diff --git a/print/p5-PDF-Template/Makefile b/print/p5-PDF-Template/Makefile
index c642ba4c7a61..87c8ae866a3a 100644
--- a/print/p5-PDF-Template/Makefile
+++ b/print/p5-PDF-Template/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= yaizawa@2004.jukuin.keio.ac.jp
COMMENT= PDF layout system that uses the same data structures as HTML::Template
-BUILD_DEPENDS+= pdflib-perl>=0:print/pdflib-perl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= pdflib-perl>=0:print/pdflib-perl \
p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/print/p5-PDFLib/Makefile b/print/p5-PDFLib/Makefile
index c3cd87ddda12..089b37d0cd3c 100644
--- a/print/p5-PDFLib/Makefile
+++ b/print/p5-PDFLib/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= More OO interface to pdflib_pl.pm
-BUILD_DEPENDS= pdflib-perl>=0:print/pdflib-perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= pdflib-perl>=0:print/pdflib-perl
USES= perl5
USE_PERL5= configure
diff --git a/print/p5-XML-ApacheFOP/Makefile b/print/p5-XML-ApacheFOP/Makefile
index decee5c5881a..8c5a3939de72 100644
--- a/print/p5-XML-ApacheFOP/Makefile
+++ b/print/p5-XML-ApacheFOP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= numisemis@yahoo.com
COMMENT= Access Apache FOP from Perl to create PDF files using XSL-FO
-BUILD_DEPENDS= p5-Java>=0:devel/p5-Java \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Java>=0:devel/p5-Java \
${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/print/p5-XML-Handler-AxPoint/Makefile b/print/p5-XML-Handler-AxPoint/Makefile
index f2d951d441e0..01b4a8b54512 100644
--- a/print/p5-XML-Handler-AxPoint/Makefile
+++ b/print/p5-XML-Handler-AxPoint/Makefile
@@ -14,12 +14,12 @@ COMMENT= XML Based Presentations
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PDFLib>=0.14:print/p5-PDFLib \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PDFLib>=0.14:print/p5-PDFLib \
p5-Text-Iconv>=0:converters/p5-Text-Iconv \
p5-XML-Filter-XSLT>=0:textproc/p5-XML-Filter-XSLT \
p5-XML-SAX>=0.09:textproc/p5-XML-SAX \
p5-XML-SAX-Writer>=0.39:textproc/p5-XML-SAX-Writer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:1.21,1.30
diff --git a/russian/p5-Convert-Cyrillic/Makefile b/russian/p5-Convert-Cyrillic/Makefile
index ab35c4ac4f83..4f7734e0e690 100644
--- a/russian/p5-Convert-Cyrillic/Makefile
+++ b/russian/p5-Convert-Cyrillic/Makefile
@@ -12,8 +12,8 @@ DISTNAME= cyrillic-${PORTVERSION}
MAINTAINER= pluknet@gmail.com
COMMENT= Routines for converting from one Cyrillic charset to another
-BUILD_DEPENDS= p5-Unicode-Map8>=0:converters/p5-Unicode-Map8
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Unicode-Map8>=0:converters/p5-Unicode-Map8
USES= perl5
USE_PERL5= configure
diff --git a/russian/p5-Text-Hyphen-RU/Makefile b/russian/p5-Text-Hyphen-RU/Makefile
index db9738ea53b6..dc5e7766c739 100644
--- a/russian/p5-Text-Hyphen-RU/Makefile
+++ b/russian/p5-Text-Hyphen-RU/Makefile
@@ -13,8 +13,8 @@ COMMENT= Determine positions for hyphens inside russian words
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= p5-Text-Hyphen>=0:textproc/p5-Text-Hyphen
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-Hyphen>=0:textproc/p5-Text-Hyphen
USE_PERL5= configure
USES= perl5
diff --git a/science/p5-Chemistry-File-PDB/Makefile b/science/p5-Chemistry-File-PDB/Makefile
index 6f9629d8d4d6..c0da12e1acba 100644
--- a/science/p5-Chemistry-File-PDB/Makefile
+++ b/science/p5-Chemistry-File-PDB/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to read and write PDB files
-BUILD_DEPENDS= p5-Chemistry-Mol>=0.37:science/p5-Chemistry-Mol \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Chemistry-Mol>=0.37:science/p5-Chemistry-Mol \
p5-Chemistry-MacroMol>=0.06:science/p5-Chemistry-MacroMol
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/science/p5-Chemistry-MacroMol/Makefile b/science/p5-Chemistry-MacroMol/Makefile
index 993e1a290e16..11aa86e8ef48 100644
--- a/science/p5-Chemistry-MacroMol/Makefile
+++ b/science/p5-Chemistry-MacroMol/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl toolkit to describe macromolecules
-BUILD_DEPENDS= p5-Chemistry-Mol>=0.37:science/p5-Chemistry-Mol
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Chemistry-Mol>=0.37:science/p5-Chemistry-Mol
USES= perl5
USE_PERL5= configure
diff --git a/science/p5-Chemistry-Mol/Makefile b/science/p5-Chemistry-Mol/Makefile
index 99858b359c9e..49573625d6a6 100644
--- a/science/p5-Chemistry-Mol/Makefile
+++ b/science/p5-Chemistry-Mol/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl toolkit to describe molecules
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-VectorReal>=1.02:math/p5-Math-VectorReal
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-VectorReal>=1.02:math/p5-Math-VectorReal
USES= perl5
USE_PERL5= configure
diff --git a/science/p5-Geo-Coordinates-Converter-iArea/Makefile b/science/p5-Geo-Coordinates-Converter-iArea/Makefile
index c029e387a37e..fa50b72bc374 100644
--- a/science/p5-Geo-Coordinates-Converter-iArea/Makefile
+++ b/science/p5-Geo-Coordinates-Converter-iArea/Makefile
@@ -14,10 +14,10 @@ COMMENT= Some utility functions around iArea
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CDB_File>=0.96:databases/p5-CDB_File \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CDB_File>=0.96:databases/p5-CDB_File \
p5-File-ShareDir>=1.02:devel/p5-File-ShareDir \
p5-Geo-Coordinates-Converter>=0.09:science/p5-Geo-Coordinates-Converter
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/science/p5-Geo-Coordinates-Converter/Makefile b/science/p5-Geo-Coordinates-Converter/Makefile
index aba612520115..f8f219534bbd 100644
--- a/science/p5-Geo-Coordinates-Converter/Makefile
+++ b/science/p5-Geo-Coordinates-Converter/Makefile
@@ -14,10 +14,10 @@ COMMENT= Simple converter of geo coordinates
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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-String-CamelCase>0:textproc/p5-String-CamelCase \
p5-YAML>0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Base>0:devel/p5-Test-Base
USES= perl5
diff --git a/science/p5-Geo-WebService-Elevation-USGS/Makefile b/science/p5-Geo-WebService-Elevation-USGS/Makefile
index bfb020c42440..95977b937a66 100644
--- a/science/p5-Geo-WebService-Elevation-USGS/Makefile
+++ b/science/p5-Geo-WebService-Elevation-USGS/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl extension for elevation queries against USGS web services
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-JSON>=0:converters/p5-JSON \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= limit:^[0-9\.]*$$
diff --git a/security/p5-Apache-Htpasswd/Makefile b/security/p5-Apache-Htpasswd/Makefile
index 1b4a6fdec360..77a75489af91 100644
--- a/security/p5-Apache-Htpasswd/Makefile
+++ b/security/p5-Apache-Htpasswd/Makefile
@@ -14,10 +14,10 @@ COMMENT= Manage Unix crypt-style password file
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
p5-Digest-SHA1>=2.0:security/p5-Digest-SHA1 \
p5-MIME-Base64>=0:converters/p5-MIME-Base64
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-App-Genpass/Makefile b/security/p5-App-Genpass/Makefile
index 743f98127d55..9888be969fc5 100644
--- a/security/p5-App-Genpass/Makefile
+++ b/security/p5-App-Genpass/Makefile
@@ -15,14 +15,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Config-Any>=0:devel/p5-Config-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Any>=0:devel/p5-Config-Any \
p5-File-HomeDir>=0:devel/p5-File-HomeDir \
p5-List-AllUtils>=0:devel/p5-List-AllUtils \
p5-Math-Random-Secure>=0.06:math/p5-Math-Random-Secure \
p5-Moo>=0:devel/p5-Moo \
p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike \
p5-namespace-clean>=0.20:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Test-Deep>=0:devel/p5-Test-Deep
diff --git a/security/p5-AuthCAS/Makefile b/security/p5-AuthCAS/Makefile
index e114e8eeff95..e9690fcb2321 100644
--- a/security/p5-AuthCAS/Makefile
+++ b/security/p5-AuthCAS/Makefile
@@ -15,10 +15,10 @@ COMMENT= Perl API to Yale's Central Authentication System (CAS)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= sampleCasClient.pl
diff --git a/security/p5-Authen-Captcha/Makefile b/security/p5-Authen-Captcha/Makefile
index 4d39360fce88..fc30b76319fd 100644
--- a/security/p5-Authen-Captcha/Makefile
+++ b/security/p5-Authen-Captcha/Makefile
@@ -12,8 +12,8 @@ COMMENT= Perl module to verify the human element in transactions
LICENSE= GPLv2
-BUILD_DEPENDS= p5-GD>=0:graphics/p5-GD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD>=0:graphics/p5-GD
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Authen-DecHpwd/Makefile b/security/p5-Authen-DecHpwd/Makefile
index 0bea39841528..8bf78945f90c 100644
--- a/security/p5-Authen-DecHpwd/Makefile
+++ b/security/p5-Authen-DecHpwd/Makefile
@@ -12,10 +12,10 @@ COMMENT= Perl module for DEC VMS password hashing
LICENSE= GPLv2+
-BUILD_DEPENDS= p5-Data-Integer>=0:devel/p5-Data-Integer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Integer>=0:devel/p5-Data-Integer \
p5-Digest-CRC>=0:security/p5-Digest-CRC \
p5-Scalar-String>=0:devel/p5-Scalar-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-OATH/Makefile b/security/p5-Authen-OATH/Makefile
index 1c2c8f306677..e9e455b4b358 100644
--- a/security/p5-Authen-OATH/Makefile
+++ b/security/p5-Authen-OATH/Makefile
@@ -15,10 +15,10 @@ COMMENT= OATH one time passwords implementation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Digest-HMAC>0:security/p5-Digest-HMAC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>0:security/p5-Digest-HMAC \
p5-Digest-SHA1>0:security/p5-Digest-SHA1 \
p5-Moose>0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Authen-PAAS/Makefile b/security/p5-Authen-PAAS/Makefile
index 31e83511afc1..b2726790ca98 100644
--- a/security/p5-Authen-PAAS/Makefile
+++ b/security/p5-Authen-PAAS/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl Authentication & Authorization Service
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Config-Record>=1.1.0:devel/p5-Config-Record \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Record>=1.1.0:devel/p5-Config-Record \
p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Authen-Passphrase/Makefile b/security/p5-Authen-Passphrase/Makefile
index 3e5a9cd1671c..486b9dc8fda3 100644
--- a/security/p5-Authen-Passphrase/Makefile
+++ b/security/p5-Authen-Passphrase/Makefile
@@ -14,7 +14,8 @@ COMMENT= Perl module for handling hashed passwords/passphrases as objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-DecHpwd>=0:security/p5-Authen-DecHpwd \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-DecHpwd>=0:security/p5-Authen-DecHpwd \
p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
p5-Crypt-DES>=0:security/p5-Crypt-DES \
p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Authen-DecHpwd>=0:security/p5-Authen-DecHpwd \
p5-Digest-MD4>=0:security/p5-Digest-MD4 \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Params-Classify>=0:devel/p5-Params-Classify
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-PluggableCaptcha/Makefile b/security/p5-Authen-PluggableCaptcha/Makefile
index f56a063c52ef..6d85bd93da80 100644
--- a/security/p5-Authen-PluggableCaptcha/Makefile
+++ b/security/p5-Authen-PluggableCaptcha/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Pluggable Captcha framework for Perl
-BUILD_DEPENDS= p5-Number-Spell>=0:textproc/p5-Number-Spell \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Number-Spell>=0:textproc/p5-Number-Spell \
p5-HTML-Email-Obfuscate>=0:security/p5-HTML-Email-Obfuscate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile
index 7011b3c40b2b..2558d7ef8dd4 100644
--- a/security/p5-Authen-Radius/Makefile
+++ b/security/p5-Authen-Radius/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl5 module to provide simple Radius client facilities
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Data-HexDump>=0.02:devel/p5-Data-HexDump \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-HexDump>=0.02:devel/p5-Data-HexDump \
p5-Net-IP>=1.26:net-mgmt/p5-Net-IP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
REINPLACE_ARGS= -i ''
diff --git a/security/p5-Authen-SASL-Cyrus/Makefile b/security/p5-Authen-SASL-Cyrus/Makefile
index d5a26b916067..177c6f50361c 100644
--- a/security/p5-Authen-SASL-Cyrus/Makefile
+++ b/security/p5-Authen-SASL-Cyrus/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= XS SASL Authentication
-BUILD_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Authen-SASL-SASLprep/Makefile b/security/p5-Authen-SASL-SASLprep/Makefile
index 45fbbc0ed5f3..1032b67c64cd 100644
--- a/security/p5-Authen-SASL-SASLprep/Makefile
+++ b/security/p5-Authen-SASL-SASLprep/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Unicode-Stringprep>=1:converters/p5-Unicode-Stringprep
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Unicode-Stringprep>=1:converters/p5-Unicode-Stringprep
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
NO_ARCH= yes
diff --git a/security/p5-Authen-SASL/Makefile b/security/p5-Authen-SASL/Makefile
index 8ab0572fc6b9..329d85849d18 100644
--- a/security/p5-Authen-SASL/Makefile
+++ b/security/p5-Authen-SASL/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl5 module for SASL authentication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Digest-HMAC>0:security/p5-Digest-HMAC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>0:security/p5-Digest-HMAC
OPTIONS_DEFINE= KERBEROS
OPTIONS_DEFAULT=KERBEROS
diff --git a/security/p5-Authen-SCRAM/Makefile b/security/p5-Authen-SCRAM/Makefile
index 31ca339d4401..543d2e155845 100644
--- a/security/p5-Authen-SCRAM/Makefile
+++ b/security/p5-Authen-SCRAM/Makefile
@@ -13,14 +13,14 @@ COMMENT= Salted Challenge Response Authentication Mechanism (RFC 5802)
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Authen-SASL-SASLprep>=1.100:security/p5-Authen-SASL-SASLprep \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-SASL-SASLprep>=1.100:security/p5-Authen-SASL-SASLprep \
p5-Crypt-URandom>=0:security/p5-Crypt-URandom \
p5-Moo>=1.001000:devel/p5-Moo \
p5-PBKDF2-Tiny>=0.003:security/p5-PBKDF2-Tiny \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-Type-Tiny>=0:devel/p5-Type-Tiny \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings \
p5-Test-Fatal>=0:devel/p5-Test-Fatal
diff --git a/security/p5-Authen-Simple-DBI/Makefile b/security/p5-Authen-Simple-DBI/Makefile
index d6017d5596a3..9801ca6f647f 100644
--- a/security/p5-Authen-Simple-DBI/Makefile
+++ b/security/p5-Authen-Simple-DBI/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple DBI authentication
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-Simple-DBM/Makefile b/security/p5-Authen-Simple-DBM/Makefile
index 721645144411..bee86f943a30 100644
--- a/security/p5-Authen-Simple-DBM/Makefile
+++ b/security/p5-Authen-Simple-DBM/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple DBM authentication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-Simple-HTTP/Makefile b/security/p5-Authen-Simple-HTTP/Makefile
index af294cbafe04..9c4d0fae225d 100644
--- a/security/p5-Authen-Simple-HTTP/Makefile
+++ b/security/p5-Authen-Simple-HTTP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple HTTP authentication
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-Simple-Kerberos/Makefile b/security/p5-Authen-Simple-Kerberos/Makefile
index 99ca3ad4c1f0..0789621314a9 100644
--- a/security/p5-Authen-Simple-Kerberos/Makefile
+++ b/security/p5-Authen-Simple-Kerberos/Makefile
@@ -9,9 +9,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= hrs@FreeBSD.org
COMMENT= Simple Kerberos authentication
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
p5-Authen-Krb5-Simple>=0:security/p5-Authen-Krb5-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-Simple-LDAP/Makefile b/security/p5-Authen-Simple-LDAP/Makefile
index 0ef9a821c42b..eb38a2ae77ff 100644
--- a/security/p5-Authen-Simple-LDAP/Makefile
+++ b/security/p5-Authen-Simple-LDAP/Makefile
@@ -14,9 +14,9 @@ COMMENT= Simple LDAP authentication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
p5-perl-ldap>=0:net/p5-perl-ldap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/security/p5-Authen-Simple-Net/Makefile b/security/p5-Authen-Simple-Net/Makefile
index 86d3d94fe96d..2d60579fef47 100644
--- a/security/p5-Authen-Simple-Net/Makefile
+++ b/security/p5-Authen-Simple-Net/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple authentication via FTP, POP3, or SMTP
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-Simple-PAM/Makefile b/security/p5-Authen-Simple-PAM/Makefile
index c8dd617e355f..b597d2e7e60c 100644
--- a/security/p5-Authen-Simple-PAM/Makefile
+++ b/security/p5-Authen-Simple-PAM/Makefile
@@ -14,9 +14,9 @@ COMMENT= Simple PAM authentication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
p5-Authen-PAM>=0:security/p5-Authen-PAM
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-Simple-Passwd/Makefile b/security/p5-Authen-Simple-Passwd/Makefile
index 29dbae309909..edb70bb0bdbf 100644
--- a/security/p5-Authen-Simple-Passwd/Makefile
+++ b/security/p5-Authen-Simple-Passwd/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple Passwd authentication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-Simple-RADIUS/Makefile b/security/p5-Authen-Simple-RADIUS/Makefile
index 3be394c6eefe..f4d12d3abc67 100644
--- a/security/p5-Authen-Simple-RADIUS/Makefile
+++ b/security/p5-Authen-Simple-RADIUS/Makefile
@@ -14,9 +14,9 @@ COMMENT= Simple RADIUS authentication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
p5-Authen-Radius>=0:security/p5-Authen-Radius
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-Simple-SMB/Makefile b/security/p5-Authen-Simple-SMB/Makefile
index cb4a53cf2658..de2ae7ec280d 100644
--- a/security/p5-Authen-Simple-SMB/Makefile
+++ b/security/p5-Authen-Simple-SMB/Makefile
@@ -14,9 +14,9 @@ COMMENT= Simple SMB authentication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
p5-Authen-Smb>=0:security/p5-Authen-Smb
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Authen-Simple-SSH/Makefile b/security/p5-Authen-Simple-SSH/Makefile
index 4382652f92cb..b1b354a57ad6 100644
--- a/security/p5-Authen-Simple-SSH/Makefile
+++ b/security/p5-Authen-Simple-SSH/Makefile
@@ -14,9 +14,9 @@ COMMENT= Simple SSH authentication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0:security/p5-Authen-Simple \
p5-Net-SSH-Perl>=0:net/p5-Net-SSH-Perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/security/p5-Authen-Simple/Makefile b/security/p5-Authen-Simple/Makefile
index 3c3212b48d06..d2980a1dc7a9 100644
--- a/security/p5-Authen-Simple/Makefile
+++ b/security/p5-Authen-Simple/Makefile
@@ -14,11 +14,11 @@ COMMENT= Simple authentication framework
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-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/security/p5-Authen-TypeKey/Makefile b/security/p5-Authen-TypeKey/Makefile
index 401f86b8b24d..7deb1a9b57b6 100644
--- a/security/p5-Authen-TypeKey/Makefile
+++ b/security/p5-Authen-TypeKey/Makefile
@@ -14,11 +14,11 @@ COMMENT= TypeKey authentication verification
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-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-libwww>=0:www/p5-libwww \
p5-Module-Install>0:devel/p5-Module-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/security/p5-Bytes-Random-Secure/Makefile b/security/p5-Bytes-Random-Secure/Makefile
index 008f4beaae55..4ef8fea8cbbe 100644
--- a/security/p5-Bytes-Random-Secure/Makefile
+++ b/security/p5-Bytes-Random-Secure/Makefile
@@ -13,9 +13,9 @@ COMMENT= Generate cryptographically-secure random bytes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-Random-Seed>=0:security/p5-Crypt-Random-Seed \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Random-Seed>=0:security/p5-Crypt-Random-Seed \
p5-Math-Random-ISAAC>=0:math/p5-Math-Random-ISAAC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/security/p5-CSP/Makefile b/security/p5-CSP/Makefile
index 787854800c8d..5513c68a6690 100644
--- a/security/p5-CSP/Makefile
+++ b/security/p5-CSP/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lx@FreeBSD.org
COMMENT= Perl tool for managing Certificate Authorities
-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-Term-Prompt>=0:devel/p5-Term-Prompt \
p5-IPC-Run>=0:devel/p5-IPC-Run
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-CBCeasy/Makefile b/security/p5-Crypt-CBCeasy/Makefile
index 8b2d0dcf94f8..69da65ed79f1 100644
--- a/security/p5-Crypt-CBCeasy/Makefile
+++ b/security/p5-Crypt-CBCeasy/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Easy things make really easy with Crypt::CBC
-BUILD_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
p5-MD5>=0:security/p5-MD5
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-Ctr/Makefile b/security/p5-Crypt-Ctr/Makefile
index 08db65f82d19..c18804c3e7ec 100644
--- a/security/p5-Crypt-Ctr/Makefile
+++ b/security/p5-Crypt-Ctr/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ashish@FreeBSD.org
COMMENT= Perl extension for encrypting data in Counter Mode
-BUILD_DEPENDS= p5-Crypt-CFB>=0:security/p5-Crypt-CFB
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-CFB>=0:security/p5-Crypt-CFB
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index 8239c287f246..3d92bc36a752 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl5 interface to DES block cipher
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-BUILD_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-DES_EDE3/Makefile b/security/p5-Crypt-DES_EDE3/Makefile
index 7247f5afa2da..7d559b6adda3 100644
--- a/security/p5-Crypt-DES_EDE3/Makefile
+++ b/security/p5-Crypt-DES_EDE3/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl5 interface to a implementing 3-DES EDE encryption and decryption
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-DES>=0:security/p5-Crypt-DES
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-DES>=0:security/p5-Crypt-DES
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-Dining/Makefile b/security/p5-Crypt-Dining/Makefile
index 28ae2dada0cf..512499330e2f 100644
--- a/security/p5-Crypt-Dining/Makefile
+++ b/security/p5-Crypt-Dining/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= The Dining Cryptographers' Protocol
-BUILD_DEPENDS= p5-Crypt-Random>=0:security/p5-Crypt-Random \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Random>=0:security/p5-Crypt-Random \
p5-Net-Address-IPv4-Local>=0:net/p5-Net-Address-IPv4-Local
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-Eksblowfish/Makefile b/security/p5-Crypt-Eksblowfish/Makefile
index ae41e953d224..f8d742fde093 100644
--- a/security/p5-Crypt-Eksblowfish/Makefile
+++ b/security/p5-Crypt-Eksblowfish/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl module for the Eksblowfish block cipher
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Mix>=0:devel/p5-Class-Mix
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Mix>=0:devel/p5-Class-Mix
USES= perl5
USE_PERL5= modbuild
diff --git a/security/p5-Crypt-HCE_SHA/Makefile b/security/p5-Crypt-HCE_SHA/Makefile
index be94d4b9d9a3..55af9c1dfd4e 100644
--- a/security/p5-Crypt-HCE_SHA/Makefile
+++ b/security/p5-Crypt-HCE_SHA/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Perl5 interface to one way hash chaining block cipher
-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/security/p5-Crypt-Lite/Makefile b/security/p5-Crypt-Lite/Makefile
index bf0d0b525da1..252d4a23e9fe 100644
--- a/security/p5-Crypt-Lite/Makefile
+++ b/security/p5-Crypt-Lite/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ashish@FreeBSD.org
COMMENT= Perl extension for a symmetric data encryption and decryption
-BUILD_DEPENDS= p5-MIME-Base64>=0:converters/p5-MIME-Base64
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MIME-Base64>=0:converters/p5-MIME-Base64
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-OFB/Makefile b/security/p5-Crypt-OFB/Makefile
index 76cf3dd0dd1f..5aa943c7731d 100644
--- a/security/p5-Crypt-OFB/Makefile
+++ b/security/p5-Crypt-OFB/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Encrypt Data using OFB Mode
-BUILD_DEPENDS= p5-Crypt-ECB>=0:security/p5-Crypt-ECB
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-ECB>=0:security/p5-Crypt-ECB
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-OpenSSL-CA/Makefile b/security/p5-Crypt-OpenSSL-CA/Makefile
index 3d5a4190f69f..55eaf1dd1548 100644
--- a/security/p5-Crypt-OpenSSL-CA/Makefile
+++ b/security/p5-Crypt-OpenSSL-CA/Makefile
@@ -16,14 +16,14 @@ LICENSE_COMB= dual
# Note: The Devel::Mallinfo dependency doesn't work on FreeBSD; mallinfo()
# is a GNU libc function.
-BUILD_DEPENDS= p5-Convert-ASN1>=0.02:converters/p5-Convert-ASN1 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Convert-ASN1>=0.02:converters/p5-Convert-ASN1 \
p5-Devel-Leak>=0:devel/p5-Devel-Leak \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-IPC-Run>=0:devel/p5-IPC-Run \
p5-Inline>=0.40:devel/p5-Inline \
p5-Inline-C>=0:devel/p5-Inline-C \
p5-Net-SSLeay>=1.25:security/p5-Net-SSLeay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Group>=0:devel/p5-Test-Group \
p5-Test-Taint>=0:devel/p5-Test-Taint
diff --git a/security/p5-Crypt-OpenSSL-EC/Makefile b/security/p5-Crypt-OpenSSL-EC/Makefile
index fd2930797c89..24ff3e4d0919 100644
--- a/security/p5-Crypt-OpenSSL-EC/Makefile
+++ b/security/p5-Crypt-OpenSSL-EC/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl extension for OpenSSL EC (Elliptic Curves) library
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-OpenSSL-Bignum>=0.04:security/p5-Crypt-OpenSSL-Bignum
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-OpenSSL-Bignum>=0.04:security/p5-Crypt-OpenSSL-Bignum
USES= perl5 ssl
USE_PERL5= configure
diff --git a/security/p5-Crypt-OpenSSL-ECDSA/Makefile b/security/p5-Crypt-OpenSSL-ECDSA/Makefile
index 59318ffade23..ad1877b7fbb2 100644
--- a/security/p5-Crypt-OpenSSL-ECDSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-ECDSA/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl extension for OpenSSL ECDSA
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-OpenSSL-EC>=0.05:security/p5-Crypt-OpenSSL-EC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-OpenSSL-EC>=0.05:security/p5-Crypt-OpenSSL-EC
BROKEN_SSL= openssl-devel
diff --git a/security/p5-Crypt-OpenSSL-PKCS10/Makefile b/security/p5-Crypt-OpenSSL-PKCS10/Makefile
index 5ddd8dca4d61..5156583a3768 100644
--- a/security/p5-Crypt-OpenSSL-PKCS10/Makefile
+++ b/security/p5-Crypt-OpenSSL-PKCS10/Makefile
@@ -11,8 +11,8 @@ COMMENT= Perl extension for OpenSSL PKCS10 API
LICENSE= ART10
-BUILD_DEPENDS= p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA
USES= perl5 ssl
USE_PERL5= configure
diff --git a/security/p5-Crypt-PBKDF2/Makefile b/security/p5-Crypt-PBKDF2/Makefile
index f5a8709f9f97..1a38911e9179 100644
--- a/security/p5-Crypt-PBKDF2/Makefile
+++ b/security/p5-Crypt-PBKDF2/Makefile
@@ -13,7 +13,8 @@ COMMENT= PBKDF2 password hashing algorithm
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Digest-HMAC>=1.01:security/p5-Digest-HMAC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>=1.01:security/p5-Digest-HMAC \
p5-Digest-SHA3>=0.22:security/p5-Digest-SHA3 \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Moo>=2:devel/p5-Moo \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Digest-HMAC>=1.01:security/p5-Digest-HMAC \
p5-Type-Tiny>=0:devel/p5-Type-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
p5-strictures>=2:devel/p5-strictures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
USES= perl5
diff --git a/security/p5-Crypt-PKCS10/Makefile b/security/p5-Crypt-PKCS10/Makefile
index 61087e276409..bb993390286f 100644
--- a/security/p5-Crypt-PKCS10/Makefile
+++ b/security/p5-Crypt-PKCS10/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Convert-ASN1>=0.27:converters/p5-Convert-ASN1 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Convert-ASN1>=0.27:converters/p5-Convert-ASN1 \
p5-Crypt-OpenSSL-DSA>0:security/p5-Crypt-OpenSSL-DSA \
p5-Crypt-OpenSSL-RSA>0:security/p5-Crypt-OpenSSL-RSA \
p5-CryptX>0:security/p5-CryptX \
p5-Digest-MD2>0:security/p5-Digest-MD2 \
p5-Digest-MD4>0:security/p5-Digest-MD4
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Module-Signature>0:security/p5-Module-Signature
PORTSCOUT= ignore:1.800201,1.8002
diff --git a/security/p5-Crypt-PWSafe3/Makefile b/security/p5-Crypt-PWSafe3/Makefile
index ba972e81d5ea..f1ccf456ab5a 100644
--- a/security/p5-Crypt-PWSafe3/Makefile
+++ b/security/p5-Crypt-PWSafe3/Makefile
@@ -12,13 +12,13 @@ COMMENT= Read and write Passwordsafe v3 files
LICENSE= ART20
-BUILD_DEPENDS= p5-Digest-HMAC>=1.00:security/p5-Digest-HMAC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>=1.00:security/p5-Digest-HMAC \
p5-Crypt-CBC>=2.30:security/p5-Crypt-CBC \
p5-Crypt-ECB>=1.45:security/p5-Crypt-ECB \
p5-Crypt-Twofish>=2.14:security/p5-Crypt-Twofish \
p5-Crypt-Random>=1.25:security/p5-Crypt-Random \
p5-Data-UUID>=1.217:devel/p5-Data-UUID
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-Password-Util/Makefile b/security/p5-Crypt-Password-Util/Makefile
index 2fe73cba974f..5d854fd4699f 100644
--- a/security/p5-Crypt-Password-Util/Makefile
+++ b/security/p5-Crypt-Password-Util/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Bytes-Random-Secure>=0:security/p5-Bytes-Random-Secure
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bytes-Random-Secure>=0:security/p5-Bytes-Random-Secure
TEST_DEPENDS= p5-Sort-Versions>=0:devel/p5-Sort-Versions
NO_ARCH= yes
diff --git a/security/p5-Crypt-Primes/Makefile b/security/p5-Crypt-Primes/Makefile
index 7710eee5f01e..ac2a659b3acc 100644
--- a/security/p5-Crypt-Primes/Makefile
+++ b/security/p5-Crypt-Primes/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Provable Prime Number Generator suitable for Cryptographic Applications
-BUILD_DEPENDS= p5-Crypt-Random>=0:security/p5-Crypt-Random \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Random>=0:security/p5-Crypt-Random \
p5-Math-Pari>=0:math/p5-Math-Pari
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-RSA/Makefile b/security/p5-Crypt-RSA/Makefile
index abfec77645f6..121d8c86b622 100644
--- a/security/p5-Crypt-RSA/Makefile
+++ b/security/p5-Crypt-RSA/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/ARTISTIC
-BUILD_DEPENDS= p5-Class-Loader>=2.00:devel/p5-Class-Loader \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Loader>=2.00:devel/p5-Class-Loader \
p5-Convert-ASCII-Armour>=0:converters/p5-Convert-ASCII-Armour \
p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
@@ -27,7 +28,6 @@ BUILD_DEPENDS= p5-Class-Loader>=2.00:devel/p5-Class-Loader \
p5-Math-Pari>=2.001804:math/p5-Math-Pari \
p5-Sort-Versions>=0:devel/p5-Sort-Versions \
p5-Tie-EncryptedHash>=0:security/p5-Tie-EncryptedHash
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-Random-Seed/Makefile b/security/p5-Crypt-Random-Seed/Makefile
index efa735b12b1f..4242a89e94ac 100644
--- a/security/p5-Crypt-Random-Seed/Makefile
+++ b/security/p5-Crypt-Random-Seed/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Crypt-Random-TESHA2>=0:security/p5-Crypt-Random-TESHA2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Random-TESHA2>=0:security/p5-Crypt-Random-TESHA2
NO_ARCH= yes
USE_PERL5= configure
diff --git a/security/p5-Crypt-Random-Source/Makefile b/security/p5-Crypt-Random-Source/Makefile
index ab717291a19d..313805f84483 100644
--- a/security/p5-Crypt-Random-Source/Makefile
+++ b/security/p5-Crypt-Random-Source/Makefile
@@ -12,13 +12,13 @@ COMMENT= Get weak or strong random data from pluggable sources
LICENSE= ART20
-BUILD_DEPENDS= p5-Moo>=1.002000:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=1.002000:devel/p5-Moo \
p5-Capture-Tiny>=0.08:devel/p5-Capture-Tiny \
p5-Module-Find>=0:devel/p5-Module-Find \
p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny \
p5-namespace-clean>=0.08:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/security/p5-Crypt-Random/Makefile b/security/p5-Crypt-Random/Makefile
index 97f91faa1fa3..c11bbad159ab 100644
--- a/security/p5-Crypt-Random/Makefile
+++ b/security/p5-Crypt-Random/Makefile
@@ -14,9 +14,9 @@ COMMENT= Cryptographically Secure, True Random Number Generator
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Math-Pari>=0:math/p5-Math-Pari \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Math-Pari>=0:math/p5-Math-Pari \
p5-Class-Loader>=0:devel/p5-Class-Loader
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-SKey/Makefile b/security/p5-Crypt-SKey/Makefile
index 5fc2f7daab07..d28036495073 100644
--- a/security/p5-Crypt-SKey/Makefile
+++ b/security/p5-Crypt-SKey/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ashish@FreeBSD.org
COMMENT= Perl S/Key calculator
-BUILD_DEPENDS= p5-Digest-MD4>=0:security/p5-Digest-MD4 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-MD4>=0:security/p5-Digest-MD4 \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-Twofish_PP/Makefile b/security/p5-Crypt-Twofish_PP/Makefile
index 3b84f2f7a80c..4a544d080cec 100644
--- a/security/p5-Crypt-Twofish_PP/Makefile
+++ b/security/p5-Crypt-Twofish_PP/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kostjnspb@yandex.ru
COMMENT= The Twofish Algorithm in Pure Perl
-BUILD_DEPENDS= p5-Locale-libintl>=0:devel/p5-Locale-libintl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Locale-libintl>=0:devel/p5-Locale-libintl
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-X509-CRL/Makefile b/security/p5-Crypt-X509-CRL/Makefile
index 66e229f7d103..acf08190a2cf 100644
--- a/security/p5-Crypt-X509-CRL/Makefile
+++ b/security/p5-Crypt-X509-CRL/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/README
-BUILD_DEPENDS= p5-Convert-ASN1>=0.19:converters/p5-Convert-ASN1
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Convert-ASN1>=0.19:converters/p5-Convert-ASN1
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-X509/Makefile b/security/p5-Crypt-X509/Makefile
index 05b5e80e6b39..985fb3127f37 100644
--- a/security/p5-Crypt-X509/Makefile
+++ b/security/p5-Crypt-X509/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ashish@FreeBSD.org
COMMENT= Perl extension to parse X.509 certificates
-BUILD_DEPENDS= p5-Convert-ASN1>=0:converters/p5-Convert-ASN1
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Convert-ASN1>=0:converters/p5-Convert-ASN1
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Crypt-XTEA/Makefile b/security/p5-Crypt-XTEA/Makefile
index 402097af6405..dc6474451c00 100644
--- a/security/p5-Crypt-XTEA/Makefile
+++ b/security/p5-Crypt-XTEA/Makefile
@@ -13,8 +13,8 @@ COMMENT= Implementation of the eXtended Tiny Encryption Algorithm
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Scalar-Util-Numeric>=0.40:devel/p5-Scalar-Util-Numeric
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Scalar-Util-Numeric>=0.40:devel/p5-Scalar-Util-Numeric
TEST_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC
USES= perl5
diff --git a/security/p5-Crypt-xDBM_File/Makefile b/security/p5-Crypt-xDBM_File/Makefile
index b2d22e122a07..d8a5fc13127c 100644
--- a/security/p5-Crypt-xDBM_File/Makefile
+++ b/security/p5-Crypt-xDBM_File/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module encrypt almost any kind of dbm file
-BUILD_DEPENDS= p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile b/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
index 9a96d0b6bea6..8d4cf067e8d4 100644
--- a/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
+++ b/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
@@ -14,11 +14,11 @@ COMMENT= Extensible authentication framework for Dancer apps
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer>=1.3118:www/p5-Dancer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer>=1.3118:www/p5-Dancer \
p5-Dancer-Plugin-Auth-Extensible>=0:security/p5-Dancer-Plugin-Auth-Extensible \
p5-Dancer-Plugin-Passphrase>=0:security/p5-Dancer-Plugin-Passphrase \
p5-Dancer-Plugin-DBIC>=0:databases/p5-Dancer-Plugin-DBIC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Dancer-Plugin-Auth-Extensible/Makefile b/security/p5-Dancer-Plugin-Auth-Extensible/Makefile
index b7f93daef5f3..28d75daa614a 100644
--- a/security/p5-Dancer-Plugin-Auth-Extensible/Makefile
+++ b/security/p5-Dancer-Plugin-Auth-Extensible/Makefile
@@ -13,9 +13,9 @@ COMMENT= Extensible authentication framework for Dancer apps
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-SaltedHash>=0:security/p5-Crypt-SaltedHash \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-SaltedHash>=0:security/p5-Crypt-SaltedHash \
p5-Dancer>=1.3118:www/p5-Dancer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Dancer-Plugin-Passphrase/Makefile b/security/p5-Dancer-Plugin-Passphrase/Makefile
index b724d887e191..40b97e30d613 100644
--- a/security/p5-Dancer-Plugin-Passphrase/Makefile
+++ b/security/p5-Dancer-Plugin-Passphrase/Makefile
@@ -16,10 +16,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Dancer>=0:www/p5-Dancer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer>=0:www/p5-Dancer \
p5-Data-Entropy>=0.005:security/p5-Data-Entropy \
p5-Digest-Bcrypt>=0:security/p5-Digest-Bcrypt
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC/Makefile b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC/Makefile
index d225a9aa5d16..811c28b7cbbf 100644
--- a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC/Makefile
+++ b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC/Makefile
@@ -13,11 +13,11 @@ COMMENT= Extensible authentication framework for Dancer2 apps using DBIC
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBIx-Class>=0:databases/p5-DBIx-Class \
p5-Dancer2-Plugin-Auth-Extensible>=0.600:security/p5-Dancer2-Plugin-Auth-Extensible \
p5-Dancer2-Plugin-DBIC>=0:databases/p5-Dancer2-Plugin-DBIC \
p5-String-CamelCase>=0:textproc/p5-String-CamelCase
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Class-Load>=0:devel/p5-Class-Load \
p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite \
p5-Path-Tiny>=0:devel/p5-Path-Tiny
diff --git a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Database/Makefile b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Database/Makefile
index e96f3c3e0e2d..a336349ea940 100644
--- a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Database/Makefile
+++ b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Database/Makefile
@@ -13,9 +13,9 @@ COMMENT= Extensible authentication for D2 apps using Dancer2-Plugin-Database
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer2-Plugin-Auth-Extensible>=0.600:security/p5-Dancer2-Plugin-Auth-Extensible \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer2-Plugin-Auth-Extensible>=0.600:security/p5-Dancer2-Plugin-Auth-Extensible \
p5-Dancer2-Plugin-Database>=0.600:databases/p5-Dancer2-Plugin-Database
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-IMAP/Makefile b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-IMAP/Makefile
index 20409fc3654a..1cac3eb8f93d 100644
--- a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-IMAP/Makefile
+++ b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-IMAP/Makefile
@@ -13,9 +13,9 @@ COMMENT= Extensible authentication for D2 apps using Net::IMAP::Simple
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer2-Plugin-Auth-Extensible>=0.620:security/p5-Dancer2-Plugin-Auth-Extensible \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer2-Plugin-Auth-Extensible>=0.620:security/p5-Dancer2-Plugin-Auth-Extensible \
p5-Net-IMAP-Simple>=0:mail/p5-Net-IMAP-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Usergroup/Makefile b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
index c3528d46fe17..fac6ba234c81 100644
--- a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
+++ b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
@@ -13,11 +13,11 @@ COMMENT= Extensible authentication framework for Dancer2 apps
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer2>=0.204001:www/p5-Dancer2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer2>=0.204001:www/p5-Dancer2 \
p5-Dancer2-Plugin-Auth-Extensible>=0.620:security/p5-Dancer2-Plugin-Auth-Extensible \
p5-Dancer2-Plugin-Passphrase>=3.3.0:security/p5-Dancer2-Plugin-Passphrase \
p5-Dancer2-Plugin-DBIC>=0.0013:databases/p5-Dancer2-Plugin-DBIC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/security/p5-Dancer2-Plugin-Passphrase/Makefile b/security/p5-Dancer2-Plugin-Passphrase/Makefile
index 04f093cf8b77..0c3958c02484 100644
--- a/security/p5-Dancer2-Plugin-Passphrase/Makefile
+++ b/security/p5-Dancer2-Plugin-Passphrase/Makefile
@@ -14,10 +14,10 @@ COMMENT= Passphrases and Passwords as objects for Dancer2
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer2>=0.200000:www/p5-Dancer2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer2>=0.200000:www/p5-Dancer2 \
p5-Data-Entropy>=0.005:security/p5-Data-Entropy \
p5-Digest-Bcrypt>=0:security/p5-Digest-Bcrypt
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/security/p5-Digest-Adler32/Makefile b/security/p5-Digest-Adler32/Makefile
index 912301814559..af5d3efb47fb 100644
--- a/security/p5-Digest-Adler32/Makefile
+++ b/security/p5-Digest-Adler32/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Perl extension for Adler32 hash algorithm
-BUILD_DEPENDS= p5-Digest>=0:security/p5-Digest
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest>=0:security/p5-Digest
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Digest-Bcrypt/Makefile b/security/p5-Digest-Bcrypt/Makefile
index ee8a10abcb2c..b5159a201427 100644
--- a/security/p5-Digest-Bcrypt/Makefile
+++ b/security/p5-Digest-Bcrypt/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Crypt-Eksblowfish>0:security/p5-Crypt-Eksblowfish
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Eksblowfish>0:security/p5-Crypt-Eksblowfish
TEST_DEPENDS= p5-Try-Tiny>=0.24:lang/p5-Try-Tiny
USES= perl5
diff --git a/security/p5-Digest-DMAC/Makefile b/security/p5-Digest-DMAC/Makefile
index 48d7d029a779..0a750c402dd2 100644
--- a/security/p5-Digest-DMAC/Makefile
+++ b/security/p5-Digest-DMAC/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Perl5 interface to DMAC Double Message-Digest Algorithms
-BUILD_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
p5-MIME-Base64>=0:converters/p5-MIME-Base64
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Digest-EMAC/Makefile b/security/p5-Digest-EMAC/Makefile
index d9c45c0c79fc..3e74191e0fde 100644
--- a/security/p5-Digest-EMAC/Makefile
+++ b/security/p5-Digest-EMAC/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Perl5 interface to EMAC Double Message-Digest Algorithms
-BUILD_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
p5-MIME-Base64>=0:converters/p5-MIME-Base64
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-File-KeePass-Agent/Makefile b/security/p5-File-KeePass-Agent/Makefile
index 5f11ca7471d3..2373f4c0f35d 100644
--- a/security/p5-File-KeePass-Agent/Makefile
+++ b/security/p5-File-KeePass-Agent/Makefile
@@ -14,10 +14,10 @@ COMMENT= Application agent for working with File::KeePass objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-KeePass>=2.03:security/p5-File-KeePass \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-KeePass>=2.03:security/p5-File-KeePass \
p5-Crypt-Rijndael>=1.0:security/p5-Crypt-Rijndael \
p5-MIME-Base64>=1.0:converters/p5-MIME-Base64
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-File-KeePass/Makefile b/security/p5-File-KeePass/Makefile
index 4591a885a4c3..cea30c184987 100644
--- a/security/p5-File-KeePass/Makefile
+++ b/security/p5-File-KeePass/Makefile
@@ -14,10 +14,10 @@ COMMENT= Interface to KeePassX, KeePass 1.x and 2.x database files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-Rijndael>=1.0:security/p5-Crypt-Rijndael \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Rijndael>=1.0:security/p5-Crypt-Rijndael \
p5-MIME-Base64>=1.0:converters/p5-MIME-Base64 \
p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile
index 055d77f972d7..640c6f49adc5 100644
--- a/security/p5-File-Scan-ClamAV/Makefile
+++ b/security/p5-File-Scan-ClamAV/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= clamscan:security/clamav
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= clamscan:security/clamav
NO_ARCH= yes
USES= perl5
diff --git a/security/p5-Filter-CBC/Makefile b/security/p5-Filter-CBC/Makefile
index bc28821daf41..9d4af9b57f1f 100644
--- a/security/p5-Filter-CBC/Makefile
+++ b/security/p5-Filter-CBC/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Source filter for Cipher Block Chaining
-BUILD_DEPENDS= p5-Filter>=0:devel/p5-Filter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Filter>=0:devel/p5-Filter \
p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
p5-Crypt-CBC>=0:security/p5-Crypt-CBC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PLIST_SUB= EXAMPLESDIR="share/examples/${PORTNAME}"
USES= perl5 shebangfix
diff --git a/security/p5-Filter-Crypto/Makefile b/security/p5-Filter-Crypto/Makefile
index d42ad3e20dda..b8778ae64709 100644
--- a/security/p5-Filter-Crypto/Makefile
+++ b/security/p5-Filter-Crypto/Makefile
@@ -13,8 +13,8 @@ COMMENT= Create runnable Perl files encrypted with OpenSSL libcrypto
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-PAR-Packer>=0:devel/p5-PAR-Packer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PAR-Packer>=0:devel/p5-PAR-Packer
TEST_DEPENDS= p5-CPAN-Changes>=0:devel/p5-CPAN-Changes
USES= perl5 ssl
diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile
index 6a4b9f9a1d64..9ca85cec8178 100644
--- a/security/p5-GD-SecurityImage/Makefile
+++ b/security/p5-GD-SecurityImage/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl5 module for creating CAPTCHA security images
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-GD>=0:graphics/p5-GD
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-GD>=0:graphics/p5-GD
OPTIONS_DEFINE= IMAGEMAGICK X11
OPTIONS_DEFAULT=X11
diff --git a/security/p5-HTML-Email-Obfuscate/Makefile b/security/p5-HTML-Email-Obfuscate/Makefile
index 8ee9748aa934..01e253fa668e 100644
--- a/security/p5-HTML-Email-Obfuscate/Makefile
+++ b/security/p5-HTML-Email-Obfuscate/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Obfuscates HTML email addresses that look normal
-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/security/p5-IO-Async-SSL/Makefile b/security/p5-IO-Async-SSL/Makefile
index d23c2c9bcd25..775716a9cca6 100644
--- a/security/p5-IO-Async-SSL/Makefile
+++ b/security/p5-IO-Async-SSL/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Future>=0.33:devel/p5-Future \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Future>=0.33:devel/p5-Future \
p5-IO-Async>=0.66:devel/p5-IO-Async\
p5-IO-Socket-SSL>=2.003:security/p5-IO-Socket-SSL
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Identity>=0:devel/p5-Test-Identity \
p5-Test-Pod>=1:devel/p5-Test-Pod \
socat:net/socat
diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile
index 3d3abe93eaf4..5f060af69559 100644
--- a/security/p5-IO-Socket-SSL/Makefile
+++ b/security/p5-IO-Socket-SSL/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/lib/IO/Socket/SSL.pod
-BUILD_DEPENDS= p5-Net-SSLeay>=1.59:security/p5-Net-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-SSLeay>=1.59:security/p5-Net-SSLeay \
p5-Mozilla-CA>=20130114:www/p5-Mozilla-CA
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5 shebangfix
diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile
index 1e4681547722..e31011450398 100644
--- a/security/p5-Module-Signature/Makefile
+++ b/security/p5-Module-Signature/Makefile
@@ -29,10 +29,8 @@ OPTIONS_MULTI_GPG= GPG1 GPG2
GPG1_DESC= Use GnuPG version 1
GPG2_DESC= Use GnuPG version 2
-GPG1_BUILD_DEPENDS= gpgv:security/gnupg1
-GPG1_RUN_DEPENDS= ${GPG1_BUILD_DEPENDS}
+GPG1_RUN_DEPENDS= gpgv:security/gnupg1
-GPG2_BUILD_DEPENDS= gpgv2:security/gnupg
-GPG2_RUN_DEPENDS= ${GPG2_BUILD_DEPENDS}
+GPG2_RUN_DEPENDS= gpgv2:security/gnupg
.include <bsd.port.mk>
diff --git a/security/p5-Net-OpenID-Common/Makefile b/security/p5-Net-OpenID-Common/Makefile
index da28d3faa5ac..411680102854 100644
--- a/security/p5-Net-OpenID-Common/Makefile
+++ b/security/p5-Net-OpenID-Common/Makefile
@@ -12,13 +12,13 @@ COMMENT= Libraries shared between Net::OpenID::Consumer and Net::OpenID::Server
LICENSE= ARTPERL10
-BUILD_DEPENDS= p5-Crypt-DH-GMP>=0:net/p5-Crypt-DH-GMP \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-DH-GMP>=0:net/p5-Crypt-DH-GMP \
p5-Email-MIME-ContentType>=0:mail/p5-Email-MIME-ContentType \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-URI>=0:net/p5-URI \
p5-XML-Simple>=0:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Net-OpenID-JanRain/Makefile b/security/p5-Net-OpenID-JanRain/Makefile
index 4ac8fd3e323a..28a3a6c69b2a 100644
--- a/security/p5-Net-OpenID-JanRain/Makefile
+++ b/security/p5-Net-OpenID-JanRain/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= OpenID JanRain and Consumer with JanRain API
-BUILD_DEPENDS= p5-Crypt-DH>=0:security/p5-Crypt-DH \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-DH>=0:security/p5-Crypt-DH \
p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-LWPx-ParanoidAgent>=0:www/p5-LWPx-ParanoidAgent \
p5-Net-Yadis>=0:net/p5-Net-Yadis \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Net-OpenID-Server/Makefile b/security/p5-Net-OpenID-Server/Makefile
index 965b8ea91ae8..7d5fd0a23efb 100644
--- a/security/p5-Net-OpenID-Server/Makefile
+++ b/security/p5-Net-OpenID-Server/Makefile
@@ -14,9 +14,9 @@ COMMENT= Reference implementation of OpenID server
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-OpenID-Common>=1.11:security/p5-Net-OpenID-Common \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-OpenID-Common>=1.11:security/p5-Net-OpenID-Common \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
INSTALL_TARGET= pure_install
USES= perl5
diff --git a/security/p5-Net-SSH-AuthorizedKeysFile/Makefile b/security/p5-Net-SSH-AuthorizedKeysFile/Makefile
index a1dfc417af83..938cc8a6b867 100644
--- a/security/p5-Net-SSH-AuthorizedKeysFile/Makefile
+++ b/security/p5-Net-SSH-AuthorizedKeysFile/Makefile
@@ -13,8 +13,8 @@ COMMENT= Read and modify SSH authorized_keys files
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Log4perl>=1:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Log4perl>=1:devel/p5-Log-Log4perl
NO_ARCH= yes
USES= perl5
diff --git a/security/p5-Net-SSL-ExpireDate/Makefile b/security/p5-Net-SSL-ExpireDate/Makefile
index c73b06fd954f..94a9ec0f3631 100644
--- a/security/p5-Net-SSL-ExpireDate/Makefile
+++ b/security/p5-Net-SSL-ExpireDate/Makefile
@@ -13,13 +13,13 @@ COMMENT= Obtain expiration date of certificate
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-Crypt-OpenSSL-X509>=0:security/p5-Crypt-OpenSSL-X509 \
p5-DateTime>=0:devel/p5-DateTime \
p5-Time-Duration-Parse>=0:devel/p5-Time-Duration-Parse \
p5-TimeDate>=0:devel/p5-TimeDate \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/security/p5-Net-SSLGlue/Makefile b/security/p5-Net-SSLGlue/Makefile
index 03623df52f7c..c93d6eebebb2 100644
--- a/security/p5-Net-SSLGlue/Makefile
+++ b/security/p5-Net-SSLGlue/Makefile
@@ -13,8 +13,8 @@ COMMENT= Add/extend SSL support for common perl modules
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>=1.190:security/p5-IO-Socket-SSL
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=1.190:security/p5-IO-Socket-SSL
NO_ARCH= yes
USE_PERL5= configure
diff --git a/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile b/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
index 7d849ac03da2..1adaa0d50d58 100644
--- a/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
+++ b/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
@@ -13,8 +13,8 @@ COMMENT= Plain and login auth methods for Net::Server::Mail::ESMTP
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-Server-Mail>=0:mail/p5-Net-Server-Mail
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Server-Mail>=0:mail/p5-Net-Server-Mail
NO_ARCH= yes
USES= perl5
diff --git a/security/p5-Net-SinFP/Makefile b/security/p5-Net-SinFP/Makefile
index cdcabd7ca6b2..5100ceb831e6 100644
--- a/security/p5-Net-SinFP/Makefile
+++ b/security/p5-Net-SinFP/Makefile
@@ -33,11 +33,11 @@ NOT_FOR_ARCHS_REASON= does not support big-endian architectures
.if ${PORTNAME} == "Net-SinFP"
PKGNAMEPREFIX= p5-
-BUILD_DEPENDS+= p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
p5-DBIx-SQLite-Simple>=0.33:databases/p5-DBIx-SQLite-Simple \
p5-Net-Packet>=3.00:net/p5-Net-Packet \
p5-Net-Packet-Target>=1.00:net/p5-Net-Packet-Target
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Nmap-Scanner/Makefile b/security/p5-Nmap-Scanner/Makefile
index 7dd7be8e344b..db77a5016f77 100644
--- a/security/p5-Nmap-Scanner/Makefile
+++ b/security/p5-Nmap-Scanner/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perform and manipulate nmap scans using perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= nmap:security/nmap \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= nmap:security/nmap \
p5-Class-Generate>=0:devel/p5-Class-Generate \
p5-XML-SAX>=0:textproc/p5-XML-SAX \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/security/p5-OpenCA-OpenSSL/Makefile b/security/p5-OpenCA-OpenSSL/Makefile
index 42e6805d6f2c..d43049b1bc4a 100644
--- a/security/p5-OpenCA-OpenSSL/Makefile
+++ b/security/p5-OpenCA-OpenSSL/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl crypto extension to OpenSSL
-BUILD_DEPENDS= p5-Locale-libintl>=0:devel/p5-Locale-libintl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Locale-libintl>=0:devel/p5-Locale-libintl \
p5-MIME-Tools>=0:mail/p5-MIME-Tools \
p5-X500-DN>=0:net/p5-X500-DN
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 ssl
USE_PERL5= configure
diff --git a/security/p5-OpenCA-PKCS7/Makefile b/security/p5-OpenCA-PKCS7/Makefile
index 54869b8ef477..08fbcdb7b21a 100644
--- a/security/p5-OpenCA-PKCS7/Makefile
+++ b/security/p5-OpenCA-PKCS7/Makefile
@@ -13,10 +13,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for basic handling PKCS\#7 Signatures
-BUILD_DEPENDS= p5-OpenCA-OpenSSL>=0:security/p5-OpenCA-OpenSSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-OpenCA-OpenSSL>=0:security/p5-OpenCA-OpenSSL \
p5-OpenCA-X509>=0:security/p5-OpenCA-X509 \
p5-X500-DN>=0:net/p5-X500-DN
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:0.9.13
diff --git a/security/p5-OpenCA-REQ/Makefile b/security/p5-OpenCA-REQ/Makefile
index 9d3ec6ffa8ae..27fe90340108 100644
--- a/security/p5-OpenCA-REQ/Makefile
+++ b/security/p5-OpenCA-REQ/Makefile
@@ -13,8 +13,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/0$//}
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension to easily manage Cert REQUESTs
-BUILD_DEPENDS= p5-X500-DN>=0:net/p5-X500-DN
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-X500-DN>=0:net/p5-X500-DN
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-OpenCA-X509/Makefile b/security/p5-OpenCA-X509/Makefile
index 5591e9b35539..5732757abb8a 100644
--- a/security/p5-OpenCA-X509/Makefile
+++ b/security/p5-OpenCA-X509/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for handling X509 Certificates
-BUILD_DEPENDS= p5-X500-DN>=0:net/p5-X500-DN
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-X500-DN>=0:net/p5-X500-DN
USES= perl5 shebangfix
SHEBANG_FILES= prova.pl
diff --git a/security/p5-POE-Component-SSLify/Makefile b/security/p5-POE-Component-SSLify/Makefile
index 910fce5b5525..87b5b7ea6337 100644
--- a/security/p5-POE-Component-SSLify/Makefile
+++ b/security/p5-POE-Component-SSLify/Makefile
@@ -13,10 +13,10 @@ COMMENT= Integrate SSL into POE
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-SSLeay>=1.36:security/p5-Net-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-SSLeay>=1.36:security/p5-Net-SSLeay \
p5-POE>=1.267:devel/p5-POE \
p5-Task-Weaken>=1.03:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings
USES= perl5
diff --git a/security/p5-POE-Filter-SSL/Makefile b/security/p5-POE-Filter-SSL/Makefile
index ffa47cb760c6..6c62009069cf 100644
--- a/security/p5-POE-Filter-SSL/Makefile
+++ b/security/p5-POE-Filter-SSL/Makefile
@@ -13,10 +13,10 @@ COMMENT= Esiest and flexiblest way to SSL in POEIntegrate SSL into POE
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-Net-SSLeay>=1.65:security/p5-Net-SSLeay \
p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:0.291
diff --git a/security/p5-Parse-Snort/Makefile b/security/p5-Parse-Snort/Makefile
index 4b0fdd4b2eaf..0ee5af13420e 100644
--- a/security/p5-Parse-Snort/Makefile
+++ b/security/p5-Parse-Snort/Makefile
@@ -12,8 +12,8 @@ COMMENT= Parse and create Snort rules
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/security/p5-Sudo/Makefile b/security/p5-Sudo/Makefile
index 624f0b66f376..8f13eefb741e 100644
--- a/security/p5-Sudo/Makefile
+++ b/security/p5-Sudo/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for running a command line sudo
-BUILD_DEPENDS= p5-Term-ReadPassword>=0:devel/p5-Term-ReadPassword \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ReadPassword>=0:devel/p5-Term-ReadPassword \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-IPC-Run>=0:devel/p5-IPC-Run
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/security/p5-Tie-EncryptedHash/Makefile b/security/p5-Tie-EncryptedHash/Makefile
index 5d0ba0f590b1..f430b45efbac 100644
--- a/security/p5-Tie-EncryptedHash/Makefile
+++ b/security/p5-Tie-EncryptedHash/Makefile
@@ -14,8 +14,8 @@ COMMENT= Hashes (and objects based on hashes) with encrypting fields
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-CBC>=0:security/p5-Crypt-CBC
TEST_DEPENDS= p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
p5-Crypt-DES>=0:security/p5-Crypt-DES
diff --git a/security/p5-Tree-Authz/Makefile b/security/p5-Tree-Authz/Makefile
index b61b4e88b883..ee086d684d61 100644
--- a/security/p5-Tree-Authz/Makefile
+++ b/security/p5-Tree-Authz/Makefile
@@ -14,10 +14,10 @@ COMMENT= Role-Based Access Control authorization scheme
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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-Devel-Symdump>=0:devel/p5-Devel-Symdump \
p5-Lingua-EN-Inflect-Number>=0:textproc/p5-Lingua-EN-Inflect-Number
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/security/p5-Unix-Passwd-File/Makefile b/security/p5-Unix-Passwd-File/Makefile
index 00b6bee71466..69c453406f57 100644
--- a/security/p5-Unix-Passwd-File/Makefile
+++ b/security/p5-Unix-Passwd-File/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Crypt-Password-Util>=0.06:security/p5-Crypt-Password-Util \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-Password-Util>=0.06:security/p5-Crypt-Password-Util \
p5-File-Flock-Retry>=0:devel/p5-File-Flock-Retry \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Class-Load>=0:devel/p5-Class-Load \
p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
p5-File-Slurper>=0:devel/p5-File-Slurper \
@@ -31,7 +31,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/security/p5-Yahoo-BBAuth/Makefile b/security/p5-Yahoo-BBAuth/Makefile
index 90adad3dbad5..7c56aba1d30d 100644
--- a/security/p5-Yahoo-BBAuth/Makefile
+++ b/security/p5-Yahoo-BBAuth/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl interface to the Yahoo! Browser-Based Authentication
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-JSON>=0:converters/p5-JSON \
p5-libwww>=5.6:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 4238766e0f2c..8b48ca4aa763 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -15,7 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_SSL= openssl-devel
-BUILD_DEPENDS= bash:shells/bash \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= bash:shells/bash \
openca-tools-forked>=1.4.0:security/openca-tools-forked \
p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
p5-CGI-Fast>=2.10:www/p5-CGI-Fast \
@@ -76,7 +77,6 @@ BUILD_DEPENDS= bash:shells/bash \
p5-XML-Validator-Schema>=0:textproc/p5-XML-Validator-Schema \
p5-openxpki-i18n>=2.0.3:security/p5-openxpki-i18n \
p5-perl-ldap>=0:net/p5-perl-ldap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS= p5-openxpki-client-[0-9]* \
p5-openxpki-client-scep-[0-9]* \
diff --git a/shells/p5-Bash-Completion/Makefile b/shells/p5-Bash-Completion/Makefile
index bf4b237911d4..066701b4f1f1 100644
--- a/shells/p5-Bash-Completion/Makefile
+++ b/shells/p5-Bash-Completion/Makefile
@@ -15,9 +15,9 @@ COMMENT= Extensible system to provide bash completion
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Module-Load>=0.22:devel/p5-Module-Load
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
NO_ARCH= yes
diff --git a/shells/p5-Term-Bash-Completion-Generator/Makefile b/shells/p5-Term-Bash-Completion-Generator/Makefile
index f8e30619be59..6bf07e9c7cc0 100644
--- a/shells/p5-Term-Bash-Completion-Generator/Makefile
+++ b/shells/p5-Term-Bash-Completion-Generator/Makefile
@@ -14,10 +14,10 @@ COMMENT= Generate bash completion scripts
LICENSE= ART10 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 \
p5-Tree-Trie>=0:devel/p5-Tree-Trie
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-Test-Warn>=0:devel/p5-Test-Warn \
diff --git a/shells/p5-Term-ShellUI/Makefile b/shells/p5-Term-ShellUI/Makefile
index 8988f3007a99..0ecaecccf079 100644
--- a/shells/p5-Term-ShellUI/Makefile
+++ b/shells/p5-Term-ShellUI/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Fully-featured shell-like command line environment
-BUILD_DEPENDS= p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
USES= perl5 shebangfix
SHEBANG_FILES= examples/*
diff --git a/sysutils/p5-BSD-Jail-Object/Makefile b/sysutils/p5-BSD-Jail-Object/Makefile
index c071c15aa35b..16d45218426d 100644
--- a/sysutils/p5-BSD-Jail-Object/Makefile
+++ b/sysutils/p5-BSD-Jail-Object/Makefile
@@ -14,9 +14,9 @@ COMMENT= Object oriented perl interface to jail(2)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline>=0.44:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0.44:devel/p5-Inline \
p5-Inline-C>=0.44:devel/p5-Inline-C
-RUN_DEPENDS:= ${BUILD_DEPENDS}
MAKE_JOBS_UNSAFE= yes
diff --git a/sysutils/p5-Brackup/Makefile b/sysutils/p5-Brackup/Makefile
index 9f16bf0364f6..50b5cdff4b28 100644
--- a/sysutils/p5-Brackup/Makefile
+++ b/sysutils/p5-Brackup/Makefile
@@ -12,7 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Flexible backup tool
-BUILD_DEPENDS= p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
p5-DBI>0:databases/p5-DBI \
p5-DateTime-Format-ISO8601>0:devel/p5-DateTime-Format-ISO8601 \
p5-Digest-SHA1>0:security/p5-Digest-SHA1 \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
p5-Net-Amazon-S3>0:net/p5-Net-Amazon-S3 \
p5-Net-SFTP>0:net/p5-Net-SFTP \
p5-String-Escape>0:textproc/p5-String-Escape
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/sysutils/p5-File-Listing/Makefile b/sysutils/p5-File-Listing/Makefile
index ea39f3998097..e51deba54481 100644
--- a/sysutils/p5-File-Listing/Makefile
+++ b/sysutils/p5-File-Listing/Makefile
@@ -14,8 +14,8 @@ COMMENT= Parse directory listings
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Date>=6:www/p5-HTTP-Date
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Date>=6:www/p5-HTTP-Date
NO_ARCH= yes
USES= perl5
diff --git a/sysutils/p5-File-Stat-ModeString/Makefile b/sysutils/p5-File-Stat-ModeString/Makefile
index 8eecb8b39c8f..5cadd308996d 100644
--- a/sysutils/p5-File-Stat-ModeString/Makefile
+++ b/sysutils/p5-File-Stat-ModeString/Makefile
@@ -14,8 +14,8 @@ COMMENT= Converts file stat(2) mode to/from string representation
LICENSE= GPLv2
-BUILD_DEPENDS= p5-File-Stat-Bits>0:sysutils/p5-File-Stat-Bits
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Stat-Bits>0:sysutils/p5-File-Stat-Bits
USES= perl5
USE_PERL5= configure
diff --git a/sysutils/p5-Fuse-Simple/Makefile b/sysutils/p5-Fuse-Simple/Makefile
index d8a38cf3bc27..842452d43416 100644
--- a/sysutils/p5-Fuse-Simple/Makefile
+++ b/sysutils/p5-Fuse-Simple/Makefile
@@ -15,8 +15,8 @@ COMMENT= Simple way to write filesystems in Perl using FUSE
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Fuse>=0:sysutils/p5-Fuse
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Fuse>=0:sysutils/p5-Fuse
NO_ARCH= yes
USE_PERL5= configure
diff --git a/sysutils/p5-Giovanni/Makefile b/sysutils/p5-Giovanni/Makefile
index 100c97aa6711..1c6d8e8a3fca 100644
--- a/sysutils/p5-Giovanni/Makefile
+++ b/sysutils/p5-Giovanni/Makefile
@@ -13,7 +13,8 @@ COMMENT= PERL-based software deployment tool inspired by capistrano
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= \
p5-Config-GitLike>=0:devel/p5-Config-GitLike \
p5-Expect>=0:lang/p5-Expect \
p5-Git-Repository>=0:devel/p5-Git-Repository \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= \
p5-Mouse>=0:devel/p5-Mouse \
p5-Net-OpenSSH>=0:net/p5-Net-OpenSSH
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/sysutils/p5-Log-Syslog-Fast/Makefile b/sysutils/p5-Log-Syslog-Fast/Makefile
index 33379ccca8e5..3fd00af46a0b 100644
--- a/sysutils/p5-Log-Syslog-Fast/Makefile
+++ b/sysutils/p5-Log-Syslog-Fast/Makefile
@@ -14,8 +14,8 @@ COMMENT= Send syslog messages over TCP, UDP, or UNIX sockets
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Syslog-Constants>-1.01:sysutils/p5-Log-Syslog-Constants
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Syslog-Constants>-1.01:sysutils/p5-Log-Syslog-Constants
USES= perl5
USE_PERL5= configure
diff --git a/sysutils/p5-MogileFS-Client/Makefile b/sysutils/p5-MogileFS-Client/Makefile
index 5917ea6a16c5..d124c0bb77aa 100644
--- a/sysutils/p5-MogileFS-Client/Makefile
+++ b/sysutils/p5-MogileFS-Client/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= trociny@FreeBSD.org
COMMENT= Client library for the MogileFS distributed file system
-BUILD_DEPENDS= p5-IO-stringy>=2.102:devel/p5-IO-stringy \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-stringy>=2.102:devel/p5-IO-stringy \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/sysutils/p5-MogileFS-Network/Makefile b/sysutils/p5-MogileFS-Network/Makefile
index e1bec7b19ab9..facac2378d2e 100644
--- a/sysutils/p5-MogileFS-Network/Makefile
+++ b/sysutils/p5-MogileFS-Network/Makefile
@@ -15,10 +15,10 @@ COMMENT= Network awareness and extensions for p5-MogileFS-Server
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \
p5-Net-Patricia>=0:net/p5-Net-Patricia \
p5-MogileFS-Server>=2.50:sysutils/p5-MogileFS-Server
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/sysutils/p5-MogileFS-Server/Makefile b/sysutils/p5-MogileFS-Server/Makefile
index d33ac7a26526..4733fa06036d 100644
--- a/sysutils/p5-MogileFS-Server/Makefile
+++ b/sysutils/p5-MogileFS-Server/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= trociny@FreeBSD.org
COMMENT= MogileFS (distributed filesystem) server
-BUILD_DEPENDS= p5-Danga-Socket>=1.56:devel/p5-Danga-Socket \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Danga-Socket>=1.56:devel/p5-Danga-Socket \
p5-DBD-SQLite>=1.13:databases/p5-DBD-SQLite \
p5-DBD-mysql>=0:databases/p5-DBD-mysql \
p5-DBI>=0:databases/p5-DBI \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-Danga-Socket>=1.56:devel/p5-Danga-Socket \
p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \
p5-Perlbal>=1.79:www/perlbal \
p5-Sys-Syscall>=0.22:devel/p5-Sys-Syscall
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/sysutils/p5-MogileFS-Utils/Makefile b/sysutils/p5-MogileFS-Utils/Makefile
index 0971d34d4ca8..817354eff03e 100644
--- a/sysutils/p5-MogileFS-Utils/Makefile
+++ b/sysutils/p5-MogileFS-Utils/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= trociny@FreeBSD.org
COMMENT= MogileFS tools
-BUILD_DEPENDS= p5-MogileFS-Client>=1.16:sysutils/p5-MogileFS-Client \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MogileFS-Client>=1.16:sysutils/p5-MogileFS-Client \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/sysutils/p5-Monitor-Simple/Makefile b/sysutils/p5-Monitor-Simple/Makefile
index 75ce3112be86..668d9148912f 100644
--- a/sysutils/p5-Monitor-Simple/Makefile
+++ b/sysutils/p5-Monitor-Simple/Makefile
@@ -14,12 +14,12 @@ COMMENT= Simple monitoring of applications and services
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-CaptureOutput>=0:devel/p5-IO-CaptureOutput \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-CaptureOutput>=0:devel/p5-IO-CaptureOutput \
p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-File-Which>=0:sysutils/p5-File-Which
diff --git a/sysutils/p5-Rex/Makefile b/sysutils/p5-Rex/Makefile
index a3d2519dfa7c..103a49f822bb 100644
--- a/sysutils/p5-Rex/Makefile
+++ b/sysutils/p5-Rex/Makefile
@@ -12,7 +12,8 @@ COMMENT= Perl framework for automation and systems administration
LICENSE= APACHE20
-BUILD_DEPENDS= \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= \
p5-Devel-Caller>=0:devel/p5-Devel-Caller \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
@@ -35,7 +36,6 @@ BUILD_DEPENDS= \
p5-Net-OpenSSH>=0:net/p5-Net-OpenSSH \
p5-Net-SFTP-Foreign>=0:net/p5-Net-SFTP-Foreign
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
USE_PERL5= configure
diff --git a/sysutils/p5-Schedule-Cron-Events/Makefile b/sysutils/p5-Schedule-Cron-Events/Makefile
index a038393a11c4..5d09175354a9 100644
--- a/sysutils/p5-Schedule-Cron-Events/Makefile
+++ b/sysutils/p5-Schedule-Cron-Events/Makefile
@@ -14,8 +14,8 @@ COMMENT= Take a line from a crontab and find out when events will occur
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Set-Crontab>=0:devel/p5-Set-Crontab
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Set-Crontab>=0:devel/p5-Set-Crontab
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
NO_ARCH= yes
diff --git a/sysutils/p5-Sysadm-Install/Makefile b/sysutils/p5-Sysadm-Install/Makefile
index 190620db7f70..deb00637b89d 100644
--- a/sysutils/p5-Sysadm-Install/Makefile
+++ b/sysutils/p5-Sysadm-Install/Makefile
@@ -15,12 +15,12 @@ COMMENT= Typical installation tasks for system administrators
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Expect>=0:lang/p5-Expect \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Expect>=0:lang/p5-Expect \
p5-File-Which>=1.09:sysutils/p5-File-Which \
p5-Log-Log4perl>=1.28:devel/p5-Log-Log4perl \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/sysutils/p5-Tail-Stat/Makefile b/sysutils/p5-Tail-Stat/Makefile
index ae88b451b709..12b0544f659d 100644
--- a/sysutils/p5-Tail-Stat/Makefile
+++ b/sysutils/p5-Tail-Stat/Makefile
@@ -14,13 +14,13 @@ COMMENT= Real-time log statistics server
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Log-Dispatch>=2.26:devel/p5-Log-Dispatch \
p5-POE>=0:devel/p5-POE \
p5-Pid-File-Flock>=0:devel/p5-Pid-File-Flock \
p5-Tie-Hash-Indexed>=0:devel/p5-Tie-Hash-Indexed
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-TCP>=0:devel/p5-Test-TCP
USES= perl5
diff --git a/sysutils/p5-Ubic/Makefile b/sysutils/p5-Ubic/Makefile
index d478cc109499..10d36512d483 100644
--- a/sysutils/p5-Ubic/Makefile
+++ b/sysutils/p5-Ubic/Makefile
@@ -14,14 +14,14 @@ COMMENT= Flexible perl-based service manager
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-Config-Tiny>=0:devel/p5-Config-Tiny \
p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
p5-JSON>=0:converters/p5-JSON \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Class>=0:devel/p5-Test-Class \
p5-Test-Fatal>=0:devel/p5-Test-Fatal
diff --git a/sysutils/p5-arclog/Makefile b/sysutils/p5-arclog/Makefile
index 9a571325d6c8..f8fbeb0391d5 100644
--- a/sysutils/p5-arclog/Makefile
+++ b/sysutils/p5-arclog/Makefile
@@ -14,11 +14,11 @@ COMMENT= Archive the log files monthly
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
p5-File-MMagic>=0:devel/p5-File-MMagic \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
p5-TimeDate>=0:devel/p5-TimeDate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/sysutils/p5-reslog/Makefile b/sysutils/p5-reslog/Makefile
index 3e976d86b026..a1369127af51 100644
--- a/sysutils/p5-reslog/Makefile
+++ b/sysutils/p5-reslog/Makefile
@@ -14,10 +14,10 @@ COMMENT= Reverse-resolve IP in Apache log files
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
p5-File-MMagic>=0:devel/p5-File-MMagic \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
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
diff --git a/www/p5-AMF-Perl/Makefile b/www/p5-AMF-Perl/Makefile
index 431f9e790049..4cb9bceca709 100644
--- a/www/p5-AMF-Perl/Makefile
+++ b/www/p5-AMF-Perl/Makefile
@@ -15,9 +15,9 @@ COMMENT= Flash Remoting in Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-Exception-Class>=0:devel/p5-Exception-Class
-RUN_DEPENDS= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-AnyEvent-HTTP/Makefile b/www/p5-AnyEvent-HTTP/Makefile
index 7670db4c90d8..a515e8bae573 100644
--- a/www/p5-AnyEvent-HTTP/Makefile
+++ b/www/p5-AnyEvent-HTTP/Makefile
@@ -15,9 +15,9 @@ COMMENT= Simple but non-blocking HTTP/HTTPS client
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent>=5.33:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=5.33:devel/p5-AnyEvent \
p5-common-sense>=3.3:devel/p5-common-sense
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index b5496ae6a624..87555063469a 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -13,7 +13,8 @@ COMMENT= Active Server Pages for Apache
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
p5-HTML-Clean>=0:www/p5-HTML-Clean \
p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
p5-HTTP-Date>=0:www/p5-HTTP-Date \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
p5-MLDBM-Sync>=0.25:databases/p5-MLDBM-Sync \
p5-Tie-Cache>=0:devel/p5-Tie-Cache \
p5-XML-LibXSLT>=0:textproc/p5-XML-LibXSLT
-RUN_DEPENDS:= ${BUILD_DEPENDS}
# XXX not tested with mod_perl2, but mod_perl was removed ...
#.if !defined(WITHOUT_MODPERL)
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index c87fc43f03aa..79be130d6272 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=1.39:www/mod_perl2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=1.39:www/mod_perl2 \
p5-Class-Load>=0.03:devel/p5-Class-Load \
p5-Hash-MultiValue>=0:devel/p5-Hash-MultiValue \
p5-HTTP-Body>=0:www/p5-HTTP-Body \
p5-WWW-Form-UrlEncoded>=0:www/p5-WWW-Form-UrlEncoded
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-URI>=1.71:net/p5-URI
NO_ARCH= yes
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index 5d872eaca4e9..28165118ea6e 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=1.9922:www/mod_perl2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=1.9922:www/mod_perl2 \
p5-Apache-AuthCookie>=3.0:www/p5-Apache-AuthCookie \
p5-CGI>=3.12:www/p5-CGI \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=1.9922:www/mod_perl2 \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-ModPerl-VersionUtil>=0:www/p5-ModPerl-VersionUtil \
p5-SQL-Abstract>=0:databases/p5-SQL-Abstract
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= apache:2.2+ perl5
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index 2d27fc03d38e..236461e81f90 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Mod_perl interface into HTML::Clean
-BUILD_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
p5-HTML-Clean>=0.8:www/p5-HTML-Clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= apache:2.2+ perl5
USE_PERL5= configure
diff --git a/www/p5-Apache-ConfigParser/Makefile b/www/p5-Apache-ConfigParser/Makefile
index 1541da1ab200..3b1acdb97f7c 100644
--- a/www/p5-Apache-ConfigParser/Makefile
+++ b/www/p5-Apache-ConfigParser/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Load Apache configuration files
-BUILD_DEPENDS= p5-File-FnMatch>=0:devel/p5-File-FnMatch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-FnMatch>=0:devel/p5-File-FnMatch \
p5-Tree-DAG_Node>=0:devel/p5-Tree-DAG_Node
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index 8a2b3459a989..40c45cc2613e 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -14,9 +14,9 @@ COMMENT= DBI persistent connection, authentication and authorization
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS= p5-Apache-DBI-mp[12]*
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 2223afc7fa6d..7ad89200659b 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -15,14 +15,14 @@ COMMENT= Apache::Gallery - mod_perl handler to create an image gallery
LICENSE= ART10
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI \
p5-Text-Template>=0:textproc/p5-Text-Template \
p5-Image-Info>=0:graphics/p5-Image-Info \
p5-Image-Size>=0:graphics/p5-Image-Size \
p5-Image-Imlib2>=0:graphics/p5-Image-Imlib2 \
p5-libapreq2>=0:www/p5-libapreq2 \
p5-CGI>=0:www/p5-CGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= apache:2.2+ perl5
USE_PERL5= configure
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index 7674277ec35b..3203fa05bbfb 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= MP3 browsing and streaming under mod_perl and Apache
-BUILD_DEPENDS= p5-Audio-Wav>=0:audio/p5-Audio-Wav \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Audio-Wav>=0:audio/p5-Audio-Wav \
p5-CGI>=4.03:www/p5-CGI \
p5-CGI-Session>=0:www/p5-CGI-Session \
p5-MP3-Info>=0:audio/p5-MP3-Info \
p5-Ogg-Vorbis-Header>=0:audio/p5-Ogg-Vorbis-Header \
${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= apache:2.2+ perl5
USE_PERL5= configure
diff --git a/www/p5-Apache-ParseFormData/Makefile b/www/p5-Apache-ParseFormData/Makefile
index cc5bdb040a77..e7cb4061bad9 100644
--- a/www/p5-Apache-ParseFormData/Makefile
+++ b/www/p5-Apache-ParseFormData/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= nistor@snickers.org
COMMENT= Module allows you to easily decode/parse form and query data
-BUILD_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
USES= apache:2.2+ perl5
USE_PERL5= configure
diff --git a/www/p5-Apache-Profiler/Makefile b/www/p5-Apache-Profiler/Makefile
index 1930a6cc113e..84478cf63a56 100644
--- a/www/p5-Apache-Profiler/Makefile
+++ b/www/p5-Apache-Profiler/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Profiles time seconds needed for every request
-BUILD_DEPENDS= mp2bug:www/mod_perl2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= mp2bug:www/mod_perl2
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Apache-Session-PHP/Makefile b/www/p5-Apache-Session-PHP/Makefile
index 29af4848e066..c9c22540c65e 100644
--- a/www/p5-Apache-Session-PHP/Makefile
+++ b/www/p5-Apache-Session-PHP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Glue Apache::Session with PHP::Session
-BUILD_DEPENDS= p5-PHP-Session>=0:www/p5-PHP-Session \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-PHP-Session>=0:www/p5-PHP-Session \
p5-Apache-Session>=0:www/p5-Apache-Session
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Apache-Session-SQLite3/Makefile b/www/p5-Apache-Session-SQLite3/Makefile
index 52a0582bb6c3..aa02ff4f3827 100644
--- a/www/p5-Apache-Session-SQLite3/Makefile
+++ b/www/p5-Apache-Session-SQLite3/Makefile
@@ -14,9 +14,9 @@ COMMENT= Use DBD::SQLite 1.x for Apache::Session storage
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Apache-Session>=0:www/p5-Apache-Session \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Apache-Session>=0:www/p5-Apache-Session \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Apache-Session-SharedMem/Makefile b/www/p5-Apache-Session-SharedMem/Makefile
index a49abf2c61d4..55dd422658e3 100644
--- a/www/p5-Apache-Session-SharedMem/Makefile
+++ b/www/p5-Apache-Session-SharedMem/Makefile
@@ -14,9 +14,9 @@ COMMENT= Apache::Session extension that store session in shared memory
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IPC-Cache>=0:devel/p5-IPC-Cache \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IPC-Cache>=0:devel/p5-IPC-Cache \
p5-Apache-Session>=0:www/p5-Apache-Session
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Apache-Session-Wrapper/Makefile b/www/p5-Apache-Session-Wrapper/Makefile
index e7e0469b8973..783d6c0bdd32 100644
--- a/www/p5-Apache-Session-Wrapper/Makefile
+++ b/www/p5-Apache-Session-Wrapper/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple wrapper around Apache::Session
-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-Exception-Class>=0:devel/p5-Exception-Class \
p5-Apache-Session>=0:www/p5-Apache-Session
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index 76335e6a6d18..6778cb9ecaaf 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -14,8 +14,8 @@ COMMENT= Persistence framework for session data
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
TEST_DEPENDS+= p5-Test-Deep>=0.082:devel/p5-Test-Deep \
p5-Test-Exception>=0.15:devel/p5-Test-Exception \
p5-Test-Database>=0:databases/p5-Test-Database
diff --git a/www/p5-Apache-SessionX/Makefile b/www/p5-Apache-SessionX/Makefile
index 4a3eb87a3537..6a4b49cd2ca5 100644
--- a/www/p5-Apache-SessionX/Makefile
+++ b/www/p5-Apache-SessionX/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Extented persistence framework for session data
-BUILD_DEPENDS= p5-Apache-Session>=0:www/p5-Apache-Session
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Apache-Session>=0:www/p5-Apache-Session
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-App-Nopaste/Makefile b/www/p5-App-Nopaste/Makefile
index 1c4cb9373165..74d4a09f77b3 100644
--- a/www/p5-App-Nopaste/Makefile
+++ b/www/p5-App-Nopaste/Makefile
@@ -13,7 +13,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Browser-Open>=0:www/p5-Browser-Open \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Browser-Open>=0:www/p5-Browser-Open \
p5-Class-Load>=0:devel/p5-Class-Load \
p5-Getopt-Long-Descriptive>=0:devel/p5-Getopt-Long-Descriptive \
p5-JSON>=0:converters/p5-JSON \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Browser-Open>=0:www/p5-Browser-Open \
p5-URI>=0:net/p5-URI \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-namespace-clean>=0.19:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
p5-Test-Deep>=0:devel/p5-Test-Deep \
diff --git a/www/p5-App-gist/Makefile b/www/p5-App-gist/Makefile
index ab07341675b4..acb2d5defd94 100644
--- a/www/p5-App-gist/Makefile
+++ b/www/p5-App-gist/Makefile
@@ -15,12 +15,12 @@ COMMENT= GitHub Gist creator
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \
p5-Class-Load>=0:devel/p5-Class-Load \
p5-Moo>=0:devel/p5-Moo \
p5-Pithub>=0:devel/p5-Pithub \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS= gist-[0-9]*
diff --git a/www/p5-Bigtop/Makefile b/www/p5-Bigtop/Makefile
index a7b22380473f..4dcee983199d 100644
--- a/www/p5-Bigtop/Makefile
+++ b/www/p5-Bigtop/Makefile
@@ -14,7 +14,8 @@ COMMENT= Web application data language processor
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-General>=0:devel/p5-Config-General \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-General>=0:devel/p5-Config-General \
p5-IO-Prompt>=0:devel/p5-IO-Prompt \
p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
p5-File-HomeDir>=0:devel/p5-File-HomeDir \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Config-General>=0:devel/p5-Config-General \
p5-Inline-TT>=0.06:devel/p5-Inline-TT \
p5-Template-Toolkit>=2.0:www/p5-Template-Toolkit \
p5-HTTP-Server-Simple>0.27:www/p5-HTTP-Server-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Ajax/Makefile b/www/p5-CGI-Ajax/Makefile
index ac80d6e49158..2ff6a5e152fc 100644
--- a/www/p5-CGI-Ajax/Makefile
+++ b/www/p5-CGI-Ajax/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Module for writing AJAX/DHTML-based web apps
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Application-Dispatch-Server/Makefile b/www/p5-CGI-Application-Dispatch-Server/Makefile
index d0bbd6ed864f..ce91cba58a1b 100644
--- a/www/p5-CGI-Application-Dispatch-Server/Makefile
+++ b/www/p5-CGI-Application-Dispatch-Server/Makefile
@@ -14,14 +14,14 @@ COMMENT= Simple HTTP server for developing with CGI::Application::Dispatch
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-IO-Capture>=0:devel/p5-IO-Capture \
p5-CGI-Application>=0:www/p5-CGI-Application \
p5-CGI-Application-Dispatch>=0:www/p5-CGI-Application-Dispatch \
p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
p5-HTTP-Server-Simple-Static>=0:www/p5-HTTP-Server-Simple-Static \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Application-Dispatch/Makefile b/www/p5-CGI-Application-Dispatch/Makefile
index 268614d5baa8..96d71a73ab80 100644
--- a/www/p5-CGI-Application-Dispatch/Makefile
+++ b/www/p5-CGI-Application-Dispatch/Makefile
@@ -14,13 +14,13 @@ COMMENT= Dispatch requests to CGI::Application based objects
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=4.50:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=4.50:www/p5-CGI-Application \
p5-CGI-PSGI>=0:www/p5-CGI-PSGI \
p5-Exception-Class>=1.20:devel/p5-Exception-Class \
p5-HTTP-Exception>=0:www/p5-HTTP-Exception \
p5-Plack>=0.9956:www/p5-Plack \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-LongString>=0:devel/p5-Test-LongString
USES= perl5
diff --git a/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile b/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
index 57cc9e056b44..321503933c54 100644
--- a/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
+++ b/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
@@ -14,10 +14,10 @@ COMMENT= Use any templating system in CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application-Plugin-Forward>=0:www/p5-CGI-Application-Plugin-Forward \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application-Plugin-Forward>=0:www/p5-CGI-Application-Plugin-Forward \
p5-CGI-Application>=0:www/p5-CGI-Application \
p5-Clone>=0.23:devel/p5-Clone
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Plugin-Apache/Makefile b/www/p5-CGI-Application-Plugin-Apache/Makefile
index 5e858cd00c29..b2c646d188ce 100644
--- a/www/p5-CGI-Application-Plugin-Apache/Makefile
+++ b/www/p5-CGI-Application-Plugin-Apache/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Provides easy access to Apache::* modules for CGI::Application
-BUILD_DEPENDS= p5-CGI-Application>=3.22:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=3.22:www/p5-CGI-Application \
p5-HTML-GenerateUtil>=0:www/p5-HTML-GenerateUtil \
p5-libapreq2>=0:www/p5-libapreq2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
LICENSE_COMB= dual
LICENSE= ART10 GPLv1+
diff --git a/www/p5-CGI-Application-Plugin-Authentication/Makefile b/www/p5-CGI-Application-Plugin-Authentication/Makefile
index 851e59230eed..f9683943fc81 100644
--- a/www/p5-CGI-Application-Plugin-Authentication/Makefile
+++ b/www/p5-CGI-Application-Plugin-Authentication/Makefile
@@ -13,12 +13,12 @@ COMMENT= Support for authenticating requests in CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Apache-Htpasswd>=0:security/p5-Apache-Htpasswd \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Apache-Htpasswd>=0:security/p5-Apache-Htpasswd \
p5-CGI-Application>=4:www/p5-CGI-Application \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
p5-Color-Calc>=1.073:graphics/p5-Color-Calc
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Warn>=0.11:devel/p5-Test-Warn
diff --git a/www/p5-CGI-Application-Plugin-Authorization/Makefile b/www/p5-CGI-Application-Plugin-Authorization/Makefile
index 02f481e78c8c..b06cc7a99738 100644
--- a/www/p5-CGI-Application-Plugin-Authorization/Makefile
+++ b/www/p5-CGI-Application-Plugin-Authorization/Makefile
@@ -14,13 +14,13 @@ COMMENT= Support for authorization of requests in CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-Class-ISA>=0:devel/p5-Class-ISA \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
p5-CGI-Application-Plugin-Authentication>=0:www/p5-CGI-Application-Plugin-Authentication \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Warn>=0:devel/p5-Test-Warn
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
index eb3aac12e347..e68559c43bca 100644
--- a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
+++ b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
@@ -14,8 +14,8 @@ COMMENT= CGI::App plugin to automatically register runmodes
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Application-Plugin-DBH/Makefile b/www/p5-CGI-Application-Plugin-DBH/Makefile
index 32e50c5760ba..4a92e0a2be37 100644
--- a/www/p5-CGI-Application-Plugin-DBH/Makefile
+++ b/www/p5-CGI-Application-Plugin-DBH/Makefile
@@ -13,9 +13,9 @@ COMMENT= Easy DBI access from CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=1.20120301:devel/p5-Test-MockObject
NO_ARCH= yes
diff --git a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
index 34de8ee829b1..f96012c8207e 100644
--- a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
+++ b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
@@ -14,12 +14,12 @@ COMMENT= This plug-in add DebugScreen support to CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-HTML-Template>=0:www/p5-HTML-Template \
p5-CGI-Application-Plugin-ViewCode>=0:www/p5-CGI-Application-Plugin-ViewCode \
p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Application-Plugin-DevPopup/Makefile b/www/p5-CGI-Application-Plugin-DevPopup/Makefile
index ebc3964dbe58..f42ca0d5155c 100644
--- a/www/p5-CGI-Application-Plugin-DevPopup/Makefile
+++ b/www/p5-CGI-Application-Plugin-DevPopup/Makefile
@@ -14,10 +14,10 @@ COMMENT= Runtime cgiapp info in a popup window
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=4.01:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=4.01:www/p5-CGI-Application \
p5-HTML-Template>0:www/p5-HTML-Template \
p5-IO-stringy>0:devel/p5-IO-stringy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Application-Plugin-Forward/Makefile b/www/p5-CGI-Application-Plugin-Forward/Makefile
index 2445dcea8cba..931db2d61aad 100644
--- a/www/p5-CGI-Application-Plugin-Forward/Makefile
+++ b/www/p5-CGI-Application-Plugin-Forward/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= hartzell@alerce.com
COMMENT= Support for forwarding requests in CGI::Application
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-CGI-Application-Plugin-AutoRunmode>=0:www/p5-CGI-Application-Plugin-AutoRunmode
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Plugin-HTDot/Makefile b/www/p5-CGI-Application-Plugin-HTDot/Makefile
index efb2f66398cd..8778e12b9806 100644
--- a/www/p5-CGI-Application-Plugin-HTDot/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTDot/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Enable "magic dot" notation in CGI::Application-derived applications
-BUILD_DEPENDS= p5-CGI-Application>=4.0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=4.0:www/p5-CGI-Application \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-HTML-Template-Pluggable>=0:www/p5-HTML-Template-Pluggable \
p5-CGI-Application>=0:www/p5-CGI-Application \
p5-Test-Simple>=0:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
index b76ed1cda882..c33aba398264 100644
--- a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
@@ -14,9 +14,9 @@ COMMENT= Access to the prototype JavaScript library using HTML::Prototype
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-HTML-Prototype>=0:www/p5-HTML-Prototype
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile b/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
index 3e7842018ee9..4400dfa1f9fb 100644
--- a/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
+++ b/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
@@ -14,10 +14,10 @@ COMMENT= Add HTML::Tidy support to CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>4.01:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>4.01:www/p5-CGI-Application \
p5-CGI-Application-Plugin-DevPopup>=0:www/p5-CGI-Application-Plugin-DevPopup \
p5-HTML-Tidy>=1.08:textproc/p5-HTML-Tidy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
index 9dc956f96b7a..889f37977c62 100644
--- a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
+++ b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
@@ -14,11 +14,11 @@ COMMENT= Make tamper-resistent links in CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-URI>=0:net/p5-URI \
p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-CGI-Application-Plugin-AutoRunmode>=0:www/p5-CGI-Application-Plugin-AutoRunmode
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
index fae793a8df7a..4aa4a08462a3 100644
--- a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
+++ b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
@@ -14,10 +14,10 @@ COMMENT= Plugin that adds Log::Dispatch support to CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Plugin-MessageStack/Makefile b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
index eaeb5212ff6d..d616989833d5 100644
--- a/www/p5-CGI-Application-Plugin-MessageStack/Makefile
+++ b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
@@ -14,10 +14,10 @@ COMMENT= Message stack for your CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-CGI-Application-Plugin-Session>=0:www/p5-CGI-Application-Plugin-Session \
p5-CGI-Application-Plugin-TT>=0:www/p5-CGI-Application-Plugin-TT
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Plugin-Redirect/Makefile b/www/p5-CGI-Application-Plugin-Redirect/Makefile
index 7ba34a54e9d0..cf26dfa22969 100644
--- a/www/p5-CGI-Application-Plugin-Redirect/Makefile
+++ b/www/p5-CGI-Application-Plugin-Redirect/Makefile
@@ -14,8 +14,8 @@ COMMENT= Easy external redirects in CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Plugin-Session/Makefile b/www/p5-CGI-Application-Plugin-Session/Makefile
index 9166203f0ab2..b97c6061159d 100644
--- a/www/p5-CGI-Application-Plugin-Session/Makefile
+++ b/www/p5-CGI-Application-Plugin-Session/Makefile
@@ -14,9 +14,9 @@ COMMENT= Plugin that adds session support to CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=3.21:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=3.21:www/p5-CGI-Application \
p5-CGI-Session>=4.48:www/p5-CGI-Session
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CGI-Simple>=0:www/p5-CGI-Simple \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Simple>=1.001002:devel/p5-Test-Simple
diff --git a/www/p5-CGI-Application-Plugin-Stream/Makefile b/www/p5-CGI-Application-Plugin-Stream/Makefile
index c9e8d25317d8..8d52913280c5 100644
--- a/www/p5-CGI-Application-Plugin-Stream/Makefile
+++ b/www/p5-CGI-Application-Plugin-Stream/Makefile
@@ -13,9 +13,9 @@ COMMENT= Plugin that adds file streaming support to CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-File-MMagic>=0:devel/p5-File-MMagic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Application-Plugin-TT/Makefile b/www/p5-CGI-Application-Plugin-TT/Makefile
index ea8b6503a319..33a6bc9385f3 100644
--- a/www/p5-CGI-Application-Plugin-TT/Makefile
+++ b/www/p5-CGI-Application-Plugin-TT/Makefile
@@ -14,10 +14,10 @@ COMMENT= Add Template Toolkit support to CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
p5-Class-ISA>=0:devel/p5-Class-ISA
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
index 6cb28c8b520a..00271434d6a2 100644
--- a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
+++ b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Help validate forms with the CGI::Application framework
-BUILD_DEPENDS= p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator \
p5-CGI-Application>=0:www/p5-CGI-Application
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Plugin-ViewCode/Makefile b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
index e304a77a7aaf..553b513e42f0 100644
--- a/www/p5-CGI-Application-Plugin-ViewCode/Makefile
+++ b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
@@ -14,12 +14,12 @@ COMMENT= View the source of the running application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-CGI-Application-Plugin-Forward>=0:www/p5-CGI-Application-Plugin-Forward \
p5-Syntax-Highlight-Perl-Improved>=0:textproc/p5-Syntax-Highlight-Perl-Improved \
p5-Pod-Xhtml>=0:textproc/p5-Pod-Xhtml \
p5-Test-LongString>=0:devel/p5-Test-LongString
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CGI-Application-Server/Makefile b/www/p5-CGI-Application-Server/Makefile
index c07657d5e3a7..e75c39bcea5f 100644
--- a/www/p5-CGI-Application-Server/Makefile
+++ b/www/p5-CGI-Application-Server/Makefile
@@ -14,12 +14,12 @@ COMMENT= Simple HTTP server for developing with CGI::Application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>4.21:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>4.21:www/p5-CGI-Application \
p5-CGI-Application-Plugin-Redirect>0:www/p5-CGI-Application-Plugin-Redirect \
p5-HTTP-Message>0:www/p5-HTTP-Message \
p5-HTTP-Server-Simple>=0.18:www/p5-HTTP-Server-Simple \
p5-HTTP-Server-Simple-Static>=0.02:www/p5-HTTP-Server-Simple-Static
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CGI-Application>0:www/p5-CGI-Application \
p5-CGI-Application-Dispatch>0:www/p5-CGI-Application-Dispatch \
p5-CGI-Application-Plugin-Redirect>0:www/p5-CGI-Application-Plugin-Redirect \
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 3cbc83ad94e1..edd2e7b6e624 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl module intended to make it easier to create reusable web apps
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI>=0:www/p5-CGI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI>=0:www/p5-CGI \
p5-Class-ISA>=0:devel/p5-Class-ISA \
p5-HTML-Template>=0:www/p5-HTML-Template
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CGI-PSGI>=0.09:www/p5-CGI-PSGI \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/www/p5-CGI-ArgChecker/Makefile b/www/p5-CGI-ArgChecker/Makefile
index 902d889c34a5..4be9d3fb2c9e 100644
--- a/www/p5-CGI-ArgChecker/Makefile
+++ b/www/p5-CGI-ArgChecker/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module implementing a cgi interface to String::Checker
-BUILD_DEPENDS= p5-String-Checker>=0:devel/p5-String-Checker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-String-Checker>=0:devel/p5-String-Checker
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Builder-TT2/Makefile b/www/p5-CGI-Builder-TT2/Makefile
index 4aeace608d9d..3dc9f36185bd 100644
--- a/www/p5-CGI-Builder-TT2/Makefile
+++ b/www/p5-CGI-Builder-TT2/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= CGI::Builder and Template Toolkit 2 integration
-BUILD_DEPENDS= p5-CGI-Builder>=0:www/p5-CGI-Builder \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Builder>=0:www/p5-CGI-Builder \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Builder/Makefile b/www/p5-CGI-Builder/Makefile
index c4286f9ae42f..88ee91c5b180 100644
--- a/www/p5-CGI-Builder/Makefile
+++ b/www/p5-CGI-Builder/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl module intended to make it easier to create reusable web apps
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Cookie-Splitter/Makefile b/www/p5-CGI-Cookie-Splitter/Makefile
index 7fbeefcc24f1..f10d17c66d97 100644
--- a/www/p5-CGI-Cookie-Splitter/Makefile
+++ b/www/p5-CGI-Cookie-Splitter/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-CGI-Simple>=0:www/p5-CGI-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Simple>=0:www/p5-CGI-Simple \
p5-namespace-clean>=0.19:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-CGI-Cookie-XS/Makefile b/www/p5-CGI-Cookie-XS/Makefile
index 1e36efec0c84..409c7edb2d48 100644
--- a/www/p5-CGI-Cookie-XS/Makefile
+++ b/www/p5-CGI-Cookie-XS/Makefile
@@ -15,8 +15,8 @@ COMMENT= HTTP Cookie parser in C
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Filter-Simple>=0:textproc/p5-Filter-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Filter-Simple>=0:textproc/p5-Filter-Simple
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-EncryptForm/Makefile b/www/p5-CGI-EncryptForm/Makefile
index 16f409fe7e68..723e911c402c 100644
--- a/www/p5-CGI-EncryptForm/Makefile
+++ b/www/p5-CGI-EncryptForm/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
COMMENT= Implement trusted stateful CGI Form Data using cryptography
-BUILD_DEPENDS= p5-Crypt-HCE_SHA>=0:security/p5-Crypt-HCE_SHA \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-HCE_SHA>=0:security/p5-Crypt-HCE_SHA \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-ExtDirect/Makefile b/www/p5-CGI-ExtDirect/Makefile
index 977cf3017422..f24f4346c3bc 100644
--- a/www/p5-CGI-ExtDirect/Makefile
+++ b/www/p5-CGI-ExtDirect/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tj@FreeBSD.org
COMMENT= Perl extension for creating Ext.Direct remoting in CGI applications
-BUILD_DEPENDS= p5-RPC-ExtDirect>=3.20:www/p5-RPC-ExtDirect \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-RPC-ExtDirect>=3.20:www/p5-RPC-ExtDirect \
p5-CGI>4.20:www/p5-CGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Fast/Makefile b/www/p5-CGI-Fast/Makefile
index 3e9b2de46d5b..7ad8c64137bc 100644
--- a/www/p5-CGI-Fast/Makefile
+++ b/www/p5-CGI-Fast/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl CGI Interface for FastCGI
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI>=4:www/p5-CGI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI>=4:www/p5-CGI \
p5-FCGI>=0.67:www/p5-FCGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CPAN-Changes>=0:devel/p5-CPAN-Changes \
p5-HTML-Parser>=0:www/p5-HTML-Parser
diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index 141721d958d3..76ce2bc4abb1 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -14,8 +14,8 @@ COMMENT= FormBuilder for CGI
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI>=0:www/p5-CGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI>=0:www/p5-CGI
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-CGI-Framework/Makefile b/www/p5-CGI-Framework/Makefile
index 5acaca33d584..5bcbde130e1c 100644
--- a/www/p5-CGI-Framework/Makefile
+++ b/www/p5-CGI-Framework/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Simple-to-use, lightweight web CGI framework
-BUILD_DEPENDS= p5-HTML-Template>=0:www/p5-HTML-Template \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Template>=0:www/p5-HTML-Template \
p5-CGI-Session>=0:www/p5-CGI-Session \
p5-CGI>=0:www/p5-CGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index e6246b6ca76b..fb0a77229af9 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -14,8 +14,8 @@ COMMENT= Quickie Wiki Package that's not too Tricky #'
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI>=0:www/p5-CGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI>=0:www/p5-CGI
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-CGI-Pager/Makefile b/www/p5-CGI-Pager/Makefile
index 97de194a0889..eb4f5dfe72fe 100644
--- a/www/p5-CGI-Pager/Makefile
+++ b/www/p5-CGI-Pager/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl extension to generate HTML pagination linkage easily
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>0:net/p5-URI
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Untaint-date/Makefile b/www/p5-CGI-Untaint-date/Makefile
index 6242a786ff98..396de2ecff05 100644
--- a/www/p5-CGI-Untaint-date/Makefile
+++ b/www/p5-CGI-Untaint-date/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Validate a date
-BUILD_DEPENDS= p5-CGI-Untaint>=0:www/p5-CGI-Untaint \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Untaint>=0:www/p5-CGI-Untaint \
p5-Date-Manip>=0:devel/p5-Date-Manip \
p5-Date-Simple>=0:devel/p5-Date-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Untaint/Makefile b/www/p5-CGI-Untaint/Makefile
index 3b61c09430ed..be6e05948a5b 100644
--- a/www/p5-CGI-Untaint/Makefile
+++ b/www/p5-CGI-Untaint/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Process CGI input parameters
-BUILD_DEPENDS= p5-UNIVERSAL-require>=0.01:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-UNIVERSAL-require>=0.01:devel/p5-UNIVERSAL-require
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-Upload/Makefile b/www/p5-CGI-Upload/Makefile
index ba4160274abb..0dbfa186dbdb 100644
--- a/www/p5-CGI-Upload/Makefile
+++ b/www/p5-CGI-Upload/Makefile
@@ -14,10 +14,10 @@ COMMENT= CGI class for handling browser file uploads
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-BrowserDetect>=0:www/p5-HTTP-BrowserDetect \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-BrowserDetect>=0:www/p5-HTTP-BrowserDetect \
p5-File-MMagic>=0:devel/p5-File-MMagic \
p5-CGI>=0:www/p5-CGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CGI-XMLApplication/Makefile b/www/p5-CGI-XMLApplication/Makefile
index e81862905182..3821bd06a8c0 100644
--- a/www/p5-CGI-XMLApplication/Makefile
+++ b/www/p5-CGI-XMLApplication/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Object Oriented Interface for CGI Script Applications
-BUILD_DEPENDS= p5-XML-LibXML>=1.1:textproc/p5-XML-LibXML \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-LibXML>=1.1:textproc/p5-XML-LibXML \
p5-XML-LibXSLT>=1.08:textproc/p5-XML-LibXSLT
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= EXAMPLES
diff --git a/www/p5-CIF-Client/Makefile b/www/p5-CIF-Client/Makefile
index aa5a2142bac8..54c174a146c8 100644
--- a/www/p5-CIF-Client/Makefile
+++ b/www/p5-CIF-Client/Makefile
@@ -15,7 +15,8 @@ COMMENT= Extends REST::Client for use with the CI-Framework REST interface
LICENSE= ART10 GPLv2
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0.31:devel/p5-Class-Accessor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0.31:devel/p5-Class-Accessor \
p5-Compress-Raw-Zlib>=2.008:archivers/p5-Compress-Raw-Zlib \
p5-Config-Simple>=4.58:devel/p5-Config-Simple \
p5-Digest-SHA1>=2.11:security/p5-Digest-SHA1 \
@@ -31,7 +32,6 @@ BUILD_DEPENDS= p5-Class-Accessor>=0.31:devel/p5-Class-Accessor \
p5-REST-Client>=243:www/p5-REST-Client \
p5-Snort-Rule>=1.07:security/p5-Snort-Rule \
p5-Text-Table>=1.114:textproc/p5-Text-Table
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CSS-DOM/Makefile b/www/p5-CSS-DOM/Makefile
index d35b56ce518e..972f00596c7d 100644
--- a/www/p5-CSS-DOM/Makefile
+++ b/www/p5-CSS-DOM/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Clone>=0.09:devel/p5-Clone
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0.09:devel/p5-Clone
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-CSS-Inliner/Makefile b/www/p5-CSS-Inliner/Makefile
index cad74f1fb231..2f5c8b4f5cc8 100644
--- a/www/p5-CSS-Inliner/Makefile
+++ b/www/p5-CSS-Inliner/Makefile
@@ -13,11 +13,11 @@ COMMENT= Library for converting CSS blocks and files to inline styles
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Query>=0.09:www/p5-HTML-Query \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Query>=0.09:www/p5-HTML-Query \
p5-HTML-Tree>=5.03:www/p5-HTML-Tree \
p5-libwww>=0:www/p5-libwww \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1:devel/p5-Test-Pod
NO_ARCH= yes
diff --git a/www/p5-Catalyst-Action-REST/Makefile b/www/p5-Catalyst-Action-REST/Makefile
index 668329585850..6f89357a68d0 100644
--- a/www/p5-Catalyst-Action-REST/Makefile
+++ b/www/p5-Catalyst-Action-REST/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.80030:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.80030:www/p5-Catalyst-Runtime \
p5-Class-Inspector>=1.13:devel/p5-Class-Inspector \
p5-MRO-Compat>=0.10:devel/p5-MRO-Compat \
p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Catalyst-Runtime>=5.80030:www/p5-Catalyst-Runtime \
p5-URI-Find>=0:textproc/p5-URI-Find \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-libwww>=5:www/p5-libwww \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/www/p5-Catalyst-Action-RenderView/Makefile b/www/p5-Catalyst-Action-RenderView/Makefile
index 0bfbcbde0039..4a0f7b4e1c1e 100644
--- a/www/p5-Catalyst-Action-RenderView/Makefile
+++ b/www/p5-Catalyst-Action-RenderView/Makefile
@@ -14,10 +14,10 @@ COMMENT= Sensible default end action for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.70:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.70:www/p5-Catalyst-Runtime \
p5-Data-Visitor>=0.24:devel/p5-Data-Visitor \
p5-MRO-Compat>=0:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile b/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile
index 520618577465..8c298486591f 100644
--- a/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile
+++ b/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile
@@ -14,9 +14,9 @@ COMMENT= XML::Hash::LX serializer for Catalyst::Action::Serialize
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-XML-Hash-LX>=0.06:textproc/p5-XML-Hash-LX
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-lib-abs>=0.90:devel/p5-lib-abs
USE_PERL5= configure
diff --git a/www/p5-Catalyst-ActionRole-ACL/Makefile b/www/p5-Catalyst-ActionRole-ACL/Makefile
index f173aec95510..3390b0233755 100644
--- a/www/p5-Catalyst-ActionRole-ACL/Makefile
+++ b/www/p5-Catalyst-ActionRole-ACL/Makefile
@@ -15,11 +15,11 @@ COMMENT= User role-based authorization action class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Controller-ActionRole>=0:www/p5-Catalyst-Controller-ActionRole \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Controller-ActionRole>=0:www/p5-Catalyst-Controller-ActionRole \
p5-Catalyst-Runtime>=5.90013:www/p5-Catalyst-Runtime \
p5-Moose>=0:devel/p5-Moose \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
index 04b625181ae0..950f6d3bb05c 100644
--- a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
+++ b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
@@ -13,13 +13,13 @@ COMMENT= HTTP plain and digest authentication plugin for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Plugin-Authentication>=0.10005:www/p5-Catalyst-Plugin-Authentication \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-Authentication>=0.10005:www/p5-Catalyst-Plugin-Authentication \
p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
p5-Class-Accessor>0:devel/p5-Class-Accessor \
p5-Data-UUID>=0.11:devel/p5-Data-UUID \
p5-String-Escape>0:textproc/p5-String-Escape \
p5-URI>0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-HTTP-Message>0:www/p5-HTTP-Message \
p5-Test-Exception>0:devel/p5-Test-Exception \
p5-Test-MockObject>0:devel/p5-Test-MockObject \
diff --git a/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile b/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile
index 45558ea2fdd1..9432964c9475 100644
--- a/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile
+++ b/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile
@@ -14,11 +14,11 @@ COMMENT= OpenID credential for Catalyst::Plugin::Authentication framework
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Net-OpenID-Consumer>=1.03:net/p5-Net-OpenID-Consumer \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile b/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
index 901bce23b97d..97ad0823c25e 100644
--- a/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
@@ -14,7 +14,8 @@ COMMENT= Storage class for Catalyst Authentication using DBIx::Class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Model-DBIC-Schema>=0.18:www/p5-Catalyst-Model-DBIC-Schema \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Model-DBIC-Schema>=0.18:www/p5-Catalyst-Model-DBIC-Schema \
p5-Catalyst-Plugin-Authentication>=0.10008:www/p5-Catalyst-Plugin-Authentication \
p5-Catalyst-Runtime>=5.8:www/p5-Catalyst-Runtime \
p5-DBIx-Class>=0.08:databases/p5-DBIx-Class \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Catalyst-Model-DBIC-Schema>=0.18:www/p5-Catalyst-Model-DBIC-Sc
p5-Moose>=0:devel/p5-Moose \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Authentication-Store-LDAP/Makefile b/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
index 0175d51a912f..d8c7e0a1e350 100644
--- a/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
@@ -13,9 +13,9 @@ COMMENT= Authentication from an LDAP Directory for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Plugin-Authentication>=0.10003:www/p5-Catalyst-Plugin-Authentication \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-Authentication>=0.10003:www/p5-Catalyst-Plugin-Authentication \
p5-perl-ldap>=0:net/p5-perl-ldap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Net-LDAP-Server-Test>=0:net/p5-Net-LDAP-Server-Test \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Catalyst-Model-LDAP>=0:www/p5-Catalyst-Model-LDAP \
diff --git a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
index 058600a58c21..583d5e9a2aec 100644
--- a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
+++ b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Make the Catalyst request context available in Models and Views
-BUILD_DEPENDS= p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime
TEST_DEPENDS= p5-Devel-Cycle>=0:devel/p5-Devel-Cycle
USES= perl5
diff --git a/www/p5-Catalyst-Component-InstancePerContext/Makefile b/www/p5-Catalyst-Component-InstancePerContext/Makefile
index 08dca06b9307..4a5f7a0fada7 100644
--- a/www/p5-Catalyst-Component-InstancePerContext/Makefile
+++ b/www/p5-Catalyst-Component-InstancePerContext/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= oleg@mamontov.net
COMMENT= Return a new instance a component on each request
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Moose>=0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Controller-ActionRole/Makefile b/www/p5-Catalyst-Controller-ActionRole/Makefile
index 52bfcc825c40..01926d5ede63 100644
--- a/www/p5-Catalyst-Controller-ActionRole/Makefile
+++ b/www/p5-Catalyst-Controller-ActionRole/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mons@cpan.org
COMMENT= Apply roles to action instances
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.71001:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.71001:www/p5-Catalyst-Runtime \
p5-Moose>=2:devel/p5-Moose \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-String-RewritePrefix>=0.004:textproc/p5-String-RewritePrefix \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Controller-BindLex/Makefile b/www/p5-Catalyst-Controller-BindLex/Makefile
index 05696420ed9e..8a168c41b585 100644
--- a/www/p5-Catalyst-Controller-BindLex/Makefile
+++ b/www/p5-Catalyst-Controller-BindLex/Makefile
@@ -15,12 +15,12 @@ COMMENT= Stash your lexical goodness
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Array-RefElem>=0:misc/p5-Array-RefElem \
p5-Devel-Caller>=0:devel/p5-Devel-Caller \
p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
p5-PadWalker>=0:devel/p5-PadWalker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
index 9a9bec57df9d..8183128ca4c7 100644
--- a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
+++ b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Catalyst-Component-InstancePerContext>=0:www/p5-Catalyst-Component-InstancePerContext \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Component-InstancePerContext>=0:www/p5-Catalyst-Component-InstancePerContext \
p5-Catalyst-Runtime>=5.71001:www/p5-Catalyst-Runtime \
p5-Config-Any>=0:devel/p5-Config-Any \
p5-HTML-FormFu>=2.06:www/p5-HTML-FormFu \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Catalyst-Component-InstancePerContext>=0:www/p5-Catalyst-Compo
p5-Regexp-Assemble>=0:devel/p5-Regexp-Assemble \
p5-Task-Weaken>=0:devel/p5-Task-Weaken \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView \
p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
diff --git a/www/p5-Catalyst-Controller-RateLimit/Makefile b/www/p5-Catalyst-Controller-RateLimit/Makefile
index c4e376cf96d8..b770494e3556 100644
--- a/www/p5-Catalyst-Controller-RateLimit/Makefile
+++ b/www/p5-Catalyst-Controller-RateLimit/Makefile
@@ -14,12 +14,12 @@ COMMENT= Protect your site from robots
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Algorithm-FloodControl>=1.91:devel/p5-Algorithm-FloodControl \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Algorithm-FloodControl>=1.91:devel/p5-Algorithm-FloodControl \
p5-Catalyst-Plugin-Cache-FastMmap>=0:www/p5-Catalyst-Plugin-Cache-FastMmap \
p5-Catalyst-Plugin-ConfigLoader>=0:www/p5-Catalyst-Plugin-ConfigLoader \
p5-Catalyst-Runtime>=5.7002:www/p5-Catalyst-Runtime \
p5-Params-Validate>=0:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
diff --git a/www/p5-Catalyst-Controller-RequestToken/Makefile b/www/p5-Catalyst-Controller-RequestToken/Makefile
index bb3d92830fa9..1ea76fb5e4b6 100644
--- a/www/p5-Catalyst-Controller-RequestToken/Makefile
+++ b/www/p5-Catalyst-Controller-RequestToken/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bill.brinzer@gmail.com
COMMENT= Generate and validate unique tokens across HTTP requests (anti-CSRF)
-BUILD_DEPENDS= p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView \
p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-MRO-Compat>=0:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Catalyst-Controller-SOAP/Makefile b/www/p5-Catalyst-Controller-SOAP/Makefile
index dfbcf0f984b9..f9eb9d068d5e 100644
--- a/www/p5-Catalyst-Controller-SOAP/Makefile
+++ b/www/p5-Catalyst-Controller-SOAP/Makefile
@@ -12,13 +12,13 @@ COMMENT= Catalyst SOAP Controller
LICENSE= ARTPERL10
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.90017:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.90017:www/p5-Catalyst-Runtime \
p5-Moose>=0.9:devel/p5-Moose \
p5-XML-Compile-SOAP>=2.35:net/p5-XML-Compile-SOAP \
p5-XML-Compile-WSDL11>=0:net/p5-XML-Compile-WSDL11 \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-IO-stringy>=0:devel/p5-IO-stringy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Devel/Makefile b/www/p5-Catalyst-Devel/Makefile
index 6a375cc3ecd2..e68b53bc0e97 100644
--- a/www/p5-Catalyst-Devel/Makefile
+++ b/www/p5-Catalyst-Devel/Makefile
@@ -13,7 +13,9 @@ COMMENT= Catalyst Development Tools
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Action-RenderView>=0.10:www/p5-Catalyst-Action-RenderView \
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+ p5-Module-Install>=1.02:devel/p5-Module-Install
+RUN_DEPENDS= p5-Catalyst-Action-RenderView>=0.10:www/p5-Catalyst-Action-RenderView \
p5-Catalyst-Plugin-ConfigLoader>=0.30:www/p5-Catalyst-Plugin-ConfigLoader \
p5-Catalyst-Plugin-Static-Simple>=0.28:www/p5-Catalyst-Plugin-Static-Simple \
p5-Catalyst-Runtime>=5.90001:www/p5-Catalyst-Runtime \
@@ -28,8 +30,6 @@ BUILD_DEPENDS= p5-Catalyst-Action-RenderView>=0.10:www/p5-Catalyst-Action-Render
p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-BUILD_DEPENDS+= p5-Module-Install>=1.02:devel/p5-Module-Install
TEST_DEPENDS= p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
diff --git a/www/p5-Catalyst-DispatchType-Regex/Makefile b/www/p5-Catalyst-DispatchType-Regex/Makefile
index 0ff180e09c33..65c44d0a03f9 100644
--- a/www/p5-Catalyst-DispatchType-Regex/Makefile
+++ b/www/p5-Catalyst-DispatchType-Regex/Makefile
@@ -14,10 +14,10 @@ COMMENT= Regex DispatchType
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.90060:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.90060:www/p5-Catalyst-Runtime \
p5-Moose>=0:devel/p5-Moose \
p5-Text-SimpleTable>=0:textproc/p5-Text-SimpleTable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
diff --git a/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile b/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
index 6ca0aecee7e2..73b5cd259538 100644
--- a/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
+++ b/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= High-performance pre-forking Catalyst engine
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7012:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7012:www/p5-Catalyst-Runtime \
p5-Net-Server>=0.97:net/p5-Net-Server \
p5-HTTP-HeaderParser-XS>=0:www/p5-HTTP-HeaderParser-XS \
p5-CGI-Cookie-XS>=0:www/p5-CGI-Cookie-XS \
p5-HTTP-Body>=0:www/p5-HTTP-Body
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Enzyme/Makefile b/www/p5-Catalyst-Enzyme/Makefile
index 8984857acedc..646496217179 100644
--- a/www/p5-Catalyst-Enzyme/Makefile
+++ b/www/p5-Catalyst-Enzyme/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= CRUD framework for Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
p5-Catalyst-Model-CDBI>=0.1:www/p5-Catalyst-Model-CDBI \
p5-Catalyst-Plugin-DefaultEnd>=0:www/p5-Catalyst-Plugin-DefaultEnd \
@@ -29,7 +30,6 @@ BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile b/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
index 9a2ab59a25ad..99081b8b3e1f 100644
--- a/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
+++ b/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Catalyst helper for Scaffolding
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
p5-Catalyst-Plugin-FormValidator>=0:www/p5-Catalyst-Plugin-FormValidator \
p5-Catalyst-View-TT>=0:www/p5-Catalyst-View-TT \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Class-DBI-FromForm>=0:www/p5-Class-DBI-FromForm \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Template-Plugin-Class>=0:www/p5-Template-Plugin-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
index 2439c253df33..351feb606ea5 100644
--- a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= CDBI model class for Catalyst that makes things sweeter
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Class-DBI-Sweet>=0:databases/p5-Class-DBI-Sweet
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Catalyst-Model-DBIC-Plain/Makefile b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
index d24d2cc887ad..09581e76e5f1 100644
--- a/www/p5-Catalyst-Model-DBIC-Plain/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= DBIx::Class model class for Catalyst, without loader
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
p5-DBIx-Class>=0.01:databases/p5-DBIx-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Model-DBIC-Schema/Makefile b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
index 3de258d9853f..467892eca134 100644
--- a/www/p5-Catalyst-Model-DBIC-Schema/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
@@ -14,7 +14,8 @@ COMMENT= DBIx::Class::Schema Model Class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
p5-Catalyst-Component-InstancePerContext>=0:www/p5-Catalyst-Component-InstancePerContext \
p5-Catalyst-Runtime>=5.80005:www/p5-Catalyst-Runtime \
p5-CatalystX-Component-Traits>=0.14:www/p5-CatalystX-Component-Traits \
@@ -33,7 +34,6 @@ BUILD_DEPENDS= p5-Carp-Clan>=0:devel/p5-Carp-Clan \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/www/p5-Catalyst-Model-DynamicAdaptor/Makefile b/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
index 27f8e4a11ee6..4f7998b8c30c 100644
--- a/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
+++ b/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Dynamically load adaptor modules
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Module-Recursive-Require>=0:devel/p5-Module-Recursive-Require \
p5-Test-Spelling>=0:devel/p5-Test-Spelling
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Model-LDAP/Makefile b/www/p5-Catalyst-Model-LDAP/Makefile
index 18a3fd851a61..38008dadade6 100644
--- a/www/p5-Catalyst-Model-LDAP/Makefile
+++ b/www/p5-Catalyst-Model-LDAP/Makefile
@@ -13,13 +13,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.62000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.62000:www/p5-Catalyst-Runtime \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Module-Runtime>=0.015:devel/p5-Module-Runtime \
p5-Data-Page>=0:databases/p5-Data-Page \
p5-perl-ldap>=0.65:net/p5-perl-ldap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Catalyst-Model-Oryx/Makefile b/www/p5-Catalyst-Model-Oryx/Makefile
index 7465357fc318..089dff0b6569 100644
--- a/www/p5-Catalyst-Model-Oryx/Makefile
+++ b/www/p5-Catalyst-Model-Oryx/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Oryx model component for Catalyst
-BUILD_DEPENDS= p5-Oryx>=0:databases/p5-Oryx \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Oryx>=0:databases/p5-Oryx \
p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Model-Tarantool/Makefile b/www/p5-Catalyst-Model-Tarantool/Makefile
index 76129db86a52..825f28033ed0 100644
--- a/www/p5-Catalyst-Model-Tarantool/Makefile
+++ b/www/p5-Catalyst-Model-Tarantool/Makefile
@@ -13,9 +13,9 @@ COMMENT= Tarantool interface for Catalyst based application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.90001:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.90001:www/p5-Catalyst-Runtime \
p5-DR-Tarantool>=0.37:databases/p5-DR-Tarantool
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Catalyst-Model-XML-Feed/Makefile b/www/p5-Catalyst-Model-XML-Feed/Makefile
index 44b30ec26145..d432dc17da21 100644
--- a/www/p5-Catalyst-Model-XML-Feed/Makefile
+++ b/www/p5-Catalyst-Model-XML-Feed/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Use RSS/Atom feeds as a Catalyst Model
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-XML-Feed>=0.11:textproc/p5-XML-Feed \
p5-URI>=1.35:net/p5-URI \
p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Model-Xapian/Makefile b/www/p5-Catalyst-Model-Xapian/Makefile
index 1f49bf3918d5..d81ddce8bc56 100644
--- a/www/p5-Catalyst-Model-Xapian/Makefile
+++ b/www/p5-Catalyst-Model-Xapian/Makefile
@@ -14,11 +14,11 @@ COMMENT= Catalyst model for Search::Xapian
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.30:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.30:www/p5-Catalyst-Runtime \
p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
p5-Data-Page>=0:databases/p5-Data-Page \
p5-Search-Xapian12>=1.2.7.0:databases/p5-Search-Xapian12
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5 shebangfix
diff --git a/www/p5-Catalyst-Model-Xapian10/Makefile b/www/p5-Catalyst-Model-Xapian10/Makefile
index 01ef233b5806..4f143ba4049f 100644
--- a/www/p5-Catalyst-Model-Xapian10/Makefile
+++ b/www/p5-Catalyst-Model-Xapian10/Makefile
@@ -16,11 +16,11 @@ COMMENT= Catalyst model for Search::Xapian
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.30:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.30:www/p5-Catalyst-Runtime \
p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
p5-Data-Page>=0:databases/p5-Data-Page \
p5-Search-Xapian10>=0.9.2.4:databases/p5-Search-Xapian10
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5 shebangfix
diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
index 4ae6c43d3b49..db525a81ed40 100644
--- a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= CDBI Authentication for Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Catalyst-Model-CDBI>=0:www/p5-Catalyst-Model-CDBI \
p5-Catalyst-Plugin-Session-FastMmap>=0:www/p5-Catalyst-Plugin-Session-FastMmap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile b/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
index 2466a0f52b9a..a827dbb52373 100644
--- a/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
@@ -14,10 +14,10 @@ COMMENT= OpenID Authentication
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-LWPx-ParanoidAgent>=0:www/p5-LWPx-ParanoidAgent \
p5-Net-OpenID-Consumer>=0:net/p5-Net-OpenID-Consumer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
index f8af4fbbeee9..9b8fb93389f0 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
@@ -15,9 +15,9 @@ COMMENT= Use .htpasswd with Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Plugin-Authentication>=0.01:www/p5-Catalyst-Plugin-Authentication \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-Authentication>=0.01:www/p5-Catalyst-Plugin-Authentication \
p5-Authen-Htpasswd>=0.13:security/p5-Authen-Htpasswd
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Catalyst-Plugin-Authentication/Makefile b/www/p5-Catalyst-Plugin-Authentication/Makefile
index 00d4d6fd03c0..a959a69308b6 100644
--- a/www/p5-Catalyst-Plugin-Authentication/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication/Makefile
@@ -12,7 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Infrastructure plugin for the Catalyst authentication framework
-BUILD_DEPENDS= p5-Catalyst-Plugin-Session>=0.10:www/p5-Catalyst-Plugin-Session \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-Session>=0.10:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Class-Inspector>=0:devel/p5-Class-Inspector \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Catalyst-Plugin-Session>=0.10:www/p5-Catalyst-Plugin-Session \
p5-String-RewritePrefix>=0:textproc/p5-String-RewritePrefix \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
diff --git a/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile b/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
index 456f1d592940..c33fb76b1287 100644
--- a/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
+++ b/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
@@ -13,7 +13,8 @@ COMMENT= ACL support for Catalyst applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authentication \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authentication \
p5-Catalyst-Plugin-Authorization-Roles>=0:www/p5-Catalyst-Plugin-Authorization-Roles \
p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Class-Throwable>=0:devel/p5-Class-Throwable \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authe
p5-Tree-Simple>=0:devel/p5-Tree-Simple \
p5-Tree-Simple-VisitorFactory>=0:devel/p5-Tree-Simple-VisitorFactory \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
diff --git a/www/p5-Catalyst-Plugin-AutoCRUD/Makefile b/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
index dc8c8ad3e0d8..cb0b1e5410c0 100644
--- a/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
+++ b/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
@@ -13,7 +13,8 @@ COMMENT= Instant AJAX web front-end for DBIx::Class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView \
p5-Catalyst-Model-DBIC-Schema>=0:www/p5-Catalyst-Model-DBIC-Schema \
p5-Catalyst-Plugin-ConfigLoader>=0:www/p5-Catalyst-Plugin-ConfigLoader \
p5-Catalyst-Runtime>=5.70000:www/p5-Catalyst-Runtime \
@@ -27,7 +28,6 @@ BUILD_DEPENDS= p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderVie
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-SQL-Translator>=0:databases/p5-SQL-Translator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
diff --git a/www/p5-Catalyst-Plugin-Browser/Makefile b/www/p5-Catalyst-Plugin-Browser/Makefile
index 5144a54a8262..d0562187236b 100644
--- a/www/p5-Catalyst-Plugin-Browser/Makefile
+++ b/www/p5-Catalyst-Plugin-Browser/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Browser Detection for Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Catalyst-TraitFor-Request-BrowserDetect>=0:www/p5-Catalyst-TraitFor-Request-BrowserDetect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-C3/Makefile b/www/p5-Catalyst-Plugin-C3/Makefile
index a8caecc651dd..23177ebb059a 100644
--- a/www/p5-Catalyst-Plugin-C3/Makefile
+++ b/www/p5-Catalyst-Plugin-C3/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Catalyst Plugin to subvert NEXT to use Class::C3
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7006:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7006:www/p5-Catalyst-Runtime \
p5-Class-C3>=0.19:devel/p5-Class-C3
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
index f7618cbe5246..e43b5d3b3fa8 100644
--- a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
@@ -14,10 +14,10 @@ COMMENT= Mmap cache for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap \
p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile b/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
index f474ea52d6e9..9a682e1cd0a5 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Catalyst Plugin for Cache::Memcached::Fast
-BUILD_DEPENDS= p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-Test-Simple>=0:devel/p5-Test-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
index d15cd8dbdffb..722409a28914 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Distributed cache for Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Cache/Makefile b/www/p5-Catalyst-Plugin-Cache/Makefile
index e5fe4ce23cad..e9d4045fdf75 100644
--- a/www/p5-Catalyst-Plugin-Cache/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Flexible caching support for Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.8000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.8000:www/p5-Catalyst-Runtime \
p5-Task-Weaken>=0:devel/p5-Task-Weaken \
p5-MRO-Compat>=0:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
diff --git a/www/p5-Catalyst-Plugin-Captcha/Makefile b/www/p5-Catalyst-Plugin-Captcha/Makefile
index 70ba7fba7a41..dd731ec2fe91 100644
--- a/www/p5-Catalyst-Plugin-Captcha/Makefile
+++ b/www/p5-Catalyst-Plugin-Captcha/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Create and validate Captcha for Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
p5-libwww>=0:www/p5-libwww \
p5-GD-SecurityImage>=0:security/p5-GD-SecurityImage
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-ConfigLoader/Makefile b/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
index 4fef76a68a08..643d22a6552b 100644
--- a/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
+++ b/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
@@ -14,11 +14,11 @@ COMMENT= Load config files of various types
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7008:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7008:www/p5-Catalyst-Runtime \
p5-Data-Visitor>=0.24:devel/p5-Data-Visitor \
p5-Config-Any>=0.20:devel/p5-Config-Any \
p5-MRO-Compat>=0.09:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-CookiedSession/Makefile b/www/p5-Catalyst-Plugin-CookiedSession/Makefile
index 32ff83ad1dc9..5e9856bd840f 100644
--- a/www/p5-Catalyst-Plugin-CookiedSession/Makefile
+++ b/www/p5-Catalyst-Plugin-CookiedSession/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Catalyst Plugin for storing sessions in a browser cookie
-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-Crypt-CBC>=0:security/p5-Crypt-CBC \
p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
p5-JSON-XS-VersionOneAndTwo>=0:converters/p5-JSON-XS-VersionOneAndTwo \
p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
index c2a5ee1ebb33..5dbb0696f1d3 100644
--- a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
+++ b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Sensible default end action
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.2000:www/p5-Catalyst-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.2000:www/p5-Catalyst-Runtime
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Catalyst-Plugin-Email/Makefile b/www/p5-Catalyst-Plugin-Email/Makefile
index 751623fc2bbb..18e50029b40e 100644
--- a/www/p5-Catalyst-Plugin-Email/Makefile
+++ b/www/p5-Catalyst-Plugin-Email/Makefile
@@ -13,10 +13,10 @@ COMMENT= Send emails with Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Email-MIME>=0:mail/p5-Email-MIME \
p5-Email-Send>=0:mail/p5-Email-Send
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile b/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
index ef666f9b08b3..7d391e538d30 100644
--- a/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
+++ b/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
@@ -14,7 +14,8 @@ COMMENT= Catch application errors and emit them somewhere
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-DateTime>=0:devel/p5-DateTime \
p5-File-Slurp>=0:devel/p5-File-Slurp \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
p5-Moose>=0:devel/p5-Moose \
p5-Path-Class>=0:devel/p5-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Catalyst-Plugin-Authentication>=0.10010:www/p5-Catalyst-Plugin-Authentication \
p5-Catalyst-Plugin-ConfigLoader>=0.22:www/p5-Catalyst-Plugin-ConfigLoader \
p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
diff --git a/www/p5-Catalyst-Plugin-FillInForm/Makefile b/www/p5-Catalyst-Plugin-FillInForm/Makefile
index 7c29082c155a..31e8dd5381f4 100644
--- a/www/p5-Catalyst-Plugin-FillInForm/Makefile
+++ b/www/p5-Catalyst-Plugin-FillInForm/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Automatically fill in forms in Catalyst using HTML::FillInForms
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-FormBuilder/Makefile b/www/p5-Catalyst-Plugin-FormBuilder/Makefile
index d4c9c9d72b1f..3b9d3b1f4396 100644
--- a/www/p5-Catalyst-Plugin-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Plugin-FormBuilder/Makefile
@@ -14,9 +14,9 @@ COMMENT= FormBuilder for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime \
p5-CGI-FormBuilder>=3.02:www/p5-CGI-FormBuilder
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 tar:tgz
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-FormValidator/Makefile b/www/p5-Catalyst-Plugin-FormValidator/Makefile
index c9b126025431..7ce425bf0d77 100644
--- a/www/p5-Catalyst-Plugin-FormValidator/Makefile
+++ b/www/p5-Catalyst-Plugin-FormValidator/Makefile
@@ -14,11 +14,11 @@ COMMENT= FormValidator for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.80001:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.80001:www/p5-Catalyst-Runtime \
p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Moose>=0.93:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-I18N/Makefile b/www/p5-Catalyst-Plugin-I18N/Makefile
index 251e93d66c7c..4deea19e2204 100644
--- a/www/p5-Catalyst-Plugin-I18N/Makefile
+++ b/www/p5-Catalyst-Plugin-I18N/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= I18N for Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Locale-Maketext-Lexicon>=0:devel/p5-Locale-Maketext-Lexicon \
p5-Locale-Maketext-Simple>=0.19:devel/p5-Locale-Maketext-Simple \
p5-MRO-Compat>=0.10:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile b/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile
index c2481f107794..8f70af05c090 100644
--- a/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile
+++ b/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= oleg@mamontov.net
COMMENT= Log module of Catalyst that uses Log::Dispatch
-BUILD_DEPENDS= p5-Log-Dispatch>=2.13:devel/p5-Log-Dispatch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Dispatch>=2.13:devel/p5-Log-Dispatch \
p5-Log-Dispatch-Config>=0:devel/p5-Log-Dispatch-Config \
p5-Catalyst-Runtime>=5.65:www/p5-Catalyst-Runtime \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Log-Handler/Makefile b/www/p5-Catalyst-Plugin-Log-Handler/Makefile
index 0cdba3a1e404..98413393d751 100644
--- a/www/p5-Catalyst-Plugin-Log-Handler/Makefile
+++ b/www/p5-Catalyst-Plugin-Log-Handler/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Catalyst log handler
-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-Log-Handler>=0:devel/p5-Log-Handler \
p5-MRO-Compat>=0:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Catalyst-Plugin-PageCache/Makefile b/www/p5-Catalyst-Plugin-PageCache/Makefile
index ba8e2eb532f4..f1744befa507 100644
--- a/www/p5-Catalyst-Plugin-PageCache/Makefile
+++ b/www/p5-Catalyst-Plugin-PageCache/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Cache the output of entire pages
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-MRO-Compat>=0.10:devel/p5-MRO-Compat \
p5-Catalyst-Plugin-Cache>=0.08:www/p5-Catalyst-Plugin-Cache
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
diff --git a/www/p5-Catalyst-Plugin-Params-Nested/Makefile b/www/p5-Catalyst-Plugin-Params-Nested/Makefile
index 6190c33554ae..90910e5da785 100644
--- a/www/p5-Catalyst-Plugin-Params-Nested/Makefile
+++ b/www/p5-Catalyst-Plugin-Params-Nested/Makefile
@@ -14,9 +14,9 @@ COMMENT= Nested params (ala Ruby on Rails or PHP-style param arrays)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Expand>=1.06:www/p5-CGI-Expand \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Expand>=1.06:www/p5-CGI-Expand \
p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject
USES= perl5
diff --git a/www/p5-Catalyst-Plugin-Pluggable/Makefile b/www/p5-Catalyst-Plugin-Pluggable/Makefile
index 75f8fd686c6c..b0ee07cf4430 100644
--- a/www/p5-Catalyst-Plugin-Pluggable/Makefile
+++ b/www/p5-Catalyst-Plugin-Pluggable/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Plugin for pluggable Catalyst applications
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Prototype/Makefile b/www/p5-Catalyst-Plugin-Prototype/Makefile
index 694c813727a0..3e96f74b0b6f 100644
--- a/www/p5-Catalyst-Plugin-Prototype/Makefile
+++ b/www/p5-Catalyst-Plugin-Prototype/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Catalyst plugin for Prototype
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7006:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7006:www/p5-Catalyst-Runtime \
p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-HTML-Prototype>=1.48:www/p5-HTML-Prototype
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Scheduler/Makefile b/www/p5-Catalyst-Plugin-Scheduler/Makefile
index 32faeab56360..0f46d54a69ea 100644
--- a/www/p5-Catalyst-Plugin-Scheduler/Makefile
+++ b/www/p5-Catalyst-Plugin-Scheduler/Makefile
@@ -14,12 +14,12 @@ COMMENT= Schedule events to run in a cron-like manner
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-DateTime-Event-Cron>=0:devel/p5-DateTime-Event-Cron \
p5-Set-Scalar>=0:devel/p5-Set-Scalar \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Server/Makefile b/www/p5-Catalyst-Plugin-Server/Makefile
index c870d0e70f92..100730cd9108 100644
--- a/www/p5-Catalyst-Plugin-Server/Makefile
+++ b/www/p5-Catalyst-Plugin-Server/Makefile
@@ -14,13 +14,13 @@ COMMENT= Catalyst Server Plugin: Base & XMLRPC
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.90:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.90:www/p5-Catalyst-Runtime \
p5-Catalyst-DispatchType-Regex>=5.90000:www/p5-Catalyst-DispatchType-Regex \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Clone-Fast>=0:devel/p5-Clone-Fast \
p5-RPC-XML>=0:net/p5-RPC-XML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
index cd5c0adfa01a..2d9da90ec526 100644
--- a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= FastMmap sessions for Catalyst
-BUILD_DEPENDS= p5-Cache-FastMmap>0:devel/p5-Cache-FastMmap \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-FastMmap>0:devel/p5-Cache-FastMmap \
p5-Catalyst-Runtime>2.99:www/p5-Catalyst-Runtime \
p5-Class-Accessor>0:devel/p5-Class-Accessor \
p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
p5-MRO-Compat>0:devel/p5-MRO-Compat \
p5-URI-Find>0:textproc/p5-URI-Find \
p5-URI>0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Session-PerUser/Makefile b/www/p5-Catalyst-Plugin-Session-PerUser/Makefile
index 6d55dacc3059..59e19ece6f86 100644
--- a/www/p5-Catalyst-Plugin-Session-PerUser/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-PerUser/Makefile
@@ -14,14 +14,14 @@ COMMENT= Per user sessions (instead of per browser sessions)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authentication \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authentication \
p5-Catalyst-Plugin-Session>=0.06:www/p5-Catalyst-Plugin-Session \
p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Moose>=0:devel/p5-Moose \
p5-Object-Signature>=0:devel/p5-Object-Signature \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/www/p5-Catalyst-Plugin-Session-State-URI/Makefile b/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
index 78ca3c2ec5c4..0e22063d5fb7 100644
--- a/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Saves Catalyst Session IDs by rewriting URIs
-BUILD_DEPENDS= p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-HTML-TokeParser-Simple>=0:www/p5-HTML-TokeParser-Simple \
p5-MIME-Types>=0:mail/p5-MIME-Types \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
p5-URI>=0:net/p5-URI \
p5-URI-Find>=0:textproc/p5-URI-Find \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=1.01:devel/p5-Test-MockObject
USES= perl5
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
index 04b61159a254..9996dcde7d1e 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Store sessions using a Catalyst::Plugin::Cache
-BUILD_DEPENDS= p5-Catalyst-Plugin-Session>=0.06:www/p5-Catalyst-Plugin-Session
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-Session>=0.06:www/p5-Catalyst-Plugin-Session
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile b/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
index 1249c4428ef3..ea0963e3afc5 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Store your sessions in a database
-BUILD_DEPENDS= p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Runtime>=5.49:www/p5-Catalyst-Runtime \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-DBI>=0:databases/p5-DBI \
p5-MRO-Compat>=0:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile b/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
index 2910d0e2ce8e..b74b5c77e8da 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
@@ -14,12 +14,12 @@ COMMENT= Store your sessions via DBIx::Class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Catalyst-Plugin-Session-Store-Delegate>=0.05:www/p5-Catalyst-Plugin-Session-Store-Delegate \
p5-DBIx-Class>=0.0700:databases/p5-DBIx-Class \
p5-MRO-Compat>0:devel/p5-MRO-Compat \
p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Warn>=0:devel/p5-Test-Warn
USES= perl5
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
index 3aa8eb5a6dfc..1e372bfe0758 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
@@ -14,9 +14,9 @@ COMMENT= Delegate session storage to an application model object
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
p5-MRO-Compat>0:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
index 728246de8adf..ff2be6a210cb 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= FastMmap session storage backend
-BUILD_DEPENDS= p5-Cache-FastMmap>=1.29:devel/p5-Cache-FastMmap \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-FastMmap>=1.29:devel/p5-Cache-FastMmap \
p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-MooseX-Emulate-Class-Accessor-Fast>=0:devel/p5-MooseX-Emulate-Class-Accessor-Fast \
p5-Path-Class>=0:devel/p5-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
index 025cad714577..de837be60c90 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
@@ -14,12 +14,12 @@ COMMENT= File storage backend for session data
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Cache-Cache>=1.02:devel/p5-Cache-Cache \
p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
p5-MRO-Compat>=0.10:devel/p5-MRO-Compat \
p5-Class-Data-Inheritable>=0.04:devel/p5-Class-Data-Inheritable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile
index 8e5c0bfee8ea..5ec1ffbb811b 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Memcached storage backend for session data
-BUILD_DEPENDS= p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
p5-Catalyst-Plugin-Session>=0.01:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
index 9bcb9be258c8..b361dfdc03cc 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
@@ -14,7 +14,8 @@ COMMENT= Memcached storage backend for session data
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cache-Memcached-Managed>=0:databases/p5-Cache-Memcached-Managed \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Memcached-Managed>=0:databases/p5-Cache-Memcached-Managed \
p5-Catalyst-Plugin-Session>=0.26:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Cache-Memcached-Managed>=0:databases/p5-Cache-Memcached-Manage
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Emulate-Class-Accessor-Fast>=0:devel/p5-MooseX-Emulate-Class-Accessor-Fast \
p5-namespace-clean>=0:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Session/Makefile b/www/p5-Catalyst-Plugin-Session/Makefile
index 64da53fa77c3..66b8fb09c415 100644
--- a/www/p5-Catalyst-Plugin-Session/Makefile
+++ b/www/p5-Catalyst-Plugin-Session/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
# Do not add p5-Catalyst-Plugin-Session-State-Cookie to TEST_DEPENDS to avoid cyclic dependency
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.71001:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.71001:www/p5-Catalyst-Runtime \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Moose>=0.76:devel/p5-Moose \
p5-MooseX-Emulate-Class-Accessor-Fast>=0.00801:devel/p5-MooseX-Emulate-Class-Accessor-Fast \
p5-Object-Signature>=0:devel/p5-Object-Signature \
p5-namespace-clean>=0.10:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-WWW-Mechanize-PSGI>=0:devel/p5-Test-WWW-Mechanize-PSGI
diff --git a/www/p5-Catalyst-Plugin-Setenv/Makefile b/www/p5-Catalyst-Plugin-Setenv/Makefile
index 72b8898146eb..0cff004a2ede 100644
--- a/www/p5-Catalyst-Plugin-Setenv/Makefile
+++ b/www/p5-Catalyst-Plugin-Setenv/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Set up the environment from Catalyst's config file
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Catalyst-Plugin-SmartURI/Makefile b/www/p5-Catalyst-Plugin-SmartURI/Makefile
index 85b01b17bce9..33d477c189fb 100644
--- a/www/p5-Catalyst-Plugin-SmartURI/Makefile
+++ b/www/p5-Catalyst-Plugin-SmartURI/Makefile
@@ -13,12 +13,12 @@ COMMENT= Configurable URIs for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Class-C3-Componentised>=0:devel/p5-Class-C3-Componentised \
p5-Class-Load>=0:devel/p5-Class-Load \
p5-Moose>=0:devel/p5-Moose \
p5-URI-SmartURI>=0:net/p5-URI-SmartURI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Catalyst-Plugin-StackTrace/Makefile b/www/p5-Catalyst-Plugin-StackTrace/Makefile
index b12e5d127606..2e252a7934cc 100644
--- a/www/p5-Catalyst-Plugin-StackTrace/Makefile
+++ b/www/p5-Catalyst-Plugin-StackTrace/Makefile
@@ -14,10 +14,10 @@ COMMENT= Display a stack trace on the debug screen
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
p5-MRO-Compat>=0.10:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Static-Simple/Makefile b/www/p5-Catalyst-Plugin-Static-Simple/Makefile
index c41fd0f47283..8944747931fe 100644
--- a/www/p5-Catalyst-Plugin-Static-Simple/Makefile
+++ b/www/p5-Catalyst-Plugin-Static-Simple/Makefile
@@ -13,12 +13,12 @@ COMMENT= Make serving static pages painless
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.80008:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.80008:www/p5-Catalyst-Runtime \
p5-MIME-Types>=2.03:mail/p5-MIME-Types \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Catalyst-Plugin-Static/Makefile b/www/p5-Catalyst-Plugin-Static/Makefile
index 91be55da5ac0..a5c556dc82dd 100644
--- a/www/p5-Catalyst-Plugin-Static/Makefile
+++ b/www/p5-Catalyst-Plugin-Static/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Serve static files with Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=2.99:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=2.99:www/p5-Catalyst-Runtime \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-File-MimeInfo>=0.11:devel/p5-File-MimeInfo \
p5-File-Slurp>0:devel/p5-File-Slurp \
p5-MRO-Compat>0:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-StatusMessage/Makefile b/www/p5-Catalyst-Plugin-StatusMessage/Makefile
index 0449db74ab31..d74ad3fe5c7c 100644
--- a/www/p5-Catalyst-Plugin-StatusMessage/Makefile
+++ b/www/p5-Catalyst-Plugin-StatusMessage/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= fw@moov.de
COMMENT= Handle passing of status (success and error) messages
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-SubRequest/Makefile b/www/p5-Catalyst-Plugin-SubRequest/Makefile
index 87bd61cc3c3f..ccd3b752a6e9 100644
--- a/www/p5-Catalyst-Plugin-SubRequest/Makefile
+++ b/www/p5-Catalyst-Plugin-SubRequest/Makefile
@@ -13,8 +13,8 @@ COMMENT= Make subrequests to actions in Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.90000:www/p5-Catalyst-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.90000:www/p5-Catalyst-Runtime
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Textile/Makefile b/www/p5-Catalyst-Plugin-Textile/Makefile
index b0d2481afa61..746e034b737e 100644
--- a/www/p5-Catalyst-Plugin-Textile/Makefile
+++ b/www/p5-Catalyst-Plugin-Textile/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Textile for Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-Text-Textile>=0:textproc/p5-Text-Textile
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Plugin-Unicode/Makefile b/www/p5-Catalyst-Plugin-Unicode/Makefile
index fee285b2a086..e65d8a438264 100644
--- a/www/p5-Catalyst-Plugin-Unicode/Makefile
+++ b/www/p5-Catalyst-Plugin-Unicode/Makefile
@@ -14,9 +14,9 @@ COMMENT= Unicode aware Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-MRO-Compat>=0.10:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-stringy>=0:devel/p5-IO-stringy \
p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
diff --git a/www/p5-Catalyst-Plugin-XMLRPC/Makefile b/www/p5-Catalyst-Plugin-XMLRPC/Makefile
index f2cb570bb9b5..ca40cf95732b 100644
--- a/www/p5-Catalyst-Plugin-XMLRPC/Makefile
+++ b/www/p5-Catalyst-Plugin-XMLRPC/Makefile
@@ -14,10 +14,10 @@ COMMENT= Dispatch XMLRPC methods with Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-RPC-XML>=0:net/p5-RPC-XML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Runtime/Makefile b/www/p5-Catalyst-Runtime/Makefile
index da200b17a531..19d242c1c221 100644
--- a/www/p5-Catalyst-Runtime/Makefile
+++ b/www/p5-Catalyst-Runtime/Makefile
@@ -18,7 +18,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# - devel/p5-Test-WWW-Mechanize-Catalyst
# - www/p5-Catalyst-Engine-PSGI
# - www/p5-CatalystX-LeakChecker
-BUILD_DEPENDS= p5-CGI-Simple>=1.109:www/p5-CGI-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Simple>=1.109:www/p5-CGI-Simple \
p5-CGI-Struct>=0:www/p5-CGI-Struct \
p5-Class-C3-Adopt-NEXT>=0.07:devel/p5-Class-C3-Adopt-NEXT \
p5-Class-Load>=0.12:devel/p5-Class-Load \
@@ -55,7 +56,6 @@ BUILD_DEPENDS= p5-CGI-Simple>=1.109:www/p5-CGI-Simple \
p5-URI-ws>=0.03:net/p5-URI-ws \
p5-libwww>=5.837:www/p5-libwww \
p5-namespace-clean>=0.23:devel/p5-namespace-clean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Term-Size-Any>=0:devel/p5-Term-Size-Any \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Without-Module>=0:devel/p5-Test-Without-Module \
@@ -71,7 +71,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/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile b/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile
index 430b319c2777..acf8161b0f2e 100644
--- a/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile
+++ b/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= Alex.Bakhtin@gmail.com
COMMENT= Helps you paginate, search, sort, and more easily using DBIx::Class
-BUILD_DEPENDS= p5-Catalyst-Model-DBIC-Schema>=0.29:www/p5-Catalyst-Model-DBIC-Schema \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Model-DBIC-Schema>=0.29:www/p5-Catalyst-Model-DBIC-Schema \
p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
p5-DBIx-Class>=0.08108:databases/p5-DBIx-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Catalyst-View-JSON>=0:www/p5-Catalyst-View-JSON \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-JSON>=0:converters/p5-JSON \
diff --git a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
index 2ff7ece7dc0f..b162258449d7 100644
--- a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
+++ b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Browser detection for Catalyst::Requests
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-CatalystX-RoleApplicator>=0:www/p5-CatalystX-RoleApplicator \
p5-HTTP-BrowserDetect>=0:www/p5-HTTP-BrowserDetect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-View-ClearSilver/Makefile b/www/p5-Catalyst-View-ClearSilver/Makefile
index 3caa9ce3266a..1ad866d8d7b6 100644
--- a/www/p5-Catalyst-View-ClearSilver/Makefile
+++ b/www/p5-Catalyst-View-ClearSilver/Makefile
@@ -15,12 +15,12 @@ COMMENT= ClearSilver view class for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-ClearSilver>=0:www/p5-ClearSilver \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ClearSilver>=0:www/p5-ClearSilver \
p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util \
p5-Class-C3>=0:devel/p5-Class-C3 \
p5-Catalyst-View-Templated>=0:www/p5-Catalyst-View-Templated
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Catalyst-View-Template-Declare>=0:www/p5-Catalyst-View-Template-Declare
USES= perl5
diff --git a/www/p5-Catalyst-View-Email/Makefile b/www/p5-Catalyst-View-Email/Makefile
index bd115a904049..910083787f85 100644
--- a/www/p5-Catalyst-View-Email/Makefile
+++ b/www/p5-Catalyst-View-Email/Makefile
@@ -13,13 +13,13 @@ COMMENT= Catalyst View for Email
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-SASL>=2.13:security/p5-Authen-SASL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-SASL>=2.13:security/p5-Authen-SASL \
p5-Catalyst-Runtime>=5.70000:www/p5-Catalyst-Runtime \
p5-Email-MIME>=1.859:mail/p5-Email-MIME \
p5-Email-Sender>=0.100110:mail/p5-Email-Sender \
p5-Module-Runtime>=0.014:devel/p5-Module-Runtime \
p5-Moose>=0.93:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Catalyst-View-Mason>=0.18:www/p5-Catalyst-View-Mason \
p5-Catalyst-View-TT>=0.31:www/p5-Catalyst-View-TT \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/www/p5-Catalyst-View-GraphViz/Makefile b/www/p5-Catalyst-View-GraphViz/Makefile
index 6ea2237eebd6..bbe523879f69 100644
--- a/www/p5-Catalyst-View-GraphViz/Makefile
+++ b/www/p5-Catalyst-View-GraphViz/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Catalyst::View::GraphViz - GraphViz View Class
-BUILD_DEPENDS= p5-Catalyst-Plugin-SubRequest>=0:www/p5-Catalyst-Plugin-SubRequest \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Plugin-SubRequest>=0:www/p5-Catalyst-Plugin-SubRequest \
p5-GraphViz>=0:graphics/p5-GraphViz
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
index ff4683c191c3..aee323884ff7 100644
--- a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
+++ b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= HTML::Template::Compiled View Class
-BUILD_DEPENDS= p5-HTML-Template-Compiled>=0.74:www/p5-HTML-Template-Compiled \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Template-Compiled>=0.74:www/p5-HTML-Template-Compiled \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Catalyst-View-HTML-Template/Makefile b/www/p5-Catalyst-View-HTML-Template/Makefile
index 2209d0e18549..cd22282e817e 100644
--- a/www/p5-Catalyst-View-HTML-Template/Makefile
+++ b/www/p5-Catalyst-View-HTML-Template/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kiki@bsdro.org
COMMENT= HTML::Template view class for Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5:www/p5-Catalyst-Runtime \
p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
p5-HTML-Template>0:www/p5-HTML-Template
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Catalyst-View-JSON/Makefile b/www/p5-Catalyst-View-JSON/Makefile
index f5df18f2d6c3..da6d818f4853 100644
--- a/www/p5-Catalyst-View-JSON/Makefile
+++ b/www/p5-Catalyst-View-JSON/Makefile
@@ -12,10 +12,10 @@ COMMENT= Catalyst View handler that returns stash data in JSON format
LICENSE= ART10
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.6000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.6000:www/p5-Catalyst-Runtime \
p5-JSON-Any>=1.15:converters/p5-JSON-Any \
p5-MRO-Compat>0:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-View-Mason/Makefile b/www/p5-Catalyst-View-Mason/Makefile
index 9042cf200a4d..bbff4aa3c093 100644
--- a/www/p5-Catalyst-View-Mason/Makefile
+++ b/www/p5-Catalyst-View-Mason/Makefile
@@ -13,10 +13,10 @@ COMMENT= Mason view class for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.5000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.5000:www/p5-Catalyst-Runtime \
p5-HTML-Mason>=0:www/p5-HTML-Mason \
p5-MRO-Compat>=0:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Catalyst-Devel>=0:www/p5-Catalyst-Devel
USES= perl5
diff --git a/www/p5-Catalyst-View-RRDGraph/Makefile b/www/p5-Catalyst-View-RRDGraph/Makefile
index 42104201fa0c..99a4fbd8143e 100644
--- a/www/p5-Catalyst-View-RRDGraph/Makefile
+++ b/www/p5-Catalyst-View-RRDGraph/Makefile
@@ -13,11 +13,11 @@ COMMENT= RRD graph view class for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Catalyst-Plugin-Static-Simple>=0.17:www/p5-Catalyst-Plugin-Static-Simple \
rrdtool>=0:databases/rrdtool \
p5-MRO-Compat>=0:devel/p5-MRO-Compat
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=1.07:devel/p5-Test-MockObject
USES= perl5
diff --git a/www/p5-Catalyst-View-TT-Alloy/Makefile b/www/p5-Catalyst-View-TT-Alloy/Makefile
index df5f929baa43..85a84e147cec 100644
--- a/www/p5-Catalyst-View-TT-Alloy/Makefile
+++ b/www/p5-Catalyst-View-TT-Alloy/Makefile
@@ -14,11 +14,11 @@ COMMENT= Template::Alloy views for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime \
p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Template-Alloy>=0:www/p5-Template-Alloy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-View-TT-ControllerLocal/Makefile b/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
index bee1653dfb07..1228d2ad6d5c 100644
--- a/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
+++ b/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
@@ -14,10 +14,10 @@ COMMENT= Catalyst TT View with template names relative to the Controller
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
p5-Catalyst-View-TT>=0:www/p5-Catalyst-View-TT
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-View-TT/Makefile b/www/p5-Catalyst-View-TT/Makefile
index 2c2394aef09b..dcb356da0dac 100644
--- a/www/p5-Catalyst-View-TT/Makefile
+++ b/www/p5-Catalyst-View-TT/Makefile
@@ -13,14 +13,14 @@ COMMENT= Template Toolkit view class for Catalyst
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-MRO-Compat>=0:devel/p5-MRO-Compat \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Template-Timer>=0:www/p5-Template-Timer \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Catalyst-View-Template-Declare/Makefile b/www/p5-Catalyst-View-Template-Declare/Makefile
index 1f49a4c2e2ec..3f8160a7c03b 100644
--- a/www/p5-Catalyst-View-Template-Declare/Makefile
+++ b/www/p5-Catalyst-View-Template-Declare/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to use Template::Declare with Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Catalyst-View-Templated>=0:www/p5-Catalyst-View-Templated \
p5-Class-C3>=0:devel/p5-Class-C3 \
p5-PadWalker>=0:devel/p5-PadWalker \
p5-Template-Declare>=0.26:textproc/p5-Template-Declare
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-View-Templated/Makefile b/www/p5-Catalyst-View-Templated/Makefile
index 6ba72db3159b..50c0dce15673 100644
--- a/www/p5-Catalyst-View-Templated/Makefile
+++ b/www/p5-Catalyst-View-Templated/Makefile
@@ -15,10 +15,10 @@ COMMENT= Generic base class for template-based views
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Component-ACCEPT_CONTEXT>=0:www/p5-Catalyst-Component-ACCEPT_CONTEXT \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Component-ACCEPT_CONTEXT>=0:www/p5-Catalyst-Component-ACCEPT_CONTEXT \
p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-Class-C3>=0:devel/p5-Class-C3
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject \
p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
diff --git a/www/p5-Catalyst-View-XML-Feed/Makefile b/www/p5-Catalyst-View-XML-Feed/Makefile
index 234a78719d5d..1df21c0be8c9 100644
--- a/www/p5-Catalyst-View-XML-Feed/Makefile
+++ b/www/p5-Catalyst-View-XML-Feed/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl extension for Catalyst view for RSS, Atom, or other XML feeds
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
p5-XML-Feed>=0:textproc/p5-XML-Feed \
p5-TimeDate>=0:devel/p5-TimeDate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-View-XSLT/Makefile b/www/p5-Catalyst-View-XSLT/Makefile
index aaa7d7ce4d23..a05b1e7cb107 100644
--- a/www/p5-Catalyst-View-XSLT/Makefile
+++ b/www/p5-Catalyst-View-XSLT/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= XSLT view class for Catalyst
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
p5-XML-LibXSLT>=1.52:textproc/p5-XML-LibXSLT \
p5-Path-Class>=0.12:devel/p5-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-CatalystX-InjectComponent/Makefile b/www/p5-CatalystX-InjectComponent/Makefile
index 8901ad239f9a..980d2c93e010 100644
--- a/www/p5-CatalystX-InjectComponent/Makefile
+++ b/www/p5-CatalystX-InjectComponent/Makefile
@@ -14,9 +14,9 @@ COMMENT= Inject components into your Catalyst application
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
p5-Class-Inspector>=0:devel/p5-Class-Inspector
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Most>=0:devel/p5-Test-Most
USES= perl5
diff --git a/www/p5-CatalystX-LeakChecker/Makefile b/www/p5-CatalystX-LeakChecker/Makefile
index cc36499acdc9..36b12aec4c69 100644
--- a/www/p5-CatalystX-LeakChecker/Makefile
+++ b/www/p5-CatalystX-LeakChecker/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Debug memory leaks in Catalyst applications
-BUILD_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
p5-Devel-Cycle>0:devel/p5-Devel-Cycle \
p5-PadWalker>0:devel/p5-PadWalker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CatalystX-Profile/Makefile b/www/p5-CatalystX-Profile/Makefile
index 00fc8fe8fee3..127f1b933451 100644
--- a/www/p5-CatalystX-Profile/Makefile
+++ b/www/p5-CatalystX-Profile/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.80020:www/p5-Catalyst-Runtime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Runtime>=5.80020:www/p5-Catalyst-Runtime \
p5-CatalystX-InjectComponent>=0.024:www/p5-CatalystX-InjectComponent \
p5-Devel-NYTProf>=3.01:devel/p5-Devel-NYTProf \
p5-Moose>=0.93:devel/p5-Moose \
p5-Sub-Identify>=0.04:devel/p5-Sub-Identify \
p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-CatalystX-RoleApplicator/Makefile b/www/p5-CatalystX-RoleApplicator/Makefile
index 6a886ff21c90..373cf2c7fb1e 100644
--- a/www/p5-CatalystX-RoleApplicator/Makefile
+++ b/www/p5-CatalystX-RoleApplicator/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Apply roles to your Catalyst application-related classes
-BUILD_DEPENDS= p5-MooseX-RelatedClassRoles>=0.003:devel/p5-MooseX-RelatedClassRoles \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MooseX-RelatedClassRoles>=0.003:devel/p5-MooseX-RelatedClassRoles \
p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-CatalystX-SimpleLogin/Makefile b/www/p5-CatalystX-SimpleLogin/Makefile
index a8d1953980d7..3ff20afb602b 100644
--- a/www/p5-CatalystX-SimpleLogin/Makefile
+++ b/www/p5-CatalystX-SimpleLogin/Makefile
@@ -13,7 +13,8 @@ COMMENT= Provide a simple Login controller which can be reused
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Catalyst-Action-REST>=0.74:www/p5-Catalyst-Action-REST \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Action-REST>=0.74:www/p5-Catalyst-Action-REST \
p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authentication \
p5-Catalyst-Plugin-Session>=0.35:www/p5-Catalyst-Plugin-Session \
p5-Catalyst-Runtime>=5.80013:www/p5-Catalyst-Runtime \
@@ -28,7 +29,6 @@ BUILD_DEPENDS= p5-Catalyst-Action-REST>=0.74:www/p5-Catalyst-Action-REST \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-Try-Tiny>=0.24:lang/p5-Try-Tiny \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView \
p5-Catalyst-ActionRole-ACL>=0:www/p5-Catalyst-ActionRole-ACL \
p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
diff --git a/www/p5-CatalystX-VirtualComponents/Makefile b/www/p5-CatalystX-VirtualComponents/Makefile
index 6c2b449841d5..75a1b775bb86 100644
--- a/www/p5-CatalystX-VirtualComponents/Makefile
+++ b/www/p5-CatalystX-VirtualComponents/Makefile
@@ -14,12 +14,12 @@ COMMENT= Setup virtual Catalyst components
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-namespace-clean>0:devel/p5-namespace-clean \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-namespace-clean>0:devel/p5-namespace-clean \
p5-Catalyst-Runtime>=5.8:www/p5-Catalyst-Runtime \
p5-Devel-InheritNamespace>0:devel/p5-Devel-InheritNamespace \
p5-Moose>0:devel/p5-Moose \
p5-Module-Pluggable>0:devel/p5-Module-Pluggable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Class-DBI-FromForm/Makefile b/www/p5-Class-DBI-FromForm/Makefile
index 693f1db71157..f4985c08aee9 100644
--- a/www/p5-Class-DBI-FromForm/Makefile
+++ b/www/p5-Class-DBI-FromForm/Makefile
@@ -15,9 +15,9 @@ COMMENT= Update Class::DBI using Data::FormValidator or HTML::Widget
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \
p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Dancer-Logger-Log4perl/Makefile b/www/p5-Dancer-Logger-Log4perl/Makefile
index ec34b7181d09..ffbcd1e3e182 100644
--- a/www/p5-Dancer-Logger-Log4perl/Makefile
+++ b/www/p5-Dancer-Logger-Log4perl/Makefile
@@ -13,9 +13,9 @@ COMMENT= Dancer logging adapter for Log::Log4perl
LICENSE= ART20
-BUILD_DEPENDS= p5-Dancer>=1.2001:www/p5-Dancer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer>=1.2001:www/p5-Dancer \
p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Dancer-Plugin-ExtDirect/Makefile b/www/p5-Dancer-Plugin-ExtDirect/Makefile
index ddd188b8cbc0..a0e233275cac 100644
--- a/www/p5-Dancer-Plugin-ExtDirect/Makefile
+++ b/www/p5-Dancer-Plugin-ExtDirect/Makefile
@@ -14,9 +14,9 @@ COMMENT= Dancer plugin for implementing ExtDirect APIs
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer>=1.2001:www/p5-Dancer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer>=1.2001:www/p5-Dancer \
p5-JSON>=0:converters/p5-JSON
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Dancer-Plugin-Feed/Makefile b/www/p5-Dancer-Plugin-Feed/Makefile
index 30af47997d77..2f3ebc6e6ef7 100644
--- a/www/p5-Dancer-Plugin-Feed/Makefile
+++ b/www/p5-Dancer-Plugin-Feed/Makefile
@@ -14,9 +14,9 @@ COMMENT= Dancer plugin for generating RSS or Atom feeds
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer>=1.2001:www/p5-Dancer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer>=1.2001:www/p5-Dancer \
p5-XML-Feed>=0:textproc/p5-XML-Feed
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Dancer-Plugin-FlashMessage/Makefile b/www/p5-Dancer-Plugin-FlashMessage/Makefile
index 3d293588835b..7e5f8d125c36 100644
--- a/www/p5-Dancer-Plugin-FlashMessage/Makefile
+++ b/www/p5-Dancer-Plugin-FlashMessage/Makefile
@@ -13,8 +13,8 @@ COMMENT= Dancer plugin for implementing Flash Messages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer>=1.2001:www/p5-Dancer
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer>=1.2001:www/p5-Dancer
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Dancer-Plugin-RPC/Makefile b/www/p5-Dancer-Plugin-RPC/Makefile
index 7d73cd690c7f..e5f575e4d9b8 100644
--- a/www/p5-Dancer-Plugin-RPC/Makefile
+++ b/www/p5-Dancer-Plugin-RPC/Makefile
@@ -14,12 +14,12 @@ COMMENT= Configure endpoints for XMLRPC and JSONRPC procedures
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Dancer>=1.3100:www/p5-Dancer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer>=1.3100:www/p5-Dancer \
p5-JSON>=2.0:converters/p5-JSON \
p5-Params-ValidationCompiler>=0.24:devel/p5-Params-ValidationCompiler \
p5-RPC-XML>=0.56:net/p5-RPC-XML \
p5-Type-Tiny>=1:devel/p5-Type-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0.010:devel/p5-Test-Fatal \
p5-Test-NoWarnings>=1:devel/p5-Test-NoWarnings
diff --git a/www/p5-Dancer2-Plugin-Ajax/Makefile b/www/p5-Dancer2-Plugin-Ajax/Makefile
index 34b135a8c58e..be6c824dd1b4 100644
--- a/www/p5-Dancer2-Plugin-Ajax/Makefile
+++ b/www/p5-Dancer2-Plugin-Ajax/Makefile
@@ -13,8 +13,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Dancer2>=0.200000:www/p5-Dancer2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer2>=0.200000:www/p5-Dancer2
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Dancer2-Plugin-Deferred/Makefile b/www/p5-Dancer2-Plugin-Deferred/Makefile
index 2b7132859a29..1c762c50c828 100644
--- a/www/p5-Dancer2-Plugin-Deferred/Makefile
+++ b/www/p5-Dancer2-Plugin-Deferred/Makefile
@@ -13,9 +13,9 @@ COMMENT= Dancer2 plugin to defer messages or data across redirections
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Dancer2>=0.200000:www/p5-Dancer2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer2>=0.200000:www/p5-Dancer2 \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-HTTP-Cookies>=0:www/p5-HTTP-Cookies \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-Plack>=0:www/p5-Plack
diff --git a/www/p5-Dancer2-Plugin-Interchange6/Makefile b/www/p5-Dancer2-Plugin-Interchange6/Makefile
index 789d56cd4087..10e186f12cb6 100644
--- a/www/p5-Dancer2-Plugin-Interchange6/Makefile
+++ b/www/p5-Dancer2-Plugin-Interchange6/Makefile
@@ -13,7 +13,8 @@ COMMENT= Dancer2 Plugin for Interchange6 Open Source Shop Machine
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Interchange6-Schema>=0:databases/p5-Interchange6-Schema \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Interchange6-Schema>=0:databases/p5-Interchange6-Schema \
p5-Interchange6>=0:www/p5-Interchange6 \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Moo>=2.000000:devel/p5-Moo \
@@ -30,7 +31,6 @@ BUILD_DEPENDS= p5-Interchange6-Schema>=0:databases/p5-Interchange6-Schema \
p5-Dancer2-Plugin-DBIC>=0.0013:databases/p5-Dancer2-Plugin-DBIC \
p5-Dancer2-Plugin-Auth-Extensible>=0.600:security/p5-Dancer2-Plugin-Auth-Extensible \
p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC>=0.600:security/p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-DBIx-Class-Helpers>=0:databases/p5-DBIx-Class-Helpers \
p5-Test-WWW-Mechanize-PSGI>=0:devel/p5-Test-WWW-Mechanize-PSGI
diff --git a/www/p5-Dancer2-Plugin-Path-Class/Makefile b/www/p5-Dancer2-Plugin-Path-Class/Makefile
index f77755e81ed2..c161404ecdfe 100644
--- a/www/p5-Dancer2-Plugin-Path-Class/Makefile
+++ b/www/p5-Dancer2-Plugin-Path-Class/Makefile
@@ -14,11 +14,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
TEST_DEPENDS= p5-Path-Tiny>=0:devel/p5-Path-Tiny
-BUILD_DEPENDS= p5-Dancer2>=0.166000:www/p5-Dancer2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Dancer2>=0.166000:www/p5-Dancer2 \
p5-MIME-Types>=0:mail/p5-MIME-Types \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Format-Human-Bytes>=0:converters/p5-Format-Human-Bytes
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Dancer2/Makefile b/www/p5-Dancer2/Makefile
index 8d359689da91..2270755ba203 100644
--- a/www/p5-Dancer2/Makefile
+++ b/www/p5-Dancer2/Makefile
@@ -15,7 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+ p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install
+RUN_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \
p5-Capture-Tiny>=0.12:devel/p5-Capture-Tiny \
p5-Clone>=0:devel/p5-Clone \
p5-Crypt-URandom>=0:security/p5-Crypt-URandom \
@@ -44,7 +46,6 @@ BUILD_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww \
p5-YAML>=0.86:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
@@ -56,18 +57,16 @@ TEST_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
p5-Test-MockTime>=0:devel/p5-Test-MockTime \
p5-YAML>=0.86:textproc/p5-YAML
-BUILD_DEPENDS+= p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install
OPTIONS_DEFINE= XS
OPTIONS_DEFAULT= XS
-XS_BUILD_DEPENDS= p5-CGI-Deurl-XS>=0:www/p5-CGI-Deurl-XS \
- p5-Class-Load-XS>=0:devel/p5-Class-Load-XS \
- p5-JSON-XS>=0:converters/p5-JSON-XS \
- p5-Scope-Upper>=0:devel/p5-Scope-Upper \
- p5-URL-Encode-XS>=0:www/p5-URL-Encode-XS \
- p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
-XS_RUN_DEPENDS= ${XS_BUILD_DEPENDS}
+XS_RUN_DEPENDS= p5-CGI-Deurl-XS>=0:www/p5-CGI-Deurl-XS \
+ p5-Class-Load-XS>=0:devel/p5-Class-Load-XS \
+ p5-JSON-XS>=0:converters/p5-JSON-XS \
+ p5-Scope-Upper>=0:devel/p5-Scope-Upper \
+ p5-URL-Encode-XS>=0:www/p5-URL-Encode-XS \
+ p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
NO_ARCH= yes
USES= perl5
@@ -76,7 +75,6 @@ USE_PERL5= configure
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 502502
-BUILD_DEPENDS+= p5-ExtUtils-MakeMaker>=7.12:devel/p5-ExtUtils-MakeMaker
RUN_DEPENDS+= p5-ExtUtils-MakeMaker>=7.12:devel/p5-ExtUtils-MakeMaker
.endif
diff --git a/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile b/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
index 28a1589b5d77..9d5b10a251ce 100644
--- a/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
+++ b/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
@@ -14,8 +14,8 @@ COMMENT= DHTML renderer for Data::TreeDumper
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Emplacken/Makefile b/www/p5-Emplacken/Makefile
index 689d3196f49b..6a036eaa27db 100644
--- a/www/p5-Emplacken/Makefile
+++ b/www/p5-Emplacken/Makefile
@@ -14,7 +14,8 @@ COMMENT= Manage multiple plack apps with a directory of config files
LICENSE= ART20
-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-Config-Any>=0:devel/p5-Config-Any \
p5-File-Pid>=0:devel/p5-File-Pid \
p5-List-AllUtils>=0:devel/p5-List-AllUtils \
@@ -26,7 +27,6 @@ BUILD_DEPENDS= p5-Class-Load>=0:devel/p5-Class-Load \
p5-Path-Class>=0:devel/p5-Path-Class \
p5-Text-Template>=0:textproc/p5-Text-Template \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-FCGI-Async/Makefile b/www/p5-FCGI-Async/Makefile
index 6b2f36da8c6a..2fe5c7ff41c8 100644
--- a/www/p5-FCGI-Async/Makefile
+++ b/www/p5-FCGI-Async/Makefile
@@ -14,10 +14,10 @@ COMMENT= Module to allow use of FastCGI asynchronously
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Async>=0:devel/p5-IO-Async \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Async>=0:devel/p5-IO-Async \
p5-Net-Async-FastCGI>=0:www/p5-Net-Async-FastCGI \
p5-Net-FastCGI>=0:www/p5-Net-FastCGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Identity>=0:devel/p5-Test-Identity \
p5-Test-HexString>=0:devel/p5-Test-HexString \
p5-Test-Refcount>0:devel/p5-Test-Refcount
diff --git a/www/p5-FCGI-Engine/Makefile b/www/p5-FCGI-Engine/Makefile
index afa64eedede9..47e384023dea 100644
--- a/www/p5-FCGI-Engine/Makefile
+++ b/www/p5-FCGI-Engine/Makefile
@@ -13,7 +13,8 @@ COMMENT= Flexible engine for running FCGI-based applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Simple>=0:www/p5-CGI-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Simple>=0:www/p5-CGI-Simple \
p5-Class-Load>=0:devel/p5-Class-Load \
p5-Config-Any>=0:devel/p5-Config-Any \
p5-Declare-Constraints-Simple>=0:devel/p5-Declare-Constraints-Simple \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-CGI-Simple>=0:www/p5-CGI-Simple \
p5-MooseX-Daemonize>=0.09:devel/p5-MooseX-Daemonize \
p5-MooseX-Getopt>=0.26:devel/p5-MooseX-Getopt \
p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize
diff --git a/www/p5-FCGI-Spawn/Makefile b/www/p5-FCGI-Spawn/Makefile
index 54fc2d8c1a35..b7ea636b6b0f 100644
--- a/www/p5-FCGI-Spawn/Makefile
+++ b/www/p5-FCGI-Spawn/Makefile
@@ -14,11 +14,11 @@ COMMENT= FastCGI server for CGI-like applications multiprocessing
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-CGI-Fast>=0:www/p5-CGI-Fast \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Fast>=0:www/p5-CGI-Fast \
p5-Const-Fast>0:devel/p5-Const-Fast \
p5-FCGI>0:www/p5-FCGI \
p5-FCGI-ProcManager>0:www/p5-FCGI-ProcManager
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Most>0:devel/p5-Test-Most \
p5-Test-Strict>0:devel/p5-Test-Strict
diff --git a/www/p5-FEAR-API/Makefile b/www/p5-FEAR-API/Makefile
index 175560f62a4e..d54e9abeb29f 100644
--- a/www/p5-FEAR-API/Makefile
+++ b/www/p5-FEAR-API/Makefile
@@ -14,7 +14,8 @@ COMMENT= Web Scraping Zen
LICENSE= ARTPERL10
-BUILD_DEPENDS= p5-Email-Find>=0:mail/p5-Email-Find \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Find>=0:mail/p5-Email-Find \
p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \
p5-File-MMagic>=0:devel/p5-File-MMagic \
p5-File-Slurp>=0:devel/p5-File-Slurp \
@@ -41,7 +42,6 @@ BUILD_DEPENDS= p5-Email-Find>=0:mail/p5-Email-Find \
p5-XML-RSS-SimpleGen>=0:textproc/p5-XML-RSS-SimpleGen \
p5-XML-XPath>=0:textproc/p5-XML-XPath \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Flickr-API/Makefile b/www/p5-Flickr-API/Makefile
index 74b875ed15fb..b4ba97c1e55f 100644
--- a/www/p5-Flickr-API/Makefile
+++ b/www/p5-Flickr-API/Makefile
@@ -13,13 +13,13 @@ COMMENT= Perl interface to the Flickr API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=1.56:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=1.56:www/p5-HTTP-Message \
p5-Net-OAuth>=0:net/p5-Net-OAuth \
p5-URI>=1.18:net/p5-URI \
p5-XML-LibXML-Simple>=0:textproc/p5-XML-LibXML-Simple \
p5-XML-Parser-Lite-Tree>=0.06:textproc/p5-XML-Parser-Lite-Tree \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Script>=0:devel/p5-Test-Script
NO_ARCH= yes
diff --git a/www/p5-Flickr-Upload/Makefile b/www/p5-Flickr-Upload/Makefile
index 8c5808f7bd51..2848ef0d7608 100644
--- a/www/p5-Flickr-Upload/Makefile
+++ b/www/p5-Flickr-Upload/Makefile
@@ -14,10 +14,10 @@ COMMENT= Upload images to flickr.com
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Flickr-API>=0:www/p5-Flickr-API \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Flickr-API>=0:www/p5-Flickr-API \
p5-XML-Parser-Lite-Tree>=0:textproc/p5-XML-Parser-Lite-Tree \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Gantry/Makefile b/www/p5-Gantry/Makefile
index a694db48f2df..e7d7fd95c489 100644
--- a/www/p5-Gantry/Makefile
+++ b/www/p5-Gantry/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Web application framework for mod_perl, cgi, etc
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-Data-UUID>=0:devel/p5-Data-UUID \
p5-Date-Calc>=0:devel/p5-Date-Calc \
p5-CGI-Simple>=0:www/p5-CGI-Simple \
@@ -28,7 +29,6 @@ BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-JSON>0:converters/p5-JSON \
p5-Template-Toolkit>=2.0:www/p5-Template-Toolkit \
p5-Template-Plugin-HTML-SuperForm>0:textproc/p5-Template-Plugin-HTML-SuperForm
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/www/p5-Geo-Caching/Makefile b/www/p5-Geo-Caching/Makefile
index 2db7b6e5203a..8a6172bd83af 100644
--- a/www/p5-Geo-Caching/Makefile
+++ b/www/p5-Geo-Caching/Makefile
@@ -14,10 +14,10 @@ COMMENT= Object interface for querying Geocaching.com website
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Geo-Cache>=0:misc/p5-Geo-Cache \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Geo-Cache>=0:misc/p5-Geo-Cache \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-Geo-Gpx>=0:graphics/p5-Geo-Gpx
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Gungho/Makefile b/www/p5-Gungho/Makefile
index 11fb4343bce0..646b0463ad3c 100644
--- a/www/p5-Gungho/Makefile
+++ b/www/p5-Gungho/Makefile
@@ -15,7 +15,8 @@ COMMENT= Event Based High Performance Web Crawler Framework
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Best>=0:devel/p5-Best \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Best>=0:devel/p5-Best \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-Class-C3-Componentised>=0:devel/p5-Class-C3-Componentised \
p5-Class-C3-XS>=0.02:devel/p5-Class-C3-XS \
@@ -46,7 +47,6 @@ BUILD_DEPENDS= p5-Best>=0:devel/p5-Best \
p5-Web-Scraper-Config>=0:www/p5-Web-Scraper-Config \
p5-YAML>=0:textproc/p5-YAML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5 shebangfix
diff --git a/www/p5-HTML-Adsense/Makefile b/www/p5-HTML-Adsense/Makefile
index f9103b921463..e8f3f5ab9069 100644
--- a/www/p5-HTML-Adsense/Makefile
+++ b/www/p5-HTML-Adsense/Makefile
@@ -14,8 +14,8 @@ COMMENT= Create adsense widgets easily
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-HTML-CalendarMonthSimple/Makefile b/www/p5-HTML-CalendarMonthSimple/Makefile
index d046759e1041..28915d310a08 100644
--- a/www/p5-HTML-CalendarMonthSimple/Makefile
+++ b/www/p5-HTML-CalendarMonthSimple/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl Module for Generating HTML Calendars
-BUILD_DEPENDS= p5-Date-Calc>=0:devel/p5-Date-Calc
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Calc>=0:devel/p5-Date-Calc
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Chunks/Makefile b/www/p5-HTML-Chunks/Makefile
index d6122e7054c5..df47e4c8c5eb 100644
--- a/www/p5-HTML-Chunks/Makefile
+++ b/www/p5-HTML-Chunks/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple nested template engine for HTML, XML and XHTML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-HTML-DOM/Makefile b/www/p5-HTML-DOM/Makefile
index 133a2ec4d28d..14d81cecf65f 100644
--- a/www/p5-HTML-DOM/Makefile
+++ b/www/p5-HTML-DOM/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Implementation of the HTML Document Object Model
-BUILD_DEPENDS= p5-CSS-DOM>=0:www/p5-CSS-DOM \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CSS-DOM>=0:www/p5-CSS-DOM \
p5-HTML-Element-Library>=0:www/p5-HTML-Element-Library \
p5-HTML-Encoding>=0:www/p5-HTML-Encoding \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
@@ -18,7 +19,6 @@ BUILD_DEPENDS= p5-CSS-DOM>=0:www/p5-CSS-DOM \
p5-TimeDate>=0:devel/p5-TimeDate \
p5-URI>=0:net/p5-URI \
p5-constant-lexical>0:devel/p5-constant-lexical
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Declare/Makefile b/www/p5-HTML-Declare/Makefile
index 1961ff91f02c..6dd3c5bad156 100644
--- a/www/p5-HTML-Declare/Makefile
+++ b/www/p5-HTML-Declare/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-HTML-Diff/Makefile b/www/p5-HTML-Diff/Makefile
index 3d227a940c7d..66723ac4f9c5 100644
--- a/www/p5-HTML-Diff/Makefile
+++ b/www/p5-HTML-Diff/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= hcoyote@ghostar.org
COMMENT= Perl module for finding changes between two strings of HTML
-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
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Display/Makefile b/www/p5-HTML-Display/Makefile
index 9c8245da5a86..1c56e123a3ab 100644
--- a/www/p5-HTML-Display/Makefile
+++ b/www/p5-HTML-Display/Makefile
@@ -14,10 +14,10 @@ COMMENT= Display HTML locally in a browser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-TokeParser-Simple>=2:www/p5-HTML-TokeParser-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-TokeParser-Simple>=2:www/p5-HTML-TokeParser-Simple \
p5-URI>=0:net/p5-URI \
p5-libwww>=5.69:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-HTML-Element-Extended/Makefile b/www/p5-HTML-Element-Extended/Makefile
index ebbf8ded9d52..fee592f3e22c 100644
--- a/www/p5-HTML-Element-Extended/Makefile
+++ b/www/p5-HTML-Element-Extended/Makefile
@@ -14,8 +14,8 @@ COMMENT= Extended interface to HTML::Tree's HTML::Element class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Tree>=3.01:www/p5-HTML-Tree
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Tree>=3.01:www/p5-HTML-Tree
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Element-Library/Makefile b/www/p5-HTML-Element-Library/Makefile
index c7d0211032b2..0bffcbf3251c 100644
--- a/www/p5-HTML-Element-Library/Makefile
+++ b/www/p5-HTML-Element-Library/Makefile
@@ -13,7 +13,8 @@ COMMENT= HTML::Element convenience functions
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Array-Group>=0:devel/p5-Array-Group \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Array-Group>=0:devel/p5-Array-Group \
p5-Data-Rmap>=0:devel/p5-Data-Rmap \
p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= p5-Array-Group>=0:devel/p5-Array-Group \
p5-List-Rotation-Cycle>=0:devel/p5-List-Rotation-Cycle \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Scalar-Listify>=0:devel/p5-Scalar-Listify
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Test-XML>=0:devel/p5-Test-XML
diff --git a/www/p5-HTML-Element-Replacer/Makefile b/www/p5-HTML-Element-Replacer/Makefile
index 82dbc3dc71ee..e8d3104f45aa 100644
--- a/www/p5-HTML-Element-Replacer/Makefile
+++ b/www/p5-HTML-Element-Replacer/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl HTML::Element replacer
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Element-Library>=0:www/p5-HTML-Element-Library \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Element-Library>=0:www/p5-HTML-Element-Library \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-Moose>=0:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-HTML-PrettyPrinter>=0:www/p5-HTML-PrettyPrinter
diff --git a/www/p5-HTML-Encoding/Makefile b/www/p5-HTML-Encoding/Makefile
index 1fb7b5c381e9..b1387b829b7c 100644
--- a/www/p5-HTML-Encoding/Makefile
+++ b/www/p5-HTML-Encoding/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Determine the encoding of HTML/XML/XHTML documents
-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/www/p5-HTML-FillInForm/Makefile b/www/p5-HTML-FillInForm/Makefile
index 5c53515d148a..b9a21f0283f6 100644
--- a/www/p5-HTML-FillInForm/Makefile
+++ b/www/p5-HTML-FillInForm/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl5 module for auto-filling HTML form fields from previous values
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Parser>=3.26:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3.26:www/p5-HTML-Parser
TEST_DEPENDS= p5-CGI>=0:www/p5-CGI
INSTALL_TARGET= pure_install
diff --git a/www/p5-HTML-Form/Makefile b/www/p5-HTML-Form/Makefile
index 46fd41578571..3edc3b82e648 100644
--- a/www/p5-HTML-Form/Makefile
+++ b/www/p5-HTML-Form/Makefile
@@ -14,10 +14,10 @@ COMMENT= Class that represents an HTML form element
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-HTTP-Message>=6.03:www/p5-HTTP-Message \
p5-URI>=1.10:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTML-FormFu-Imager/Makefile b/www/p5-HTML-FormFu-Imager/Makefile
index b3d2ca10beee..069392ea6487 100644
--- a/www/p5-HTML-FormFu-Imager/Makefile
+++ b/www/p5-HTML-FormFu-Imager/Makefile
@@ -14,12 +14,12 @@ COMMENT= Imager.pm helpers for HTML::FormFu file uploads
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Clone>=0.31:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0.31:devel/p5-Clone \
p5-HTML-FormFu>=1:www/p5-HTML-FormFu \
p5-Imager>=0:graphics/p5-Imager \
p5-Moose>=1:devel/p5-Moose \
p5-MooseX-Attribute-Chained>=1.0.1:devel/p5-MooseX-Attribute-Chained
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-FormFu-Model-DBIC/Makefile b/www/p5-HTML-FormFu-Model-DBIC/Makefile
index 822d32d4db94..89441dc5e1a3 100644
--- a/www/p5-HTML-FormFu-Model-DBIC/Makefile
+++ b/www/p5-HTML-FormFu-Model-DBIC/Makefile
@@ -13,13 +13,13 @@ COMMENT= Integrate HTML::FormFu with DBIx::Class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-DBIx-Class>=0.08108:databases/p5-DBIx-Class \
p5-HTML-FormFu>=2.00:www/p5-HTML-FormFu \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-MooseX-Attribute-Chained>=1.0.2:devel/p5-MooseX-Attribute-Chained \
p5-Task-Weaken>=0:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite \
p5-SQL-Translator>=0.11016:databases/p5-SQL-Translator
diff --git a/www/p5-HTML-FormFu-MultiForm/Makefile b/www/p5-HTML-FormFu-MultiForm/Makefile
index 30666fb4f984..5ce6ea426542 100644
--- a/www/p5-HTML-FormFu-MultiForm/Makefile
+++ b/www/p5-HTML-FormFu-MultiForm/Makefile
@@ -15,14 +15,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Clone>=0:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone>=0:devel/p5-Clone \
p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
p5-Crypt-DES>=0:security/p5-Crypt-DES \
p5-HTML-FormFu>=0:www/p5-HTML-FormFu \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Moose>=0:devel/p5-Moose \
p5-MooseX-Attribute-Chained>=0:devel/p5-MooseX-Attribute-Chained
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
NO_ARCH= yes
diff --git a/www/p5-HTML-FormFu/Makefile b/www/p5-HTML-FormFu/Makefile
index ad93c21879ae..de0e1e175240 100644
--- a/www/p5-HTML-FormFu/Makefile
+++ b/www/p5-HTML-FormFu/Makefile
@@ -14,7 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Clone>=0.31:devel/p5-Clone \
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+ p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install
+RUN_DEPENDS= p5-Clone>=0.31:devel/p5-Clone \
p5-Config-Any>=0.18:devel/p5-Config-Any \
p5-Data-Visitor>=0.26:devel/p5-Data-Visitor \
p5-DateTime>=0.54:devel/p5-DateTime \
@@ -39,8 +41,6 @@ BUILD_DEPENDS= p5-Clone>=0.31:devel/p5-Clone \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
p5-Task-Weaken>=0:devel/p5-Task-Weaken \
p5-YAML-LibYAML>=0.32:textproc/p5-YAML-LibYAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-BUILD_DEPENDS+= p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install
TEST_DEPENDS= p5-CGI>=0:www/p5-CGI \
p5-Test-Aggregate>=0.371:devel/p5-Test-Aggregate \
p5-Test-Exception>=0:devel/p5-Test-Exception \
diff --git a/www/p5-HTML-FormHandler/Makefile b/www/p5-HTML-FormHandler/Makefile
index 67dd62522a88..593eed3b6984 100644
--- a/www/p5-HTML-FormHandler/Makefile
+++ b/www/p5-HTML-FormHandler/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Load>=0.06:devel/p5-Class-Load \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Load>=0.06:devel/p5-Class-Load \
p5-Config-Any>=0:devel/p5-Config-Any \
p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
@@ -39,7 +40,6 @@ BUILD_DEPENDS= p5-Class-Load>=0.06:devel/p5-Class-Load \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-aliased>=0:devel/p5-aliased \
p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
diff --git a/www/p5-HTML-FromANSI/Makefile b/www/p5-HTML-FromANSI/Makefile
index 8e0a2420ae98..736c421ac3b3 100644
--- a/www/p5-HTML-FromANSI/Makefile
+++ b/www/p5-HTML-FromANSI/Makefile
@@ -14,9 +14,9 @@ COMMENT= Mark up ANSI sequences as HTML
LICENSE= ART10 GPLv1 MIT
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-Term-VT102-Boundless>=0:devel/p5-Term-VT102-Boundless
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTML-FromText/Makefile b/www/p5-HTML-FromText/Makefile
index bcae37f77e5a..e769e7d93252 100644
--- a/www/p5-HTML-FromText/Makefile
+++ b/www/p5-HTML-FromText/Makefile
@@ -14,9 +14,9 @@ COMMENT= Mark up text as HTML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Email-Find>=0.09:mail/p5-Email-Find \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Find>=0.09:mail/p5-Email-Find \
p5-HTML-Parser>=1.26:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-GenToc/Makefile b/www/p5-HTML-GenToc/Makefile
index a8cf81f8b202..c9c45c7d2219 100644
--- a/www/p5-HTML-GenToc/Makefile
+++ b/www/p5-HTML-GenToc/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Generate a Table of Contents for HTML documents
-BUILD_DEPENDS= p5-HTML-LinkList>=0.1501:www/p5-HTML-LinkList \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-LinkList>=0.1501:www/p5-HTML-LinkList \
p5-HTML-SimpleParse>=0.10:www/p5-HTML-SimpleParse \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-Getopt-ArgvFile>=1.09:devel/p5-Getopt-ArgvFile
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-HTML-LinkExtractor/Makefile b/www/p5-HTML-LinkExtractor/Makefile
index e124fce745a3..c6a3a5dac23f 100644
--- a/www/p5-HTML-LinkExtractor/Makefile
+++ b/www/p5-HTML-LinkExtractor/Makefile
@@ -12,9 +12,9 @@ DISTNAME= ${PORTNAME}-0.13
MAINTAINER= lars.eggert@gmx.net
COMMENT= HTML::LinkExtractor is used for extracting links from HTML
-BUILD_DEPENDS= p5-HTML-TokeParser-Simple>=0:www/p5-HTML-TokeParser-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-TokeParser-Simple>=0:www/p5-HTML-TokeParser-Simple \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Lint/Makefile b/www/p5-HTML-Lint/Makefile
index 37c76c8c37dc..28336f756c9a 100644
--- a/www/p5-HTML-Lint/Makefile
+++ b/www/p5-HTML-Lint/Makefile
@@ -14,10 +14,10 @@ COMMENT= HTML::Lint - check for HTML errors in a string or file
LICENSE= ART20
-BUILD_DEPENDS= p5-HTML-Tagset>0:www/p5-HTML-Tagset \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Tagset>0:www/p5-HTML-Tagset \
p5-libwww>0:www/p5-libwww \
p5-HTML-Parser>0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Mason-PSGIHandler/Makefile b/www/p5-HTML-Mason-PSGIHandler/Makefile
index 866f12f2e593..fb450e6b26b0 100644
--- a/www/p5-HTML-Mason-PSGIHandler/Makefile
+++ b/www/p5-HTML-Mason-PSGIHandler/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= PSGI handler for HTML::Mason
-BUILD_DEPENDS= p5-CGI-PSGI>0:www/p5-CGI-PSGI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-PSGI>0:www/p5-CGI-PSGI \
p5-HTML-Mason>0:www/p5-HTML-Mason
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Plack>=0:www/p5-Plack
USES= perl5
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index bc858641e083..fb741618eb99 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -12,13 +12,13 @@ COMMENT= High-performance, dynamic web site authoring system
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cache-Cache>=1:devel/p5-Cache-Cache \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Cache>=1:devel/p5-Cache-Cache \
p5-Class-Container>=0.07:devel/p5-Class-Container \
p5-Exception-Class>=1.15:devel/p5-Exception-Class \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-Log-Any>=0.08:devel/p5-Log-Any \
p5-Params-Validate>=0.70:devel/p5-Params-Validate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CHI>=0.210:devel/p5-CHI \
p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
diff --git a/www/p5-HTML-Pager/Makefile b/www/p5-HTML-Pager/Makefile
index cf16556ffb77..cc6c71ad6d87 100644
--- a/www/p5-HTML-Pager/Makefile
+++ b/www/p5-HTML-Pager/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl module for handling CGI HTML paging of arbitrary data
LICENSE= GPLv2
-BUILD_DEPENDS= p5-HTML-Template>=0:www/p5-HTML-Template
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Template>=0:www/p5-HTML-Template
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Parser-Simple/Makefile b/www/p5-HTML-Parser-Simple/Makefile
index 924223eed79e..696377cb631a 100644
--- a/www/p5-HTML-Parser-Simple/Makefile
+++ b/www/p5-HTML-Parser-Simple/Makefile
@@ -12,9 +12,9 @@ COMMENT= Parse nice HTML files without needing a compiler
LICENSE= ART20
-BUILD_DEPENDS= p5-Moo>=1.003001:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=1.003001:devel/p5-Moo \
p5-Tree-Simple>=1.22:devel/p5-Tree-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=0:devel/p5-Test-Pod
NO_ARCH= yes
diff --git a/www/p5-HTML-PrettyPrinter/Makefile b/www/p5-HTML-PrettyPrinter/Makefile
index f9550f315cb8..ec5de870de1d 100644
--- a/www/p5-HTML-PrettyPrinter/Makefile
+++ b/www/p5-HTML-PrettyPrinter/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= vivek@khera.org
COMMENT= Generate nice HTML files from HTML syntax trees
-BUILD_DEPENDS= p5-HTML-Tree>=0:www/p5-HTML-Tree
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Tree>=0:www/p5-HTML-Tree
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Prototype/Makefile b/www/p5-HTML-Prototype/Makefile
index 872b79336e8c..5f4465d83326 100644
--- a/www/p5-HTML-Prototype/Makefile
+++ b/www/p5-HTML-Prototype/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Generate HTML and JavaScript for the Prototype library
-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-Tree>=0:www/p5-HTML-Tree
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-HTML-RSSAutodiscovery/Makefile b/www/p5-HTML-RSSAutodiscovery/Makefile
index 84afbe75bdfa..a2f50f21baaa 100644
--- a/www/p5-HTML-RSSAutodiscovery/Makefile
+++ b/www/p5-HTML-RSSAutodiscovery/Makefile
@@ -14,9 +14,9 @@ COMMENT= Methods for retrieving RSS-ish information from an HTML document
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-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-HTML-ResolveLink/Makefile b/www/p5-HTML-ResolveLink/Makefile
index b963d13f5de7..b8f2a3b2b092 100644
--- a/www/p5-HTML-ResolveLink/Makefile
+++ b/www/p5-HTML-ResolveLink/Makefile
@@ -14,9 +14,9 @@ COMMENT= Resolve relative links in (X)HTML into absolute URI
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-URI>0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-RobotsMETA/Makefile b/www/p5-HTML-RobotsMETA/Makefile
index ad6b87df447a..43deacde9dc2 100644
--- a/www/p5-HTML-RobotsMETA/Makefile
+++ b/www/p5-HTML-RobotsMETA/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= Parse HTML For Robots Exclusion META Markup
-BUILD_DEPENDS= p5-HTML-Parser>=3:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3:www/p5-HTML-Parser
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Scrubber/Makefile b/www/p5-HTML-Scrubber/Makefile
index 78de41a0bcf1..12cc26a7cfd4 100644
--- a/www/p5-HTML-Scrubber/Makefile
+++ b/www/p5-HTML-Scrubber/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTML-Parser>=3.47:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3.47:www/p5-HTML-Parser
TEST_DEPENDS= p5-Test-CPAN-Meta>=0:devel/p5-Test-CPAN-Meta \
p5-Test-Differences>=0:devel/p5-Test-Differences \
p5-Test-EOL>=0:devel/p5-Test-EOL \
diff --git a/www/p5-HTML-Seamstress/Makefile b/www/p5-HTML-Seamstress/Makefile
index 1da0052cf5be..a78860dc7702 100644
--- a/www/p5-HTML-Seamstress/Makefile
+++ b/www/p5-HTML-Seamstress/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-HTML-Element-Library>=0:www/p5-HTML-Element-Library \
p5-HTML-Element-Replacer>=0:www/p5-HTML-Element-Replacer \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-Set-Array>=0:devel/p5-Set-Array
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Class-Prototyped>=0:devel/p5-Class-Prototyped
NO_ARCH= yes
diff --git a/www/p5-HTML-SimpleLinkExtor/Makefile b/www/p5-HTML-SimpleLinkExtor/Makefile
index 4331d57883fb..81395aea7eb7 100644
--- a/www/p5-HTML-SimpleLinkExtor/Makefile
+++ b/www/p5-HTML-SimpleLinkExtor/Makefile
@@ -13,10 +13,10 @@ COMMENT= This is a simple HTML link extractor
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTML-Parser>=1.28:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=1.28:www/p5-HTML-Parser \
p5-URI>=1.09:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Output>=0:devel/p5-Test-Output
NO_ARCH= yes
diff --git a/www/p5-HTML-StickyQuery/Makefile b/www/p5-HTML-StickyQuery/Makefile
index 999f04e34973..5d0011fac71b 100644
--- a/www/p5-HTML-StickyQuery/Makefile
+++ b/www/p5-HTML-StickyQuery/Makefile
@@ -14,9 +14,9 @@ COMMENT= Add sticky QUERY_STRING to a tag href attributes
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-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-StripScripts-Parser/Makefile b/www/p5-HTML-StripScripts-Parser/Makefile
index 50be4db60d7e..b95af4e2953b 100644
--- a/www/p5-HTML-StripScripts-Parser/Makefile
+++ b/www/p5-HTML-StripScripts-Parser/Makefile
@@ -14,9 +14,9 @@ COMMENT= XSS filter using HTML::Parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Parser>=3.56:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3.56:www/p5-HTML-Parser \
p5-HTML-StripScripts>=1.05:www/p5-HTML-StripScripts
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index 250d227bb3fc..12ae804b766c 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTML-Element-Extended>=1.17:www/p5-HTML-Element-Extended \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Element-Extended>=1.17:www/p5-HTML-Element-Extended \
p5-HTML-Parser>=0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTML-TableParser/Makefile b/www/p5-HTML-TableParser/Makefile
index 8fda2f5e5909..79af737d8ddc 100644
--- a/www/p5-HTML-TableParser/Makefile
+++ b/www/p5-HTML-TableParser/Makefile
@@ -13,8 +13,8 @@ COMMENT= Extract data from an HTML table
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTML-Parser>=3.26:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3.26:www/p5-HTML-Parser
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTML-TableTiler/Makefile b/www/p5-HTML-TableTiler/Makefile
index 0cf2999d1506..d702d288befd 100644
--- a/www/p5-HTML-TableTiler/Makefile
+++ b/www/p5-HTML-TableTiler/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Module generate a HTML table from bidimensional array 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-IO-Util>=0:devel/p5-IO-Util
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-TagCloud-Extended/Makefile b/www/p5-HTML-TagCloud-Extended/Makefile
index 6982107d81f1..47911ff8cd88 100644
--- a/www/p5-HTML-TagCloud-Extended/Makefile
+++ b/www/p5-HTML-TagCloud-Extended/Makefile
@@ -14,10 +14,10 @@ COMMENT= HTML::TagCloud extension for time-stamp based coloring of tags
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-Readonly>=0:devel/p5-Readonly
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Template-Compiled/Makefile b/www/p5-HTML-Template-Compiled/Makefile
index 32c70a5b4cb4..9d64fe6a79aa 100644
--- a/www/p5-HTML-Template-Compiled/Makefile
+++ b/www/p5-HTML-Template-Compiled/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
diff --git a/www/p5-HTML-Template-HashWrapper/Makefile b/www/p5-HTML-Template-HashWrapper/Makefile
index 71c23d7bed29..3684ff42598c 100644
--- a/www/p5-HTML-Template-HashWrapper/Makefile
+++ b/www/p5-HTML-Template-HashWrapper/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Easy way to use the associate option from HTML::Template
-BUILD_DEPENDS= p5-HTML-Template>=0:www/p5-HTML-Template
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Template>=0:www/p5-HTML-Template
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Template-JIT/Makefile b/www/p5-HTML-Template-JIT/Makefile
index 29a747e7447d..f3bf99aedd0e 100644
--- a/www/p5-HTML-Template-JIT/Makefile
+++ b/www/p5-HTML-Template-JIT/Makefile
@@ -13,10 +13,10 @@ COMMENT= Perl module to compile HTML Templates with Inline::C
LICENSE= ARTPERL10
-BUILD_DEPENDS= p5-HTML-Template>=2.8:www/p5-HTML-Template \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Template>=2.8:www/p5-HTML-Template \
p5-Inline>=0.43:devel/p5-Inline \
p5-Inline-C>=0:devel/p5-Inline-C
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Template-Pluggable/Makefile b/www/p5-HTML-Template-Pluggable/Makefile
index 544a878678c1..0f107c9edc08 100644
--- a/www/p5-HTML-Template-Pluggable/Makefile
+++ b/www/p5-HTML-Template-Pluggable/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
COMMENT= Extends HTML::Template with plugin support
-BUILD_DEPENDS= p5-HTML-Template>=2.7:www/p5-HTML-Template \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Template>=2.7:www/p5-HTML-Template \
p5-Test-MockObject>=1:devel/p5-Test-MockObject \
p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
p5-Class-Trigger>=0:devel/p5-Class-Trigger
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Toc/Makefile b/www/p5-HTML-Toc/Makefile
index 82c04b5c4f0d..ab8b9d7a61df 100644
--- a/www/p5-HTML-Toc/Makefile
+++ b/www/p5-HTML-Toc/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= alex.deiter@gmail.com
COMMENT= Generate, insert and update HTML Table of Contents
-BUILD_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences \
p5-HTML-Parser>=0:www/p5-HTML-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-TokeParser-Simple/Makefile b/www/p5-HTML-TokeParser-Simple/Makefile
index 5bd82ed08f82..d1f8c6037add 100644
--- a/www/p5-HTML-TokeParser-Simple/Makefile
+++ b/www/p5-HTML-TokeParser-Simple/Makefile
@@ -14,9 +14,9 @@ COMMENT= Subclass of HTML::TokeParser with easy-to-remember method calls
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-Sub-Override>=0:devel/p5-Sub-Override
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index 2c7ca7c7701f..e7a95c529145 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTML-Parser>=3.46:www/p5-HTML-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Parser>=3.46:www/p5-HTML-Parser \
p5-HTML-Tagset>=3.02:www/p5-HTML-Tagset \
p5-libwww>=5.815:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal
NO_ARCH= yes
diff --git a/www/p5-HTML-TreeBuilder-LibXML/Makefile b/www/p5-HTML-TreeBuilder-LibXML/Makefile
index dbdfb8470733..13b139233cdf 100644
--- a/www/p5-HTML-TreeBuilder-LibXML/Makefile
+++ b/www/p5-HTML-TreeBuilder-LibXML/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
# Do not add p5-Web-Query and p5-Web-Scraper to TEST_DEPENDS to avoid cyclic dependency loop
-BUILD_DEPENDS= p5-Filter>=0:devel/p5-Filter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Filter>=0:devel/p5-Filter \
p5-HTML-TreeBuilder-XPath>=0.14:www/p5-HTML-TreeBuilder-XPath \
p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTML-TreeBuilder-XPath/Makefile b/www/p5-HTML-TreeBuilder-XPath/Makefile
index cf649867d189..ab204d06aef9 100644
--- a/www/p5-HTML-TreeBuilder-XPath/Makefile
+++ b/www/p5-HTML-TreeBuilder-XPath/Makefile
@@ -14,9 +14,9 @@ COMMENT= Add XPath support to HTML::TreeBuilder
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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-XML-XPathEngine>=0.12:textproc/p5-XML-XPathEngine
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-DokuWiki/Makefile b/www/p5-HTML-WikiConverter-DokuWiki/Makefile
index 4008aea8d4ed..8c20a64fac2d 100644
--- a/www/p5-HTML-WikiConverter-DokuWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-DokuWiki/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert HTML to DokuWiki markup
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-GoogleCode/Makefile b/www/p5-HTML-WikiConverter-GoogleCode/Makefile
index ff5e6596fb2a..e80a5576e9d3 100644
--- a/www/p5-HTML-WikiConverter-GoogleCode/Makefile
+++ b/www/p5-HTML-WikiConverter-GoogleCode/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert HTML to Google Code wiki markup
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-Kwiki/Makefile b/www/p5-HTML-WikiConverter-Kwiki/Makefile
index c543ba7e5f29..5450f4e23201 100644
--- a/www/p5-HTML-WikiConverter-Kwiki/Makefile
+++ b/www/p5-HTML-WikiConverter-Kwiki/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert HTML to Kwiki markup
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-Markdown/Makefile b/www/p5-HTML-WikiConverter-Markdown/Makefile
index 23f65fe9020d..7b4e5dad6fa7 100644
--- a/www/p5-HTML-WikiConverter-Markdown/Makefile
+++ b/www/p5-HTML-WikiConverter-Markdown/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert HTML to Markdown markup
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.67:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.67:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-MediaWiki/Makefile b/www/p5-HTML-WikiConverter-MediaWiki/Makefile
index 6ad2dc650ce5..81e29829e103 100644
--- a/www/p5-HTML-WikiConverter-MediaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-MediaWiki/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert HTML to MediaWiki markup
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.63:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.63:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-MoinMoin/Makefile b/www/p5-HTML-WikiConverter-MoinMoin/Makefile
index 3f2f1f43c58a..45ecdf892e18 100644
--- a/www/p5-HTML-WikiConverter-MoinMoin/Makefile
+++ b/www/p5-HTML-WikiConverter-MoinMoin/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert HTML to MoinMoin markup
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-Oddmuse/Makefile b/www/p5-HTML-WikiConverter-Oddmuse/Makefile
index ec91cf0651f6..f478c6df7046 100644
--- a/www/p5-HTML-WikiConverter-Oddmuse/Makefile
+++ b/www/p5-HTML-WikiConverter-Oddmuse/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert HTML to Oddmuse markup
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-PbWiki/Makefile b/www/p5-HTML-WikiConverter-PbWiki/Makefile
index 9d906729415d..b2184e1578f4 100644
--- a/www/p5-HTML-WikiConverter-PbWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PbWiki/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert HTML to PbWiki markup
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-PhpWiki/Makefile b/www/p5-HTML-WikiConverter-PhpWiki/Makefile
index e1b9671b8c3c..bd8870c6bfab 100644
--- a/www/p5-HTML-WikiConverter-PhpWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PhpWiki/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert HTML to PhpWiki markup
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-PmWiki/Makefile b/www/p5-HTML-WikiConverter-PmWiki/Makefile
index a6b8125fd163..313537ffc886 100644
--- a/www/p5-HTML-WikiConverter-PmWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PmWiki/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert HTML to PmWiki markup
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-SnipSnap/Makefile b/www/p5-HTML-WikiConverter-SnipSnap/Makefile
index 8271bdefe431..32c1a0be5796 100644
--- a/www/p5-HTML-WikiConverter-SnipSnap/Makefile
+++ b/www/p5-HTML-WikiConverter-SnipSnap/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert HTML to SnipSnap markup
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-Socialtext/Makefile b/www/p5-HTML-WikiConverter-Socialtext/Makefile
index 63b5f10df6ff..aa67732c4a44 100644
--- a/www/p5-HTML-WikiConverter-Socialtext/Makefile
+++ b/www/p5-HTML-WikiConverter-Socialtext/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert HTML to Socialtext markup
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-TikiWiki/Makefile b/www/p5-HTML-WikiConverter-TikiWiki/Makefile
index 790f137efdde..19696f16395e 100644
--- a/www/p5-HTML-WikiConverter-TikiWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-TikiWiki/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert HTML to TikiWiki markup
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-UseMod/Makefile b/www/p5-HTML-WikiConverter-UseMod/Makefile
index a9103f453f7d..6fa637a957e4 100644
--- a/www/p5-HTML-WikiConverter-UseMod/Makefile
+++ b/www/p5-HTML-WikiConverter-UseMod/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert HTML to UseMod markup
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-WakkaWiki/Makefile b/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
index a61b41b6baf9..35ef68850956 100644
--- a/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Convert HTML to WakkaWiki markup
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter-WikkaWiki/Makefile b/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
index 7c6399d09a46..53d138a14aad 100644
--- a/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
@@ -14,9 +14,9 @@ COMMENT= Convert HTML to WikkaWiki markup
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTML-WikiConverter/Makefile b/www/p5-HTML-WikiConverter/Makefile
index 0af189f84e91..53c069758496 100644
--- a/www/p5-HTML-WikiConverter/Makefile
+++ b/www/p5-HTML-WikiConverter/Makefile
@@ -15,14 +15,14 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE_GPLv1+ = ${WRKSRC}/LICENSE # GPLv2 actually
-BUILD_DEPENDS= p5-Class-Data-Inheritable>=0.02:devel/p5-Class-Data-Inheritable \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Data-Inheritable>=0.02:devel/p5-Class-Data-Inheritable \
p5-Params-Validate>=0.77:devel/p5-Params-Validate \
p5-CSS>=0:textproc/p5-CSS \
p5-HTML-Parser>=3.34:www/p5-HTML-Parser \
p5-HTML-Tagset>=3.04:www/p5-HTML-Tagset \
p5-HTML-Tree>=3.18:www/p5-HTML-Tree \
p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTTP-Async/Makefile b/www/p5-HTTP-Async/Makefile
index 32c934ca65cb..9c25c52b6461 100644
--- a/www/p5-HTTP-Async/Makefile
+++ b/www/p5-HTTP-Async/Makefile
@@ -13,11 +13,11 @@ COMMENT= Process multiple HTTP requests in parallel without blocking
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
p5-Net-HTTPS-NB>=0.13:net/p5-Net-HTTPS-NB \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CGI>=0:www/p5-CGI \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-HTTP-Server-Simple>=0:www/p5-Test-HTTP-Server-Simple \
diff --git a/www/p5-HTTP-Body/Makefile b/www/p5-HTTP-Body/Makefile
index 9cc970130b65..ba66dd36746b 100644
--- a/www/p5-HTTP-Body/Makefile
+++ b/www/p5-HTTP-Body/Makefile
@@ -14,8 +14,8 @@ COMMENT= HTTP Body Parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Pod>=1.14:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
diff --git a/www/p5-HTTP-Cache-Transparent/Makefile b/www/p5-HTTP-Cache-Transparent/Makefile
index bc2ce9ade791..857b52ba7af4 100644
--- a/www/p5-HTTP-Cache-Transparent/Makefile
+++ b/www/p5-HTTP-Cache-Transparent/Makefile
@@ -13,8 +13,8 @@ COMMENT= Implementation of http get that keeps a local cache of fetched pages
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-CookieJar/Makefile b/www/p5-HTTP-CookieJar/Makefile
index 27a19dec2ce4..b2cd184f7941 100644
--- a/www/p5-HTTP-CookieJar/Makefile
+++ b/www/p5-HTTP-CookieJar/Makefile
@@ -13,8 +13,8 @@ COMMENT= Minimalist HTTP user agent cookie jar
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTTP-Date>=0:www/p5-HTTP-Date
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Date>=0:www/p5-HTTP-Date
TEST_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-Mozilla-PublicSuffix>=0:dns/p5-Mozilla-PublicSuffix \
p5-Test-Deep>=0:devel/p5-Test-Deep \
diff --git a/www/p5-HTTP-Cookies-Mozilla/Makefile b/www/p5-HTTP-Cookies-Mozilla/Makefile
index f6be21b62bc1..eb9d94401d20 100644
--- a/www/p5-HTTP-Cookies-Mozilla/Makefile
+++ b/www/p5-HTTP-Cookies-Mozilla/Makefile
@@ -13,8 +13,8 @@ COMMENT= Cookie storage and management for Mozilla
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Cookies>=1.25:www/p5-HTTP-Cookies
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Cookies>=1.25:www/p5-HTTP-Cookies
TEST_DEPENDS= p5-Text-Diff>=0:textproc/p5-Text-Diff \
sqlite3:databases/sqlite3
diff --git a/www/p5-HTTP-Cookies-iCab/Makefile b/www/p5-HTTP-Cookies-iCab/Makefile
index ad82a0ad3409..5026f23b47e7 100644
--- a/www/p5-HTTP-Cookies-iCab/Makefile
+++ b/www/p5-HTTP-Cookies-iCab/Makefile
@@ -13,9 +13,9 @@ COMMENT= Cookie storage and management for iCab
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTTP-Cookies>=1.25:www/p5-HTTP-Cookies \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Cookies>=1.25:www/p5-HTTP-Cookies \
p5-Text-Diff>=0:textproc/p5-Text-Diff
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-Cookies-w3m/Makefile b/www/p5-HTTP-Cookies-w3m/Makefile
index 0768a508124b..783842958c8f 100644
--- a/www/p5-HTTP-Cookies-w3m/Makefile
+++ b/www/p5-HTTP-Cookies-w3m/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= Cookie storage and management for w3m
-BUILD_DEPENDS= p5-Module-Install>=0:devel/p5-Module-Install
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Install>=0:devel/p5-Module-Install
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTTP-Cookies/Makefile b/www/p5-HTTP-Cookies/Makefile
index f00792f2eacc..5d468073f385 100644
--- a/www/p5-HTTP-Cookies/Makefile
+++ b/www/p5-HTTP-Cookies/Makefile
@@ -13,9 +13,9 @@ COMMENT= HTTP Cookie jars
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Date>=6:www/p5-HTTP-Date \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Date>=6:www/p5-HTTP-Date \
p5-HTTP-Message>=6:www/p5-HTTP-Message
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-URI>=0:net/p5-URI
NO_ARCH= yes
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index 140520507c93..da1e71406264 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -13,10 +13,10 @@ COMMENT= WebDAV client library
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-DOM>0:textproc/p5-XML-DOM \
p5-libwww>=5.48:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTTP-Daemon/Makefile b/www/p5-HTTP-Daemon/Makefile
index e1a62bb812ad..3205cef3018a 100644
--- a/www/p5-HTTP-Daemon/Makefile
+++ b/www/p5-HTTP-Daemon/Makefile
@@ -14,10 +14,10 @@ COMMENT= Simple HTTP server class
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Date>=6:www/p5-HTTP-Date \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Date>=6:www/p5-HTTP-Date \
p5-HTTP-Message>=6:www/p5-HTTP-Message \
p5-LWP-MediaTypes>=6:www/p5-LWP-MediaTypes
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-Engine/Makefile b/www/p5-HTTP-Engine/Makefile
index e29f68d62a09..6e6c808a753f 100644
--- a/www/p5-HTTP-Engine/Makefile
+++ b/www/p5-HTTP-Engine/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl extension for HTTP Server Engine Drivers
-BUILD_DEPENDS= \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= \
p5-Any-Moose>=0.13:devel/p5-Any-Moose \
p5-CGI-Simple>=1.103:www/p5-CGI-Simple \
p5-Filter>0:devel/p5-Filter \
@@ -19,7 +20,6 @@ BUILD_DEPENDS= \
p5-HTTP-Server-Simple>=0.35:www/p5-HTTP-Server-Simple \
p5-Mouse>=0.62:devel/p5-Mouse \
p5-URI>=1.36:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= \
p5-HTTP-Request-AsCGI>0:www/p5-HTTP-Request-AsCGI \
p5-YAML>0:textproc/p5-YAML \
diff --git a/www/p5-HTTP-Entity-Parser/Makefile b/www/p5-HTTP-Entity-Parser/Makefile
index 622c01b63ecf..c17d148d94cb 100644
--- a/www/p5-HTTP-Entity-Parser/Makefile
+++ b/www/p5-HTTP-Entity-Parser/Makefile
@@ -12,12 +12,12 @@ COMMENT= PSGI compliant HTTP Entity Parser
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
p5-WWW-Form-UrlEncoded>=0.23:www/p5-WWW-Form-UrlEncoded \
p5-HTTP-MultiPartParser>=0:www/p5-HTTP-MultiPartParser \
p5-Hash-MultiValue>=0:devel/p5-Hash-MultiValue \
p5-Stream-Buffered>=0:devel/p5-Stream-Buffered
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-Headers-Fast/Makefile b/www/p5-HTTP-Headers-Fast/Makefile
index 368c9a29af47..c035395c629a 100644
--- a/www/p5-HTTP-Headers-Fast/Makefile
+++ b/www/p5-HTTP-Headers-Fast/Makefile
@@ -13,8 +13,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTTP-Date>0:www/p5-HTTP-Date
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Date>0:www/p5-HTTP-Date
TEST_DEPENDS= p5-Test-Requires>0:devel/p5-Test-Requires
NO_ARCH= yes
diff --git a/www/p5-HTTP-Link-Parser/Makefile b/www/p5-HTTP-Link-Parser/Makefile
index d25a5aa46a7a..b71df39504b4 100644
--- a/www/p5-HTTP-Link-Parser/Makefile
+++ b/www/p5-HTTP-Link-Parser/Makefile
@@ -13,10 +13,10 @@ COMMENT= Parse HTTP Link headers
LICENSE= MIT
-BUILD_DEPENDS= p5-URI>=1.30:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=1.30:net/p5-URI \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-RDF-Trine>=0:textproc/p5-RDF-Trine
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTTP-Message/Makefile b/www/p5-HTTP-Message/Makefile
index 876b19312a4f..b4ac963a37fe 100644
--- a/www/p5-HTTP-Message/Makefile
+++ b/www/p5-HTTP-Message/Makefile
@@ -14,12 +14,12 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Encode-Locale>=1:converters/p5-Encode-Locale \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Encode-Locale>=1:converters/p5-Encode-Locale \
p5-HTTP-Date>=6:www/p5-HTTP-Date \
p5-IO-HTML>=0:devel/p5-IO-HTML \
p5-LWP-MediaTypes>=6:www/p5-LWP-MediaTypes \
p5-URI>=1.10:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Try-Tiny>=0:lang/p5-Try-Tiny
NO_ARCH= yes
diff --git a/www/p5-HTTP-Negotiate/Makefile b/www/p5-HTTP-Negotiate/Makefile
index 8787540b885e..b22533905c20 100644
--- a/www/p5-HTTP-Negotiate/Makefile
+++ b/www/p5-HTTP-Negotiate/Makefile
@@ -14,8 +14,8 @@ COMMENT= Implementation of the HTTP content negotiation algorithm
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=6:www/p5-HTTP-Message
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=6:www/p5-HTTP-Message
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-Proxy/Makefile b/www/p5-HTTP-Proxy/Makefile
index fade891660bb..0c27b2008c29 100644
--- a/www/p5-HTTP-Proxy/Makefile
+++ b/www/p5-HTTP-Proxy/Makefile
@@ -13,10 +13,10 @@ COMMENT= Pure Perl HTTP proxy
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Daemon>=1.25:www/p5-HTTP-Daemon \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Daemon>=1.25:www/p5-HTTP-Daemon \
p5-HTML-Parser>=3:www/p5-HTML-Parser \
p5-libwww>=6:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-ProxyPAC/Makefile b/www/p5-HTTP-ProxyPAC/Makefile
index 15c5df3f5b8e..83b6629ea910 100644
--- a/www/p5-HTTP-ProxyPAC/Makefile
+++ b/www/p5-HTTP-ProxyPAC/Makefile
@@ -13,10 +13,10 @@ COMMENT= Use a proxy auto config file to get proxy info
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JE>0:www/p5-JE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JE>0:www/p5-JE \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTTP-Recorder/Makefile b/www/p5-HTTP-Recorder/Makefile
index ffcf2e2315b1..7b34f3db8e0d 100644
--- a/www/p5-HTTP-Recorder/Makefile
+++ b/www/p5-HTTP-Recorder/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Record interaction with websites
-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-HTTP-Proxy>=0:www/p5-HTTP-Proxy \
p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 dos2unix
USE_PERL5= configure
diff --git a/www/p5-HTTP-Request-AsCGI/Makefile b/www/p5-HTTP-Request-AsCGI/Makefile
index da4c6d4a3c6f..06f196546cb9 100644
--- a/www/p5-HTTP-Request-AsCGI/Makefile
+++ b/www/p5-HTTP-Request-AsCGI/Makefile
@@ -14,10 +14,10 @@ COMMENT= Setup a CGI environment from a HTTP::Request
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-libwww>=5.805:www/p5-libwww \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTTP-Request-Params/Makefile b/www/p5-HTTP-Request-Params/Makefile
index 8c55f91df57b..c3b28e0e2fa4 100644
--- a/www/p5-HTTP-Request-Params/Makefile
+++ b/www/p5-HTTP-Request-Params/Makefile
@@ -13,12 +13,12 @@ COMMENT= Retrieve GET/POST Parameters from HTTP Requests
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI>=3:www/p5-CGI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI>=3:www/p5-CGI \
p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
p5-Email-MIME-ContentType>=1:mail/p5-Email-MIME-ContentType \
p5-Email-MIME>=1.420:mail/p5-Email-MIME \
p5-HTTP-Message>=1.40:www/p5-HTTP-Message
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-Response-Encoding/Makefile b/www/p5-HTTP-Response-Encoding/Makefile
index 64089953246a..f5ba4b2ac1a7 100644
--- a/www/p5-HTTP-Response-Encoding/Makefile
+++ b/www/p5-HTTP-Response-Encoding/Makefile
@@ -14,9 +14,9 @@ COMMENT= Adds encoding() to HTTP::Response
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-HTTP-Message>=0:www/p5-HTTP-Message
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-Router/Makefile b/www/p5-HTTP-Router/Makefile
index daaa4b11ed29..36e89d83347b 100644
--- a/www/p5-HTTP-Router/Makefile
+++ b/www/p5-HTTP-Router/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl extension of Yet Another Path Router for HTTP
-BUILD_DEPENDS= \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= \
p5-Class-Accessor>0:devel/p5-Class-Accessor \
p5-Devel-Caller-Perl>0:devel/p5-Devel-Caller-Perl \
p5-Filter>0:devel/p5-Filter \
@@ -21,7 +22,6 @@ BUILD_DEPENDS= \
p5-Text-SimpleTable>=0:textproc/p5-Text-SimpleTable \
p5-Text-SimpleTemplate>0:textproc/p5-Text-SimpleTemplate \
p5-URI-Template-Restrict>=0.05:net/p5-URI-Template-Restrict
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTTP-Server-Simple-Authen/Makefile b/www/p5-HTTP-Server-Simple-Authen/Makefile
index c14033fc1958..cc84091f308d 100644
--- a/www/p5-HTTP-Server-Simple-Authen/Makefile
+++ b/www/p5-HTTP-Server-Simple-Authen/Makefile
@@ -14,9 +14,9 @@ COMMENT= Authentication plugin for HTTP::Server::Simple
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Authen-Simple>=0.4:security/p5-Authen-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Authen-Simple>=0.4:security/p5-Authen-Simple \
p5-HTTP-Server-Simple>=0.16:www/p5-HTTP-Server-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-HTTP-Server-Simple-Mason/Makefile b/www/p5-HTTP-Server-Simple-Mason/Makefile
index 5dfac6804235..5c9f828e6f73 100644
--- a/www/p5-HTTP-Server-Simple-Mason/Makefile
+++ b/www/p5-HTTP-Server-Simple-Mason/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Abstract baseclass for a standalone mason server
-BUILD_DEPENDS= p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
p5-HTML-Mason>=0:www/p5-HTML-Mason \
p5-Hook-LexWrap>=0:devel/p5-Hook-LexWrap
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTTP-Server-Simple-PSGI/Makefile b/www/p5-HTTP-Server-Simple-PSGI/Makefile
index 1800f9f753e7..671629f43ace 100644
--- a/www/p5-HTTP-Server-Simple-PSGI/Makefile
+++ b/www/p5-HTTP-Server-Simple-PSGI/Makefile
@@ -14,8 +14,8 @@ COMMENT= PSGI handler for HTTP::Server::Simple
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Server-Simple>=0.42:www/p5-HTTP-Server-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Server-Simple>=0.42:www/p5-HTTP-Server-Simple
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-HTTP-Server-Simple-Recorder/Makefile b/www/p5-HTTP-Server-Simple-Recorder/Makefile
index 1eaa849807e1..c185c2bb0ac2 100644
--- a/www/p5-HTTP-Server-Simple-Recorder/Makefile
+++ b/www/p5-HTTP-Server-Simple-Recorder/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Mixin to record HTTP::Server::Simple's sockets
-BUILD_DEPENDS= p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
p5-Test-HTTP-Server-Simple>=0:www/p5-Test-HTTP-Server-Simple \
p5-IO-Tee>=0:devel/p5-IO-Tee
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTTP-Server-Simple/Makefile b/www/p5-HTTP-Server-Simple/Makefile
index 0eb77d90ee5c..63982cedac5d 100644
--- a/www/p5-HTTP-Server-Simple/Makefile
+++ b/www/p5-HTTP-Server-Simple/Makefile
@@ -13,8 +13,8 @@ COMMENT= Simple standalone HTTP daemon
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI>=0:www/p5-CGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI>=0:www/p5-CGI
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-Session-Store-DBI/Makefile b/www/p5-HTTP-Session-Store-DBI/Makefile
index eab645b8d29f..286a313ba5b9 100644
--- a/www/p5-HTTP-Session-Store-DBI/Makefile
+++ b/www/p5-HTTP-Session-Store-DBI/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl extension to store session data in DBI for HTTP::Session
-BUILD_DEPENDS= \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= \
p5-Moose>0:devel/p5-Moose \
p5-HTTP-Session>=0.26:www/p5-HTTP-Session \
p5-DBI>0:databases/p5-DBI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-HTTP-SimpleLinkChecker/Makefile b/www/p5-HTTP-SimpleLinkChecker/Makefile
index b7213fa7961a..64bcf3ddd6b1 100644
--- a/www/p5-HTTP-SimpleLinkChecker/Makefile
+++ b/www/p5-HTTP-SimpleLinkChecker/Makefile
@@ -13,11 +13,11 @@ COMMENT= Check the HTTP response code for a link
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTTP-Message>=1.28:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=1.28:www/p5-HTTP-Message \
p5-LWP-Protocol-https>=1:www/p5-LWP-Protocol-https \
p5-Mojolicious>=4.50:www/p5-Mojolicious \
p5-libwww>0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-Size/Makefile b/www/p5-HTTP-Size/Makefile
index 5f565a57529f..74c0d6455ab3 100644
--- a/www/p5-HTTP-Size/Makefile
+++ b/www/p5-HTTP-Size/Makefile
@@ -13,11 +13,11 @@ COMMENT= Get the byte size of an internet resource
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-HTML-SimpleLinkExtor>=0:www/p5-HTML-SimpleLinkExtor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-SimpleLinkExtor>=0:www/p5-HTML-SimpleLinkExtor \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-HTTP-Tiny-SPDY/Makefile b/www/p5-HTTP-Tiny-SPDY/Makefile
index 8680cf35c792..d1ef5216c542 100644
--- a/www/p5-HTTP-Tiny-SPDY/Makefile
+++ b/www/p5-HTTP-Tiny-SPDY/Makefile
@@ -14,10 +14,10 @@ COMMENT= Subclass of HTTP::Tiny with SPDY support
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>=1.560:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=1.560:security/p5-IO-Socket-SSL \
p5-Net-SPDY>=0:net/p5-Net-SPDY \
p5-Net-SSLeay>=1.49:security/p5-Net-SSLeay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Mozilla-CA>=0:www/p5-Mozilla-CA
NO_ARCH= yes
diff --git a/www/p5-HTTP-Tiny-UA/Makefile b/www/p5-HTTP-Tiny-UA/Makefile
index 6ec7d2c08d2b..dc5cad5b2a0d 100644
--- a/www/p5-HTTP-Tiny-UA/Makefile
+++ b/www/p5-HTTP-Tiny-UA/Makefile
@@ -13,9 +13,9 @@ COMMENT= Higher-level UA features for HTTP::Tiny
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Class-Tiny>=1.000:devel/p5-Class-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Tiny>=1.000:devel/p5-Class-Tiny \
p5-superclass>=0:devel/p5-superclass
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-IMDB-Film/Makefile b/www/p5-IMDB-Film/Makefile
index 04afe578931b..1b1326eced40 100644
--- a/www/p5-IMDB-Film/Makefile
+++ b/www/p5-IMDB-Film/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= OO Perl interface to the movies database IMDB
-BUILD_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
p5-Error>=0:lang/p5-Error \
p5-HTML-Parser>=2.28:www/p5-HTML-Parser \
p5-Text-Unidecode>=0:converters/p5-Text-Unidecode \
p5-libwww>=1.41:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Image-Delivery/Makefile b/www/p5-Image-Delivery/Makefile
index 9de0bb2459e1..f57e603feeab 100644
--- a/www/p5-Image-Delivery/Makefile
+++ b/www/p5-Image-Delivery/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
COMMENT= Efficient transformation and delivery of web images
-BUILD_DEPENDS= p5-Test-ClassAPI>=1.04:devel/p5-Test-ClassAPI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-ClassAPI>=1.04:devel/p5-Test-ClassAPI \
p5-Digest-TransformPath>=0.01:devel/p5-Digest-TransformPath \
p5-File-Remove>=0.34:devel/p5-File-Remove \
p5-File-Slurp>=9999.04:devel/p5-File-Slurp \
p5-HTML-Location>=1.00:www/p5-HTML-Location \
p5-Params-Coerce>=0.13:devel/p5-Params-Coerce
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Interchange6/Makefile b/www/p5-Interchange6/Makefile
index 9b2b860b9af5..7d3910eb07ec 100644
--- a/www/p5-Interchange6/Makefile
+++ b/www/p5-Interchange6/Makefile
@@ -14,7 +14,8 @@ COMMENT= Open Source Shop Machine
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Interchange6-Schema>=0:databases/p5-Interchange6-Schema \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Interchange6-Schema>=0:databases/p5-Interchange6-Schema \
p5-Module-Runtime>=0:devel/p5-Module-Runtime \
p5-Moo>=2.000000:devel/p5-Moo \
p5-Type-Tiny>=0:devel/p5-Type-Tiny \
@@ -23,7 +24,6 @@ BUILD_DEPENDS= p5-Interchange6-Schema>=0:databases/p5-Interchange6-Schema \
p5-MooseX-CoverableModifiers>=0:devel/p5-MooseX-CoverableModifiers \
p5-aliased>=0:devel/p5-aliased
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-JSON-API/Makefile b/www/p5-JSON-API/Makefile
index 146e578f8ed7..bdc483ee9fbf 100644
--- a/www/p5-JSON-API/Makefile
+++ b/www/p5-JSON-API/Makefile
@@ -14,10 +14,10 @@ COMMENT= Module to interact with a JSON API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2:converters/p5-JSON \
p5-libwww>=0:www/p5-libwww \
p5-URI-Encode>0:www/p5-URI-Encode
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-Capture>=0:devel/p5-IO-Capture \
p5-Test-Fake-HTTPD>=0:devel/p5-Test-Fake-HTTPD \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
diff --git a/www/p5-Jemplate/Makefile b/www/p5-Jemplate/Makefile
index f25243c67cd9..ef15c0660bbb 100644
--- a/www/p5-Jemplate/Makefile
+++ b/www/p5-Jemplate/Makefile
@@ -16,9 +16,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-Find-Rule>=0.33:devel/p5-File-Find-Rule \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Find-Rule>=0.33:devel/p5-File-Find-Rule \
p5-Template-Toolkit>=2.25:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Jifty/Makefile b/www/p5-Jifty/Makefile
index 48c460536a79..3f049def10e3 100644
--- a/www/p5-Jifty/Makefile
+++ b/www/p5-Jifty/Makefile
@@ -14,7 +14,8 @@ COMMENT= Jifty -- Just Do It -- Yet another web framework
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-App-CLI>=0.03:devel/p5-App-CLI \
p5-CGI-Cookie-Splitter>=0:www/p5-CGI-Cookie-Splitter \
p5-CGI-Emulate-PSGI>=0.06:www/p5-CGI-Emulate-PSGI \
@@ -88,7 +89,6 @@ BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-YAML>=0.35:textproc/p5-YAML \
p5-YAML-Syck>=0.71:textproc/p5-YAML-Syck \
p5-libwww>0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Base>=0.44:devel/p5-Test-Base \
p5-Test-HTTP-Server-Simple>=0.02:www/p5-Test-HTTP-Server-Simple \
p5-Test-Log4perl>0:devel/p5-Test-Log4perl \
diff --git a/www/p5-LWP-Authen-Wsse/Makefile b/www/p5-LWP-Authen-Wsse/Makefile
index 00d750f82589..cabd51a5fc23 100644
--- a/www/p5-LWP-Authen-Wsse/Makefile
+++ b/www/p5-LWP-Authen-Wsse/Makefile
@@ -14,9 +14,9 @@ COMMENT= Library for enabling X-WSSE authentication in LWP
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-LWP-Protocol-connect/Makefile b/www/p5-LWP-Protocol-connect/Makefile
index f3107842deee..bd33c7d531a8 100644
--- a/www/p5-LWP-Protocol-connect/Makefile
+++ b/www/p5-LWP-Protocol-connect/Makefile
@@ -14,13 +14,13 @@ COMMENT= Provides HTTP/CONNECT proxy support for LWP::UserAgent
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-libwww>=0:www/p5-libwww \
p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
p5-URI>=0:net/p5-URI \
p5-Net-HTTP>=6:net/p5-Net-HTTP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/www/p5-LWP-Protocol-http10/Makefile b/www/p5-LWP-Protocol-http10/Makefile
index 53ad7424abd1..0cd438d74623 100644
--- a/www/p5-LWP-Protocol-http10/Makefile
+++ b/www/p5-LWP-Protocol-http10/Makefile
@@ -14,9 +14,9 @@ COMMENT= Legacy HTTP/1.0 support for LWP
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=6:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=6:www/p5-HTTP-Message \
p5-libwww>=6:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-LWP-Protocol-https/Makefile b/www/p5-LWP-Protocol-https/Makefile
index 5ba4442f96ff..af56c70aa271 100644
--- a/www/p5-LWP-Protocol-https/Makefile
+++ b/www/p5-LWP-Protocol-https/Makefile
@@ -14,11 +14,11 @@ COMMENT= Provide https support for LWP::UserAgent
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>=1.54:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=1.54:security/p5-IO-Socket-SSL \
p5-Mozilla-CA>=20110101:www/p5-Mozilla-CA \
p5-Net-HTTP>=6:net/p5-Net-HTTP \
p5-libwww>=6.06:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-LWP-Protocol-socks/Makefile b/www/p5-LWP-Protocol-socks/Makefile
index f1d4498ee511..04ed8d80e745 100644
--- a/www/p5-LWP-Protocol-socks/Makefile
+++ b/www/p5-LWP-Protocol-socks/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Adds support for the socks protocol and proxy facility in LWP
-BUILD_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-IO-Socket-Socks>=0:net/p5-IO-Socket-Socks \
p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-LWP-UserAgent-POE/Makefile b/www/p5-LWP-UserAgent-POE/Makefile
index 533327ab58c1..a55b636c74e8 100644
--- a/www/p5-LWP-UserAgent-POE/Makefile
+++ b/www/p5-LWP-UserAgent-POE/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Drop-in LWP::UserAgent replacement in POE environments
-BUILD_DEPENDS= p5-POE>=0.9999:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0.9999:devel/p5-POE \
p5-POE-Component-Client-HTTP>=0.83:www/p5-POE-Component-Client-HTTP \
p5-POE-Component-SSLify>=1.008:security/p5-POE-Component-SSLify \
p5-libwww>=0:www/p5-libwww \
p5-Log-Log4perl>=1:devel/p5-Log-Log4perl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-LWP-UserAgent-WithCache/Makefile b/www/p5-LWP-UserAgent-WithCache/Makefile
index 2bb0ea98a06a..cdc8d30adaee 100644
--- a/www/p5-LWP-UserAgent-WithCache/Makefile
+++ b/www/p5-LWP-UserAgent-WithCache/Makefile
@@ -14,10 +14,10 @@ COMMENT= LWP::UserAgent extension with local cache
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
p5-File-HomeDir>=0:devel/p5-File-HomeDir \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-LWPx-ParanoidAgent/Makefile b/www/p5-LWPx-ParanoidAgent/Makefile
index b13ad7ac12ac..9a0fdcaff936 100644
--- a/www/p5-LWPx-ParanoidAgent/Makefile
+++ b/www/p5-LWPx-ParanoidAgent/Makefile
@@ -13,10 +13,10 @@ COMMENT= Subclass of LWP::UserAgent that protects you from harm
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-SSLeay>=0.58:security/p5-Crypt-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-SSLeay>=0.58:security/p5-Crypt-SSLeay \
p5-Net-DNS>=0:dns/p5-Net-DNS \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Mason/Makefile b/www/p5-Mason/Makefile
index 522ec0a7b8f5..d28bf0839c9b 100644
--- a/www/p5-Mason/Makefile
+++ b/www/p5-Mason/Makefile
@@ -14,7 +14,8 @@ COMMENT= High-performance, dynamic web site authoring system
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-Load>=0:devel/p5-Class-Load \
p5-Class-Unload>=0:devel/p5-Class-Unload \
p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
@@ -28,7 +29,6 @@ BUILD_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-MooseX-HasDefaults>=0.03:devel/p5-MooseX-HasDefaults \
p5-MooseX-StrictConstructor>=0.13:devel/p5-MooseX-StrictConstructor \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Class-Most>=0:devel/p5-Test-Class-Most \
p5-Test-LongString>=0:devel/p5-Test-LongString
diff --git a/www/p5-MasonX-Interp-WithCallbacks/Makefile b/www/p5-MasonX-Interp-WithCallbacks/Makefile
index 12df8057046b..ed5f41d02199 100644
--- a/www/p5-MasonX-Interp-WithCallbacks/Makefile
+++ b/www/p5-MasonX-Interp-WithCallbacks/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Mason callback support via Params::CallbackRequest
-BUILD_DEPENDS= p5-HTML-Mason>=0:www/p5-HTML-Mason \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Mason>=0:www/p5-HTML-Mason \
p5-Params-CallbackRequest>=0:devel/p5-Params-CallbackRequest
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-MasonX-Profiler/Makefile b/www/p5-MasonX-Profiler/Makefile
index 3e6efaf0f342..30dc6bdd75e1 100644
--- a/www/p5-MasonX-Profiler/Makefile
+++ b/www/p5-MasonX-Profiler/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Mason per-component profiler
-BUILD_DEPENDS= p5-HTML-Mason>=0:www/p5-HTML-Mason
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Mason>=0:www/p5-HTML-Mason
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-MasonX-Request-WithApacheSession/Makefile b/www/p5-MasonX-Request-WithApacheSession/Makefile
index 9fec3f5d67bb..7d49d6155485 100644
--- a/www/p5-MasonX-Request-WithApacheSession/Makefile
+++ b/www/p5-MasonX-Request-WithApacheSession/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Interface to Apache::Session for HTML::Mason
-BUILD_DEPENDS= p5-HTML-Mason>=0:www/p5-HTML-Mason \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Mason>=0:www/p5-HTML-Mason \
p5-Apache-Session-Wrapper>=0:www/p5-Apache-Session-Wrapper
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-MasonX-WebApp/Makefile b/www/p5-MasonX-WebApp/Makefile
index 6f051bd1de83..c4024a7ffee5 100644
--- a/www/p5-MasonX-WebApp/Makefile
+++ b/www/p5-MasonX-WebApp/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Works with HTML::Mason to do processing before Mason is invoked
-BUILD_DEPENDS= mp2bug:www/mod_perl2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= mp2bug:www/mod_perl2 \
p5-HTML-Mason>=0:www/p5-HTML-Mason \
p5-Apache-Session-Wrapper>=0:www/p5-Apache-Session-Wrapper \
p5-Exception-Class>=0:devel/p5-Exception-Class \
p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
p5-Class-Factory-Util>=0:devel/p5-Class-Factory-Util \
p5-URI>0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Output>=0:devel/p5-Test-Output
diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile
index f244e7e65e3f..b631f084601e 100644
--- a/www/p5-Maypole/Makefile
+++ b/www/p5-Maypole/Makefile
@@ -15,7 +15,8 @@ COMMENT= MVC web application framework
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Simple>=0:www/p5-CGI-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Simple>=0:www/p5-CGI-Simple \
p5-CGI-Untaint>=1.26:www/p5-CGI-Untaint \
p5-CGI-Untaint-date>=0:www/p5-CGI-Untaint-date \
p5-CGI-Untaint-email>=0:www/p5-CGI-Untaint-email \
@@ -36,7 +37,6 @@ BUILD_DEPENDS= p5-CGI-Simple>=0:www/p5-CGI-Simple \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockModule>=0:devel/p5-Test-MockModule \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
diff --git a/www/p5-MediaWiki-API/Makefile b/www/p5-MediaWiki-API/Makefile
index 09a549994bdd..6317111d5ebd 100644
--- a/www/p5-MediaWiki-API/Makefile
+++ b/www/p5-MediaWiki-API/Makefile
@@ -12,9 +12,9 @@ COMMENT= OOP MediaWiki engine client
LICENSE= GPLv3
-BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-JSON-Any>=0:converters/p5-JSON-Any
NO_ARCH= yes
diff --git a/www/p5-MediaWiki/Makefile b/www/p5-MediaWiki/Makefile
index 61eb6e3aed47..83c9cbc2b075 100644
--- a/www/p5-MediaWiki/Makefile
+++ b/www/p5-MediaWiki/Makefile
@@ -15,9 +15,9 @@ COMMENT= OOP MediaWiki engine client
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-IniHash>=0:devel/p5-Config-IniHash \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-IniHash>=0:devel/p5-Config-IniHash \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-ModPerl-VersionUtil/Makefile b/www/p5-ModPerl-VersionUtil/Makefile
index 6f3aeb2dad73..e164abd27f3b 100644
--- a/www/p5-ModPerl-VersionUtil/Makefile
+++ b/www/p5-ModPerl-VersionUtil/Makefile
@@ -14,8 +14,8 @@ COMMENT= Makes it easier to investigate your mod_perl version
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Data-Inheritable>=0.02:devel/p5-Class-Data-Inheritable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Data-Inheritable>=0.02:devel/p5-Class-Data-Inheritable
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-MojoMojo/Makefile b/www/p5-MojoMojo/Makefile
index 180685bfc8a8..9a26cb392071 100644
--- a/www/p5-MojoMojo/Makefile
+++ b/www/p5-MojoMojo/Makefile
@@ -15,7 +15,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
# Please keep order as in Makefile.PL
-BUILD_DEPENDS= \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= \
p5-Plack>=0.9974:www/p5-Plack \
p5-Algorithm-Diff>=1.1901:devel/p5-Algorithm-Diff \
p5-Algorithm-Merge>=0:devel/p5-Algorithm-Merge \
@@ -82,7 +83,6 @@ BUILD_DEPENDS= \
p5-Term-Prompt>=0:devel/p5-Term-Prompt \
p5-Text-Emoticon-MSN>=0:textproc/p5-Text-Emoticon-MSN \
p5-File-Slurp>=0:devel/p5-File-Slurp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
NO_ARCH= yes
diff --git a/www/p5-MojoX-Log-Dispatch-Simple/Makefile b/www/p5-MojoX-Log-Dispatch-Simple/Makefile
index b5fcb9f19c80..177c74668dc9 100644
--- a/www/p5-MojoX-Log-Dispatch-Simple/Makefile
+++ b/www/p5-MojoX-Log-Dispatch-Simple/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple Log::Dispatch replacement of Mojo::Log
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
p5-Mojolicious>=0:www/p5-Mojolicious
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Most>=0:devel/p5-Test-Most
USES= perl5
diff --git a/www/p5-MojoX-Renderer-Xslate/Makefile b/www/p5-MojoX-Renderer-Xslate/Makefile
index 20f26c4ba805..6c05aa8055ed 100644
--- a/www/p5-MojoX-Renderer-Xslate/Makefile
+++ b/www/p5-MojoX-Renderer-Xslate/Makefile
@@ -13,9 +13,9 @@ COMMENT= Text::Xslate renderer for for Mojolicious
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mojolicious>=5.81:www/p5-Mojolicious \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mojolicious>=5.81:www/p5-Mojolicious \
p5-Text-Xslate>=0.2013:textproc/p5-Text-Xslate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Mojolicious-Plugin-Authentication/Makefile b/www/p5-Mojolicious-Plugin-Authentication/Makefile
index 22ce7f4685fb..4e4d948d487d 100644
--- a/www/p5-Mojolicious-Plugin-Authentication/Makefile
+++ b/www/p5-Mojolicious-Plugin-Authentication/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Mojolicious>=0:www/p5-Mojolicious
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mojolicious>=0:www/p5-Mojolicious
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Mojolicious-Plugin-Database/Makefile b/www/p5-Mojolicious-Plugin-Database/Makefile
index 32948a0b60a7..49eafef06779 100644
--- a/www/p5-Mojolicious-Plugin-Database/Makefile
+++ b/www/p5-Mojolicious-Plugin-Database/Makefile
@@ -14,9 +14,9 @@ COMMENT= Handling of DBI based connections in Mojolicious
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-Mojolicious>=1:www/p5-Mojolicious
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
diff --git a/www/p5-Mojolicious-Plugin-Mongodb/Makefile b/www/p5-Mojolicious-Plugin-Mongodb/Makefile
index 7591d49f80a6..463b7bffa330 100644
--- a/www/p5-Mojolicious-Plugin-Mongodb/Makefile
+++ b/www/p5-Mojolicious-Plugin-Mongodb/Makefile
@@ -15,10 +15,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Mojolicious>=0:www/p5-Mojolicious \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mojolicious>=0:www/p5-Mojolicious \
p5-MongoDB>=0:databases/p5-MongoDB \
p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Mojolicious-Plugin-SetUserGroup/Makefile b/www/p5-Mojolicious-Plugin-SetUserGroup/Makefile
index 660119c830f4..1b5ea75bacb8 100644
--- a/www/p5-Mojolicious-Plugin-SetUserGroup/Makefile
+++ b/www/p5-Mojolicious-Plugin-SetUserGroup/Makefile
@@ -14,9 +14,9 @@ COMMENT= Mojolicious plugin to set unprivileged credentials
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Mojolicious>=6.0:www/p5-Mojolicious \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mojolicious>=6.0:www/p5-Mojolicious \
p5-Unix-Groups-FFI>=0:devel/p5-Unix-Groups-FFI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Mojolicious-Plugin-TtRenderer/Makefile b/www/p5-Mojolicious-Plugin-TtRenderer/Makefile
index 659acd56f53e..d4426db37716 100644
--- a/www/p5-Mojolicious-Plugin-TtRenderer/Makefile
+++ b/www/p5-Mojolicious-Plugin-TtRenderer/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Mojolicious>=6.33:www/p5-Mojolicious \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mojolicious>=6.33:www/p5-Mojolicious \
p5-Template-Toolkit>=2.18:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Mojolicious-Plugin-YamlConfig/Makefile b/www/p5-Mojolicious-Plugin-YamlConfig/Makefile
index af3edd0ee601..d5ad830c6982 100644
--- a/www/p5-Mojolicious-Plugin-YamlConfig/Makefile
+++ b/www/p5-Mojolicious-Plugin-YamlConfig/Makefile
@@ -13,9 +13,9 @@ COMMENT= YAML Configuration Plugin
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mojolicious>=5.54:www/p5-Mojolicious \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mojolicious>=5.54:www/p5-Mojolicious \
p5-YAML-Tiny>=1.60:textproc/p5-YAML-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Compile>=0:devel/p5-Test-Compile
USES= perl5
diff --git a/www/p5-Net-Akismet/Makefile b/www/p5-Net-Akismet/Makefile
index 7fb25d0ae97d..870c7c510ec5 100644
--- a/www/p5-Net-Akismet/Makefile
+++ b/www/p5-Net-Akismet/Makefile
@@ -14,8 +14,8 @@ COMMENT= Perl interface to the Akismet comment and trackback spam blocker
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=5.09:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=5.09:www/p5-libwww
TEST_DEPENDS= p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
USES= perl5
diff --git a/www/p5-Net-Amazon-AWIS/Makefile b/www/p5-Net-Amazon-AWIS/Makefile
index a4799918a25a..db7a5761cece 100644
--- a/www/p5-Net-Amazon-AWIS/Makefile
+++ b/www/p5-Net-Amazon-AWIS/Makefile
@@ -14,13 +14,13 @@ COMMENT= Use the Amazon Alexa Web Information Service
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-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-URI>=0:net/p5-URI \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-Prompt>=0:devel/p5-IO-Prompt \
p5-Test-Exception>=0:devel/p5-Test-Exception
diff --git a/www/p5-Net-Async-FastCGI/Makefile b/www/p5-Net-Async-FastCGI/Makefile
index 5a2291528e51..d6dc286a66af 100644
--- a/www/p5-Net-Async-FastCGI/Makefile
+++ b/www/p5-Net-Async-FastCGI/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl module to use FastCGI with IO::Async
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-IO-Async>=0:devel/p5-IO-Async \
p5-Net-FastCGI>=0:www/p5-Net-FastCGI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-HexString>=0:devel/p5-Test-HexString \
p5-Test-Refcount>0:devel/p5-Test-Refcount \
p5-Test-Identity>=0:devel/p5-Test-Identity
diff --git a/www/p5-Net-Async-HTTP/Makefile b/www/p5-Net-Async-HTTP/Makefile
index cb59faadba73..541bfd8d0a3e 100644
--- a/www/p5-Net-Async-HTTP/Makefile
+++ b/www/p5-Net-Async-HTTP/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Future>=0.28:devel/p5-Future \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Future>=0.28:devel/p5-Future \
p5-HTTP-Cookies>=0:www/p5-HTTP-Cookies \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-IO-Async>=0.59:devel/p5-IO-Async \
p5-Struct-Dumb>=0.07:devel/p5-Struct-Dumb \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-Async-SSL>=0.12:security/p5-IO-Async-SSL \
p5-Test-Identity>=0:devel/p5-Test-Identity \
p5-Test-Refcount>=0:devel/p5-Test-Refcount
diff --git a/www/p5-Net-Flickr-API/Makefile b/www/p5-Net-Flickr-API/Makefile
index c865ea83dd3e..7ea4e35b2fa3 100644
--- a/www/p5-Net-Flickr-API/Makefile
+++ b/www/p5-Net-Flickr-API/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Base API class for Net::Flickr::* libraries
-BUILD_DEPENDS= p5-Config-Simple>=0:devel/p5-Config-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Simple>=0:devel/p5-Config-Simple \
p5-Flickr-API>=0:www/p5-Flickr-API \
p5-Flickr-Upload>=0:www/p5-Flickr-Upload \
p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
p5-Readonly>=0:devel/p5-Readonly \
p5-XML-XPath>=0:textproc/p5-XML-XPath
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Net-Flickr-Backup/Makefile b/www/p5-Net-Flickr-Backup/Makefile
index fa26b816966a..c9f829fb7cf2 100644
--- a/www/p5-Net-Flickr-Backup/Makefile
+++ b/www/p5-Net-Flickr-Backup/Makefile
@@ -14,14 +14,14 @@ COMMENT= OOP for backing up your Flickr photos locally
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-IO-stringy>=2.101:devel/p5-IO-stringy \
p5-Image-MetaData-JPEG>=0.15:graphics/p5-Image-MetaData-JPEG \
p5-Net-Flickr-RDF>=2.2:www/p5-Net-Flickr-RDF \
p5-TimeDate>=1.16:devel/p5-TimeDate \
p5-Text-Unidecode>=0.04:converters/p5-Text-Unidecode \
p5-libwww>=1.38:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Net-Flickr-RDF/Makefile b/www/p5-Net-Flickr-RDF/Makefile
index 454834986316..1d5ea4ff7505 100644
--- a/www/p5-Net-Flickr-RDF/Makefile
+++ b/www/p5-Net-Flickr-RDF/Makefile
@@ -14,10 +14,10 @@ COMMENT= Describe Flickr photos as RDF
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Net-Flickr-API>=1.7:www/p5-Net-Flickr-API \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-Flickr-API>=1.7:www/p5-Net-Flickr-API \
p5-RDF-Simple>=0.220:textproc/p5-RDF-Simple \
p5-TimeDate>=1.16:devel/p5-TimeDate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Net-FreshBooks-API/Makefile b/www/p5-Net-FreshBooks-API/Makefile
index 7ee0786e4f8b..e34c9ff7f1a6 100644
--- a/www/p5-Net-FreshBooks-API/Makefile
+++ b/www/p5-Net-FreshBooks-API/Makefile
@@ -13,7 +13,8 @@ COMMENT= Easy OO access to the FreshBooks.com API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-B-Hooks-EndOfScope>=0.09:devel/p5-B-Hooks-EndOfScope \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-B-Hooks-EndOfScope>=0.09:devel/p5-B-Hooks-EndOfScope \
p5-Clone>=0:devel/p5-Clone \
p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
@@ -28,7 +29,6 @@ BUILD_DEPENDS= p5-B-Hooks-EndOfScope>=0.09:devel/p5-B-Hooks-EndOfScope \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww \
p5-namespace-autoclean>=0.11:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \
p5-File-Slurp>=0:devel/p5-File-Slurp \
p5-Sub-Override>=0:devel/p5-Sub-Override \
diff --git a/www/p5-Net-Plurk/Makefile b/www/p5-Net-Plurk/Makefile
index 37d4327d8c7f..d817f520b154 100644
--- a/www/p5-Net-Plurk/Makefile
+++ b/www/p5-Net-Plurk/Makefile
@@ -14,7 +14,8 @@ COMMENT= Perl interface to Plurk API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
p5-HTTP-Lite>=0:www/p5-HTTP-Lite \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
p5-URI>=0:net/p5-URI \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-Net-Trac/Makefile b/www/p5-Net-Trac/Makefile
index cd71667677d1..198d97870381 100644
--- a/www/p5-Net-Trac/Makefile
+++ b/www/p5-Net-Trac/Makefile
@@ -14,7 +14,8 @@ COMMENT= Interact with a remote Trac instance
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>0:devel/p5-Any-Moose \
p5-DateTime>0:devel/p5-DateTime \
p5-Lingua-EN-Inflect>0:textproc/p5-Lingua-EN-Inflect \
p5-Params-Validate>0:devel/p5-Params-Validate \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Any-Moose>0:devel/p5-Any-Moose \
p5-URI>0:net/p5-URI \
p5-WWW-Mechanize>=1.52:www/p5-WWW-Mechanize \
p5-libwww>0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Net-UPS/Makefile b/www/p5-Net-UPS/Makefile
index d48d0439c7ae..062879c6c245 100644
--- a/www/p5-Net-UPS/Makefile
+++ b/www/p5-Net-UPS/Makefile
@@ -13,13 +13,13 @@ COMMENT= Perl Client library for UPS XML Shipping API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-libwww>=0:www/p5-libwww \
p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
p5-Scalar-List-Utils>=0:lang/p5-Scalar-List-Utils \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-Task-Weaken>=0:devel/p5-Task-Weaken
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Net-YAP/Makefile b/www/p5-Net-YAP/Makefile
index 445b2ccb6062..766dae69030f 100644
--- a/www/p5-Net-YAP/Makefile
+++ b/www/p5-Net-YAP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Conduit to communicate with the Yahoo! Application Platform
-BUILD_DEPENDS= p5-Net-OAuth-Simple>=1.0:net/p5-Net-OAuth-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-OAuth-Simple>=1.0:net/p5-Net-OAuth-Simple
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Net-eBay/Makefile b/www/p5-Net-eBay/Makefile
index 4f43593eb1dc..3b247dccdee9 100644
--- a/www/p5-Net-eBay/Makefile
+++ b/www/p5-Net-eBay/Makefile
@@ -14,7 +14,8 @@ COMMENT= Perl Interface to XML based eBay API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-DateTime-Precise>=0:devel/p5-DateTime-Precise \
p5-HTML-Format>=0:textproc/p5-HTML-Format \
p5-HTML-PrettyPrinter>=0:www/p5-HTML-PrettyPrinter \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-XML-Dumper>=0:textproc/p5-XML-Dumper \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= EXAMPLES
diff --git a/www/p5-Newsletter/Makefile b/www/p5-Newsletter/Makefile
index 9b20388fb6ce..544313b368b7 100644
--- a/www/p5-Newsletter/Makefile
+++ b/www/p5-Newsletter/Makefile
@@ -14,10 +14,10 @@ COMMENT= Simple website based Newsletter interface
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-Type>0:devel/p5-File-Type \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Type>0:devel/p5-File-Type \
p5-MIME-Explode>0:mail/p5-MIME-Explode \
p5-MIME-Lite>0:mail/p5-MIME-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-PHP-Session/Makefile b/www/p5-PHP-Session/Makefile
index fb1cbd9c4600..76e3ea2b801d 100644
--- a/www/p5-PHP-Session/Makefile
+++ b/www/p5-PHP-Session/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Read / write PHP session files
-BUILD_DEPENDS= p5-UNIVERSAL-require>=0.03:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-UNIVERSAL-require>=0.03:devel/p5-UNIVERSAL-require
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-POE-Component-Client-HTTP/Makefile b/www/p5-POE-Component-Client-HTTP/Makefile
index 6dccfcc88541..995c386e9cbe 100644
--- a/www/p5-POE-Component-Client-HTTP/Makefile
+++ b/www/p5-POE-Component-Client-HTTP/Makefile
@@ -16,11 +16,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-POE>=1.312:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.312:devel/p5-POE \
p5-POE-Component-Client-Keepalive>=0.2710:net/p5-POE-Component-Client-Keepalive \
p5-URI>=1.37:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-POE-Server-TCP>=1.14:devel/p5-Test-POE-Server-TCP
USES= perl5
diff --git a/www/p5-POE-Component-Client-UserAgent/Makefile b/www/p5-POE-Component-Client-UserAgent/Makefile
index 08780c39f9ee..e774a570d583 100644
--- a/www/p5-POE-Component-Client-UserAgent/Makefile
+++ b/www/p5-POE-Component-Client-UserAgent/Makefile
@@ -15,9 +15,9 @@ COMMENT= LWP and LWP::Parallel based POE component
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-ParallelUserAgent>=0:www/p5-ParallelUserAgent
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-POE-Component-Server-HTTP/Makefile b/www/p5-POE-Component-Server-HTTP/Makefile
index 2adae1d52d6c..90c3769a030f 100644
--- a/www/p5-POE-Component-Server-HTTP/Makefile
+++ b/www/p5-POE-Component-Server-HTTP/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= POE Component to create HTTP Servers
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-POE-API-Peek>=0:devel/p5-POE-API-Peek \
p5-YAML>=0:textproc/p5-YAML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-POE-Component-Server-HTTPServer/Makefile b/www/p5-POE-Component-Server-HTTPServer/Makefile
index b5733b2da9de..74017d4b477b 100644
--- a/www/p5-POE-Component-Server-HTTPServer/Makefile
+++ b/www/p5-POE-Component-Server-HTTPServer/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lin-chi@lastamericanempire.com
COMMENT= POE Component to server HTTP requests
-BUILD_DEPENDS= p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=0:devel/p5-POE \
p5-libwww>=0:www/p5-libwww \
p5-HTML-Template-HashWrapper>=0:www/p5-HTML-Template-HashWrapper \
p5-MIME-Types>=0:mail/p5-MIME-Types
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-POE-Component-Server-SOAP/Makefile b/www/p5-POE-Component-Server-SOAP/Makefile
index 002711d188bb..97814d6ac564 100644
--- a/www/p5-POE-Component-Server-SOAP/Makefile
+++ b/www/p5-POE-Component-Server-SOAP/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Publish POE event handlers via SOAP over HTTP
-BUILD_DEPENDS= p5-SOAP-Lite>=0.55:net/p5-SOAP-Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SOAP-Lite>=0.55:net/p5-SOAP-Lite \
p5-POE-Component-Server-SimpleHTTP>=1.54:www/p5-POE-Component-Server-SimpleHTTP \
p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/Makefile b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
index dfdcc9a9c7be..db95f0fe4f44 100644
--- a/www/p5-POE-Component-Server-SimpleHTTP/Makefile
+++ b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
@@ -13,10 +13,10 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0.9:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.9:devel/p5-Moose \
p5-MooseX-POE>=0.205:devel/p5-MooseX-POE \
p5-POE>=1:devel/p5-POE
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-POE-Component-Client-HTTP>=0.82:www/p5-POE-Component-Client-HTTP \
p5-POE-Filter-HTTP-Parser>=1.06:www/p5-POE-Filter-HTTP-Parser \
p5-Test-POE-Client-TCP>=0.1:devel/p5-Test-POE-Client-TCP
diff --git a/www/p5-POE-Filter-HTTP-Parser/Makefile b/www/p5-POE-Filter-HTTP-Parser/Makefile
index c8f56f9539f2..122c0d4874db 100644
--- a/www/p5-POE-Filter-HTTP-Parser/Makefile
+++ b/www/p5-POE-Filter-HTTP-Parser/Makefile
@@ -9,10 +9,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= HTTP POE filter for HTTP clients or servers
-BUILD_DEPENDS= p5-POE>=1.003:devel/p5-POE \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-POE>=1.003:devel/p5-POE \
p5-libwww>=0:www/p5-libwww \
p5-HTTP-Parser>=0.06:www/p5-HTTP-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-POE-Client-TCP>=0:devel/p5-Test-POE-Client-TCP \
p5-Test-POE-Server-TCP>=0:devel/p5-Test-POE-Server-TCP
diff --git a/www/p5-ParallelUserAgent/Makefile b/www/p5-ParallelUserAgent/Makefile
index 6155f50a922a..f9a449561007 100644
--- a/www/p5-ParallelUserAgent/Makefile
+++ b/www/p5-ParallelUserAgent/Makefile
@@ -14,9 +14,9 @@ COMMENT= Extension for LWP to allow parallel HTTP and FTP access
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
p5-libwww>=5.64:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
REINPLACE_ARGS= -i ''
diff --git a/www/p5-Parse-HTTP-UserAgent/Makefile b/www/p5-Parse-HTTP-UserAgent/Makefile
index 4a3d9a174674..5a13caf911a1 100644
--- a/www/p5-Parse-HTTP-UserAgent/Makefile
+++ b/www/p5-Parse-HTTP-UserAgent/Makefile
@@ -14,10 +14,10 @@ COMMENT= Parser for the User Agent string
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
diff --git a/www/p5-Perlanet/Makefile b/www/p5-Perlanet/Makefile
index ea62ad2e7f31..db0526aa989e 100644
--- a/www/p5-Perlanet/Makefile
+++ b/www/p5-Perlanet/Makefile
@@ -15,7 +15,8 @@ COMMENT= Program for creating programs that aggregate web feeds
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CHI>=0:devel/p5-CHI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CHI>=0:devel/p5-CHI \
p5-DateTime>=0:devel/p5-DateTime \
p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber \
p5-HTML-Tidy>=0:textproc/p5-HTML-Tidy \
@@ -28,7 +29,6 @@ BUILD_DEPENDS= p5-CHI>=0:devel/p5-CHI \
p5-XML-Feed>=0.22:textproc/p5-XML-Feed \
p5-YAML>=0:textproc/p5-YAML \
p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Plack-Middleware-CrossOrigin/Makefile b/www/p5-Plack-Middleware-CrossOrigin/Makefile
index 15ae608ec56a..2f800f4f6e46 100644
--- a/www/p5-Plack-Middleware-CrossOrigin/Makefile
+++ b/www/p5-Plack-Middleware-CrossOrigin/Makefile
@@ -13,8 +13,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Plack>=0:www/p5-Plack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Plack>=0:www/p5-Plack
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Plack-Middleware-Expires/Makefile b/www/p5-Plack-Middleware-Expires/Makefile
index ac02235a4bde..e4405725ddbc 100644
--- a/www/p5-Plack-Middleware-Expires/Makefile
+++ b/www/p5-Plack-Middleware-Expires/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl module mod_expires for Plack
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Date>=0:www/p5-HTTP-Date \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Date>=0:www/p5-HTTP-Date \
p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-Plack>=0.9937:www/p5-Plack \
p5-Try-Tiny>=0.06:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/www/p5-Plack-Middleware-ExtDirect/Makefile b/www/p5-Plack-Middleware-ExtDirect/Makefile
index 998fa3def2e0..e58efcf05aff 100644
--- a/www/p5-Plack-Middleware-ExtDirect/Makefile
+++ b/www/p5-Plack-Middleware-ExtDirect/Makefile
@@ -13,10 +13,10 @@ COMMENT= Implement an RPC::ExtDirect gateway using Plack
LICENSE= ART10
-BUILD_DEPENDS= pkg-config:devel/pkgconf \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= pkg-config:devel/pkgconf \
p5-Plack>=0:www/p5-Plack \
p5-RPC-ExtDirect>=3.20:www/p5-RPC-ExtDirect
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.46:devel/p5-Test-Pod
USES= perl5
diff --git a/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile b/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
index 4e25eacf4fd7..72a62182c75e 100644
--- a/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
+++ b/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
@@ -14,9 +14,9 @@ COMMENT= Sets body for redirect response, if it is not already set
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-Plack>=0:www/p5-Plack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message
USE_PERL5= configure
diff --git a/www/p5-Plack-Middleware-ForceEnv/Makefile b/www/p5-Plack-Middleware-ForceEnv/Makefile
index 6f265cb64e68..8d1c2837ea7e 100644
--- a/www/p5-Plack-Middleware-ForceEnv/Makefile
+++ b/www/p5-Plack-Middleware-ForceEnv/Makefile
@@ -14,8 +14,8 @@ COMMENT= Force set environment variables for testing
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Plack>=0.9925:www/p5-Plack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Plack>=0.9925:www/p5-Plack
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-Plack-Middleware-MethodOverride/Makefile b/www/p5-Plack-Middleware-MethodOverride/Makefile
index 33bfe8bbf62a..9cc1c6e7fe20 100644
--- a/www/p5-Plack-Middleware-MethodOverride/Makefile
+++ b/www/p5-Plack-Middleware-MethodOverride/Makefile
@@ -13,8 +13,8 @@ COMMENT= Override REST methods to Plack apps via POST
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Plack>=0:www/p5-Plack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Plack>=0:www/p5-Plack
TEST_DEPENDS= p5-URI>=0:net/p5-URI
NO_ARCH= yes
diff --git a/www/p5-Plack-Middleware-NoMultipleSlashes/Makefile b/www/p5-Plack-Middleware-NoMultipleSlashes/Makefile
index 6524c346df0d..1f05c74065eb 100644
--- a/www/p5-Plack-Middleware-NoMultipleSlashes/Makefile
+++ b/www/p5-Plack-Middleware-NoMultipleSlashes/Makefile
@@ -13,8 +13,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Plack>=0:www/p5-Plack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Plack>=0:www/p5-Plack
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile b/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
index f96878801140..1d7404efadf6 100644
--- a/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
+++ b/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
@@ -14,8 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Plack>=0:www/p5-Plack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Plack>=0:www/p5-Plack
TEST_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message
NO_ARCH= yes
diff --git a/www/p5-Plack-Middleware-Rewrite/Makefile b/www/p5-Plack-Middleware-Rewrite/Makefile
index c21138a45f3b..fd25e28fc335 100644
--- a/www/p5-Plack-Middleware-Rewrite/Makefile
+++ b/www/p5-Plack-Middleware-Rewrite/Makefile
@@ -14,8 +14,8 @@ COMMENT= mod_rewrite for Plack
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Plack>=0.9942:www/p5-Plack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Plack>=0.9942:www/p5-Plack
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Plack-Middleware-Test-StashWarnings/Makefile b/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
index b20b35ab9b94..5b37bab70e7f 100644
--- a/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
+++ b/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= matthew@FreeBSD.org
COMMENT= Test your application's warnings
-BUILD_DEPENDS= p5-Plack>0:www/p5-Plack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Plack>0:www/p5-Plack
NO_ARCH= yes
diff --git a/www/p5-Plack-Middleware-XForwardedFor/Makefile b/www/p5-Plack-Middleware-XForwardedFor/Makefile
index 0c57c9fc95f1..e51d5f972c3b 100644
--- a/www/p5-Plack-Middleware-XForwardedFor/Makefile
+++ b/www/p5-Plack-Middleware-XForwardedFor/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Net-IP>=1.26:net-mgmt/p5-Net-IP \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Net-IP>=1.26:net-mgmt/p5-Net-IP \
p5-Plack>=0.9913:www/p5-Plack
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-Plack-Test-ExternalServer/Makefile b/www/p5-Plack-Test-ExternalServer/Makefile
index 270c08d2908e..01eba973589e 100644
--- a/www/p5-Plack-Test-ExternalServer/Makefile
+++ b/www/p5-Plack-Test-ExternalServer/Makefile
@@ -13,9 +13,9 @@ COMMENT= Run HTTP tests on external live servers
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-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \
p5-Plack>=0:www/p5-Plack \
p5-Test-TCP>=0:devel/p5-Test-TCP
diff --git a/www/p5-PocketIO/Makefile b/www/p5-PocketIO/Makefile
index dc49155b02f1..a9e120843cac 100644
--- a/www/p5-PocketIO/Makefile
+++ b/www/p5-PocketIO/Makefile
@@ -14,12 +14,12 @@ COMMENT= Socket.IO Plack application
LICENSE= ART20
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-JSON>=2.53:converters/p5-JSON \
p5-Protocol-SocketIO>=0.04:www/p5-Protocol-SocketIO \
p5-Protocol-WebSocket>=0.00906:www/p5-Protocol-WebSocket \
p5-Test-TCP>=0:devel/p5-Test-TCP
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Plack>=0:www/p5-Plack \
p5-Twiggy>=0:www/p5-Twiggy
diff --git a/www/p5-Pod-Site/Makefile b/www/p5-Pod-Site/Makefile
index bc99221a9041..775da27fd9ff 100644
--- a/www/p5-Pod-Site/Makefile
+++ b/www/p5-Pod-Site/Makefile
@@ -14,9 +14,9 @@ COMMENT= Build browsable HTML documentation for your app
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-Object-Tiny>=0:devel/p5-Object-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-File>=0:devel/p5-Test-File \
p5-Test-MockModule>=0.05:devel/p5-Test-MockModule \
p5-Test-XPath>=0.12:lang/p5-Test-XPath
diff --git a/www/p5-PodToHTML/Makefile b/www/p5-PodToHTML/Makefile
index fb968829cc99..a9a6afd127a9 100644
--- a/www/p5-PodToHTML/Makefile
+++ b/www/p5-PodToHTML/Makefile
@@ -15,11 +15,11 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-HTML-Format>=0:textproc/p5-HTML-Format
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Protocol-HTTP2/Makefile b/www/p5-Protocol-HTTP2/Makefile
index e6d29165e008..80937755d400 100644
--- a/www/p5-Protocol-HTTP2/Makefile
+++ b/www/p5-Protocol-HTTP2/Makefile
@@ -15,9 +15,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-Net-SSLeay>=1.45:security/p5-Net-SSLeay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
p5-Test-TCP>=0:devel/p5-Test-TCP
diff --git a/www/p5-Protocol-SocketIO/Makefile b/www/p5-Protocol-SocketIO/Makefile
index c7ae3c4a2e89..50ecd2114fc0 100644
--- a/www/p5-Protocol-SocketIO/Makefile
+++ b/www/p5-Protocol-SocketIO/Makefile
@@ -13,8 +13,8 @@ COMMENT= Socket.IO protocol implementation
LICENSE= ART20
-BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON
NO_ARCH= yes
USE_PERL5= modbuildtiny
diff --git a/www/p5-Protocol-XMLRPC/Makefile b/www/p5-Protocol-XMLRPC/Makefile
index 90a87f7cb67b..fe374a59000a 100644
--- a/www/p5-Protocol-XMLRPC/Makefile
+++ b/www/p5-Protocol-XMLRPC/Makefile
@@ -14,8 +14,8 @@ COMMENT= XML-RPC implementation
LICENSE= ART20
-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
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-REST-Client/Makefile b/www/p5-REST-Client/Makefile
index 025ed2c1d5d3..c883e642b68d 100644
--- a/www/p5-REST-Client/Makefile
+++ b/www/p5-REST-Client/Makefile
@@ -13,10 +13,10 @@ COMMENT= Simple client for interacting with RESTful http/https resources
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
p5-URI>0:net/p5-URI \
p5-libwww>0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-RPC-ExtDirect/Makefile b/www/p5-RPC-ExtDirect/Makefile
index 6cd19d23d21e..2c4df9e21c3e 100644
--- a/www/p5-RPC-ExtDirect/Makefile
+++ b/www/p5-RPC-ExtDirect/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl extension for implementing the Ext.Direct remoting protocol
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Attribute-Handlers>=0.93:devel/p5-Attribute-Handlers \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Attribute-Handlers>=0.93:devel/p5-Attribute-Handlers \
p5-JSON>=2.53:converters/p5-JSON
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.46:devel/p5-Test-Pod
USES= perl5
diff --git a/www/p5-RT-Authen-ExternalAuth/Makefile b/www/p5-RT-Authen-ExternalAuth/Makefile
index 0bd3133956fd..df4d6530b641 100644
--- a/www/p5-RT-Authen-ExternalAuth/Makefile
+++ b/www/p5-RT-Authen-ExternalAuth/Makefile
@@ -12,10 +12,10 @@ COMMENT= RT extension to authenticate users against an external source
LICENSE= GPLv2
-BUILD_DEPENDS= p5-perl-ldap>0:net/p5-perl-ldap \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-perl-ldap>0:net/p5-perl-ldap \
p5-DBI>0:databases/p5-DBI \
p5-Net-SSLeay>0:security/p5-Net-SSLeay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
@@ -40,7 +40,6 @@ RT_VER= ${opt:S/RT//}
### Temporary for debugging
#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
MAN3PREFIX= ${PREFIX}
diff --git a/www/p5-RT-Client-REST/Makefile b/www/p5-RT-Client-REST/Makefile
index 1e67c2a66739..0e7875d3562a 100644
--- a/www/p5-RT-Client-REST/Makefile
+++ b/www/p5-RT-Client-REST/Makefile
@@ -14,7 +14,8 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-Error>=0:lang/p5-Error \
p5-Exception-Class>=0:devel/p5-Exception-Class \
p5-DateTime>0:devel/p5-DateTime \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-URI>0:net/p5-URI
TEST_DEPENDS= p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
p5-Test-Exception>=0:devel/p5-Test-Exception
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-RT-Extension-LDAPImport/Makefile b/www/p5-RT-Extension-LDAPImport/Makefile
index 6068080e9ce3..eb37ea6746ab 100644
--- a/www/p5-RT-Extension-LDAPImport/Makefile
+++ b/www/p5-RT-Extension-LDAPImport/Makefile
@@ -14,9 +14,9 @@ COMMENT= RT extension to import users from an LDAP store
LICENSE_COMB= dual
LICENSE= ART10 GPLv1+
-BUILD_DEPENDS= p5-perl-ldap>0:net/p5-perl-ldap \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-perl-ldap>0:net/p5-perl-ldap \
p5-Class-Accessor>0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
@@ -41,7 +41,6 @@ RT_VER= ${opt:S/RT//}
### Temporary for debugging
#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
MAN3PREFIX= ${PREFIX}
diff --git a/www/p5-RT-Extension-SLA/Makefile b/www/p5-RT-Extension-SLA/Makefile
index 80d42d413fbe..8c14d8b62671 100644
--- a/www/p5-RT-Extension-SLA/Makefile
+++ b/www/p5-RT-Extension-SLA/Makefile
@@ -12,8 +12,8 @@ COMMENT= RT extension to automate due dates using service levels
LICENSE= GPLv2
-BUILD_DEPENDS= p5-Business-Hours>0:misc/p5-Business-Hours
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-Hours>0:misc/p5-Business-Hours
# SLA functionality comes as standard in RT 4.4.x
CONFLICTS_INSTALL= rt44-4.4.*
@@ -40,7 +40,6 @@ RT_VER= ${opt:S/RT//}
### Temporary for debugging
#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
PLIST_SUB+= RTHOME=share/rt${RT_VER}
diff --git a/www/p5-RTx-Calendar/Makefile b/www/p5-RTx-Calendar/Makefile
index e3ef53a55476..fbc8d000f315 100644
--- a/www/p5-RTx-Calendar/Makefile
+++ b/www/p5-RTx-Calendar/Makefile
@@ -13,10 +13,10 @@ COMMENT= Calendar extension module for the RT ticketing system
LICENSE_COMB= dual
LICENSE= ART10 GPLv1+
-BUILD_DEPENDS= p5-Date-ICal>0:devel/p5-Date-ICal \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-ICal>0:devel/p5-Date-ICal \
p5-Data-ICal>0:deskutils/p5-Data-ICal \
p5-DateTime-Set>0:devel/p5-DateTime-Set
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
@@ -38,7 +38,6 @@ RT_VER= ${opt:S/RT//}
.endif
.endfor
-BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
MAN3PREFIX= ${PREFIX}
diff --git a/www/p5-Reaction/Makefile b/www/p5-Reaction/Makefile
index d37643104515..8926a1ed11fb 100644
--- a/www/p5-Reaction/Makefile
+++ b/www/p5-Reaction/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Extended MVC framework built upon Catalyst
-BUILD_DEPENDS= p5-Catalyst-Component-ACCEPT_CONTEXT>=0.05:www/p5-Catalyst-Component-ACCEPT_CONTEXT \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-Component-ACCEPT_CONTEXT>=0.05:www/p5-Catalyst-Component-ACCEPT_CONTEXT \
p5-Catalyst-Component-InstancePerContext>=0.001001:www/p5-Catalyst-Component-InstancePerContext \
p5-Catalyst-Model-DBIC-Schema>=0.23:www/p5-Catalyst-Model-DBIC-Schema \
p5-Catalyst-Plugin-ConfigLoader>=0.23:www/p5-Catalyst-Plugin-ConfigLoader \
@@ -47,7 +48,6 @@ BUILD_DEPENDS= p5-Catalyst-Component-ACCEPT_CONTEXT>=0.05:www/p5-Catalyst-Compon
p5-aliased>=0.22:devel/p5-aliased \
p5-namespace-clean>=0.11:devel/p5-namespace-clean \
p5-signatures>=0.05:lang/p5-signatures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-SQL-Translator>=0.11002:databases/p5-SQL-Translator \
p5-Test-Class>=0.31:devel/p5-Test-Class \
p5-Test-Memory-Cycle>=1.04:devel/p5-Test-Memory-Cycle \
diff --git a/www/p5-Reddit-Client/Makefile b/www/p5-Reddit-Client/Makefile
index 281e6575c375..e75c550edc81 100644
--- a/www/p5-Reddit-Client/Makefile
+++ b/www/p5-Reddit-Client/Makefile
@@ -14,13 +14,13 @@ COMMENT= Methods and object wrappers for objects exposed by the Reddit API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-Capture>=0:devel/p5-IO-Capture \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-Capture>=0:devel/p5-IO-Capture \
p5-JSON>=2.53:converters/p5-JSON \
p5-URI-Encode>0:www/p5-URI-Encode \
p5-URI>0:net/p5-URI \
p5-libwww>0:www/p5-libwww \
p5-File-Path-Expand>=0:devel/p5-File-Path-Expand
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockModule>=0:devel/p5-Test-MockModule
USES= perl5
diff --git a/www/p5-Rose-HTML-Objects/Makefile b/www/p5-Rose-HTML-Objects/Makefile
index 39f146ecd10b..3a2f6f7863b3 100644
--- a/www/p5-Rose-HTML-Objects/Makefile
+++ b/www/p5-Rose-HTML-Objects/Makefile
@@ -13,7 +13,8 @@ COMMENT= Object-oriented interfaces for HTML
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Clone-PP>=0:devel/p5-Clone-PP \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Clone-PP>=0:devel/p5-Clone-PP \
p5-DateTime>=0.20:devel/p5-DateTime \
p5-Email-Valid>=0:mail/p5-Email-Valid \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Clone-PP>=0:devel/p5-Clone-PP \
p5-Rose-Object>=0.854:devel/p5-Rose-Object \
p5-Rose-URI>=0.021:net/p5-Rose-URI \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
PORTSCOUT= skipv:0.6061
diff --git a/www/p5-Router-Simple/Makefile b/www/p5-Router-Simple/Makefile
index b33c153c5947..68f7fd6ac999 100644
--- a/www/p5-Router-Simple/Makefile
+++ b/www/p5-Router-Simple/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple HTTP Router
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
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/www/p5-SRU/Makefile b/www/p5-SRU/Makefile
index d4e024400d4a..35ef0b01a627 100644
--- a/www/p5-SRU/Makefile
+++ b/www/p5-SRU/Makefile
@@ -15,13 +15,13 @@ COMMENT= Search and Retrieval by URL
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI-Application>=0:www/p5-CGI-Application \
p5-CQL-Parser>=1.12:textproc/p5-CQL-Parser \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-URI>=0:net/p5-URI \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-XML-Simple>=0:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/www/p5-Scrappy/Makefile b/www/p5-Scrappy/Makefile
index 7a80764d7fdd..c642dcf83245 100644
--- a/www/p5-Scrappy/Makefile
+++ b/www/p5-Scrappy/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= All Powerful Web Harvester, Spider, Scraper fully automated
-BUILD_DEPENDS= p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install \
p5-Array-Unique>=0:devel/p5-Array-Unique \
p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite \
@@ -29,7 +30,6 @@ BUILD_DEPENDS= p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-Web-Scraper>=0:www/p5-Web-Scraper \
p5-YAML-Syck>=0:textproc/p5-YAML-Syck
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:0.921111901
diff --git a/www/p5-Syntax-Highlight-HTML/Makefile b/www/p5-Syntax-Highlight-HTML/Makefile
index 497031010ce9..897c832596c2 100644
--- a/www/p5-Syntax-Highlight-HTML/Makefile
+++ b/www/p5-Syntax-Highlight-HTML/Makefile
@@ -14,8 +14,8 @@ COMMENT= Syntax::Highlight::HTML - Highlight HTML syntax
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/www/p5-Syntax-Highlight-Shell/Makefile b/www/p5-Syntax-Highlight-Shell/Makefile
index 8910de2dda52..1bbdaa4e13f9 100644
--- a/www/p5-Syntax-Highlight-Shell/Makefile
+++ b/www/p5-Syntax-Highlight-Shell/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Syntax::Highlight::Shell - Highlight shell scripts
-BUILD_DEPENDS= p5-Shell-Parser>=0:devel/p5-Shell-Parser
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Shell-Parser>=0:devel/p5-Shell-Parser
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Task-Catalyst/Makefile b/www/p5-Task-Catalyst/Makefile
index 55c7ef8380a3..88313bec885a 100644
--- a/www/p5-Task-Catalyst/Makefile
+++ b/www/p5-Task-Catalyst/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= All you need to start with Catalyst
-BUILD_DEPENDS= p5-Catalyst-ActionRole-ACL>=0:www/p5-Catalyst-ActionRole-ACL \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Catalyst-ActionRole-ACL>=0:www/p5-Catalyst-ActionRole-ACL \
p5-Catalyst-Action-REST>=0:www/p5-Catalyst-Action-REST \
p5-Catalyst-Authentication-Credential-HTTP>=0:www/p5-Catalyst-Authentication-Credential-HTTP \
p5-Catalyst-Authentication-Store-DBIx-Class>=0.106:www/p5-Catalyst-Authentication-Store-DBIx-Class \
@@ -39,7 +40,6 @@ BUILD_DEPENDS= p5-Catalyst-ActionRole-ACL>=0:www/p5-Catalyst-ActionRole-ACL \
p5-FCGI-ProcManager>=0:www/p5-FCGI-ProcManager \
p5-Starman>=0:www/p5-Starman \
p5-local-lib>=0:devel/p5-local-lib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Tatsumaki/Makefile b/www/p5-Tatsumaki/Makefile
index 7e513082cbfb..b9b9d2360ebb 100644
--- a/www/p5-Tatsumaki/Makefile
+++ b/www/p5-Tatsumaki/Makefile
@@ -15,7 +15,8 @@ COMMENT= Non-blocking web framework based on Plack and AnyEvent
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-AnyEvent>=0:devel/p5-AnyEvent \
p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
p5-JSON>=0:converters/p5-JSON \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-Text-MicroTemplate>=0:textproc/p5-Text-MicroTemplate \
p5-Try-Tiny>=0:lang/p5-Try-Tiny \
p5-Twiggy>=0:www/p5-Twiggy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-TCP>=0:devel/p5-Test-TCP
USES= perl5
diff --git a/www/p5-Template-GD/Makefile b/www/p5-Template-GD/Makefile
index 4714a2003a12..c84116808d1f 100644
--- a/www/p5-Template-GD/Makefile
+++ b/www/p5-Template-GD/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Template Toolkit plugin to interface with GD modules
-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/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile b/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile
index f8749ff25148..0113e936bdc0 100644
--- a/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile
+++ b/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile
@@ -14,9 +14,9 @@ COMMENT= Turns a Class-AlzaboWrapper-Cursor object into a TT2 iterator
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-AlzaboWrapper>=0:devel/p5-Class-AlzaboWrapper \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-AlzaboWrapper>=0:devel/p5-Class-AlzaboWrapper \
p5-Template-Toolkit>=2:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Template-Mustache/Makefile b/www/p5-Template-Mustache/Makefile
index c3f588a5d2af..40af9012f83d 100644
--- a/www/p5-Template-Mustache/Makefile
+++ b/www/p5-Template-Mustache/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kurt.lidl@cello.com
COMMENT= Perl version of the fabulous Mustache template language
-BUILD_DEPENDS= p5-YAML-Syck>=1.15:textproc/p5-YAML-Syck
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-YAML-Syck>=1.15:textproc/p5-YAML-Syck
TEST_DEPENDS:= p5-Test-Mini-Unit>=v1.0.3:devel/p5-Test-Mini-Unit
USES= perl5
diff --git a/www/p5-Template-Plugin-Class/Makefile b/www/p5-Template-Plugin-Class/Makefile
index 788c0eb6c552..626eda41db62 100644
--- a/www/p5-Template-Plugin-Class/Makefile
+++ b/www/p5-Template-Plugin-Class/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Allow calling of class methods on arbitrary classes
-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/www/p5-Template-Plugin-Clickable-Email/Makefile b/www/p5-Template-Plugin-Clickable-Email/Makefile
index 1557167bdb1a..d9b2d04ccc37 100644
--- a/www/p5-Template-Plugin-Clickable-Email/Makefile
+++ b/www/p5-Template-Plugin-Clickable-Email/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= TT plugin to make email addresses into HTML links
-BUILD_DEPENDS= p5-Email-Find>=0:mail/p5-Email-Find \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Email-Find>=0:mail/p5-Email-Find \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-Template-Plugin-Clickable/Makefile b/www/p5-Template-Plugin-Clickable/Makefile
index 46e5b627aaf4..3728edb3abfb 100644
--- a/www/p5-Template-Plugin-Clickable/Makefile
+++ b/www/p5-Template-Plugin-Clickable/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= TT plugin to make URLs clickable in HTML
-BUILD_DEPENDS= p5-URI-Find>=0.13:textproc/p5-URI-Find \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI-Find>=0.13:textproc/p5-URI-Find \
p5-Template-Toolkit>=2.07:www/p5-Template-Toolkit \
p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Template-Plugin-Comma/Makefile b/www/p5-Template-Plugin-Comma/Makefile
index a926e0ba3097..2df1c6b28e8c 100644
--- a/www/p5-Template-Plugin-Comma/Makefile
+++ b/www/p5-Template-Plugin-Comma/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= TT Plugin to commify numbers
-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/www/p5-Template-Plugin-FillInForm/Makefile b/www/p5-Template-Plugin-FillInForm/Makefile
index 44ac98642c71..ef1c949789ba 100644
--- a/www/p5-Template-Plugin-FillInForm/Makefile
+++ b/www/p5-Template-Plugin-FillInForm/Makefile
@@ -14,9 +14,9 @@ COMMENT= Template::Plugin::FillInForm - TT plugin for HTML::FillInForm
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Template-Plugin-JSON/Makefile b/www/p5-Template-Plugin-JSON/Makefile
index cd77097ecfe3..ba8cf615553d 100644
--- a/www/p5-Template-Plugin-JSON/Makefile
+++ b/www/p5-Template-Plugin-JSON/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Adds a .json vmethod for all TT values
-BUILD_DEPENDS= p5-JSON>=2.12:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2.12:converters/p5-JSON \
p5-Moose>0:devel/p5-Moose \
p5-Template-Toolkit>=2.20:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-Template-Plugin-JavaScript/Makefile b/www/p5-Template-Plugin-JavaScript/Makefile
index 5211d2073f09..0b907d767fe0 100644
--- a/www/p5-Template-Plugin-JavaScript/Makefile
+++ b/www/p5-Template-Plugin-JavaScript/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Encodes text to be safe in JavaScript
-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/www/p5-Template-Plugin-MP3/Makefile b/www/p5-Template-Plugin-MP3/Makefile
index fa4d825a58d2..de7ec6bdf51d 100644
--- a/www/p5-Template-Plugin-MP3/Makefile
+++ b/www/p5-Template-Plugin-MP3/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= TT Plugin that wraps around the MP3::Info 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-MP3-Info>=0:audio/p5-MP3-Info
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Template-Plugin-Markdown/Makefile b/www/p5-Template-Plugin-Markdown/Makefile
index 3f4817e38816..05483317bb64 100644
--- a/www/p5-Template-Plugin-Markdown/Makefile
+++ b/www/p5-Template-Plugin-Markdown/Makefile
@@ -14,9 +14,9 @@ COMMENT= TT plugin for Text::Markdown
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-Text-Markdown>=0:textproc/p5-Text-Markdown
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Template-Plugin-StripScripts/Makefile b/www/p5-Template-Plugin-StripScripts/Makefile
index b9abb33e2b4d..b082754f9133 100644
--- a/www/p5-Template-Plugin-StripScripts/Makefile
+++ b/www/p5-Template-Plugin-StripScripts/Makefile
@@ -13,9 +13,9 @@ COMMENT= TT plugin to filter HTML against XSS
LICENSE= MIT
-BUILD_DEPENDS= p5-HTML-StripScripts-Parser>=0.99:www/p5-HTML-StripScripts-Parser \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-StripScripts-Parser>=0.99:www/p5-HTML-StripScripts-Parser \
p5-Template-Toolkit>=0:www/p5-Template-Toolkit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
diff --git a/www/p5-Template-Plugin-Subst/Makefile b/www/p5-Template-Plugin-Subst/Makefile
index b0c74753469f..7db4e5c25296 100644
--- a/www/p5-Template-Plugin-Subst/Makefile
+++ b/www/p5-Template-Plugin-Subst/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= TT plugin for s/// functionality in templates
-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= modbuild
diff --git a/www/p5-Template-Provider-Encoding/Makefile b/www/p5-Template-Provider-Encoding/Makefile
index 1c99d474de4b..4fb71572e75a 100644
--- a/www/p5-Template-Provider-Encoding/Makefile
+++ b/www/p5-Template-Provider-Encoding/Makefile
@@ -14,8 +14,8 @@ COMMENT= Explicitly declare encodings of your templates
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-Template-Provider-FromDATA/Makefile b/www/p5-Template-Provider-FromDATA/Makefile
index 66a234d07003..5527139a580b 100644
--- a/www/p5-Template-Provider-FromDATA/Makefile
+++ b/www/p5-Template-Provider-FromDATA/Makefile
@@ -14,9 +14,9 @@ COMMENT= Load templates from your __DATA__ section
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Template-Toolkit>=2.15:www/p5-Template-Toolkit \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Template-Toolkit>=2.15:www/p5-Template-Toolkit \
p5-Class-Accessor>0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Template-Simple/Makefile b/www/p5-Template-Simple/Makefile
index 67a814c37b33..27ad22b65fba 100644
--- a/www/p5-Template-Simple/Makefile
+++ b/www/p5-Template-Simple/Makefile
@@ -13,8 +13,8 @@ COMMENT= Fast templating module
LICENSE= ART20
-BUILD_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Template-Timer/Makefile b/www/p5-Template-Timer/Makefile
index 934e3a255209..3d9ab7fdc958 100644
--- a/www/p5-Template-Timer/Makefile
+++ b/www/p5-Template-Timer/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Rudimentary profiling for Template Toolkit
-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/www/p5-Template-Toolkit-Simple/Makefile b/www/p5-Template-Toolkit-Simple/Makefile
index 3d6a8e4a80e1..4e5603de2600 100644
--- a/www/p5-Template-Toolkit-Simple/Makefile
+++ b/www/p5-Template-Toolkit-Simple/Makefile
@@ -13,8 +13,8 @@ COMMENT= Simple Interface to Template Toolkit
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index 8c8abb652101..cffcd6a7ff81 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -14,8 +14,8 @@ COMMENT= Extensive Toolkit for template processing
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-AppConfig>=1.56:devel/p5-AppConfig
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-AppConfig>=1.56:devel/p5-AppConfig
TEST_DEPENDS= p5-Image-Size>=0:graphics/p5-Image-Size \
p5-Pod-POM>=0:textproc/p5-Pod-POM
diff --git a/www/p5-Test-HTTP-Server-Simple/Makefile b/www/p5-Test-HTTP-Server-Simple/Makefile
index 65c1c47fb7d9..51bda6e39e28 100644
--- a/www/p5-Test-HTTP-Server-Simple/Makefile
+++ b/www/p5-Test-HTTP-Server-Simple/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Test::More functions for HTTP::Server::Simple
-BUILD_DEPENDS= p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
p5-URI>0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Test-HTTP/Makefile b/www/p5-Test-HTTP/Makefile
index 795904b81a6e..d07a5264e10c 100644
--- a/www/p5-Test-HTTP/Makefile
+++ b/www/p5-Test-HTTP/Makefile
@@ -14,9 +14,9 @@ COMMENT= Test HTTP interactions
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Class-Field>=0:devel/p5-Class-Field \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Field>=0:devel/p5-Class-Field \
p5-libwww>=5.827:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Test-LWP-UserAgent/Makefile b/www/p5-Test-LWP-UserAgent/Makefile
index 3b8b630ca7a3..94649adf8549 100644
--- a/www/p5-Test-LWP-UserAgent/Makefile
+++ b/www/p5-Test-LWP-UserAgent/Makefile
@@ -12,13 +12,13 @@ COMMENT= LWP::UserAgent suitable for simulating and testing network calls
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-URI>=0:net/p5-URI \
p5-namespace-clean>=0:devel/p5-namespace-clean \
p5-HTTP-Date>=0:www/p5-HTTP-Date \
p5-Safe-Isa>=0:devel/p5-Safe-Isa \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Plack>=0:www/p5-Plack \
p5-Path-Tiny>=0:devel/p5-Path-Tiny \
p5-Test-Deep>=0:devel/p5-Test-Deep \
diff --git a/www/p5-Test-Nginx/Makefile b/www/p5-Test-Nginx/Makefile
index d17910441aff..aea895171208 100644
--- a/www/p5-Test-Nginx/Makefile
+++ b/www/p5-Test-Nginx/Makefile
@@ -13,12 +13,12 @@ COMMENT= Testing modules for Nginx C module development
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Test-LongString>=0:devel/p5-Test-LongString \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Test-LongString>=0:devel/p5-Test-LongString \
p5-Test-Base>=0:devel/p5-Test-Base \
p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
p5-Text-Diff>=0:textproc/p5-Text-Diff \
p5-libwww>=6:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-TestGen4Web-Runner/Makefile b/www/p5-TestGen4Web-Runner/Makefile
index c25512c04914..5082304a105d 100644
--- a/www/p5-TestGen4Web-Runner/Makefile
+++ b/www/p5-TestGen4Web-Runner/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= eg@fbsd.lt
COMMENT= Perl module to replay files recorded with TestGen4Web
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-URI>=0:net/p5-URI \
p5-XML-Simple>=0:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
index 0b0917099869..a30291fdb55c 100644
--- a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
+++ b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Module for processing files with MultiMarkdown syntax for Apache
-BUILD_DEPENDS= p5-Text-MultiMarkdown>=0:textproc/p5-Text-MultiMarkdown \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Text-MultiMarkdown>=0:textproc/p5-Text-MultiMarkdown \
p5-Text-Typography>=0:textproc/p5-Text-Typography \
${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= apache:run,2.2+ perl5
USE_PERL5= configure
diff --git a/www/p5-Tie-TinyURL/Makefile b/www/p5-Tie-TinyURL/Makefile
index 03ade9c2a583..aa2e0397a571 100644
--- a/www/p5-Tie-TinyURL/Makefile
+++ b/www/p5-Tie-TinyURL/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Tied interface to TinyURL.com
-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/www/p5-Toader/Makefile b/www/p5-Toader/Makefile
index 05cc6119385e..7e42b60c0ed0 100644
--- a/www/p5-Toader/Makefile
+++ b/www/p5-Toader/Makefile
@@ -15,7 +15,8 @@ COMMENT= CMS meant to be used from the terminal and integrated into a VCS for re
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Config-Tiny>=2.14:devel/p5-Config-Tiny \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-Tiny>=2.14:devel/p5-Config-Tiny \
p5-Email-MIME>=1.911:mail/p5-Email-MIME \
p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
p5-Error-Helper>=1.0.0:devel/p5-Error-Helper \
@@ -29,7 +30,6 @@ BUILD_DEPENDS= p5-Config-Tiny>=2.14:devel/p5-Config-Tiny \
p5-Text-Tags>=0.04:textproc/p5-Text-Tags \
p5-Pod-WikiDoc>=0.18:textproc/p5-Pod-WikiDoc \
p5-Script-isAperlScript>=1.0.0:devel/p5-Script-isAperlScript
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS
diff --git a/www/p5-Toadfarm/Makefile b/www/p5-Toadfarm/Makefile
index 9b6a5a752510..fe4a582f79c9 100644
--- a/www/p5-Toadfarm/Makefile
+++ b/www/p5-Toadfarm/Makefile
@@ -13,9 +13,9 @@ COMMENT= One Mojolicious app to rule them all
LICENSE= ART20
-BUILD_DEPENDS= p5-File-Which>=1.00:sysutils/p5-File-Which \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Which>=1.00:sysutils/p5-File-Which \
p5-Mojolicious>=7.18:www/p5-Mojolicious
-RUN_DEPENDS:= ${BUILD_DEPENDS}
PORTSCOUT= skipv:0.0801,0.1001,0.1301,0.1601,0.1701,0.2601,0.2602,0.4301
diff --git a/www/p5-URI-Fetch/Makefile b/www/p5-URI-Fetch/Makefile
index 1c947e6f339d..464b2d492a5e 100644
--- a/www/p5-URI-Fetch/Makefile
+++ b/www/p5-URI-Fetch/Makefile
@@ -14,10 +14,10 @@ COMMENT= Smart URI fetching/caching
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-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-RequiresInternet>=0.05:devel/p5-Test-RequiresInternet
OPTIONS_DEFINE= CACHE
diff --git a/www/p5-URL-Encode/Makefile b/www/p5-URL-Encode/Makefile
index 0d79bc6f48c1..9eb79a9df754 100644
--- a/www/p5-URL-Encode/Makefile
+++ b/www/p5-URL-Encode/Makefile
@@ -14,11 +14,13 @@ COMMENT= Encoding and decoding of application/x-www-form-urlencoded encoding
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-OPTIONS_DEFINE= XS
-XS_BUILD_DEPENDS= p5-URL-Encode-XS>=0:www/p5-URL-Encode-XS
-XS_RUN_DEPENDS= ${XS_BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
USES= perl5
USE_PERL5= configure
+OPTIONS_DEFINE= XS
+
+XS_RUN_DEPENDS= p5-URL-Encode-XS>=0:www/p5-URL-Encode-XS
+
.include <bsd.port.mk>
diff --git a/www/p5-W3C-LinkChecker/Makefile b/www/p5-W3C-LinkChecker/Makefile
index f5eb5f8fa3e4..ef66ac303198 100644
--- a/www/p5-W3C-LinkChecker/Makefile
+++ b/www/p5-W3C-LinkChecker/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jadawin@FreeBSD.org
COMMENT= Checks the validity of links in an HTML or XHTML document
-BUILD_DEPENDS= p5-CSS-DOM>=0.09:www/p5-CSS-DOM \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CSS-DOM>=0.09:www/p5-CSS-DOM \
p5-Config-General>=0:devel/p5-Config-General \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-Net-IP>=0:net-mgmt/p5-Net-IP \
p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-W3C-LogValidator/Makefile b/www/p5-W3C-LogValidator/Makefile
index a0865e633187..dba2515fa199 100644
--- a/www/p5-W3C-LogValidator/Makefile
+++ b/www/p5-W3C-LogValidator/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= toni.viemero@iki.fi
COMMENT= Comprehensive validation tool for webmasters and web developers
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-URI>=0:net/p5-URI \
p5-Config-General>=0:devel/p5-Config-General \
p5-Mail-Sendmail>=0:mail/p5-Mail-Sendmail \
p5-WebService-Validator-CSS-W3C>=0:www/p5-webservice-validator-css-w3c \
p5-WebService-Validator-HTML-W3C>=0:www/p5-webservice-validator-html-w3c \
${LOCALBASE}/bin/checklink:www/p5-W3C-LinkChecker
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-AtMovies-TV/Makefile b/www/p5-WWW-AtMovies-TV/Makefile
index 75aceae94c30..17c941f62120 100644
--- a/www/p5-WWW-AtMovies-TV/Makefile
+++ b/www/p5-WWW-AtMovies-TV/Makefile
@@ -13,10 +13,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Retrieve TV information from http://www.atmovies.com.tw/
-BUILD_DEPENDS= p5-HTML-TableExtract>=2.1:www/p5-HTML-TableExtract \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-TableExtract>=2.1:www/p5-HTML-TableExtract \
p5-Moose>=0.55:devel/p5-Moose \
p5-WWW-Mechanize>=1.34:www/p5-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Babelfish/Makefile b/www/p5-WWW-Babelfish/Makefile
index 3f427a6cfc9b..39ff22dcfa7c 100644
--- a/www/p5-WWW-Babelfish/Makefile
+++ b/www/p5-WWW-Babelfish/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to obtain translations from the babelfish server
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-IO-String>=0:devel/p5-IO-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Baseball-NPB/Makefile b/www/p5-WWW-Baseball-NPB/Makefile
index 420e7dd8d702..936c493f7d6e 100644
--- a/www/p5-WWW-Baseball-NPB/Makefile
+++ b/www/p5-WWW-Baseball-NPB/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Fetches Japanese baseball games information
-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= configure
diff --git a/www/p5-WWW-Comic/Makefile b/www/p5-WWW-Comic/Makefile
index 6b4ca0275e1f..110a7991f05a 100644
--- a/www/p5-WWW-Comic/Makefile
+++ b/www/p5-WWW-Comic/Makefile
@@ -13,9 +13,9 @@ COMMENT= Retrieve comic strip images
LICENSE= APACHE20
-BUILD_DEPENDS= p5-WWW-Dilbert>=1.19:www/p5-WWW-Dilbert \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Dilbert>=1.19:www/p5-WWW-Dilbert \
p5-WWW-VenusEnvy>=1.10:www/p5-WWW-VenusEnvy
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-WWW-Contact/Makefile b/www/p5-WWW-Contact/Makefile
index 04f13b0391b6..e731faf0385f 100644
--- a/www/p5-WWW-Contact/Makefile
+++ b/www/p5-WWW-Contact/Makefile
@@ -15,7 +15,8 @@ COMMENT= Contact importer for all the major email systems
LICENSE= ART20 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
p5-HTML-TokeParser-Simple>=0:www/p5-HTML-TokeParser-Simple \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
@@ -26,7 +27,6 @@ BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-Text-vCard>=0:textproc/p5-Text-vCard \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-WWW-Mechanize-GZip>=0:www/p5-WWW-Mechanize-GZip
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-DHL/Makefile b/www/p5-WWW-DHL/Makefile
index e8fd2577d6d3..b615c4a3838f 100644
--- a/www/p5-WWW-DHL/Makefile
+++ b/www/p5-WWW-DHL/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl module for the DHL online tracking service
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-HTML-TokeParser-Simple>=0:www/p5-HTML-TokeParser-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Dilbert/Makefile b/www/p5-WWW-Dilbert/Makefile
index 3d7e69adde5e..ceaf438ba5b1 100644
--- a/www/p5-WWW-Dilbert/Makefile
+++ b/www/p5-WWW-Dilbert/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Dilbert of the day comic strip archive and retrieval module
-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/www/p5-WWW-Facebook-API/Makefile b/www/p5-WWW-Facebook-API/Makefile
index a16b367f23a9..9eda9f68637c 100644
--- a/www/p5-WWW-Facebook-API/Makefile
+++ b/www/p5-WWW-Facebook-API/Makefile
@@ -14,11 +14,11 @@ COMMENT= Facebook API implementation in Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-JSON-Any>=0:converters/p5-JSON-Any \
p5-Readonly>=0:devel/p5-Readonly \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-FreeProxy/Makefile b/www/p5-WWW-FreeProxy/Makefile
index 45e206eeeb9a..060dfba833d2 100644
--- a/www/p5-WWW-FreeProxy/Makefile
+++ b/www/p5-WWW-FreeProxy/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Fetch proxies from free proxy lists
-BUILD_DEPENDS= p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-YAML>=0:textproc/p5-YAML
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-GitHub-Gist/Makefile b/www/p5-WWW-GitHub-Gist/Makefile
index 489857ac0e31..0213208cc1fa 100644
--- a/www/p5-WWW-GitHub-Gist/Makefile
+++ b/www/p5-WWW-GitHub-Gist/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl interface to Gist
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON \
p5-Moo>=0:devel/p5-Moo
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Google-Calculator/Makefile b/www/p5-WWW-Google-Calculator/Makefile
index 372ef0f7a3a7..4bfccadd4d9e 100644
--- a/www/p5-WWW-Google-Calculator/Makefile
+++ b/www/p5-WWW-Google-Calculator/Makefile
@@ -14,11 +14,11 @@ COMMENT= This module provide simple interface for Google calculator
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-HTML-Parser>=0:www/p5-HTML-Parser \
p5-URI>=0:net/p5-URI \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Google-News-TW/Makefile b/www/p5-WWW-Google-News-TW/Makefile
index 281566a005c5..4644244153ef 100644
--- a/www/p5-WWW-Google-News-TW/Makefile
+++ b/www/p5-WWW-Google-News-TW/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Access to Google's Taiwan News Service (Not Usenet)
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-URI>=0:net/p5-URI \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Google-News/Makefile b/www/p5-WWW-Google-News/Makefile
index 1dd4aee3438d..45b9fb9e418c 100644
--- a/www/p5-WWW-Google-News/Makefile
+++ b/www/p5-WWW-Google-News/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Access to Google's News Service (Not Usenet)
-BUILD_DEPENDS= p5-URI>=0:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=0:net/p5-URI \
p5-XML-Atom>=0:textproc/p5-XML-Atom \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Google-PageRank/Makefile b/www/p5-WWW-Google-PageRank/Makefile
index 10df7e8cdb95..d73412bd5029 100644
--- a/www/p5-WWW-Google-PageRank/Makefile
+++ b/www/p5-WWW-Google-PageRank/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Perl interface for querying Google pagerank
-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}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Google-Video/Makefile b/www/p5-WWW-Google-Video/Makefile
index 88a121dc3ea2..e06f4057886d 100644
--- a/www/p5-WWW-Google-Video/Makefile
+++ b/www/p5-WWW-Google-Video/Makefile
@@ -14,8 +14,8 @@ COMMENT= Interface to fetch the Google Video Information
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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= configure
diff --git a/www/p5-WWW-HatenaDiary/Makefile b/www/p5-WWW-HatenaDiary/Makefile
index e25781ab0b49..aa662c369a07 100644
--- a/www/p5-WWW-HatenaDiary/Makefile
+++ b/www/p5-WWW-HatenaDiary/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= CRUD interface to Hatena::Diary
-BUILD_DEPENDS= p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
p5-URI>=0:net/p5-URI \
p5-WWW-HatenaLogin>=0.02:www/p5-WWW-HatenaLogin \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-Web-Scraper>=0:www/p5-Web-Scraper
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-HatenaLogin/Makefile b/www/p5-WWW-HatenaLogin/Makefile
index a6593bc302e5..af155ea688f5 100644
--- a/www/p5-WWW-HatenaLogin/Makefile
+++ b/www/p5-WWW-HatenaLogin/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= Login/Logout interface to Hatena
-BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-URI>=0:net/p5-URI \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-HatenaStar/Makefile b/www/p5-WWW-HatenaStar/Makefile
index e3a721efe695..eaccb17dddb2 100644
--- a/www/p5-WWW-HatenaStar/Makefile
+++ b/www/p5-WWW-HatenaStar/Makefile
@@ -14,12 +14,12 @@ COMMENT= Perl interface to Hatena::Star
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-YAML-Syck>=0:textproc/p5-YAML-Syck \
p5-URI>=0:net/p5-URI \
p5-WWW-HatenaLogin>=0:www/p5-WWW-HatenaLogin \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-WWW-Instapaper-Client/Makefile b/www/p5-WWW-Instapaper-Client/Makefile
index a7f7f8fc7eb7..8d49d56d5536 100644
--- a/www/p5-WWW-Instapaper-Client/Makefile
+++ b/www/p5-WWW-Instapaper-Client/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= Implementation of the Instapaper client API
-BUILD_DEPENDS= p5-Class-Base>=0:devel/p5-Class-Base \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Class-Base>=0:devel/p5-Class-Base \
p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-WWW-LongURL/Makefile b/www/p5-WWW-LongURL/Makefile
index 62b55cdef92a..cd079830c3ae 100644
--- a/www/p5-WWW-LongURL/Makefile
+++ b/www/p5-WWW-LongURL/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl interface to the LongURL API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON-Any>0:converters/p5-JSON-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-Any>0:converters/p5-JSON-Any \
p5-URI>0:net/p5-URI \
p5-Class-Accessor>0:devel/p5-Class-Accessor \
p5-libwww>0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-LWP-Online>0:www/p5-LWP-Online
diff --git a/www/p5-WWW-Mechanize-DecodedContent/Makefile b/www/p5-WWW-Mechanize-DecodedContent/Makefile
index 59bfb8959d4e..acb13e5e9fc0 100644
--- a/www/p5-WWW-Mechanize-DecodedContent/Makefile
+++ b/www/p5-WWW-Mechanize-DecodedContent/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
COMMENT= Decode Mech content using its HTTP response encoding
-BUILD_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-HTTP-Response-Encoding>=0:www/p5-HTTP-Response-Encoding
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Mechanize-FormFiller/Makefile b/www/p5-WWW-Mechanize-FormFiller/Makefile
index 0029ca18738d..0b11c7589bbf 100644
--- a/www/p5-WWW-Mechanize-FormFiller/Makefile
+++ b/www/p5-WWW-Mechanize-FormFiller/Makefile
@@ -13,11 +13,11 @@ COMMENT= Perl framework to automate HTML forms
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Random>=0.05:devel/p5-Data-Random \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Random>=0.05:devel/p5-Data-Random \
p5-HTML-Form>=1.038:www/p5-HTML-Form \
p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-WWW-Mechanize-GZip/Makefile b/www/p5-WWW-Mechanize-GZip/Makefile
index 10b7413b03e8..5953c12fa22b 100644
--- a/www/p5-WWW-Mechanize-GZip/Makefile
+++ b/www/p5-WWW-Mechanize-GZip/Makefile
@@ -13,8 +13,8 @@ COMMENT= Use WWW::Mechanize by requesting gzip-compression from the webserver
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Mechanize-PhantomJS/Makefile b/www/p5-WWW-Mechanize-PhantomJS/Makefile
index 239c949cbdeb..3e99ff461436 100644
--- a/www/p5-WWW-Mechanize-PhantomJS/Makefile
+++ b/www/p5-WWW-Mechanize-PhantomJS/Makefile
@@ -11,12 +11,12 @@ COMMENT= Automate interaction with javascript websites
LICENSE= ARTPERL10
-BUILD_DEPENDS= phantomjs:lang/phantomjs \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= phantomjs:lang/phantomjs \
p5-WWW-Mechanize>=1.73:www/p5-WWW-Mechanize \
p5-Object-Import>=1.004:devel/p5-Object-Import \
p5-Selenium-Remote-Driver>=0.2202:www/p5-Selenium-Remote-Driver \
p5-HTML-Selector-XPath>=0.14:www/p5-HTML-Selector-XPath
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-HTTP-Daemon>=6.0:www/p5-HTTP-Daemon \
p5-libwww>=5.829:www/p5-libwww
diff --git a/www/p5-WWW-Mechanize-Pluggable/Makefile b/www/p5-WWW-Mechanize-Pluggable/Makefile
index 0bf829edf0c0..1bd5572de59e 100644
--- a/www/p5-WWW-Mechanize-Pluggable/Makefile
+++ b/www/p5-WWW-Mechanize-Pluggable/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Custmomize WWW::Mechanize via plugins
-BUILD_DEPENDS= p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
p5-HTML-Form>=1.038:www/p5-HTML-Form \
p5-HTML-Parser>=2.28:www/p5-HTML-Parser \
p5-HTTP-Cookies>=0:www/p5-HTTP-Cookies \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
p5-URI>=1.25:net/p5-URI \
p5-WWW-Mechanize>=1.66:www/p5-WWW-Mechanize \
p5-libwww>=6:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0.2:devel/p5-Test-Exception
USES= perl5
diff --git a/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile b/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
index 8e4dcb5dadda..12e17acc7dbd 100644
--- a/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
+++ b/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Screen scraper for phpBB installations
-BUILD_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-WWW-Mechanize-Pluggable>=0.10:www/p5-WWW-Mechanize-Pluggable \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-Log-Log4perl>=1.0:devel/p5-Log-Log4perl \
p5-Class-Accessor>=0.19:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Mechanize-Shell/Makefile b/www/p5-WWW-Mechanize-Shell/Makefile
index 0c1ee0cc3330..52f7cf604af8 100644
--- a/www/p5-WWW-Mechanize-Shell/Makefile
+++ b/www/p5-WWW-Mechanize-Shell/Makefile
@@ -14,7 +14,8 @@ COMMENT= Interactive shell for www/p5-WWW-Mechanize
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTML-Display>=0:www/p5-HTML-Display \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-Display>=0:www/p5-HTML-Display \
p5-HTML-TokeParser-Simple>=2.0:www/p5-HTML-TokeParser-Simple \
p5-Hook-LexWrap>=0.20:devel/p5-Hook-LexWrap \
p5-Term-Shell>=0.02:devel/p5-Term-Shell \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-HTML-Display>=0:www/p5-HTML-Display \
p5-WWW-Mechanize>=1.20:www/p5-WWW-Mechanize \
p5-WWW-Mechanize-FormFiller>=0.05:www/p5-WWW-Mechanize-FormFiller \
p5-libwww>=5.69:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-CGI>=0:www/p5-CGI
OPTIONS_DEFINE= EXAMPLES
diff --git a/www/p5-WWW-Mechanize-SpamCop/Makefile b/www/p5-WWW-Mechanize-SpamCop/Makefile
index 985c034925e5..b916e74c35a3 100644
--- a/www/p5-WWW-Mechanize-SpamCop/Makefile
+++ b/www/p5-WWW-Mechanize-SpamCop/Makefile
@@ -14,8 +14,8 @@ COMMENT= SpamCop reporting automation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-WWW-Mechanize-TreeBuilder/Makefile b/www/p5-WWW-Mechanize-TreeBuilder/Makefile
index 8d596a1d3b1a..bb7ecd014255 100644
--- a/www/p5-WWW-Mechanize-TreeBuilder/Makefile
+++ b/www/p5-WWW-Mechanize-TreeBuilder/Makefile
@@ -13,10 +13,10 @@ COMMENT= Combine WWW::Mechanize and HTML::TreeBuilder
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-Moose>=2.1200:devel/p5-Moose
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Params-Util>0:devel/p5-Params-Util \
p5-Test-WWW-Mechanize>0:devel/p5-Test-WWW-Mechanize
diff --git a/www/p5-WWW-Mechanize/Makefile b/www/p5-WWW-Mechanize/Makefile
index 51e4be0b791e..9586c7d05526 100644
--- a/www/p5-WWW-Mechanize/Makefile
+++ b/www/p5-WWW-Mechanize/Makefile
@@ -13,14 +13,14 @@ COMMENT= This module is to help you automate interaction with a website
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-CGI>=4.08:www/p5-CGI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-CGI>=4.08:www/p5-CGI \
p5-HTML-Form>=6:www/p5-HTML-Form \
p5-HTML-Parser>=3.33:www/p5-HTML-Parser \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-HTTP-Server-Simple>=0.35:www/p5-HTTP-Server-Simple \
p5-URI>=0:net/p5-URI \
p5-libwww>=5.829:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \
diff --git a/www/p5-WWW-Mediawiki-Client/Makefile b/www/p5-WWW-Mediawiki-Client/Makefile
index 233456b00162..654d1e35e0ca 100644
--- a/www/p5-WWW-Mediawiki-Client/Makefile
+++ b/www/p5-WWW-Mediawiki-Client/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Very simple cvs-like interface for Mediawiki websites
-BUILD_DEPENDS= p5-VCS-Lite>0:devel/p5-VCS-Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-VCS-Lite>0:devel/p5-VCS-Lite \
p5-libwww>0:www/p5-libwww \
p5-HTML-Parser>0:www/p5-HTML-Parser \
p5-XML-LibXML>0:textproc/p5-XML-LibXML \
p5-URI>=1.31:net/p5-URI \
p5-Exception-Class>0:devel/p5-Exception-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>0:devel/p5-Test-Differences
USES= perl5
diff --git a/www/p5-WWW-Mixi/Makefile b/www/p5-WWW-Mixi/Makefile
index 9019ee486ac4..014528bd3e77 100644
--- a/www/p5-WWW-Mixi/Makefile
+++ b/www/p5-WWW-Mixi/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module of Automated interface to the Mixi
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
ja-p5-Jcode>=0:japanese/p5-Jcode
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Myspace/Makefile b/www/p5-WWW-Myspace/Makefile
index cfe7f4f7df06..1990b7722830 100644
--- a/www/p5-WWW-Myspace/Makefile
+++ b/www/p5-WWW-Myspace/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Access MySpace.com profile information from Perl
-BUILD_DEPENDS= p5-Config-General>=0:devel/p5-Config-General \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Config-General>=0:devel/p5-Config-General \
p5-Contextual-Return>=0:devel/p5-Contextual-Return \
p5-Params-Validate>=0:devel/p5-Params-Validate \
p5-Spiffy>=0.24:devel/p5-Spiffy \
@@ -20,7 +21,6 @@ BUILD_DEPENDS= p5-Config-General>=0:devel/p5-Config-General \
p5-WWW-Mechanize>=1.2:www/p5-WWW-Mechanize \
p5-YAML>=0.39:textproc/p5-YAML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-NicoVideo-Download/Makefile b/www/p5-WWW-NicoVideo-Download/Makefile
index b2f5ba6b934c..5de3b0d8b2a1 100644
--- a/www/p5-WWW-NicoVideo-Download/Makefile
+++ b/www/p5-WWW-NicoVideo-Download/Makefile
@@ -14,11 +14,11 @@ COMMENT= Download FLV/MP4/SWF files from nicovideo.jp
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-CGI-Simple>=0:www/p5-CGI-Simple \
p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-NioTV/Makefile b/www/p5-WWW-NioTV/Makefile
index ec030a617be8..5b2ee336c4d2 100644
--- a/www/p5-WWW-NioTV/Makefile
+++ b/www/p5-WWW-NioTV/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Retrieve TV information from http://www.niotv.com/
-BUILD_DEPENDS= p5-HTML-SimpleLinkExtor>=1.19:www/p5-HTML-SimpleLinkExtor \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTML-SimpleLinkExtor>=1.19:www/p5-HTML-SimpleLinkExtor \
p5-HTML-TableExtract>=2.1:www/p5-HTML-TableExtract \
p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
p5-Moose>=0.54:devel/p5-Moose \
p5-WWW-Mechanize>=1.34:www/p5-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-OpenSVN/Makefile b/www/p5-WWW-OpenSVN/Makefile
index adb99fa1bfec..5b26076aed16 100644
--- a/www/p5-WWW-OpenSVN/Makefile
+++ b/www/p5-WWW-OpenSVN/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Automated interface for OpenSVN.csie.org
-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/www/p5-WWW-OpenSearch/Makefile b/www/p5-WWW-OpenSearch/Makefile
index fcd3389bcc13..5f380718018c 100644
--- a/www/p5-WWW-OpenSearch/Makefile
+++ b/www/p5-WWW-OpenSearch/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Search A9 OpenSearch compatible engines
-BUILD_DEPENDS= p5-URI-Template>=0:net/p5-URI-Template \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI-Template>=0:net/p5-URI-Template \
p5-URI>=0:net/p5-URI \
p5-Data-Page>=2.00:databases/p5-Data-Page \
p5-XML-Feed>=0.08:textproc/p5-XML-Feed \
p5-libwww>=5.60:www/p5-libwww \
p5-XML-LibXML>=1.58:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile b/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
index 49907ee26fd3..8ef62688c727 100644
--- a/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
+++ b/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
@@ -12,9 +12,9 @@ COMMENT= Paste to http://pastebin.com from Perl
LICENSE= ART20
-BUILD_DEPENDS= p5-Moo>=1.004001:devel/p5-Moo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moo>=1.004001:devel/p5-Moo \
p5-WWW-Mechanize>=1.73:www/p5-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Robot/Makefile b/www/p5-WWW-Robot/Makefile
index 932df1925635..7d08972aedca 100644
--- a/www/p5-WWW-Robot/Makefile
+++ b/www/p5-WWW-Robot/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= WWW::Robot - configurable web traversal engine
-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-libwww>=0:www/p5-libwww \
p5-HTML-Tagset>=0:www/p5-HTML-Tagset
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-RobotRules/Makefile b/www/p5-WWW-RobotRules/Makefile
index c0f94d366f5e..9c58bd89137a 100644
--- a/www/p5-WWW-RobotRules/Makefile
+++ b/www/p5-WWW-RobotRules/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Database of robots.txt-derived permissions
-BUILD_DEPENDS= p5-URI>=1.10:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=1.10:net/p5-URI
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
diff --git a/www/p5-WWW-Salesforce/Makefile b/www/p5-WWW-Salesforce/Makefile
index dd305d089887..0358a490e1a6 100644
--- a/www/p5-WWW-Salesforce/Makefile
+++ b/www/p5-WWW-Salesforce/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple abstraction layer between SOAP::Lite and Salesforce.com
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-SOAP-Lite>=0.68:net/p5-SOAP-Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SOAP-Lite>=0.68:net/p5-SOAP-Lite \
p5-Crypt-SSLeay>=0.56:security/p5-Crypt-SSLeay
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=0:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
diff --git a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile
index 9c722d03553e..f1cb5967fd85 100644
--- a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile
+++ b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile
@@ -12,9 +12,9 @@ COMMENT= Search driver for the (US) Amazon online catalog
LICENSE= ART20
-BUILD_DEPENDS= p5-WWW-Mechanize>=1.60:www/p5-WWW-Mechanize \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Mechanize>=1.60:www/p5-WWW-Mechanize \
p5-WWW-Scraper-ISBN>=1:www/p5-WWW-Scraper-ISBN
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-JSON>=0:converters/p5-JSON
USES= perl5
diff --git a/www/p5-WWW-Search-AltaVista/Makefile b/www/p5-WWW-Search-AltaVista/Makefile
index 3faf3ea18fd8..0d3fee0107ff 100644
--- a/www/p5-WWW-Search-AltaVista/Makefile
+++ b/www/p5-WWW-Search-AltaVista/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl WWW::Search class for searching AltaVista
-BUILD_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-WWW-Search>=0:www/p5-WWW-Search
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Search-Google/Makefile b/www/p5-WWW-Search-Google/Makefile
index ed47c624e869..504d3aa0bb58 100644
--- a/www/p5-WWW-Search-Google/Makefile
+++ b/www/p5-WWW-Search-Google/Makefile
@@ -13,10 +13,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl WWW::Search class for searching Google
-BUILD_DEPENDS= p5-WWW-Search>=0:www/p5-WWW-Search \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Search>=0:www/p5-WWW-Search \
p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
p5-Net-Google>=0:net/p5-Net-Google
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Search-MSN/Makefile b/www/p5-WWW-Search-MSN/Makefile
index ac8310cd548f..191971e4d6e6 100644
--- a/www/p5-WWW-Search-MSN/Makefile
+++ b/www/p5-WWW-Search-MSN/Makefile
@@ -13,9 +13,9 @@ COMMENT= Backend for searching search.msn.com
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-WWW-Search>=0:www/p5-WWW-Search
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index 94653db09ea9..42d2610c398f 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -13,7 +13,8 @@ COMMENT= Perl5 module for WWW searches
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
p5-CGI>=0:www/p5-CGI \
p5-Date-Manip>=0:devel/p5-Date-Manip \
p5-File-Slurp>=0:devel/p5-File-Slurp \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Bit-Vector>=0:math/p5-Bit-Vector \
p5-URI>=0:net/p5-URI \
p5-User>=0:sysutils/p5-User \
p5-libwww>=2:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-IO-Capture>=0:devel/p5-IO-Capture \
p5-Test-File>=0:devel/p5-Test-File
diff --git a/www/p5-WWW-Shorten-0rz/Makefile b/www/p5-WWW-Shorten-0rz/Makefile
index edf721ce5850..96f4159c56c4 100644
--- a/www/p5-WWW-Shorten-0rz/Makefile
+++ b/www/p5-WWW-Shorten-0rz/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Shorten URL using 0rz.net
-BUILD_DEPENDS= p5-WWW-Shorten>=0:www/p5-WWW-Shorten \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Shorten>=0:www/p5-WWW-Shorten \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
diff --git a/www/p5-WWW-Shorten-Bitly/Makefile b/www/p5-WWW-Shorten-Bitly/Makefile
index 0ea2e9e3a52e..3e58b083a344 100644
--- a/www/p5-WWW-Shorten-Bitly/Makefile
+++ b/www/p5-WWW-Shorten-Bitly/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-File-HomeDir>=1.00:devel/p5-File-HomeDir \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-HomeDir>=1.00:devel/p5-File-HomeDir \
p5-JSON-MaybeXS>0:converters/p5-JSON-MaybeXS \
p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https \
p5-Path-Tiny>0:devel/p5-Path-Tiny \
p5-URI>=1.58:net/p5-URI \
p5-WWW-Shorten>=3.09:www/p5-WWW-Shorten
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Shorten-Googl/Makefile b/www/p5-WWW-Shorten-Googl/Makefile
index 860d744a0d17..45ad25867a06 100644
--- a/www/p5-WWW-Shorten-Googl/Makefile
+++ b/www/p5-WWW-Shorten-Googl/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= cowboyneal@gmail.com
COMMENT= Perl interface to goo.gl
-BUILD_DEPENDS= p5-WWW-Shorten>=1.98:www/p5-WWW-Shorten \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Shorten>=1.98:www/p5-WWW-Shorten \
p5-libwww>=5.75:www/p5-libwww \
p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
p5-JSON-Any>=0:converters/p5-JSON-Any
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Shorten-KUSO/Makefile b/www/p5-WWW-Shorten-KUSO/Makefile
index e70182e2f1b7..2d7a7dd76eff 100644
--- a/www/p5-WWW-Shorten-KUSO/Makefile
+++ b/www/p5-WWW-Shorten-KUSO/Makefile
@@ -14,8 +14,8 @@ COMMENT= Shorten URL using http://KUSO.CC/
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-WWW-Shorten>=0:www/p5-WWW-Shorten
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Shorten>=0:www/p5-WWW-Shorten
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Shorten-Yourls/Makefile b/www/p5-WWW-Shorten-Yourls/Makefile
index a258675a3a38..728bdcd42560 100644
--- a/www/p5-WWW-Shorten-Yourls/Makefile
+++ b/www/p5-WWW-Shorten-Yourls/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= beastie@tardisi.com
COMMENT= Perl interface to www/yourls, Your Own URL Shortener
-BUILD_DEPENDS= p5-JSON-Any>=1.18:converters/p5-JSON-Any \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-Any>=1.18:converters/p5-JSON-Any \
p5-WWW-Shorten>=1.9:www/p5-WWW-Shorten \
p5-XML-Simple>=2.18:textproc/p5-XML-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Shorten-isgd/Makefile b/www/p5-WWW-Shorten-isgd/Makefile
index 74934977d493..64b4135e76ac 100644
--- a/www/p5-WWW-Shorten-isgd/Makefile
+++ b/www/p5-WWW-Shorten-isgd/Makefile
@@ -14,8 +14,8 @@ COMMENT= Abstract interface to is.gd, one of URL shortening sites
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-WWW-Shorten>=1.97:www/p5-WWW-Shorten
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Shorten>=1.97:www/p5-WWW-Shorten
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Shorten/Makefile b/www/p5-WWW-Shorten/Makefile
index da458800ecc4..2e843d6c2ef0 100644
--- a/www/p5-WWW-Shorten/Makefile
+++ b/www/p5-WWW-Shorten/Makefile
@@ -13,9 +13,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-libwww>=5.835:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=5.835:www/p5-libwww \
p5-Try-Tiny>=0.24:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-WWW-SourceForge/Makefile b/www/p5-WWW-SourceForge/Makefile
index 859852b298e2..56c835a134c0 100644
--- a/www/p5-WWW-SourceForge/Makefile
+++ b/www/p5-WWW-SourceForge/Makefile
@@ -13,10 +13,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
COMMENT= Retrieve information from SourceForge site
-BUILD_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
p5-HTML-TableExtract>=0:www/p5-HTML-TableExtract \
p5-YAML>=0:textproc/p5-YAML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-Spinn3r/Makefile b/www/p5-WWW-Spinn3r/Makefile
index 283a91316bb7..2f54e7bc63c0 100644
--- a/www/p5-WWW-Spinn3r/Makefile
+++ b/www/p5-WWW-Spinn3r/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Interface to the Spinn3r API
-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>=0:devel/p5-DateTime \
p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
p5-URI>=0:net/p5-URI \
p5-XML-Twig>=0:textproc/p5-XML-Twig \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
USES= perl5
diff --git a/www/p5-WWW-TWSMS/Makefile b/www/p5-WWW-TWSMS/Makefile
index 66bcede24f34..944574a1199b 100644
--- a/www/p5-WWW-TWSMS/Makefile
+++ b/www/p5-WWW-TWSMS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= Perl interface for sending sms by TWSMS
-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= configure
diff --git a/www/p5-WWW-TinySong/Makefile b/www/p5-WWW-TinySong/Makefile
index be95f443968c..db46add1eaa5 100644
--- a/www/p5-WWW-TinySong/Makefile
+++ b/www/p5-WWW-TinySong/Makefile
@@ -14,9 +14,9 @@ COMMENT= Get free music links from tinysong.com
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-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-WWW-Tumblr/Makefile b/www/p5-WWW-Tumblr/Makefile
index 77f48e9a9601..11a249f2fae0 100644
--- a/www/p5-WWW-Tumblr/Makefile
+++ b/www/p5-WWW-Tumblr/Makefile
@@ -14,12 +14,12 @@ COMMENT= Perl interface for the Tumblr API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Message>0:www/p5-HTTP-Message \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Message>0:www/p5-HTTP-Message \
p5-JSON>0:converters/p5-JSON \
p5-Moose>0:devel/p5-Moose \
p5-Net-OAuth>0:net/p5-Net-OAuth \
p5-libwww>0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-VenusEnvy/Makefile b/www/p5-WWW-VenusEnvy/Makefile
index 84b0b24044be..2e4260abffa5 100644
--- a/www/p5-WWW-VenusEnvy/Makefile
+++ b/www/p5-WWW-VenusEnvy/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= VenusEnvy comic strip archive and retrieval module
-BUILD_DEPENDS= p5-libwww>=5.805:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=5.805:www/p5-libwww
USES= perl5
USE_PERL5= modbuild
diff --git a/www/p5-WWW-WebArchive/Makefile b/www/p5-WWW-WebArchive/Makefile
index 83deecd1e895..096835ee7719 100644
--- a/www/p5-WWW-WebArchive/Makefile
+++ b/www/p5-WWW-WebArchive/Makefile
@@ -14,10 +14,10 @@ COMMENT= Retrieve old versions of public web pages from various web archives
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-App-Options>=0:devel/p5-App-Options \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-App-Options>=0:devel/p5-App-Options \
p5-App-Trace>=0:devel/p5-App-Trace \
p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-WWW-Wikipedia/Makefile b/www/p5-WWW-Wikipedia/Makefile
index 7d71e4d0e514..934e8c3df027 100644
--- a/www/p5-WWW-Wikipedia/Makefile
+++ b/www/p5-WWW-Wikipedia/Makefile
@@ -14,10 +14,10 @@ COMMENT= Perl module of Automated interface to the Wikipedia
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
p5-Text-Autoformat>=0:textproc/p5-Text-Autoformat \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-WWW-iTunesConnect/Makefile b/www/p5-WWW-iTunesConnect/Makefile
index 9e92f006aa9e..8b1628a0e33a 100644
--- a/www/p5-WWW-iTunesConnect/Makefile
+++ b/www/p5-WWW-iTunesConnect/Makefile
@@ -12,11 +12,11 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= bfoz@bfoz.net
COMMENT= Client interface for Apple's iTunes Connect service
-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-libwww>=5.829:www/p5-libwww \
p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
p5-HTML-Form>=0:www/p5-HTML-Form
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Web-Query/Makefile b/www/p5-Web-Query/Makefile
index 78e52819036f..00f494b4e089 100644
--- a/www/p5-Web-Query/Makefile
+++ b/www/p5-Web-Query/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-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-Selector-XPath>=0.20:www/p5-HTML-Selector-XPath \
p5-HTML-TreeBuilder-LibXML>=0:www/p5-HTML-TreeBuilder-LibXML \
p5-HTML-TreeBuilder-XPath>=0:www/p5-HTML-TreeBuilder-XPath \
p5-Scalar-List-Utils>=1.44:lang/p5-Scalar-List-Utils \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
NO_ARCH= yes
diff --git a/www/p5-Web-Scraper/Makefile b/www/p5-Web-Scraper/Makefile
index 3c724ee41bdb..662088bb3da3 100644
--- a/www/p5-Web-Scraper/Makefile
+++ b/www/p5-Web-Scraper/Makefile
@@ -14,7 +14,8 @@ COMMENT= Web Scraping Toolkit inspired by Scrapi
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-HTML-Selector-XPath>=0.03:www/p5-HTML-Selector-XPath \
p5-HTML-Tagset>0:www/p5-HTML-Tagset \
p5-HTML-TreeBuilder-LibXML>=0.04:www/p5-HTML-TreeBuilder-LibXML \
@@ -25,7 +26,6 @@ BUILD_DEPENDS= p5-HTML-Parser>0:www/p5-HTML-Parser \
p5-XML-XPathEngine>=0.08:textproc/p5-XML-XPathEngine \
p5-YAML>0:textproc/p5-YAML \
p5-libwww>=5.827:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Base>=0:devel/p5-Test-Base \
p5-Test-Requires>=0:devel/p5-Test-Requires
diff --git a/www/p5-Web-Simple/Makefile b/www/p5-Web-Simple/Makefile
index f3bfc091b212..d491f25bab6e 100644
--- a/www/p5-Web-Simple/Makefile
+++ b/www/p5-Web-Simple/Makefile
@@ -13,12 +13,12 @@ COMMENT= Quick and easy way to build simple web applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-HTTP-Body>=1.22:www/p5-HTTP-Body \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-HTTP-Body>=1.22:www/p5-HTTP-Body \
p5-Moo>=0.009014:devel/p5-Moo \
p5-Plack>=0.9968:www/p5-Plack \
p5-Syntax-Keyword-Gather>=1.001000:devel/p5-Syntax-Keyword-Gather \
p5-strictures>=1:devel/p5-strictures
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Data-Dumper-Concise>=2.20:devel/p5-Data-Dumper-Concise
NO_ARCH= yes
diff --git a/www/p5-Web-oEmbed/Makefile b/www/p5-Web-oEmbed/Makefile
index 5b4fb0360068..8615f6bebb36 100644
--- a/www/p5-Web-oEmbed/Makefile
+++ b/www/p5-Web-oEmbed/Makefile
@@ -14,12 +14,12 @@ COMMENT= oEmbed consumer
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
p5-HTML-Tree>=0:www/p5-HTML-Tree \
p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-XML-LibXML-Simple>=0:textproc/p5-XML-LibXML-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/www/p5-WebDAO/Makefile b/www/p5-WebDAO/Makefile
index 7035fbfd0089..60601b7d6478 100644
--- a/www/p5-WebDAO/Makefile
+++ b/www/p5-WebDAO/Makefile
@@ -14,13 +14,13 @@ COMMENT= Platform for easy creation of web applications
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-DateTime>=0.37:devel/p5-DateTime \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-DateTime>=0.37:devel/p5-DateTime \
p5-DateTime-Format-HTTP>=0.37:devel/p5-DateTime-Format-HTTP \
p5-FCGI>=0.67:www/p5-FCGI \
p5-HTTP-Body>=1.11:www/p5-HTTP-Body \
p5-URI>=1.36:net/p5-URI \
p5-XML-Flow>=0.86:textproc/p5-XML-Flow
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Class>=0:devel/p5-Test-Class
NO_ARCH= yes
diff --git a/www/p5-WebService-Bloglines/Makefile b/www/p5-WebService-Bloglines/Makefile
index 5a1b323df550..5f17aab5bd63 100644
--- a/www/p5-WebService-Bloglines/Makefile
+++ b/www/p5-WebService-Bloglines/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Easy-to-use Interface for Bloglines Web Services
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-XML-RSS>=0:textproc/p5-XML-RSS \
p5-XML-RSS-LibXML>=0:textproc/p5-XML-RSS-LibXML \
p5-XML-XPath>=0:textproc/p5-XML-XPath
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WebService-GData/Makefile b/www/p5-WebService-GData/Makefile
index 1ae360876cf0..6a3813972381 100644
--- a/www/p5-WebService-GData/Makefile
+++ b/www/p5-WebService-GData/Makefile
@@ -16,9 +16,9 @@ COMMENT= Google data protocol v2 base object to inherit from
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2.0:converters/p5-JSON \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON>=2.0:converters/p5-JSON \
p5-libwww>0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Mock-LWP>=0.05:devel/p5-Test-Mock-LWP
USES= perl5
diff --git a/www/p5-WebService-Google-Reader/Makefile b/www/p5-WebService-Google-Reader/Makefile
index 9ebf06040dd9..59aeae470445 100644
--- a/www/p5-WebService-Google-Reader/Makefile
+++ b/www/p5-WebService-Google-Reader/Makefile
@@ -13,7 +13,8 @@ COMMENT= Perl interface to Google Reader
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON-XS>=2:converters/p5-JSON-XS \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-JSON-XS>=2:converters/p5-JSON-XS \
p5-URI>=1.36:net/p5-URI \
p5-libwww>=6.02:www/p5-libwww \
p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-JSON-XS>=2:converters/p5-JSON-XS \
p5-JSON>=2:converters/p5-JSON \
p5-XML-Atom>0:textproc/p5-XML-Atom \
p5-XML-LibXML>0:textproc/p5-XML-LibXML
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WebService-Google-Sets/Makefile b/www/p5-WebService-Google-Sets/Makefile
index a38af200ffdb..d619b4a854b8 100644
--- a/www/p5-WebService-Google-Sets/Makefile
+++ b/www/p5-WebService-Google-Sets/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl access to Google Labs Sets site
-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= configure
diff --git a/www/p5-WebService-IMDB/Makefile b/www/p5-WebService-IMDB/Makefile
index e140fd0a3dd4..bec8da7f28d6 100644
--- a/www/p5-WebService-IMDB/Makefile
+++ b/www/p5-WebService-IMDB/Makefile
@@ -14,7 +14,8 @@ COMMENT= Perl interface to IMDb
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-DateTime>=0:devel/p5-DateTime \
p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
@@ -22,7 +23,6 @@ BUILD_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
p5-JSON>=0:converters/p5-JSON \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WebService-ISBNDB/Makefile b/www/p5-WebService-ISBNDB/Makefile
index 3853b19c466b..d9005ce8f5b8 100644
--- a/www/p5-WebService-ISBNDB/Makefile
+++ b/www/p5-WebService-ISBNDB/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension to access isbndb.com
-BUILD_DEPENDS= p5-Business-ISBN>=1.80:misc/p5-Business-ISBN \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Business-ISBN>=1.80:misc/p5-Business-ISBN \
p5-Class-Std>=0.0.8:devel/p5-Class-Std \
p5-Error>=0.17:lang/p5-Error \
p5-libwww>=5.801:www/p5-libwww \
p5-XML-LibXML>=1.58:textproc/p5-XML-LibXML \
p5-TimeDate>=1.16:devel/p5-TimeDate
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/www/p5-WebService-Linode/Makefile b/www/p5-WebService-Linode/Makefile
index b2cb6a93def2..ea446cb2a72f 100644
--- a/www/p5-WebService-Linode/Makefile
+++ b/www/p5-WebService-Linode/Makefile
@@ -13,11 +13,11 @@ COMMENT= Perl Interface to the Linode.com API
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
p5-JSON>=0:converters/p5-JSON \
p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject
NO_ARCH= yes
diff --git a/www/p5-WebService-MoviePosterDB/Makefile b/www/p5-WebService-MoviePosterDB/Makefile
index fe83efa7ea15..508b541a84e4 100644
--- a/www/p5-WebService-MoviePosterDB/Makefile
+++ b/www/p5-WebService-MoviePosterDB/Makefile
@@ -14,12 +14,12 @@ COMMENT= Perl interface to MoviePosterDB
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-JSON>=0:converters/p5-JSON \
p5-URI>=0:net/p5-URI \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WebService-MusicBrainz/Makefile b/www/p5-WebService-MusicBrainz/Makefile
index 29b83e178f80..df2b1f294c67 100644
--- a/www/p5-WebService-MusicBrainz/Makefile
+++ b/www/p5-WebService-MusicBrainz/Makefile
@@ -13,12 +13,12 @@ COMMENT= Perl interface to MusicBrainz
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-URI>=0:net/p5-URI \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-libwww>=0:www/p5-libwww \
p5-Mojolicious>=7.13:www/p5-Mojolicious
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WebService-MusicBrainz0/Makefile b/www/p5-WebService-MusicBrainz0/Makefile
index aa9363174c3d..09990a83af5d 100644
--- a/www/p5-WebService-MusicBrainz0/Makefile
+++ b/www/p5-WebService-MusicBrainz0/Makefile
@@ -14,11 +14,11 @@ COMMENT= Perl interface to MusicBrainz
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-URI>=0:net/p5-URI \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WebService-NoPaste/Makefile b/www/p5-WebService-NoPaste/Makefile
index 2d48b7d11880..1de9c2776602 100644
--- a/www/p5-WebService-NoPaste/Makefile
+++ b/www/p5-WebService-NoPaste/Makefile
@@ -14,10 +14,10 @@ COMMENT= Pastebin web application to upload snippets of text
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-IO-All>=0:devel/p5-IO-All \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-All>=0:devel/p5-IO-All \
p5-Spiffy>=0:devel/p5-Spiffy \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= X11
X11_DESC= X11 Clipboard support
diff --git a/www/p5-WebService-Rakuten/Makefile b/www/p5-WebService-Rakuten/Makefile
index 751b728cc6c1..3701e0929401 100644
--- a/www/p5-WebService-Rakuten/Makefile
+++ b/www/p5-WebService-Rakuten/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Rakuten WebService API
-BUILD_DEPENDS= ja-p5-Unicode-Japanese>=0:japanese/p5-Unicode-Japanese \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ja-p5-Unicode-Japanese>=0:japanese/p5-Unicode-Japanese \
p5-JSON>=0:converters/p5-JSON \
p5-Readonly>=0:devel/p5-Readonly \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-BUILD_DEPENDS+= p5-Test-Exception>=0:devel/p5-Test-Exception
+TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WebService-Simple/Makefile b/www/p5-WebService-Simple/Makefile
index 199ecabbeb9a..ab1680b77e4e 100644
--- a/www/p5-WebService-Simple/Makefile
+++ b/www/p5-WebService-Simple/Makefile
@@ -13,7 +13,8 @@ COMMENT= Simple Interface To Web Services APIs
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-ConfigHash>=0:devel/p5-Class-Data-ConfigHash \
p5-Class-Inspector>=0:devel/p5-Class-Inspector \
p5-Hash-MultiValue>=0:devel/p5-Hash-MultiValue \
@@ -24,7 +25,6 @@ BUILD_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-XML-Feed>=0:textproc/p5-XML-Feed \
p5-XML-Parser-Lite-Tree>=0:textproc/p5-XML-Parser-Lite-Tree
diff --git a/www/p5-WebService-Technorati/Makefile b/www/p5-WebService-Technorati/Makefile
index 27a8b257e5a8..63029c9b7457 100644
--- a/www/p5-WebService-Technorati/Makefile
+++ b/www/p5-WebService-Technorati/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to the Technorati web services interface
-BUILD_DEPENDS= p5-XML-XPath>=0:textproc/p5-XML-XPath \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-XML-XPath>=0:textproc/p5-XML-XPath \
p5-Exception-Class>=0:devel/p5-Exception-Class \
p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
SHEBANG_FILES= pod2html.pl
diff --git a/www/p5-WordPress-XMLRPC/Makefile b/www/p5-WordPress-XMLRPC/Makefile
index bc63395f97f7..cfe154dc3c57 100644
--- a/www/p5-WordPress-XMLRPC/Makefile
+++ b/www/p5-WordPress-XMLRPC/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl 5 API to WordPress XML-RPC services
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
p5-XMLRPC-Lite>=0:net/p5-XMLRPC-Lite
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Smart-Comments>=0:devel/p5-Smart-Comments \
p5-YAML>=0:textproc/p5-YAML
diff --git a/www/p5-Yahoo-Search/Makefile b/www/p5-Yahoo-Search/Makefile
index a33f0a427041..0ff75c9a4850 100644
--- a/www/p5-Yahoo-Search/Makefile
+++ b/www/p5-Yahoo-Search/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to the Yahoo Search public API
-BUILD_DEPENDS= p5-URI>=1.54:net/p5-URI \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-URI>=1.54:net/p5-URI \
p5-libwww>=5.835:www/p5-libwww
-RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Simple>=0.88:devel/p5-Test-Simple
USES= perl5
diff --git a/www/p5-chklinks/Makefile b/www/p5-chklinks/Makefile
index c8f665bc5f66..1284771677bd 100644
--- a/www/p5-chklinks/Makefile
+++ b/www/p5-chklinks/Makefile
@@ -14,10 +14,10 @@ COMMENT= Non-threaded Perl link checker
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-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 \
p5-URI>=0:net/p5-URI
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-libservlet/Makefile b/www/p5-libservlet/Makefile
index c3ee4f5dff5a..fefa5f089b8c 100644
--- a/www/p5-libservlet/Makefile
+++ b/www/p5-libservlet/Makefile
@@ -14,8 +14,8 @@ COMMENT= Servlet API for Perl
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Exception-Class>=0:devel/p5-Exception-Class
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Exception-Class>=0:devel/p5-Exception-Class
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-webservice-validator-css-w3c/Makefile b/www/p5-webservice-validator-css-w3c/Makefile
index d4e990d047a1..d76dd835fb77 100644
--- a/www/p5-webservice-validator-css-w3c/Makefile
+++ b/www/p5-webservice-validator-css-w3c/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= toni.viemero@iki.fi
COMMENT= Experimental interface to the W3C CSS Validation online service
-BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-URI>=0:net/p5-URI \
p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
p5-Class-Accessor>=0:devel/p5-Class-Accessor
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/x11-fonts/p5-Font-TTF/Makefile b/x11-fonts/p5-Font-TTF/Makefile
index 61f17c499e8c..df6bd5315af4 100644
--- a/x11-fonts/p5-Font-TTF/Makefile
+++ b/x11-fonts/p5-Font-TTF/Makefile
@@ -11,8 +11,8 @@ COMMENT= Perl module for TrueType font hacking
LICENSE= ART20
-BUILD_DEPENDS= p5-IO-String>=0:devel/p5-IO-String
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-String>=0:devel/p5-IO-String
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Alien-wxWidgets/Makefile b/x11-toolkits/p5-Alien-wxWidgets/Makefile
index 1ce8dafb235c..1dbbf538b252 100644
--- a/x11-toolkits/p5-Alien-wxWidgets/Makefile
+++ b/x11-toolkits/p5-Alien-wxWidgets/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl5 module for building, finding and using wxWidgets binaries
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
NO_ARCH= yes
USES= perl5 compiler:env
diff --git a/x11-toolkits/p5-Gtk2-Chmod/Makefile b/x11-toolkits/p5-Gtk2-Chmod/Makefile
index cc9e87687860..7096dead6fb3 100644
--- a/x11-toolkits/p5-Gtk2-Chmod/Makefile
+++ b/x11-toolkits/p5-Gtk2-Chmod/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= vvelox@vvelox.net
COMMENT= Provides a dialog for getting values to use with chmod
-BUILD_DEPENDS= p5-File-Stat-Bits>=0:sysutils/p5-File-Stat-Bits \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Stat-Bits>=0:sysutils/p5-File-Stat-Bits \
p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile b/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
index 5307cb099899..a3cf3ae019f6 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
@@ -13,9 +13,9 @@ COMMENT= Useful tools for Gnome2/Gtk2 Perl GUI design
LICENSE= LGPL21
-BUILD_DEPENDS= p5-File-Type>=0:devel/p5-File-Type \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-File-Type>=0:devel/p5-File-Type \
p5-Gtk2-Ex-Utils>=0:x11-toolkits/p5-Gtk2-Ex-Utils
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
index 7e348971c1ca..2041018198c5 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
@@ -14,12 +14,12 @@ COMMENT= Displays plain old documentation
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
p5-IO-stringy>=0:devel/p5-IO-stringy \
p5-Locale-gettext>=0:devel/p5-Locale-gettext \
p5-Gtk2-Ex-Simple-List>=0.50:x11-toolkits/p5-Gtk2-Ex-Simple-List \
p5-Pod-Simple>=0:textproc/p5-Pod-Simple
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
index ab09910c3182..b1084bbb0d01 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
@@ -14,9 +14,9 @@ COMMENT= Simple interface to complex MVC list widget
LICENSE= LGPL21 LGPL3
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Glib2>=1.00:devel/p5-Glib2 \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Glib2>=1.00:devel/p5-Glib2 \
p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Gtk2-ImageView/Makefile b/x11-toolkits/p5-Gtk2-ImageView/Makefile
index 58a44058c21b..47682eb6a1a1 100644
--- a/x11-toolkits/p5-Gtk2-ImageView/Makefile
+++ b/x11-toolkits/p5-Gtk2-ImageView/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl bindings to the GtkImageView image viewer widget
-BUILD_DEPENDS= p5-Cairo>=0:graphics/p5-Cairo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cairo>=0:graphics/p5-Cairo \
p5-ExtUtils-Depends>=0.2:devel/p5-ExtUtils-Depends \
p5-ExtUtils-PkgConfig>=1.03:devel/p5-ExtUtils-PkgConfig \
p5-Gtk2>=1.140:x11-toolkits/p5-Gtk2
LIB_DEPENDS= libgtkimageview.so:x11-toolkits/gtkimageview
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
index 57e4422d78f5..bef0ca05ed65 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to the EggTrayIcon library
-BUILD_DEPENDS= p5-Cairo>=0:graphics/p5-Cairo \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cairo>=0:graphics/p5-Cairo \
p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
p5-Gtk2>=0:x11-toolkits/p5-Gtk2
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Gtk3/Makefile b/x11-toolkits/p5-Gtk3/Makefile
index 4407f64275cc..1a351a006700 100644
--- a/x11-toolkits/p5-Gtk3/Makefile
+++ b/x11-toolkits/p5-Gtk3/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl module for Gtk+ 3.x graphical user interface library
LICENSE= LGPL21+
LICENSE_FILE_LGPL21= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Cairo-GObject>=1:devel/p5-Cairo-GObject \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Cairo-GObject>=1:devel/p5-Cairo-GObject \
p5-Glib-Object-Introspection>=0.016:devel/p5-Glib-Object-Introspection
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/x11-toolkits/p5-Tk-Action/Makefile b/x11-toolkits/p5-Tk-Action/Makefile
index 00498708cc30..91c9d97b1863 100644
--- a/x11-toolkits/p5-Tk-Action/Makefile
+++ b/x11-toolkits/p5-Tk-Action/Makefile
@@ -14,11 +14,11 @@ COMMENT= Action abstraction for Tk
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moose>=0.92:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.92:devel/p5-Moose \
p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar \
p5-MooseX-SemiAffordanceAccessor>=0:devel/p5-MooseX-SemiAffordanceAccessor \
p5-Tk-Sugar>=0:x11-toolkits/p5-Tk-Sugar
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile
index 59c5872021ea..3546982a0d92 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/Makefile
+++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Tk::Autoscroll - space invaders-like scrolling
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile
index 2e9a2a44265c..f1f6929db3d5 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/Makefile
+++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl/Tk module providing a Colour selection dialogue box
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-Contrib/Makefile b/x11-toolkits/p5-Tk-Contrib/Makefile
index 0a363f355f95..cc81860a3d4d 100644
--- a/x11-toolkits/p5-Tk-Contrib/Makefile
+++ b/x11-toolkits/p5-Tk-Contrib/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Contributed Tk widgets
-BUILD_DEPENDS= p5-Tk>=804:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=804:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-CursorControl/Makefile b/x11-toolkits/p5-Tk-CursorControl/Makefile
index c946d467ac11..cf3015f776f5 100644
--- a/x11-toolkits/p5-Tk-CursorControl/Makefile
+++ b/x11-toolkits/p5-Tk-CursorControl/Makefile
@@ -14,8 +14,8 @@ COMMENT= Manipulate the mouse cursor programmatically
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tk>=800.015:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=800.015:x11-toolkits/p5-Tk
ALL_TARGETS= pure_install
NO_ARCH= yes
diff --git a/x11-toolkits/p5-Tk-DKW/Makefile b/x11-toolkits/p5-Tk-DKW/Makefile
index 51a9fe66e0d8..dfb27094062a 100644
--- a/x11-toolkits/p5-Tk-DKW/Makefile
+++ b/x11-toolkits/p5-Tk-DKW/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Collection of Tk widgets
-BUILD_DEPENDS= p5-Tk>=804:x11-toolkits/p5-Tk \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=804:x11-toolkits/p5-Tk \
p5-Tk-Contrib>=0.07:x11-toolkits/p5-Tk-Contrib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile
index 22fdf74b499e..81481dfbf5c8 100644
--- a/x11-toolkits/p5-Tk-Date/Makefile
+++ b/x11-toolkits/p5-Tk-Date/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Tk::Date - a date/time widget for perl/Tk
-BUILD_DEPENDS= p5-Tk-GBARR>=0:x11-toolkits/p5-Tk-GBARR
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk-GBARR>=0:x11-toolkits/p5-Tk-GBARR
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
index 4fa7272bd2cb..1cf9a8ce3f79 100644
--- a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
+++ b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= NoteBook widget with orientable, dynamically stacking tabs
-BUILD_DEPENDS= p5-Tk>=804.027:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=804.027:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile
index 2d69f258db5e..a7030fb1f276 100644
--- a/x11-toolkits/p5-Tk-Enscript/Makefile
+++ b/x11-toolkits/p5-Tk-Enscript/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Tk::Enscript - a text-to-postscript converter using Tk::Canvas
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile
index d7a0f8dfa595..1485ec124dd9 100644
--- a/x11-toolkits/p5-Tk-FileDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FileDialog/Makefile
@@ -14,8 +14,8 @@ COMMENT= Tk::FileDialog - A file selector dialog for perl/Tk
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-FontDialog/Makefile b/x11-toolkits/p5-Tk-FontDialog/Makefile
index 65c4659cee92..cad251fb69f4 100644
--- a/x11-toolkits/p5-Tk-FontDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FontDialog/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= pi@FreeBSD.org
COMMENT= Font dialog widget
-BUILD_DEPENDS= p5-Tk>=804:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=804:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index ff2e6fd2ef10..d16c994965b3 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Some collection of Tk Widgets
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index f0d177fe5004..11964813b03f 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -13,9 +13,9 @@ COMMENT= User configuration window for Tk with interface to Getopt::Long
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tk>=804:x11-toolkits/p5-Tk \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=804:x11-toolkits/p5-Tk \
p5-Tk-FontDialog>=0:x11-toolkits/p5-Tk-FontDialog
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile
index 44579f48c37d..1f8ae666bbd9 100644
--- a/x11-toolkits/p5-Tk-HistEntry/Makefile
+++ b/x11-toolkits/p5-Tk-HistEntry/Makefile
@@ -13,8 +13,8 @@ COMMENT= Tk::HistEntry - Entry widget with history capability
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
NO_ARCH= yes
USES= perl5
diff --git a/x11-toolkits/p5-Tk-JComboBox/Makefile b/x11-toolkits/p5-Tk-JComboBox/Makefile
index 4609717973b7..1acb4b5f9dc1 100644
--- a/x11-toolkits/p5-Tk-JComboBox/Makefile
+++ b/x11-toolkits/p5-Tk-JComboBox/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Contains a Label or Entry, a Button, and a Listbox
-BUILD_DEPENDS= p5-Tk>=804.027:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=804.027:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-ResizeButton/Makefile b/x11-toolkits/p5-Tk-ResizeButton/Makefile
index 57689cccc2c6..7759dcdbeb77 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/Makefile
+++ b/x11-toolkits/p5-Tk-ResizeButton/Makefile
@@ -14,8 +14,8 @@ COMMENT= Resizable button to be used in a Tk::HList column header
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-Role-Dialog/Makefile b/x11-toolkits/p5-Tk-Role-Dialog/Makefile
index c01eac5a2905..dca701d34be5 100644
--- a/x11-toolkits/p5-Tk-Role-Dialog/Makefile
+++ b/x11-toolkits/p5-Tk-Role-Dialog/Makefile
@@ -14,13 +14,13 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0.92:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.92:devel/p5-Moose \
p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar \
p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
p5-Tk>=0:x11-toolkits/p5-Tk \
p5-Tk-Role-HasWidgets>=${PORTVERSION}:x11-toolkits/p5-Tk-Role-HasWidgets \
p5-Tk-Sugar>=0:x11-toolkits/p5-Tk-Sugar
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile b/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile
index caccc71cf64f..3bd27d6dd1ae 100644
--- a/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile
+++ b/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile
@@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-Moose>=0.92:devel/p5-Moose \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Moose>=0.92:devel/p5-Moose \
p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USE_PERL5= modbuild
diff --git a/x11-toolkits/p5-Tk-Splashscreen/Makefile b/x11-toolkits/p5-Tk-Splashscreen/Makefile
index 041a925b88eb..2bed2dd5a2a9 100644
--- a/x11-toolkits/p5-Tk-Splashscreen/Makefile
+++ b/x11-toolkits/p5-Tk-Splashscreen/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Tk::Splashscreen, display a Splashscreen during program initialization
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-Sugar/Makefile b/x11-toolkits/p5-Tk-Sugar/Makefile
index 7e2cdb290ff0..a232dc1a52ba 100644
--- a/x11-toolkits/p5-Tk-Sugar/Makefile
+++ b/x11-toolkits/p5-Tk-Sugar/Makefile
@@ -14,8 +14,8 @@ COMMENT= Sugar syntax for Tk
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-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
NO_ARCH= yes
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile
index 0b0c559d4a13..2f764ebcef09 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/Makefile
+++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Table/matrix extension to perl/tk for displaying table formatted data
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Tk-ToolBar/Makefile b/x11-toolkits/p5-Tk-ToolBar/Makefile
index 349393bd7662..acb106f13d7b 100644
--- a/x11-toolkits/p5-Tk-ToolBar/Makefile
+++ b/x11-toolkits/p5-Tk-ToolBar/Makefile
@@ -13,8 +13,8 @@ COMMENT= Toolbar widget for Perl/Tk
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
TEST_DEPENDS= p5-Test-Pod>=1.14:devel/p5-Test-Pod
NO_ARCH= yes
diff --git a/x11-toolkits/p5-Tk-WaitBox/Makefile b/x11-toolkits/p5-Tk-WaitBox/Makefile
index 8da8eddcf8ea..110008b5eccd 100644
--- a/x11-toolkits/p5-Tk-WaitBox/Makefile
+++ b/x11-toolkits/p5-Tk-WaitBox/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Wait Dialog for Perl/Tk
-BUILD_DEPENDS= p5-Tk>=804.027:x11-toolkits/p5-Tk
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Tk>=804.027:x11-toolkits/p5-Tk
USES= perl5
USE_PERL5= configure
diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile
index 83ec75988cd9..580ea62ad7fa 100644
--- a/x11-toolkits/p5-Wx/Makefile
+++ b/x11-toolkits/p5-Wx/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl5 interface to the wxWidgets cross-platform GUI toolkit
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-ExtUtils-XSpp>=0.16.03:devel/p5-ExtUtils-XSpp \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-ExtUtils-XSpp>=0.16.03:devel/p5-ExtUtils-XSpp \
p5-Alien-wxWidgets>=0.25:x11-toolkits/p5-Alien-wxWidgets
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= compiler:c++11-lib perl5
USE_CXXSTD= c++11
diff --git a/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile
index ca2935b04585..537cb295ddf4 100644
--- a/x11/p5-X11-IdleTime/Makefile
+++ b/x11/p5-X11-IdleTime/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl module that reports number of seconds that X11 has been idle
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Inline>=0.44:devel/p5-Inline \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Inline>=0.44:devel/p5-Inline \
p5-Inline-C>=0.44:devel/p5-Inline-C
-RUN_DEPENDS:= ${BUILD_DEPENDS}
MAKE_JOBS_UNSAFE= yes
USES= perl5
diff --git a/x11/p5-X11-Protocol-Other/Makefile b/x11/p5-X11-Protocol-Other/Makefile
index d2bb7c2e5286..9e4973e25846 100644
--- a/x11/p5-X11-Protocol-Other/Makefile
+++ b/x11/p5-X11-Protocol-Other/Makefile
@@ -13,8 +13,8 @@ COMMENT= Module for window manager related functions for use by client programs
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= p5-X11-Protocol>=0:x11/p5-X11-Protocol
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-X11-Protocol>=0:x11/p5-X11-Protocol
USES= perl5 shebangfix
USE_PERL5= configure
diff --git a/x11/p5-X11-XCB/Makefile b/x11/p5-X11-XCB/Makefile
index 48913f8b7dc0..96f4926ddebe 100644
--- a/x11/p5-X11-XCB/Makefile
+++ b/x11/p5-X11-XCB/Makefile
@@ -16,7 +16,8 @@ LICENSE_COMB= dual
LIB_DEPENDS= libxcb.so:x11/libxcb \
libxcb-util.so:x11/xcb-util \
libxcb-icccm.so:x11/xcb-util-wm
-BUILD_DEPENDS= \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= \
${LOCALBASE}/share/xcb/xcb.xsd:x11/xcb-proto \
p5-Data-Dump>=0:devel/p5-Data-Dump \
p5-Mouse>=0:devel/p5-Mouse \
@@ -29,7 +30,6 @@ BUILD_DEPENDS= \
p5-XML-Descent>=0:textproc/p5-XML-Descent \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-XS-Object-Magic>=0:devel/p5-XS-Object-Magic
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= localbase perl5
USE_PERL5= configure
diff --git a/x11/p5-X11-Xlib/Makefile b/x11/p5-X11-Xlib/Makefile
index b8482849bb63..67fd9de911d0 100644
--- a/x11/p5-X11-Xlib/Makefile
+++ b/x11/p5-X11-Xlib/Makefile
@@ -13,11 +13,11 @@ COMMENT= Low-level access to the X11 library
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib \
p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_XORG= x11 xcomposite xext xfixes xinerama xorgproto xrender xtst
diff --git a/x11/p5-XTerm-Conf/Makefile b/x11/p5-XTerm-Conf/Makefile
index 93f653e37595..fbd369e3f398 100644
--- a/x11/p5-XTerm-Conf/Makefile
+++ b/x11/p5-XTerm-Conf/Makefile
@@ -13,8 +13,8 @@ COMMENT= Perl module that changes configuration of a running xterm
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Term-ReadKey>=2.32:devel/p5-Term-ReadKey
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Term-ReadKey>=2.32:devel/p5-Term-ReadKey
USES= perl5
USE_PERL5= configure