aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorKoop Mast <kwm@rainbow-runner.nl>2018-10-09 05:37:56 +0800
committerKoop Mast <kwm@rainbow-runner.nl>2018-10-09 05:37:56 +0800
commit60f6f1305b950f42a9a0ef44648a5be1b35a3b7f (patch)
tree39b2fafe80cfeb5bd950f0a32ad9b55afd1426e7 /www
parentdcf9fee87c9b0d628187099169a069ab0b9741c0 (diff)
parentc548260f83d8334108363016fc0f22e56c1cfe17 (diff)
downloadfreebsd-ports-gnome-60f6f1305b950f42a9a0ef44648a5be1b35a3b7f.tar.gz
freebsd-ports-gnome-60f6f1305b950f42a9a0ef44648a5be1b35a3b7f.tar.zst
freebsd-ports-gnome-60f6f1305b950f42a9a0ef44648a5be1b35a3b7f.zip
Merge branch 'master' into gnome-3.28
Diffstat (limited to 'www')
-rw-r--r--www/Makefile5
-rw-r--r--www/Stikked/Makefile3
-rw-r--r--www/Stikked/distinfo6
-rw-r--r--www/Stikked/pkg-plist2
-rw-r--r--www/UniversalFeedCreator/Makefile2
-rw-r--r--www/UniversalFeedCreator/distinfo6
-rw-r--r--www/asterisk-stat/Makefile2
-rw-r--r--www/atutor/Makefile2
-rw-r--r--www/choqok-kde4/Makefile2
-rw-r--r--www/choqok/Makefile2
-rw-r--r--www/claroline/Makefile2
-rw-r--r--www/cmsmadesimple/Makefile2
-rw-r--r--www/coppermine/Makefile2
-rw-r--r--www/davical/Makefile2
-rw-r--r--www/davix/Makefile6
-rw-r--r--www/davix/distinfo4
-rw-r--r--www/davix/files/patch-src_libs_datetime_datetime__utils.cpp44
-rw-r--r--www/dotproject/Makefile2
-rw-r--r--www/elgg/Makefile2
-rw-r--r--www/entrans/Makefile2
-rw-r--r--www/fancybox/Makefile2
-rw-r--r--www/fancybox/distinfo6
-rw-r--r--www/fluxbb/Makefile2
-rw-r--r--www/gallery3/Makefile2
-rw-r--r--www/gitlab-ce/Makefile4
-rw-r--r--www/gitlab-ce/distinfo6
-rw-r--r--www/gitlab-ce/pkg-plist1
-rw-r--r--www/gurlchecker/Makefile3
-rw-r--r--www/ilias/Makefile2
-rw-r--r--www/ilias/distinfo6
-rw-r--r--www/kplaylist/Makefile2
-rw-r--r--www/libnghttp2/Makefile2
-rw-r--r--www/libnghttp2/distinfo6
-rw-r--r--www/libnghttp2/pkg-plist2
-rw-r--r--www/limesurvey/Makefile2
-rw-r--r--www/magento/Makefile2
-rw-r--r--www/mahara/Makefile2
-rw-r--r--www/mediawiki129/Makefile69
-rw-r--r--www/mediawiki129/distinfo3
-rw-r--r--www/mediawiki129/files/pkg-message.in11
-rw-r--r--www/mediawiki129/pkg-descr6
-rw-r--r--www/minio-client/Makefile2
-rw-r--r--www/mod_auth_openidc/Makefile2
-rw-r--r--www/mod_auth_openidc/distinfo6
-rw-r--r--www/mod_php73/Makefile15
-rw-r--r--www/mysar/Makefile2
-rw-r--r--www/neon/Makefile2
-rw-r--r--www/netoffice/Makefile2
-rw-r--r--www/nghttp2/Makefile2
-rw-r--r--www/nghttp2/distinfo6
-rw-r--r--www/nginx-devel/Makefile3
-rw-r--r--www/nginx-devel/Makefile.extmod4
-rw-r--r--www/nginx-devel/distinfo14
-rw-r--r--www/oscommerce/Makefile2
-rw-r--r--www/osrm-backend/Makefile2
-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-Simple/Makefile2
-rw-r--r--www/p5-CGI-Simple/distinfo6
-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-HamlRenderer/Makefile6
-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--www/pecl-amfext/Makefile2
-rw-r--r--www/pecl-http1/Makefile2
-rw-r--r--www/pecl-http2/Makefile2
-rw-r--r--www/pecl-sphinx/Makefile2
-rw-r--r--www/pecl-swish/Makefile2
-rw-r--r--www/pecl-twig/Makefile2
-rw-r--r--www/pecl-yaf2/Makefile2
-rw-r--r--www/pecl-yar1/Makefile2
-rw-r--r--www/php-templates/Makefile2
-rw-r--r--www/php73-opcache/Makefile13
-rw-r--r--www/php73-opcache/files/patch-zend__file__cache.c14
-rw-r--r--www/php73-session/Makefile11
-rw-r--r--www/php73-tidy/Makefile11
-rw-r--r--www/py-django/Makefile2
-rw-r--r--www/py-google-api-core/Makefile4
-rw-r--r--www/py-google-api-core/distinfo6
-rw-r--r--www/py-google-api-core/pkg-descr2
-rw-r--r--www/py-requests-file/Makefile12
-rw-r--r--www/py-requests-file/distinfo6
-rw-r--r--www/qt5-webkit/Makefile2
-rw-r--r--www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake34
-rw-r--r--www/qt5-webkit/files/patch-git_14947c-fix_build_cmake_3.1028
-rw-r--r--www/qutebrowser/Makefile2
-rw-r--r--www/qutebrowser/distinfo6
-rw-r--r--www/redaxo/Makefile2
-rw-r--r--www/rnews/Makefile2
-rw-r--r--www/rubygem-passenger/Makefile3
-rw-r--r--www/rubygem-passenger/files/pkg-message-apache.in (renamed from www/rubygem-passenger/files/pkg-message.in)0
-rw-r--r--www/rubygem-passenger/files/pkg-message-nginx.in16
-rw-r--r--www/sams2/Makefile2
-rw-r--r--www/sit/Makefile2
-rw-r--r--www/sitebar/Makefile2
-rw-r--r--www/tdiary/Makefile9
-rw-r--r--www/tdiary/distinfo6
-rw-r--r--www/testlink/Makefile2
-rw-r--r--www/usermanager/Makefile2
-rw-r--r--www/xcache/Makefile2
-rw-r--r--www/yarn/Makefile2
-rw-r--r--www/yarn/distinfo6
603 files changed, 1280 insertions, 1325 deletions
diff --git a/www/Makefile b/www/Makefile
index 414b426e7b61..549e18cf6819 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -395,7 +395,6 @@
SUBDIR += mattermost-server
SUBDIR += mattermost-webapp
SUBDIR += mediawiki127
- SUBDIR += mediawiki129
SUBDIR += mediawiki130
SUBDIR += mediawiki131
SUBDIR += mergelog
@@ -467,6 +466,7 @@
SUBDIR += mod_php70
SUBDIR += mod_php71
SUBDIR += mod_php72
+ SUBDIR += mod_php73
SUBDIR += mod_proctitle
SUBDIR += mod_proxy_xml
SUBDIR += mod_python35
@@ -1463,6 +1463,9 @@
SUBDIR += php72-opcache
SUBDIR += php72-session
SUBDIR += php72-tidy
+ SUBDIR += php73-opcache
+ SUBDIR += php73-session
+ SUBDIR += php73-tidy
SUBDIR += phpbb
SUBDIR += phpbb3
SUBDIR += phpgroupware
diff --git a/www/Stikked/Makefile b/www/Stikked/Makefile
index 5760807c1ac0..2c925a5a9955 100644
--- a/www/Stikked/Makefile
+++ b/www/Stikked/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Stikked
-DISTVERSION= 0.12.0
-PORTREVISION= 1
+DISTVERSION= 0.13.0
CATEGORIES= www
MAINTAINER= dvl@FreeBSD.org
diff --git a/www/Stikked/distinfo b/www/Stikked/distinfo
index 868d944e1005..d2eed38c5b43 100644
--- a/www/Stikked/distinfo
+++ b/www/Stikked/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512417548
-SHA256 (claudehohl-Stikked-0.12.0_GH0.tar.gz) = 8323ace7b65c0957ddb005f79a21f3da5c6f311bb74730216cea5f19a19b7e50
-SIZE (claudehohl-Stikked-0.12.0_GH0.tar.gz) = 10641256
+TIMESTAMP = 1538678447
+SHA256 (claudehohl-Stikked-0.13.0_GH0.tar.gz) = bd6695268a899a1d562b0deff1b67e0522f0e0ef818413e392cc182d3aa82566
+SIZE (claudehohl-Stikked-0.13.0_GH0.tar.gz) = 10644340
diff --git a/www/Stikked/pkg-plist b/www/Stikked/pkg-plist
index efff7e0e09fa..80eb3e65cb8f 100644
--- a/www/Stikked/pkg-plist
+++ b/www/Stikked/pkg-plist
@@ -15,7 +15,6 @@
%%WWWDIR%%/application/config/geshi_languages.php
%%WWWDIR%%/application/config/hooks.php
%%WWWDIR%%/application/config/index.html
-%%WWWDIR%%/application/config/language.php
%%WWWDIR%%/application/config/migration.php
%%WWWDIR%%/application/config/mimes.php
%%WWWDIR%%/application/config/profiler.php
@@ -46,7 +45,6 @@
%%WWWDIR%%/application/helpers/language_helper.php
%%WWWDIR%%/application/helpers/recaptcha_helper.php
%%WWWDIR%%/application/hooks/index.html
-%%WWWDIR%%/application/hooks/pick_language.php
%%WWWDIR%%/application/index.html
%%WWWDIR%%/application/language/chinese-simplified/date_lang.php
%%WWWDIR%%/application/language/chinese-simplified/form_validation_lang.php
diff --git a/www/UniversalFeedCreator/Makefile b/www/UniversalFeedCreator/Makefile
index 5af32025a5b8..9b695ad016ab 100644
--- a/www/UniversalFeedCreator/Makefile
+++ b/www/UniversalFeedCreator/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= UniversalFeedCreator
-PORTVERSION= 1.8.3
+PORTVERSION= 1.8.3.1
DISTVERSIONPREFIX= v
PORTREVISION= 0
CATEGORIES= www
diff --git a/www/UniversalFeedCreator/distinfo b/www/UniversalFeedCreator/distinfo
index 1befc6c0d7e6..c03e198ed7b5 100644
--- a/www/UniversalFeedCreator/distinfo
+++ b/www/UniversalFeedCreator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509638718
-SHA256 (flack-UniversalFeedCreator-v1.8.3_GH0.tar.gz) = f98b18c5b975aea0bdd398ff3a7fd3ce3ce9e31c61ea9f51359c55fcb48cff89
-SIZE (flack-UniversalFeedCreator-v1.8.3_GH0.tar.gz) = 19524
+TIMESTAMP = 1538672535
+SHA256 (flack-UniversalFeedCreator-v1.8.3.1_GH0.tar.gz) = 3cf343a3f26b5243b757a2263b6f97a7eb3ab0579c2c473263958876dbb35c10
+SIZE (flack-UniversalFeedCreator-v1.8.3.1_GH0.tar.gz) = 19535
diff --git a/www/asterisk-stat/Makefile b/www/asterisk-stat/Makefile
index 40a69462a0d1..9a0f8e0cfd35 100644
--- a/www/asterisk-stat/Makefile
+++ b/www/asterisk-stat/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}
MAINTAINER= jfkimura@yahoo.co.jp
COMMENT= ASTERISK call detail records analyzer
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
LIB_DEPENDS= libgd.so:graphics/gd
diff --git a/www/atutor/Makefile b/www/atutor/Makefile
index 3ea48fc1e064..9c498dd51209 100644
--- a/www/atutor/Makefile
+++ b/www/atutor/Makefile
@@ -12,7 +12,7 @@ COMMENT= Open Source Web-based Learning Content Management System (LCMS)
LICENSE= GPLv2
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= cpe php
diff --git a/www/choqok-kde4/Makefile b/www/choqok-kde4/Makefile
index b01e28271e29..8f3a48d477b3 100644
--- a/www/choqok-kde4/Makefile
+++ b/www/choqok-kde4/Makefile
@@ -19,7 +19,7 @@ EXPIRATION_DATE= 2018-12-31
LIB_DEPENDS= libqjson.so:devel/qjson@qt4 \
libqoauth.so:net/qoauth \
- libtelepathy-qt4.so:net-im/telepathy-qt4
+ libtelepathy-qt4.so:net-im/telepathy-qt@qt4
USES= cmake gettext kde:4 qt:4 tar:xz
USE_KDE= attica automoc4 kdelibs
diff --git a/www/choqok/Makefile b/www/choqok/Makefile
index 34a7511ebb9f..af0ee4418114 100644
--- a/www/choqok/Makefile
+++ b/www/choqok/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqjson-qt5.so:devel/qjson@qt5 \
libqca-qt5.so:devel/qca@qt5 \
libqoauth-qt5.so:net/qoauth-qt5 \
- libtelepathy-qt5.so:net-im/telepathy-qt5
+ libtelepathy-qt5.so:net-im/telepathy-qt@qt5
USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= attica auth bookmarks codecs completion config configwidgets \
diff --git a/www/claroline/Makefile b/www/claroline/Makefile
index 63c64957cb4d..e9a7ffc854f2 100644
--- a/www/claroline/Makefile
+++ b/www/claroline/Makefile
@@ -12,7 +12,7 @@ COMMENT= Open Source eLearning and eWorking platform
LICENSE= GPLv2
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= cpe php
diff --git a/www/cmsmadesimple/Makefile b/www/cmsmadesimple/Makefile
index e3ce9faebfdc..375e02f72a1f 100644
--- a/www/cmsmadesimple/Makefile
+++ b/www/cmsmadesimple/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple Open Source CMS
LICENSE= GPLv2
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= php
USE_PHP= mysql tokenizer gd
diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile
index 8ab0acca6727..399a7f746fa8 100644
--- a/www/coppermine/Makefile
+++ b/www/coppermine/Makefile
@@ -11,7 +11,7 @@ COMMENT= Web picture gallery script
LICENSE= GPLv3
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
OPTIONS_DEFINE= DOCS IMAGEMAGICK
IMAGEMAGICK_DESC= Use ImageMagick instead of PHP GD extension
diff --git a/www/davical/Makefile b/www/davical/Makefile
index 8218aeadd6d1..906032cc38dc 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -6,7 +6,7 @@ DISTVERSIONPREFIX= r
DISTVERSION= 1.1.7
CATEGORIES?= www
-MAINTAINER= lebarondemerde@privacychain.ch
+MAINTAINER= rigoletto@FreeBSD.org
COMMENT= Simple CalDAV server using a postgres backend
LICENSE= GPLv2 LGPL21
diff --git a/www/davix/Makefile b/www/davix/Makefile
index 825e875459ae..b3b61ffb3de0 100644
--- a/www/davix/Makefile
+++ b/www/davix/Makefile
@@ -2,8 +2,12 @@
PORTNAME= davix
DISTVERSION= 0.6.9
-MASTER_SITES= http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${DISTVERSION}/
+PORTREVISION= 1
CATEGORIES= www
+MASTER_SITES= http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${DISTVERSION}/
+
+PATCH_SITES= https://github.com/cern-fts/davix/commit/
+PATCHFILES= 8e6386f64187cf32a32627033105e3a641f6b3d2.patch:-p1
MAINTAINER= yuri@FreeBSD.org
COMMENT= Make the task of managing files over HTTP-based protocols simple
diff --git a/www/davix/distinfo b/www/davix/distinfo
index 1a86fff68bb1..a43e387374f5 100644
--- a/www/davix/distinfo
+++ b/www/davix/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1538501544
+TIMESTAMP = 1538623319
SHA256 (davix-0.6.9.tar.gz) = fbd97eb5fdf82ca48770d06bf8e2805b35f23255478aa381a9d25a49eb98e348
SIZE (davix-0.6.9.tar.gz) = 4333197
+SHA256 (8e6386f64187cf32a32627033105e3a641f6b3d2.patch) = 5666a12d11cfb4e2278e4488031aea4c061f12409bd60805052b1e620be66ab4
+SIZE (8e6386f64187cf32a32627033105e3a641f6b3d2.patch) = 951
diff --git a/www/davix/files/patch-src_libs_datetime_datetime__utils.cpp b/www/davix/files/patch-src_libs_datetime_datetime__utils.cpp
deleted file mode 100644
index a467cd259e89..000000000000
--- a/www/davix/files/patch-src_libs_datetime_datetime__utils.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/libs/datetime/datetime_utils.cpp.orig 2018-06-16 07:41:55 UTC
-+++ src/libs/datetime/datetime_utils.cpp
-@@ -19,6 +19,7 @@
- */
-
- #include <davix_internal_config.hpp>
-+#include <sys/time.h>
- #include "datetime_utils.hpp"
-
- time_t parse_http_date(const char* http_date){
-@@ -32,7 +33,15 @@ time_t parse_http_date(const char* http_
- if ( p == NULL || *p != '\0'){
- return -1;
- }
-- return mktime(&tm) - timezone;;
-+ int _timezone = 0;
-+ {
-+ struct timeval tv;
-+ struct timezone tz;
-+ gettimeofday( &tv, &tz );
-+ _timezone = -tz.tz_minuteswest * 60;
-+ }
-+
-+ return mktime(&tm) - _timezone;;
-
- }
-
-@@ -70,8 +79,15 @@ time_t parse_iso8601date(const char* iso
- }
- }
-
-+ int _timezone = 0;
-+ {
-+ struct timeval tv;
-+ struct timezone tz;
-+ gettimeofday( &tv, &tz );
-+ _timezone = -tz.tz_minuteswest * 60;
-+ }
-
-- return mktime(&tm_time) - timezone;
-+ return mktime(&tm_time) - _timezone;
-
- }
-
diff --git a/www/dotproject/Makefile b/www/dotproject/Makefile
index 205da4066429..82c3ce57d9c9 100644
--- a/www/dotproject/Makefile
+++ b/www/dotproject/Makefile
@@ -11,7 +11,7 @@ COMMENT= Open Source Project Management tool
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= apache:run,2.2+ cpe shebangfix php:web
SHEBANG_FILES= misc/cvs2cl/cvs2cl.pl
diff --git a/www/elgg/Makefile b/www/elgg/Makefile
index 794aba9f1529..2df14b5733e0 100644
--- a/www/elgg/Makefile
+++ b/www/elgg/Makefile
@@ -12,7 +12,7 @@ COMMENT= Blogging and social networking platform
LICENSE= GPLv2
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USE_PHP= mysql gd json soap dom xml
USES= cpe gettext zip php
diff --git a/www/entrans/Makefile b/www/entrans/Makefile
index 80d82bc2fd28..aa1a71c389d4 100644
--- a/www/entrans/Makefile
+++ b/www/entrans/Makefile
@@ -12,7 +12,7 @@ COMMENT= Entrans is an online, collaborative translation tool
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= php:web
USE_PHP= mysql
diff --git a/www/fancybox/Makefile b/www/fancybox/Makefile
index f4f4a239ea2f..2b29a4dba052 100644
--- a/www/fancybox/Makefile
+++ b/www/fancybox/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fancybox
-PORTVERSION= 3.4.2
+PORTVERSION= 3.5.2
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/fancybox/distinfo b/www/fancybox/distinfo
index 00d7d62b18af..313e38fa23a5 100644
--- a/www/fancybox/distinfo
+++ b/www/fancybox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537608122
-SHA256 (fancyapps-fancybox-v3.4.2_GH0.tar.gz) = b1f0aba343f5ae3f532e7885a893b77b9288e7c9320e80d9a872f37fbb953017
-SIZE (fancyapps-fancybox-v3.4.2_GH0.tar.gz) = 127949
+TIMESTAMP = 1538849525
+SHA256 (fancyapps-fancybox-v3.5.2_GH0.tar.gz) = 26b6ed5c889eb76cb67c1752829fe3c09f725809582819ad32dca70a1b85e47c
+SIZE (fancyapps-fancybox-v3.5.2_GH0.tar.gz) = 130409
diff --git a/www/fluxbb/Makefile b/www/fluxbb/Makefile
index 1c827e9c7835..9888abd3535a 100644
--- a/www/fluxbb/Makefile
+++ b/www/fluxbb/Makefile
@@ -12,7 +12,7 @@ COMMENT= Fast and lightweight PHP-powered discussion board
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= cpe php
SUB_FILES= pkg-message
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index fa5aacf8f961..b495b68e3bd7 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -11,7 +11,7 @@ DISTNAME= gallery-${PORTVERSION}
MAINTAINER= appleboy.tw@gmail.com
COMMENT= Web based photo album organizer written in PHP
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= zip php:web
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index e6c4833402f7..cd21af828fea 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
-PORTVERSION= 11.3.1
+PORTVERSION= 11.3.4
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
@@ -218,7 +218,7 @@ USE_RC_SUBR= gitlab
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
-GL_COMMIT= 32cb452ee039e11b42933646f982b5e36363d360
+GL_COMMIT= 30f019dca78bb64bcb8b355a267be006884e6d8f
USERS= git
GROUPS= git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index e628b4a0014c..e7eb18dd2d48 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538419242
-SHA256 (gitlab-org-gitlab-ce-32cb452ee039e11b42933646f982b5e36363d360_GL0.tar.gz) = fd5f44632b842c117362ec105ff4a6130706d13a29ce5bf95724671126f8f784
-SIZE (gitlab-org-gitlab-ce-32cb452ee039e11b42933646f982b5e36363d360_GL0.tar.gz) = 42434337
+TIMESTAMP = 1538768604
+SHA256 (gitlab-org-gitlab-ce-30f019dca78bb64bcb8b355a267be006884e6d8f_GL0.tar.gz) = 160f74ee44d034ca5a2b804856d5b132951461b41bac6ac2a14324ee822641d5
+SIZE (gitlab-org-gitlab-ce-30f019dca78bb64bcb8b355a267be006884e6d8f_GL0.tar.gz) = 42469501
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index e3c9c77bcbbc..355fe2f8399b 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -11288,6 +11288,7 @@
%%WWWDIR%%/spec/fixtures/api/schemas/entities/merge_request_basic.json
%%WWWDIR%%/spec/fixtures/api/schemas/entities/merge_request_metrics.json
%%WWWDIR%%/spec/fixtures/api/schemas/entities/merge_request_widget.json
+%%WWWDIR%%/spec/fixtures/api/schemas/entities/note_user_entity.json
%%WWWDIR%%/spec/fixtures/api/schemas/entities/test_case.json
%%WWWDIR%%/spec/fixtures/api/schemas/entities/test_reports_comparer.json
%%WWWDIR%%/spec/fixtures/api/schemas/entities/test_suite_comparer.json
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 8575871afc0b..db5294ee76ad 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -13,6 +13,9 @@ COMMENT= Gnome program to check a page/website for broken links
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
+DEPRECATED= GNOME 2 application
+EXPIRATION_DATE= 2018-12-10
+
LIB_DEPENDS= libgnet-2.0.so:net/gnet2
OPTIONS_DEFINE= CROCO TIDY CLAMAV GNUTLS NLS
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index 67c11a4e5dc8..e23e34c0d0b2 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ilias
-PORTVERSION= 5.3.8
+PORTVERSION= 5.3.10
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/ilias/distinfo b/www/ilias/distinfo
index f2a2a20390d2..7635df6c3286 100644
--- a/www/ilias/distinfo
+++ b/www/ilias/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535675357
-SHA256 (ILIAS-eLearning-ILIAS-v5.3.8_GH0.tar.gz) = cf5c79c5a8d1305b26ccb750afa9862787466226d1135a9125277f39601dd0e7
-SIZE (ILIAS-eLearning-ILIAS-v5.3.8_GH0.tar.gz) = 177802028
+TIMESTAMP = 1538706680
+SHA256 (ILIAS-eLearning-ILIAS-v5.3.10_GH0.tar.gz) = c53b6948c5bf88bbde01bb36ddd7fd3361b093d06451895909125258072b3c39
+SIZE (ILIAS-eLearning-ILIAS-v5.3.10_GH0.tar.gz) = 178067168
diff --git a/www/kplaylist/Makefile b/www/kplaylist/Makefile
index c08723df6830..a6c6638dab85 100644
--- a/www/kplaylist/Makefile
+++ b/www/kplaylist/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= PHP based music database
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
RUN_DEPENDS= lame:audio/lame \
oggenc:audio/vorbis-tools \
diff --git a/www/libnghttp2/Makefile b/www/libnghttp2/Makefile
index 1bd2a5cf9359..271f1c18f4ff 100644
--- a/www/libnghttp2/Makefile
+++ b/www/libnghttp2/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nghttp2
-PORTVERSION= 1.33.0
+PORTVERSION= 1.34.0
DISTVERSIONPREFIX= v
CATEGORIES= www net
PKGNAMEPREFIX= lib
diff --git a/www/libnghttp2/distinfo b/www/libnghttp2/distinfo
index 2d1d28bb3d21..8c576454d47a 100644
--- a/www/libnghttp2/distinfo
+++ b/www/libnghttp2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535987260
-SHA256 (nghttp2-nghttp2-v1.33.0_GH0.tar.gz) = 60c5b7e2b6a2da05b980014ee14a4b77198ad1cce81b5a13d01fd521f5c23b9d
-SIZE (nghttp2-nghttp2-v1.33.0_GH0.tar.gz) = 1751546
+TIMESTAMP = 1538662894
+SHA256 (nghttp2-nghttp2-v1.34.0_GH0.tar.gz) = a0ca4071e59cb1a08cbc40e86127f42c6c7f5ae98d121094d917f81fc6fa0728
+SIZE (nghttp2-nghttp2-v1.34.0_GH0.tar.gz) = 1760930
diff --git a/www/libnghttp2/pkg-plist b/www/libnghttp2/pkg-plist
index 3753c18cd031..25757b14f9d0 100644
--- a/www/libnghttp2/pkg-plist
+++ b/www/libnghttp2/pkg-plist
@@ -3,5 +3,5 @@ include/nghttp2/nghttp2ver.h
lib/libnghttp2.a
lib/libnghttp2.so
lib/libnghttp2.so.14
-lib/libnghttp2.so.14.17.0
+lib/libnghttp2.so.14.17.1
libdata/pkgconfig/libnghttp2.pc
diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index af464ea87758..e62ff45e2cac 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -13,7 +13,7 @@ COMMENT= PHP-based survey building and runing system
LICENSE= GPLv2
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= cpe php:web
diff --git a/www/magento/Makefile b/www/magento/Makefile
index b82d8dc198c2..30ae575cb8a6 100644
--- a/www/magento/Makefile
+++ b/www/magento/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.magentocommerce.com/downloads/assets/${PORTVERSION}/
MAINTAINER= wen@FreeBSD.org
COMMENT= Feature-rich eCommerce platform
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= cpe php
CPE_VENDDOR= magentocommerce
diff --git a/www/mahara/Makefile b/www/mahara/Makefile
index bf8684a7d482..c6cf8ad00990 100644
--- a/www/mahara/Makefile
+++ b/www/mahara/Makefile
@@ -12,7 +12,7 @@ COMMENT= Open source ePortfolio system
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/../COPYING
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= cpe php tar:bzip2
USE_PHP= dom gd session json curl xml xmlrpc openssl simplexml \
diff --git a/www/mediawiki129/Makefile b/www/mediawiki129/Makefile
deleted file mode 100644
index 2d828acd1215..000000000000
--- a/www/mediawiki129/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# Created by: Gerrit Beine <tux@pinguru.net>
-# $FreeBSD$
-
-PORTNAME= mediawiki
-PORTVERSION= 1.29.3
-CATEGORIES= www
-MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/
-PKGNAMESUFFIX= 129
-
-MAINTAINER= wen@FreeBSD.org
-COMMENT= Wiki engine used by Wikipedia
-
-LICENSE= GPLv2
-
-CONFLICTS= mediawiki127-[0-9]* mediawiki13[01]-[0-9]*
-
-DEPRECATED= Deprecated by upstream
-EXPIRATION_DATE= 2018-10-07
-
-USES= php:web shebangfix
-SHEBANG_FILES= maintenance/dev/*.sh \
- maintenance/postgres/*.pl \
- maintenance/storage/make-blobs \
- includes/limit.sh
-SHEBANG_LANG= hhvm
-hhvm_OLD_CMD= /usr/bin/hhvm
-hhvm_CMD= ${LOCALBASE}/bin/hhvm # not installed by anything yet
-USE_PHP= ctype dom hash iconv intl json mbstring pcre readline \
- session xml xmlreader zlib
-MEDIAWIKIDIR?= www/mediawiki
-
-NO_BUILD= yes
-PLIST= ${WRKDIR}/plist
-
-SUB_FILES= pkg-message
-SUB_LIST= MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR}
-
-OPTIONS_DEFINE= LDAP MEMCACHED IMAGICK SOCKETS XCACHE
-OPTIONS_SINGLE= DB
-OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE
-OPTIONS_DEFAULT= MYSQL SOCKETS
-
-MEMCACHED_DESC= Use memcached
-XCACHE_DESC= Use xCache
-IMAGICK_DESC= Use ImageMagick
-SOCKETS_DESC= Use sockets
-
-MYSQL_USE= mysql=client php=mysqli
-PGSQL_USE= php=pgsql
-SQLITE_USE= php=sqlite3
-LDAP_USE= php=ldap
-SOCKETS_USE= php=sockets
-
-MEMCACHED_RUN_DEPENDS= memcached:databases/memcached
-IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
-XCACHE_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
-
-pre-install:
- @${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}
- @${ECHO} "@mode 0777" >> ${PLIST}
- @${ECHO} "@dir %%WWWDIR%%/images" >> ${PLIST}
- @${ECHO} "@mode" >> ${PLIST}
- @${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST}
-
-do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
- @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
-
-.include <bsd.port.mk>
diff --git a/www/mediawiki129/distinfo b/www/mediawiki129/distinfo
deleted file mode 100644
index 6505f91f5db1..000000000000
--- a/www/mediawiki129/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1537615561
-SHA256 (mediawiki-1.29.3.tar.gz) = 4f28a812694c95bd6778d1ac322ea80d3bbfedbda69c4562b75c8d450cc8d3f0
-SIZE (mediawiki-1.29.3.tar.gz) = 39727911
diff --git a/www/mediawiki129/files/pkg-message.in b/www/mediawiki129/files/pkg-message.in
deleted file mode 100644
index d98978fe6903..000000000000
--- a/www/mediawiki129/files/pkg-message.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
- **** NOTE ****
-Remember to check
-
-%%MEDIAWIKIDIR%%/INSTALL
-
-and
-
-%%MEDIAWIKIDIR%%/UPGRADE
-
-for details
diff --git a/www/mediawiki129/pkg-descr b/www/mediawiki129/pkg-descr
deleted file mode 100644
index dac83f83ccda..000000000000
--- a/www/mediawiki129/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-MediaWiki is the collaborative editing software that runs Wikipedia,
-the free encyclopedia, and other projects.
-It's designed to handle a large number of users and pages without imposing
-too rigid a structure or workflow.
-
-WWW: http://www.mediawiki.org/
diff --git a/www/minio-client/Makefile b/www/minio-client/Makefile
index 5a226d53a479..7d4284aef4cf 100644
--- a/www/minio-client/Makefile
+++ b/www/minio-client/Makefile
@@ -9,6 +9,8 @@ COMMENT= Replacement for ls, cp, mkdir, diff and rsync commands for filesystems
LICENSE= APACHE20
+BROKEN_amd64= github.com/minio/mc/vendor/golang.org/x/crypto/blake2b.supportsAVX2: relocation target runtime.support_avx2 not defined
+
BUILD_DEPENDS= go>=1.9.4:lang/go \
bash:shells/bash
diff --git a/www/mod_auth_openidc/Makefile b/www/mod_auth_openidc/Makefile
index c27d921141f2..0f53bfda1b95 100644
--- a/www/mod_auth_openidc/Makefile
+++ b/www/mod_auth_openidc/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mod_auth_openidc
-PORTVERSION= 2.3.5
+PORTVERSION= 2.3.8
DISTVERSIONPREFIX= v
CATEGORIES= www
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_auth_openidc/distinfo b/www/mod_auth_openidc/distinfo
index c1ad19be8743..b39a3fa9e6c8 100644
--- a/www/mod_auth_openidc/distinfo
+++ b/www/mod_auth_openidc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526867206
-SHA256 (pingidentity-mod_auth_openidc-v2.3.5_GH0.tar.gz) = 63b210ec7aaa121dc29eacc62af54059b11a14077b7b0634196f6741bce2fa95
-SIZE (pingidentity-mod_auth_openidc-v2.3.5_GH0.tar.gz) = 216759
+TIMESTAMP = 1538925830
+SHA256 (pingidentity-mod_auth_openidc-v2.3.8_GH0.tar.gz) = bdeaf219a18ef18654784e8866e1affa0695bcbb693131e2b41f7e96239ce9b8
+SIZE (pingidentity-mod_auth_openidc-v2.3.8_GH0.tar.gz) = 221846
diff --git a/www/mod_php73/Makefile b/www/mod_php73/Makefile
new file mode 100644
index 000000000000..a0b7560bc315
--- /dev/null
+++ b/www/mod_php73/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+CATEGORIES= www devel
+PKGNAMEPREFIX= mod_
+
+MAINTAINER= ports@FreeBSD.org
+
+PHP_PORT= lang/php73
+MASTERDIR= ${.CURDIR}/../../${PHP_PORT}
+
+OPTIONS_DEFINE= AP2FILTER
+AP2FILTER_DESC= Use Apache 2.x filter interface (experimental)
+OPTIONS_EXCLUDE=CGI CLI FPM EMBED
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/mysar/Makefile b/www/mysar/Makefile
index 3ebd596d8274..564703e74bac 100644
--- a/www/mysar/Makefile
+++ b/www/mysar/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME:tl}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= MySQL Squid Access Report
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
LICENSE= GPLv2
LICENSE_FILE= ${WRKROOT}/COPYING
diff --git a/www/neon/Makefile b/www/neon/Makefile
index a157b80d2505..c9dc306780b6 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -3,7 +3,7 @@
PORTNAME= neon
PORTVERSION= 0.30.2
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= LOCAL/lev
diff --git a/www/netoffice/Makefile b/www/netoffice/Makefile
index 9fbafa5ee52b..6652735c8d06 100644
--- a/www/netoffice/Makefile
+++ b/www/netoffice/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= NetOffice is a free web based project-management environment
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
NO_BUILD= yes
NO_ARCH= yes
diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
index 270270bd1732..e30243ae5556 100644
--- a/www/nghttp2/Makefile
+++ b/www/nghttp2/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nghttp2
-PORTVERSION= 1.33.0
+PORTVERSION= 1.34.0
DISTVERSIONPREFIX= v
CATEGORIES= www net
diff --git a/www/nghttp2/distinfo b/www/nghttp2/distinfo
index 2d1d28bb3d21..8c576454d47a 100644
--- a/www/nghttp2/distinfo
+++ b/www/nghttp2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535987260
-SHA256 (nghttp2-nghttp2-v1.33.0_GH0.tar.gz) = 60c5b7e2b6a2da05b980014ee14a4b77198ad1cce81b5a13d01fd521f5c23b9d
-SIZE (nghttp2-nghttp2-v1.33.0_GH0.tar.gz) = 1751546
+TIMESTAMP = 1538662894
+SHA256 (nghttp2-nghttp2-v1.34.0_GH0.tar.gz) = a0ca4071e59cb1a08cbc40e86127f42c6c7f5ae98d121094d917f81fc6fa0728
+SIZE (nghttp2-nghttp2-v1.34.0_GH0.tar.gz) = 1760930
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index cbb298e3454a..a92a215ac260 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= nginx
-PORTVERSION= 1.15.4
+PORTVERSION= 1.15.5
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/ \
LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 951cdb7222e9..e5de1cfb6dee 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -125,7 +125,7 @@ HTTP_NOTICE_GH_TUPLE= kr:nginx-notice:3c95966:notice
HTTP_NOTICE_CONFIGURE_ON= --add-module=${WRKSRC_notice}
HTTP_NOTICE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c
-HTTP_PUSH_GH_TUPLE= slact:nchan:v1.1.14:push
+HTTP_PUSH_GH_TUPLE= slact:nchan:v1.2.1:push
HTTP_PUSH_VARS= DSO_EXTMODS+=push
HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:0.5.4:pushstream
@@ -281,7 +281,7 @@ VOD_VARS= DSO_EXTMODS+=vod
VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-module-config \
${PATCHDIR}/extra-patch-vod-filters-audio_encoder.c
-VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.15:vts
+VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.18:vts
VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts}
XSS_GH_TUPLE= openresty:xss-nginx-module:v0.05:xss
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index aa9eb1bec69c..cb20b57734eb 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1537907181
-SHA256 (nginx-1.15.4.tar.gz) = 3324776c800d974ceae8797ab9102ca26a8c3656f5c6fb3f31f2cb1e719458e7
-SIZE (nginx-1.15.4.tar.gz) = 1024694
+TIMESTAMP = 1538918416
+SHA256 (nginx-1.15.5.tar.gz) = 1a3a889a8f14998286de3b14cc1dd5b2747178e012d6d480a18aa413985dae6f
+SIZE (nginx-1.15.5.tar.gz) = 1024791
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
SIZE (ngx_cache_purge-2.3.tar.gz) = 12248
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -73,8 +73,8 @@ SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e
SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736
SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343
-SHA256 (slact-nchan-v1.1.14_GH0.tar.gz) = 70b38d9e54826b2a69a9a5f3de5fb0e25fb03177ec3ac0bc69b9fd2c087143b8
-SIZE (slact-nchan-v1.1.14_GH0.tar.gz) = 630564
+SHA256 (slact-nchan-v1.2.1_GH0.tar.gz) = 7bb3ae57a036afabee1da5e40085b69b3fd68026fcc1d8abc98a8ad9f5dccc44
+SIZE (slact-nchan-v1.2.1_GH0.tar.gz) = 645188
SHA256 (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 5253bb8a804ea679e514137a234637298f044c3ef63c053670bf3802ff3535b1
SIZE (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 183493
SHA256 (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = ed4ddbcf0c434f4a1e97b61251a63ace759792764bd5cb79ff20efe348db8db3
@@ -131,7 +131,7 @@ SHA256 (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 3f9729e73a8340926fa9d
SIZE (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 48310
SHA256 (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 800cf3de639567e27f4cb75527392f23842b349fb680abefd12d4db9a5be951f
SIZE (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 442053
-SHA256 (vozlt-nginx-module-vts-v0.1.15_GH0.tar.gz) = 5112a054b1b1edb4c0042a9a840ef45f22abb3c05c68174e28ebf483164fb7e1
-SIZE (vozlt-nginx-module-vts-v0.1.15_GH0.tar.gz) = 371128
+SHA256 (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 17ea41d4083f6d1ab1ab83dad9160eeca66867abe16c5a0421f85a39d7c84b65
+SIZE (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 380327
SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
diff --git a/www/oscommerce/Makefile b/www/oscommerce/Makefile
index 74c5ff0038d6..f29040f788a8 100644
--- a/www/oscommerce/Makefile
+++ b/www/oscommerce/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.oscommerce.com/files/
MAINTAINER= wen@FreeBSD.org
COMMENT= Full-featured open source e-commerce system
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= cpe php:web zip
USE_PHP= mysql session pcre gd curl openssl
diff --git a/www/osrm-backend/Makefile b/www/osrm-backend/Makefile
index ea394a82b93b..8b40eac7151f 100644
--- a/www/osrm-backend/Makefile
+++ b/www/osrm-backend/Makefile
@@ -3,7 +3,7 @@
PORTNAME= osrm-backend
DISTVERSIONPREFIX= v
DISTVERSION= 5.17.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MAINTAINER= a.andersson.thn@gmail.com
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-Simple/Makefile b/www/p5-CGI-Simple/Makefile
index 8d407b62d638..74020b2b61b0 100644
--- a/www/p5-CGI-Simple/Makefile
+++ b/www/p5-CGI-Simple/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= CGI-Simple
-PORTVERSION= 1.160
+PORTVERSION= 1.210
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-CGI-Simple/distinfo b/www/p5-CGI-Simple/distinfo
index d6f60377e8ac..208a6c8e5e93 100644
--- a/www/p5-CGI-Simple/distinfo
+++ b/www/p5-CGI-Simple/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532611074
-SHA256 (CGI-Simple-1.16.tar.gz) = 0e541f61022e7d883e6c7d66507c1c96f3eabe3faa76ad7a7864262584c707c8
-SIZE (CGI-Simple-1.16.tar.gz) = 86384
+TIMESTAMP = 1538984375
+SHA256 (CGI-Simple-1.21.tar.gz) = 4f1b2f7a1fa5c7e8e3f61a426c21d2335d22d8417a43e5fe91154ea25f14ecf3
+SIZE (CGI-Simple-1.21.tar.gz) = 87306
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-HamlRenderer/Makefile b/www/p5-Mojolicious-Plugin-HamlRenderer/Makefile
index 31317d290f1b..c3ca7c1bfac1 100644
--- a/www/p5-Mojolicious-Plugin-HamlRenderer/Makefile
+++ b/www/p5-Mojolicious-Plugin-HamlRenderer/Makefile
@@ -7,15 +7,15 @@ CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= adamw@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Haml renderer for Mojolicious
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Mojolicious>=1.3:www/p5-Mojolicious \
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mojolicious>=1.3:www/p5-Mojolicious \
p5-Text-Haml>=0.990103:textproc/p5-Text-Haml
-RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
USES= perl5
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/www/pecl-amfext/Makefile b/www/pecl-amfext/Makefile
index e7ee6ea4cec7..c66c9cf2c39a 100644
--- a/www/pecl-amfext/Makefile
+++ b/www/pecl-amfext/Makefile
@@ -13,7 +13,7 @@ LICENSE= PHP30
USES= dos2unix libtool php:pecl
PHP_MODNAME= amf
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
CONFIGURE_ARGS= --with-amf
diff --git a/www/pecl-http1/Makefile b/www/pecl-http1/Makefile
index 68a7c3d2ae35..8adbb8918831 100644
--- a/www/pecl-http1/Makefile
+++ b/www/pecl-http1/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libcurl.so:ftp/curl
USES= php:pecl
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
CONFLICTS= pecl-http-*
CONFIGURE_ARGS+= --with-http-curl-requests \
diff --git a/www/pecl-http2/Makefile b/www/pecl-http2/Makefile
index be3c73a8ac82..40765b0b6e35 100644
--- a/www/pecl-http2/Makefile
+++ b/www/pecl-http2/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf@${PHP
LIB_DEPENDS= libcurl.so:ftp/curl \
libevent.so:devel/libevent
-IGNORE_WITH_PHP=70 71 72
+IGNORE_WITH_PHP=70 71 72 73
USES= php:pecl
CONFLICTS= pecl-http1* pecl-http-*
diff --git a/www/pecl-sphinx/Makefile b/www/pecl-sphinx/Makefile
index 04f82401b009..e2fb5c253dfb 100644
--- a/www/pecl-sphinx/Makefile
+++ b/www/pecl-sphinx/Makefile
@@ -11,7 +11,7 @@ COMMENT= Sphinx search engine php client
LICENSE= PHP301
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
LIB_DEPENDS= libsphinxclient.so:textproc/libsphinxclient
diff --git a/www/pecl-swish/Makefile b/www/pecl-swish/Makefile
index 93739e38e983..4b5353c9a7b6 100644
--- a/www/pecl-swish/Makefile
+++ b/www/pecl-swish/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS= swish-config:www/swish-e
RUN_DEPENDS:= swish-config:www/swish-e
USES= php:pecl
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
CONFIGURE_ARGS= --enable-swish --with-swish=${LOCALBASE}/bin
diff --git a/www/pecl-twig/Makefile b/www/pecl-twig/Makefile
index ed4a101df3d5..2d85c25c7867 100644
--- a/www/pecl-twig/Makefile
+++ b/www/pecl-twig/Makefile
@@ -14,6 +14,6 @@ COMMENT= Twig C extension to improve performance of the Twig template language
LICENSE= BSD3CLAUSE
USES= php:ext tar:tgz
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
.include <bsd.port.mk>
diff --git a/www/pecl-yaf2/Makefile b/www/pecl-yaf2/Makefile
index a48f49456dd4..673eeb78c1cf 100644
--- a/www/pecl-yaf2/Makefile
+++ b/www/pecl-yaf2/Makefile
@@ -15,6 +15,6 @@ LIB_DEPENDS= libpcre.so:devel/pcre
PORTSCOUT= limit:^2\.
USES= localbase php:pecl
-IGNORE_WITH_PHP=70 71 72
+IGNORE_WITH_PHP=70 71 72 73
.include <bsd.port.mk>
diff --git a/www/pecl-yar1/Makefile b/www/pecl-yar1/Makefile
index 0c527e48ad59..5cfd6db7eccd 100644
--- a/www/pecl-yar1/Makefile
+++ b/www/pecl-yar1/Makefile
@@ -13,7 +13,7 @@ LICENSE= PHP301
USES= localbase php:pecl
USE_PHP= json:build curl:build
-IGNORE_WITH_PHP=70 71 72
+IGNORE_WITH_PHP=70 71 72 73
OPTIONS_DEFINE= MSGPACK
MSGPACK_DESC= Enable MSGPACK module
diff --git a/www/php-templates/Makefile b/www/php-templates/Makefile
index 067c5567c07f..7b516d342535 100644
--- a/www/php-templates/Makefile
+++ b/www/php-templates/Makefile
@@ -18,7 +18,7 @@ COMMENT= Template framework for PHP
WRKSRC= ${WRKDIR}/templates
USES= dos2unix php:phpize
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
CONFIGURE_ARGS= --enable-templates=shared
diff --git a/www/php73-opcache/Makefile b/www/php73-opcache/Makefile
new file mode 100644
index 000000000000..bd4aa1cf5891
--- /dev/null
+++ b/www/php73-opcache/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+CATEGORIES= www
+
+MASTERDIR= ${.CURDIR}/../../lang/php73
+
+PKGNAMESUFFIX= -opcache
+
+TEST_TARGET= test
+
+USES= php:zend,noflavors
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/php73-opcache/files/patch-zend__file__cache.c b/www/php73-opcache/files/patch-zend__file__cache.c
new file mode 100644
index 000000000000..937290216eef
--- /dev/null
+++ b/www/php73-opcache/files/patch-zend__file__cache.c
@@ -0,0 +1,14 @@
+--- zend_file_cache.c.orig 2017-07-05 13:48:27 UTC
++++ zend_file_cache.c
+@@ -24,9 +24,10 @@
+
+ #include "php.h"
+
++#include "ZendAccelerator.h"
++
+ #ifdef HAVE_OPCACHE_FILE_CACHE
+
+-#include "ZendAccelerator.h"
+ #include "zend_file_cache.h"
+ #include "zend_shared_alloc.h"
+ #include "zend_accelerator_util_funcs.h"
diff --git a/www/php73-session/Makefile b/www/php73-session/Makefile
new file mode 100644
index 000000000000..b4bf59c30257
--- /dev/null
+++ b/www/php73-session/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES= www
+
+MASTERDIR= ${.CURDIR}/../../lang/php73
+
+PKGNAMESUFFIX= -session
+
+TEST_TARGET= test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/php73-tidy/Makefile b/www/php73-tidy/Makefile
new file mode 100644
index 000000000000..101623cb7897
--- /dev/null
+++ b/www/php73-tidy/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES= www
+
+MASTERDIR= ${.CURDIR}/../../lang/php73
+
+PKGNAMESUFFIX= -tidy
+
+TEST_TARGET= test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 6cfe2a47c93b..0480e3e9bb71 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= django
-PORTVERSION= 1.11.15
+PORTVERSION= 1.11.16
CATEGORIES= www python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-google-api-core/Makefile b/www/py-google-api-core/Makefile
index faa2a9784b92..f37a06cc89dd 100644
--- a/www/py-google-api-core/Makefile
+++ b/www/py-google-api-core/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= google-api-core
-PORTVERSION= 1.4.0
+PORTVERSION= 1.4.1
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PY_FUTURES} \
${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>=1.5.3:devel/py-googleapis-common-protos@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}grpcio>=1.8.2:devel/py-grpcio@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}grpcio-gcp>=0.2.2:devel/py-grpcio-gcp@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}protobuf>=3.0.0:devel/py-protobuf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.4.0:devel/py-protobuf@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.18.0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
diff --git a/www/py-google-api-core/distinfo b/www/py-google-api-core/distinfo
index e281583e9011..e4d50c472993 100644
--- a/www/py-google-api-core/distinfo
+++ b/www/py-google-api-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536758810
-SHA256 (google-api-core-1.4.0.tar.gz) = 121cc7b93fcf5bde0bf8047a5fb9b5217a7e663eaf83f828044a073781c88901
-SIZE (google-api-core-1.4.0.tar.gz) = 55571
+TIMESTAMP = 1538591910
+SHA256 (google-api-core-1.4.1.tar.gz) = a9ae625afd0ea5a4618604675d1fc140998c9c2b17f1d91817a7a7f5b33f7484
+SIZE (google-api-core-1.4.1.tar.gz) = 55844
diff --git a/www/py-google-api-core/pkg-descr b/www/py-google-api-core/pkg-descr
index f8b585773e23..eea504e195f9 100644
--- a/www/py-google-api-core/pkg-descr
+++ b/www/py-google-api-core/pkg-descr
@@ -4,4 +4,4 @@ This library is not meant to stand-alone. Instead it defines common helpers used
by all Google API clients.
WWW: https://pypi.org/project/google-api-core/
-WWW: https://github.com/GoogleCloudPlatform/google-cloud-python
+WWW: https://github.com/googleapis/google-cloud-python
diff --git a/www/py-requests-file/Makefile b/www/py-requests-file/Makefile
index 2fdb8cb87921..26a168eca422 100644
--- a/www/py-requests-file/Makefile
+++ b/www/py-requests-file/Makefile
@@ -2,8 +2,9 @@
# $FreeBSD$
PORTNAME= requests-file
-PORTVERSION= 1.4.2
+PORTVERSION= 1.4.3
CATEGORIES= www python
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sunpoet@FreeBSD.org
@@ -11,15 +12,12 @@ COMMENT= Transport adapter for use with the Requests Python library
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
-NO_ARCH= yes
-
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist concurrent distutils
-USE_GITHUB= yes
-GH_ACCOUNT= dashea
+NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/www/py-requests-file/distinfo b/www/py-requests-file/distinfo
index 37ffae86a70f..07a0f2c2e471 100644
--- a/www/py-requests-file/distinfo
+++ b/www/py-requests-file/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507832477
-SHA256 (dashea-requests-file-1.4.2_GH0.tar.gz) = 311c0accf3c9496ca6db7c53ca2d64a31e54fe94e825074f1844707b86df6420
-SIZE (dashea-requests-file-1.4.2_GH0.tar.gz) = 5889
+TIMESTAMP = 1538663207
+SHA256 (requests-file-1.4.3.tar.gz) = 8f04aa6201bacda0567e7ac7f677f1499b0fc76b22140c54bc06edf1ba92e2fa
+SIZE (requests-file-1.4.3.tar.gz) = 5252
diff --git a/www/qt5-webkit/Makefile b/www/qt5-webkit/Makefile
index a7c2e15348a9..08b6cfbda3e9 100644
--- a/www/qt5-webkit/Makefile
+++ b/www/qt5-webkit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= webkit
DISTVERSION= 5.212.0-alpha2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= www
MASTER_SITES= https://github.com/annulen/${PORTNAME}/releases/download/${DISTNAME}/
PKGNAMEPREFIX= qt5-
diff --git a/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake b/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
index 45c24851f226..658853248814 100644
--- a/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
+++ b/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
@@ -1,18 +1,44 @@
---- Source/WebKit/PlatformQt.cmake.orig 2017-06-15 23:36:48 UTC
+commit 14947c04b3c19b5eb04a683081742b14c1d32786
+Author: Konstantin Tokarev <annulen@yandex.ru>
+Date: Sat Oct 7 17:38:32 2017 +0300
+
+ [cmake] Fix build with CMake 3.10: -frtti was enabled for wrong file path
+
+ Change-Id: I65d4f491f21c17f6d99a14259988d2ddb0d67105
+
+--- Source/WebKit/PlatformQt.cmake.orig 2018-10-07 11:03:32 UTC
+++ Source/WebKit/PlatformQt.cmake
-@@ -481,6 +481,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
+@@ -481,6 +481,8 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
BASE_NAME Qt5WebKit
DEPS "${WEBKIT_PKGCONGIG_DEPS}"
FILENAME_VAR WebKit_PKGCONFIG_FILENAME
++ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
+ DESCRIPTION "Qt WebKit module"
)
- set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
+ set(ECM_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
-@@ -671,6 +672,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
+@@ -671,6 +673,8 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
BASE_NAME Qt5WebKitWidgets
DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}"
FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME
++ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets"
+ DESCRIPTION "Qt WebKitWidgets module"
)
install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
endif ()
+@@ -786,6 +790,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
+ set_source_files_properties(
+ qt/Api/qwebdatabase.cpp
+ qt/Api/qwebelement.cpp
++ qt/Api/qwebfullscreenrequest.cpp
+ qt/Api/qwebhistory.cpp
+ qt/Api/qwebhistoryinterface.cpp
+ qt/Api/qwebpluginfactory.cpp
+@@ -795,7 +800,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
+
+ qt/WidgetApi/qgraphicswebview.cpp
+ qt/WidgetApi/qwebframe.cpp
+- qt/WidgetApi/qwebfullscreenrequest.cpp
+ qt/WidgetApi/qwebinspector.cpp
+ qt/WidgetApi/qwebpage.cpp
+ qt/WidgetApi/qwebview.cpp
diff --git a/www/qt5-webkit/files/patch-git_14947c-fix_build_cmake_3.10 b/www/qt5-webkit/files/patch-git_14947c-fix_build_cmake_3.10
deleted file mode 100644
index 3cf00e36853d..000000000000
--- a/www/qt5-webkit/files/patch-git_14947c-fix_build_cmake_3.10
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 14947c04b3c19b5eb04a683081742b14c1d32786
-Author: Konstantin Tokarev <annulen@yandex.ru>
-Date: Sat Oct 7 17:38:32 2017 +0300
-
- [cmake] Fix build with CMake 3.10: -frtti was enabled for wrong file path
-
- Change-Id: I65d4f491f21c17f6d99a14259988d2ddb0d67105
-
-diff --git Source/WebKit/PlatformQt.cmake Source/WebKit/PlatformQt.cmake
-index 61433257a76..edfa57e97ac 100644
---- Source/WebKit/PlatformQt.cmake
-+++ Source/WebKit/PlatformQt.cmake
-@@ -795,6 +795,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
- set_source_files_properties(
- qt/Api/qwebdatabase.cpp
- qt/Api/qwebelement.cpp
-+ qt/Api/qwebfullscreenrequest.cpp
- qt/Api/qwebhistory.cpp
- qt/Api/qwebhistoryinterface.cpp
- qt/Api/qwebpluginfactory.cpp
-@@ -804,7 +805,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
-
- qt/WidgetApi/qgraphicswebview.cpp
- qt/WidgetApi/qwebframe.cpp
-- qt/WidgetApi/qwebfullscreenrequest.cpp
- qt/WidgetApi/qwebinspector.cpp
- qt/WidgetApi/qwebpage.cpp
- qt/WidgetApi/qwebview.cpp
diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile
index ca11d5d67f46..36196e69cf72 100644
--- a/www/qutebrowser/Makefile
+++ b/www/qutebrowser/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= qutebrowser
-DISTVERSION= 1.4.2
+DISTVERSION= 1.5.0
CATEGORIES= www
MASTER_SITES= CHEESESHOP
diff --git a/www/qutebrowser/distinfo b/www/qutebrowser/distinfo
index 468d67048b6c..b48064ec98a1 100644
--- a/www/qutebrowser/distinfo
+++ b/www/qutebrowser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536043103
-SHA256 (qutebrowser-1.4.2.tar.gz) = fd5d47b0e45e40b1348caf37e8ac304256d453d147f7a930193d3c4aeb21d2de
-SIZE (qutebrowser-1.4.2.tar.gz) = 3549553
+TIMESTAMP = 1538654925
+SHA256 (qutebrowser-1.5.0.tar.gz) = 179b5d0e05159a77097dffc1469eec7955a1569d9fe65870c35c1c783e6d5d1f
+SIZE (qutebrowser-1.5.0.tar.gz) = 3565920
diff --git a/www/redaxo/Makefile b/www/redaxo/Makefile
index e7db92332761..2167f2614cb7 100644
--- a/www/redaxo/Makefile
+++ b/www/redaxo/Makefile
@@ -12,7 +12,7 @@ COMMENT= REDAXO content management system
LICENSE= GPLv2
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
NO_BUILD= yes
diff --git a/www/rnews/Makefile b/www/rnews/Makefile
index fcf5b0159890..8c928e588bd1 100644
--- a/www/rnews/Makefile
+++ b/www/rnews/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Server-side RSS aggregator written in PHP with MySQL
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
NO_BUILD= yes
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index d987ee610183..b97fa874f25d 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -3,6 +3,7 @@
PORTNAME= passenger
PORTVERSION= 5.3.5
+PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-
@@ -60,7 +61,7 @@ BUILD_DEPENDS+= rubygem-rack>=0:www/rubygem-rack
RUN_DEPENDS:= ${BUILD_DEPENDS}
SUB_LIST+= GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY}
-SUB_FILES= pkg-message
+SUB_FILES= pkg-message-${FLAVOR}
PLIST_FILES= bin/passenger \
bin/passenger-config \
diff --git a/www/rubygem-passenger/files/pkg-message.in b/www/rubygem-passenger/files/pkg-message-apache.in
index 38ad68aaaf11..38ad68aaaf11 100644
--- a/www/rubygem-passenger/files/pkg-message.in
+++ b/www/rubygem-passenger/files/pkg-message-apache.in
diff --git a/www/rubygem-passenger/files/pkg-message-nginx.in b/www/rubygem-passenger/files/pkg-message-nginx.in
new file mode 100644
index 000000000000..e79125579daf
--- /dev/null
+++ b/www/rubygem-passenger/files/pkg-message-nginx.in
@@ -0,0 +1,16 @@
+#####################################################################
+
+Please edit your nginx configuration file, and add these lines:
+
+ server {
+ root %%PASSENGER_INSTALL_DIR%%;
+ passenger_enabled on;
+ passenger_ruby %%RUBY%%;
+ passenger_sticky_sessions on;
+ }
+
+After you restart nginx, you are ready to deploy any number of Ruby on Rails
+applications on nginx, without any further Ruby on Rails-specific
+configuration!
+
+#####################################################################
diff --git a/www/sams2/Makefile b/www/sams2/Makefile
index 7b4d4f3d8d53..743ec3d33cf3 100644
--- a/www/sams2/Makefile
+++ b/www/sams2/Makefile
@@ -11,7 +11,7 @@ COMMENT= Squid Accounting Management System
LICENSE= BSD4CLAUSE
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
LIB_DEPENDS= libpcre.so:devel/pcre
RUN_DEPENDS= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
diff --git a/www/sit/Makefile b/www/sit/Makefile
index 04caf8b15e4d..eaece9558b4b 100644
--- a/www/sit/Makefile
+++ b/www/sit/Makefile
@@ -13,7 +13,7 @@ COMMENT= PHP incident tracking system / Helpdesk
LICENSE= GPLv2
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= php:web
USE_PHP= pcre mysql session zlib mbstring
diff --git a/www/sitebar/Makefile b/www/sitebar/Makefile
index 860e143623a7..8d383003e8d5 100644
--- a/www/sitebar/Makefile
+++ b/www/sitebar/Makefile
@@ -10,7 +10,7 @@ DISTNAME= SiteBar-${PORTVERSION}
MAINTAINER= gunter@six-two.net
COMMENT= The Bookmark Server for Personal and Team Use
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= php:web tar:bzip2
USE_PHP= mysql pcre
diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index 11d446fd2b83..e9d5171d2a17 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tdiary
-PORTVERSION= 5.0.9
+PORTVERSION= 5.0.10
CATEGORIES?= www ruby
MASTER_SITES= https://github.com/tdiary/tdiary-core/releases/download/v${PORTVERSION}/
DISTNAME= ${PORTNAME}-full-v${PORTVERSION}
@@ -13,9 +13,9 @@ COMMENT= Web-based diary system (like weblog) written in Ruby
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= rubygem-bundler>=1.16.1:sysutils/rubygem-bundler \
+RUN_DEPENDS= rubygem-bundler>=1.16.5:sysutils/rubygem-bundler \
rubygem-emot>=0.0.4:textproc/rubygem-emot \
- rubygem-fastimage>=2.1.3:graphics/rubygem-fastimage \
+ rubygem-fastimage>=2.1.4:graphics/rubygem-fastimage \
rubygem-hikidoc>=0.1.0:textproc/rubygem-hikidoc \
rubygem-mail>=2.7.0:mail/rubygem-mail \
rubygem-rack>=2.0.5:www/rubygem-rack \
@@ -23,6 +23,7 @@ RUN_DEPENDS= rubygem-bundler>=1.16.1:sysutils/rubygem-bundler \
USES= shebangfix
USE_RUBY= yes
+
NO_ARCH= yes
NO_BUILD= yes
@@ -81,7 +82,7 @@ pre-patch:
@${RM} ${WRKSRC}/tmp/.gitkeep
@${RM} -r ${WRKSRC}/.bundle
@${RM} -r ${WRKSRC}/.vscode
- @${RM} -r ${WRKSRC}/misc/lib/bundler-1.16.1
+ @${RM} -r ${WRKSRC}/misc/lib/bundler-1.16.5
@${RM} -r ${WRKSRC}/public
@${RM} -r ${WRKSRC}/spec
@${RM} -r ${WRKSRC}/test
diff --git a/www/tdiary/distinfo b/www/tdiary/distinfo
index 627805314305..53a0d6c61a73 100644
--- a/www/tdiary/distinfo
+++ b/www/tdiary/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530262596
-SHA256 (tdiary-full-v5.0.9.tar.gz) = dd01c3af5916185b74aa53bb9072f40d3b492be6803aab397759b58f4cdf56de
-SIZE (tdiary-full-v5.0.9.tar.gz) = 7038364
+TIMESTAMP = 1538268183
+SHA256 (tdiary-full-v5.0.10.tar.gz) = a05ee96d6ac8c0dd5a8a9176ca3788d79be54ebdcf2ac5bc9a38b54edd03bf73
+SIZE (tdiary-full-v5.0.10.tar.gz) = 7300429
diff --git a/www/testlink/Makefile b/www/testlink/Makefile
index 3cae7a53c00c..989e6fc66b50 100644
--- a/www/testlink/Makefile
+++ b/www/testlink/Makefile
@@ -12,7 +12,7 @@ COMMENT= Web based test management and test execution system
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
USES= cpe php:web
CPE_VENDOR= teamst
diff --git a/www/usermanager/Makefile b/www/usermanager/Makefile
index ca6f0ef529fe..87db1c607693 100644
--- a/www/usermanager/Makefile
+++ b/www/usermanager/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ftp_v${PORTVERSION}
MAINTAINER= danger@FreeBSD.org
COMMENT= Easily create, change, or delete virtual PureFTPd users
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
WRKSRC= ${WRKDIR}/ftp
diff --git a/www/xcache/Makefile b/www/xcache/Makefile
index 807c87af78ce..6eea71518f89 100644
--- a/www/xcache/Makefile
+++ b/www/xcache/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE
USES= php:phpize tar:bzip2
-IGNORE_WITH_PHP= 70 71 72
+IGNORE_WITH_PHP= 70 71 72 73
CONFIGURE_ARGS= --enable-xcache=shared
diff --git a/www/yarn/Makefile b/www/yarn/Makefile
index 6d612c2bde0b..2fc98fcd09ef 100644
--- a/www/yarn/Makefile
+++ b/www/yarn/Makefile
@@ -2,7 +2,7 @@
PORTNAME= yarn
DISTVERSIONPREFIX= v
-DISTVERSION= 1.9.4
+DISTVERSION= 1.10.1
CATEGORIES= www
MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/
diff --git a/www/yarn/distinfo b/www/yarn/distinfo
index ac79cdf9e9ae..9adde652c7df 100644
--- a/www/yarn/distinfo
+++ b/www/yarn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535976334
-SHA256 (yarn-v1.9.4.tar.gz) = 7667eb715077b4bad8e2a832e7084e0e6f1ba54d7280dc573c8f7031a7fb093e
-SIZE (yarn-v1.9.4.tar.gz) = 937393
+TIMESTAMP = 1539006369
+SHA256 (yarn-v1.10.1.tar.gz) = 97bf147cb28229e66e4e3c5733a93c851bbcb0f10fbc72696ed011774f4c6f1b
+SIZE (yarn-v1.10.1.tar.gz) = 1107068