pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/www



Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Nov  4 22:10:16 UTC 2019

Modified Files:
        pkgsrc/www/SOGo: Makefile
        pkgsrc/www/SOGo4: Makefile
        pkgsrc/www/SpeedyCGI: Makefile
        pkgsrc/www/album_themes: Makefile
        pkgsrc/www/ap-mono: Makefile
        pkgsrc/www/ap2-auth-mellon: Makefile
        pkgsrc/www/ap2-encoding: Makefile
        pkgsrc/www/ap2-jk: Makefile
        pkgsrc/www/ap2-mkdir: Makefile
        pkgsrc/www/ap2-upload: Makefile
        pkgsrc/www/ap22-auth-ofba: Makefile
        pkgsrc/www/ap22-dnssd: Makefile
        pkgsrc/www/apache24: options.mk
        pkgsrc/www/aws: Makefile options.mk
        pkgsrc/www/aws-demos: Makefile
        pkgsrc/www/bluefish: Makefile
        pkgsrc/www/browser-bookmarks-menu: Makefile
        pkgsrc/www/c-icap-modules: options.mk
        pkgsrc/www/caddy: Makefile
        pkgsrc/www/cgilib: Makefile
        pkgsrc/www/clearsilver: Makefile Makefile.common
        pkgsrc/www/contao35: Makefile
        pkgsrc/www/cronolog: Makefile
        pkgsrc/www/davical: Makefile
        pkgsrc/www/dillo: Makefile
        pkgsrc/www/drivel: hacks.mk
        pkgsrc/www/drupal7: Makefile
        pkgsrc/www/drupal8: Makefile
        pkgsrc/www/e2guardian: Makefile
        pkgsrc/www/elinks: options.mk
        pkgsrc/www/eliom: Makefile
        pkgsrc/www/emacs-w3m: Makefile
        pkgsrc/www/epiphany: Makefile
        pkgsrc/www/fengoffice: Makefile
        pkgsrc/www/firefox: Makefile mozilla-common.mk options.mk
        pkgsrc/www/firefox-l10n: Makefile
        pkgsrc/www/firefox52: Makefile mozilla-common.mk options.mk
        pkgsrc/www/firefox52-l10n: Makefile
        pkgsrc/www/firefox60: Makefile mozilla-common.mk options.mk
        pkgsrc/www/firefox60-l10n: Makefile
        pkgsrc/www/firefox68: Makefile mozilla-common.mk options.mk
        pkgsrc/www/firefox68-l10n: Makefile
        pkgsrc/www/gallery: Makefile
        pkgsrc/www/ganglia-webfrontend: options.mk
        pkgsrc/www/go-cssmin: Makefile
        pkgsrc/www/go-gohtml: Makefile
        pkgsrc/www/goaccess: Makefile options.mk
        pkgsrc/www/gtkasp2php: Makefile
        pkgsrc/www/horde: Makefile options.mk
        pkgsrc/www/htmldoc: Makefile.common
        pkgsrc/www/hugo: Makefile
        pkgsrc/www/ies4linux: Makefile
        pkgsrc/www/ikiwiki: options.mk
        pkgsrc/www/kahua: Makefile
        pkgsrc/www/khtml: Makefile
        pkgsrc/www/librest: Makefile
        pkgsrc/www/librest07: Makefile
        pkgsrc/www/lighttpd: Makefile options.mk
        pkgsrc/www/llgal: Makefile
        pkgsrc/www/lynx: Makefile options.mk
        pkgsrc/www/midori: Makefile
        pkgsrc/www/mimetex: Makefile
        pkgsrc/www/mono-xsp: Makefile
        pkgsrc/www/moodle: Makefile
        pkgsrc/www/netscape: Makefile
        pkgsrc/www/nginx: Makefile.common options.mk
        pkgsrc/www/ocaml-cohttp: Makefile
        pkgsrc/www/ocaml-curl: Makefile
        pkgsrc/www/ocaml-uri: buildlink3.mk
        pkgsrc/www/ocsigen: Makefile options.mk
        pkgsrc/www/ocsigen-i18n: Makefile
        pkgsrc/www/ocsigen-start: Makefile
        pkgsrc/www/opera: Makefile
        pkgsrc/www/p5-AnyEvent-HTTP: Makefile
        pkgsrc/www/p5-AnyEvent-HTTPD: Makefile
        pkgsrc/www/p5-App-Nopaste: Makefile
        pkgsrc/www/p5-CGI-Compile: Makefile
        pkgsrc/www/p5-CGI-Cookie-XS: Makefile
        pkgsrc/www/p5-CGI-Emulate-PSGI: Makefile
        pkgsrc/www/p5-CGI-PSGI: Makefile
        pkgsrc/www/p5-CGI-Simple: Makefile
        pkgsrc/www/p5-CSS-Tiny: Makefile
        pkgsrc/www/p5-Catalyst-Action-REST: Makefile
        pkgsrc/www/p5-Catalyst-Action-RenderView: Makefile
        pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP: Makefile
        pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy: Makefile
        pkgsrc/www/p5-Catalyst-Authentication-Store-Htpasswd: Makefile
        pkgsrc/www/p5-Catalyst-Controller-BindLex: Makefile
        pkgsrc/www/p5-Catalyst-Controller-FormBuilder: Makefile
        pkgsrc/www/p5-Catalyst-Controller-HTML-FormFu: Makefile
        pkgsrc/www/p5-Catalyst-Devel: Makefile
        pkgsrc/www/p5-Catalyst-DispatchType-Regex: Makefile
        pkgsrc/www/p5-Catalyst-Engine-JobQueue-POE: Makefile
        pkgsrc/www/p5-Catalyst-Engine-PSGI: Makefile
        pkgsrc/www/p5-Catalyst-Manual: Makefile
        pkgsrc/www/p5-Catalyst-Model-File: Makefile
        pkgsrc/www/p5-Catalyst-Plugin-Authentication: Makefile
        pkgsrc/www/p5-Catalyst-Plugin-ConfigLoader: Makefile
        pkgsrc/www/p5-Catalyst-Plugin-Session-State-Cookie: Makefile
        pkgsrc/www/p5-Catalyst-Plugin-Session-Store-DBIC: Makefile
        pkgsrc/www/p5-Catalyst-Plugin-Session-Store-Delegate: Makefile
        pkgsrc/www/p5-Catalyst-Plugin-Session-Store-FastMmap: Makefile
        pkgsrc/www/p5-Catalyst-Plugin-Session-Store-File: Makefile
        pkgsrc/www/p5-Catalyst-Runtime: Makefile
        pkgsrc/www/p5-Catalyst-View-Jemplate: Makefile
        pkgsrc/www/p5-Catalyst-View-TT: Makefile
        pkgsrc/www/p5-CatalystX-CRUD-View-Excel: Makefile
        pkgsrc/www/p5-CatalystX-CRUD-YUI: Makefile
        pkgsrc/www/p5-Cookie-Baker: Makefile
        pkgsrc/www/p5-Cookie-XS: Makefile
        pkgsrc/www/p5-Dancer: Makefile
        pkgsrc/www/p5-Dancer-Session-Cookie: Makefile
        pkgsrc/www/p5-Dancer2: Makefile
        pkgsrc/www/p5-File-Mork: Makefile
        pkgsrc/www/p5-HTML-FormFu: Makefile
        pkgsrc/www/p5-HTML-Lint: Makefile
        pkgsrc/www/p5-HTML-Mason-PSGIHandler: Makefile
        pkgsrc/www/p5-HTML-Prototype: Makefile
        pkgsrc/www/p5-HTML-Prototype-Useful: Makefile
        pkgsrc/www/p5-HTML-Selector-XPath: Makefile
        pkgsrc/www/p5-HTML-Stream: Makefile
        pkgsrc/www/p5-HTML-StripScripts-Parser: Makefile
        pkgsrc/www/p5-HTML-TreeBuilder-LibXML: Makefile
        pkgsrc/www/p5-HTML-TreeBuilder-XPath: Makefile
        pkgsrc/www/p5-HTMLObject: Makefile
        pkgsrc/www/p5-HTTP-Date: Makefile
        pkgsrc/www/p5-HTTP-GHTTP: Makefile
        pkgsrc/www/p5-HTTP-OAI: Makefile
        pkgsrc/www/p5-HTTP-Parser: Makefile
        pkgsrc/www/p5-HTTP-Server-EV: Makefile
        pkgsrc/www/p5-HTTP-Server-Simple-PSGI: Makefile
        pkgsrc/www/p5-HTTP-Tiny-Mech: Makefile
        pkgsrc/www/p5-Handel: Makefile
        pkgsrc/www/p5-JSON-RPC: Makefile
        pkgsrc/www/p5-Kwiki-Users-Remote: Makefile
        pkgsrc/www/p5-Mojolicious: Makefile
        pkgsrc/www/p5-Net-HTTP: Makefile
        pkgsrc/www/p5-POE-Component-Server-PSGI: Makefile
        pkgsrc/www/p5-POE-Component-Server-SOAP: Makefile
        pkgsrc/www/p5-POE-Filter-HTTP-Parser: Makefile
        pkgsrc/www/p5-PSGI: Makefile
        pkgsrc/www/p5-ParallelUserAgent: Makefile
        pkgsrc/www/p5-Plack: Makefile
        pkgsrc/www/p5-Plack-App-Proxy: Makefile
        pkgsrc/www/p5-Plack-Handler-AnyEvent-ReverseHTTP: Makefile
        pkgsrc/www/p5-Plack-Handler-AnyEvent-SCGI: Makefile
        pkgsrc/www/p5-Plack-Middleware-Auth-Digest: Makefile
        pkgsrc/www/p5-Plack-Middleware-ConsoleLogger: Makefile
        pkgsrc/www/p5-Plack-Middleware-FixMissingBodyInRedirect: Makefile
        pkgsrc/www/p5-Plack-Middleware-MethodOverride: Makefile
        pkgsrc/www/p5-Plack-Middleware-RemoveRedundantBody: Makefile
        pkgsrc/www/p5-Plack-Middleware-ReverseProxy: Makefile
        pkgsrc/www/p5-Plack-Middleware-Session: Makefile
        pkgsrc/www/p5-Plack-Test-Agent: Makefile
        pkgsrc/www/p5-Plack-Test-ExternalServer: Makefile
        pkgsrc/www/p5-Pod-POM-Web: Makefile
        pkgsrc/www/p5-Reaction: Makefile
        pkgsrc/www/p5-Rose-HTML-Objects: Makefile
        pkgsrc/www/p5-Router-Simple: Makefile
        pkgsrc/www/p5-Session-Storage-Secure: Makefile
        pkgsrc/www/p5-Starlet: Makefile
        pkgsrc/www/p5-Starman: Makefile
        pkgsrc/www/p5-Task-CatInABox: Makefile
        pkgsrc/www/p5-Task-Catalyst-Tutorial: Makefile
        pkgsrc/www/p5-Tatsumaki: Makefile
        pkgsrc/www/p5-Template-Plugin-Subst: Makefile
        pkgsrc/www/p5-Template-Stash-EscapeHTML: Makefile
        pkgsrc/www/p5-Test-HTTP-Server-Simple: Makefile
        pkgsrc/www/p5-Test-WWW-Mechanize-Catalyst: Makefile
        pkgsrc/www/p5-Test-WWW-Mechanize-PSGI: Makefile
        pkgsrc/www/p5-Twiggy: Makefile
        pkgsrc/www/p5-URI-ws: Makefile
        pkgsrc/www/p5-WWW-Mechanize-Cached: Makefile
        pkgsrc/www/p5-WWW-Mechanize-GZip: Makefile
        pkgsrc/www/p5-WWW-Mechanize-Timed: Makefile
        pkgsrc/www/p5-WWW-Pastebin-PastebinCom-Create: Makefile
        pkgsrc/www/p5-WWW-Pastebin-RafbNet-Create: Makefile
        pkgsrc/www/p5-WWW-RobotRules: Makefile
        pkgsrc/www/p5-WWW-Shorten: Makefile
        pkgsrc/www/p5-Web-Scraper: Makefile
        pkgsrc/www/php-apcu_bc: Makefile
        pkgsrc/www/php-basercms: Makefile
        pkgsrc/www/php-glpi: Makefile
        pkgsrc/www/php-phrasea2: Makefile
        pkgsrc/www/php-tt-rss: options.mk
        pkgsrc/www/phraseanet-indexer: Makefile
        pkgsrc/www/py-HTMLgen: Makefile
        pkgsrc/www/py-beautifulsoup: Makefile
        pkgsrc/www/py-blosxom: Makefile
        pkgsrc/www/py-cloudfiles: Makefile
        pkgsrc/www/py-django14: options.mk
        pkgsrc/www/py-flask-wtf: options.mk
        pkgsrc/www/py-graphite-web: Makefile
        pkgsrc/www/py-python-digest: Makefile
        pkgsrc/www/py-recaptcha: Makefile
        pkgsrc/www/py-scgi: Makefile
        pkgsrc/www/py-simpletal: Makefile
        pkgsrc/www/py-sparqlwrapper: Makefile
        pkgsrc/www/py-trytond-webdav: Makefile
        pkgsrc/www/py-twill: Makefile
        pkgsrc/www/py-webassets: Makefile
        pkgsrc/www/py-webpy: Makefile
        pkgsrc/www/py-wtforms-components: options.mk
        pkgsrc/www/qDecoder: Makefile
        pkgsrc/www/ruby-borges: Makefile
        pkgsrc/www/ruby-jekyll-watch: Makefile
        pkgsrc/www/ruby-pygments.rb: Makefile
        pkgsrc/www/ruby-rest-client: Makefile
        pkgsrc/www/ruby-webunit: Makefile
        pkgsrc/www/screws: Makefile
        pkgsrc/www/seamonkey: Makefile options.mk
        pkgsrc/www/shibboleth-sp: Makefile
        pkgsrc/www/siege: options.mk
        pkgsrc/www/squid3: Makefile options.mk
        pkgsrc/www/squidGuard: Makefile
        pkgsrc/www/squidview: Makefile
        pkgsrc/www/thttpd: Makefile
        pkgsrc/www/typo3_62: Makefile
        pkgsrc/www/w3c-httpd: Makefile
        pkgsrc/www/w3m: Makefile.common
        pkgsrc/www/webkit24-gtk: options.mk
        pkgsrc/www/wml: Makefile
        pkgsrc/www/wwwoffle: Makefile options.mk
        pkgsrc/www/z-push: Makefile

Log Message:
www: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

Manually excluded phraseanet since pkglint got the indentation wrong.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/www/SOGo/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/SOGo4/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/www/SpeedyCGI/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/album_themes/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/ap-mono/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/www/ap2-auth-mellon/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ap2-encoding/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/ap2-jk/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/ap2-mkdir/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/ap2-upload/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ap22-auth-ofba/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/www/ap22-dnssd/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/apache24/options.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/aws/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/aws/options.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/aws-demos/Makefile
cvs rdiff -u -r1.143 -r1.144 pkgsrc/www/bluefish/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/www/browser-bookmarks-menu/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/c-icap-modules/options.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/caddy/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/cgilib/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/www/clearsilver/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/clearsilver/Makefile.common
cvs rdiff -u -r1.44 -r1.45 pkgsrc/www/contao35/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/www/cronolog/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/www/davical/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/www/dillo/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/drivel/hacks.mk
cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/drupal7/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/drupal8/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/e2guardian/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/elinks/options.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/www/eliom/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/emacs-w3m/Makefile
cvs rdiff -u -r1.188 -r1.189 pkgsrc/www/epiphany/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/www/fengoffice/Makefile
cvs rdiff -u -r1.400 -r1.401 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.142 -r1.143 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.49 -r1.50 pkgsrc/www/firefox/options.mk
cvs rdiff -u -r1.160 -r1.161 pkgsrc/www/firefox-l10n/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/www/firefox52/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/firefox52/mozilla-common.mk \
    pkgsrc/www/firefox52/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/firefox52-l10n/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/firefox60/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/firefox60/mozilla-common.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox60/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/firefox60-l10n/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox68/Makefile \
    pkgsrc/www/firefox68/mozilla-common.mk pkgsrc/www/firefox68/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox68-l10n/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/gallery/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ganglia-webfrontend/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/go-cssmin/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/go-gohtml/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/goaccess/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/goaccess/options.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/gtkasp2php/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/www/horde/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/horde/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/htmldoc/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/hugo/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/ies4linux/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/ikiwiki/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/kahua/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/khtml/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/librest/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/www/librest07/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/www/lighttpd/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/lighttpd/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/llgal/Makefile
cvs rdiff -u -r1.133 -r1.134 pkgsrc/www/lynx/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/lynx/options.mk
cvs rdiff -u -r1.122 -r1.123 pkgsrc/www/midori/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/mimetex/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/www/mono-xsp/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/www/moodle/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/netscape/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/nginx/Makefile.common
cvs rdiff -u -r1.51 -r1.52 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ocaml-cohttp/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/ocaml-curl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ocaml-uri/buildlink3.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/www/ocsigen/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/ocsigen/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/ocsigen-i18n/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/ocsigen-start/Makefile
cvs rdiff -u -r1.107 -r1.108 pkgsrc/www/opera/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/p5-AnyEvent-HTTP/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/p5-AnyEvent-HTTPD/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/p5-App-Nopaste/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/p5-CGI-Compile/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/p5-CGI-Cookie-XS/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/p5-CGI-Emulate-PSGI/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/p5-CGI-PSGI/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/p5-CGI-Simple/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/p5-CSS-Tiny/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/p5-Catalyst-Action-REST/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/p5-Catalyst-Action-RenderView/Makefile
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
cvs rdiff -u -r1.14 -r1.15 \
    pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/p5-Catalyst-Controller-BindLex/Makefile
cvs rdiff -u -r1.22 -r1.23 \
    pkgsrc/www/p5-Catalyst-Controller-FormBuilder/Makefile
cvs rdiff -u -r1.20 -r1.21 \
    pkgsrc/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/www/p5-Catalyst-Devel/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/p5-Catalyst-DispatchType-Regex/Makefile
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/www/p5-Catalyst-Engine-JobQueue-POE/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/p5-Catalyst-Engine-PSGI/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/www/p5-Catalyst-Manual/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/p5-Catalyst-Model-File/Makefile
cvs rdiff -u -r1.29 -r1.30 \
    pkgsrc/www/p5-Catalyst-Plugin-Authentication/Makefile
cvs rdiff -u -r1.24 -r1.25 \
    pkgsrc/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
cvs rdiff -u -r1.26 -r1.27 \
    pkgsrc/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
cvs rdiff -u -r1.23 -r1.24 \
    pkgsrc/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
cvs rdiff -u -r1.22 -r1.23 \
    pkgsrc/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
cvs rdiff -u -r1.25 -r1.26 \
    pkgsrc/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
cvs rdiff -u -r1.22 -r1.23 \
    pkgsrc/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/www/p5-Catalyst-Runtime/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/p5-Catalyst-View-Jemplate/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/p5-Catalyst-View-TT/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/p5-CatalystX-CRUD-View-Excel/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/p5-CatalystX-CRUD-YUI/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/p5-Cookie-Baker/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/p5-Cookie-XS/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/www/p5-Dancer/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/p5-Dancer-Session-Cookie/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/www/p5-Dancer2/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/p5-File-Mork/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/p5-HTML-FormFu/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/p5-HTML-Lint/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/p5-HTML-Mason-PSGIHandler/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/p5-HTML-Prototype/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/p5-HTML-Prototype-Useful/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/p5-HTML-Selector-XPath/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/p5-HTML-Stream/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/p5-HTML-StripScripts-Parser/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/p5-HTML-TreeBuilder-LibXML/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/p5-HTML-TreeBuilder-XPath/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/p5-HTMLObject/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/p5-HTTP-Date/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/p5-HTTP-GHTTP/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/p5-HTTP-OAI/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/p5-HTTP-Parser/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/p5-HTTP-Server-EV/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/p5-HTTP-Server-Simple-PSGI/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/p5-HTTP-Tiny-Mech/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/p5-Handel/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/p5-JSON-RPC/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/p5-Kwiki-Users-Remote/Makefile
cvs rdiff -u -r1.140 -r1.141 pkgsrc/www/p5-Mojolicious/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/p5-Net-HTTP/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/p5-POE-Component-Server-PSGI/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/p5-POE-Component-Server-SOAP/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/p5-POE-Filter-HTTP-Parser/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/p5-PSGI/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/p5-ParallelUserAgent/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/www/p5-Plack/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/p5-Plack-App-Proxy/Makefile
cvs rdiff -u -r1.14 -r1.15 \
    pkgsrc/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
cvs rdiff -u -r1.17 -r1.18 \
    pkgsrc/www/p5-Plack-Middleware-Auth-Digest/Makefile
cvs rdiff -u -r1.19 -r1.20 \
    pkgsrc/www/p5-Plack-Middleware-ConsoleLogger/Makefile
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/www/p5-Plack-Middleware-MethodOverride/Makefile
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
cvs rdiff -u -r1.17 -r1.18 \
    pkgsrc/www/p5-Plack-Middleware-ReverseProxy/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/p5-Plack-Middleware-Session/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/p5-Plack-Test-Agent/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/p5-Plack-Test-ExternalServer/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/p5-Pod-POM-Web/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/p5-Reaction/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/www/p5-Rose-HTML-Objects/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/p5-Router-Simple/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/p5-Session-Storage-Secure/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/p5-Starlet/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/p5-Starman/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/p5-Task-CatInABox/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/p5-Task-Catalyst-Tutorial/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/p5-Tatsumaki/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/p5-Template-Plugin-Subst/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/p5-Template-Stash-EscapeHTML/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/p5-Test-HTTP-Server-Simple/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/p5-Test-WWW-Mechanize-Catalyst/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/p5-Test-WWW-Mechanize-PSGI/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/p5-Twiggy/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/p5-URI-ws/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/p5-WWW-Mechanize-Cached/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/p5-WWW-Mechanize-GZip/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/p5-WWW-Mechanize-Timed/Makefile
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/p5-WWW-Pastebin-RafbNet-Create/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/p5-WWW-RobotRules/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/p5-WWW-Shorten/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/p5-Web-Scraper/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/php-apcu_bc/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/php-basercms/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/php-glpi/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/php-phrasea2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/php-tt-rss/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/phraseanet-indexer/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/py-HTMLgen/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/py-beautifulsoup/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/py-blosxom/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/py-cloudfiles/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/py-django14/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-flask-wtf/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/py-graphite-web/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/py-python-digest/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/py-recaptcha/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/py-scgi/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/py-simpletal/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/py-sparqlwrapper/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/py-trytond-webdav/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/py-twill/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/py-webassets/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/py-webpy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-wtforms-components/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/qDecoder/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/ruby-borges/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/ruby-jekyll-watch/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/ruby-pygments.rb/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/ruby-rest-client/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/ruby-webunit/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/www/screws/Makefile
cvs rdiff -u -r1.197 -r1.198 pkgsrc/www/seamonkey/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/seamonkey/options.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/shibboleth-sp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/siege/options.mk
cvs rdiff -u -r1.84 -r1.85 pkgsrc/www/squid3/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/squid3/options.mk
cvs rdiff -u -r1.37 -r1.38 pkgsrc/www/squidGuard/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/squidview/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/www/thttpd/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/typo3_62/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/w3c-httpd/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/www/w3m/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/webkit24-gtk/options.mk
cvs rdiff -u -r1.49 -r1.50 pkgsrc/www/wml/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/www/wwwoffle/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/wwwoffle/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/z-push/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/SOGo/Makefile
diff -u pkgsrc/www/SOGo/Makefile:1.54 pkgsrc/www/SOGo/Makefile:1.55
--- pkgsrc/www/SOGo/Makefile:1.54       Thu Aug 22 12:23:51 2019
+++ pkgsrc/www/SOGo/Makefile    Mon Nov  4 22:09:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/08/22 12:23:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.55 2019/11/04 22:09:50 rillig Exp $
 #
 
 DISTNAME=      SOGo-2.3.23
@@ -12,11 +12,11 @@ COMMENT=    Groupware server supporting Cal
 LICENSE=       gnu-gpl-v2
 
 HAS_CONFIGURE= yes
-USE_TOOLS+=     bash gmake zip:run
+USE_TOOLS+=    bash gmake zip:run
 
 CONFIG_SHELL=  bash
-CONFIGURE_ARGS= --enable-debug --disable-strip
-MAKE_JOBS_SAFE=                no
+CONFIGURE_ARGS=        --enable-debug --disable-strip
+MAKE_JOBS_SAFE=        no
 
 SOGOUSER?=     sogo
 SOGOGROUP?=    sogo
@@ -25,18 +25,18 @@ SOGORUNDIR?=        ${VARBASE}/sogo
 
 INSTALLATION_DIRS+=    share/examples/SOGo
 
-CONF_FILES+=   share/examples/SOGo/sogo-conf.sh \
-               ${PKG_SYSCONFDIR}/sogo-conf.sh
-CONF_FILES+=   share/examples/SOGo/SOGo.conf \
-               ${PKG_SYSCONFDIR}/SOGo.conf
-OWN_DIRS+=     ${SOGOETCDIR}
-OWN_DIRS+=     ${SOGORUNDIR}
+CONF_FILES+=           share/examples/SOGo/sogo-conf.sh \
+                       ${PKG_SYSCONFDIR}/sogo-conf.sh
+CONF_FILES+=           share/examples/SOGo/SOGo.conf \
+                       ${PKG_SYSCONFDIR}/SOGo.conf
+OWN_DIRS+=             ${SOGOETCDIR}
+OWN_DIRS+=             ${SOGORUNDIR}
 OWN_DIRS_PERMS+=       ${SOGOETCDIR} ${SOGOUSER} ${SOGOGROUP} 0755
 OWN_DIRS_PERMS+=       ${SOGORUNDIR} ${SOGOUSER} ${SOGOGROUP} 0755
-BUILD_DEFS+=   VARBASE
+BUILD_DEFS+=           VARBASE
 
-PKG_GROUPS+=   ${SOGOGROUP}
-PKG_USERS+=    ${SOGOUSER}:${SOGOGROUP}
+PKG_GROUPS+=           ${SOGOGROUP}
+PKG_USERS+=            ${SOGOUSER}:${SOGOGROUP}
 PKG_HOME.${SOGOUSER}=  ${SOGOETCDIR}
 PKG_SHELL.${SOGOUSER}= ${SH}
 PKG_GECOS.${SOGOUSER}= SOGo daemon user

Index: pkgsrc/www/SOGo4/Makefile
diff -u pkgsrc/www/SOGo4/Makefile:1.1 pkgsrc/www/SOGo4/Makefile:1.2
--- pkgsrc/www/SOGo4/Makefile:1.1       Wed Sep 11 12:01:54 2019
+++ pkgsrc/www/SOGo4/Makefile   Mon Nov  4 22:09:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/09/11 12:01:54 tm Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/04 22:09:50 rillig Exp $
 #
 
 DISTNAME=      SOGo-4.0.8
@@ -11,11 +11,11 @@ COMMENT=    Groupware server supporting Cal
 LICENSE=       gnu-gpl-v2
 
 HAS_CONFIGURE= yes
-USE_TOOLS+=     bash gmake zip:run
+USE_TOOLS+=    bash gmake zip:run
 
 CONFIG_SHELL=  bash
-CONFIGURE_ARGS= --enable-debug --disable-strip
-MAKE_JOBS_SAFE=                no
+CONFIGURE_ARGS=        --enable-debug --disable-strip
+MAKE_JOBS_SAFE=        no
 
 SOGOUSER?=     sogo
 SOGOGROUP?=    sogo
@@ -24,18 +24,18 @@ SOGORUNDIR?=        ${VARBASE}/sogo
 
 INSTALLATION_DIRS+=    share/examples/SOGo
 
-CONF_FILES+=   share/examples/SOGo/sogo-conf.sh \
-               ${PKG_SYSCONFDIR}/sogo-conf.sh
-CONF_FILES+=   share/examples/SOGo/SOGo.conf \
-               ${PKG_SYSCONFDIR}/SOGo.conf
-OWN_DIRS+=     ${SOGOETCDIR}
-OWN_DIRS+=     ${SOGORUNDIR}
+CONF_FILES+=           share/examples/SOGo/sogo-conf.sh \
+                       ${PKG_SYSCONFDIR}/sogo-conf.sh
+CONF_FILES+=           share/examples/SOGo/SOGo.conf \
+                       ${PKG_SYSCONFDIR}/SOGo.conf
+OWN_DIRS+=             ${SOGOETCDIR}
+OWN_DIRS+=             ${SOGORUNDIR}
 OWN_DIRS_PERMS+=       ${SOGOETCDIR} ${SOGOUSER} ${SOGOGROUP} 0755
 OWN_DIRS_PERMS+=       ${SOGORUNDIR} ${SOGOUSER} ${SOGOGROUP} 0755
-BUILD_DEFS+=   VARBASE
+BUILD_DEFS+=           VARBASE
 
-PKG_GROUPS+=   ${SOGOGROUP}
-PKG_USERS+=    ${SOGOUSER}:${SOGOGROUP}
+PKG_GROUPS+=           ${SOGOGROUP}
+PKG_USERS+=            ${SOGOUSER}:${SOGOGROUP}
 PKG_HOME.${SOGOUSER}=  ${SOGOETCDIR}
 PKG_SHELL.${SOGOUSER}= ${SH}
 PKG_GECOS.${SOGOUSER}= SOGo daemon user
@@ -47,11 +47,11 @@ FILES_SUBST+=       SOGOETCDIR=${SOGOETCDIR}
 FILES_SUBST+=  SOGOUSER=${SOGOUSER}
 RCD_SCRIPTS=   sogod
 
-SUBST_CLASSES+=         paths
-SUBST_MESSAGE.paths=    Fixing hardcoded paths.
-SUBST_STAGE.paths=      pre-configure
-SUBST_FILES.paths=      SoObjects/SOGo/SOGoSystemDefaults.m
-SUBST_SED.paths=        -e 's,/etc/sogo/,${PKG_SYSCONFDIR}/,g'
+SUBST_CLASSES+=                paths
+SUBST_MESSAGE.paths=   Fixing hardcoded paths.
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     SoObjects/SOGo/SOGoSystemDefaults.m
+SUBST_SED.paths=       -e 's,/etc/sogo/,${PKG_SYSCONFDIR}/,g'
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-pie
 

Index: pkgsrc/www/SpeedyCGI/Makefile
diff -u pkgsrc/www/SpeedyCGI/Makefile:1.26 pkgsrc/www/SpeedyCGI/Makefile:1.27
--- pkgsrc/www/SpeedyCGI/Makefile:1.26  Sun Aug 11 13:24:16 2019
+++ pkgsrc/www/SpeedyCGI/Makefile       Mon Nov  4 22:09:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:24:16 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/04 22:09:50 rillig Exp $
 
 DISTNAME=      CGI-SpeedyCGI-2.22
 PKGNAME=       SpeedyCGI-2.22
@@ -12,7 +12,7 @@ COMMENT=      Speed up perl scripts by runnin
 
 MAKE_JOBS_SAFE=                no
 
-PERL5_PACKLIST=        auto/CGI/SpeedyCGI/.packlist
+PERL5_PACKLIST=                auto/CGI/SpeedyCGI/.packlist
 
 # XXX Kick can down the road and hope the developer fixes this issue.
 MAKE_ENV+=             PERL_USE_UNSAFE_INC=1

Index: pkgsrc/www/album_themes/Makefile
diff -u pkgsrc/www/album_themes/Makefile:1.19 pkgsrc/www/album_themes/Makefile:1.20
--- pkgsrc/www/album_themes/Makefile:1.19       Sun Aug 11 13:24:16 2019
+++ pkgsrc/www/album_themes/Makefile    Mon Nov  4 22:09:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:24:16 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/04 22:09:50 rillig Exp $
 #
 
 DISTNAME=      album_data
@@ -24,7 +24,7 @@ A_HTTPDIR=    share/httpd/htdocs/Album
 
 PLIST_SRC=             ${WRKDIR}/PLIST
 
-MESSAGE_SUBST= A_DATADIR=${A_DATADIR} A_HTTPDIR=${A_HTTPDIR}
+MESSAGE_SUBST= A_DATADIR=${A_DATADIR} A_HTTPDIR=${A_HTTPDIR}
 
 INSTALLATION_DIRS=     ${A_DATADIR}
 

Index: pkgsrc/www/ap-mono/Makefile
diff -u pkgsrc/www/ap-mono/Makefile:1.42 pkgsrc/www/ap-mono/Makefile:1.43
--- pkgsrc/www/ap-mono/Makefile:1.42    Wed Sep 11 11:53:40 2019
+++ pkgsrc/www/ap-mono/Makefile Mon Nov  4 22:09:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/09/11 11:53:40 nia Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/04 22:09:50 rillig Exp $
 
 DISTNAME=      mod_mono-3.12
 PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -15,11 +15,11 @@ APACHE_MODULE=              yes
 CONF_FILES=            ${PREFIX}/share/examples/httpd/mod_mono.conf\
                        ${PKG_SYSCONFDIR}/httpd/mod_mono.conf
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-apxs=${APXS:Q}
-USE_TOOLS+=    gmake pkg-config
-USE_LIBTOOL=   yes
-MAKE_JOBS_SAFE=        no
+USE_TOOLS+=            gmake pkg-config
+USE_LIBTOOL=           yes
+MAKE_JOBS_SAFE=                no
 
 .include "../../lang/mono/buildlink3.mk"
 .include "../../www/mono-xsp/buildlink3.mk"

Index: pkgsrc/www/ap2-auth-mellon/Makefile
diff -u pkgsrc/www/ap2-auth-mellon/Makefile:1.52 pkgsrc/www/ap2-auth-mellon/Makefile:1.53
--- pkgsrc/www/ap2-auth-mellon/Makefile:1.52    Thu Aug 22 12:23:52 2019
+++ pkgsrc/www/ap2-auth-mellon/Makefile Mon Nov  4 22:09:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/08/22 12:23:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/04 22:09:51 rillig Exp $
 
 DISTNAME=      mod_auth_mellon-0.14.2
 PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/g}
@@ -34,7 +34,7 @@ do-install:
            ${APXS} -i -S LIBEXECDIR=${DESTDIR}"$${libexecdir}"         \
              -n auth_mellon  mod_auth_mellon.la
 
-BUILDLINK_ABI_DEPENDS.lasso+=   lasso>=2.1.0
+BUILDLINK_ABI_DEPENDS.lasso+=  lasso>=2.1.0
 
 .include "../../security/lasso/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/www/ap2-encoding/Makefile
diff -u pkgsrc/www/ap2-encoding/Makefile:1.2 pkgsrc/www/ap2-encoding/Makefile:1.3
--- pkgsrc/www/ap2-encoding/Makefile:1.2        Mon Jan  1 10:23:07 2018
+++ pkgsrc/www/ap2-encoding/Makefile    Mon Nov  4 22:09:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/01/01 10:23:07 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/04 22:09:51 rillig Exp $
 
 DISTNAME=              mod_encoding-20021209
 PKGNAME=               ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -15,7 +15,7 @@ GNU_CONFIGURE=                yes
 
 DOC_DIR=               share/doc/${DISTNAME:C/-.*//}
 INSTALLATION_DIRS+=    lib/httpd ${DOC_DIR}
-PLIST_SUBST+=           DOC_DIR=${DOC_DIR}
+PLIST_SUBST+=          DOC_DIR=${DOC_DIR}
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOC_DIR}

Index: pkgsrc/www/ap2-jk/Makefile
diff -u pkgsrc/www/ap2-jk/Makefile:1.12 pkgsrc/www/ap2-jk/Makefile:1.13
--- pkgsrc/www/ap2-jk/Makefile:1.12     Sat Aug 25 01:57:43 2018
+++ pkgsrc/www/ap2-jk/Makefile  Mon Nov  4 22:09:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/08/25 01:57:43 manu Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 22:09:51 rillig Exp $
 
 DISTNAME=      tomcat-connectors-${JK_VERSION}-src
 PKGNAME=       ${APACHE_PKG_PREFIX}-jk-${JK_VERSION}
@@ -28,9 +28,9 @@ WRKSRC=               ${WRKDIR}/${DISTNAME}/native
 APACHE_MODULE= YES
 BUILD_DEFS+=   JK_ENABLE_JNI
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake
 OVERRIDE_DIRDEPTH=     3
 
 SUBST_CLASSES+=                jk-lt
@@ -49,7 +49,7 @@ SUBST_MESSAGE.jk-shlt=        Fixing libtool re
 CONFIGURE_ARGS+=       --with-apxs=${APXS:Q}
 
 .if defined(JK_ENABLE_JNI)
-USE_JAVA=      yes
+USE_JAVA=              yes
 CONFIGURE_ARGS+=       --enable-jni
 CONFIGURE_ARGS+=       --with-java-home=${JAVA_HOME:Q}
 SUBST_FILES.jk-lt+=    jni/Makefile

Index: pkgsrc/www/ap2-mkdir/Makefile
diff -u pkgsrc/www/ap2-mkdir/Makefile:1.3 pkgsrc/www/ap2-mkdir/Makefile:1.4
--- pkgsrc/www/ap2-mkdir/Makefile:1.3   Wed May  9 12:19:13 2018
+++ pkgsrc/www/ap2-mkdir/Makefile       Mon Nov  4 22:09:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/05/09 12:19:13 manu Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/04 22:09:51 rillig Exp $
 
 DISTNAME=              mod_mkdir-0.4
 EXTRACT_SUFX=          .tgz
@@ -14,7 +14,7 @@ APACHE_MODULE_NAME=   ${DISTNAME:C/-.*//}.
 
 DOC_DIR=               share/doc/${DISTNAME:C/-.*//}
 INSTALLATION_DIRS+=    lib/httpd ${DOC_DIR}
-PLIST_SUBST+=           DOC_DIR=${DOC_DIR}
+PLIST_SUBST+=          DOC_DIR=${DOC_DIR}
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOC_DIR}

Index: pkgsrc/www/ap2-upload/Makefile
diff -u pkgsrc/www/ap2-upload/Makefile:1.3 pkgsrc/www/ap2-upload/Makefile:1.4
--- pkgsrc/www/ap2-upload/Makefile:1.3  Mon Jan  8 09:04:50 2018
+++ pkgsrc/www/ap2-upload/Makefile      Mon Nov  4 22:09:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/01/08 09:04:50 manu Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/04 22:09:51 rillig Exp $
 
 DISTNAME=      mod_upload-0.8
 PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -10,16 +10,16 @@ HOMEPAGE=   https://ftp.espci.fr/pub/mod_u
 COMMENT=       High performance file upload helper for PHP
 LICENSE=       gnu-gpl-v2
 
-APACHE_MODULE_NAME=     ${DISTNAME:C/-.*//}.la
+APACHE_MODULE_NAME=    ${DISTNAME:C/-.*//}.la
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-apxs=${APXS}
 CONFIGURE_ARGS+=       --with-php-config=${BUILDLINK_PREFIX.php}/bin/php-config
 USE_LIBTOOL=           yes
 
-DOC_DIR=                share/doc/${DISTNAME:C/-.*//}
-INSTALLATION_DIRS+=     lib/httpd ${DOC_DIR}
-PLIST_SUBST+=           DOC_DIR=${DOC_DIR}
+DOC_DIR=               share/doc/${DISTNAME:C/-.*//}
+INSTALLATION_DIRS+=    lib/httpd ${DOC_DIR}
+PLIST_SUBST+=          DOC_DIR=${DOC_DIR}
 
 do-build:
        cd ${WRKSRC} && ${MAKE}

Index: pkgsrc/www/ap22-auth-ofba/Makefile
diff -u pkgsrc/www/ap22-auth-ofba/Makefile:1.2 pkgsrc/www/ap22-auth-ofba/Makefile:1.3
--- pkgsrc/www/ap22-auth-ofba/Makefile:1.2      Mon Jan  1 10:23:08 2018
+++ pkgsrc/www/ap22-auth-ofba/Makefile  Mon Nov  4 22:09:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/01/01 10:23:08 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/04 22:09:51 rillig Exp $
 
 DISTNAME=      mod_auth_ofba-0.6
 PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/g}
@@ -17,7 +17,7 @@ USE_APR=      yes
 
 .include "../../mk/apache.mk"
 
-APACHE_MODULE_NAME=     mod_auth_ofba.${MODULE_EXT}
+APACHE_MODULE_NAME=    mod_auth_ofba.${MODULE_EXT}
 MODULE_EXT=            la
 
 DOC_DIR=               share/doc/mod_auth_ofba

Index: pkgsrc/www/ap22-dnssd/Makefile
diff -u pkgsrc/www/ap22-dnssd/Makefile:1.46 pkgsrc/www/ap22-dnssd/Makefile:1.47
--- pkgsrc/www/ap22-dnssd/Makefile:1.46 Sun Jul 21 22:25:53 2019
+++ pkgsrc/www/ap22-dnssd/Makefile      Mon Nov  4 22:09:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2019/07/21 22:25:53 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2019/11/04 22:09:51 rillig Exp $
 #
 
 DISTNAME=      mod_dnssd-0.6
@@ -16,7 +16,7 @@ GNU_CONFIGURE=        yes
 USE_TOOLS=     pkg-config gmake
 USE_LIBTOOL=   yes
 
-CFLAGS.SunOS+= -D__EXTENSIONS__        # may be needed for PATH_MAX
+CFLAGS.SunOS+=         -D__EXTENSIONS__        # may be needed for PATH_MAX
 CONFIGURE_ENV+=                APXS=${APXS:Q}
 CONFIGURE_ARGS+=       --disable-lynx
 

Index: pkgsrc/www/apache24/options.mk
diff -u pkgsrc/www/apache24/options.mk:1.15 pkgsrc/www/apache24/options.mk:1.16
--- pkgsrc/www/apache24/options.mk:1.15 Fri Jun  7 11:26:20 2019
+++ pkgsrc/www/apache24/options.mk      Mon Nov  4 22:09:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2019/06/07 11:26:20 tm Exp $
+# $NetBSD: options.mk,v 1.16 2019/11/04 22:09:51 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.apache
 PKG_SUPPORTED_OPTIONS=         apache-mpm-event apache-mpm-prefork apache-mpm-worker \
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=          apache-mpm-event
 .if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.1[0-9])
 PKG_SUPPORTED_OPTIONS+=                privileges
 # Disabled until DTrace support is fully implemented/fixed
-#PKG_SUPPORTED_OPTIONS+=               dtrace
+#PKG_SUPPORTED_OPTIONS+=       dtrace
 .endif
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/www/aws/Makefile
diff -u pkgsrc/www/aws/Makefile:1.28 pkgsrc/www/aws/Makefile:1.29
--- pkgsrc/www/aws/Makefile:1.28        Sat Jul 20 22:46:54 2019
+++ pkgsrc/www/aws/Makefile     Mon Nov  4 22:09:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/07/20 22:46:54 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/04 22:09:51 rillig Exp $
 
 DISTNAME=      aws-${AWS_VERSION}
 PKGREVISION=   14
@@ -13,7 +13,7 @@ LICENSE=      gnu-gpl-v2
 
 AWS_VERSION=           3.1.0.0
 USE_TOOLS+=            gmake makeinfo sed awk
-USE_LANGUAGES=         c ada c++ fortran
+USE_LANGUAGES=         c ada c++ fortran
 
 # Note: c++ and fortran aren't used, but gprconfig probes for them.
 # When that happens, pkgsrc wrapper emits a warning message which causes
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=      ZPATH=${BUILDLINK_PREFI
 #      it doesn't support the concept of DESTDIR.
 # "-Wl,-R" adds a second rpath string.
 # -Wl,-rpath is a better choice, but synonym -Wl,-R works on all BSD and SunOS
-SUBST_CLASSES+=        rpath
+SUBST_CLASSES+=                rpath
 SUBST_STAGE.rpath=     pre-configure
 SUBST_MESSAGE.rpath=   Adjust rpaths of shared libraries
 SUBST_FILES.rpath=     src/src.gpr include/include.gpr \
@@ -46,8 +46,8 @@ SUBST_SED.rpath=      -e "s,@ADDITIONAL_RPATH
                        -e "s,@SSL_RPATH@,${BUILDLINK_PREFIX.openssl}/lib,g"
 ADDITIONAL_RPATH=      ${PREFIX}/lib:${PREFIX}/lib/aws/relocatable
 
-GENERATE_PLIST=  cd ${DESTDIR}${PREFIX};
-GENERATE_PLIST+= ${FIND} * -type f | ${SORT};
+GENERATE_PLIST=                cd ${DESTDIR}${PREFIX};
+GENERATE_PLIST+=       ${FIND} * -type f | ${SORT};
 
 do-configure:
        cd ${WRKSRC} && ${SETENV} ${MY_CONF_ENV} \

Index: pkgsrc/www/aws/options.mk
diff -u pkgsrc/www/aws/options.mk:1.10 pkgsrc/www/aws/options.mk:1.11
--- pkgsrc/www/aws/options.mk:1.10      Fri May  9 22:45:15 2014
+++ pkgsrc/www/aws/options.mk   Mon Nov  4 22:09:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2014/05/09 22:45:15 marino Exp $
+# $NetBSD: options.mk,v 1.11 2019/11/04 22:09:51 rillig Exp $
 
 
 # xmlada is built-in (not optional) due to gprbuild dependency
@@ -9,11 +9,11 @@
 # should not be switched on per default even on systems which
 # support IPv6. For that reason, the option name is not "inet6".
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.aws
+PKG_OPTIONS_VAR=               PKG_OPTIONS.aws
 PKG_OPTIONS_OPTIONAL_GROUPS=   slayer
 PKG_OPTIONS_GROUP.slayer=      ssl gnutls
-PKG_SUPPORTED_OPTIONS= ldap inet6 debug relocatable
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_SUPPORTED_OPTIONS=         ldap inet6 debug relocatable
+PKG_SUGGESTED_OPTIONS=         ssl
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
@@ -71,9 +71,9 @@ CONFIGURE_ARGS+= LDAP=true
 ##  IPv6 Support  ##
 ####################
 
-PLIST_VARS+= ipv6 noipv6
+PLIST_VARS+=           ipv6 noipv6
 .if !empty(PKG_OPTIONS:Mipv6)
-CONFIGURE_ARGS+= IPv6=true
+CONFIGURE_ARGS+=       IPv6=true
 .endif
 
 #####################
@@ -81,8 +81,8 @@ CONFIGURE_ARGS+= IPv6=true
 #####################
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= DEBUG=true
-DOTBUILD=debug
+CONFIGURE_ARGS+=       DEBUG=true
+DOTBUILD=              debug
 .endif
 
 ##############################
@@ -90,7 +90,7 @@ DOTBUILD=debug
 ##############################
 
 #.if !empty(PKG_OPTIONS:Mdisable-shared-rt)
-CONFIGURE_ARGS+= ENABLE_SHARED=false
+CONFIGURE_ARGS+=       ENABLE_SHARED=false
 #.endif
 
 ############################
@@ -98,5 +98,5 @@ CONFIGURE_ARGS+= ENABLE_SHARED=false
 ############################
 
 .if !empty(PKG_OPTIONS:Mrelocatable)
-CONFIGURE_ARGS+= DEFAULT_LIBRARY_TYPE=relocatable
+CONFIGURE_ARGS+=       DEFAULT_LIBRARY_TYPE=relocatable
 .endif

Index: pkgsrc/www/aws-demos/Makefile
diff -u pkgsrc/www/aws-demos/Makefile:1.24 pkgsrc/www/aws-demos/Makefile:1.25
--- pkgsrc/www/aws-demos/Makefile:1.24  Sat Jul 20 22:46:55 2019
+++ pkgsrc/www/aws-demos/Makefile       Mon Nov  4 22:09:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/07/20 22:46:55 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/04 22:09:52 rillig Exp $
 
 DISTNAME=      aws-${AWS_VERSION}
 PKGNAME=       aws-demos-${AWS_VERSION}
@@ -31,7 +31,7 @@ MY_CONF_ENV+=         PATH=${PREFIX}/gcc5-aux/b
 CONFIGURE_ARGS+=       LPATH=${BUILDLINK_PREFIX.openssl}/lib
 CONFIGURE_ARGS+=       ZPATH=${BUILDLINK_PREFIX.zlib}/lib
 
-SUBST_CLASSES+=        lpath
+SUBST_CLASSES+=                lpath
 SUBST_STAGE.lpath=     pre-configure
 SUBST_MESSAGE.lpath=   Add library path for ldap
 SUBST_FILES.lpath=     demos/test_ldap/test_ldap.gpr

Index: pkgsrc/www/bluefish/Makefile
diff -u pkgsrc/www/bluefish/Makefile:1.143 pkgsrc/www/bluefish/Makefile:1.144
--- pkgsrc/www/bluefish/Makefile:1.143  Mon Sep  2 13:20:04 2019
+++ pkgsrc/www/bluefish/Makefile        Mon Nov  4 22:09:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.143 2019/09/02 13:20:04 adam Exp $
+# $NetBSD: Makefile,v 1.144 2019/11/04 22:09:52 rillig Exp $
 
 DISTNAME=      bluefish-2.2.10
 PKGREVISION=   3
@@ -22,12 +22,12 @@ CONFIGURE_ARGS+=    --with-freedesktop_org-
 CONFIGURE_ENV+=                EXTERNAL_GREP=${TOOLS_GREP:Q}
 CONFIGURE_ENV+=                EXTERNAL_FIND=${TOOLS_FIND:Q}
 
-CHECK_WRKREF_SKIP+=    lib/bluefish/about.so
-REPLACE_PYTHON+=       data/lorem-ipsum-generator data/jsbeautify
-REPLACE_PYTHON+=       data/cssmin.py data/jsmin.py
-REPLACE_PYTHON+=       data/css_decompressor
-CHECK_INTERPRETER_SKIP+= share/bluefish/plugins/*/*.py
-CHECK_INTERPRETER_SKIP+= share/bluefish/plugins/*/*/*.py
+CHECK_WRKREF_SKIP+=            lib/bluefish/about.so
+REPLACE_PYTHON+=               data/lorem-ipsum-generator data/jsbeautify
+REPLACE_PYTHON+=               data/cssmin.py data/jsmin.py
+REPLACE_PYTHON+=               data/css_decompressor
+CHECK_INTERPRETER_SKIP+=       share/bluefish/plugins/*/*.py
+CHECK_INTERPRETER_SKIP+=       share/bluefish/plugins/*/*/*.py
 
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 2.2.4
 

Index: pkgsrc/www/browser-bookmarks-menu/Makefile
diff -u pkgsrc/www/browser-bookmarks-menu/Makefile:1.68 pkgsrc/www/browser-bookmarks-menu/Makefile:1.69
--- pkgsrc/www/browser-bookmarks-menu/Makefile:1.68     Mon Sep  2 13:20:02 2019
+++ pkgsrc/www/browser-bookmarks-menu/Makefile  Mon Nov  4 22:09:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2019/09/02 13:20:02 adam Exp $
+# $NetBSD: Makefile,v 1.69 2019/11/04 22:09:52 rillig Exp $
 
 DISTNAME=      browser-bookmarks-menu-0.6
 PKGREVISION=   43
@@ -17,8 +17,8 @@ SUBST_CLASSES+=               paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_MESSAGE.paths=   Fixing paths to installed files.
 SUBST_FILES.paths=     BrowserBookmarksMenu.server
-SUBST_SED.paths= -e 's|/usr/lib/browser-bookmarks-menu|${PREFIX}/libexec|g'
-SUBST_SED.paths+= -e 's|/usr/share|${PREFIX}/share|g'
+SUBST_SED.paths=       -e 's|/usr/lib/browser-bookmarks-menu|${PREFIX}/libexec|g'
+SUBST_SED.paths+=      -e 's|/usr/share|${PREFIX}/share|g'
 
 INSTALLATION_DIRS=     lib/bonobo/servers libexec
 

Index: pkgsrc/www/c-icap-modules/options.mk
diff -u pkgsrc/www/c-icap-modules/options.mk:1.3 pkgsrc/www/c-icap-modules/options.mk:1.4
--- pkgsrc/www/c-icap-modules/options.mk:1.3    Fri Jun 12 23:40:16 2015
+++ pkgsrc/www/c-icap-modules/options.mk        Mon Nov  4 22:09:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2015/06/12 23:40:16 taca Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/04 22:09:52 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.c-icap
 PKG_SUPPORTED_OPTIONS= bdb clamav
@@ -20,9 +20,9 @@ CONFIGURE_ARGS+=      --without-bdb
 .if !empty(PKG_OPTIONS:Mclamav)
 PLIST.clamav=          yes
 CONFIGURE_ARGS+=       --with-clamav
-CONF_FILES+=   ${EGDIR}/virus_scan.conf.default ${PKG_SYSCONFDIR}/virus_scan.conf
-CONF_FILES+=   ${EGDIR}/clamd_mod.conf.default ${PKG_SYSCONFDIR}/clamd_mod.conf
-CONF_FILES+=   ${EGDIR}/clamav_mod.conf.default ${PKG_SYSCONFDIR}/clamav_mod.conf
+CONF_FILES+=           ${EGDIR}/virus_scan.conf.default ${PKG_SYSCONFDIR}/virus_scan.conf
+CONF_FILES+=           ${EGDIR}/clamd_mod.conf.default ${PKG_SYSCONFDIR}/clamd_mod.conf
+CONF_FILES+=           ${EGDIR}/clamav_mod.conf.default ${PKG_SYSCONFDIR}/clamav_mod.conf
 
 .  include "../../security/clamav/buildlink3.mk"
 .else

Index: pkgsrc/www/caddy/Makefile
diff -u pkgsrc/www/caddy/Makefile:1.19 pkgsrc/www/caddy/Makefile:1.20
--- pkgsrc/www/caddy/Makefile:1.19      Fri Oct 18 14:58:59 2019
+++ pkgsrc/www/caddy/Makefile   Mon Nov  4 22:09:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/10/18 14:58:59 bsiegert Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/04 22:09:52 rillig Exp $
 
 DISTNAME=      caddy-${GITHUB_TAG:S/v//}
 PKGREVISION=   7
@@ -11,9 +11,9 @@ HOMEPAGE=     ${MASTER_SITE_GITHUB:=mholt/ca
 COMMENT=       General-purpose web server
 LICENSE=       apache-2.0
 
-GO_DIST_BASE=  ${DISTNAME}
-GO_SRCPATH=    github.com/mholt/caddy
-GO_BUILD_PATTERN= ${GO_SRCPATH}/caddy
+GO_DIST_BASE=          ${DISTNAME}
+GO_SRCPATH=            github.com/mholt/caddy
+GO_BUILD_PATTERN=      ${GO_SRCPATH}/caddy
 
 CHECK_RELRO_SKIP+=     bin/caddy
 

Index: pkgsrc/www/cgilib/Makefile
diff -u pkgsrc/www/cgilib/Makefile:1.19 pkgsrc/www/cgilib/Makefile:1.20
--- pkgsrc/www/cgilib/Makefile:1.19     Mon Nov 24 05:23:17 2014
+++ pkgsrc/www/cgilib/Makefile  Mon Nov  4 22:09:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/11/24 05:23:17 mef Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/04 22:09:52 rillig Exp $
 #
 
 DISTNAME=      cgilib-0.7
@@ -11,9 +11,9 @@ COMMENT=      Common gateway interface librar
 LICENSE=       gnu-gpl-v2
 
 INSTALLATION_DIRS=     include lib ${PKGMANDIR}/man3 ${PKGMANDIR}/man5
-USE_LIBTOOL=   yes
+USE_LIBTOOL=           yes
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=       --bindir=${PREFIX}/libexec/cgi-bin
 INSTALLATION_DIRS=     ${PREFIX}/share/examples/cgilib

Index: pkgsrc/www/clearsilver/Makefile
diff -u pkgsrc/www/clearsilver/Makefile:1.31 pkgsrc/www/clearsilver/Makefile:1.32
--- pkgsrc/www/clearsilver/Makefile:1.31        Mon Sep  2 13:20:02 2019
+++ pkgsrc/www/clearsilver/Makefile     Mon Nov  4 22:09:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/09/02 13:20:02 adam Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/04 22:09:52 rillig Exp $
 
 META_PACKAGE=  yes
 
@@ -6,11 +6,11 @@ META_PACKAGE= yes
 
 PKGREVISION=           11
 
-DEPENDS+=${CLEARSILVER_BASE}{,nb[0-9]*}:../../www/clearsilver-base
-DEPENDS+=${PYPKGPREFIX}-${DISTNAME}{,nb[0-9]*}:../../www/py-clearsilver
-DEPENDS+=${RUBY_PKGPREFIX}-${DISTNAME}{,nb[0-9]*}:../../www/ruby-clearsilver
+DEPENDS+=      ${CLEARSILVER_BASE}{,nb[0-9]*}:../../www/clearsilver-base
+DEPENDS+=      ${PYPKGPREFIX}-${DISTNAME}{,nb[0-9]*}:../../www/py-clearsilver
+DEPENDS+=      ${RUBY_PKGPREFIX}-${DISTNAME}{,nb[0-9]*}:../../www/ruby-clearsilver
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-clearsilver
+PYTHON_VERSIONS_ACCEPTED=      27 # py-clearsilver
 
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/ruby/rubyversion.mk"

Index: pkgsrc/www/clearsilver/Makefile.common
diff -u pkgsrc/www/clearsilver/Makefile.common:1.11 pkgsrc/www/clearsilver/Makefile.common:1.12
--- pkgsrc/www/clearsilver/Makefile.common:1.11 Mon Sep 13 03:06:16 2010
+++ pkgsrc/www/clearsilver/Makefile.common      Mon Nov  4 22:09:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2010/09/13 03:06:16 taca Exp $
+# $NetBSD: Makefile.common,v 1.12 2019/11/04 22:09:52 rillig Exp $
 #
 # used by www/clearsilver-base/Makefile
 # used by www/py-clearsilver/Makefile
@@ -14,9 +14,9 @@ HOMEPAGE=             http://www.clearsilver.net/
 COMMENT=               Fast, powerful, language-neutral HTML template system
 LICENSE=               2-clause-bsd
 
-DISTINFO_FILE=         ${.CURDIR}/../../www/clearsilver/distinfo
+DISTINFO_FILE= ${.CURDIR}/../../www/clearsilver/distinfo
 #FILESDIR=     ${.CURDIR}/../../www/clearsilver/files
-PATCHDIR=              ${.CURDIR}/../../www/clearsilver/patches
+PATCHDIR=      ${.CURDIR}/../../www/clearsilver/patches
 
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake

Index: pkgsrc/www/contao35/Makefile
diff -u pkgsrc/www/contao35/Makefile:1.44 pkgsrc/www/contao35/Makefile:1.45
--- pkgsrc/www/contao35/Makefile:1.44   Sun Apr 14 09:23:06 2019
+++ pkgsrc/www/contao35/Makefile        Mon Nov  4 22:09:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2019/04/14 09:23:06 taca Exp $
+# $NetBSD: Makefile,v 1.45 2019/11/04 22:09:52 rillig Exp $
 #
 
 DISTNAME=      contao-${CT_PKGVER}
@@ -59,18 +59,18 @@ REPLACE_INTERPRETER+=       php
 REPLACE.php.old=       .*php[^ ]*
 REPLACE.php.new=       ${PREFIX}/bin/php
 REPLACE_FILES.php=     system/bin/automator system/bin/filesync \
-    system/bin/ide_compat system/bin/txpurge system/bin/version \
-    vendor/bin/lessc vendor/bin/minifycss vendor/bin/minifyjs \
-    vendor/bin/pscss vendor/leafo/scssphp/bin/pscss \
-    vendor/matthiasmullie/minify/bin/minifycss \
-    vendor/matthiasmullie/minify/bin/minifyjs \
-    vendor/oyejorge/less.php/bin/lessc \
-    vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \
-    vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
+                       system/bin/ide_compat system/bin/txpurge system/bin/version \
+                       vendor/bin/lessc vendor/bin/minifycss vendor/bin/minifyjs \
+                       vendor/bin/pscss vendor/leafo/scssphp/bin/pscss \
+                       vendor/matthiasmullie/minify/bin/minifycss \
+                       vendor/matthiasmullie/minify/bin/minifyjs \
+                       vendor/oyejorge/less.php/bin/lessc \
+                       vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \
+                       vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
 
 SUBST_CLASSES+=                conf
 SUBST_FILES.conf+=     ${WRKDIR}/contao.conf
-SUBST_VARS.conf+=       PREFIX CT_WEBDIR
+SUBST_VARS.conf+=      PREFIX CT_WEBDIR
 SUBST_STAGE.conf=      post-configure
 
 WWW_FILES=     .htaccess.default README.md assets contao \

Index: pkgsrc/www/cronolog/Makefile
diff -u pkgsrc/www/cronolog/Makefile:1.26 pkgsrc/www/cronolog/Makefile:1.27
--- pkgsrc/www/cronolog/Makefile:1.26   Sun Aug 11 13:24:18 2019
+++ pkgsrc/www/cronolog/Makefile        Mon Nov  4 22:09:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:24:18 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/04 22:09:52 rillig Exp $
 #
 
 DISTNAME=      cronolog-1.6.2
@@ -11,9 +11,9 @@ HOMEPAGE=     https://github.com/fordmason/c
 COMMENT=       Web log rotation utility that provides datestamp filenames
 LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE= YES
-INFO_FILES=    yes
-USE_TOOLS+=    perl:run
+GNU_CONFIGURE=         YES
+INFO_FILES=            yes
+USE_TOOLS+=            perl:run
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
 
 SUBST_CLASSES+=        cl

Index: pkgsrc/www/davical/Makefile
diff -u pkgsrc/www/davical/Makefile:1.40 pkgsrc/www/davical/Makefile:1.41
--- pkgsrc/www/davical/Makefile:1.40    Mon Nov  4 04:26:26 2019
+++ pkgsrc/www/davical/Makefile Mon Nov  4 22:09:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2019/11/04 04:26:26 triaxx Exp $
+# $NetBSD: Makefile,v 1.41 2019/11/04 22:09:53 rillig Exp $
 
 DISTNAME=      davical-${DAVICAL_VERSION}
 PKGNAME=       ${PHP_PKG_PREFIX}-davical-${DAVICAL_VERSION}
@@ -11,9 +11,9 @@ HOMEPAGE=     https://www.davical.org/
 COMMENT=       Simple CalDAV server using a PostgreSQL backend
 LICENSE=       gnu-gpl-v2 AND gnu-gpl-v3
 
-DAVICAL_VERSION=1.1.8
-GITLAB_TAG=    r${DAVICAL_VERSION}
-GITLAB_REV=    4af9595f4d0530268ac1289ba4ab2adb4890802e
+DAVICAL_VERSION=       1.1.8
+GITLAB_TAG=            r${DAVICAL_VERSION}
+GITLAB_REV=            4af9595f4d0530268ac1289ba4ab2adb4890802e
 
 DAVICALDIR=    ${PREFIX}/share/davical
 EGDIR=         ${PREFIX}/share/examples/davical
@@ -74,12 +74,12 @@ REPLACE_FILES.php+= scripts/refresh-alar
 REPLACE_FILES.php+=    scripts/sync-remote-caldav.php
 REPLACE_FILES.php+=    scripts/tz-update.php
 
-SUBST_CLASSES+=                conf-path
-SUBST_STAGE.conf-path= pre-configure
-SUBST_VARS.conf-path+= PKG_SYSCONFDIR
-SUBST_FILES.conf-path= inc/always.php.in dba/update-davical-database
-SUBST_FILES.conf-path+=        inc/davical_configuration_missing.php
-SUBST_MESSAGE.conf-path=Fixing configuration path.
+SUBST_CLASSES+=                        conf-path
+SUBST_STAGE.conf-path=         pre-configure
+SUBST_VARS.conf-path+=         PKG_SYSCONFDIR
+SUBST_FILES.conf-path=         inc/always.php.in dba/update-davical-database
+SUBST_FILES.conf-path+=                inc/davical_configuration_missing.php
+SUBST_MESSAGE.conf-path=       Fixing configuration path.
 
 # See ../../devel/php-libawl/Makefile.common for the LIBAWLDIR value
 SUBST_CLASSES+=                inc-path
@@ -124,15 +124,15 @@ do-install:
 
        cd ${WRKSRC}/docs && pax -rwpam . ${DESTDIR}${DOCDIR}
 
-.      for f in COPYING CREDITS ChangeLog INSTALL README TODO VERSION
-               cd ${WRKSRC} && \
-               ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
-.      endfor
-
-.      for d in ${PAXDIRS}
-               ${INSTALL_DATA_DIR} ${DESTDIR}${DAVICALDIR}/${d}
-               cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${DAVICALDIR}/${d}
-.      endfor
+.for f in COPYING CREDITS ChangeLog INSTALL README TODO VERSION
+       cd ${WRKSRC} && \
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
+.endfor
+
+.for d in ${PAXDIRS}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DAVICALDIR}/${d}
+       cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${DAVICALDIR}/${d}
+.endfor
 
        cd ${WRKSRC}/config && for f in *; do                           \
                ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/config/$$f;      \

Index: pkgsrc/www/dillo/Makefile
diff -u pkgsrc/www/dillo/Makefile:1.76 pkgsrc/www/dillo/Makefile:1.77
--- pkgsrc/www/dillo/Makefile:1.76      Sun Aug 11 13:24:18 2019
+++ pkgsrc/www/dillo/Makefile   Mon Nov  4 22:09:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2019/08/11 13:24:18 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2019/11/04 22:09:53 rillig Exp $
 
 DISTNAME=      dillo-3.0.5
 PKGREVISION=   5
@@ -19,11 +19,11 @@ REPLACE_PERL+=      dpid/dpidc dillo-install-
 USE_TOOLS+=    perl:run wget:run
 
 PKG_SYSCONFSUBDIR=     dillo
-EGDIR=         ${PREFIX}/share/examples/dillo
-CONF_FILES=    ${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
-CONF_FILES+=   ${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
-CONF_FILES+=   ${EGDIR}/keysrc ${PKG_SYSCONFDIR}/keysrc
-CONF_FILES+=   ${EGDIR}/domainrc ${PKG_SYSCONFDIR}/domainrc
+EGDIR=                 ${PREFIX}/share/examples/dillo
+CONF_FILES=            ${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
+CONF_FILES+=           ${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
+CONF_FILES+=           ${EGDIR}/keysrc ${PKG_SYSCONFDIR}/keysrc
+CONF_FILES+=           ${EGDIR}/domainrc ${PKG_SYSCONFDIR}/domainrc
 
 INSTALLATION_DIRS=     share/doc/dillo ${EGDIR}
 

Index: pkgsrc/www/drivel/hacks.mk
diff -u pkgsrc/www/drivel/hacks.mk:1.2 pkgsrc/www/drivel/hacks.mk:1.3
--- pkgsrc/www/drivel/hacks.mk:1.2      Thu Feb 22 19:27:19 2007
+++ pkgsrc/www/drivel/hacks.mk  Mon Nov  4 22:09:53 2019
@@ -1,11 +1,11 @@
-# $NetBSD: hacks.mk,v 1.2 2007/02/22 19:27:19 wiz Exp $
+# $NetBSD: hacks.mk,v 1.3 2019/11/04 22:09:53 rillig Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
 # NetBSD 1.x does not define types such as fd_set when _XOPEN_SOURCE is
 # defined, unless _XOPEN_SOURCE_EXTENDED also is defined
 .if ${OPSYS} == "NetBSD"
-.if empty(OS_VERSION:N1.[56]*)
+.  if empty(OS_VERSION:N1.[56]*)
 CFLAGS+=       -D_XOPEN_SOURCE_EXTENDED
-.endif
+.  endif
 .endif

Index: pkgsrc/www/drupal7/Makefile
diff -u pkgsrc/www/drupal7/Makefile:1.59 pkgsrc/www/drupal7/Makefile:1.60
--- pkgsrc/www/drupal7/Makefile:1.59    Sat May 11 06:48:43 2019
+++ pkgsrc/www/drupal7/Makefile Mon Nov  4 22:09:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2019/05/11 06:48:43 taca Exp $
+# $NetBSD: Makefile,v 1.60 2019/11/04 22:09:53 rillig Exp $
 
 DISTNAME=      drupal-7.67
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
@@ -35,8 +35,8 @@ CONF_FILES=   share/examples/drupal/drupal
                ${DRUPAL}/sites/default/default.settings.php
 
 CONF_FILES_PERMS+=     share/examples/drupal/default.settings.php \
-               ${DRUPAL}/sites/default/settings.php \
-               ${WWW_USER} ${WWW_GROUP} 0640
+                       ${DRUPAL}/sites/default/settings.php \
+                       ${WWW_USER} ${WWW_GROUP} 0640
 
 REPLACE_INTERPRETER+=  php
 REPLACE.php.old=       .*php[^ ]*

Index: pkgsrc/www/drupal8/Makefile
diff -u pkgsrc/www/drupal8/Makefile:1.25 pkgsrc/www/drupal8/Makefile:1.26
--- pkgsrc/www/drupal8/Makefile:1.25    Thu Oct 10 13:28:35 2019
+++ pkgsrc/www/drupal8/Makefile Mon Nov  4 22:09:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/10/10 13:28:35 prlw1 Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/04 22:09:53 rillig Exp $
 
 DISTNAME=      drupal-8.7.8
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
@@ -34,8 +34,8 @@ CONF_FILES=   share/examples/drupal/drupal
                ${DRUPAL}/sites/default/default.settings.php
 
 CONF_FILES_PERMS+=     share/examples/drupal/default.settings.php \
-               ${DRUPAL}/sites/default/settings.php \
-               ${WWW_USER} ${WWW_GROUP} 0640
+                       ${DRUPAL}/sites/default/settings.php \
+                       ${WWW_USER} ${WWW_GROUP} 0640
 
 REPLACE_INTERPRETER+=  php
 REPLACE.php.old=       .*php[^ ]*

Index: pkgsrc/www/e2guardian/Makefile
diff -u pkgsrc/www/e2guardian/Makefile:1.8 pkgsrc/www/e2guardian/Makefile:1.9
--- pkgsrc/www/e2guardian/Makefile:1.8  Sun Aug 11 13:24:19 2019
+++ pkgsrc/www/e2guardian/Makefile      Mon Nov  4 22:09:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:24:19 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/04 22:09:53 rillig Exp $
 
 DISTNAME=      e2guardian-5.1.1
 PKGREVISION=   2
@@ -41,7 +41,7 @@ PKG_SYSCONFSUBDIR=    e2guardian
 BUILD_DEFS+=           VARBASE
 
 OWN_DIRS_PERMS+=       ${VARBASE}/log/e2guardian \
-                        ${E2G_USER} ${E2G_GROUP} 0755
+                       ${E2G_USER} ${E2G_GROUP} 0755
 
 CONFIGURE_ARGS+=       --with-proxyuser=${E2G_USER}
 CONFIGURE_ARGS+=       --with-proxygroup=${E2G_GROUP}
@@ -55,7 +55,7 @@ WRKSRC=               ${WRKDIR}/${DISTNAME}
 
 .include "options.mk"
 
-CHECK_WRKREF_SKIP=     sbin/e2guardian
+CHECK_WRKREF_SKIP=     sbin/e2guardian
 
 REPLACE_PERL+=         data/e2guardian.pl
 

Index: pkgsrc/www/elinks/options.mk
diff -u pkgsrc/www/elinks/options.mk:1.16 pkgsrc/www/elinks/options.mk:1.17
--- pkgsrc/www/elinks/options.mk:1.16   Sun Nov  4 21:50:53 2012
+++ pkgsrc/www/elinks/options.mk        Mon Nov  4 22:09:53 2019
@@ -1,24 +1,24 @@
-# $NetBSD: options.mk,v 1.16 2012/11/04 21:50:53 wiz Exp $
+# $NetBSD: options.mk,v 1.17 2019/11/04 22:09:53 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.elinks
-PKG_SUPPORTED_OPTIONS+=        bittorrent nntp finger gopher
-PKG_SUPPORTED_OPTIONS+=        inet6 x11 elinks-exmode expat
-PKG_SUPPORTED_OPTIONS+= elinks-html-highlight elinks-root-exec
-PKG_SUPPORTED_OPTIONS+=        kerberos
-PKG_SUPPORTED_OPTIONS+=        python
-PKG_OPTIONS_GROUP.tls= gnutls ssl
+PKG_OPTIONS_VAR=               PKG_OPTIONS.elinks
+PKG_SUPPORTED_OPTIONS+=                bittorrent nntp finger gopher
+PKG_SUPPORTED_OPTIONS+=                inet6 x11 elinks-exmode expat
+PKG_SUPPORTED_OPTIONS+=                elinks-html-highlight elinks-root-exec
+PKG_SUPPORTED_OPTIONS+=                kerberos
+PKG_SUPPORTED_OPTIONS+=                python
+PKG_OPTIONS_GROUP.tls=         gnutls ssl
 PKG_OPTIONS_GROUP.malloc=      boehm-gc elinks-fastmem
 PKG_OPTIONS_REQUIRED_GROUPS=   tls
 PKG_OPTIONS_OPTIONAL_GROUPS=   malloc
-PKG_SUGGESTED_OPTIONS= ssl elinks-html-highlight elinks-exmode
-PKG_SUGGESTED_OPTIONS+=        expat boehm-gc inet6
+PKG_SUGGESTED_OPTIONS=         ssl elinks-html-highlight elinks-exmode
+PKG_SUGGESTED_OPTIONS+=                expat boehm-gc inet6
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+=       --enable-ipv6
 .else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=       --disable-ipv6
 .endif
 
 .if !empty(PKG_OPTIONS:Mx11)
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=      --with-openssl=${BUILDL
 
 .include "../../security/gnutls/buildlink3.mk"
 
-CONFIGURE_ARGS+= --without-openssl
+CONFIGURE_ARGS+=       --without-openssl
 .endif
 
 # Requires fsplib, which is not currently in pkgsrc.

Index: pkgsrc/www/eliom/Makefile
diff -u pkgsrc/www/eliom/Makefile:1.29 pkgsrc/www/eliom/Makefile:1.30
--- pkgsrc/www/eliom/Makefile:1.29      Sat Aug 24 11:08:04 2019
+++ pkgsrc/www/eliom/Makefile   Mon Nov  4 22:09:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/08/24 11:08:04 jaapb Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/04 22:09:53 rillig Exp $
 #
 
 GITHUB_PROJECT=        eliom
@@ -12,8 +12,8 @@ HOMEPAGE=     http://ocsigen.org/download/
 COMMENT=       Dynamic webpage generation library
 LICENSE=       gnu-lgpl-v2.1
 
-USE_TOOLS+=    gmake
-USE_LANGUAGES= c
+USE_TOOLS+=            gmake
+USE_LANGUAGES=         c
 OCAML_USE_FINDLIB=     yes
 
 DEPENDS+=      ocsigen>=2.9:../../www/ocsigen

Index: pkgsrc/www/emacs-w3m/Makefile
diff -u pkgsrc/www/emacs-w3m/Makefile:1.33 pkgsrc/www/emacs-w3m/Makefile:1.34
--- pkgsrc/www/emacs-w3m/Makefile:1.33  Fri Sep 29 12:40:28 2017
+++ pkgsrc/www/emacs-w3m/Makefile       Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2017/09/29 12:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/04 22:09:54 rillig Exp $
 
 DISTNAME=      emacs-w3m-1.4.4
 PKGREVISION=   4
@@ -16,21 +16,21 @@ INFO_FILES= YES
 
 DEPENDS+=      w3m{,-img}>=0.5.1nb2:../../www/w3m
 
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q}
-CONFIGURE_ARGS+=--with-icondir=${ICONDIR}
-BUILD_TARGET=  default
-INSTALL_TARGET=        ${INSTALL_TARGET.${EMACS_FLAVOR}}
-MAKE_FLAGS=    prefix=${DESTDIR}${PREFIX} ICONDIR=${DESTDIR}${ICONDIR}
-PLIST_SUBST+=  ETCDIR=${ETCDIR:Q}
+HAS_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-emacs=${EMACS_BIN:Q}
+CONFIGURE_ARGS+=       --with-icondir=${ICONDIR}
+BUILD_TARGET=          default
+INSTALL_TARGET=                ${INSTALL_TARGET.${EMACS_FLAVOR}}
+MAKE_FLAGS=            prefix=${DESTDIR}${PREFIX} ICONDIR=${DESTDIR}${ICONDIR}
+PLIST_SUBST+=          ETCDIR=${ETCDIR:Q}
 
-SUBST_CLASSES+=        fix-icondir
+SUBST_CLASSES+=                        fix-icondir
 SUBST_STAGE.fix-icondir=       pre-configure
 SUBST_FILES.fix-icondir=       Makefile.in w3m.el w3mhack.el
 SUBST_SED.fix-icondir=         -e 's|etc/images/w3m|etc/w3m|g'
 SUBST_SED.fix-icondir+=                -e 's|images/w3m|w3m|g'
 
-EMACS_BUILDLINK=# defined
+EMACS_BUILDLINK=               # defined
 EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20 \
                                xemacs215 xemacs215nox xemacs214 xemacs214nox
 

Index: pkgsrc/www/epiphany/Makefile
diff -u pkgsrc/www/epiphany/Makefile:1.188 pkgsrc/www/epiphany/Makefile:1.189
--- pkgsrc/www/epiphany/Makefile:1.188  Sun Jul 21 22:24:13 2019
+++ pkgsrc/www/epiphany/Makefile        Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.188 2019/07/21 22:24:13 wiz Exp $
+# $NetBSD: Makefile,v 1.189 2019/11/04 22:09:54 rillig Exp $
 
 DISTNAME=      epiphany-2.30.6
 PKGREVISION=   69
@@ -30,7 +30,7 @@ PKGCONFIG_OVERRIDE=   data/epiphany.pc.in
 
 .include "options.mk"
 
-GCONF_SCHEMAS=         epiphany.schemas
+GCONF_SCHEMAS= epiphany.schemas
 GCONF_SCHEMAS+=        epiphany-lockdown.schemas
 
 .include "../../audio/libcanberra/buildlink3.mk"

Index: pkgsrc/www/fengoffice/Makefile
diff -u pkgsrc/www/fengoffice/Makefile:1.38 pkgsrc/www/fengoffice/Makefile:1.39
--- pkgsrc/www/fengoffice/Makefile:1.38 Wed Apr  5 12:33:48 2017
+++ pkgsrc/www/fengoffice/Makefile      Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2017/04/05 12:33:48 fhajny Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/04 22:09:54 rillig Exp $
 #
 
 DISTNAME=      fengoffice_3.2.2.1
@@ -27,11 +27,11 @@ WRKSRC=             ${WRKDIR}/fengoffice
 USE_TOOLS=     pax
 NO_BUILD=      yes
 
-OWN_DIRS_PERMS+= ${FO_DIR}/public/files ${REAL_ROOT_USER} ${APACHE_GROUP} 0775
-OWN_DIRS_PERMS+= ${FO_DIR}/upload ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
-OWN_DIRS_PERMS+= ${FO_DIR}/cache ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
-OWN_DIRS_PERMS+= ${FO_DIR}/config ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
-OWN_DIRS_PERMS+=  ${FO_DIR}/tmp ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
+OWN_DIRS_PERMS+=       ${FO_DIR}/public/files ${REAL_ROOT_USER} ${APACHE_GROUP} 0775
+OWN_DIRS_PERMS+=       ${FO_DIR}/upload ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
+OWN_DIRS_PERMS+=       ${FO_DIR}/cache ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
+OWN_DIRS_PERMS+=       ${FO_DIR}/config ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
+OWN_DIRS_PERMS+=       ${FO_DIR}/tmp ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
 
 BUILD_DEFS+=   APACHE_GROUP APACHE_USER
 FILES_SUBST+=  FO_DIR=${FO_DIR} APACHE_USER=${APACHE_USER}
@@ -44,7 +44,7 @@ PRINT_PLIST_AWK+= \
 
 .include "../../mk/bsd.prefs.mk"
 
-FO_DIR?=       share/fengoffice
+FO_DIR?=               share/fengoffice
 INSTALLATION_DIRS=     ${FO_DIR}
 
 post-extract:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.400 pkgsrc/www/firefox/Makefile:1.401
--- pkgsrc/www/firefox/Makefile:1.400   Sat Nov  2 02:09:32 2019
+++ pkgsrc/www/firefox/Makefile Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.400 2019/11/02 02:09:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.401 2019/11/04 22:09:54 rillig Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            70.0
@@ -52,12 +52,12 @@ SUBST_FILES.dfly_malloc_h+= media/ffvpx/
 .include "mozilla-common.mk"
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpt.py
 
-CHECK_WRKREF_SKIP+=lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=    lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
 
 MOZILLA=       ${PKGBASE}
 MOZILLA_ICON=  ${WRKSRC}/${OBJDIR}/dist/${MOZILLA}/browser/chrome/icons/default/default48.png

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.142 pkgsrc/www/firefox/mozilla-common.mk:1.143
--- pkgsrc/www/firefox/mozilla-common.mk:1.142  Sat Nov  2 02:09:32 2019
+++ pkgsrc/www/firefox/mozilla-common.mk        Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.142 2019/11/02 02:09:32 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.143 2019/11/04 22:09:54 rillig Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -10,11 +10,11 @@
 PYTHON_VERSIONS_ACCEPTED=      27
 PYTHON_FOR_BUILD_ONLY=         tool
 .if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
-TOOL_DEPENDS+=         python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
-ALL_ENV+=      PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
+TOOL_DEPENDS+=                 python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
+ALL_ENV+=                      PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
 .else
-TOOL_DEPENDS+=         python37-[0-9]*:../../lang/python37
-ALL_ENV+=      PYTHON3=${LOCALBASE}/bin/python3.7
+TOOL_DEPENDS+=                 python37-[0-9]*:../../lang/python37
+ALL_ENV+=                      PYTHON3=${LOCALBASE}/bin/python3.7
 .endif
 
 HAS_CONFIGURE=         yes
@@ -60,13 +60,13 @@ CXXFLAGS+=          -mstackrealign
 
 CXXFLAGS+=             -D__HAVE_INLINE___ISINF
 
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
-#CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}modules/pdfium/update.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}js/src/tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}intl/icu/source/configure
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
+#CHECK_PORTABILITY_SKIP+=      ${MOZILLA_DIR}modules/pdfium/update.sh
 
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
 CONFIGURE_ARGS+=       --enable-release

Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.49 pkgsrc/www/firefox/options.mk:1.50
--- pkgsrc/www/firefox/options.mk:1.49  Wed Sep 11 16:30:05 2019
+++ pkgsrc/www/firefox/options.mk       Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.49 2019/09/11 16:30:05 gutteridge Exp $
+# $NetBSD: options.mk,v 1.50 2019/11/04 22:09:54 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -44,15 +44,15 @@ CONFIGURE_ARGS+=    --enable-debug-js-modul
 CONFIGURE_ARGS+=       --disable-install-strip
 PLIST.debug=           yes
 .else
-.if !empty(PKG_OPTIONS:Mdebug-info)
+.  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=       --enable-debug-symbols
 CONFIGURE_ARGS+=       --enable-optimize=-O0
 CONFIGURE_ARGS+=       --disable-install-strip
-.else
+.  else
 CONFIGURE_ARGS+=       --disable-debug-symbols
 CONFIGURE_ARGS+=       --enable-optimize=-O2
 CONFIGURE_ARGS+=       --enable-install-strip
-.endif
+.  endif
 CONFIGURE_ARGS+=       --disable-debug
 .endif
 

Index: pkgsrc/www/firefox-l10n/Makefile
diff -u pkgsrc/www/firefox-l10n/Makefile:1.160 pkgsrc/www/firefox-l10n/Makefile:1.161
--- pkgsrc/www/firefox-l10n/Makefile:1.160      Sat Nov  2 02:11:08 2019
+++ pkgsrc/www/firefox-l10n/Makefile    Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2019/11/02 02:11:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.161 2019/11/04 22:09:54 rillig Exp $
 #
 
 FIREFOX_VER=   70.0.1
@@ -19,16 +19,16 @@ NO_BUILD=   yes
 
 INSTALLATION_DIRS=     lib/firefox/browser/extensions
 
-FIREFOX_LOCALES=ach af an ar ast az be bg bn br bs ca cak      \
-               cs cy da de dsb el en-CA en-GB en-US eo es-AR   \
-               es-CL es-ES     \
-               es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN      \
-               he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn \
-               ko      \
-               lij lt lv mk mr ms my nb-NO ne-NP nl nn-NO oc \
-               pa-IN pl        \
-               pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th  \
-               tr uk uz vi xh zh-CN zh-TW
+FIREFOX_LOCALES=       ach af an ar ast az be bg bn br bs ca cak       \
+                       cs cy da de dsb el en-CA en-GB en-US eo es-AR   \
+                       es-CL es-ES     \
+                       es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN      \
+                       he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn \
+                       ko      \
+                       lij lt lv mk mr ms my nb-NO ne-NP nl nn-NO oc \
+                       pa-IN pl        \
+                       pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th  \
+                       tr uk uz vi xh zh-CN zh-TW
 
 EXTENSIONS_DIR=                ${PREFIX}/lib/firefox/browser/extensions
 XPI_FILES=             ${FIREFOX_LOCALES:=.xpi}

Index: pkgsrc/www/firefox52/Makefile
diff -u pkgsrc/www/firefox52/Makefile:1.46 pkgsrc/www/firefox52/Makefile:1.47
--- pkgsrc/www/firefox52/Makefile:1.46  Wed Sep 18 14:17:18 2019
+++ pkgsrc/www/firefox52/Makefile       Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2019/09/18 14:17:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2019/11/04 22:09:54 rillig Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            52.9
@@ -51,12 +51,12 @@ SUBST_FILES.dfly_malloc_h+= media/ffvpx/
 .include "mozilla-common.mk"
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpt.py
 
-CHECK_WRKREF_SKIP+=lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=    lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
 
 MOZILLA=       ${PKGBASE}
 MOZILLA_ICON=  ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png

Index: pkgsrc/www/firefox52/mozilla-common.mk
diff -u pkgsrc/www/firefox52/mozilla-common.mk:1.3 pkgsrc/www/firefox52/mozilla-common.mk:1.4
--- pkgsrc/www/firefox52/mozilla-common.mk:1.3  Tue Oct 23 12:33:04 2018
+++ pkgsrc/www/firefox52/mozilla-common.mk      Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.3 2018/10/23 12:33:04 jperkin Exp $
+# $NetBSD: mozilla-common.mk,v 1.4 2019/11/04 22:09:54 rillig Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -38,12 +38,12 @@ CXXFLAGS+=          -march=i586
 CXXFLAGS+=             -mstackrealign
 .endif
 
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}js/src/tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}intl/icu/source/configure
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 
 .if ${OPSYS} != "SunOS"
 CONFIGURE_ARGS+=       --enable-pie
Index: pkgsrc/www/firefox52/options.mk
diff -u pkgsrc/www/firefox52/options.mk:1.3 pkgsrc/www/firefox52/options.mk:1.4
--- pkgsrc/www/firefox52/options.mk:1.3 Thu Jun 13 19:02:37 2019
+++ pkgsrc/www/firefox52/options.mk     Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/06/13 19:02:37 rjs Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/04 22:09:54 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -20,7 +20,7 @@ PKG_SUGGESTED_OPTIONS+=       oss dbus
 .elif ${OPSYS} == "DragonFly"
 PKG_SUGGESTED_OPTIONS+=        oss dbus
 .else
-PKG_SUGGESTED_OPTIONS+= dbus pulseaudio
+PKG_SUGGESTED_OPTIONS+=        dbus pulseaudio
 .endif
 
 # On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
@@ -67,12 +67,12 @@ CONFIGURE_ARGS+=    --disable-jemalloc
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mgcc)
-.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
+.  if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
 # Modern gcc does not run any "tracking" passes when compiling with -O0,
 # which makes the generated debug info mostly useless. So explicitly
 # request them.
 O0TRACKING=-fvar-tracking-assignments -fvar-tracking
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -82,12 +82,12 @@ CONFIGURE_ARGS+=    --enable-debug-js-modul
 CONFIGURE_ARGS+=       --disable-install-strip
 PLIST.debug=           yes
 .else
-.if !empty(PKG_OPTIONS:Mdebug-info)
+.  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=       --enable-debug-symbols
 CONFIGURE_ARGS+=       --enable-optimize=-O0
-.else
+.  else
 CONFIGURE_ARGS+=       --disable-debug-symbols
-.endif
+.  endif
 CONFIGURE_ARGS+=       --disable-debug
 CONFIGURE_ARGS+=       --enable-optimize=-O2
 CONFIGURE_ARGS+=       --enable-install-strip

Index: pkgsrc/www/firefox52-l10n/Makefile
diff -u pkgsrc/www/firefox52-l10n/Makefile:1.15 pkgsrc/www/firefox52-l10n/Makefile:1.16
--- pkgsrc/www/firefox52-l10n/Makefile:1.15     Sat May 25 20:17:05 2019
+++ pkgsrc/www/firefox52-l10n/Makefile  Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/05/25 20:17:05 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:09:54 rillig Exp $
 #
 
 FIREFOX_VER=   52.9.0esr
@@ -17,13 +17,13 @@ DISTFILES=  ${XPI_FILES}
 
 NO_BUILD=      yes
 
-FIREFOX_LOCALES=ach af an ar as ast az bg bn-BD bn-IN br bs ca cs      \
-               cy da de dsb el en-GB en-ZA eo es-AR es-CL es-ES        \
-               es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN      \
-               he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko \
-               lij lt lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl    \
-               pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th  \
-               tr uk uz vi xh zh-CN zh-TW
+FIREFOX_LOCALES=       ach af an ar as ast az bg bn-BD bn-IN br bs ca cs       \
+                       cy da de dsb el en-GB en-ZA eo es-AR es-CL es-ES        \
+                       es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN      \
+                       he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko \
+                       lij lt lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl    \
+                       pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th  \
+                       tr uk uz vi xh zh-CN zh-TW
 
 EXTENSIONS_DIR=                ${PREFIX}/lib/firefox52/browser/extensions
 XPI_FILES=             ${FIREFOX_LOCALES:=.xpi}

Index: pkgsrc/www/firefox60/Makefile
diff -u pkgsrc/www/firefox60/Makefile:1.33 pkgsrc/www/firefox60/Makefile:1.34
--- pkgsrc/www/firefox60/Makefile:1.33  Wed Sep 18 14:17:18 2019
+++ pkgsrc/www/firefox60/Makefile       Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/09/18 14:17:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/04 22:09:54 rillig Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            60.7
@@ -52,10 +52,10 @@ SUBST_FILES.dfly_malloc_h+= media/ffvpx/
 .include "mozilla-common.mk"
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpt.py
 
 CHECK_WRKREF_SKIP+=    lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
 

Index: pkgsrc/www/firefox60/mozilla-common.mk
diff -u pkgsrc/www/firefox60/mozilla-common.mk:1.5 pkgsrc/www/firefox60/mozilla-common.mk:1.6
--- pkgsrc/www/firefox60/mozilla-common.mk:1.5  Thu Jun 13 14:16:37 2019
+++ pkgsrc/www/firefox60/mozilla-common.mk      Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.5 2019/06/13 14:16:37 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.6 2019/11/04 22:09:54 rillig Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -43,12 +43,12 @@ CXXFLAGS+=          -march=i586
 CXXFLAGS+=             -mstackrealign
 .endif
 
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}js/src/tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}intl/icu/source/configure
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
 .if ${OPSYS} != "SunOS"

Index: pkgsrc/www/firefox60/options.mk
diff -u pkgsrc/www/firefox60/options.mk:1.1 pkgsrc/www/firefox60/options.mk:1.2
--- pkgsrc/www/firefox60/options.mk:1.1 Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/options.mk     Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 22:09:54 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox60
 
@@ -40,12 +40,12 @@ CONFIGURE_ARGS+=    --disable-jemalloc
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mgcc)
-.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
+.  if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
 # Modern gcc does not run any "tracking" passes when compiling with -O0,
 # which makes the generated debug info mostly useless. So explicitly
 # request them.
 O0TRACKING=-fvar-tracking-assignments -fvar-tracking
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -55,12 +55,12 @@ CONFIGURE_ARGS+=    --enable-debug-js-modul
 CONFIGURE_ARGS+=       --disable-install-strip
 PLIST.debug=           yes
 .else
-.if !empty(PKG_OPTIONS:Mdebug-info)
+.  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=       --enable-debug-symbols
 CONFIGURE_ARGS+=       --enable-optimize=-O0
-.else
+.  else
 CONFIGURE_ARGS+=       --disable-debug-symbols
-.endif
+.  endif
 CONFIGURE_ARGS+=       --disable-debug
 CONFIGURE_ARGS+=       --enable-optimize=-O2
 CONFIGURE_ARGS+=       --enable-install-strip

Index: pkgsrc/www/firefox60-l10n/Makefile
diff -u pkgsrc/www/firefox60-l10n/Makefile:1.12 pkgsrc/www/firefox60-l10n/Makefile:1.13
--- pkgsrc/www/firefox60-l10n/Makefile:1.12     Fri Jun 21 16:39:34 2019
+++ pkgsrc/www/firefox60-l10n/Makefile  Mon Nov  4 22:09:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/06/21 16:39:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 22:09:54 rillig Exp $
 #
 
 FIREFOX_VER=   60.7.2esr
@@ -19,14 +19,14 @@ NO_BUILD=   yes
 
 INSTALLATION_DIRS=     lib/firefox60/browser/extensions
 
-FIREFOX_LOCALES=ach af an ar as ast az be bg bn-BD bn-IN br bs ca cs   \
-               cy da de dsb el en-GB en-ZA eo es-AR es-CL es-ES        \
-               es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN      \
-               he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko \
-               lij lt lv mai mk ml mr ms my nb-NO ne-NP nl nn-NO oc or \
-               pa-IN pl en-US  \
-               pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th  \
-               tr uk uz vi xh zh-CN zh-TW
+FIREFOX_LOCALES=       ach af an ar as ast az be bg bn-BD bn-IN br bs ca cs    \
+                       cy da de dsb el en-GB en-ZA eo es-AR es-CL es-ES        \
+                       es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN      \
+                       he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko \
+                       lij lt lv mai mk ml mr ms my nb-NO ne-NP nl nn-NO oc or \
+                       pa-IN pl en-US  \
+                       pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th  \
+                       tr uk uz vi xh zh-CN zh-TW
 
 EXTENSIONS_DIR=                ${PREFIX}/lib/firefox60/browser/extensions
 XPI_FILES=             ${FIREFOX_LOCALES:=.xpi}

Index: pkgsrc/www/firefox68/Makefile
diff -u pkgsrc/www/firefox68/Makefile:1.1 pkgsrc/www/firefox68/Makefile:1.2
--- pkgsrc/www/firefox68/Makefile:1.1   Sat Sep 21 07:31:43 2019
+++ pkgsrc/www/firefox68/Makefile       Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/09/21 07:31:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/04 22:09:55 rillig Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            68.1
@@ -54,12 +54,12 @@ SUBST_FILES.dfly_malloc_h+= media/ffvpx/
 .include "mozilla-common.mk"
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpt.py
 
-CHECK_WRKREF_SKIP+=lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=    lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
 
 MOZILLA=       ${PKGBASE}
 MOZILLA_ICON=  ${WRKSRC}/${OBJDIR}/dist/${MOZILLA}/browser/chrome/icons/default/default48.png
Index: pkgsrc/www/firefox68/mozilla-common.mk
diff -u pkgsrc/www/firefox68/mozilla-common.mk:1.1 pkgsrc/www/firefox68/mozilla-common.mk:1.2
--- pkgsrc/www/firefox68/mozilla-common.mk:1.1  Sat Sep 21 07:31:43 2019
+++ pkgsrc/www/firefox68/mozilla-common.mk      Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.1 2019/09/21 07:31:43 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.2 2019/11/04 22:09:55 rillig Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -10,11 +10,11 @@
 PYTHON_VERSIONS_ACCEPTED=      27
 PYTHON_FOR_BUILD_ONLY=         tool
 .if !empty(PYTHON_VERSION_DEFAULT:M37) || !empty(PYTHON_VERSION_DEFAULT:M36)
-TOOL_DEPENDS+=         python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
-ALL_ENV+=      PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
+TOOL_DEPENDS+=                 python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
+ALL_ENV+=                      PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
 .else
-TOOL_DEPENDS+=         python37-[0-9]*:../../lang/python37
-ALL_ENV+=      PYTHON3=${LOCALBASE}/bin/python3.7
+TOOL_DEPENDS+=                 python37-[0-9]*:../../lang/python37
+ALL_ENV+=                      PYTHON3=${LOCALBASE}/bin/python3.7
 .endif
 
 HAS_CONFIGURE=         yes
@@ -65,13 +65,13 @@ CXXFLAGS+=          -mstackrealign
 
 CXXFLAGS+=             -D__HAVE_INLINE___ISINF
 
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
-#CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}modules/pdfium/update.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}js/src/tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}intl/icu/source/configure
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
+#CHECK_PORTABILITY_SKIP+=      ${MOZILLA_DIR}modules/pdfium/update.sh
 
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
 CONFIGURE_ARGS+=       --enable-release
Index: pkgsrc/www/firefox68/options.mk
diff -u pkgsrc/www/firefox68/options.mk:1.1 pkgsrc/www/firefox68/options.mk:1.2
--- pkgsrc/www/firefox68/options.mk:1.1 Sat Sep 21 07:31:43 2019
+++ pkgsrc/www/firefox68/options.mk     Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/09/21 07:31:43 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 22:09:55 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -39,12 +39,12 @@ CONFIGURE_ARGS+=    --disable-jemalloc
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mgcc)
-.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
+.  if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
 # Modern gcc does not run any "tracking" passes when compiling with -O0,
 # which makes the generated debug info mostly useless. So explicitly
 # request them.
 O0TRACKING=-fvar-tracking-assignments -fvar-tracking
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -54,15 +54,15 @@ CONFIGURE_ARGS+=    --enable-debug-js-modul
 CONFIGURE_ARGS+=       --disable-install-strip
 PLIST.debug=           yes
 .else
-.if !empty(PKG_OPTIONS:Mdebug-info)
+.  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=       --enable-debug-symbols
 CONFIGURE_ARGS+=       --enable-optimize=-O0
 CONFIGURE_ARGS+=       --disable-install-strip
-.else
+.  else
 CONFIGURE_ARGS+=       --disable-debug-symbols
 CONFIGURE_ARGS+=       --enable-optimize=-O2
 CONFIGURE_ARGS+=       --enable-install-strip
-.endif
+.  endif
 CONFIGURE_ARGS+=       --disable-debug
 .endif
 

Index: pkgsrc/www/firefox68-l10n/Makefile
diff -u pkgsrc/www/firefox68-l10n/Makefile:1.1 pkgsrc/www/firefox68-l10n/Makefile:1.2
--- pkgsrc/www/firefox68-l10n/Makefile:1.1      Sat Sep 21 07:33:39 2019
+++ pkgsrc/www/firefox68-l10n/Makefile  Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/09/21 07:33:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/04 22:09:55 rillig Exp $
 #
 
 FIREFOX_VER=   68.1.0esr
@@ -19,16 +19,16 @@ NO_BUILD=   yes
 
 INSTALLATION_DIRS=     lib/firefox68/browser/extensions
 
-FIREFOX_LOCALES=ach af an ar ast az be bg bn br bs ca cak      \
-               cs cy da de dsb el en-CA en-GB en-US eo es-AR   \
-               es-CL es-ES     \
-               es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN      \
-               he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn \
-               ko      \
-               lij lt lv mk mr ms my nb-NO ne-NP nl nn-NO oc \
-               pa-IN pl        \
-               pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th  \
-               tr uk uz vi xh zh-CN zh-TW
+FIREFOX_LOCALES=       ach af an ar ast az be bg bn br bs ca cak       \
+                       cs cy da de dsb el en-CA en-GB en-US eo es-AR   \
+                       es-CL es-ES     \
+                       es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN      \
+                       he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn \
+                       ko      \
+                       lij lt lv mk mr ms my nb-NO ne-NP nl nn-NO oc \
+                       pa-IN pl        \
+                       pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th  \
+                       tr uk uz vi xh zh-CN zh-TW
 
 EXTENSIONS_DIR=                ${PREFIX}/lib/firefox68/browser/extensions
 XPI_FILES=             ${FIREFOX_LOCALES:=.xpi}

Index: pkgsrc/www/gallery/Makefile
diff -u pkgsrc/www/gallery/Makefile:1.17 pkgsrc/www/gallery/Makefile:1.18
--- pkgsrc/www/gallery/Makefile:1.17    Sun Aug 11 13:24:19 2019
+++ pkgsrc/www/gallery/Makefile Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:19 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:09:55 rillig Exp $
 #
 
 DISTNAME=      gallery-1.5.10
@@ -37,7 +37,7 @@ CONF_FILES_PERMS+=    ${EGDIR}/.htaccess ${
 MESSAGE_SUBST+=        G1DIR=${G1DIR}
 FILES_SUBST+=  G1DIR=${G1DIR}
 
-SUBST_CLASSES+=        paths
+SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     ${WRKDIR}/gallery.conf
 SUBST_VARS.paths+=     G1DIR
 SUBST_STAGE.paths=     pre-configure

Index: pkgsrc/www/ganglia-webfrontend/options.mk
diff -u pkgsrc/www/ganglia-webfrontend/options.mk:1.1 pkgsrc/www/ganglia-webfrontend/options.mk:1.2
--- pkgsrc/www/ganglia-webfrontend/options.mk:1.1       Tue Feb 16 13:05:23 2016
+++ pkgsrc/www/ganglia-webfrontend/options.mk   Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2016/02/16 13:05:23 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 22:09:55 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ganglia-webfrontend
 
@@ -26,9 +26,9 @@ BUILD_DEFS+=          APACHE_USER APACHE_GROUP
 ###
 .if !empty(PKG_OPTIONS:Mnginx)
 DEPENDS+=      nginx-[0-9]*:../../www/nginx
-NGINX_USER?=           nginx
-NGINX_GROUP?=          nginx
-WWW_USER?=             ${NGINX_USER}
-WWW_GROUP?=            ${NGINX_USER}
-BUILD_DEFS+=           NGINX_USER NGINX_GROUP
+NGINX_USER?=   nginx
+NGINX_GROUP?=  nginx
+WWW_USER?=     ${NGINX_USER}
+WWW_GROUP?=    ${NGINX_USER}
+BUILD_DEFS+=   NGINX_USER NGINX_GROUP
 .endif

Index: pkgsrc/www/go-cssmin/Makefile
diff -u pkgsrc/www/go-cssmin/Makefile:1.15 pkgsrc/www/go-cssmin/Makefile:1.16
--- pkgsrc/www/go-cssmin/Makefile:1.15  Fri Oct 18 14:58:59 2019
+++ pkgsrc/www/go-cssmin/Makefile       Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/10/18 14:58:59 bsiegert Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:09:55 rillig Exp $
 
 DISTNAME=      cssmin-0.0.20151210
 PKGNAME=       go-${DISTNAME}
@@ -6,14 +6,14 @@ PKGREVISION=  13
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dchest/}
 CATEGORIES=    www
 GITHUB_TAG=    fb8d9b44afdc258bfff6052d3667521babcb2239
-GITHUB_PROJECT= ${PKGBASE:S/^go-//}
+GITHUB_PROJECT=        ${PKGBASE:S/^go-//}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/dchest/cssmin
 COMMENT=       Go port of Ryan Grove's cssmin
 LICENSE=       modified-bsd
 
-GO_DIST_BASE=   ${GITHUB_PROJECT}-${GITHUB_TAG}
+GO_DIST_BASE=  ${GITHUB_PROJECT}-${GITHUB_TAG}
 GO_SRCPATH=    github.com/dchest/cssmin
 
 .include "../../lang/go/go-package.mk"

Index: pkgsrc/www/go-gohtml/Makefile
diff -u pkgsrc/www/go-gohtml/Makefile:1.15 pkgsrc/www/go-gohtml/Makefile:1.16
--- pkgsrc/www/go-gohtml/Makefile:1.15  Fri Oct 18 14:58:59 2019
+++ pkgsrc/www/go-gohtml/Makefile       Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/10/18 14:58:59 bsiegert Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:09:55 rillig Exp $
 
 DISTNAME=      gohtml-0.0.20150923
 PKGNAME=       go-${DISTNAME}
@@ -6,7 +6,7 @@ PKGREVISION=    13
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=yosssi/}
 CATEGORIES=    www
 GITHUB_TAG=    ccf383eafddde21dfe37c6191343813822b30e6b
-GITHUB_PROJECT= ${PKGBASE:S/^go-//}
+GITHUB_PROJECT=        ${PKGBASE:S/^go-//}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/yosssi/gohtml

Index: pkgsrc/www/goaccess/Makefile
diff -u pkgsrc/www/goaccess/Makefile:1.20 pkgsrc/www/goaccess/Makefile:1.21
--- pkgsrc/www/goaccess/Makefile:1.20   Thu Aug 29 18:04:10 2019
+++ pkgsrc/www/goaccess/Makefile        Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/29 18:04:10 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 22:09:55 rillig Exp $
 
 DISTNAME=      goaccess-1.3
 CATEGORIES=    www
@@ -20,7 +20,7 @@ USE_NCURSES=  yes
 EGDIR=         ${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=    ${EGDIR}/goaccess.conf ${PKG_SYSCONFDIR}/goaccess.conf
 
-LIBS.SunOS+=   -lsocket -lnsl
+LIBS.SunOS+=           -lsocket -lnsl
 CPPFLAGS.SunOS+=       -D__EXTENSIONS__
 
 BROKEN_GETTEXT_DETECTION=      yes

Index: pkgsrc/www/goaccess/options.mk
diff -u pkgsrc/www/goaccess/options.mk:1.2 pkgsrc/www/goaccess/options.mk:1.3
--- pkgsrc/www/goaccess/options.mk:1.2  Fri Aug 23 01:48:00 2019
+++ pkgsrc/www/goaccess/options.mk      Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/08/23 01:48:00 schmonz Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/04 22:09:55 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.goaccess
 PKG_SUPPORTED_OPTIONS= geoip wide-curses
@@ -7,13 +7,13 @@ PKG_SUGGESTED_OPTIONS=        wide-curses
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgeoip)
-.      include "../../net/GeoIP/buildlink3.mk"
+.  include "../../net/GeoIP/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-geoip=legacy
 .endif # geoip
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
-.      include "../../devel/ncursesw/buildlink3.mk"
+.  include "../../devel/ncursesw/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-utf8
 .else
-.      include "../../devel/ncurses/buildlink3.mk"
+.  include "../../devel/ncurses/buildlink3.mk"
 .endif # wide-curses

Index: pkgsrc/www/gtkasp2php/Makefile
diff -u pkgsrc/www/gtkasp2php/Makefile:1.19 pkgsrc/www/gtkasp2php/Makefile:1.20
--- pkgsrc/www/gtkasp2php/Makefile:1.19 Sun Oct 28 06:30:16 2012
+++ pkgsrc/www/gtkasp2php/Makefile      Mon Nov  4 22:09:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/28 06:30:16 asau Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/04 22:09:55 rillig Exp $
 #
 
 DISTNAME=      asp2php-0.76.17
@@ -13,7 +13,7 @@ COMMENT=      Gtk+ version of utility to conv
 
 MAKE_JOBS_SAFE=                no
 
-BUILD_TARGET=  all gui
+BUILD_TARGET=          all gui
 INSTALLATION_DIRS+=    bin
 
 .include "../../x11/gtk/buildlink3.mk"

Index: pkgsrc/www/horde/Makefile
diff -u pkgsrc/www/horde/Makefile:1.84 pkgsrc/www/horde/Makefile:1.85
--- pkgsrc/www/horde/Makefile:1.84      Thu May 23 19:23:20 2019
+++ pkgsrc/www/horde/Makefile   Mon Nov  4 22:09:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2019/05/23 19:23:20 rillig Exp $
+# $NetBSD: Makefile,v 1.85 2019/11/04 22:09:56 rillig Exp $
 
 DISTNAME=      horde-3.3.13
 PKGREVISION=   4
@@ -34,13 +34,13 @@ USE_TOOLS+= pax
 
 .include "../../mk/bsd.prefs.mk"
 
-DOCDIR=                ${PREFIX}/share/doc/horde
-EGDIR=         ${PREFIX}/share/examples/horde
-HORDEDIR=      ${PREFIX}/share/horde
-PAXDIRS=       js lib locale po scripts services templates themes util admin \
+DOCDIR=                        ${PREFIX}/share/doc/horde
+EGDIR=                 ${PREFIX}/share/examples/horde
+HORDEDIR=              ${PREFIX}/share/horde
+PAXDIRS=               js lib locale po scripts services templates themes util admin \
                rpc
-SENDMAIL?=     /usr/sbin/sendmail
-PKG_USERS_VARS+=APACHE_USER
+SENDMAIL?=             /usr/sbin/sendmail
+PKG_USERS_VARS+=       APACHE_USER
 
 PKG_SYSCONFSUBDIR?=    httpd
 MESSAGE_SUBST+=                HORDEDIR=${HORDEDIR}
@@ -113,10 +113,10 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${DOCDIR}
 .for d in ${PAXDIRS}
-               ${INSTALL_DATA_DIR} ${DESTDIR}${HORDEDIR}/${d}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${HORDEDIR}/${d}
 .endfor
 .for d in ${PAXDIRS}
-               cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${HORDEDIR}/${d}
+       cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${HORDEDIR}/${d}
 .endfor
        cd ${WRKSRC}/config && for f in *.dist; do \
                ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/config/$${f%.dist}; \

Index: pkgsrc/www/horde/options.mk
diff -u pkgsrc/www/horde/options.mk:1.4 pkgsrc/www/horde/options.mk:1.5
--- pkgsrc/www/horde/options.mk:1.4     Sun Sep 11 17:03:28 2016
+++ pkgsrc/www/horde/options.mk Mon Nov  4 22:09:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2016/09/11 17:03:28 taca Exp $
+# $NetBSD: options.mk,v 1.5 2019/11/04 22:09:56 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.horde
 PKG_SUPPORTED_OPTIONS= ldap pgsql mysql
@@ -24,6 +24,6 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-pgsql>=4.3.3
 ### Use MySQL for storing user details
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
+DEPENDS+=              ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
 PHP_VERSIONS_ACCEPTED= 56
 .endif

Index: pkgsrc/www/htmldoc/Makefile.common
diff -u pkgsrc/www/htmldoc/Makefile.common:1.15 pkgsrc/www/htmldoc/Makefile.common:1.16
--- pkgsrc/www/htmldoc/Makefile.common:1.15     Fri Oct 18 11:02:13 2019
+++ pkgsrc/www/htmldoc/Makefile.common  Mon Nov  4 22:09:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2019/10/18 11:02:13 micha Exp $
+# $NetBSD: Makefile.common,v 1.16 2019/11/04 22:09:56 rillig Exp $
 #
 # used by www/htmldoc/Makefile
 # used by www/htmldoc-x11/Makefile
@@ -8,7 +8,7 @@ PKGNAME?=       ${PKGNAME_BASE}-${VERSION}
 COMMENT?=      Converts HTML to indexed HTML, PDF and/or PostScript
 
 # Normal package Makefile contents follow.
-VERSION=       1.9.7
+VERSION=       1.9.7
 PKGNAME_BASE=  htmldoc
 CATEGORIES=    www
 DIST_SUBDIR=   ${PKGNAME_BASE}

Index: pkgsrc/www/hugo/Makefile
diff -u pkgsrc/www/hugo/Makefile:1.22 pkgsrc/www/hugo/Makefile:1.23
--- pkgsrc/www/hugo/Makefile:1.22       Fri Oct 18 14:59:00 2019
+++ pkgsrc/www/hugo/Makefile    Mon Nov  4 22:09:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/10/18 14:59:00 bsiegert Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/04 22:09:56 rillig Exp $
 
 DISTNAME=      hugo-0.55.6
 PKGNAME=       go-${DISTNAME}
@@ -6,7 +6,7 @@ PKGREVISION=    4
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gohugoio/}
 CATEGORIES=    www
 GITHUB_TAG=    v${PKGVERSION_NOREV}
-GITHUB_PROJECT= ${PKGBASE:S/^go-//}
+GITHUB_PROJECT=        ${PKGBASE:S/^go-//}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://gohugo.io/

Index: pkgsrc/www/ies4linux/Makefile
diff -u pkgsrc/www/ies4linux/Makefile:1.21 pkgsrc/www/ies4linux/Makefile:1.22
--- pkgsrc/www/ies4linux/Makefile:1.21  Mon Sep  2 13:20:03 2019
+++ pkgsrc/www/ies4linux/Makefile       Mon Nov  4 22:09:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/09/02 13:20:03 adam Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 22:09:56 rillig Exp $
 
 DISTNAME=      ies4linux-2.99.0.1
 PKGREVISION=   6
@@ -9,15 +9,15 @@ MAINTAINER=   abs%NetBSD.org@localhost
 #HOMEPAGE=     http://www.tatanka.com.br/ies4linux/page/Main_Page
 COMMENT=       Microsoft Internet Explorer installer
 
-DEPENDS+=  wget-[0-9]*:../../net/wget
-DEPENDS+=  wine-[0-9]*:../../emulators/wine
-DEPENDS+=  ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
-BUILD_DEPENDS+= cabextract-[0-9]*:../../archivers/cabextract
+DEPENDS+=      wget-[0-9]*:../../net/wget
+DEPENDS+=      wine-[0-9]*:../../emulators/wine
+DEPENDS+=      ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
+BUILD_DEPENDS+=        cabextract-[0-9]*:../../archivers/cabextract
 
-NO_BUILD=      yes
+NO_BUILD=      yes
 USE_LANGUAGES= # none
 USE_TOOLS+=    bash:run pax unzip:run
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
 
 SHAREDIR=              share/ies4linux
 
@@ -29,7 +29,7 @@ SUBST_SED.sharedir=   -e "s|.dirname ..0..
 REPLACE_BASH=          ${WRKSRC}/ies4linux \
                        ${WRKSRC}/lib/install.sh ${WRKSRC}/lib/uninstall.sh
 
-INSTALLATION_DIRS=     bin ${SHAREDIR}
+INSTALLATION_DIRS=     bin ${SHAREDIR}
 
 do-install:
        cd ${WRKSRC} && rm -f lib/functions.sh.orig

Index: pkgsrc/www/ikiwiki/options.mk
diff -u pkgsrc/www/ikiwiki/options.mk:1.19 pkgsrc/www/ikiwiki/options.mk:1.20
--- pkgsrc/www/ikiwiki/options.mk:1.19  Sat May  4 09:32:29 2019
+++ pkgsrc/www/ikiwiki/options.mk       Mon Nov  4 22:09:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2019/05/04 09:32:29 leot Exp $
+# $NetBSD: options.mk,v 1.20 2019/11/04 22:09:56 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ikiwiki
 PKG_SUPPORTED_OPTIONS=         cgi imagemagick l10n python w3m
@@ -16,9 +16,9 @@ DEPENDS+=     p5-DB_File-[0-9]*:../../databa
 .endif
 
 .if !empty(PKG_OPTIONS:Mcvs)
-. if !exists(/usr/bin/cvs)
+.  if !exists(/usr/bin/cvs)
 DEPENDS+=      cvs-[0-9]*:../../devel/scmcvs
-. endif
+.  endif
 DEPENDS+=      cvsps-[0-9]*:../../devel/cvsps
 DEPENDS+=      cvsweb-[0-9]*:../../www/cvsweb
 DEPENDS+=      p5-File-chdir-[0-9]*:../../devel/p5-File-chdir
@@ -61,8 +61,8 @@ SUBST_SED.l10n+=      -e 's|\(Locale::Po4a::C
 .endif
 
 .if !empty(PKG_OPTIONS:Mpython)
-DEPENDS+=      ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
-DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+DEPENDS+=              ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+DEPENDS+=              ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 .else
 PYTHON_FOR_BUILD_ONLY= yes
 .endif

Index: pkgsrc/www/kahua/Makefile
diff -u pkgsrc/www/kahua/Makefile:1.7 pkgsrc/www/kahua/Makefile:1.8
--- pkgsrc/www/kahua/Makefile:1.7       Sun Oct 28 06:30:18 2012
+++ pkgsrc/www/kahua/Makefile   Mon Nov  4 22:09:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/28 06:30:18 asau Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 22:09:56 rillig Exp $
 
 DISTNAME=      Kahua-1.0.1
 PKGNAME=       ${DISTNAME:C/Kahua/kahua/}
@@ -15,10 +15,10 @@ MAKE_JOBS_SAFE=             no
 
 DEPENDS+=      Gauche>=0.8.8:../../lang/gauche
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
-CONFIGURE_ARGS+=--localstatedir=${VARBASE}
-BUILD_DEFS+=   VARBASE
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
+BUILD_DEFS+=           VARBASE
 
 PKG_SYSCONFSUBDIR=     kahua
 EGDIR=                 ${PREFIX}/share/examples/kahua

Index: pkgsrc/www/khtml/Makefile
diff -u pkgsrc/www/khtml/Makefile:1.33 pkgsrc/www/khtml/Makefile:1.34
--- pkgsrc/www/khtml/Makefile:1.33      Wed Sep 18 14:17:18 2019
+++ pkgsrc/www/khtml/Makefile   Mon Nov  4 22:09:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/09/18 14:17:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/04 22:09:56 rillig Exp $
 
 DISTNAME=      khtml-${KF5VER}
 PKGREVISION=   1
@@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_KDE:=framewo
 USE_TOOLS+=    perl msgfmt
 
 # generation of kded.moc fails when ${PREFIX}/include in the moc include path
-SUBST_CLASSES+=        fix-moc
+SUBST_CLASSES+=                fix-moc
 SUBST_STAGE.fix-moc=   post-configure
 SUBST_MESSAGE.fix-moc= Cleaning up MOC includes
 SUBST_FILES.fix-moc=   _KDE_build/src/CMakeFiles/khtmlpart_autogen.dir/AutogenInfo.cmake 

Index: pkgsrc/www/librest/Makefile
diff -u pkgsrc/www/librest/Makefile:1.32 pkgsrc/www/librest/Makefile:1.33
--- pkgsrc/www/librest/Makefile:1.32    Wed Apr  3 00:33:12 2019
+++ pkgsrc/www/librest/Makefile Mon Nov  4 22:09:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/04/03 00:33:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/04 22:09:56 rillig Exp $
 
 DISTNAME=      librest-0.6
 PKGREVISION=   28
@@ -18,7 +18,7 @@ WRKSRC=               ${WRKDIR}/${PKGBASE}-${DISTNAME
 PKGCONFIG_OVERRIDE+=   rest.pc.in gtk-doc.pc.in
 
 pre-configure:
-               (cd ${WRKSRC}; ./autogen.sh)
+       (cd ${WRKSRC}; ./autogen.sh)
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"

Index: pkgsrc/www/librest07/Makefile
diff -u pkgsrc/www/librest07/Makefile:1.30 pkgsrc/www/librest07/Makefile:1.31
--- pkgsrc/www/librest07/Makefile:1.30  Wed Apr  3 00:33:12 2019
+++ pkgsrc/www/librest07/Makefile       Mon Nov  4 22:09:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/04/03 00:33:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/04 22:09:56 rillig Exp $
 
 DISTNAME=      rest-0.7.93
 PKGNAME=       ${DISTNAME:S/rest/librest07/}
@@ -12,11 +12,11 @@ HOMEPAGE=   https://wiki.gnome.org/Project
 COMMENT=       Library for "RESTful" web services
 LICENSE=       gnu-lgpl-v2.1
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config gmake
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config gmake
 # see pkgsrc/security/mozilla-rootcerts
-CONFIGURE_ARGS+= --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
+CONFIGURE_ARGS+=       --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
 
 PKGCONFIG_OVERRIDE+=   rest.pc.in rest-extras.pc.in
 

Index: pkgsrc/www/lighttpd/Makefile
diff -u pkgsrc/www/lighttpd/Makefile:1.83 pkgsrc/www/lighttpd/Makefile:1.84
--- pkgsrc/www/lighttpd/Makefile:1.83   Wed May 29 10:01:28 2019
+++ pkgsrc/www/lighttpd/Makefile        Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2019/05/29 10:01:28 nia Exp $
+# $NetBSD: Makefile,v 1.84 2019/11/04 22:09:57 rillig Exp $
 
 DISTNAME=      lighttpd-1.4.54
 CATEGORIES=    www
@@ -10,13 +10,13 @@ HOMEPAGE=   http://www.lighttpd.net/
 COMMENT=       Fast, light-footprint HTTP server
 LICENSE=       modified-bsd
 
-USE_LIBTOOL=           yes
-SHLIBTOOL_OVERRIDE=    # empty
-USE_TOOLS+=            pkg-config
-GNU_CONFIGURE=         yes
-GNU_CONFIGURE_LIBSUBDIR=${PKGBASE}
-CONFIGURE_ARGS+=       --with-pcre
-TEST_TARGET=           check
+USE_LIBTOOL=                   yes
+SHLIBTOOL_OVERRIDE=            # empty
+USE_TOOLS+=                    pkg-config
+GNU_CONFIGURE=                 yes
+GNU_CONFIGURE_LIBSUBDIR=       ${PKGBASE}
+CONFIGURE_ARGS+=               --with-pcre
+TEST_TARGET=                   check
 
 DOCDIR=                        ${PREFIX}/share/doc/${PKGBASE}
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}

Index: pkgsrc/www/lighttpd/options.mk
diff -u pkgsrc/www/lighttpd/options.mk:1.21 pkgsrc/www/lighttpd/options.mk:1.22
--- pkgsrc/www/lighttpd/options.mk:1.21 Wed May 29 10:01:28 2019
+++ pkgsrc/www/lighttpd/options.mk      Mon Nov  4 22:09:57 2019
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.21 2019/05/29 10:01:28 nia Exp $
+# $NetBSD: options.mk,v 1.22 2019/11/04 22:09:57 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.lighttpd
-PKG_SUPPORTED_OPTIONS= bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav
+PKG_OPTIONS_VAR=               PKG_OPTIONS.lighttpd
+PKG_SUPPORTED_OPTIONS=         bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav
 PKG_OPTIONS_LEGACY_OPTS+=      memcache:memcached
-PKG_SUGGESTED_OPTIONS= inet6 ssl
+PKG_SUGGESTED_OPTIONS=         inet6 ssl
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/www/llgal/Makefile
diff -u pkgsrc/www/llgal/Makefile:1.15 pkgsrc/www/llgal/Makefile:1.16
--- pkgsrc/www/llgal/Makefile:1.15      Sun Aug 11 13:24:21 2019
+++ pkgsrc/www/llgal/Makefile   Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:24:21 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:09:57 rillig Exp $
 
 DISTNAME=      llgal-0.13.19
 PKGREVISION=   2
@@ -13,7 +13,7 @@ LICENSE=      gnu-gpl-v2
 
 GITHUB_TAG=    llgal-${PKGVERSION_NOREV}
 
-USE_PKGLOCALEDIR=yes
+USE_PKGLOCALEDIR=      yes
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/www/lynx/Makefile
diff -u pkgsrc/www/lynx/Makefile:1.133 pkgsrc/www/lynx/Makefile:1.134
--- pkgsrc/www/lynx/Makefile:1.133      Sat Jun 22 11:37:13 2019
+++ pkgsrc/www/lynx/Makefile    Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2019/06/22 11:37:13 nia Exp $
+# $NetBSD: Makefile,v 1.134 2019/11/04 22:09:57 rillig Exp $
 
 DISTNAME=      lynx2.8.9rel.1
 PKGNAME=       ${DISTNAME:S/lynx/lynx-/:S/rel//}
@@ -15,12 +15,12 @@ LICENSE=    gnu-gpl-v2
 # problem with WWW/Library/Implementation
 MAKE_JOBS_SAFE=                no
 
-SUBDIR=                        current
-USE_PKGLOCALEDIR=      yes
-GNU_CONFIGURE=         yes
-BROKEN_GETTEXT_DETECTION= yes
-INSTALL_TARGET=                install-full
-MAKE_FILE=             makefile
+SUBDIR=                                current
+USE_PKGLOCALEDIR=              yes
+GNU_CONFIGURE=                 yes
+BROKEN_GETTEXT_DETECTION=      yes
+INSTALL_TARGET=                        install-full
+MAKE_FILE=                     makefile
 
 CONFIGURE_ENV+=                GZIP=${TOOLS_GZIP_CMD:Q}
 CONFIGURE_ENV+=                UNZIP=${TOOLS_PATH.unzip:Q}

Index: pkgsrc/www/lynx/options.mk
diff -u pkgsrc/www/lynx/options.mk:1.17 pkgsrc/www/lynx/options.mk:1.18
--- pkgsrc/www/lynx/options.mk:1.17     Wed Jan  4 14:49:38 2017
+++ pkgsrc/www/lynx/options.mk  Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2017/01/04 14:49:38 roy Exp $
+# $NetBSD: options.mk,v 1.18 2019/11/04 22:09:57 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lynx
 PKG_SUPPORTED_OPTIONS= inet6
@@ -57,5 +57,5 @@ CONFIGURE_ARGS+=      --with-socks
 ### IPv6 support
 ###
 .if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --enable-ipv6
+CONFIGURE_ARGS+=       --enable-ipv6
 .endif

Index: pkgsrc/www/midori/Makefile
diff -u pkgsrc/www/midori/Makefile:1.122 pkgsrc/www/midori/Makefile:1.123
--- pkgsrc/www/midori/Makefile:1.122    Tue Sep 10 22:53:54 2019
+++ pkgsrc/www/midori/Makefile  Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2019/09/10 22:53:54 leot Exp $
+# $NetBSD: Makefile,v 1.123 2019/11/04 22:09:57 rillig Exp $
 
 DISTNAME=      midori-v9.0
 PKGNAME=       ${DISTNAME:S/v//}
@@ -8,11 +8,11 @@ MASTER_SITES= ${MASTER_SITE_GITHUB:=mido
 GITHUB_PROJECT=        core
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://midori-browser.org/
-COMMENT=       Lightweight web browser using WebKit
-LICENSE=       gnu-lgpl-v2.1
-USE_GCC_RUNTIME=yes
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=              http://midori-browser.org/
+COMMENT=               Lightweight web browser using WebKit
+LICENSE=               gnu-lgpl-v2.1
+USE_GCC_RUNTIME=       yes
 
 USE_CMAKE=     yes
 USE_TOOLS+=    intltool msgfmt pkg-config

Index: pkgsrc/www/mimetex/Makefile
diff -u pkgsrc/www/mimetex/Makefile:1.8 pkgsrc/www/mimetex/Makefile:1.9
--- pkgsrc/www/mimetex/Makefile:1.8     Sun Mar 15 16:56:49 2015
+++ pkgsrc/www/mimetex/Makefile Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/03/15 16:56:49 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/04 22:09:57 rillig Exp $
 #
 
 DISTNAME=      mimetex
@@ -20,11 +20,11 @@ WRKSRC=             ${WRKDIR}
 INSTALLATION_DIRS=     libexec/cgi-bin
 
 do-build:
-               cd ${WRKSRC:Q} && \
-               env ${MAKE_ENV} ${CC} -DAA mimetex.c gifsave.c -lm \
-                       -o mimetex.cgi
+       cd ${WRKSRC:Q} && \
+       env ${MAKE_ENV} ${CC} -DAA mimetex.c gifsave.c -lm \
+               -o mimetex.cgi
 
 do-install:
-               ${INSTALL_PROGRAM} ${WRKSRC:Q}/mimetex.cgi ${DESTDIR}${PREFIX}/libexec/cgi-bin
+       ${INSTALL_PROGRAM} ${WRKSRC:Q}/mimetex.cgi ${DESTDIR}${PREFIX}/libexec/cgi-bin
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/mono-xsp/Makefile
diff -u pkgsrc/www/mono-xsp/Makefile:1.48 pkgsrc/www/mono-xsp/Makefile:1.49
--- pkgsrc/www/mono-xsp/Makefile:1.48   Wed Sep 11 11:53:40 2019
+++ pkgsrc/www/mono-xsp/Makefile        Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/09/11 11:53:40 nia Exp $
+# $NetBSD: Makefile,v 1.49 2019/11/04 22:09:57 rillig Exp $
 
 DISTNAME=      xsp-3.8
 PKGNAME=       mono-${DISTNAME}
@@ -24,11 +24,11 @@ SUBST_FILES.unwrap_mk=              unittests/Tests.
 SUBST_SED.unwrap_mk=           -e 's,^MAKEINFO = .*,MAKEINFO = makeinfo,'
 SUBST_SED.unwrap_mk+=          -e 's,^PKG_CONFIG = .*,PKG_CONFIG = ${PREFIX}/bin/pkg-config,'
 
-SUBST_CLASSES+=         fix-mcs
-SUBST_STAGE.fix-mcs=    pre-configure
-SUBST_MESSAGE.fix-mcs=  Fix compiler name
-SUBST_FILES.fix-mcs=    configure
-SUBST_SED.fix-mcs=      -e 's,gmcs,mcs,'
+SUBST_CLASSES+=                fix-mcs
+SUBST_STAGE.fix-mcs=   pre-configure
+SUBST_MESSAGE.fix-mcs= Fix compiler name
+SUBST_FILES.fix-mcs=   configure
+SUBST_SED.fix-mcs=     -e 's,gmcs,mcs,'
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"

Index: pkgsrc/www/moodle/Makefile
diff -u pkgsrc/www/moodle/Makefile:1.76 pkgsrc/www/moodle/Makefile:1.77
--- pkgsrc/www/moodle/Makefile:1.76     Fri Sep 13 02:59:11 2019
+++ pkgsrc/www/moodle/Makefile  Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2019/09/13 02:59:11 wen Exp $
+# $NetBSD: Makefile,v 1.77 2019/11/04 22:09:57 rillig Exp $
 
 DISTNAME=      moodle-3.7.2
 CATEGORIES=    www
@@ -33,7 +33,7 @@ INSTALLATION_DIRS=    ${EGDIR} share/moodle
 .include "options.mk"
 
 PHP_VERSIONS_INCOMPATIBLE=     56
-PHP_VERSIONS_ACCEPTED= 71 72
+PHP_VERSIONS_ACCEPTED=         71 72
 
 PKG_GROUPS_VARS=       APACHE_GROUP
 PKG_USERS_VARS=                APACHE_USER

Index: pkgsrc/www/netscape/Makefile
diff -u pkgsrc/www/netscape/Makefile:1.27 pkgsrc/www/netscape/Makefile:1.28
--- pkgsrc/www/netscape/Makefile:1.27   Sun Oct 28 06:30:23 2012
+++ pkgsrc/www/netscape/Makefile        Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/10/28 06:30:23 asau Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/04 22:09:57 rillig Exp $
 #
 
 DISTNAME=      netscape-20040123
@@ -12,14 +12,14 @@ COMMENT=    Open new window using netscape-
 
 .include "../../mk/bsd.prefs.mk"
 
-DEPENDS+= ns-remote>=1.3:../../www/ns-remote
-DEPENDS+={${NETSCAPE_PREFERRED:C/:/,/g}}-[0-9]*:../../www/${NETSCAPE_PREFERRED:C/:.*//}
+DEPENDS+=      ns-remote>=1.3:../../www/ns-remote
+DEPENDS+=      {${NETSCAPE_PREFERRED:C/:/,/g}}-[0-9]*:../../www/${NETSCAPE_PREFERRED:C/:.*//}
 
-NETSCAPE_PREFERRED_DEFAULT=firefox:mozilla:firefox-bin:netscape7:communicator:navigator
+NETSCAPE_PREFERRED_DEFAULT=    firefox:mozilla:firefox-bin:netscape7:communicator:navigator
 .if defined(NS_PREFERRED)
-NETSCAPE_PREFERRED=${NS_PREFERRED}:${NETSCAPE_PREFERRED_DEFAULT}
+NETSCAPE_PREFERRED=            ${NS_PREFERRED}:${NETSCAPE_PREFERRED_DEFAULT}
 .else
-NETSCAPE_PREFERRED=${NETSCAPE_PREFERRED_DEFAULT}
+NETSCAPE_PREFERRED=            ${NETSCAPE_PREFERRED_DEFAULT}
 .endif
 
 WRKSRC=                ${WRKDIR}

Index: pkgsrc/www/nginx/Makefile.common
diff -u pkgsrc/www/nginx/Makefile.common:1.15 pkgsrc/www/nginx/Makefile.common:1.16
--- pkgsrc/www/nginx/Makefile.common:1.15       Mon May  6 09:38:48 2019
+++ pkgsrc/www/nginx/Makefile.common    Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2019/05/06 09:38:48 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2019/11/04 22:09:57 rillig Exp $
 # used by www/nginx/Makefile
 # used by www/nginx-devel/Makefile
 
@@ -29,9 +29,9 @@ PKG_GROUPS_VARS+=     NGINX_GROUP
 PKG_GROUPS=            ${NGINX_GROUP}
 PKG_USERS=             ${NGINX_USER}:${NGINX_GROUP}
 
-PKG_GECOS.${NGINX_USER}=NGINX server user
-PKG_HOME.${NGINX_USER}=        ${NGINX_DATADIR}
-PKG_SHELL.${NGINX_USER}=${NOLOGIN}
+PKG_GECOS.${NGINX_USER}=       NGINX server user
+PKG_HOME.${NGINX_USER}=                ${NGINX_DATADIR}
+PKG_SHELL.${NGINX_USER}=       ${NOLOGIN}
 
 USE_PKGLOCALEDIR=      yes
 HAS_CONFIGURE=         yes

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.51 pkgsrc/www/nginx/options.mk:1.52
--- pkgsrc/www/nginx/options.mk:1.51    Thu Aug 15 08:06:29 2019
+++ pkgsrc/www/nginx/options.mk Mon Nov  4 22:09:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.51 2019/08/15 08:06:29 adam Exp $
+# $NetBSD: options.mk,v 1.52 2019/11/04 22:09:57 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS=         dav flv gtools inet6 luajit mail-proxy memcache naxsi \
@@ -16,15 +16,15 @@ PLIST_VARS+=                naxsi perl uwsgi
 
 # documentation says naxsi must be the first module
 .if !empty(PKG_OPTIONS:Mnaxsi)
-PLIST.naxsi=           yes
-CONFIGURE_ARGS+=       --add-module=../${NAXSI_DISTNAME}/naxsi_src
+PLIST.naxsi=                   yes
+CONFIGURE_ARGS+=               --add-module=../${NAXSI_DISTNAME}/naxsi_src
 .endif
 .if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum)
-NAXSI_VERSION=         0.56
-NAXSI_DISTNAME=                naxsi-${NAXSI_VERSION}
-NAXSI_DISTFILE=                ${NAXSI_DISTNAME}.tar.gz
-SITES.${NAXSI_DISTFILE}=-https://github.com/nbs-system/naxsi/archive/${NAXSI_VERSION}.tar.gz
-DISTFILES+=            ${NAXSI_DISTFILE}
+NAXSI_VERSION=                 0.56
+NAXSI_DISTNAME=                        naxsi-${NAXSI_VERSION}
+NAXSI_DISTFILE=                        ${NAXSI_DISTNAME}.tar.gz
+SITES.${NAXSI_DISTFILE}=       -https://github.com/nbs-system/naxsi/archive/${NAXSI_VERSION}.tar.gz
+DISTFILES+=                    ${NAXSI_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -108,69 +108,69 @@ DISTFILES+=               ${LUA_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mecho)
-CONFIGURE_ARGS+=       --add-module=../${ECHOMOD_DISTNAME}
+CONFIGURE_ARGS+=               --add-module=../${ECHOMOD_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mecho) || make(makesum)
-ECHOMOD_VERSION=       0.61
-ECHOMOD_DISTNAME=      echo-nginx-module-${ECHOMOD_VERSION}
-ECHOMOD_DISTFILE=      ${ECHOMOD_DISTNAME}.tar.gz
+ECHOMOD_VERSION=               0.61
+ECHOMOD_DISTNAME=              echo-nginx-module-${ECHOMOD_VERSION}
+ECHOMOD_DISTFILE=              ${ECHOMOD_DISTNAME}.tar.gz
 SITES.${ECHOMOD_DISTFILE}=     -https://github.com/openresty/echo-nginx-module/archive/v${ECHOMOD_VERSION}.tar.gz
-DISTFILES+=            ${ECHOMOD_DISTFILE}
+DISTFILES+=                    ${ECHOMOD_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mset-misc)
-CONFIGURE_ARGS+=       --add-module=../${SETMISC_DISTNAME}
+CONFIGURE_ARGS+=               --add-module=../${SETMISC_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mset-misc) || make(makesum)
-SETMISC_VERSION=       0.32
-SETMISC_DISTNAME=      set-misc-nginx-module-${SETMISC_VERSION}
-SETMISC_DISTFILE=      ${SETMISC_DISTNAME}.tar.gz
+SETMISC_VERSION=               0.32
+SETMISC_DISTNAME=              set-misc-nginx-module-${SETMISC_VERSION}
+SETMISC_DISTFILE=              ${SETMISC_DISTNAME}.tar.gz
 SITES.${SETMISC_DISTFILE}=     -https://github.com/openresty/set-misc-nginx-module/archive/v${SETMISC_VERSION}.tar.gz
-DISTFILES+=            ${SETMISC_DISTFILE}
+DISTFILES+=                    ${SETMISC_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Marray-var)
-CONFIGURE_ARGS+=       --add-module=../${ARRAYVAR_DISTNAME}
+CONFIGURE_ARGS+=               --add-module=../${ARRAYVAR_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Marray-var) || make(makesum)
-ARRAYVAR_VERSION=      0.05
-ARRAYVAR_DISTNAME=     array-var-nginx-module-${ARRAYVAR_VERSION}
-ARRAYVAR_DISTFILE=     ${ARRAYVAR_DISTNAME}.tar.gz
+ARRAYVAR_VERSION=              0.05
+ARRAYVAR_DISTNAME=             array-var-nginx-module-${ARRAYVAR_VERSION}
+ARRAYVAR_DISTFILE=             ${ARRAYVAR_DISTNAME}.tar.gz
 SITES.${ARRAYVAR_DISTFILE}=    -https://github.com/openresty/array-var-nginx-module/archive/v${ARRAYVAR_VERSION}.tar.gz
-DISTFILES+=            ${ARRAYVAR_DISTFILE}
+DISTFILES+=                    ${ARRAYVAR_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mencrypted-session)
-CONFIGURE_ARGS+=       --add-module=../${ENCSESS_DISTNAME}
+CONFIGURE_ARGS+=               --add-module=../${ENCSESS_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum)
-ENCSESS_VERSION=       0.08
-ENCSESS_DISTNAME=      encrypted-session-nginx-module-${ENCSESS_VERSION}
-ENCSESS_DISTFILE=      ${ENCSESS_DISTNAME}.tar.gz
+ENCSESS_VERSION=               0.08
+ENCSESS_DISTNAME=              encrypted-session-nginx-module-${ENCSESS_VERSION}
+ENCSESS_DISTFILE=              ${ENCSESS_DISTNAME}.tar.gz
 SITES.${ENCSESS_DISTFILE}=     -https://github.com/openresty/encrypted-session-nginx-module/archive/v${ENCSESS_VERSION}.tar.gz
-DISTFILES+=            ${ENCSESS_DISTFILE}
+DISTFILES+=                    ${ENCSESS_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mform-input)
-CONFIGURE_ARGS+=       --add-module=../${FORMINPUT_DISTNAME}
+CONFIGURE_ARGS+=               --add-module=../${FORMINPUT_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mform-input) || make(makesum)
-FORMINPUT_VERSION=     0.12
-FORMINPUT_DISTNAME=    form-input-nginx-module-${FORMINPUT_VERSION}
-FORMINPUT_DISTFILE=    ${FORMINPUT_DISTNAME}.tar.gz
+FORMINPUT_VERSION=             0.12
+FORMINPUT_DISTNAME=            form-input-nginx-module-${FORMINPUT_VERSION}
+FORMINPUT_DISTFILE=            ${FORMINPUT_DISTNAME}.tar.gz
 SITES.${FORMINPUT_DISTFILE}=   -https://github.com/calio/form-input-nginx-module/archive/v${FORMINPUT_VERSION}.tar.gz
-DISTFILES+=            ${FORMINPUT_DISTFILE}
+DISTFILES+=                    ${FORMINPUT_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mheaders-more)
-CONFIGURE_ARGS+=       --add-module=../${HEADMORE_DISTNAME}
+CONFIGURE_ARGS+=               --add-module=../${HEADMORE_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum)
-HEADMORE_VERSION=      0.33
-HEADMORE_DISTNAME=     headers-more-nginx-module-${HEADMORE_VERSION}
-HEADMORE_DISTFILE=     ${HEADMORE_DISTNAME}.tar.gz
+HEADMORE_VERSION=              0.33
+HEADMORE_DISTNAME=             headers-more-nginx-module-${HEADMORE_VERSION}
+HEADMORE_DISTFILE=             ${HEADMORE_DISTNAME}.tar.gz
 SITES.${HEADMORE_DISTFILE}=    -https://github.com/openresty/headers-more-nginx-module/archive/v${HEADMORE_VERSION}.tar.gz
-DISTFILES+=            ${HEADMORE_DISTFILE}
+DISTFILES+=                    ${HEADMORE_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Muwsgi)

Index: pkgsrc/www/ocaml-cohttp/Makefile
diff -u pkgsrc/www/ocaml-cohttp/Makefile:1.1 pkgsrc/www/ocaml-cohttp/Makefile:1.2
--- pkgsrc/www/ocaml-cohttp/Makefile:1.1        Mon Jul  1 15:48:53 2019
+++ pkgsrc/www/ocaml-cohttp/Makefile    Mon Nov  4 22:09:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/07/01 15:48:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/04 22:09:58 rillig Exp $
 
 GITHUB_PROJECT=        ocaml-cohttp
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -13,7 +13,7 @@ LICENSE=      isc
 
 USE_LANGUAGES= # none
 
-OCAML_USE_DUNE=        yes
+OCAML_USE_DUNE=                yes
 DUNE_BUILD_PACKAGES=   cohttp cohttp-top
 OPAM_INSTALL_FILES=    cohttp cohttp-top
 

Index: pkgsrc/www/ocaml-curl/Makefile
diff -u pkgsrc/www/ocaml-curl/Makefile:1.33 pkgsrc/www/ocaml-curl/Makefile:1.34
--- pkgsrc/www/ocaml-curl/Makefile:1.33 Thu Aug 22 12:23:53 2019
+++ pkgsrc/www/ocaml-curl/Makefile      Mon Nov  4 22:09:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/08/22 12:23:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/04 22:09:58 rillig Exp $
 #
 
 DISTNAME=              ocurl-0.5.3
@@ -13,7 +13,7 @@ HOMEPAGE=             https://sourceforge.net/proje
 COMMENT=               OCaml bindings to the CURL library
 LICENSE=               mit
 
-MAKE_JOBS_SAFE=         no
+MAKE_JOBS_SAFE=                no
 
 USE_TOOLS=             gmake
 GNU_CONFIGURE=         yes

Index: pkgsrc/www/ocaml-uri/buildlink3.mk
diff -u pkgsrc/www/ocaml-uri/buildlink3.mk:1.1 pkgsrc/www/ocaml-uri/buildlink3.mk:1.2
--- pkgsrc/www/ocaml-uri/buildlink3.mk:1.1      Tue Mar 19 14:26:38 2019
+++ pkgsrc/www/ocaml-uri/buildlink3.mk  Mon Nov  4 22:09:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 14:26:38 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/11/04 22:09:58 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-uri
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-uri
 OCAML_URI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-uri+=      ocaml-uri>=2.2.0
-BUILDLINK_PKGSRCDIR.ocaml-uri?=        ../../www/ocaml-uri
+BUILDLINK_PKGSRCDIR.ocaml-uri?=                ../../www/ocaml-uri
 
 .endif # OCAML_URI_BUILDLINK3_MK
 

Index: pkgsrc/www/ocsigen/Makefile
diff -u pkgsrc/www/ocsigen/Makefile:1.36 pkgsrc/www/ocsigen/Makefile:1.37
--- pkgsrc/www/ocsigen/Makefile:1.36    Sat Aug 24 11:13:48 2019
+++ pkgsrc/www/ocsigen/Makefile Mon Nov  4 22:09:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/08/24 11:13:48 jaapb Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/04 22:09:58 rillig Exp $
 #
 
 VERSION=       2.15.0
@@ -17,13 +17,13 @@ LICENSE=    gnu-lgpl-v2.1
 # Makefile:42: recipe for target 'ocsipersist.mli' failed
 MAKE_JOBS_SAFE=        no
 
-DEPENDS+=     ocaml-react-[0-9]*:../../devel/ocaml-react
-DEPENDS+=     ocaml-text-[0-9]*:../../textproc/ocaml-text
+DEPENDS+=      ocaml-react-[0-9]*:../../devel/ocaml-react
+DEPENDS+=      ocaml-text-[0-9]*:../../textproc/ocaml-text
 
-OCSIGEN_USER?= ${APACHE_USER}
-OCSIGEN_GROUP?=        ${APACHE_GROUP}
-PKG_GROUPS=    ${OCSIGEN_GROUP}
-PKG_USERS=     ${OCSIGEN_USER}:${OCSIGEN_GROUP}
+OCSIGEN_USER?=         ${APACHE_USER}
+OCSIGEN_GROUP?=                ${APACHE_GROUP}
+PKG_GROUPS=            ${OCSIGEN_GROUP}
+PKG_USERS=             ${OCSIGEN_USER}:${OCSIGEN_GROUP}
 PKG_GROUPS_VARS+=      OCSIGEN_GROUP
 PKG_USERS_VARS+=       OCSIGEN_USER
 
@@ -59,8 +59,8 @@ OCAML_FINDLIB_DIRS=   ocsigenserver
 .include "../../mk/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
-CONFIGURE_ARGS+=               --enable-natdynlink
-BUILDLINK_API_DEPENDS.ocaml+=   ocaml>=3.12.0
+CONFIGURE_ARGS+=               --enable-natdynlink
+BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=3.12.0
 .else
 CONFIGURE_ARGS+=               --disable-natdynlink
 .endif

Index: pkgsrc/www/ocsigen/options.mk
diff -u pkgsrc/www/ocsigen/options.mk:1.6 pkgsrc/www/ocsigen/options.mk:1.7
--- pkgsrc/www/ocsigen/options.mk:1.6   Fri Apr 13 13:15:00 2018
+++ pkgsrc/www/ocsigen/options.mk       Mon Nov  4 22:09:58 2019
@@ -1,14 +1,14 @@
-# $NetBSD: options.mk,v 1.6 2018/04/13 13:15:00 jaapb Exp $
+# $NetBSD: options.mk,v 1.7 2019/11/04 22:09:58 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.ocsigen
-PKG_SUPPORTED_OPTIONS= camlzip
+PKG_OPTIONS_VAR=               PKG_OPTIONS.ocsigen
+PKG_SUPPORTED_OPTIONS=         camlzip
 PKG_OPTIONS_NONEMPTY_SETS=     database
 PKG_OPTIONS_SET.database=      sqlite gdbm pgsql
-PKG_SUGGESTED_OPTIONS= gdbm camlzip
+PKG_SUGGESTED_OPTIONS=         gdbm camlzip
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   sqlite
+PLIST_VARS+=           sqlite
 .if !empty(PKG_OPTIONS:Msqlite)
 DEPENDS+=              ocaml-sqlite3>=0.23.0:../../databases/ocaml-sqlite3
 CONFIGURE_ARGS+=       --with-sqlite
@@ -26,7 +26,7 @@ PLIST.dbm=            yes
 CONFIGURE_ARGS+=       --without-dbm
 .endif
 
-PLIST_VARS+=   camlzip
+PLIST_VARS+=           camlzip
 .if !empty(PKG_OPTIONS:Mcamlzip)
 DEPENDS+=              ocaml-zip-[0-9]*:../../archivers/ocaml-zip
 CONFIGURE_ARGS+=       --with-camlzip

Index: pkgsrc/www/ocsigen-i18n/Makefile
diff -u pkgsrc/www/ocsigen-i18n/Makefile:1.4 pkgsrc/www/ocsigen-i18n/Makefile:1.5
--- pkgsrc/www/ocsigen-i18n/Makefile:1.4        Mon May 13 17:18:43 2019
+++ pkgsrc/www/ocsigen-i18n/Makefile    Mon Nov  4 22:09:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/05/13 17:18:43 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/04 22:09:58 rillig Exp $
 
 GITHUB_PROJECT=        ocsigen-i18n
 DISTNAME=      ${GITHUB_PROJECT}-3.4.0
@@ -10,10 +10,10 @@ HOMEPAGE=   https://github.com/besport/ocs
 COMMENT=       i18n package for Ocsigen
 LICENSE=       gnu-lgpl-v2.1
 
-USE_LANGUAGES= # none
-USE_TOOLS=     gmake
-BUILD_TARGET=  build
-MAKE_ENV=      bindir=${DESTDIR}${PREFIX}/bin
+USE_LANGUAGES=         # none
+USE_TOOLS=             gmake
+BUILD_TARGET=          build
+MAKE_ENV=              bindir=${DESTDIR}${PREFIX}/bin
 INSTALLATION_DIRS+=    bin
 
 OCAML_USE_FINDLIB=     yes

Index: pkgsrc/www/ocsigen-start/Makefile
diff -u pkgsrc/www/ocsigen-start/Makefile:1.7 pkgsrc/www/ocsigen-start/Makefile:1.8
--- pkgsrc/www/ocsigen-start/Makefile:1.7       Mon May 13 12:17:11 2019
+++ pkgsrc/www/ocsigen-start/Makefile   Mon Nov  4 22:09:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/05/13 12:17:11 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 22:09:58 rillig Exp $
 
 GITHUB_PROJECT=        ocsigen-start
 DISTNAME=      ${GITHUB_PROJECT}-1.7.0
@@ -25,16 +25,16 @@ MAKE_ENV+=  NATIVE=no
 
 DEPENDS+=      eliom>=6.4:../../www/eliom
 
-SUBST_CLASSES+=        fix-settings
+SUBST_CLASSES+=                        fix-settings
 SUBST_STAGE.fix-settings=      pre-configure
-SUBST_FILES.fix-settings= template.distillery/Makefile.db
+SUBST_FILES.fix-settings=      template.distillery/Makefile.db
 SUBST_FILES.fix-settings+=     template.distillery/Makefile.options
-SUBST_SED.fix-settings=        -e 's,$$(shell opam config var lib),${PREFIX}/${OCAML_SITELIBDIR},'
+SUBST_SED.fix-settings=                -e 's,$$(shell opam config var lib),${PREFIX}/${OCAML_SITELIBDIR},'
 SUBST_SED.fix-settings+=       -e 's,$$(shell $$(OPAM) config var share),${PREFIX}/share,'
 SUBST_SED.fix-settings+=       -e '/USE_SASS/s,yes,no,'
 SUBST_SED.fix-settings+=       -e '/USE_NPM/s,yes,no,'
 
-SUBST_CLASSES+=        fix-md5
+SUBST_CLASSES+=                fix-md5
 SUBST_STAGE.fix-md5=   pre-configure
 SUBST_FILES.fix-md5=   template.distillery/Makefile.mobile
 SUBST_FILES.fix-md5+=  template.distillery/Makefile.os

Index: pkgsrc/www/opera/Makefile
diff -u pkgsrc/www/opera/Makefile:1.107 pkgsrc/www/opera/Makefile:1.108
--- pkgsrc/www/opera/Makefile:1.107     Sat Apr 21 13:38:07 2018
+++ pkgsrc/www/opera/Makefile   Mon Nov  4 22:09:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2018/04/21 13:38:07 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2019/11/04 22:09:58 rillig Exp $
 
 DISTNAME=              opera-${OPERA_PKG_VERSION}-${OPERA_PKG_BUILD}.${OPERA_ARCH}.${EMUL_OPSYS}
 PKGNAME=               opera-${OPERA_PKG_VERSION:S/u/pl/}
@@ -36,26 +36,26 @@ EMUL_MODULES.linux= base x11 fontconfig
 EMUL_REQD=             suse>=11.3
 OPERA_ARCH.x86_64=     x86_64
 OPERA_OPSYS_SUBDIR=    linux
-.if !defined(EMUL_IS_NATIVE) && ${OPSYS} == "NetBSD"
+.  if !defined(EMUL_IS_NATIVE) && ${OPSYS} == "NetBSD"
 TOOLS_CREATE+=         md5
 TOOLS_SCRIPT.md5=      /usr/bin/md5 -n "$$2" | { read sum file; echo $$sum; }
-.endif
-.if ${EMUL_ARCH} == "x86_64"
+.  endif
+.  if ${EMUL_ARCH} == "x86_64"
 PLIST.ia32w=           yes
-.endif
+.  endif
 PLIST.linux=           yes
 
 .elif ${EMUL_OPSYS} == "freebsd"
-OPERA_ARCH.x86_64=     amd64
-OPERA_OPSYS_SUBDIR=    unix
+OPERA_ARCH.x86_64=             amd64
+OPERA_OPSYS_SUBDIR=            unix
 # XXX: TBD
 #.  if defined(EMUL_IS_NATIVE)
-#DEPENDS+=             {gtk2+-[0-9]*,kdelibs4-[0-9]*}:../../x11/gtk2
+#DEPENDS+=                     {gtk2+-[0-9]*,kdelibs4-[0-9]*}:../../x11/gtk2
 #CHECK_SHLIBS_SUPPORTED=       no
 #.  endif
 .endif
-OPERA_ARCH=            ${OPERA_ARCH.${EMUL_ARCH}:U${EMUL_ARCH}}
-OPERA_DIR=             ${OPERA_OPSYS_SUBDIR}/${OPERA_PKG_VERSION_DIR}
+OPERA_ARCH=                    ${OPERA_ARCH.${EMUL_ARCH}:U${EMUL_ARCH}}
+OPERA_DIR=                     ${OPERA_OPSYS_SUBDIR}/${OPERA_PKG_VERSION_DIR}
 
 MANCOMPRESSED=         yes
 

Index: pkgsrc/www/p5-AnyEvent-HTTP/Makefile
diff -u pkgsrc/www/p5-AnyEvent-HTTP/Makefile:1.21 pkgsrc/www/p5-AnyEvent-HTTP/Makefile:1.22
--- pkgsrc/www/p5-AnyEvent-HTTP/Makefile:1.21   Sun Aug 11 13:24:22 2019
+++ pkgsrc/www/p5-AnyEvent-HTTP/Makefile        Mon Nov  4 22:09:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:24:22 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 22:09:58 rillig Exp $
 
 DISTNAME=      AnyEvent-HTTP-2.24
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module providing simple 
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/AnyEvent/HTTP/.packlist
+PERL5_PACKLIST=        auto/AnyEvent/HTTP/.packlist
 
 DEPENDS+=      p5-AnyEvent>=5:../../devel/p5-AnyEvent
 

Index: pkgsrc/www/p5-AnyEvent-HTTPD/Makefile
diff -u pkgsrc/www/p5-AnyEvent-HTTPD/Makefile:1.16 pkgsrc/www/p5-AnyEvent-HTTPD/Makefile:1.17
--- pkgsrc/www/p5-AnyEvent-HTTPD/Makefile:1.16  Sun Aug 11 13:24:22 2019
+++ pkgsrc/www/p5-AnyEvent-HTTPD/Makefile       Mon Nov  4 22:09:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:24:22 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 22:09:59 rillig Exp $
 
 DISTNAME=      AnyEvent-HTTPD-0.93
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 simple lightweight event
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/AnyEvent/HTTPD/.packlist
+PERL5_PACKLIST=        auto/AnyEvent/HTTPD/.packlist
 
 DEPENDS+=      p5-AnyEvent-[0-9]*:../../devel/p5-AnyEvent
 DEPENDS+=      p5-Object-Event-[0-9]*:../../devel/p5-Object-Event

Index: pkgsrc/www/p5-App-Nopaste/Makefile
diff -u pkgsrc/www/p5-App-Nopaste/Makefile:1.33 pkgsrc/www/p5-App-Nopaste/Makefile:1.34
--- pkgsrc/www/p5-App-Nopaste/Makefile:1.33     Sun Aug 11 13:24:25 2019
+++ pkgsrc/www/p5-App-Nopaste/Makefile  Mon Nov  4 22:09:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/08/11 13:24:25 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/04 22:09:59 rillig Exp $
 
 DISTNAME=      App-Nopaste-1.012
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module providing easy ac
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/App/Nopaste/.packlist
+PERL5_PACKLIST=        auto/App/Nopaste/.packlist
 
 REPLACE_PERL+= script/nopaste
 

Index: pkgsrc/www/p5-CGI-Compile/Makefile
diff -u pkgsrc/www/p5-CGI-Compile/Makefile:1.21 pkgsrc/www/p5-CGI-Compile/Makefile:1.22
--- pkgsrc/www/p5-CGI-Compile/Makefile:1.21     Sun Aug 11 13:24:26 2019
+++ pkgsrc/www/p5-CGI-Compile/Makefile  Mon Nov  4 22:09:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:24:26 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 22:09:59 rillig Exp $
 
 DISTNAME=      CGI-Compile-0.22
 PKGNAME=       p5-${DISTNAME}
@@ -11,8 +11,8 @@ HOMEPAGE=     https://metacpan.org/release/C
 COMMENT=       Perl 5 module to compile .cgi scripts to a code reference
 LICENSE=       ${PERL5_LICENSE}
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/CGI/Compile/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/CGI/Compile/.packlist
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 
 BUILD_DEPENDS+=        p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings

Index: pkgsrc/www/p5-CGI-Cookie-XS/Makefile
diff -u pkgsrc/www/p5-CGI-Cookie-XS/Makefile:1.8 pkgsrc/www/p5-CGI-Cookie-XS/Makefile:1.9
--- pkgsrc/www/p5-CGI-Cookie-XS/Makefile:1.8    Sun Aug 11 13:24:26 2019
+++ pkgsrc/www/p5-CGI-Cookie-XS/Makefile        Mon Nov  4 22:09:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:24:26 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/04 22:09:59 rillig Exp $
 
 DISTNAME=      CGI-Cookie-XS-0.18
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      HTTP Cookie parser in pure C
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= c
-PERL5_PACKLIST= auto/CGI/Cookie/XS/.packlist
+PERL5_PACKLIST=        auto/CGI/Cookie/XS/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-CGI-Emulate-PSGI/Makefile
diff -u pkgsrc/www/p5-CGI-Emulate-PSGI/Makefile:1.21 pkgsrc/www/p5-CGI-Emulate-PSGI/Makefile:1.22
--- pkgsrc/www/p5-CGI-Emulate-PSGI/Makefile:1.21        Sun Aug 11 13:24:26 2019
+++ pkgsrc/www/p5-CGI-Emulate-PSGI/Makefile     Mon Nov  4 22:09:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:24:26 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 22:09:59 rillig Exp $
 
 DISTNAME=      CGI-Emulate-PSGI-0.23
 PKGNAME=       p5-${DISTNAME}
@@ -18,7 +18,7 @@ BUILD_DEPENDS+=       p5-Test-Requires-[0-9]*:
 BUILD_DEPENDS+=        p5-CGI-[0-9]*:../../www/p5-CGI
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/CGI/Emulate/PSGI/.packlist
+PERL5_PACKLIST=        auto/CGI/Emulate/PSGI/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-CGI-PSGI/Makefile
diff -u pkgsrc/www/p5-CGI-PSGI/Makefile:1.16 pkgsrc/www/p5-CGI-PSGI/Makefile:1.17
--- pkgsrc/www/p5-CGI-PSGI/Makefile:1.16        Sun Aug 11 13:24:27 2019
+++ pkgsrc/www/p5-CGI-PSGI/Makefile     Mon Nov  4 22:09:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:24:27 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 22:09:59 rillig Exp $
 
 DISTNAME=      CGI-PSGI-0.15
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module to adapt CGI.pm t
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/CGI/PSGI/.packlist
+PERL5_PACKLIST=        auto/CGI/PSGI/.packlist
 
 #DEPENDS+=     {perl>=5.10.1,p5-CGI>=3.33}:../../www/p5-CGI
 

Index: pkgsrc/www/p5-CGI-Simple/Makefile
diff -u pkgsrc/www/p5-CGI-Simple/Makefile:1.24 pkgsrc/www/p5-CGI-Simple/Makefile:1.25
--- pkgsrc/www/p5-CGI-Simple/Makefile:1.24      Thu Oct  3 23:55:40 2019
+++ pkgsrc/www/p5-CGI-Simple/Makefile   Mon Nov  4 22:09:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/10/03 23:55:40 wen Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/04 22:09:59 rillig Exp $
 
 DISTNAME=      CGI-Simple-1.22
 PKGNAME=       p5-${DISTNAME}
@@ -14,8 +14,8 @@ DEPENDS+=     p5-IO-stringy-[0-9]*:../../dev
 BUILD_DEPENDS+=        p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 BUILD_DEPENDS+=        p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST=        auto/CGI/Simple/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/CGI/Simple/.packlist
 PERL5_MODULE_TYPE=     Module::Build
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-CSS-Tiny/Makefile
diff -u pkgsrc/www/p5-CSS-Tiny/Makefile:1.17 pkgsrc/www/p5-CSS-Tiny/Makefile:1.18
--- pkgsrc/www/p5-CSS-Tiny/Makefile:1.17        Sun Aug 11 13:24:28 2019
+++ pkgsrc/www/p5-CSS-Tiny/Makefile     Mon Nov  4 22:09:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:28 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:09:59 rillig Exp $
 
 DISTNAME=      CSS-Tiny-1.20
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module to read/write .cs
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/CSS/Tiny/.packlist
+PERL5_PACKLIST=        auto/CSS/Tiny/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-Catalyst-Action-REST/Makefile
diff -u pkgsrc/www/p5-Catalyst-Action-REST/Makefile:1.27 pkgsrc/www/p5-Catalyst-Action-REST/Makefile:1.28
--- pkgsrc/www/p5-Catalyst-Action-REST/Makefile:1.27    Sun Aug 11 13:24:28 2019
+++ pkgsrc/www/p5-Catalyst-Action-REST/Makefile Mon Nov  4 22:09:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/08/11 13:24:28 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/04 22:09:59 rillig Exp $
 
 DISTNAME=      Catalyst-Action-REST-1.21
 PKGNAME=       p5-${DISTNAME}
@@ -29,7 +29,7 @@ DEPENDS+=     p5-libwww>=5.831:../../www/p5-
 DEPENDS+=      p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
 USE_LANGUAGES=         # empty
-PERL5_PACKLIST=        auto/Catalyst/Action/REST/.packlist
+PERL5_PACKLIST=                auto/Catalyst/Action/REST/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Catalyst-Action-RenderView/Makefile
diff -u pkgsrc/www/p5-Catalyst-Action-RenderView/Makefile:1.21 pkgsrc/www/p5-Catalyst-Action-RenderView/Makefile:1.22
--- pkgsrc/www/p5-Catalyst-Action-RenderView/Makefile:1.21      Sun Aug 11 13:24:29 2019
+++ pkgsrc/www/p5-Catalyst-Action-RenderView/Makefile   Mon Nov  4 22:10:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:24:29 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 22:10:00 rillig Exp $
 
 DISTNAME=      Catalyst-Action-RenderView-0.16
 PKGNAME=       p5-${DISTNAME}
@@ -17,8 +17,8 @@ DEPENDS+=     p5-MRO-Compat-[0-9]*:../../dev
 
 BUILD_DEPENDS+=        p5-HTTP-Request-AsCGI-[0-9]*:../../www/p5-HTTP-Request-AsCGI
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Catalyst/Action/RenderView/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Catalyst/Action/RenderView/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
diff -u pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile:1.18 pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile:1.19
--- pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile:1.18 Sun Aug 11 13:24:29 2019
+++ pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile      Mon Nov  4 22:10:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:24:29 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/04 22:10:00 rillig Exp $
 
 DISTNAME=      Catalyst-Authentication-Credential-HTTP-1.018
 PKGNAME=       p5-${DISTNAME}
@@ -25,7 +25,7 @@ BUILD_DEPENDS+=       p5-Test-Needs-[0-9]*:../
 BUILD_DEPENDS+=        p5-Test-MockObject-[0-9]*:../../devel/p5-Test-MockObject
 BUILD_DEPENDS+=        p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
-PERL5_PACKLIST=        auto/Catalyst/Authentication/Credential/HTTP/.packlist
+PERL5_PACKLIST=                auto/Catalyst/Authentication/Credential/HTTP/.packlist
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1

Index: pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile
diff -u pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile:1.14 pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile:1.15
--- pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile:1.14   Sun Aug 11 13:24:29 2019
+++ pkgsrc/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile        Mon Nov  4 22:10:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:24:29 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 22:10:00 rillig Exp $
 
 DISTNAME=      Catalyst-Authentication-Credential-HTTP-Proxy-0.06
 PKGNAME=       p5-${DISTNAME}
@@ -19,7 +19,7 @@ DEPENDS+=     p5-libwww-[0-9]*:../../www/p5-
 BUILD_DEPENDS+=        p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 BUILD_DEPENDS+=        p5-Test-MockObject-[0-9]*:../../devel/p5-Test-MockObject
 
-PERL5_PACKLIST=        auto/Catalyst/Authentication/Credential/HTTP/Proxy/.packlist
+PERL5_PACKLIST=                auto/Catalyst/Authentication/Credential/HTTP/Proxy/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1

Index: pkgsrc/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile
diff -u pkgsrc/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile:1.18 pkgsrc/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile:1.19
--- pkgsrc/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile:1.18  Sun Aug 11 13:24:29 2019
+++ pkgsrc/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile       Mon Nov  4 22:10:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:24:29 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/04 22:10:00 rillig Exp $
 
 DISTNAME=      Catalyst-Authentication-Store-Htpasswd-1.006
 PKGNAME=       p5-${DISTNAME}
@@ -23,7 +23,7 @@ BUILD_DEPENDS+=       p5-Test-Simple>=1.001010
 REPLACE_PERL+= lib/Catalyst/Authentication/Store/*.pm
 REPLACE_PERL+= lib/Catalyst/Authentication/Store/Htpasswd/*.pm
 
-PERL5_PACKLIST=        auto/Catalyst/Authentication/Store/Htpasswd/.packlist
+PERL5_PACKLIST=                auto/Catalyst/Authentication/Store/Htpasswd/.packlist
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Catalyst-Controller-BindLex/Makefile
diff -u pkgsrc/www/p5-Catalyst-Controller-BindLex/Makefile:1.17 pkgsrc/www/p5-Catalyst-Controller-BindLex/Makefile:1.18
--- pkgsrc/www/p5-Catalyst-Controller-BindLex/Makefile:1.17     Sun Aug 11 13:24:29 2019
+++ pkgsrc/www/p5-Catalyst-Controller-BindLex/Makefile  Mon Nov  4 22:10:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:29 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:00 rillig Exp $
 
 DISTNAME=      Catalyst-Controller-BindLex-0.05
 PKGNAME=       p5-${DISTNAME}
@@ -10,11 +10,11 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://metacpan.org/pod/Catalyst::Controller::BindLex
 COMMENT=       Put lexicals on the catalyst stash
 
-DEPENDS+=       p5-Array-RefElem>=0:../../devel/p5-Array-RefElem
+DEPENDS+=      p5-Array-RefElem>=0:../../devel/p5-Array-RefElem
 DEPENDS+=      p5-Catalyst-Runtime>=0:../../www/p5-Catalyst-Runtime
 DEPENDS+=      p5-Devel-Caller>0:../../devel/p5-Devel-Caller
 DEPENDS+=      p5-Devel-LexAlias>0:../../devel/p5-Devel-LexAlias
-DEPENDS+=       p5-Test-Simple>=1.001010:../../devel/p5-Test-Simple
+DEPENDS+=      p5-Test-Simple>=1.001010:../../devel/p5-Test-Simple
 DEPENDS+=      p5-PadWalker>0:../../devel/p5-PadWalker
 
 USE_LANGUAGES= # empty

Index: pkgsrc/www/p5-Catalyst-Controller-FormBuilder/Makefile
diff -u pkgsrc/www/p5-Catalyst-Controller-FormBuilder/Makefile:1.22 pkgsrc/www/p5-Catalyst-Controller-FormBuilder/Makefile:1.23
--- pkgsrc/www/p5-Catalyst-Controller-FormBuilder/Makefile:1.22 Sun Aug 11 13:24:30 2019
+++ pkgsrc/www/p5-Catalyst-Controller-FormBuilder/Makefile      Mon Nov  4 22:10:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:24:30 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/04 22:10:00 rillig Exp $
 
 DISTNAME=      Catalyst-Controller-FormBuilder-0.06
 PKGNAME=       p5-${DISTNAME}
@@ -23,8 +23,8 @@ DEPENDS+=     p5-Tie-IxHash>=1.21:../../deve
 # Recommented
 DEPENDS+=      p5-Catalyst-View-TT>=0.23:../../www/p5-Catalyst-View-TT
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Catalyst/Controller/FormBuilder/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Catalyst/Controller/FormBuilder/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1

Index: pkgsrc/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
diff -u pkgsrc/www/p5-Catalyst-Controller-HTML-FormFu/Makefile:1.20 pkgsrc/www/p5-Catalyst-Controller-HTML-FormFu/Makefile:1.21
--- pkgsrc/www/p5-Catalyst-Controller-HTML-FormFu/Makefile:1.20 Sun Aug 11 13:24:30 2019
+++ pkgsrc/www/p5-Catalyst-Controller-HTML-FormFu/Makefile      Mon Nov  4 22:10:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:24:30 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 22:10:00 rillig Exp $
 
 DISTNAME=      Catalyst-Controller-HTML-FormFu-2.04
 PKGNAME=       p5-${DISTNAME}
@@ -22,20 +22,20 @@ DEPENDS+=   p5-Regexp-Assemble-[0-9]*:../.
 DEPENDS+=      p5-Task-Weaken-[0-9]*:../../devel/p5-Task-Weaken
 DEPENDS+=      p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
-BUILD_DEPENDS+=        p5-Catalyst-Action-RenderView-[0-9]*:../../www/p5-Catalyst-Action-RenderView
-BUILD_DEPENDS+=        p5-Catalyst-Plugin-ConfigLoader>=0.23:../../www/p5-Catalyst-Plugin-ConfigLoader
-BUILD_DEPENDS+=        p5-Catalyst-Plugin-Session-[0-9]*:../../www/p5-Catalyst-Plugin-Session
-BUILD_DEPENDS+=        p5-Catalyst-Plugin-Session-State-Cookie-[0-9]*:../../www/p5-Catalyst-Plugin-Session-State-Cookie
-BUILD_DEPENDS+=        p5-Catalyst-Plugin-Session-Store-File-[0-9]*:../../www/p5-Catalyst-Plugin-Session-Store-File
-BUILD_DEPENDS+=        p5-Catalyst-View-TT-[0-9]*:../../www/p5-Catalyst-View-TT
-BUILD_DEPENDS+=        p5-Config-General-[0-9]*:../../devel/p5-Config-General
-BUILD_DEPENDS+=        p5-Template-Toolkit>=2:../../www/p5-Template-Toolkit
+BUILD_DEPENDS+=                p5-Catalyst-Action-RenderView-[0-9]*:../../www/p5-Catalyst-Action-RenderView
+BUILD_DEPENDS+=                p5-Catalyst-Plugin-ConfigLoader>=0.23:../../www/p5-Catalyst-Plugin-ConfigLoader
+BUILD_DEPENDS+=                p5-Catalyst-Plugin-Session-[0-9]*:../../www/p5-Catalyst-Plugin-Session
+BUILD_DEPENDS+=                p5-Catalyst-Plugin-Session-State-Cookie-[0-9]*:../../www/p5-Catalyst-Plugin-Session-State-Cookie
+BUILD_DEPENDS+=                p5-Catalyst-Plugin-Session-Store-File-[0-9]*:../../www/p5-Catalyst-Plugin-Session-Store-File
+BUILD_DEPENDS+=                p5-Catalyst-View-TT-[0-9]*:../../www/p5-Catalyst-View-TT
+BUILD_DEPENDS+=                p5-Config-General-[0-9]*:../../devel/p5-Config-General
+BUILD_DEPENDS+=                p5-Template-Toolkit>=2:../../www/p5-Template-Toolkit
 #BUILD_DEPENDS+=       {perl>=5.10.1,p5-Test-Simple>=0.92}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=        p5-Test-WWW-Mechanize>=1.16:../../www/p5-Test-WWW-Mechanize
-BUILD_DEPENDS+=        p5-Test-WWW-Mechanize-Catalyst-[0-9]*:../../www/p5-Test-WWW-Mechanize-Catalyst
+BUILD_DEPENDS+=                p5-Test-WWW-Mechanize>=1.16:../../www/p5-Test-WWW-Mechanize
+BUILD_DEPENDS+=                p5-Test-WWW-Mechanize-Catalyst-[0-9]*:../../www/p5-Test-WWW-Mechanize-Catalyst
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Catalyst/Controller/HTML/FormFu/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Catalyst/Controller/HTML/FormFu/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Catalyst-Devel/Makefile
diff -u pkgsrc/www/p5-Catalyst-Devel/Makefile:1.31 pkgsrc/www/p5-Catalyst-Devel/Makefile:1.32
--- pkgsrc/www/p5-Catalyst-Devel/Makefile:1.31  Sun Aug 11 13:24:30 2019
+++ pkgsrc/www/p5-Catalyst-Devel/Makefile       Mon Nov  4 22:10:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/08/11 13:24:30 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/04 22:10:00 rillig Exp $
 
 DISTNAME=      Catalyst-Devel-1.39
 PKGNAME=       p5-${DISTNAME}
@@ -34,7 +34,7 @@ DEPENDS+=     p5-namespace-clean-[0-9]*:../.
 #BUILD_DEPENDS+=       {perl>=5.12.0,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple
 
 USE_LANGUAGES=         # empty
-PERL5_PACKLIST=        auto/Catalyst/Devel/.packlist
+PERL5_PACKLIST=                auto/Catalyst/Devel/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Catalyst-DispatchType-Regex/Makefile
diff -u pkgsrc/www/p5-Catalyst-DispatchType-Regex/Makefile:1.11 pkgsrc/www/p5-Catalyst-DispatchType-Regex/Makefile:1.12
--- pkgsrc/www/p5-Catalyst-DispatchType-Regex/Makefile:1.11     Sun Aug 11 13:24:30 2019
+++ pkgsrc/www/p5-Catalyst-DispatchType-Regex/Makefile  Mon Nov  4 22:10:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/08/11 13:24:30 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/04 22:10:01 rillig Exp $
 
 DISTNAME=      Catalyst-DispatchType-Regex-5.90035
 PKGNAME=       p5-${DISTNAME}
@@ -17,8 +17,8 @@ DEPENDS+=     p5-Text-SimpleTable>=0:../../t
 
 #BUILD_DEPENDS+=       {perl>=5.19.1,p5-Module-Build>=0.4004}:../../devel/p5-Module-Build
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Catalyst/DispatchType/Regex/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Catalyst/DispatchType/Regex/.packlist
 PERL5_MODULE_TYPE=     Module::Build
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Catalyst-Engine-JobQueue-POE/Makefile
diff -u pkgsrc/www/p5-Catalyst-Engine-JobQueue-POE/Makefile:1.18 pkgsrc/www/p5-Catalyst-Engine-JobQueue-POE/Makefile:1.19
--- pkgsrc/www/p5-Catalyst-Engine-JobQueue-POE/Makefile:1.18    Sun Aug 11 13:24:30 2019
+++ pkgsrc/www/p5-Catalyst-Engine-JobQueue-POE/Makefile Mon Nov  4 22:10:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:24:30 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/04 22:10:01 rillig Exp $
 
 DISTNAME=      Catalyst-Engine-JobQueue-POE-0.0.4
 PKGNAME=       p5-${DISTNAME}
@@ -19,7 +19,7 @@ DEPENDS+=     p5-Catalyst-Runtime>=5.7001:..
 DEPENDS+=      p5-POE-Component-Cron>=0.014:../../devel/p5-POE-Component-Cron
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Catalyst/Engine/JobQueue/POE/.packlist
+PERL5_PACKLIST=        auto/Catalyst/Engine/JobQueue/POE/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-Catalyst-Engine-PSGI/Makefile
diff -u pkgsrc/www/p5-Catalyst-Engine-PSGI/Makefile:1.17 pkgsrc/www/p5-Catalyst-Engine-PSGI/Makefile:1.18
--- pkgsrc/www/p5-Catalyst-Engine-PSGI/Makefile:1.17    Sun Aug 11 13:24:30 2019
+++ pkgsrc/www/p5-Catalyst-Engine-PSGI/Makefile Mon Nov  4 22:10:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:30 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:01 rillig Exp $
 
 DISTNAME=      Catalyst-Engine-PSGI-0.14
 PKGNAME=       p5-${DISTNAME}
@@ -19,8 +19,8 @@ BUILD_DEPENDS+=       p5-Test-TCP-[0-9]*:../..
 BUILD_DEPENDS+=        p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 BUILD_DEPENDS+=        p5-Plack-[0-9]*:../../www/p5-Plack
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST=        auto/Catalyst/Engine/PSGI/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Catalyst/Engine/PSGI/.packlist
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Catalyst-Manual/Makefile
diff -u pkgsrc/www/p5-Catalyst-Manual/Makefile:1.29 pkgsrc/www/p5-Catalyst-Manual/Makefile:1.30
--- pkgsrc/www/p5-Catalyst-Manual/Makefile:1.29 Fri Oct  4 03:06:38 2019
+++ pkgsrc/www/p5-Catalyst-Manual/Makefile      Mon Nov  4 22:10:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/10/04 03:06:38 wen Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/04 22:10:01 rillig Exp $
 
 DISTNAME=      Catalyst-Manual-5.9010
 PKGNAME=       p5-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=     https://metacpan.org/release/C
 COMMENT=       Manual for Catalyst
 LICENSE=       ${PERL5_LICENSE}
 
-PERL5_PACKLIST=        auto/Catalyst/Manual/.packlist
+PERL5_PACKLIST=                auto/Catalyst/Manual/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Catalyst-Model-File/Makefile
diff -u pkgsrc/www/p5-Catalyst-Model-File/Makefile:1.15 pkgsrc/www/p5-Catalyst-Model-File/Makefile:1.16
--- pkgsrc/www/p5-Catalyst-Model-File/Makefile:1.15     Sun Aug 11 13:24:31 2019
+++ pkgsrc/www/p5-Catalyst-Model-File/Makefile  Mon Nov  4 22:10:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:24:31 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:10:01 rillig Exp $
 
 DISTNAME=      Catalyst-Model-File-0.10
 PKGNAME=       p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=     p5-MRO-Compat-[0-9]*:../../dev
 DEPENDS+=      p5-Path-Class-[0-9]*:../../devel/p5-Path-Class
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Catalyst/Model/File/.packlist
+PERL5_PACKLIST=        auto/Catalyst/Model/File/.packlist
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1
 

Index: pkgsrc/www/p5-Catalyst-Plugin-Authentication/Makefile
diff -u pkgsrc/www/p5-Catalyst-Plugin-Authentication/Makefile:1.29 pkgsrc/www/p5-Catalyst-Plugin-Authentication/Makefile:1.30
--- pkgsrc/www/p5-Catalyst-Plugin-Authentication/Makefile:1.29  Sun Aug 11 13:24:31 2019
+++ pkgsrc/www/p5-Catalyst-Plugin-Authentication/Makefile       Mon Nov  4 22:10:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/08/11 13:24:31 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/04 22:10:01 rillig Exp $
 
 DISTNAME=      Catalyst-Plugin-Authentication-0.10023
 PKGNAME=       p5-${DISTNAME}0
@@ -16,16 +16,16 @@ DEPENDS+=   p5-Catalyst-Runtime-[0-9]*:../
 DEPENDS+=      p5-Class-Inspector-[0-9]*:../../devel/p5-Class-Inspector
 DEPENDS+=      p5-MRO-Compat-[0-9]*:../../devel/p5-MRO-Compat
 
-BUILD_DEPENDS+= p5-Catalyst-Plugin-Session-State-Cookie-[0-9]*:../../www/p5-Catalyst-Plugin-Session-State-Cookie
-BUILD_DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
-BUILD_DEPENDS+= p5-Moose>=2:../../devel/p5-Moose
-BUILD_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
-#BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+= p5-Test-WWW-Mechanize-Catalyst>=0.50:../../www/p5-Test-WWW-Mechanize-Catalyst
+BUILD_DEPENDS+=                p5-Catalyst-Plugin-Session-State-Cookie-[0-9]*:../../www/p5-Catalyst-Plugin-Session-State-Cookie
+BUILD_DEPENDS+=                p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
+BUILD_DEPENDS+=                p5-Moose>=2:../../devel/p5-Moose
+BUILD_DEPENDS+=                p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+#BUILD_DEPENDS+=       {perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
+BUILD_DEPENDS+=                p5-Test-WWW-Mechanize-Catalyst>=0.50:../../www/p5-Test-WWW-Mechanize-Catalyst
 
 #PERL5_MODULE_TYPE=    Module::Install::Bundled
-MAKE_PARAMS+=  --skipdeps
-PERL5_PACKLIST= auto/Catalyst/Plugin/Authentication/.packlist
+MAKE_PARAMS+=          --skipdeps
+PERL5_PACKLIST=                auto/Catalyst/Plugin/Authentication/.packlist
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1
 

Index: pkgsrc/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
diff -u pkgsrc/www/p5-Catalyst-Plugin-ConfigLoader/Makefile:1.24 pkgsrc/www/p5-Catalyst-Plugin-ConfigLoader/Makefile:1.25
--- pkgsrc/www/p5-Catalyst-Plugin-ConfigLoader/Makefile:1.24    Sun Aug 11 13:24:32 2019
+++ pkgsrc/www/p5-Catalyst-Plugin-ConfigLoader/Makefile Mon Nov  4 22:10:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:24:32 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/04 22:10:02 rillig Exp $
 
 DISTNAME=      Catalyst-Plugin-ConfigLoader-0.34
 PKGNAME=       p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=     p5-Data-Visitor>=0.24:../../de
 DEPENDS+=      p5-MRO-Compat>=0.09:../../devel/p5-MRO-Compat
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Catalyst/Plugin/ConfigLoader/.packlist
+PERL5_PACKLIST=        auto/Catalyst/Plugin/ConfigLoader/.packlist
 
 EXTRACT_USING= gtar
 

Index: pkgsrc/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
diff -u pkgsrc/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile:1.26 pkgsrc/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile:1.27
--- pkgsrc/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile:1.26    Sun Aug 11 13:24:32 2019
+++ pkgsrc/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile Mon Nov  4 22:10:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:24:32 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/04 22:10:02 rillig Exp $
 
 DISTNAME=      Catalyst-Plugin-Session-State-Cookie-0.17
 PKGNAME=       p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=     p5-MRO-Compat>=0:../../devel/p
 DEPENDS+=      p5-Moose-[0-9]*:../../devel/p5-Moose
 DEPENDS+=      p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
-PERL5_PACKLIST= auto/Catalyst/Plugin/Session/State/Cookie/.packlist
+PERL5_PACKLIST=                auto/Catalyst/Plugin/Session/State/Cookie/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1

Index: pkgsrc/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
diff -u pkgsrc/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile:1.23 pkgsrc/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile:1.24
--- pkgsrc/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile:1.23      Sun Aug 11 13:24:32 2019
+++ pkgsrc/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile   Mon Nov  4 22:10:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:24:32 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/04 22:10:02 rillig Exp $
 
 DISTNAME=      Catalyst-Plugin-Session-Store-DBIC-0.14
 PKGNAME=       p5-${DISTNAME}
@@ -18,7 +18,7 @@ DEPENDS+=     p5-DBIx-Class>=0.07000:../../d
 DEPENDS+=      p5-MRO-Compat-[0-9]*:../../devel/p5-MRO-Compat
 DEPENDS+=      p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
 
-PERL5_PACKLIST= auto/Catalyst/Plugin/Session/Store/DBIC/.packlist
+PERL5_PACKLIST=        auto/Catalyst/Plugin/Session/Store/DBIC/.packlist
  
 ## delete unnecessary (and harmfull) directory
 post-extract:

Index: pkgsrc/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
diff -u pkgsrc/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile:1.22 pkgsrc/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile:1.23
--- pkgsrc/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile:1.22  Sun Aug 11 13:24:33 2019
+++ pkgsrc/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile       Mon Nov  4 22:10:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:24:33 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/04 22:10:02 rillig Exp $
 
 DISTNAME=      Catalyst-Plugin-Session-Store-Delegate-0.06
 PKGNAME=       p5-${DISTNAME}
@@ -19,8 +19,8 @@ DEPENDS+=     p5-namespace-clean-[0-9]*:../.
 
 BUILD_DEPENDS+=        p5-Test-Simple>=1.001010:../../devel/p5-Test-Simple
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Catalyst/Plugin/Session/Store/Delegate/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Catalyst/Plugin/Session/Store/Delegate/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1

Index: pkgsrc/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
diff -u pkgsrc/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile:1.25 pkgsrc/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile:1.26
--- pkgsrc/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile:1.25  Sun Aug 11 13:24:33 2019
+++ pkgsrc/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile       Mon Nov  4 22:10:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:24:33 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/04 22:10:02 rillig Exp $
 
 DISTNAME=      Catalyst-Plugin-Session-Store-FastMmap-0.16
 PKGNAME=       p5-${DISTNAME}
@@ -11,20 +11,20 @@ HOMEPAGE=   https://metacpan.org/release/C
 COMMENT=       FastMmap session storage backend
 LICENSE=       ${PERL5_LICENSE}
 
-DEPENDS+=       p5-Cache-FastMmap>=1.29:../../devel/p5-Cache-FastMmap
+DEPENDS+=      p5-Cache-FastMmap>=1.29:../../devel/p5-Cache-FastMmap
 DEPENDS+=      p5-Catalyst-Plugin-Session>=0.27:../../www/p5-Catalyst-Plugin-Session
-#DEPENDS+=       {perl>=5.10,p5-File-Temp-[0-9]*}:../../devel/p5-File-Temp
+#DEPENDS+=     {perl>=5.10,p5-File-Temp-[0-9]*}:../../devel/p5-File-Temp
 #DEPENDS+=     {perl>=5.10,p5-MRO-Compat-[0-9]*}:../../devel/p5-MRO-Compat
-DEPENDS+=       p5-Path-Class>=0:../../devel/p5-Path-Class
-#DEPENDS+=       {perl>=5.10,p5-PathTools-[0-9]*}:../../devel/p5-PathTools
-DEPENDS+=       p5-MooseX-Emulate-Class-Accessor-Fast-[0-9]*:../../devel/p5-MooseX-Emulate-Class-Accessor-Fast
-DEPENDS+=       p5-Catalyst-Runtime>=5.9:../../www/p5-Catalyst-Runtime
+DEPENDS+=      p5-Path-Class>=0:../../devel/p5-Path-Class
+#DEPENDS+=     {perl>=5.10,p5-PathTools-[0-9]*}:../../devel/p5-PathTools
+DEPENDS+=      p5-MooseX-Emulate-Class-Accessor-Fast-[0-9]*:../../devel/p5-MooseX-Emulate-Class-Accessor-Fast
+DEPENDS+=      p5-Catalyst-Runtime>=5.9:../../www/p5-Catalyst-Runtime
 
 # Missed in package META.yml
-DEPENDS+=       p5-Class-Data-Inheritable>=0:../../devel/p5-Class-Data-Inheritable
+DEPENDS+=      p5-Class-Data-Inheritable>=0:../../devel/p5-Class-Data-Inheritable
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Catalyst/Plugin/Session/Store/FastMmap/.packlist
+PERL5_PACKLIST=        auto/Catalyst/Plugin/Session/Store/FastMmap/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
diff -u pkgsrc/www/p5-Catalyst-Plugin-Session-Store-File/Makefile:1.22 pkgsrc/www/p5-Catalyst-Plugin-Session-Store-File/Makefile:1.23
--- pkgsrc/www/p5-Catalyst-Plugin-Session-Store-File/Makefile:1.22      Sun Aug 11 13:24:33 2019
+++ pkgsrc/www/p5-Catalyst-Plugin-Session-Store-File/Makefile   Mon Nov  4 22:10:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:24:33 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/04 22:10:02 rillig Exp $
 
 DISTNAME=      Catalyst-Plugin-Session-Store-File-0.18
 PKGNAME=       p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=     p5-Catalyst-Runtime>=5.7000:..
 DEPENDS+=      p5-Class-Data-Inheritable>=0.04:../../devel/p5-Class-Data-Inheritable
 DEPENDS+=      p5-MRO-Compat>=0.10:../../devel/p5-MRO-Compat
 
-PERL5_PACKLIST=        auto/Catalyst/Plugin/Session/Store/File/.packlist
+PERL5_PACKLIST=                auto/Catalyst/Plugin/Session/Store/File/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1

Index: pkgsrc/www/p5-Catalyst-Runtime/Makefile
diff -u pkgsrc/www/p5-Catalyst-Runtime/Makefile:1.50 pkgsrc/www/p5-Catalyst-Runtime/Makefile:1.51
--- pkgsrc/www/p5-Catalyst-Runtime/Makefile:1.50        Fri Oct  4 02:39:29 2019
+++ pkgsrc/www/p5-Catalyst-Runtime/Makefile     Mon Nov  4 22:10:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2019/10/04 02:39:29 wen Exp $
+# $NetBSD: Makefile,v 1.51 2019/11/04 22:10:02 rillig Exp $
 
 DISTNAME=      Catalyst-Runtime-5.90124
 PKGNAME=       p5-${DISTNAME}
@@ -51,11 +51,11 @@ DEPENDS+=   p5-Plack-Middleware-MethodOver
 DEPENDS+=      p5-Plack-Middleware-RemoveRedundantBody-[0-9]*:../../www/p5-Plack-Middleware-RemoveRedundantBody
 DEPENDS+=      p5-PerlIO-utf8_strict>=0:../../devel/p5-PerlIO-utf8_strict
 
-BUILD_DEPENDS+=        p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=                p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 #BUILD_DEPENDS+=       p5-Test-MockObject>=1.07:../../devel/p5-Test-MockObject
 
-#MAKE_ENV+=    PERL_EXTUTILS_AUTOINSTALL=--skipdeps
-PERL5_PACKLIST= auto/Catalyst/Runtime/.packlist
+#MAKE_ENV+=            PERL_EXTUTILS_AUTOINSTALL=--skipdeps
+PERL5_PACKLIST=                auto/Catalyst/Runtime/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Catalyst-View-Jemplate/Makefile
diff -u pkgsrc/www/p5-Catalyst-View-Jemplate/Makefile:1.15 pkgsrc/www/p5-Catalyst-View-Jemplate/Makefile:1.16
--- pkgsrc/www/p5-Catalyst-View-Jemplate/Makefile:1.15  Sun Aug 11 13:24:34 2019
+++ pkgsrc/www/p5-Catalyst-View-Jemplate/Makefile       Mon Nov  4 22:10:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:24:34 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:10:02 rillig Exp $
 
 DISTNAME=      Catalyst-View-Jemplate-0.06
 PKGNAME=       p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=     p5-File-Find-Rule-[0-9]*:../..
 DEPENDS+=      p5-Jemplate>=0.19:../../www/p5-Jemplate
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Catalyst/View/Jemplate/.packlist
+PERL5_PACKLIST=        auto/Catalyst/View/Jemplate/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-Catalyst-View-TT/Makefile
diff -u pkgsrc/www/p5-Catalyst-View-TT/Makefile:1.25 pkgsrc/www/p5-Catalyst-View-TT/Makefile:1.26
--- pkgsrc/www/p5-Catalyst-View-TT/Makefile:1.25        Sun Aug 11 13:24:34 2019
+++ pkgsrc/www/p5-Catalyst-View-TT/Makefile     Mon Nov  4 22:10:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:24:34 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/04 22:10:02 rillig Exp $
 
 DISTNAME=      Catalyst-View-TT-0.44
 PKGNAME=       p5-${DISTNAME}
@@ -23,7 +23,7 @@ DEPENDS+=     p5-Template-Timer-[0-9]*:../..
 BUILD_DEPENDS+=        p5-Template-Provider-Encoding-[0-9]*:../../www/p5-Template-Provider-Encoding
 
 USE_LANGUAGES=         # empty
-PERL5_PACKLIST=        auto/Catalyst/View/TT/.packlist
+PERL5_PACKLIST=                auto/Catalyst/View/TT/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-CatalystX-CRUD-View-Excel/Makefile
diff -u pkgsrc/www/p5-CatalystX-CRUD-View-Excel/Makefile:1.15 pkgsrc/www/p5-CatalystX-CRUD-View-Excel/Makefile:1.16
--- pkgsrc/www/p5-CatalystX-CRUD-View-Excel/Makefile:1.15       Sun Aug 11 13:24:35 2019
+++ pkgsrc/www/p5-CatalystX-CRUD-View-Excel/Makefile    Mon Nov  4 22:10:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:24:35 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:10:03 rillig Exp $
 
 DISTNAME=      CatalystX-CRUD-View-Excel-0.07
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/C
 COMMENT=       View CRUD search/list results in Excel format
 LICENSE=       ${PERL5_LICENSE}
 
-DEPENDS+=       p5-CatalystX-CRUD>=0.27:../../databases/p5-CatalystX-CRUD
+DEPENDS+=      p5-CatalystX-CRUD>=0.27:../../databases/p5-CatalystX-CRUD
 DEPENDS+=      p5-Catalyst-View-Excel-Template-Plus-[0-9]*:../../www/p5-Catalyst-View-Excel-Template-Plus
 DEPENDS+=      p5-MRO-Compat-[0-9]*:../../devel/p5-MRO-Compat
 DEPENDS+=      p5-Path-Class-[0-9]*:../../devel/p5-Path-Class

Index: pkgsrc/www/p5-CatalystX-CRUD-YUI/Makefile
diff -u pkgsrc/www/p5-CatalystX-CRUD-YUI/Makefile:1.22 pkgsrc/www/p5-CatalystX-CRUD-YUI/Makefile:1.23
--- pkgsrc/www/p5-CatalystX-CRUD-YUI/Makefile:1.22      Sun Aug 11 13:24:35 2019
+++ pkgsrc/www/p5-CatalystX-CRUD-YUI/Makefile   Mon Nov  4 22:10:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:24:35 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/04 22:10:03 rillig Exp $
 
 DISTNAME=      CatalystX-CRUD-YUI-0.031
 PKGNAME=       p5-${DISTNAME}
@@ -22,7 +22,7 @@ DEPENDS+=     p5-Catalyst-Action-RenderView-
 DEPENDS+=      p5-Catalyst-Plugin-ConfigLoader-[0-9]*:../../www/p5-Catalyst-Plugin-ConfigLoader
 DEPENDS+=      p5-Catalyst-Plugin-Static-Simple-[0-9]*:../../www/p5-Catalyst-Plugin-Static-Simple
 DEPENDS+=      p5-Catalyst-View-TT-[0-9]*:../../www/p5-Catalyst-View-TT
-DEPENDS+=       p5-CatalystX-CRUD>=0.43:../../databases/p5-CatalystX-CRUD
+DEPENDS+=      p5-CatalystX-CRUD>=0.43:../../databases/p5-CatalystX-CRUD
 DEPENDS+=      p5-CatalystX-CRUD-Controller-RHTMLO>=0.19:../../www/p5-CatalystX-CRUD-Controller-RHTMLO
 DEPENDS+=      p5-CatalystX-CRUD-View-Excel>=0.06:../../www/p5-CatalystX-CRUD-View-Excel
 DEPENDS+=      p5-Class-Inspector-[0-9]*:../../devel/p5-Class-Inspector

Index: pkgsrc/www/p5-Cookie-Baker/Makefile
diff -u pkgsrc/www/p5-Cookie-Baker/Makefile:1.14 pkgsrc/www/p5-Cookie-Baker/Makefile:1.15
--- pkgsrc/www/p5-Cookie-Baker/Makefile:1.14    Thu Oct  3 23:59:31 2019
+++ pkgsrc/www/p5-Cookie-Baker/Makefile Mon Nov  4 22:10:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/10/03 23:59:31 wen Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 22:10:03 rillig Exp $
 
 DISTNAME=      Cookie-Baker-0.11
 PKGNAME=       p5-${DISTNAME}
@@ -11,10 +11,10 @@ COMMENT=    Perl extension for cookie strin
 LICENSE=       ${PERL5_LICENSE}
 
 BUILD_DEPENDS+=        p5-Test-Time>=0:../../time/p5-Test-Time
-DEPENDS+=       p5-URI>=0:../../www/p5-URI
+DEPENDS+=      p5-URI>=0:../../www/p5-URI
 
 USE_LANGUAGES= #
-PERL5_PACKLIST= auto/Cookie/Baker/.packlist
+PERL5_PACKLIST=        auto/Cookie/Baker/.packlist
 
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 

Index: pkgsrc/www/p5-Cookie-XS/Makefile
diff -u pkgsrc/www/p5-Cookie-XS/Makefile:1.8 pkgsrc/www/p5-Cookie-XS/Makefile:1.9
--- pkgsrc/www/p5-Cookie-XS/Makefile:1.8        Sun Aug 11 13:24:36 2019
+++ pkgsrc/www/p5-Cookie-XS/Makefile    Mon Nov  4 22:10:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:24:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/04 22:10:03 rillig Exp $
 
 DISTNAME=      Cookie-XS-0.11
 PKGNAME=       p5-${DISTNAME}
@@ -11,10 +11,10 @@ HOMEPAGE=   https://metacpan.org/release/C
 COMMENT=       HTTP Cookie parser in C (deprecated)
 LICENSE=       ${PERL5_LICENSE}
 
-DEPENDS+=       p5-CGI-Cookie-XS>=0.15:../../www/p5-CGI-Cookie-XS
+DEPENDS+=      p5-CGI-Cookie-XS>=0.15:../../www/p5-CGI-Cookie-XS
 
 USE_LANGUAGES= #
-PERL5_PACKLIST= auto/Cookie/XS/.packlist
+PERL5_PACKLIST=        auto/Cookie/XS/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-Dancer/Makefile
diff -u pkgsrc/www/p5-Dancer/Makefile:1.43 pkgsrc/www/p5-Dancer/Makefile:1.44
--- pkgsrc/www/p5-Dancer/Makefile:1.43  Sun Aug 11 13:24:36 2019
+++ pkgsrc/www/p5-Dancer/Makefile       Mon Nov  4 22:10:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/08/11 13:24:36 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/04 22:10:03 rillig Exp $
 
 DISTNAME=      Dancer-1.3512
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 lightweight yet powerful
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Dancer/.packlist
+PERL5_PACKLIST=        auto/Dancer/.packlist
 
 BUILD_DEPENDS+=        p5-CGI>=0:../../www/p5-CGI
 BUILD_DEPENDS+=        p5-Devel-Hide>=0:../../devel/p5-Devel-Hide

Index: pkgsrc/www/p5-Dancer-Session-Cookie/Makefile
diff -u pkgsrc/www/p5-Dancer-Session-Cookie/Makefile:1.12 pkgsrc/www/p5-Dancer-Session-Cookie/Makefile:1.13
--- pkgsrc/www/p5-Dancer-Session-Cookie/Makefile:1.12   Sun Aug 11 13:24:36 2019
+++ pkgsrc/www/p5-Dancer-Session-Cookie/Makefile        Mon Nov  4 22:10:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/08/11 13:24:36 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 22:10:03 rillig Exp $
 
 DISTNAME=      Dancer-Session-Cookie-0.30
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Encrypted cookie-based session 
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Dancer/Session/Cookie/.packlist
+PERL5_PACKLIST=        auto/Dancer/Session/Cookie/.packlist
 
 DEPENDS+=      p5-Crypt-CBC-[0-9]*:../../security/p5-Crypt-CBC
 DEPENDS+=      p5-Crypt-Rijndael-[0-9]*:../../security/p5-Crypt-Rijndael

Index: pkgsrc/www/p5-Dancer2/Makefile
diff -u pkgsrc/www/p5-Dancer2/Makefile:1.52 pkgsrc/www/p5-Dancer2/Makefile:1.53
--- pkgsrc/www/p5-Dancer2/Makefile:1.52 Sat Aug 31 10:34:05 2019
+++ pkgsrc/www/p5-Dancer2/Makefile      Mon Nov  4 22:10:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/08/31 10:34:05 wen Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/04 22:10:03 rillig Exp $
 
 DISTNAME=      Dancer2-0.208001
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=      Lightweight yet powerful web ap
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Dancer2/.packlist
+PERL5_PACKLIST=        auto/Dancer2/.packlist
 
 BUILD_DEPENDS+=        p5-Exporter-Tiny>=0:../../devel/p5-Exporter-Tiny
 BUILD_DEPENDS+=        p5-ExtUtils-MakeMaker>=7.12:../../devel/p5-ExtUtils-MakeMaker

Index: pkgsrc/www/p5-File-Mork/Makefile
diff -u pkgsrc/www/p5-File-Mork/Makefile:1.10 pkgsrc/www/p5-File-Mork/Makefile:1.11
--- pkgsrc/www/p5-File-Mork/Makefile:1.10       Sun Aug 11 13:24:37 2019
+++ pkgsrc/www/p5-File-Mork/Makefile    Mon Nov  4 22:10:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:24:37 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/04 22:10:03 rillig Exp $
 
 DISTNAME=      File-Mork-0.4
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/S
 COMMENT=       Module to read Mozilla URL history files
 LICENSE=       ${PERL5_LICENSE}
 
-PERL5_PACKLIST= auto/File/Mork/.packlist
+PERL5_PACKLIST=        auto/File/Mork/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-HTML-FormFu/Makefile
diff -u pkgsrc/www/p5-HTML-FormFu/Makefile:1.27 pkgsrc/www/p5-HTML-FormFu/Makefile:1.28
--- pkgsrc/www/p5-HTML-FormFu/Makefile:1.27     Sun Aug 11 13:24:38 2019
+++ pkgsrc/www/p5-HTML-FormFu/Makefile  Mon Nov  4 22:10:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/08/11 13:24:38 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/04 22:10:03 rillig Exp $
 
 DISTNAME=              HTML-FormFu-2.07
 PKGNAME=               p5-${DISTNAME}
@@ -49,7 +49,7 @@ DEPENDS+=     p5-YAML-LibYAML>=0.32:../../te
 DEPENDS+=      p5-libwww>=5:../../www/p5-libwww
 
 #BUILD_DEPENDS+=       {perl>=5.10.1,p5-Test-Simple>=0.92}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=        p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings
+BUILD_DEPENDS+=                p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings
 
 USE_LANGUAGES=         c
 

Index: pkgsrc/www/p5-HTML-Lint/Makefile
diff -u pkgsrc/www/p5-HTML-Lint/Makefile:1.22 pkgsrc/www/p5-HTML-Lint/Makefile:1.23
--- pkgsrc/www/p5-HTML-Lint/Makefile:1.22       Sun Aug 11 13:24:39 2019
+++ pkgsrc/www/p5-HTML-Lint/Makefile    Mon Nov  4 22:10:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:24:39 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/04 22:10:04 rillig Exp $
 
 DISTNAME=      HTML-Lint-2.32
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module to check for HTML
 LICENSE=       artistic-2.0
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/HTML/Lint/.packlist
+PERL5_PACKLIST=        auto/HTML/Lint/.packlist
 
 DEPENDS+=      p5-HTML-Parser>=3.47:../../www/p5-HTML-Parser
 DEPENDS+=      p5-HTML-Tagset>=3.03:../../www/p5-HTML-Tagset

Index: pkgsrc/www/p5-HTML-Mason-PSGIHandler/Makefile
diff -u pkgsrc/www/p5-HTML-Mason-PSGIHandler/Makefile:1.12 pkgsrc/www/p5-HTML-Mason-PSGIHandler/Makefile:1.13
--- pkgsrc/www/p5-HTML-Mason-PSGIHandler/Makefile:1.12  Sun Aug 11 13:24:39 2019
+++ pkgsrc/www/p5-HTML-Mason-PSGIHandler/Makefile       Mon Nov  4 22:10:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/08/11 13:24:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 22:10:04 rillig Exp $
 #
 
 DISTNAME=      HTML-Mason-PSGIHandler-0.53
@@ -12,7 +12,7 @@ HOMEPAGE=     https://metacpan.org/release/H
 COMMENT=       PSGI handler for HTML::Mason
 LICENSE=       ${PERL5_LICENSE}
 
-BUILD_DEPENDS+=        p5-Plack-[0-9]*:../../www/p5-Plack
+BUILD_DEPENDS+=                p5-Plack-[0-9]*:../../www/p5-Plack
 #BUILD_DEPENDS+=       {perl>=5.6.2,p5-Test-Simple-[0-9]*}:../../devel/p5-Test-Simple
 
 DEPENDS+=      p5-CGI-PSGI-[0-9]*:../../www/p5-CGI-PSGI

Index: pkgsrc/www/p5-HTML-Prototype/Makefile
diff -u pkgsrc/www/p5-HTML-Prototype/Makefile:1.17 pkgsrc/www/p5-HTML-Prototype/Makefile:1.18
--- pkgsrc/www/p5-HTML-Prototype/Makefile:1.17  Sun Aug 11 13:24:39 2019
+++ pkgsrc/www/p5-HTML-Prototype/Makefile       Mon Nov  4 22:10:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:39 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:04 rillig Exp $
 
 DISTNAME=      HTML-Prototype-1.48
 PKGNAME=       p5-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=     p5-Class-Accessor>=0.22:../../
 DEPENDS+=      p5-HTML-Tree>=3.19.01:../../www/p5-HTML-Tree
 
 PERL5_MODULE_TYPE=     Module::Build
-PERL5_PACKLIST=        auto/HTML/Prototype/.packlist
+PERL5_PACKLIST=                auto/HTML/Prototype/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-HTML-Prototype-Useful/Makefile
diff -u pkgsrc/www/p5-HTML-Prototype-Useful/Makefile:1.17 pkgsrc/www/p5-HTML-Prototype-Useful/Makefile:1.18
--- pkgsrc/www/p5-HTML-Prototype-Useful/Makefile:1.17   Sun Aug 11 13:24:39 2019
+++ pkgsrc/www/p5-HTML-Prototype-Useful/Makefile        Mon Nov  4 22:10:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:39 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:04 rillig Exp $
 
 DISTNAME=      HTML-Prototype-Useful-0.05
 PKGNAME=       p5-${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT=      Some useful additions for the P
 DEPENDS+=      p5-HTML-Prototype>=1.32:../../www/p5-HTML-Prototype
 
 PERL5_MODULE_TYPE=     Module::Build
-PERL5_PACKLIST=        auto/HTML/Prototype/Useful/.packlist
+PERL5_PACKLIST=                auto/HTML/Prototype/Useful/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-HTML-Selector-XPath/Makefile
diff -u pkgsrc/www/p5-HTML-Selector-XPath/Makefile:1.21 pkgsrc/www/p5-HTML-Selector-XPath/Makefile:1.22
--- pkgsrc/www/p5-HTML-Selector-XPath/Makefile:1.21     Sun Aug 11 13:24:40 2019
+++ pkgsrc/www/p5-HTML-Selector-XPath/Makefile  Mon Nov  4 22:10:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:24:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 22:10:04 rillig Exp $
 
 DISTNAME=      HTML-Selector-XPath-0.25
 PKGNAME=       p5-${DISTNAME}
@@ -11,10 +11,10 @@ HOMEPAGE=   https://metacpan.org/release/H
 COMMENT=       Perl 5 CSS Selector to XPath compiler
 LICENSE=       ${PERL5_LICENSE}
 
-BUILD_DEPENDS+= p5-Test-Base-[0-9]*:../../devel/p5-Test-Base
+BUILD_DEPENDS+=        p5-Test-Base-[0-9]*:../../devel/p5-Test-Base
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/HTML/Selector/XPath/.packlist
+PERL5_PACKLIST=        auto/HTML/Selector/XPath/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-HTML-Stream/Makefile
diff -u pkgsrc/www/p5-HTML-Stream/Makefile:1.18 pkgsrc/www/p5-HTML-Stream/Makefile:1.19
--- pkgsrc/www/p5-HTML-Stream/Makefile:1.18     Sun Aug 11 13:24:41 2019
+++ pkgsrc/www/p5-HTML-Stream/Makefile  Mon Nov  4 22:10:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:24:41 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/04 22:10:04 rillig Exp $
 
 DISTNAME=      HTML-Stream-1.60
 PKGNAME=       p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://metacpan.org/release/HTML-Stream
 COMMENT=       Perl5 HTML output stream class, and some markup utilities
 
-PERL5_PACKLIST= auto/HTML/Stream/.packlist
+PERL5_PACKLIST=        auto/HTML/Stream/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-HTML-StripScripts-Parser/Makefile
diff -u pkgsrc/www/p5-HTML-StripScripts-Parser/Makefile:1.16 pkgsrc/www/p5-HTML-StripScripts-Parser/Makefile:1.17
--- pkgsrc/www/p5-HTML-StripScripts-Parser/Makefile:1.16        Sun Aug 11 13:24:41 2019
+++ pkgsrc/www/p5-HTML-StripScripts-Parser/Makefile     Mon Nov  4 22:10:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:24:41 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 22:10:04 rillig Exp $
 
 DISTNAME=      HTML-StripScripts-Parser-1.03
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/H
 COMMENT=       Perl5 module XSS filter using HTML::Parser
 LICENSE=       ${PERL5_LICENSE}
 
-DEPENDS+=      p5-HTML-StripScripts>=1.05:../../www/p5-HTML-StripScripts
+DEPENDS+=      p5-HTML-StripScripts>=1.05:../../www/p5-HTML-StripScripts
 DEPENDS+=      p5-HTML-Parser>=3.56:../../www/p5-HTML-Parser
 
 PERL5_PACKLIST=        auto/HTML/StripScripts/Parser/.packlist

Index: pkgsrc/www/p5-HTML-TreeBuilder-LibXML/Makefile
diff -u pkgsrc/www/p5-HTML-TreeBuilder-LibXML/Makefile:1.22 pkgsrc/www/p5-HTML-TreeBuilder-LibXML/Makefile:1.23
--- pkgsrc/www/p5-HTML-TreeBuilder-LibXML/Makefile:1.22 Sun Aug 11 13:24:42 2019
+++ pkgsrc/www/p5-HTML-TreeBuilder-LibXML/Makefile      Mon Nov  4 22:10:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:24:42 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/04 22:10:04 rillig Exp $
 
 DISTNAME=      HTML-TreeBuilder-LibXML-0.26
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 HTML::TreeBuilder and XP
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/HTML/TreeBuilder/LibXML/.packlist
+PERL5_PACKLIST=        auto/HTML/TreeBuilder/LibXML/.packlist
 
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 

Index: pkgsrc/www/p5-HTML-TreeBuilder-XPath/Makefile
diff -u pkgsrc/www/p5-HTML-TreeBuilder-XPath/Makefile:1.14 pkgsrc/www/p5-HTML-TreeBuilder-XPath/Makefile:1.15
--- pkgsrc/www/p5-HTML-TreeBuilder-XPath/Makefile:1.14  Sun Aug 11 13:24:43 2019
+++ pkgsrc/www/p5-HTML-TreeBuilder-XPath/Makefile       Mon Nov  4 22:10:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:24:43 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 22:10:05 rillig Exp $
 
 DISTNAME=      HTML-TreeBuilder-XPath-0.14
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module adding XPath supp
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/HTML/TreeBuilder/XPath/.packlist
+PERL5_PACKLIST=        auto/HTML/TreeBuilder/XPath/.packlist
 
 DEPENDS+=      p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
 DEPENDS+=      p5-XML-XPathEngine>=0.12:../../textproc/p5-XML-XPathEngine

Index: pkgsrc/www/p5-HTMLObject/Makefile
diff -u pkgsrc/www/p5-HTMLObject/Makefile:1.25 pkgsrc/www/p5-HTMLObject/Makefile:1.26
--- pkgsrc/www/p5-HTMLObject/Makefile:1.25      Sun Aug 11 13:24:43 2019
+++ pkgsrc/www/p5-HTMLObject/Makefile   Mon Nov  4 22:10:05 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:24:43 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/04 22:10:05 rillig Exp $
 
-DISTNAME=              libhtmlobject-perl-${VERSION}
-PKGNAME=               p5-HTMLObject-${VERSION}
-PKGREVISION=           6
-CATEGORIES=            www perl5
+DISTNAME=      libhtmlobject-perl-${VERSION}
+PKGNAME=       p5-HTMLObject-${VERSION}
+PKGREVISION=   6
+CATEGORIES=    www perl5
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=htmlobject/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/p5-HTTP-Date/Makefile
diff -u pkgsrc/www/p5-HTTP-Date/Makefile:1.15 pkgsrc/www/p5-HTTP-Date/Makefile:1.16
--- pkgsrc/www/p5-HTTP-Date/Makefile:1.15       Sun Aug 11 13:24:44 2019
+++ pkgsrc/www/p5-HTTP-Date/Makefile    Mon Nov  4 22:10:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:24:44 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:10:05 rillig Exp $
 
 DISTNAME=      HTTP-Date-6.02
 PKGNAME=       p5-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE=      ${PERL5_LICENSE}
 CONFLICTS+=    p5-libwww<6.00
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/HTTP/Date/.packlist
+PERL5_PACKLIST=        auto/HTTP/Date/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-HTTP-GHTTP/Makefile
diff -u pkgsrc/www/p5-HTTP-GHTTP/Makefile:1.16 pkgsrc/www/p5-HTTP-GHTTP/Makefile:1.17
--- pkgsrc/www/p5-HTTP-GHTTP/Makefile:1.16      Sun Aug 11 13:24:44 2019
+++ pkgsrc/www/p5-HTTP-GHTTP/Makefile   Mon Nov  4 22:10:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:24:44 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 22:10:05 rillig Exp $
 #
 
 DISTNAME=      HTTP-GHTTP-1.07
@@ -11,7 +11,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://metacpan.org/release/HTTP-GHTTP
 COMMENT=       Perl interface to the gnome ghttp library
 
-PERL5_PACKLIST= auto/HTTP/GHTTP/.packlist
+PERL5_PACKLIST=        auto/HTTP/GHTTP/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../www/libghttp/buildlink3.mk"

Index: pkgsrc/www/p5-HTTP-OAI/Makefile
diff -u pkgsrc/www/p5-HTTP-OAI/Makefile:1.19 pkgsrc/www/p5-HTTP-OAI/Makefile:1.20
--- pkgsrc/www/p5-HTTP-OAI/Makefile:1.19        Sat Aug 31 14:18:41 2019
+++ pkgsrc/www/p5-HTTP-OAI/Makefile     Mon Nov  4 22:10:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/31 14:18:41 wen Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/04 22:10:05 rillig Exp $
 
 DISTNAME=      HTTP-OAI-4.09
 PKGNAME=       p5-${DISTNAME}
@@ -15,8 +15,8 @@ DEPENDS+=     p5-XML-SAX>=0.96:../../textpro
 DEPENDS+=      p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST=        auto/HTTP/OAI/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/HTTP/OAI/.packlist
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-HTTP-Parser/Makefile
diff -u pkgsrc/www/p5-HTTP-Parser/Makefile:1.14 pkgsrc/www/p5-HTTP-Parser/Makefile:1.15
--- pkgsrc/www/p5-HTTP-Parser/Makefile:1.14     Sun Aug 11 13:24:46 2019
+++ pkgsrc/www/p5-HTTP-Parser/Makefile  Mon Nov  4 22:10:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:24:46 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 22:10:05 rillig Exp $
 
 DISTNAME=      HTTP-Parser-0.06
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module to parse HTTP req
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/HTTP/Parser/.packlist
+PERL5_PACKLIST=        auto/HTTP/Parser/.packlist
 
 DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=      p5-URI-[0-9]*:../../www/p5-URI

Index: pkgsrc/www/p5-HTTP-Server-EV/Makefile
diff -u pkgsrc/www/p5-HTTP-Server-EV/Makefile:1.17 pkgsrc/www/p5-HTTP-Server-EV/Makefile:1.18
--- pkgsrc/www/p5-HTTP-Server-EV/Makefile:1.17  Sun Aug 11 13:24:46 2019
+++ pkgsrc/www/p5-HTTP-Server-EV/Makefile       Mon Nov  4 22:10:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:46 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:05 rillig Exp $
 
 DISTNAME=      HTTP-Server-EV-0.69
 PKGNAME=       p5-${DISTNAME}
@@ -21,7 +21,7 @@ BUILD_DEPENDS+=       p5-AnyEvent-HTTP-[0-9]*:
 BUILD_DEPENDS+=        p5-HTTP-Message-[0-9]*:../../www/p5-HTTP-Message
 
 EXTRACT_USING= bsdtar
-PERL5_PACKLIST=                auto/HTTP/Server/EV/.packlist
+PERL5_PACKLIST=        auto/HTTP/Server/EV/.packlist
 
 .include "../../devel/p5-EV/buildlink3.mk"
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-HTTP-Server-Simple-PSGI/Makefile
diff -u pkgsrc/www/p5-HTTP-Server-Simple-PSGI/Makefile:1.14 pkgsrc/www/p5-HTTP-Server-Simple-PSGI/Makefile:1.15
--- pkgsrc/www/p5-HTTP-Server-Simple-PSGI/Makefile:1.14 Sun Aug 11 13:24:47 2019
+++ pkgsrc/www/p5-HTTP-Server-Simple-PSGI/Makefile      Mon Nov  4 22:10:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:24:47 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 22:10:05 rillig Exp $
 
 DISTNAME=      HTTP-Server-Simple-PSGI-0.16
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      PSGI handler for HTTP::Server::
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/HTTP/Server/Simple/PSGI/.packlist
+PERL5_PACKLIST=        auto/HTTP/Server/Simple/PSGI/.packlist
 
 DEPENDS+=      p5-HTTP-Server-Simple>=0.42:../../www/p5-HTTP-Server-Simple
 

Index: pkgsrc/www/p5-HTTP-Tiny-Mech/Makefile
diff -u pkgsrc/www/p5-HTTP-Tiny-Mech/Makefile:1.1 pkgsrc/www/p5-HTTP-Tiny-Mech/Makefile:1.2
--- pkgsrc/www/p5-HTTP-Tiny-Mech/Makefile:1.1   Fri Oct 25 13:43:45 2019
+++ pkgsrc/www/p5-HTTP-Tiny-Mech/Makefile       Mon Nov  4 22:10:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/10/25 13:43:45 mef Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/04 22:10:05 rillig Exp $
 
 DISTNAME=      HTTP-Tiny-Mech-1.001002
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=      Wrap a WWW::Mechanize instance 
 LICENSE=       ${PERL5_LICENSE}
 
 
-PERL5_PACKLIST= auto/HTTP/Tiny/Mech/.packlist
+PERL5_PACKLIST=        auto/HTTP/Tiny/Mech/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-Handel/Makefile
diff -u pkgsrc/www/p5-Handel/Makefile:1.22 pkgsrc/www/p5-Handel/Makefile:1.23
--- pkgsrc/www/p5-Handel/Makefile:1.22  Sun Aug 11 13:24:48 2019
+++ pkgsrc/www/p5-Handel/Makefile       Mon Nov  4 22:10:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:24:48 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/04 22:10:06 rillig Exp $
 
 DISTNAME=      Handel-1.00014
 PKGNAME=       p5-${DISTNAME}
@@ -48,7 +48,7 @@ DEPENDS+=     p5-HTML-FillInForm>=0:../../ww
 # Skip AxKit Support
 
 USE_LANGUAGES=         # empty
-PERL5_PACKLIST=        auto/Handel/.packlist
+PERL5_PACKLIST=                auto/Handel/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-JSON-RPC/Makefile
diff -u pkgsrc/www/p5-JSON-RPC/Makefile:1.11 pkgsrc/www/p5-JSON-RPC/Makefile:1.12
--- pkgsrc/www/p5-JSON-RPC/Makefile:1.11        Sun Aug 11 13:24:48 2019
+++ pkgsrc/www/p5-JSON-RPC/Makefile     Mon Nov  4 22:10:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/08/11 13:24:48 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/04 22:10:06 rillig Exp $
 
 DISTNAME=      JSON-RPC-1.06
 PKGNAME=       p5-${DISTNAME}
@@ -21,7 +21,7 @@ DEPENDS+=     p5-Plack-[0-9]*:../../www/p5-P
 DEPENDS+=      p5-Router-Simple-[0-9]*:../../www/p5-Router-Simple
 DEPENDS+=      p5-JSON-XS-[0-9]*:../../converters/p5-JSON-XS
 
-PERL5_PACKLIST=        auto/JSON/RPC/.packlist
+PERL5_PACKLIST=                auto/JSON/RPC/.packlist
 PERL5_MODULE_TYPE=     Module::Build
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Kwiki-Users-Remote/Makefile
diff -u pkgsrc/www/p5-Kwiki-Users-Remote/Makefile:1.18 pkgsrc/www/p5-Kwiki-Users-Remote/Makefile:1.19
--- pkgsrc/www/p5-Kwiki-Users-Remote/Makefile:1.18      Sun Aug 11 13:24:51 2019
+++ pkgsrc/www/p5-Kwiki-Users-Remote/Makefile   Mon Nov  4 22:10:06 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:24:51 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/04 22:10:06 rillig Exp $
 
-DISTNAME=              Kwiki-Users-Remote-0.04
+DISTNAME=      Kwiki-Users-Remote-0.04
 PKGREVISION=   12
-PKGNAME=               p5-${DISTNAME}
+PKGNAME=       p5-${DISTNAME}
 CATEGORIES=    www perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Kwiki/}
 

Index: pkgsrc/www/p5-Mojolicious/Makefile
diff -u pkgsrc/www/p5-Mojolicious/Makefile:1.140 pkgsrc/www/p5-Mojolicious/Makefile:1.141
--- pkgsrc/www/p5-Mojolicious/Makefile:1.140    Sun Aug 11 13:24:53 2019
+++ pkgsrc/www/p5-Mojolicious/Makefile  Mon Nov  4 22:10:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2019/08/11 13:24:53 wiz Exp $
+# $NetBSD: Makefile,v 1.141 2019/11/04 22:10:06 rillig Exp $
 #
 # When updating this package, please upload the distfile
 # since they disappear immediately when new releases happen,
@@ -16,7 +16,7 @@ COMMENT=      Perl web framework: The Web In 
 LICENSE=       artistic-2.0
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Mojolicious/.packlist
+PERL5_PACKLIST=        auto/Mojolicious/.packlist
 
 REPLACE_PERL+= script/*
 

Index: pkgsrc/www/p5-Net-HTTP/Makefile
diff -u pkgsrc/www/p5-Net-HTTP/Makefile:1.27 pkgsrc/www/p5-Net-HTTP/Makefile:1.28
--- pkgsrc/www/p5-Net-HTTP/Makefile:1.27        Sun Aug 11 13:24:54 2019
+++ pkgsrc/www/p5-Net-HTTP/Makefile     Mon Nov  4 22:10:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/08/11 13:24:54 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/04 22:10:06 rillig Exp $
 
 DISTNAME=      Net-HTTP-6.18
 PKGNAME=       p5-${DISTNAME}
@@ -15,7 +15,7 @@ LICENSE=      ${PERL5_LICENSE}
 BUILD_DEPENDS+=        p5-URI-[0-9]*:../../www/p5-URI
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Net/HTTP/.packlist
+PERL5_PACKLIST=        auto/Net/HTTP/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-POE-Component-Server-PSGI/Makefile
diff -u pkgsrc/www/p5-POE-Component-Server-PSGI/Makefile:1.14 pkgsrc/www/p5-POE-Component-Server-PSGI/Makefile:1.15
--- pkgsrc/www/p5-POE-Component-Server-PSGI/Makefile:1.14       Sun Aug 11 13:24:54 2019
+++ pkgsrc/www/p5-POE-Component-Server-PSGI/Makefile    Mon Nov  4 22:10:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:24:54 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 22:10:06 rillig Exp $
 
 DISTNAME=      POE-Component-Server-PSGI-0.6
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      PSGI Server implementation for 
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/POE/Component/Server/PSGI/.packlist
+PERL5_PACKLIST=        auto/POE/Component/Server/PSGI/.packlist
 
 BUILD_DEPENDS+=        p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 DEPENDS+=      p5-Plack-[0-9]*:../../www/p5-Plack

Index: pkgsrc/www/p5-POE-Component-Server-SOAP/Makefile
diff -u pkgsrc/www/p5-POE-Component-Server-SOAP/Makefile:1.10 pkgsrc/www/p5-POE-Component-Server-SOAP/Makefile:1.11
--- pkgsrc/www/p5-POE-Component-Server-SOAP/Makefile:1.10       Sun Aug 11 13:24:54 2019
+++ pkgsrc/www/p5-POE-Component-Server-SOAP/Makefile    Mon Nov  4 22:10:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:24:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/04 22:10:06 rillig Exp $
 
 DISTNAME=      POE-Component-Server-SOAP-1.14
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      SOAP Server implementation for 
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/POE/Component/Server/SOAP/.packlist
+PERL5_PACKLIST=        auto/POE/Component/Server/SOAP/.packlist
 
 DEPENDS+=      p5-POE-[0-9]*:../../devel/p5-POE
 DEPENDS+=      p5-POE-Component-Server-SimpleHTTP>=1.54:../../www/p5-POE-Component-Server-SimpleHTTP

Index: pkgsrc/www/p5-POE-Filter-HTTP-Parser/Makefile
diff -u pkgsrc/www/p5-POE-Filter-HTTP-Parser/Makefile:1.16 pkgsrc/www/p5-POE-Filter-HTTP-Parser/Makefile:1.17
--- pkgsrc/www/p5-POE-Filter-HTTP-Parser/Makefile:1.16  Sun Aug 11 13:24:54 2019
+++ pkgsrc/www/p5-POE-Filter-HTTP-Parser/Makefile       Mon Nov  4 22:10:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:24:54 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 22:10:06 rillig Exp $
 
 DISTNAME=      POE-Filter-HTTP-Parser-1.08
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      HTTP POE filter for HTTP client
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/POE/Filter/HTTP/Parser/.packlist
+PERL5_PACKLIST=        auto/POE/Filter/HTTP/Parser/.packlist
 
 BUILD_DEPENDS+=        p5-Test-POE-Client-TCP>=0.1:../../devel/p5-Test-POE-Client-TCP
 BUILD_DEPENDS+=        p5-Test-POE-Server-TCP>=0.16:../../devel/p5-Test-POE-Server-TCP

Index: pkgsrc/www/p5-PSGI/Makefile
diff -u pkgsrc/www/p5-PSGI/Makefile:1.16 pkgsrc/www/p5-PSGI/Makefile:1.17
--- pkgsrc/www/p5-PSGI/Makefile:1.16    Sun Aug 11 13:24:55 2019
+++ pkgsrc/www/p5-PSGI/Makefile Mon Nov  4 22:10:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:24:55 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 22:10:06 rillig Exp $
 
 DISTNAME=      PSGI-1.102
 PKGNAME=       p5-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=      ${PERL5_LICENSE}
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/PSGI/.packlist
+PERL5_PACKLIST=        auto/PSGI/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-ParallelUserAgent/Makefile
diff -u pkgsrc/www/p5-ParallelUserAgent/Makefile:1.15 pkgsrc/www/p5-ParallelUserAgent/Makefile:1.16
--- pkgsrc/www/p5-ParallelUserAgent/Makefile:1.15       Sun Aug 11 13:24:55 2019
+++ pkgsrc/www/p5-ParallelUserAgent/Makefile    Mon Nov  4 22:10:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:24:55 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:10:07 rillig Exp $
 #
 
 DISTNAME=      ParallelUserAgent-2.62
@@ -6,7 +6,7 @@ PKGNAME=        p5-${DISTNAME}
 PKGREVISION=   3
 CATEGORIES=    www net perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=LWP/}
-MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MS/MSOUTH/}
+MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MS/MSOUTH/}
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/p5-Plack/Makefile
diff -u pkgsrc/www/p5-Plack/Makefile:1.49 pkgsrc/www/p5-Plack/Makefile:1.50
--- pkgsrc/www/p5-Plack/Makefile:1.49   Sun Aug 11 13:24:55 2019
+++ pkgsrc/www/p5-Plack/Makefile        Mon Nov  4 22:10:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2019/08/11 13:24:55 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2019/11/04 22:10:07 rillig Exp $
 
 DISTNAME=      Plack-1.0047
 PKGNAME=       p5-${DISTNAME}
@@ -31,7 +31,7 @@ DEPENDS+=     p5-Cookie-Baker>=0.07:../../ww
 DEPENDS+=      p5-HTTP-Headers-Fast>=0.18:../../www/p5-HTTP-Headers-Fast
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/.packlist
+PERL5_PACKLIST=        auto/Plack/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-Plack-App-Proxy/Makefile
diff -u pkgsrc/www/p5-Plack-App-Proxy/Makefile:1.20 pkgsrc/www/p5-Plack-App-Proxy/Makefile:1.21
--- pkgsrc/www/p5-Plack-App-Proxy/Makefile:1.20 Sun Aug 11 13:24:55 2019
+++ pkgsrc/www/p5-Plack-App-Proxy/Makefile      Mon Nov  4 22:10:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:24:55 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 22:10:07 rillig Exp $
 
 DISTNAME=      Plack-App-Proxy-0.29
 PKGNAME=       p5-${DISTNAME}
@@ -16,11 +16,11 @@ MAKE_ENV+=  PERL_USE_UNSAFE_INC=1
 PERL5_PACKLIST=        auto/Plack/App/Proxy/.packlist
 
 #BUILD_DEPENDS+=       {perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=        p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
-BUILD_DEPENDS+=        p5-Test-TCP-[0-9]*:../../net/p5-Test-TCP
-DEPENDS+=      p5-AnyEvent-HTTP>=1.44:../../www/p5-AnyEvent-HTTP
-DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+=      p5-Plack>=0.9913:../../www/p5-Plack
+BUILD_DEPENDS+=                p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=                p5-Test-TCP-[0-9]*:../../net/p5-Test-TCP
+DEPENDS+=              p5-AnyEvent-HTTP>=1.44:../../www/p5-AnyEvent-HTTP
+DEPENDS+=              p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+=              p5-Plack>=0.9913:../../www/p5-Plack
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
diff -u pkgsrc/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile:1.14 pkgsrc/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile:1.15
--- pkgsrc/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile:1.14      Sun Aug 11 13:24:55 2019
+++ pkgsrc/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile   Mon Nov  4 22:10:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:24:55 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 22:10:07 rillig Exp $
 
 DISTNAME=      Plack-Handler-AnyEvent-ReverseHTTP-0.04
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Reversehttp gateway for PSGI ap
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/Handler/AnyEvent/ReverseHTTP/.packlist
+PERL5_PACKLIST=        auto/Plack/Handler/AnyEvent/ReverseHTTP/.packlist
 
 DEPENDS+=      p5-AnyEvent-[0-9]*:../../devel/p5-AnyEvent
 DEPENDS+=      p5-AnyEvent-ReverseHTTP-[0-9]*:../../www/p5-AnyEvent-ReverseHTTP

Index: pkgsrc/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
diff -u pkgsrc/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile:1.14 pkgsrc/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile:1.15
--- pkgsrc/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile:1.14     Sun Aug 11 13:24:55 2019
+++ pkgsrc/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile  Mon Nov  4 22:10:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:24:55 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 22:10:07 rillig Exp $
 
 DISTNAME=      Plack-Handler-AnyEvent-SCGI-0.03
 PKGNAME=       p5-${DISTNAME}
@@ -11,8 +11,8 @@ HOMEPAGE=     https://metacpan.org/release/P
 COMMENT=       PSGI handler on AnyEvent::SCGI
 LICENSE=       ${PERL5_LICENSE}
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/Handler/AnyEvent/SCGI/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Plack/Handler/AnyEvent/SCGI/.packlist
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 
 BUILD_DEPENDS+=        p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires

Index: pkgsrc/www/p5-Plack-Middleware-Auth-Digest/Makefile
diff -u pkgsrc/www/p5-Plack-Middleware-Auth-Digest/Makefile:1.17 pkgsrc/www/p5-Plack-Middleware-Auth-Digest/Makefile:1.18
--- pkgsrc/www/p5-Plack-Middleware-Auth-Digest/Makefile:1.17    Sun Aug 11 13:24:56 2019
+++ pkgsrc/www/p5-Plack-Middleware-Auth-Digest/Makefile Mon Nov  4 22:10:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:56 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:07 rillig Exp $
 
 DISTNAME=      Plack-Middleware-Auth-Digest-0.05
 PKGNAME=       p5-${DISTNAME}
@@ -12,12 +12,12 @@ COMMENT=    Plack middleware enabling diges
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/Middleware/Auth/Digest/.packlist
+PERL5_PACKLIST=        auto/Plack/Middleware/Auth/Digest/.packlist
 
 #BUILD_DEPENDS+=       {perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-DEPENDS+=      p5-Digest-HMAC-[0-9]*:../../security/p5-Digest-HMAC
-DEPENDS+=      p5-Plack-[0-9]*:../../www/p5-Plack
-BUILD_DEPENDS+=        p5-Module-Build-Tiny-[0-9]*:../../devel/p5-Module-Build-Tiny
+DEPENDS+=              p5-Digest-HMAC-[0-9]*:../../security/p5-Digest-HMAC
+DEPENDS+=              p5-Plack-[0-9]*:../../www/p5-Plack
+BUILD_DEPENDS+=                p5-Module-Build-Tiny-[0-9]*:../../devel/p5-Module-Build-Tiny
 
 PERL5_MODULE_TYPE=     Module::Build
 

Index: pkgsrc/www/p5-Plack-Middleware-ConsoleLogger/Makefile
diff -u pkgsrc/www/p5-Plack-Middleware-ConsoleLogger/Makefile:1.19 pkgsrc/www/p5-Plack-Middleware-ConsoleLogger/Makefile:1.20
--- pkgsrc/www/p5-Plack-Middleware-ConsoleLogger/Makefile:1.19  Sun Aug 11 13:24:56 2019
+++ pkgsrc/www/p5-Plack-Middleware-ConsoleLogger/Makefile       Mon Nov  4 22:10:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:24:56 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/04 22:10:07 rillig Exp $
 
 DISTNAME=      Plack-Middleware-ConsoleLogger-0.05
 PKGNAME=       p5-${DISTNAME}
@@ -11,8 +11,8 @@ HOMEPAGE=     https://metacpan.org/release/P
 COMMENT=       Plack middleware to write logs to Firebug or Webkit Inspector
 LICENSE=       ${PERL5_LICENSE}
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/Middleware/ConsoleLogger/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Plack/Middleware/ConsoleLogger/.packlist
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 
 BUILD_DEPENDS+=        p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires

Index: pkgsrc/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
diff -u pkgsrc/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile:1.7 pkgsrc/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile:1.8
--- pkgsrc/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile:1.7        Sun Aug 11 13:24:56 2019
+++ pkgsrc/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile    Mon Nov  4 22:10:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/08/11 13:24:56 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 22:10:07 rillig Exp $
 
 DISTNAME=      Plack-Middleware-FixMissingBodyInRedirect-0.12
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Sets body for redirect response
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/Middleware/FixMissingBodyInRedirect/.packlist
+PERL5_PACKLIST=        auto/Plack/Middleware/FixMissingBodyInRedirect/.packlist
 
 DEPENDS+=      p5-Plack-[0-9]*:../../www/p5-Plack
 

Index: pkgsrc/www/p5-Plack-Middleware-MethodOverride/Makefile
diff -u pkgsrc/www/p5-Plack-Middleware-MethodOverride/Makefile:1.8 pkgsrc/www/p5-Plack-Middleware-MethodOverride/Makefile:1.9
--- pkgsrc/www/p5-Plack-Middleware-MethodOverride/Makefile:1.8  Sun Aug 11 13:24:57 2019
+++ pkgsrc/www/p5-Plack-Middleware-MethodOverride/Makefile      Mon Nov  4 22:10:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/04 22:10:08 rillig Exp $
 
 DISTNAME=      Plack-Middleware-MethodOverride-0.20
 PKGNAME=       p5-${DISTNAME}
@@ -13,8 +13,8 @@ LICENSE=      ${PERL5_LICENSE}
 
 DEPENDS=       p5-Plack>=0:../../www/p5-Plack
 
-PERL5_PACKLIST=         auto/Plack/Middleware/MethodOverride/.packlist
-USE_LANGUAGES=          # none
+PERL5_PACKLIST=                auto/Plack/Middleware/MethodOverride/.packlist
+USE_LANGUAGES=         # none
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
diff -u pkgsrc/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile:1.10 pkgsrc/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile:1.11
--- pkgsrc/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile:1.10    Sun Aug 11 13:24:57 2019
+++ pkgsrc/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile Mon Nov  4 22:10:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/04 22:10:08 rillig Exp $
 
 DISTNAME=      Plack-Middleware-RemoveRedundantBody-0.07
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Removes body for HTTP response 
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/Middleware/RemoveRedundantBody/.packlist
+PERL5_PACKLIST=        auto/Plack/Middleware/RemoveRedundantBody/.packlist
 
 DEPENDS+=      p5-Plack>=0:../../www/p5-Plack
 

Index: pkgsrc/www/p5-Plack-Middleware-ReverseProxy/Makefile
diff -u pkgsrc/www/p5-Plack-Middleware-ReverseProxy/Makefile:1.17 pkgsrc/www/p5-Plack-Middleware-ReverseProxy/Makefile:1.18
--- pkgsrc/www/p5-Plack-Middleware-ReverseProxy/Makefile:1.17   Sun Aug 11 13:24:57 2019
+++ pkgsrc/www/p5-Plack-Middleware-ReverseProxy/Makefile        Mon Nov  4 22:10:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:08 rillig Exp $
 
 DISTNAME=      Plack-Middleware-ReverseProxy-0.15
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Plack middleware to support rev
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/Middleware/ReverseProxy/.packlist
+PERL5_PACKLIST=        auto/Plack/Middleware/ReverseProxy/.packlist
 
 DEPENDS+=      p5-Plack>=0.9988:../../www/p5-Plack
 #DEPENDS+=     {perl>=5.10.1,p5-parent-[0-9]*}:../../devel/p5-parent

Index: pkgsrc/www/p5-Plack-Middleware-Session/Makefile
diff -u pkgsrc/www/p5-Plack-Middleware-Session/Makefile:1.19 pkgsrc/www/p5-Plack-Middleware-Session/Makefile:1.20
--- pkgsrc/www/p5-Plack-Middleware-Session/Makefile:1.19        Sun Aug 11 13:24:57 2019
+++ pkgsrc/www/p5-Plack-Middleware-Session/Makefile     Mon Nov  4 22:10:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/04 22:10:08 rillig Exp $
 
 DISTNAME=      Plack-Middleware-Session-0.30
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Plack middleware for session ma
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/Middleware/Session/.packlist
+PERL5_PACKLIST=        auto/Plack/Middleware/Session/.packlist
 
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 

Index: pkgsrc/www/p5-Plack-Test-Agent/Makefile
diff -u pkgsrc/www/p5-Plack-Test-Agent/Makefile:1.6 pkgsrc/www/p5-Plack-Test-Agent/Makefile:1.7
--- pkgsrc/www/p5-Plack-Test-Agent/Makefile:1.6 Sun Aug 11 13:24:57 2019
+++ pkgsrc/www/p5-Plack-Test-Agent/Makefile     Mon Nov  4 22:10:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/08/11 13:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/04 22:10:08 rillig Exp $
 
 DISTNAME=      Plack-Test-Agent-1.4
 PKGNAME=       p5-${DISTNAME}
@@ -22,7 +22,7 @@ DEPENDS+=     p5-Test-Memory-Cycle-[0-9]*:..
 #DEPENDS+=     p5-HTTP-Message>=0:../../www/p5-HTTP-Message
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/Test/Agent/.packlist
+PERL5_PACKLIST=        auto/Plack/Test/Agent/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-Plack-Test-ExternalServer/Makefile
diff -u pkgsrc/www/p5-Plack-Test-ExternalServer/Makefile:1.12 pkgsrc/www/p5-Plack-Test-ExternalServer/Makefile:1.13
--- pkgsrc/www/p5-Plack-Test-ExternalServer/Makefile:1.12       Sun Aug 11 13:24:57 2019
+++ pkgsrc/www/p5-Plack-Test-ExternalServer/Makefile    Mon Nov  4 22:10:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/08/11 13:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 22:10:08 rillig Exp $
 
 DISTNAME=      Plack-Test-ExternalServer-0.02
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Run HTTP tests on external live
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Plack/Test/ExternalServer/.packlist
+PERL5_PACKLIST=        auto/Plack/Test/ExternalServer/.packlist
 
 DEPENDS+=      p5-URI>=0:../../www/p5-URI
 DEPENDS+=      p5-libwww>0:../../www/p5-libwww

Index: pkgsrc/www/p5-Pod-POM-Web/Makefile
diff -u pkgsrc/www/p5-Pod-POM-Web/Makefile:1.23 pkgsrc/www/p5-Pod-POM-Web/Makefile:1.24
--- pkgsrc/www/p5-Pod-POM-Web/Makefile:1.23     Sun Aug 11 13:24:57 2019
+++ pkgsrc/www/p5-Pod-POM-Web/Makefile  Mon Nov  4 22:10:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/04 22:10:08 rillig Exp $
 
 DISTNAME=      Pod-POM-Web-1.23
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module providing a HTML 
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES=         # empty
-PERL5_PACKLIST=        auto/Pod/POM/Web/.packlist
+PERL5_PACKLIST=                auto/Pod/POM/Web/.packlist
 PERL5_MODULE_TYPE=     Module::Build
 
 DEPENDS+=      p5-Alien-GvaScript>=1.21:../../www/p5-Alien-GvaScript
@@ -24,8 +24,8 @@ DEPENDS+=     p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
 
 # recommends
-DEPENDS+=       p5-AnnoCPAN-Perldoc-[0-9]*:../../devel/p5-AnnoCPAN-Perldoc
-DEPENDS+=       p5-PPI-HTML-[0-9]*:../../textproc/p5-PPI-HTML
+DEPENDS+=      p5-AnnoCPAN-Perldoc-[0-9]*:../../devel/p5-AnnoCPAN-Perldoc
+DEPENDS+=      p5-PPI-HTML-[0-9]*:../../textproc/p5-PPI-HTML
 DEPENDS+=      p5-Search-Indexer>=0.75:../../textproc/p5-Search-Indexer
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Reaction/Makefile
diff -u pkgsrc/www/p5-Reaction/Makefile:1.16 pkgsrc/www/p5-Reaction/Makefile:1.17
--- pkgsrc/www/p5-Reaction/Makefile:1.16        Sun Aug 11 13:24:58 2019
+++ pkgsrc/www/p5-Reaction/Makefile     Mon Nov  4 22:10:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:24:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 22:10:08 rillig Exp $
 
 DISTNAME=      Reaction-0.002005
 PKGNAME=       p5-Reaction-0.2.5
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/R
 COMMENT=       Perl 5 extended MVC framework based on Catalyst
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Reaction/.packlist
+PERL5_PACKLIST=        auto/Reaction/.packlist
 
 REPLACE_PERL+= script/moose_to_rclass.pl
 REPLACE_PERL+= script/rclass_back_to_moose.pl

Index: pkgsrc/www/p5-Rose-HTML-Objects/Makefile
diff -u pkgsrc/www/p5-Rose-HTML-Objects/Makefile:1.29 pkgsrc/www/p5-Rose-HTML-Objects/Makefile:1.30
--- pkgsrc/www/p5-Rose-HTML-Objects/Makefile:1.29       Sun Aug 11 13:24:58 2019
+++ pkgsrc/www/p5-Rose-HTML-Objects/Makefile    Mon Nov  4 22:10:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/08/11 13:24:58 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/04 22:10:08 rillig Exp $
 
 DISTNAME=      Rose-HTML-Objects-0.623
 PKGNAME=       p5-${DISTNAME}
@@ -29,7 +29,7 @@ DEPENDS+=     p5-URI-[0-9]*:../../www/p5-URI
 BUILD_DEPENDS+=        p5-Test-Memory-Cycle-[0-9]*:../../devel/p5-Test-Memory-Cycle
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST=                auto/Rose/HTML/Objects/.packlist
+PERL5_PACKLIST=        auto/Rose/HTML/Objects/.packlist
 
 post-extract:
        ${FIND} ${WRKSRC} -name "*.pm" -type f -exec ${CHMOD} -x {} \;

Index: pkgsrc/www/p5-Router-Simple/Makefile
diff -u pkgsrc/www/p5-Router-Simple/Makefile:1.10 pkgsrc/www/p5-Router-Simple/Makefile:1.11
--- pkgsrc/www/p5-Router-Simple/Makefile:1.10   Sun Aug 11 13:24:59 2019
+++ pkgsrc/www/p5-Router-Simple/Makefile        Mon Nov  4 22:10:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:24:59 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/04 22:10:09 rillig Exp $
 
 DISTNAME=      Router-Simple-0.17
 PKGNAME=       p5-${DISTNAME}
@@ -15,7 +15,7 @@ USE_TOOLS+=   perl:run
 
 DEPENDS+=      p5-Class-Accessor-Lite-[0-9]*:../../devel/p5-Class-Accessor-Lite
 
-PERL5_PACKLIST=        auto/Router/Simple/.packlist
+PERL5_PACKLIST=                auto/Router/Simple/.packlist
 PERL5_MODULE_TYPE=     Module::Build
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Session-Storage-Secure/Makefile
diff -u pkgsrc/www/p5-Session-Storage-Secure/Makefile:1.10 pkgsrc/www/p5-Session-Storage-Secure/Makefile:1.11
--- pkgsrc/www/p5-Session-Storage-Secure/Makefile:1.10  Sun Aug 11 13:24:59 2019
+++ pkgsrc/www/p5-Session-Storage-Secure/Makefile       Mon Nov  4 22:10:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:24:59 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/04 22:10:09 rillig Exp $
 
 DISTNAME=      Session-Storage-Secure-0.011
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Encrypted, expiring, compressed
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Session/Storage/Secure/.packlist
+PERL5_PACKLIST=        auto/Session/Storage/Secure/.packlist
 
 DEPENDS+=      p5-Crypt-CBC>=0:../../security/p5-Crypt-CBC
 DEPENDS+=      p5-Crypt-Rijndael-[0-9]*:../../security/p5-Crypt-Rijndael

Index: pkgsrc/www/p5-Starlet/Makefile
diff -u pkgsrc/www/p5-Starlet/Makefile:1.22 pkgsrc/www/p5-Starlet/Makefile:1.23
--- pkgsrc/www/p5-Starlet/Makefile:1.22 Sun Aug 11 13:24:59 2019
+++ pkgsrc/www/p5-Starlet/Makefile      Mon Nov  4 22:10:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:24:59 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/04 22:10:09 rillig Exp $
 
 DISTNAME=      Starlet-0.31
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 Plack based standalone H
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Starlet/.packlist
+PERL5_PACKLIST=        auto/Starlet/.packlist
 
 BUILD_DEPENDS+=        p5-Test-TCP>=2.10:../../net/p5-Test-TCP
 DEPENDS+=      p5-Parallel-Prefork>=0.17:../../devel/p5-Parallel-Prefork

Index: pkgsrc/www/p5-Starman/Makefile
diff -u pkgsrc/www/p5-Starman/Makefile:1.25 pkgsrc/www/p5-Starman/Makefile:1.26
--- pkgsrc/www/p5-Starman/Makefile:1.25 Sun Aug 11 13:24:59 2019
+++ pkgsrc/www/p5-Starman/Makefile      Mon Nov  4 22:10:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:24:59 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/04 22:10:09 rillig Exp $
 
 DISTNAME=      Starman-0.4014
 PKGNAME=       p5-${DISTNAME}
@@ -11,8 +11,8 @@ HOMEPAGE=     https://metacpan.org/release/S
 COMMENT=       High-performance preforking PSGI web server
 LICENSE=       ${PERL5_LICENSE}
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Starman/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Starman/.packlist
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 
 DEPENDS+=      p5-Net-Server-SS-PreFork-[0-9]*:../../net/p5-Net-Server-SS-PreFork

Index: pkgsrc/www/p5-Task-CatInABox/Makefile
diff -u pkgsrc/www/p5-Task-CatInABox/Makefile:1.13 pkgsrc/www/p5-Task-CatInABox/Makefile:1.14
--- pkgsrc/www/p5-Task-CatInABox/Makefile:1.13  Sun Aug 11 13:25:00 2019
+++ pkgsrc/www/p5-Task-CatInABox/Makefile       Mon Nov  4 22:10:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:25:00 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/04 22:10:09 rillig Exp $
 
 DISTNAME=      Task-CatInABox-0.03
 PKGNAME=       p5-${DISTNAME}
@@ -27,7 +27,7 @@ DEPENDS+=     p5-DBIx-Class-TimeStamp-[0-9]*
 DEPENDS+=      p5-Template-Toolkit-[0-9]*:../../www/p5-Template-Toolkit
 
 USE_LANGUAGES=         # empty
-PERL5_PACKLIST=        auto/Task/CatInABox/.packlist
+PERL5_PACKLIST=                auto/Task/CatInABox/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Task-Catalyst-Tutorial/Makefile
diff -u pkgsrc/www/p5-Task-Catalyst-Tutorial/Makefile:1.13 pkgsrc/www/p5-Task-Catalyst-Tutorial/Makefile:1.14
--- pkgsrc/www/p5-Task-Catalyst-Tutorial/Makefile:1.13  Sun Aug 11 13:25:00 2019
+++ pkgsrc/www/p5-Task-Catalyst-Tutorial/Makefile       Mon Nov  4 22:10:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:25:00 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/04 22:10:09 rillig Exp $
 
 DISTNAME=      Task-Catalyst-Tutorial-0.06
 PKGNAME=       p5-${DISTNAME}
@@ -30,7 +30,7 @@ REPLACE_PERL+=        examples/MyApp/script/*.p
 REPLACE_PERL+= examples/MyApp/t/*.t
 
 USE_LANGUAGES=         # empty
-PERL5_PACKLIST=        auto/Task/Catalyst/Tutorial/.packlist
+PERL5_PACKLIST=                auto/Task/Catalyst/Tutorial/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Tatsumaki/Makefile
diff -u pkgsrc/www/p5-Tatsumaki/Makefile:1.17 pkgsrc/www/p5-Tatsumaki/Makefile:1.18
--- pkgsrc/www/p5-Tatsumaki/Makefile:1.17       Sun Aug 11 13:25:00 2019
+++ pkgsrc/www/p5-Tatsumaki/Makefile    Mon Nov  4 22:10:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:25:00 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:09 rillig Exp $
 
 DISTNAME=      Tatsumaki-0.1013
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 non-blocking web framewo
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Tatsumaki/.packlist
+PERL5_PACKLIST=        auto/Tatsumaki/.packlist
 
 BUILD_DEPENDS+=        p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 DEPENDS+=      p5-Any-Moose-[0-9]*:../../devel/p5-Any-Moose

Index: pkgsrc/www/p5-Template-Plugin-Subst/Makefile
diff -u pkgsrc/www/p5-Template-Plugin-Subst/Makefile:1.16 pkgsrc/www/p5-Template-Plugin-Subst/Makefile:1.17
--- pkgsrc/www/p5-Template-Plugin-Subst/Makefile:1.16   Sun Aug 11 13:25:01 2019
+++ pkgsrc/www/p5-Template-Plugin-Subst/Makefile        Mon Nov  4 22:10:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 22:10:09 rillig Exp $
 
 DISTNAME=      Template-Plugin-Subst-0.02
 PKGNAME=       p5-${DISTNAME}
@@ -13,8 +13,8 @@ LICENSE=      2-clause-bsd
 
 DEPENDS+=      p5-Template-Toolkit>=2.0:../../www/p5-Template-Toolkit
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST=        auto/Template/Plugin/Subst/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Template/Plugin/Subst/.packlist
 PERL5_MODULE_TYPE=     Module::Build
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Template-Stash-EscapeHTML/Makefile
diff -u pkgsrc/www/p5-Template-Stash-EscapeHTML/Makefile:1.16 pkgsrc/www/p5-Template-Stash-EscapeHTML/Makefile:1.17
--- pkgsrc/www/p5-Template-Stash-EscapeHTML/Makefile:1.16       Sun Aug 11 13:25:01 2019
+++ pkgsrc/www/p5-Template-Stash-EscapeHTML/Makefile    Mon Nov  4 22:10:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 22:10:09 rillig Exp $
 
 DISTNAME=      Template-Stash-EscapeHTML-0.02
 PKGNAME=       p5-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=      ${PERL5_LICENSE}
 
 DEPENDS+=      p5-Template-Toolkit>=2.13:../../www/p5-Template-Toolkit
 
-PERL5_PACKLIST=        auto/Template/Stash/EscapeHTML/.packlist
+PERL5_PACKLIST=                auto/Template/Stash/EscapeHTML/.packlist
 PERL5_MODULE_TYPE=     Module::Build
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/www/p5-Test-HTTP-Server-Simple/Makefile
diff -u pkgsrc/www/p5-Test-HTTP-Server-Simple/Makefile:1.17 pkgsrc/www/p5-Test-HTTP-Server-Simple/Makefile:1.18
--- pkgsrc/www/p5-Test-HTTP-Server-Simple/Makefile:1.17 Sun Aug 11 13:25:02 2019
+++ pkgsrc/www/p5-Test-HTTP-Server-Simple/Makefile      Mon Nov  4 22:10:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:25:02 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:10 rillig Exp $
 
 DISTNAME=      Test-HTTP-Server-Simple-0.11
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module providing Test::M
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Test/HTTP/Server/Simple/.packlist
+PERL5_PACKLIST=        auto/Test/HTTP/Server/Simple/.packlist
 
 DEPENDS+=      p5-HTTP-Server-Simple-[0-9]*:../../www/p5-HTTP-Server-Simple
 # This may be only a build dependency - No, it's not

Index: pkgsrc/www/p5-Test-WWW-Mechanize-Catalyst/Makefile
diff -u pkgsrc/www/p5-Test-WWW-Mechanize-Catalyst/Makefile:1.20 pkgsrc/www/p5-Test-WWW-Mechanize-Catalyst/Makefile:1.21
--- pkgsrc/www/p5-Test-WWW-Mechanize-Catalyst/Makefile:1.20     Sun Aug 11 13:25:02 2019
+++ pkgsrc/www/p5-Test-WWW-Mechanize-Catalyst/Makefile  Mon Nov  4 22:10:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:25:02 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 22:10:10 rillig Exp $
 
 DISTNAME=      Test-WWW-Mechanize-Catalyst-0.60
 PKGNAME=       p5-${DISTNAME}
@@ -25,7 +25,7 @@ BUILD_DEPENDS+=       p5-Catalyst-Plugin-Sessi
 BUILD_DEPENDS+=        p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Test/WWW/Mechanize/Catalyst/.packlist
+PERL5_PACKLIST=        auto/Test/WWW/Mechanize/Catalyst/.packlist
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1
 

Index: pkgsrc/www/p5-Test-WWW-Mechanize-PSGI/Makefile
diff -u pkgsrc/www/p5-Test-WWW-Mechanize-PSGI/Makefile:1.16 pkgsrc/www/p5-Test-WWW-Mechanize-PSGI/Makefile:1.17
--- pkgsrc/www/p5-Test-WWW-Mechanize-PSGI/Makefile:1.16 Sun Aug 11 13:25:02 2019
+++ pkgsrc/www/p5-Test-WWW-Mechanize-PSGI/Makefile      Mon Nov  4 22:10:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:25:02 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 22:10:10 rillig Exp $
 
 DISTNAME=      Test-WWW-Mechanize-PSGI-0.38
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module to test PSGI prog
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Test/WWW/Mechanize/PSGI/.packlist
+PERL5_PACKLIST=        auto/Test/WWW/Mechanize/PSGI/.packlist
 
 DEPENDS+=      p5-Plack-[0-9]*:../../www/p5-Plack
 DEPENDS+=      p5-Test-WWW-Mechanize-[0-9]*:../../www/p5-Test-WWW-Mechanize

Index: pkgsrc/www/p5-Twiggy/Makefile
diff -u pkgsrc/www/p5-Twiggy/Makefile:1.17 pkgsrc/www/p5-Twiggy/Makefile:1.18
--- pkgsrc/www/p5-Twiggy/Makefile:1.17  Sun Aug 11 13:25:02 2019
+++ pkgsrc/www/p5-Twiggy/Makefile       Mon Nov  4 22:10:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:25:02 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:10 rillig Exp $
 
 DISTNAME=      Twiggy-0.1025
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      AnyEvent HTTP server for PSGI
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Twiggy/.packlist
+PERL5_PACKLIST=        auto/Twiggy/.packlist
 
 REPLACE_PERL+= bin/twiggy
 

Index: pkgsrc/www/p5-URI-ws/Makefile
diff -u pkgsrc/www/p5-URI-ws/Makefile:1.5 pkgsrc/www/p5-URI-ws/Makefile:1.6
--- pkgsrc/www/p5-URI-ws/Makefile:1.5   Sun Aug 11 13:25:03 2019
+++ pkgsrc/www/p5-URI-ws/Makefile       Mon Nov  4 22:10:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/08/11 13:25:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/04 22:10:10 rillig Exp $
 
 DISTNAME=      URI-ws-0.03
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/U
 COMMENT=       WebSocket support for URI package
 LICENSE=       ${PERL5_LICENSE}
 
-DEPENDS+=       p5-URI-[0-9]*:../../www/p5-URI
+DEPENDS+=      p5-URI-[0-9]*:../../www/p5-URI
 
 PERL5_PACKLIST=        auto/URI/ws/.packlist
 

Index: pkgsrc/www/p5-WWW-Mechanize-Cached/Makefile
diff -u pkgsrc/www/p5-WWW-Mechanize-Cached/Makefile:1.10 pkgsrc/www/p5-WWW-Mechanize-Cached/Makefile:1.11
--- pkgsrc/www/p5-WWW-Mechanize-Cached/Makefile:1.10    Sun Aug 11 13:25:04 2019
+++ pkgsrc/www/p5-WWW-Mechanize-Cached/Makefile Mon Nov  4 22:10:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:25:04 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/04 22:10:10 rillig Exp $
 
 DISTNAME=      WWW-Mechanize-Cached-1.51
 PKGNAME=       p5-${DISTNAME}
@@ -17,10 +17,10 @@ DEPENDS+=   p5-WWW-Mechanize-[0-9]*:../../
 DEPENDS+=      p5-namespace-clean-[0-9]*:../../devel/p5-namespace-clean
 
 # TEST_DEPENDS
-BUILD_DEPENDS+= p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
-BUILD_DEPENDS+= p5-Test-RequiresInternet-[0-9]*:../../net/p5-Test-RequiresInternet
-BUILD_DEPENDS+= p5-Find-Lib-[0-9]*:../../devel/p5-Find-Lib
-BUILD_DEPENDS+= p5-CHI-[0-9]*:../../devel/p5-CHI
+BUILD_DEPENDS+=        p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=        p5-Test-RequiresInternet-[0-9]*:../../net/p5-Test-RequiresInternet
+BUILD_DEPENDS+=        p5-Find-Lib-[0-9]*:../../devel/p5-Find-Lib
+BUILD_DEPENDS+=        p5-CHI-[0-9]*:../../devel/p5-CHI
 
 PERL5_PACKLIST=                auto/WWW/Mechanize/Cached/.packlist
 USE_LANGUAGES=         # none

Index: pkgsrc/www/p5-WWW-Mechanize-GZip/Makefile
diff -u pkgsrc/www/p5-WWW-Mechanize-GZip/Makefile:1.14 pkgsrc/www/p5-WWW-Mechanize-GZip/Makefile:1.15
--- pkgsrc/www/p5-WWW-Mechanize-GZip/Makefile:1.14      Sun Aug 11 13:25:05 2019
+++ pkgsrc/www/p5-WWW-Mechanize-GZip/Makefile   Mon Nov  4 22:10:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 22:10:10 rillig Exp $
 
 DISTNAME=      WWW-Mechanize-GZip-0.14
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module to fetch webpages
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/WWW/Mechanize/GZip/.packlist
+PERL5_PACKLIST=        auto/WWW/Mechanize/GZip/.packlist
 
 DEPENDS+=      p5-Test-WWW-Mechanize-[0-9]*:../../www/p5-Test-WWW-Mechanize
 

Index: pkgsrc/www/p5-WWW-Mechanize-Timed/Makefile
diff -u pkgsrc/www/p5-WWW-Mechanize-Timed/Makefile:1.11 pkgsrc/www/p5-WWW-Mechanize-Timed/Makefile:1.12
--- pkgsrc/www/p5-WWW-Mechanize-Timed/Makefile:1.11     Sun Aug 11 13:25:05 2019
+++ pkgsrc/www/p5-WWW-Mechanize-Timed/Makefile  Mon Nov  4 22:10:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/08/11 13:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/04 22:10:10 rillig Exp $
 
 DISTNAME=      WWW-Mechanize-Timed-0.44
 PKGNAME=       p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=     p5-LWPx-TimedHTTP>=1.2:../../w
 DEPENDS+=      p5-WWW-Mechanize>=0.72:../../www/p5-WWW-Mechanize
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/WWW/Mechanize/Timed/.packlist
+PERL5_PACKLIST=        auto/WWW/Mechanize/Timed/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
diff -u pkgsrc/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile:1.18 pkgsrc/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile:1.19
--- pkgsrc/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile:1.18 Sun Aug 11 13:25:05 2019
+++ pkgsrc/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile      Mon Nov  4 22:10:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/04 22:10:11 rillig Exp $
 
 DISTNAME=      WWW-Pastebin-PastebinCom-Create-1.003
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Paste to <http://pastebin.com> 
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/WWW/Pastebin/PastebinCom/Create/.packlist
+PERL5_PACKLIST=        auto/WWW/Pastebin/PastebinCom/Create/.packlist
 
 DEPENDS+=      p5-URI>=1.35:../../www/p5-URI
 # LWP::UserAgent 2.036 is really what is required

Index: pkgsrc/www/p5-WWW-Pastebin-RafbNet-Create/Makefile
diff -u pkgsrc/www/p5-WWW-Pastebin-RafbNet-Create/Makefile:1.13 pkgsrc/www/p5-WWW-Pastebin-RafbNet-Create/Makefile:1.14
--- pkgsrc/www/p5-WWW-Pastebin-RafbNet-Create/Makefile:1.13     Sun Aug 11 13:25:05 2019
+++ pkgsrc/www/p5-WWW-Pastebin-RafbNet-Create/Makefile  Mon Nov  4 22:10:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/04 22:10:11 rillig Exp $
 
 DISTNAME=      WWW-Pastebin-RafbNet-Create-0.001
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/W
 COMMENT=       Create new pastes on http://rafb.net/ from Perl
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/WWW/Pastebin/RafbNet/Create/.packlist
+PERL5_PACKLIST=        auto/WWW/Pastebin/RafbNet/Create/.packlist
 
 DEPENDS+=      p5-Class-Data-Accessor>=0.04001:../../devel/p5-Class-Data-Accessor
 DEPENDS+=      p5-URI>=1.35:../../www/p5-URI

Index: pkgsrc/www/p5-WWW-RobotRules/Makefile
diff -u pkgsrc/www/p5-WWW-RobotRules/Makefile:1.15 pkgsrc/www/p5-WWW-RobotRules/Makefile:1.16
--- pkgsrc/www/p5-WWW-RobotRules/Makefile:1.15  Sun Aug 11 13:25:05 2019
+++ pkgsrc/www/p5-WWW-RobotRules/Makefile       Mon Nov  4 22:10:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:10:11 rillig Exp $
 
 DISTNAME=      WWW-RobotRules-6.02
 PKGNAME=       p5-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE=      ${PERL5_LICENSE}
 CONFLICTS+=    p5-libwww<6.00
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/WWW/RobotRules/.packlist
+PERL5_PACKLIST=        auto/WWW/RobotRules/.packlist
 
 DEPENDS+=      p5-URI>=1.27:../../www/p5-URI
 

Index: pkgsrc/www/p5-WWW-Shorten/Makefile
diff -u pkgsrc/www/p5-WWW-Shorten/Makefile:1.21 pkgsrc/www/p5-WWW-Shorten/Makefile:1.22
--- pkgsrc/www/p5-WWW-Shorten/Makefile:1.21     Sun Aug 11 13:25:05 2019
+++ pkgsrc/www/p5-WWW-Shorten/Makefile  Mon Nov  4 22:10:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 22:10:11 rillig Exp $
 
 DISTNAME=      WWW-Shorten-3.093
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module interface to URL 
 LICENSE=       artistic-2.0
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/WWW/Shorten/.packlist
+PERL5_PACKLIST=        auto/WWW/Shorten/.packlist
 
 DEPENDS+=      p5-Config-Auto-[0-9]*:../../devel/p5-Config-Auto
 DEPENDS+=      p5-URI>=1.27:../../www/p5-URI

Index: pkgsrc/www/p5-Web-Scraper/Makefile
diff -u pkgsrc/www/p5-Web-Scraper/Makefile:1.17 pkgsrc/www/p5-Web-Scraper/Makefile:1.18
--- pkgsrc/www/p5-Web-Scraper/Makefile:1.17     Sun Aug 11 13:25:06 2019
+++ pkgsrc/www/p5-Web-Scraper/Makefile  Mon Nov  4 22:10:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:25:06 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:11 rillig Exp $
 
 DISTNAME=      Web-Scraper-0.38
 PKGNAME=       p5-${DISTNAME}
@@ -11,8 +11,8 @@ HOMEPAGE=     https://metacpan.org/release/W
 COMMENT=       Perl 5 Web Scraping Toolkit inspired by Scrapi
 LICENSE=       ${PERL5_LICENSE}
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Web/Scraper/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Web/Scraper/.packlist
 PERL5_MODULE_TYPE=     Module::Build::Tiny
 
 DEPENDS+=      p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser

Index: pkgsrc/www/php-apcu_bc/Makefile
diff -u pkgsrc/www/php-apcu_bc/Makefile:1.4 pkgsrc/www/php-apcu_bc/Makefile:1.5
--- pkgsrc/www/php-apcu_bc/Makefile:1.4 Mon Jan 14 13:06:11 2019
+++ pkgsrc/www/php-apcu_bc/Makefile     Mon Nov  4 22:10:11 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2019/01/14 13:06:11 taca Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/04 22:10:11 rillig Exp $
 
 MODNAME=       apcu_bc
-PKGMODNAME= apc
+PKGMODNAME=    apc
 PECL_VERSION=  1.0.3
 CATEGORIES+=   sysutils
 

Index: pkgsrc/www/php-basercms/Makefile
diff -u pkgsrc/www/php-basercms/Makefile:1.9 pkgsrc/www/php-basercms/Makefile:1.10
--- pkgsrc/www/php-basercms/Makefile:1.9        Mon Dec 17 15:56:32 2018
+++ pkgsrc/www/php-basercms/Makefile    Mon Nov  4 22:10:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/12/17 15:56:32 taca Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/04 22:10:11 rillig Exp $
 
 BASERVER=      3.0.16
 DISTNAME=      basercms-${BASERVER}
@@ -12,7 +12,7 @@ HOMEPAGE=     https://basercms.net/
 COMMENT=       Easy to use Content Management System for Japan/Japanese
 LICENSE=       mit
 
-DEPENDS+=       ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd
 
 WRKSRC=                        ${WRKDIR}/basercms

Index: pkgsrc/www/php-glpi/Makefile
diff -u pkgsrc/www/php-glpi/Makefile:1.9 pkgsrc/www/php-glpi/Makefile:1.10
--- pkgsrc/www/php-glpi/Makefile:1.9    Thu Sep 26 14:52:24 2019
+++ pkgsrc/www/php-glpi/Makefile        Mon Nov  4 22:10:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/09/26 14:52:24 hauke Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/04 22:10:11 rillig Exp $
 
 DISTNAME=      glpi-${GLPI_VERSION}
 GLPI_VERSION=  9.4.4
@@ -30,7 +30,7 @@ USE_LANGUAGES=        # none
 
 USE_TOOLS+=    chmod find pax
 
-BUILD_DEFS+=    APACHE_USER APACHE_GROUP VARBASE
+BUILD_DEFS+=   APACHE_USER APACHE_GROUP VARBASE
 
 MESSAGE_SUBST+=        APACHE_USER="${APACHE_USER}"
 
@@ -74,7 +74,7 @@ REPLACE_FILES.php=    vendor/tecnickcom/tcp
 REPLACE_FILES.php+=    bin/console
 .for ddd in  bench.php fetch_windows_zones.php generate_vcards \
             generateicalendardata.php vobject
-REPLACE_FILES.php+=      vendor/sabre/vobject/bin/${ddd}
+REPLACE_FILES.php+=    vendor/sabre/vobject/bin/${ddd}
 .endfor
 
 INSTALLATION_DIRS+=    ${GLPI_DIR} ${EGDIR}

Index: pkgsrc/www/php-phrasea2/Makefile
diff -u pkgsrc/www/php-phrasea2/Makefile:1.12 pkgsrc/www/php-phrasea2/Makefile:1.13
--- pkgsrc/www/php-phrasea2/Makefile:1.12       Sun Sep 11 17:03:29 2016
+++ pkgsrc/www/php-phrasea2/Makefile    Mon Nov  4 22:10:11 2019
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2016/09/11 17:03:29 taca Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 22:10:11 rillig Exp $
 #
 
 .include "../../www/phraseanet/Makefile.common"
 
-MODNAME=               phrasea2
-PKGREVISION=           2
-PECL_VERSION=          ${VERS}
+MODNAME=                       phrasea2
+PKGREVISION=                   2
+PECL_VERSION=                  ${VERS}
 PECL_LEGACY_VERSION_SCHEME=    yes
-EXTRACT_ELEMENTS=      ${DISTNAME}/bin/src/php_phrasea2
-EXTRACT_SUFX=          .tar.gz
-USE_LANGUAGES=         c c++
+EXTRACT_ELEMENTS=              ${DISTNAME}/bin/src/php_phrasea2
+EXTRACT_SUFX=                  .tar.gz
+USE_LANGUAGES=                 c c++
 
 PHP_VERSIONS_ACCEPTED= 56
 
@@ -21,7 +21,7 @@ DISTNAME=     phraseanet-v${VERS}-linux
 DIST_SUBDIR=   #empty
 
 # This seems to now be needed though it wasn't before...
-WRKSRC=${WRKDIR}/${DISTNAME}/bin/src/php_phrasea2
+WRKSRC=        ${WRKDIR}/${DISTNAME}/bin/src/php_phrasea2
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"

Index: pkgsrc/www/php-tt-rss/options.mk
diff -u pkgsrc/www/php-tt-rss/options.mk:1.3 pkgsrc/www/php-tt-rss/options.mk:1.4
--- pkgsrc/www/php-tt-rss/options.mk:1.3        Sun Sep 11 17:03:29 2016
+++ pkgsrc/www/php-tt-rss/options.mk    Mon Nov  4 22:10:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/09/11 17:03:29 taca Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/04 22:10:12 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.php-tt-rss
 
@@ -13,8 +13,8 @@ PKG_SUGGESTED_OPTIONS=        pgsql
 ### Use mysql or pgsql backend
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
+DEPENDS+=              ${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
 PHP_VERSIONS_ACCEPTED= 56
 .elif !empty(PKG_OPTIONS:Mpgsql)
-DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=5.2.0:../../databases/php-pgsql
+DEPENDS+=              ${PHP_PKG_PREFIX}-pgsql>=5.2.0:../../databases/php-pgsql
 .endif

Index: pkgsrc/www/phraseanet-indexer/Makefile
diff -u pkgsrc/www/phraseanet-indexer/Makefile:1.7 pkgsrc/www/phraseanet-indexer/Makefile:1.8
--- pkgsrc/www/phraseanet-indexer/Makefile:1.7  Tue Sep 20 12:59:25 2016
+++ pkgsrc/www/phraseanet-indexer/Makefile      Mon Nov  4 22:10:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/09/20 12:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 22:10:12 rillig Exp $
 
 .include "../../www/phraseanet/Makefile.common"
 PKGNAME=        phraseanet-indexer-${VERS}
@@ -9,7 +9,7 @@ WRKSRC=                 ${WRKDIR}/${DISTNAME}/bin/src/
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            aclocal autoconf automake
 GNU_CONFIGURE=         yes
-CFLAGS+=       -I${BUILDLINK_PREFIX.libxml2}/include/libxml2
+CFLAGS+=               -I${BUILDLINK_PREFIX.libxml2}/include/libxml2
 LIBS.SunOS+=           -lrt -lsocket
 
 

Index: pkgsrc/www/py-HTMLgen/Makefile
diff -u pkgsrc/www/py-HTMLgen/Makefile:1.21 pkgsrc/www/py-HTMLgen/Makefile:1.22
--- pkgsrc/www/py-HTMLgen/Makefile:1.21 Mon Sep  2 13:20:01 2019
+++ pkgsrc/www/py-HTMLgen/Makefile      Mon Nov  4 22:10:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/09/02 13:20:01 adam Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 22:10:12 rillig Exp $
 
 DISTNAME=      HTMLgen
 PKGNAME=       ${PYPKGPREFIX}-HTMLgen-2.2.2
@@ -18,7 +18,7 @@ PY_PATCHPLIST=        yes
 
 REPLACE_PYTHON+=       *.py
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 INSTALLATION_DIRS+=    ${PYSITELIB}
 

Index: pkgsrc/www/py-beautifulsoup/Makefile
diff -u pkgsrc/www/py-beautifulsoup/Makefile:1.19 pkgsrc/www/py-beautifulsoup/Makefile:1.20
--- pkgsrc/www/py-beautifulsoup/Makefile:1.19   Mon Oct  7 18:34:21 2019
+++ pkgsrc/www/py-beautifulsoup/Makefile        Mon Nov  4 22:10:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/10/07 18:34:21 adam Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/04 22:10:12 rillig Exp $
 
 DISTNAME=      BeautifulSoup-3.2.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/B/b/:S/S/s/}
@@ -13,7 +13,7 @@ LICENSE=      modified-bsd
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27 # use py-beautifulsoup4 for python-3.x
+PYTHON_VERSIONS_ACCEPTED=      27 # use py-beautifulsoup4 for python-3.x
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-blosxom/Makefile
diff -u pkgsrc/www/py-blosxom/Makefile:1.25 pkgsrc/www/py-blosxom/Makefile:1.26
--- pkgsrc/www/py-blosxom/Makefile:1.25 Tue May  7 14:26:06 2019
+++ pkgsrc/www/py-blosxom/Makefile      Mon Nov  4 22:10:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/05/07 14:26:06 hauke Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/04 22:10:12 rillig Exp $
 
 PYBLOXSOMVERS= 1.5.3
 DISTNAME=      pyblosxom-${PYBLOXSOMVERS}
@@ -17,9 +17,9 @@ DIST_SUBDIR=  ${DISTNAME}     # upstream reis
 
 USE_LANGUAGES= #none
 
-DOC_SUBDIR=     share/doc/pyblosxom
-DOCDIR=         ${PREFIX}/${DOC_SUBDIR}
-DOCFILES=       AUTHORS INSTALL LICENSE README.rst UPGRADE WHATSNEW
+DOC_SUBDIR=    share/doc/pyblosxom
+DOCDIR=                ${PREFIX}/${DOC_SUBDIR}
+DOCFILES=      AUTHORS INSTALL LICENSE README.rst UPGRADE WHATSNEW
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
 
@@ -27,7 +27,7 @@ INSTALLATION_DIRS=            ${DOC_SUBDIR}
 
 REPLACE_PYTHON=                        Pyblosxom/data/pyblosxom.cgi
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 pre-configure:
        cd ${WRKSRC} && ${FIND} Pyblosxom -type f -name '*.orig' \

Index: pkgsrc/www/py-cloudfiles/Makefile
diff -u pkgsrc/www/py-cloudfiles/Makefile:1.4 pkgsrc/www/py-cloudfiles/Makefile:1.5
--- pkgsrc/www/py-cloudfiles/Makefile:1.4       Mon Sep  2 13:20:01 2019
+++ pkgsrc/www/py-cloudfiles/Makefile   Mon Nov  4 22:10:12 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2019/09/02 13:20:01 adam Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/04 22:10:12 rillig Exp $
 
 DISTNAME=      python-cloudfiles-1.7.11
 PKGNAME=       ${DISTNAME:S/python/${PYPKGPREFIX}/}
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-cloudfiles/}
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 MAINTAINER=    triaxx%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/ncw/python-cloudfiles/

Index: pkgsrc/www/py-django14/options.mk
diff -u pkgsrc/www/py-django14/options.mk:1.10 pkgsrc/www/py-django14/options.mk:1.11
--- pkgsrc/www/py-django14/options.mk:1.10      Mon Sep  2 13:20:04 2019
+++ pkgsrc/www/py-django14/options.mk   Mon Nov  4 22:10:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2019/09/02 13:20:04 adam Exp $
+# $NetBSD: options.mk,v 1.11 2019/11/04 22:10:12 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.django
 PKG_SUPPORTED_OPTIONS= mysql oracle pgsql sqlite
@@ -10,7 +10,7 @@ PLIST_VARS+=  ${PKG_SUPPORTED_OPTIONS}
 
 .if !empty(PKG_OPTIONS:Mmysql)
 DEPENDS+=      ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
-PYTHON_VERSIONS_ACCEPTED=       27 # py-mysqldb
+PYTHON_VERSIONS_ACCEPTED= 27 # py-mysqldb
 PLIST.mysql=   yes
 .endif
 
@@ -26,6 +26,6 @@ PLIST.pgsql=  yes
 
 .if !empty(PKG_OPTIONS:Msqlite)
 DEPENDS+=      ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
-PYTHON_VERSIONS_ACCEPTED=       27 # py-sqlite2
+PYTHON_VERSIONS_ACCEPTED= 27 # py-sqlite2
 PLIST.sqlite=  yes
 .endif

Index: pkgsrc/www/py-flask-wtf/options.mk
diff -u pkgsrc/www/py-flask-wtf/options.mk:1.1 pkgsrc/www/py-flask-wtf/options.mk:1.2
--- pkgsrc/www/py-flask-wtf/options.mk:1.1      Fri Jan 10 02:21:53 2014
+++ pkgsrc/www/py-flask-wtf/options.mk  Mon Nov  4 22:10:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/01/10 02:21:53 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 22:10:12 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-flask-wtf
 PKG_SUPPORTED_OPTIONS= tests
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS+= # blank
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mtests)
-DEPENDS+=      ${PYPKGPREFIX}-flask-babel-[0-9]*:../../www/py-flask-babel
-DEPENDS+=      ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+DEPENDS+=              ${PYPKGPREFIX}-flask-babel-[0-9]*:../../www/py-flask-babel
+DEPENDS+=              ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 PYSETUPBUILDTARGET=    test
 .endif

Index: pkgsrc/www/py-graphite-web/Makefile
diff -u pkgsrc/www/py-graphite-web/Makefile:1.7 pkgsrc/www/py-graphite-web/Makefile:1.8
--- pkgsrc/www/py-graphite-web/Makefile:1.7     Mon Sep  2 13:20:02 2019
+++ pkgsrc/www/py-graphite-web/Makefile Mon Nov  4 22:10:12 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2019/09/02 13:20:02 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 22:10:12 rillig Exp $
 
 DISTNAME=      graphite-web-0.9.15
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    www
-GITHUB_PROJECT= graphite-web
+GITHUB_PROJECT=        graphite-web
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=graphite-project/}
 
 MAINTAINER=    riz%NetBSD.org@localhost
@@ -28,8 +28,8 @@ BUILD_DEFS+=          VARBASE GRAPHITE_DIR
 
 REPLACE_SH+=           bin/build-index.sh
 
-OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR}/webapp ${WWW_USER} ${GRAPHITE_GROUP} 0775
+OWN_DIRS_PERMS+=       ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+=       ${GRAPHITE_LOG_DIR}/webapp ${WWW_USER} ${GRAPHITE_GROUP} 0775
 
 SUBST_CLASSES+=                dirs
 SUBST_STAGE.dirs=      pre-configure
@@ -59,9 +59,9 @@ CONF_FILES+=          ${GRAPHITE_EGDIR}/${file}.
                        ${PKG_SYSCONFDIR}/${file}
 .endfor
 
-PYSETUPINSTALLARGS=    --prefix=${PREFIX}                      \
+PYSETUPINSTALLARGS=            --prefix=${PREFIX}                      \
                        --install-lib=${PREFIX}/${PYSITELIB}
-PYTHON_VERSIONS_ACCEPTED=       27 # py-django-tagging
+PYTHON_VERSIONS_ACCEPTED=      27 # py-django-tagging
 
 INSTALLATION_DIRS+=    share/examples/graphite
 

Index: pkgsrc/www/py-python-digest/Makefile
diff -u pkgsrc/www/py-python-digest/Makefile:1.11 pkgsrc/www/py-python-digest/Makefile:1.12
--- pkgsrc/www/py-python-digest/Makefile:1.11   Mon Sep  2 13:20:02 2019
+++ pkgsrc/www/py-python-digest/Makefile        Mon Nov  4 22:10:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/09/02 13:20:02 adam Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/04 22:10:13 rillig Exp $
 
 DISTNAME=      python-digest-1.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=      modified-bsd
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-recaptcha/Makefile
diff -u pkgsrc/www/py-recaptcha/Makefile:1.11 pkgsrc/www/py-recaptcha/Makefile:1.12
--- pkgsrc/www/py-recaptcha/Makefile:1.11       Mon Sep  2 13:20:03 2019
+++ pkgsrc/www/py-recaptcha/Makefile    Mon Nov  4 22:10:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/09/02 13:20:03 adam Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/04 22:10:13 rillig Exp $
 
 DISTNAME=      recaptcha-client-1.0.6
 PKGNAME=       ${PYPKGPREFIX}-recaptcha-1.0.6
@@ -8,9 +8,9 @@ MASTER_SITES=   ${MASTER_SITE_PYPI:=r/reca
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://cheeseshop.python.org/pypi/recaptcha-client
 COMMENT=       Plugin for reCAPTCHA and reCAPTCHA Mailhide
-LICENSE=    mit
+LICENSE=       mit
 
-PYTHON_VERSIONS_ACCEPTED=  27 # as of 1.0.6
+PYTHON_VERSIONS_ACCEPTED=      27 # as of 1.0.6
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-scgi/Makefile
diff -u pkgsrc/www/py-scgi/Makefile:1.17 pkgsrc/www/py-scgi/Makefile:1.18
--- pkgsrc/www/py-scgi/Makefile:1.17    Mon Sep  2 13:20:01 2019
+++ pkgsrc/www/py-scgi/Makefile Mon Nov  4 22:10:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/09/02 13:20:01 adam Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:13 rillig Exp $
 
 DISTNAME=      scgi-1.15
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=      cnri-license
 
 DEPENDS+=      ${PYPKGPREFIX}-quixote-[0-9]*:../../devel/py-quixote
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-quixote
+PYTHON_VERSIONS_ACCEPTED=      27 # py-quixote
 
 CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1
 

Index: pkgsrc/www/py-simpletal/Makefile
diff -u pkgsrc/www/py-simpletal/Makefile:1.12 pkgsrc/www/py-simpletal/Makefile:1.13
--- pkgsrc/www/py-simpletal/Makefile:1.12       Mon Sep  2 13:20:03 2019
+++ pkgsrc/www/py-simpletal/Makefile    Mon Nov  4 22:10:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/09/02 13:20:03 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 22:10:13 rillig Exp $
 
 DISTNAME=      SimpleTAL-4.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=      modified-bsd
 
 USE_LANGUAGES= #none
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 do-test:
        ${PYTHONBIN} ${WRKSRC}/runtests.py

Index: pkgsrc/www/py-sparqlwrapper/Makefile
diff -u pkgsrc/www/py-sparqlwrapper/Makefile:1.5 pkgsrc/www/py-sparqlwrapper/Makefile:1.6
--- pkgsrc/www/py-sparqlwrapper/Makefile:1.5    Thu Sep 26 07:48:32 2019
+++ pkgsrc/www/py-sparqlwrapper/Makefile        Mon Nov  4 22:10:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/09/26 07:48:32 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/04 22:10:13 rillig Exp $
 
 DISTNAME=      SPARQLWrapper-1.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,7 +12,7 @@ LICENSE=      w3c
 
 DEPENDS+=      ${PYPKGPREFIX}-rdflib>=4.0:../../textproc/py-rdflib
 
-PYTHON_VERSIONS_INCOMPATIBLE=   27     # py-networkx via py-rdflib
+PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-networkx via py-rdflib
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/www/py-trytond-webdav/Makefile
diff -u pkgsrc/www/py-trytond-webdav/Makefile:1.8 pkgsrc/www/py-trytond-webdav/Makefile:1.9
--- pkgsrc/www/py-trytond-webdav/Makefile:1.8   Mon Sep  2 13:20:03 2019
+++ pkgsrc/www/py-trytond-webdav/Makefile       Mon Nov  4 22:10:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/09/02 13:20:03 adam Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/04 22:10:13 rillig Exp $
 TRYTON_MODULE_NAME=    trytond_webdav
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=    python www
@@ -11,7 +11,7 @@ LICENSE=      gnu-gpl-v3
 DEPENDS+=      ${PYPKGPREFIX}-pywebdav-[0-9]*:../../www/py-pywebdav
 DEPENDS+=      ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 
-PYTHON_VERSIONS_ACCEPTED=    27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 REPLACE_PYTHON+=       tests/test_webdav.py
 

Index: pkgsrc/www/py-twill/Makefile
diff -u pkgsrc/www/py-twill/Makefile:1.15 pkgsrc/www/py-twill/Makefile:1.16
--- pkgsrc/www/py-twill/Makefile:1.15   Mon Sep  2 13:20:04 2019
+++ pkgsrc/www/py-twill/Makefile        Mon Nov  4 22:10:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/09/02 13:20:04 adam Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 22:10:13 rillig Exp $
 
 DISTNAME=      twill-1.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=     ${PYPKGPREFIX}-cssselect-[0-9]
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27 # setup fails for 1.8.0
+PYTHON_VERSIONS_ACCEPTED=      27 # setup fails for 1.8.0
 
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/twill-fork \

Index: pkgsrc/www/py-webassets/Makefile
diff -u pkgsrc/www/py-webassets/Makefile:1.9 pkgsrc/www/py-webassets/Makefile:1.10
--- pkgsrc/www/py-webassets/Makefile:1.9        Tue Jan 17 15:13:20 2017
+++ pkgsrc/www/py-webassets/Makefile    Mon Nov  4 22:10:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/01/17 15:13:20 kleink Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/04 22:10:13 rillig Exp $
 
 DISTNAME=      webassets-0.12.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=      modified-bsd
 
 USE_LANGUAGES= # empty
 
-REPLACE_PYTHON+=src/webassets/filter/rjsmin/rjsmin.py
+REPLACE_PYTHON+=       src/webassets/filter/rjsmin/rjsmin.py
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"

Index: pkgsrc/www/py-webpy/Makefile
diff -u pkgsrc/www/py-webpy/Makefile:1.21 pkgsrc/www/py-webpy/Makefile:1.22
--- pkgsrc/www/py-webpy/Makefile:1.21   Mon Sep  2 13:20:01 2019
+++ pkgsrc/www/py-webpy/Makefile        Mon Nov  4 22:10:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/09/02 13:20:01 adam Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 22:10:14 rillig Exp $
 
 DISTNAME=      web.py-0.37
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=      public-domain
 
 USE_LANGUAGES= #none
 
-REPLACE_PYTHON+=       web/__init__.py web/utils.py
+REPLACE_PYTHON+=               web/__init__.py web/utils.py
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.37
 
 .include "../../lang/python/application.mk"

Index: pkgsrc/www/py-wtforms-components/options.mk
diff -u pkgsrc/www/py-wtforms-components/options.mk:1.2 pkgsrc/www/py-wtforms-components/options.mk:1.3
--- pkgsrc/www/py-wtforms-components/options.mk:1.2     Mon Feb 20 17:00:37 2017
+++ pkgsrc/www/py-wtforms-components/options.mk Mon Nov  4 22:10:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2017/02/20 17:00:37 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/04 22:10:14 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-wtforms-components
 PKG_SUPPORTED_OPTIONS= arrow babel color ipaddress password phone tests
@@ -43,7 +43,7 @@ DEPENDS+=     ${PYPKGPREFIX}-pymysql-[0-9]*:
 DEPENDS+=      ${PYPKGPREFIX}-arrow>=0.3.4:../../time/py-arrow
 DEPENDS+=      ${PYPKGPREFIX}-babel>=1.3:../../devel/py-babel
 DEPENDS+=      ${PYPKGPREFIX}-colour>=0.0.4:../../textproc/py-colour
-DEPENDS+=       ${PYPKGPREFIX}-intervals>=0.2.4:../../math/py-intervals
+DEPENDS+=      ${PYPKGPREFIX}-intervals>=0.2.4:../../math/py-intervals
 DEPENDS+=      ${PYPKGPREFIX}-ipaddr-[0-9]*:../../devel/py-ipaddr
 DEPENDS+=      ${PYPKGPREFIX}-passlib>=1.6<2.0:../../security/py-passlib
 DEPENDS+=      ${PYPKGPREFIX}-phonenumbers>=5.9.2:../../textproc/py-phonenumbers

Index: pkgsrc/www/qDecoder/Makefile
diff -u pkgsrc/www/qDecoder/Makefile:1.12 pkgsrc/www/qDecoder/Makefile:1.13
--- pkgsrc/www/qDecoder/Makefile:1.12   Thu Dec 27 20:12:26 2012
+++ pkgsrc/www/qDecoder/Makefile        Mon Nov  4 22:10:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/12/27 20:12:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 22:10:14 rillig Exp $
 #
 
 DISTNAME=      qDecoder-9.0.1
@@ -11,8 +11,8 @@ COMMENT=      Web Application Interface for C
 
 MAKE_JOBS_SAFE=        no
 
-GNU_CONFIGURE= YES
-USE_LIBTOOL=   YES
+GNU_CONFIGURE=         YES
+USE_LIBTOOL=           YES
 INSTALLATION_DIRS=     include lib share/doc/qDecoder share/doc/qDecoder/html \
                        share/examples/qDecoder share/examples/qDecoder/qDecoder-upload
 

Index: pkgsrc/www/ruby-borges/Makefile
diff -u pkgsrc/www/ruby-borges/Makefile:1.22 pkgsrc/www/ruby-borges/Makefile:1.23
--- pkgsrc/www/ruby-borges/Makefile:1.22        Mon Sep  4 18:01:04 2017
+++ pkgsrc/www/ruby-borges/Makefile     Mon Nov  4 22:10:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/09/04 18:01:04 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/04 22:10:14 rillig Exp $
 
 DISTNAME=      borges-1.1.0
 PKGREVISION=   2
@@ -22,11 +22,11 @@ BORGES_SHARE_DIR=   data/doc data/examples
 
 .if !empty(RUBY_SUFFIX)
 pre-configure:
-.for d in ${BORGES_SHARE_DIR}
+.  for d in ${BORGES_SHARE_DIR}
        cd ${WRKSRC}; if [ -d ${d}/ruby ]; then \
                 ${MV} -f ${d}/ruby ${d}/${RUBY_NAME}; \
        fi
-.endfor
+.  endfor
 .endif
 
 .include "../../lang/ruby/modules.mk"

Index: pkgsrc/www/ruby-jekyll-watch/Makefile
diff -u pkgsrc/www/ruby-jekyll-watch/Makefile:1.9 pkgsrc/www/ruby-jekyll-watch/Makefile:1.10
--- pkgsrc/www/ruby-jekyll-watch/Makefile:1.9   Tue Mar 13 17:14:44 2018
+++ pkgsrc/www/ruby-jekyll-watch/Makefile       Mon Nov  4 22:10:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/03/13 17:14:44 taca Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/04 22:10:14 rillig Exp $
 
 DISTNAME=      jekyll-watch-2.0.0
 CATEGORIES=    www
@@ -10,7 +10,7 @@ LICENSE=      mit
 
 DEPENDS+=      ${RUBY_PKGPREFIX}-listen>=3.0<4:../../sysutils/ruby-listen
 
-OVERRIDE_GEMSPEC+=      listen>=3.0
+OVERRIDE_GEMSPEC+=     listen>=3.0
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/ruby-pygments.rb/Makefile
diff -u pkgsrc/www/ruby-pygments.rb/Makefile:1.18 pkgsrc/www/ruby-pygments.rb/Makefile:1.19
--- pkgsrc/www/ruby-pygments.rb/Makefile:1.18   Mon Sep  2 13:20:03 2019
+++ pkgsrc/www/ruby-pygments.rb/Makefile        Mon Nov  4 22:10:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/09/02 13:20:03 adam Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/04 22:10:14 rillig Exp $
 
 DISTNAME=      pygments.rb-1.2.1
 PKGREVISION=   1
@@ -19,7 +19,7 @@ SUBST_FILES.path=     lib/pygments/popen.rb
 SUBST_SED.path+=       -e 's|@PYTHON@|python${PYVERSSUFFIX}|'
 SUBST_MESSAGE.path=    Fixing Python's path.
 
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 0.6.3
+PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.6.3
 
 .include "../../lang/ruby/gem.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/www/ruby-rest-client/Makefile
diff -u pkgsrc/www/ruby-rest-client/Makefile:1.7 pkgsrc/www/ruby-rest-client/Makefile:1.8
--- pkgsrc/www/ruby-rest-client/Makefile:1.7    Mon Jun  5 15:35:29 2017
+++ pkgsrc/www/ruby-rest-client/Makefile        Mon Nov  4 22:10:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/06/05 15:35:29 taca Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 22:10:14 rillig Exp $
 
 DISTNAME=      rest-client-2.0.2
 CATEGORIES=    www
@@ -6,7 +6,7 @@ CATEGORIES=     www
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/rest-client/rest-client
 COMMENT=       Simple HTTP and REST client for Ruby inspired by Sinatra
-LICENSE=        mit
+LICENSE=       mit
 
 DEPENDS+=      ${RUBY_PKGPREFIX}-readline>=${RUBY_VERSION}:../../devel/ruby-readline
 DEPENDS+=      ${RUBY_PKGPREFIX}-mime-types>=3.0<4.0:../../mail/ruby-mime-types

Index: pkgsrc/www/ruby-webunit/Makefile
diff -u pkgsrc/www/ruby-webunit/Makefile:1.17 pkgsrc/www/ruby-webunit/Makefile:1.18
--- pkgsrc/www/ruby-webunit/Makefile:1.17       Mon Sep  4 18:01:04 2017
+++ pkgsrc/www/ruby-webunit/Makefile    Mon Nov  4 22:10:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/09/04 18:01:04 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 22:10:14 rillig Exp $
 
 DISTNAME=      webunit-${VERSION}
 PKGREVISION=   3
@@ -10,8 +10,8 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 COMMENT=       HTTP unit testing framework for Ruby
 LICENSE=       gnu-gpl-v2 OR ruby-license
 
-DEPENDS+= ${RUBY_PKGPREFIX}-html-parser>=19990912p1:../../textproc/ruby-html-parser
-DEPENDS+= ${RUBY_PKGPREFIX}-htmlsplit>=1.0.2:../../www/ruby-htmlsplit
+DEPENDS+=      ${RUBY_PKGPREFIX}-html-parser>=19990912p1:../../textproc/ruby-html-parser
+DEPENDS+=      ${RUBY_PKGPREFIX}-htmlsplit>=1.0.2:../../www/ruby-htmlsplit
 
 USE_TOOLS=     pax
 USE_RUBY_SETUP=        yes

Index: pkgsrc/www/screws/Makefile
diff -u pkgsrc/www/screws/Makefile:1.45 pkgsrc/www/screws/Makefile:1.46
--- pkgsrc/www/screws/Makefile:1.45     Sun Aug 11 13:25:08 2019
+++ pkgsrc/www/screws/Makefile  Mon Nov  4 22:10:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/08/11 13:25:08 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/04 22:10:14 rillig Exp $
 #
 
 DISTNAME=      screws-0.56
@@ -19,8 +19,8 @@ PKG_USERS_VARS+=      SCREWS_USER
 PKG_USERS=     ${SCREWS_USER}:${SCREWS_GROUP}
 PKG_GROUPS=    ${SCREWS_GROUP}
 
-MAKE_ENV+=     ETCPREFIX=${PKG_SYSCONFDIR:Q}
-MAKE_ENV+=     PERL=${PERL5:Q}
+MAKE_ENV+=             ETCPREFIX=${PKG_SYSCONFDIR:Q}
+MAKE_ENV+=             PERL=${PERL5:Q}
 INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX}
 
 EGDIR=         ${PREFIX}/share/examples/screws

Index: pkgsrc/www/seamonkey/Makefile
diff -u pkgsrc/www/seamonkey/Makefile:1.197 pkgsrc/www/seamonkey/Makefile:1.198
--- pkgsrc/www/seamonkey/Makefile:1.197 Wed Sep 18 14:17:19 2019
+++ pkgsrc/www/seamonkey/Makefile       Mon Nov  4 22:10:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.197 2019/09/18 14:17:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.198 2019/11/04 22:10:15 rillig Exp $
 
 DISTNAME=      seamonkey-${SM_VER}.source
 PKGNAME=       seamonkey-${SM_VER:S/b/beta/}
@@ -45,13 +45,13 @@ LDFLAGS+=           ${COMPILER_RPATH_FLAG}${PREFI
 #BUILD_DEPENDS+=               yasm>=1.1.0:../../devel/yasm
 #.endif
 
-CHECK_PORTABILITY_SKIP+=mozilla/js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=mozilla/security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+=       mozilla/js/src/tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+=       mozilla/security/nss/tests/libpkix/libpkix.sh
 
-CHECK_INTERPRETER_SKIP+=lib/seamonkey-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/seamonkey-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/seamonkey-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/seamonkey-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=       lib/seamonkey-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=       lib/seamonkey-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=       lib/seamonkey-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=       lib/seamonkey-sdk/sdk/bin/xpt.py
 
 SUBST_CLASSES+=                sys-dic
 SUBST_STAGE.sys-dic=   pre-configure

Index: pkgsrc/www/seamonkey/options.mk
diff -u pkgsrc/www/seamonkey/options.mk:1.41 pkgsrc/www/seamonkey/options.mk:1.42
--- pkgsrc/www/seamonkey/options.mk:1.41        Thu Jun 13 10:53:11 2019
+++ pkgsrc/www/seamonkey/options.mk     Mon Nov  4 22:10:15 2019
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.41 2019/06/13 10:53:11 nia Exp $
+# $NetBSD: options.mk,v 1.42 2019/11/04 22:10:15 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.seamonkey
 
 PKG_OPTIONS_REQUIRED_GROUPS=   gtk
 PKG_OPTIONS_GROUP.gtk=         gtk2 gtk3
-PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc
-PKG_SUPPORTED_OPTIONS+=        webrtc pulseaudio
+PKG_SUPPORTED_OPTIONS=         alsa dbus debug mozilla-jemalloc
+PKG_SUPPORTED_OPTIONS+=                webrtc pulseaudio
 
 PLIST_VARS+=   debug gnome jemalloc
 

Index: pkgsrc/www/shibboleth-sp/Makefile
diff -u pkgsrc/www/shibboleth-sp/Makefile:1.34 pkgsrc/www/shibboleth-sp/Makefile:1.35
--- pkgsrc/www/shibboleth-sp/Makefile:1.34      Thu Aug 22 12:23:55 2019
+++ pkgsrc/www/shibboleth-sp/Makefile   Mon Nov  4 22:10:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/08/22 12:23:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/04 22:10:15 rillig Exp $
 #
 
 DISTNAME=      shibboleth-sp-2.5.5
@@ -13,7 +13,7 @@ LICENSE=      apache-2.0
 
 BUILD_DEFS+=   VARBASE
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-xmltooling=${PREFIX}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 

Index: pkgsrc/www/siege/options.mk
diff -u pkgsrc/www/siege/options.mk:1.1 pkgsrc/www/siege/options.mk:1.2
--- pkgsrc/www/siege/options.mk:1.1     Fri Nov 27 16:20:31 2015
+++ pkgsrc/www/siege/options.mk Mon Nov  4 22:10:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/11/27 16:20:31 nils Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 22:10:15 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.siege
 PKG_SUPPORTED_OPTIONS= ssl
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=  ssl
 
 .if !empty(PKG_OPTIONS:Mssl)
 CONFIGURE_ARGS+=       --with-ssl=${SSLBASE:Q}
-. include "../../security/openssl/buildlink3.mk"
+.  include "../../security/openssl/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-ssl
 .endif

Index: pkgsrc/www/squid3/Makefile
diff -u pkgsrc/www/squid3/Makefile:1.84 pkgsrc/www/squid3/Makefile:1.85
--- pkgsrc/www/squid3/Makefile:1.84     Sun Aug 11 13:25:08 2019
+++ pkgsrc/www/squid3/Makefile  Mon Nov  4 22:10:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2019/08/11 13:25:08 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2019/11/04 22:10:15 rillig Exp $
 
 DISTNAME=      squid-3.5.28
 PKGREVISION=   2
@@ -41,15 +41,15 @@ MAKE_ENV+=          INSTALL_SCRIPT=${INSTALL_SCR
 MAKE_ENV+=             PKG_PREFIX=${PREFIX} VARBASE=${VARBASE}
 REPLACE_PERL+=         helpers/ssl/cert_valid.pl tools/helper-mux.pl
 
-EGFILES=       src/mime.conf.default src/squid.conf.default \
-               errors/errorpage.css tools/cachemgr.conf
-EGDIR=         share/examples/squid
+EGFILES=               src/mime.conf.default src/squid.conf.default \
+                       errors/errorpage.css tools/cachemgr.conf
+EGDIR=                 share/examples/squid
 .for f in cachemgr.conf errorpage.css mime.conf squid.conf
-CONF_FILES+=   ${PREFIX}/${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+CONF_FILES+=           ${PREFIX}/${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
-OWN_DIRS=      ${SQUID_DATADIR}
-OWN_DIRS_PERMS+=${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
-               ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
+OWN_DIRS=              ${SQUID_DATADIR}
+OWN_DIRS_PERMS+=       ${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
+                       ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
 
 .include "Makefile.common"
 .include "options.mk"

Index: pkgsrc/www/squid3/options.mk
diff -u pkgsrc/www/squid3/options.mk:1.24 pkgsrc/www/squid3/options.mk:1.25
--- pkgsrc/www/squid3/options.mk:1.24   Tue Sep  5 08:09:08 2017
+++ pkgsrc/www/squid3/options.mk        Mon Nov  4 22:10:15 2019
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.24 2017/09/05 08:09:08 dholland Exp $
+# $NetBSD: options.mk,v 1.25 2019/11/04 22:10:15 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.squid
-PKG_SUPPORTED_OPTIONS= ecap inet6 snmp ssl squid-backend-aufs \
-               squid-backend-diskd squid-backend-rock squid-backend-ufs \
-               squid-carp squid-unlinkd squid-kerberos-helper \
-               squid-ldap-helper squid-pam-helper
+PKG_OPTIONS_VAR=               PKG_OPTIONS.squid
+PKG_SUPPORTED_OPTIONS=         ecap inet6 snmp ssl squid-backend-aufs \
+                               squid-backend-diskd squid-backend-rock squid-backend-ufs \
+                               squid-carp squid-unlinkd squid-kerberos-helper \
+                               squid-ldap-helper squid-pam-helper
 PKG_OPTIONS_LEGACY_OPTS+=      diskd:squid-backend-diskd \
        null:squid-backend-null ufs:squid-backend-ufs \
        linux-netfilter:squid-netfilter ipf-transparent:squid-ipf \
@@ -20,7 +20,7 @@ PLIST_VARS+=  eacl_file_userip eacl_LDAP_
 PLIST_VARS+=   ssl
 
 PKG_SUGGESTED_OPTIONS= inet6 snmp ssl squid-backend-diskd squid-carp \
-               squid-pam-helper squid-unlinkd
+                       squid-pam-helper squid-unlinkd
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/www/squidGuard/Makefile
diff -u pkgsrc/www/squidGuard/Makefile:1.37 pkgsrc/www/squidGuard/Makefile:1.38
--- pkgsrc/www/squidGuard/Makefile:1.37 Sun Aug 11 13:25:08 2019
+++ pkgsrc/www/squidGuard/Makefile      Mon Nov  4 22:10:15 2019
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.37 2019/08/11 13:25:08 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2019/11/04 22:10:15 rillig Exp $
 
-DISTNAME=      squidGuard-1.4
-PKGREVISION=   15
-CATEGORIES=    www
-MASTER_SITES=  http://www.squidguard.org/Downloads/
-MASTER_SITES+= http://www.squidguard.org/Downloads/Patches/1.4/
-DISTFILES=     ${DEFAULT_DISTFILES} \
-               squidGuard-1.4-patch-20091015.tar.gz \
-               squidGuard-1.4-patch-20091019.tar.gz
+DISTNAME=              squidGuard-1.4
+PKGREVISION=           15
+CATEGORIES=            www
+MASTER_SITES=          http://www.squidguard.org/Downloads/
+MASTER_SITES+=         http://www.squidguard.org/Downloads/Patches/1.4/
+DISTFILES=             ${DEFAULT_DISTFILES} \
+                       squidGuard-1.4-patch-20091015.tar.gz \
+                       squidGuard-1.4-patch-20091019.tar.gz
 # http://bugs.squid-cache.org/show_bug.cgi?id=3978
-PATCH_SITES=   -http://bugs.squid-cache.org/attachment.cgi?id=2988
-PATCHFILES=    squidGuard-1.4_upgrade.patch
+PATCH_SITES=           -http://bugs.squid-cache.org/attachment.cgi?id=2988
+PATCHFILES=            squidGuard-1.4_upgrade.patch
 PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/squidview/Makefile
diff -u pkgsrc/www/squidview/Makefile:1.6 pkgsrc/www/squidview/Makefile:1.7
--- pkgsrc/www/squidview/Makefile:1.6   Wed Jul  4 13:40:42 2018
+++ pkgsrc/www/squidview/Makefile       Mon Nov  4 22:10:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/07/04 13:40:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/04 22:10:15 rillig Exp $
 
 DISTNAME=      squidview-0.80
 PKGREVISION=   3
@@ -15,7 +15,7 @@ GNU_CONFIGURE=                yes
 
 .include "../../www/squid3/Makefile.common"
 
-SUBST_CLASSES+=        files
+SUBST_CLASSES+=                files
 SUBST_STAGE.files=     pre-configure
 SUBST_FILES.files=     squidview.h squidview.1
 SUBST_SED.files=       -e "s|/var/log/squid|${LOGDIR}|g"

Index: pkgsrc/www/thttpd/Makefile
diff -u pkgsrc/www/thttpd/Makefile:1.52 pkgsrc/www/thttpd/Makefile:1.53
--- pkgsrc/www/thttpd/Makefile:1.52     Thu May 23 19:23:21 2019
+++ pkgsrc/www/thttpd/Makefile  Mon Nov  4 22:10:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/05/23 19:23:21 rillig Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/04 22:10:15 rillig Exp $
 
 DISTNAME=      thttpd-2.29
 CATEGORIES=    www
@@ -19,11 +19,11 @@ SITES.${NETBSD_LOGO}=       http://www.NetBSD.
 GNU_CONFIGURE= yes
 
 # Note: this pkg auto-detects IPv6.
-BUILD_DEFS+=   IPV6_READY
+BUILD_DEFS+=           IPV6_READY
 # thttpd syslogs at level LOG_DAEMON by default
 # change this to your preferred syslog level
 THTTPD_LOG_FACILITY?=  LOG_DAEMON
-BUILD_DEFS+=   THTTPD_LOG_FACILITY
+BUILD_DEFS+=           THTTPD_LOG_FACILITY
 
 EGDIR=         ${PREFIX}/share/examples
 CONF_FILES=    ${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf

Index: pkgsrc/www/typo3_62/Makefile
diff -u pkgsrc/www/typo3_62/Makefile:1.23 pkgsrc/www/typo3_62/Makefile:1.24
--- pkgsrc/www/typo3_62/Makefile:1.23   Sun Sep  3 08:53:17 2017
+++ pkgsrc/www/typo3_62/Makefile        Mon Nov  4 22:10:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/09/03 08:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/04 22:10:15 rillig Exp $
 #
 
 DISTNAME=      ${TYPO3NAME}
@@ -31,11 +31,11 @@ REPLACE.php.old=    .*php[^ ]*
 REPLACE.php.new=       ${PREFIX}/bin/php
 REPLACE_FILES.php=     typo3/cli_dispatch.phpsh
 
-REPLACE_BASH= typo3/sysext/core/Build/Scripts/xlfcheck.sh \
+REPLACE_BASH=  typo3/sysext/core/Build/Scripts/xlfcheck.sh \
        typo3/sysext/core/Build/Scripts/splitFunctionalTests.sh \
        typo3/sysext/core/Build/Scripts/update-static-composer.sh
 
-OWN_DIRS_PERMS+= ${TYPO3DIR}/${SITEDIR} ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
+OWN_DIRS_PERMS+=       ${TYPO3DIR}/${SITEDIR} ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
 
 BUILD_DEFS+=   APACHE_GROUP
 
@@ -43,7 +43,7 @@ FILES_SUBST+= SITEDIR=${SITEDIR} TYPO3DI
 MESSAGE_SUBST+=        SITEDIR=${SITEDIR} TYPO3DIR=${TYPO3DIR} 
 PLIST_SUBST+=  SITEDIR=${SITEDIR} TYPO3DIR=${TYPO3DIR} TYPO3NAME=${TYPO3NAME}
 
-INSTALLATION_DIRS+= ${TYPO3DIR}/${TYPO3NAME}
+INSTALLATION_DIRS+=    ${TYPO3DIR}/${TYPO3NAME}
 
 PRINT_PLIST_AWK+=      /^${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/ \
                        { gsub(/${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/, \

Index: pkgsrc/www/w3c-httpd/Makefile
diff -u pkgsrc/www/w3c-httpd/Makefile:1.28 pkgsrc/www/w3c-httpd/Makefile:1.29
--- pkgsrc/www/w3c-httpd/Makefile:1.28  Wed Jul  4 13:40:42 2018
+++ pkgsrc/www/w3c-httpd/Makefile       Mon Nov  4 22:10:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/04 22:10:16 rillig Exp $
 
 DISTNAME=      w3c-httpd-3.0A
 PKGREVISION=   1
@@ -16,7 +16,7 @@ BUILD_TARGET= build-all
 # prevent conflict with directory All on non-case-sensitive file systems
 USE_TOOLS+=    csh
 
-OPSYSVARS+=    OSNAME
+OPSYSVARS+=            OSNAME
 OSNAME.Darwin=         darwin
 OSNAME.DragonFly=      freebsd
 OSNAME.FreeBSD=                freebsd
@@ -32,9 +32,9 @@ CFLAGS+=      ${CPPFLAGS}
 SUBST_CLASSES+=                strcasestr
 SUBST_STAGE.strcasestr=        pre-configure
 SUBST_FILES.strcasestr=        Daemon/Implementation/HTWild.c \
-       Library/Implementation/HTString.c \
-       Library/Implementation/HTString.h \
-       Library/Implementation/HTString.h
+                       Library/Implementation/HTString.c \
+                       Library/Implementation/HTString.h \
+                       Library/Implementation/HTString.h
 SUBST_SED.strcasestr=  -e 's,\([[:blank:]]\)\(strcasestr\),\1x\2,g'
 
 EGDIR=                 ${PREFIX}/share/examples/w3c-httpd

Index: pkgsrc/www/w3m/Makefile.common
diff -u pkgsrc/www/w3m/Makefile.common:1.67 pkgsrc/www/w3m/Makefile.common:1.68
--- pkgsrc/www/w3m/Makefile.common:1.67 Wed Jul  4 13:40:42 2018
+++ pkgsrc/www/w3m/Makefile.common      Mon Nov  4 22:10:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.67 2018/07/04 13:40:42 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.68 2019/11/04 22:10:16 rillig Exp $
 #
 # used by www/w3m/Makefile
 # used by www/w3m-img/Makefile
@@ -15,10 +15,10 @@ HOMEPAGE=   http://w3m.sourceforge.net/
 
 WRKSRC=                ${WRKDIR}/w3m-${W3M_VERS:S/+/-/}
 
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+=    gmake   # Needed for some combinations of options...
-USE_TOOLS+=    msgfmt
+GNU_CONFIGURE=         yes
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            gmake   # Needed for some combinations of options...
+USE_TOOLS+=            msgfmt
 USE_PKGLOCALEDIR=      yes
 
 W3M_VERS=      0.5.3+git20180125

Index: pkgsrc/www/webkit24-gtk/options.mk
diff -u pkgsrc/www/webkit24-gtk/options.mk:1.2 pkgsrc/www/webkit24-gtk/options.mk:1.3
--- pkgsrc/www/webkit24-gtk/options.mk:1.2      Thu Dec  1 14:27:21 2016
+++ pkgsrc/www/webkit24-gtk/options.mk  Mon Nov  4 22:10:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2016/12/01 14:27:21 martin Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/04 22:10:16 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.webkit-gtk
@@ -17,7 +17,7 @@ PLIST_VARS=   introspection
  && empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) \
  && empty(MACHINE_PLATFORM:MNetBSD-*-sparc) \
  && empty(MACHINE_PLATFORM:MSunOS-*)
-PKG_SUGGESTED_OPTIONS+= webkit-jit
+PKG_SUGGESTED_OPTIONS+=        webkit-jit
 .endif
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/www/wml/Makefile
diff -u pkgsrc/www/wml/Makefile:1.49 pkgsrc/www/wml/Makefile:1.50
--- pkgsrc/www/wml/Makefile:1.49        Sun Aug 11 13:25:10 2019
+++ pkgsrc/www/wml/Makefile     Mon Nov  4 22:10:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2019/08/11 13:25:10 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2019/11/04 22:10:16 rillig Exp $
 
 DISTNAME=      wml-2.0.11
 PKGREVISION=   8
@@ -17,13 +17,13 @@ BUILD_DEPENDS+=     lynx-[0-9]*:../../www/ly
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=    automake bash
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-perl=${PERL5:Q} \
-               --with-openworld \
-               --with-tidy=${LOCALBASE}/bin/tidy
-CONFIG_SHELL=  ${TOOLS_PATH.bash}
-TEST_TARGET=   test
+USE_TOOLS+=            automake bash
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-perl=${PERL5:Q} \
+                       --with-openworld \
+                       --with-tidy=${LOCALBASE}/bin/tidy
+CONFIG_SHELL=          ${TOOLS_PATH.bash}
+TEST_TARGET=           test
 
 PERL_ARCHNAME_cmd=     eval `${PERL5} -V:archname 2>/dev/null`; \
                        ${ECHO} $${archname}

Index: pkgsrc/www/wwwoffle/Makefile
diff -u pkgsrc/www/wwwoffle/Makefile:1.88 pkgsrc/www/wwwoffle/Makefile:1.89
--- pkgsrc/www/wwwoffle/Makefile:1.88   Sun Aug 11 13:25:10 2019
+++ pkgsrc/www/wwwoffle/Makefile        Mon Nov  4 22:10:16 2019
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.88 2019/08/11 13:25:10 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2019/11/04 22:10:16 rillig Exp $
 
 DISTNAME=      wwwoffle-2.9j
 PKGREVISION=   5
 CATEGORIES=    www
-MASTER_SITES=   http://www.gedanken.org.uk/software/wwwoffle/download/
+MASTER_SITES=  http://www.gedanken.org.uk/software/wwwoffle/download/
 EXTRACT_SUFX=  .tgz
 
-MAINTAINER=     ginger%email.su@localhost
+MAINTAINER=    ginger%email.su@localhost
 HOMEPAGE=      http://www.gedanken.org.uk/software/wwwoffle
 LICENSE=       gnu-gpl-v2
 COMMENT=       WWW proxy with support for offline browsing
@@ -15,8 +15,8 @@ USE_TOOLS+=   gmake gzip perl tar lex
 GNU_CONFIGURE= yes
 BUILD_DEFS+=   VARBASE
 
-CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle
+CONFIGURE_ARGS+=       --with-confdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --with-spooldir=${VARBASE}/wwwoffle
 
 PKG_SYSCONFSUBDIR=     wwwoffle
 CONF_FILES+=           ${PREFIX}/share/examples/wwwoffle/wwwoffle.conf ${PKG_SYSCONFDIR}/wwwoffle.conf

Index: pkgsrc/www/wwwoffle/options.mk
diff -u pkgsrc/www/wwwoffle/options.mk:1.3 pkgsrc/www/wwwoffle/options.mk:1.4
--- pkgsrc/www/wwwoffle/options.mk:1.3  Sun Aug 21 09:53:55 2016
+++ pkgsrc/www/wwwoffle/options.mk      Mon Nov  4 22:10:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/08/21 09:53:55 bsiegert Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/04 22:10:16 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wwwoffle
 PKG_SUPPORTED_OPTIONS= inet6 gnutls libgcrypt
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS=  inet6 gnutls libg
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --with-ipv6
+CONFIGURE_ARGS+=       --with-ipv6
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnutls)

Index: pkgsrc/www/z-push/Makefile
diff -u pkgsrc/www/z-push/Makefile:1.4 pkgsrc/www/z-push/Makefile:1.5
--- pkgsrc/www/z-push/Makefile:1.4      Mon Jan 28 14:33:52 2019
+++ pkgsrc/www/z-push/Makefile  Mon Nov  4 22:10:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/01/28 14:33:52 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/04 22:10:16 rillig Exp $
 #
 
 DISTNAME=      z-push-${ZPUSH_VERSION}
@@ -66,11 +66,11 @@ SUBST_FILES.conf=   ${WRKDIR}/z-push.conf
 SUBST_VARS.conf=       ZPUSHDIR
 SUBST_MESSAGE.conf=    Fixing Z-push directory path for apache configuration.
 
-SUBST_CLASSES+=                state-dir
-SUBST_STAGE.state-dir= pre-configure
-SUBST_FILES.state-dir= config.php
-SUBST_VARS.state-dir=  ZPUSHSTATEDIR
-SUBST_MESSAGE.state-dir=Fixing Z-push state directory path.
+SUBST_CLASSES+=                        state-dir
+SUBST_STAGE.state-dir=         pre-configure
+SUBST_FILES.state-dir=         config.php
+SUBST_VARS.state-dir=          ZPUSHSTATEDIR
+SUBST_MESSAGE.state-dir=       Fixing Z-push state directory path.
 
 post-extract:
        ${CP} ${FILESDIR}/z-push.conf ${WRKDIR}/z-push.conf
@@ -87,9 +87,9 @@ do-install:
 
        cd ${WRKSRC} && pax -rwpam . ${DESTDIR}${ZPUSHDIR}
 
-.      for f in INSTALL LICENSE
-               ${MV} ${DESTDIR}${ZPUSHDIR}/${f} ${DESTDIR}${DOCDIR}
-.      endfor
+.for f in INSTALL LICENSE
+       ${MV} ${DESTDIR}${ZPUSHDIR}/${f} ${DESTDIR}${DOCDIR}
+.endfor
 
        ${LN} -sf ${ZPUSHDIR}/z-push-top.php    \
                ${DESTDIR}${PREFIX}/bin/z-push-top



Home | Main Index | Thread Index | Old Index