summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/SOGo/Makefile26
-rw-r--r--www/SOGo4/Makefile36
-rw-r--r--www/SpeedyCGI/Makefile4
-rw-r--r--www/album_themes/Makefile4
-rw-r--r--www/ap-mono/Makefile10
-rw-r--r--www/ap2-auth-mellon/Makefile4
-rw-r--r--www/ap2-encoding/Makefile4
-rw-r--r--www/ap2-jk/Makefile10
-rw-r--r--www/ap2-mkdir/Makefile4
-rw-r--r--www/ap2-upload/Makefile10
-rw-r--r--www/ap22-auth-ofba/Makefile4
-rw-r--r--www/ap22-dnssd/Makefile4
-rw-r--r--www/apache24/options.mk4
-rw-r--r--www/aws-demos/Makefile4
-rw-r--r--www/aws/Makefile10
-rw-r--r--www/aws/options.mk20
-rw-r--r--www/bluefish/Makefile14
-rw-r--r--www/browser-bookmarks-menu/Makefile6
-rw-r--r--www/c-icap-modules/options.mk8
-rw-r--r--www/caddy/Makefile8
-rw-r--r--www/cgilib/Makefile6
-rw-r--r--www/clearsilver/Makefile10
-rw-r--r--www/clearsilver/Makefile.common6
-rw-r--r--www/contao35/Makefile20
-rw-r--r--www/cronolog/Makefile8
-rw-r--r--www/davical/Makefile36
-rw-r--r--www/dillo/Makefile12
-rw-r--r--www/drivel/hacks.mk6
-rw-r--r--www/drupal7/Makefile6
-rw-r--r--www/drupal8/Makefile6
-rw-r--r--www/e2guardian/Makefile6
-rw-r--r--www/elinks/options.mk28
-rw-r--r--www/eliom/Makefile6
-rw-r--r--www/emacs-w3m/Makefile20
-rw-r--r--www/epiphany/Makefile4
-rw-r--r--www/fengoffice/Makefile14
-rw-r--r--www/firefox-l10n/Makefile22
-rw-r--r--www/firefox/Makefile12
-rw-r--r--www/firefox/mozilla-common.mk24
-rw-r--r--www/firefox/options.mk8
-rw-r--r--www/firefox52-l10n/Makefile16
-rw-r--r--www/firefox52/Makefile12
-rw-r--r--www/firefox52/mozilla-common.mk14
-rw-r--r--www/firefox52/options.mk14
-rw-r--r--www/firefox60-l10n/Makefile18
-rw-r--r--www/firefox60/Makefile10
-rw-r--r--www/firefox60/mozilla-common.mk14
-rw-r--r--www/firefox60/options.mk12
-rw-r--r--www/firefox68-l10n/Makefile22
-rw-r--r--www/firefox68/Makefile12
-rw-r--r--www/firefox68/mozilla-common.mk24
-rw-r--r--www/firefox68/options.mk12
-rw-r--r--www/gallery/Makefile4
-rw-r--r--www/ganglia-webfrontend/options.mk12
-rw-r--r--www/go-cssmin/Makefile6
-rw-r--r--www/go-gohtml/Makefile4
-rw-r--r--www/goaccess/Makefile4
-rw-r--r--www/goaccess/options.mk8
-rw-r--r--www/gtkasp2php/Makefile4
-rw-r--r--www/horde/Makefile18
-rw-r--r--www/horde/options.mk4
-rw-r--r--www/htmldoc/Makefile.common4
-rw-r--r--www/hugo/Makefile4
-rw-r--r--www/ies4linux/Makefile16
-rw-r--r--www/ikiwiki/options.mk10
-rw-r--r--www/kahua/Makefile10
-rw-r--r--www/khtml/Makefile4
-rw-r--r--www/librest/Makefile4
-rw-r--r--www/librest07/Makefile10
-rw-r--r--www/lighttpd/Makefile16
-rw-r--r--www/lighttpd/options.mk8
-rw-r--r--www/llgal/Makefile4
-rw-r--r--www/lynx/Makefile14
-rw-r--r--www/lynx/options.mk4
-rw-r--r--www/midori/Makefile12
-rw-r--r--www/mimetex/Makefile10
-rw-r--r--www/mono-xsp/Makefile12
-rw-r--r--www/moodle/Makefile4
-rw-r--r--www/netscape/Makefile12
-rw-r--r--www/nginx/Makefile.common8
-rw-r--r--www/nginx/options.mk76
-rw-r--r--www/ocaml-cohttp/Makefile4
-rw-r--r--www/ocaml-curl/Makefile4
-rw-r--r--www/ocaml-uri/buildlink3.mk4
-rw-r--r--www/ocsigen-i18n/Makefile10
-rw-r--r--www/ocsigen-start/Makefile10
-rw-r--r--www/ocsigen/Makefile18
-rw-r--r--www/ocsigen/options.mk12
-rw-r--r--www/opera/Makefile20
-rw-r--r--www/p5-AnyEvent-HTTP/Makefile4
-rw-r--r--www/p5-AnyEvent-HTTPD/Makefile4
-rw-r--r--www/p5-App-Nopaste/Makefile4
-rw-r--r--www/p5-CGI-Compile/Makefile6
-rw-r--r--www/p5-CGI-Cookie-XS/Makefile4
-rw-r--r--www/p5-CGI-Emulate-PSGI/Makefile4
-rw-r--r--www/p5-CGI-PSGI/Makefile4
-rw-r--r--www/p5-CGI-Simple/Makefile6
-rw-r--r--www/p5-CSS-Tiny/Makefile4
-rw-r--r--www/p5-Catalyst-Action-REST/Makefile4
-rw-r--r--www/p5-Catalyst-Action-RenderView/Makefile6
-rw-r--r--www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile4
-rw-r--r--www/p5-Catalyst-Authentication-Credential-HTTP/Makefile4
-rw-r--r--www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile4
-rw-r--r--www/p5-Catalyst-Controller-BindLex/Makefile6
-rw-r--r--www/p5-Catalyst-Controller-FormBuilder/Makefile6
-rw-r--r--www/p5-Catalyst-Controller-HTML-FormFu/Makefile26
-rw-r--r--www/p5-Catalyst-Devel/Makefile4
-rw-r--r--www/p5-Catalyst-DispatchType-Regex/Makefile6
-rw-r--r--www/p5-Catalyst-Engine-JobQueue-POE/Makefile4
-rw-r--r--www/p5-Catalyst-Engine-PSGI/Makefile6
-rw-r--r--www/p5-Catalyst-Manual/Makefile4
-rw-r--r--www/p5-Catalyst-Model-File/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Authentication/Makefile18
-rw-r--r--www/p5-Catalyst-Plugin-ConfigLoader/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile4
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile6
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile18
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-File/Makefile4
-rw-r--r--www/p5-Catalyst-Runtime/Makefile8
-rw-r--r--www/p5-Catalyst-View-Jemplate/Makefile4
-rw-r--r--www/p5-Catalyst-View-TT/Makefile4
-rw-r--r--www/p5-CatalystX-CRUD-View-Excel/Makefile4
-rw-r--r--www/p5-CatalystX-CRUD-YUI/Makefile4
-rw-r--r--www/p5-Cookie-Baker/Makefile6
-rw-r--r--www/p5-Cookie-XS/Makefile6
-rw-r--r--www/p5-Dancer-Session-Cookie/Makefile4
-rw-r--r--www/p5-Dancer/Makefile4
-rw-r--r--www/p5-Dancer2/Makefile4
-rw-r--r--www/p5-File-Mork/Makefile4
-rw-r--r--www/p5-HTML-FormFu/Makefile4
-rw-r--r--www/p5-HTML-Lint/Makefile4
-rw-r--r--www/p5-HTML-Mason-PSGIHandler/Makefile4
-rw-r--r--www/p5-HTML-Prototype-Useful/Makefile4
-rw-r--r--www/p5-HTML-Prototype/Makefile4
-rw-r--r--www/p5-HTML-Selector-XPath/Makefile6
-rw-r--r--www/p5-HTML-Stream/Makefile4
-rw-r--r--www/p5-HTML-StripScripts-Parser/Makefile4
-rw-r--r--www/p5-HTML-TreeBuilder-LibXML/Makefile4
-rw-r--r--www/p5-HTML-TreeBuilder-XPath/Makefile4
-rw-r--r--www/p5-HTMLObject/Makefile10
-rw-r--r--www/p5-HTTP-Date/Makefile4
-rw-r--r--www/p5-HTTP-GHTTP/Makefile4
-rw-r--r--www/p5-HTTP-OAI/Makefile6
-rw-r--r--www/p5-HTTP-Parser/Makefile4
-rw-r--r--www/p5-HTTP-Server-EV/Makefile4
-rw-r--r--www/p5-HTTP-Server-Simple-PSGI/Makefile4
-rw-r--r--www/p5-HTTP-Tiny-Mech/Makefile4
-rw-r--r--www/p5-Handel/Makefile4
-rw-r--r--www/p5-JSON-RPC/Makefile4
-rw-r--r--www/p5-Kwiki-Users-Remote/Makefile6
-rw-r--r--www/p5-Mojolicious/Makefile4
-rw-r--r--www/p5-Net-HTTP/Makefile4
-rw-r--r--www/p5-POE-Component-Server-PSGI/Makefile4
-rw-r--r--www/p5-POE-Component-Server-SOAP/Makefile4
-rw-r--r--www/p5-POE-Filter-HTTP-Parser/Makefile4
-rw-r--r--www/p5-PSGI/Makefile4
-rw-r--r--www/p5-ParallelUserAgent/Makefile4
-rw-r--r--www/p5-Plack-App-Proxy/Makefile12
-rw-r--r--www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile4
-rw-r--r--www/p5-Plack-Handler-AnyEvent-SCGI/Makefile6
-rw-r--r--www/p5-Plack-Middleware-Auth-Digest/Makefile10
-rw-r--r--www/p5-Plack-Middleware-ConsoleLogger/Makefile6
-rw-r--r--www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile4
-rw-r--r--www/p5-Plack-Middleware-MethodOverride/Makefile6
-rw-r--r--www/p5-Plack-Middleware-RemoveRedundantBody/Makefile4
-rw-r--r--www/p5-Plack-Middleware-ReverseProxy/Makefile4
-rw-r--r--www/p5-Plack-Middleware-Session/Makefile4
-rw-r--r--www/p5-Plack-Test-Agent/Makefile4
-rw-r--r--www/p5-Plack-Test-ExternalServer/Makefile4
-rw-r--r--www/p5-Plack/Makefile4
-rw-r--r--www/p5-Pod-POM-Web/Makefile8
-rw-r--r--www/p5-Reaction/Makefile4
-rw-r--r--www/p5-Rose-HTML-Objects/Makefile4
-rw-r--r--www/p5-Router-Simple/Makefile4
-rw-r--r--www/p5-Session-Storage-Secure/Makefile4
-rw-r--r--www/p5-Starlet/Makefile4
-rw-r--r--www/p5-Starman/Makefile6
-rw-r--r--www/p5-Task-CatInABox/Makefile4
-rw-r--r--www/p5-Task-Catalyst-Tutorial/Makefile4
-rw-r--r--www/p5-Tatsumaki/Makefile4
-rw-r--r--www/p5-Template-Plugin-Subst/Makefile6
-rw-r--r--www/p5-Template-Stash-EscapeHTML/Makefile4
-rw-r--r--www/p5-Test-HTTP-Server-Simple/Makefile4
-rw-r--r--www/p5-Test-WWW-Mechanize-Catalyst/Makefile4
-rw-r--r--www/p5-Test-WWW-Mechanize-PSGI/Makefile4
-rw-r--r--www/p5-Twiggy/Makefile4
-rw-r--r--www/p5-URI-ws/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-Cached/Makefile10
-rw-r--r--www/p5-WWW-Mechanize-GZip/Makefile4
-rw-r--r--www/p5-WWW-Mechanize-Timed/Makefile4
-rw-r--r--www/p5-WWW-Pastebin-PastebinCom-Create/Makefile4
-rw-r--r--www/p5-WWW-Pastebin-RafbNet-Create/Makefile4
-rw-r--r--www/p5-WWW-RobotRules/Makefile4
-rw-r--r--www/p5-WWW-Shorten/Makefile4
-rw-r--r--www/p5-Web-Scraper/Makefile6
-rw-r--r--www/php-apcu_bc/Makefile4
-rw-r--r--www/php-basercms/Makefile4
-rw-r--r--www/php-glpi/Makefile6
-rw-r--r--www/php-phrasea2/Makefile16
-rw-r--r--www/php-tt-rss/options.mk6
-rw-r--r--www/phraseanet-indexer/Makefile4
-rw-r--r--www/py-HTMLgen/Makefile4
-rw-r--r--www/py-beautifulsoup/Makefile4
-rw-r--r--www/py-blosxom/Makefile10
-rw-r--r--www/py-cloudfiles/Makefile4
-rw-r--r--www/py-django14/options.mk6
-rw-r--r--www/py-flask-wtf/options.mk6
-rw-r--r--www/py-graphite-web/Makefile12
-rw-r--r--www/py-python-digest/Makefile4
-rw-r--r--www/py-recaptcha/Makefile6
-rw-r--r--www/py-scgi/Makefile4
-rw-r--r--www/py-simpletal/Makefile4
-rw-r--r--www/py-sparqlwrapper/Makefile4
-rw-r--r--www/py-trytond-webdav/Makefile4
-rw-r--r--www/py-twill/Makefile4
-rw-r--r--www/py-webassets/Makefile4
-rw-r--r--www/py-webpy/Makefile4
-rw-r--r--www/py-wtforms-components/options.mk4
-rw-r--r--www/qDecoder/Makefile6
-rw-r--r--www/ruby-borges/Makefile6
-rw-r--r--www/ruby-jekyll-watch/Makefile4
-rw-r--r--www/ruby-pygments.rb/Makefile4
-rw-r--r--www/ruby-rest-client/Makefile4
-rw-r--r--www/ruby-webunit/Makefile6
-rw-r--r--www/screws/Makefile6
-rw-r--r--www/seamonkey/Makefile14
-rw-r--r--www/seamonkey/options.mk6
-rw-r--r--www/shibboleth-sp/Makefile4
-rw-r--r--www/siege/options.mk4
-rw-r--r--www/squid3/Makefile16
-rw-r--r--www/squid3/options.mk14
-rw-r--r--www/squidGuard/Makefile22
-rw-r--r--www/squidview/Makefile4
-rw-r--r--www/thttpd/Makefile6
-rw-r--r--www/typo3_62/Makefile8
-rw-r--r--www/w3c-httpd/Makefile10
-rw-r--r--www/w3m/Makefile.common10
-rw-r--r--www/webkit24-gtk/options.mk4
-rw-r--r--www/wml/Makefile16
-rw-r--r--www/wwwoffle/Makefile10
-rw-r--r--www/wwwoffle/options.mk4
-rw-r--r--www/z-push/Makefile18
243 files changed, 953 insertions, 953 deletions
diff --git a/www/SOGo/Makefile b/www/SOGo/Makefile
index f888fe9ac99..d161bc1f761 100644
--- a/www/SOGo/Makefile
+++ b/www/SOGo/Makefile
@@ -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 CalDAV, CardDAV and GroupDAV
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
diff --git a/www/SOGo4/Makefile b/www/SOGo4/Makefile
index 2334821d5a2..c5dde33d083 100644
--- a/www/SOGo4/Makefile
+++ b/www/SOGo4/Makefile
@@ -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 CalDAV, CardDAV and GroupDAV
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
diff --git a/www/SpeedyCGI/Makefile b/www/SpeedyCGI/Makefile
index 306b45681da..7b4af35b288 100644
--- a/www/SpeedyCGI/Makefile
+++ b/www/SpeedyCGI/Makefile
@@ -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 running them persistently
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
diff --git a/www/album_themes/Makefile b/www/album_themes/Makefile
index 3fb898ed5c9..4b6c6bbd59d 100644
--- a/www/album_themes/Makefile
+++ b/www/album_themes/Makefile
@@ -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}
diff --git a/www/ap-mono/Makefile b/www/ap-mono/Makefile
index 467a2a3064c..a663f5cef41 100644
--- a/www/ap-mono/Makefile
+++ b/www/ap-mono/Makefile
@@ -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"
diff --git a/www/ap2-auth-mellon/Makefile b/www/ap2-auth-mellon/Makefile
index 46a64313b26..0aac84250b5 100644
--- a/www/ap2-auth-mellon/Makefile
+++ b/www/ap2-auth-mellon/Makefile
@@ -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"
diff --git a/www/ap2-encoding/Makefile b/www/ap2-encoding/Makefile
index 393ef393a8a..aa225132142 100644
--- a/www/ap2-encoding/Makefile
+++ b/www/ap2-encoding/Makefile
@@ -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}
diff --git a/www/ap2-jk/Makefile b/www/ap2-jk/Makefile
index 05bf2845eda..c48ed39106f 100644
--- a/www/ap2-jk/Makefile
+++ b/www/ap2-jk/Makefile
@@ -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 references in install script.
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
diff --git a/www/ap2-mkdir/Makefile b/www/ap2-mkdir/Makefile
index 95c8c0e5e68..49a254f16f9 100644
--- a/www/ap2-mkdir/Makefile
+++ b/www/ap2-mkdir/Makefile
@@ -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/-.*//}.la
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}
diff --git a/www/ap2-upload/Makefile b/www/ap2-upload/Makefile
index 531055e8763..a1933b61c59 100644
--- a/www/ap2-upload/Makefile
+++ b/www/ap2-upload/Makefile
@@ -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_upload/
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}
diff --git a/www/ap22-auth-ofba/Makefile b/www/ap22-auth-ofba/Makefile
index 307c4f30c84..296f8eaf06f 100644
--- a/www/ap22-auth-ofba/Makefile
+++ b/www/ap22-auth-ofba/Makefile
@@ -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
diff --git a/www/ap22-dnssd/Makefile b/www/ap22-dnssd/Makefile
index 58c114f6bb3..42cdaf7c2be 100644
--- a/www/ap22-dnssd/Makefile
+++ b/www/ap22-dnssd/Makefile
@@ -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
diff --git a/www/apache24/options.mk b/www/apache24/options.mk
index 1316d6e43a8..74854e0951d 100644
--- a/www/apache24/options.mk
+++ b/www/apache24/options.mk
@@ -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 apache-mpm-prefork \
.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"
diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile
index 07110928936..15a918ac967 100644
--- a/www/aws-demos/Makefile
+++ b/www/aws-demos/Makefile
@@ -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/bin:${PATH}
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
diff --git a/www/aws/Makefile b/www/aws/Makefile
index 79a851d1a82..d1b3e31e93f 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -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_PREFIX.zlib}/lib
# 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@,${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} \
diff --git a/www/aws/options.mk b/www/aws/options.mk
index f443fcf714a..b70d045fb3b 100644
--- a/www/aws/options.mk
+++ b/www/aws/options.mk
@@ -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
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index d105a6739f1..5bd1a7dfdd8 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -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-mime=${PREFIX:Q}/share/mime
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
diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile
index d8b56b6a1eb..b497b8c3752 100644
--- a/www/browser-bookmarks-menu/Makefile
+++ b/www/browser-bookmarks-menu/Makefile
@@ -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
diff --git a/www/c-icap-modules/options.mk b/www/c-icap-modules/options.mk
index 32aba499fff..ec2c5bff6ce 100644
--- a/www/c-icap-modules/options.mk
+++ b/www/c-icap-modules/options.mk
@@ -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
diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index 66513c07dd4..1df18969120 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -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/caddy/}
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
diff --git a/www/cgilib/Makefile b/www/cgilib/Makefile
index 5a05e59f69a..14af812d835 100644
--- a/www/cgilib/Makefile
+++ b/www/cgilib/Makefile
@@ -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 library
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
diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile
index b6d85034c17..59157c2d954 100644
--- a/www/clearsilver/Makefile
+++ b/www/clearsilver/Makefile
@@ -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"
diff --git a/www/clearsilver/Makefile.common b/www/clearsilver/Makefile.common
index 4e2a8b160c9..dab87420f01 100644
--- a/www/clearsilver/Makefile.common
+++ b/www/clearsilver/Makefile.common
@@ -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
diff --git a/www/contao35/Makefile b/www/contao35/Makefile
index 6faaf774b1c..01580452aa1 100644
--- a/www/contao35/Makefile
+++ b/www/contao35/Makefile
@@ -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 \
diff --git a/www/cronolog/Makefile b/www/cronolog/Makefile
index c356f1249a7..deeb8cc24de 100644
--- a/www/cronolog/Makefile
+++ b/www/cronolog/Makefile
@@ -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/cronolog/
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
diff --git a/www/davical/Makefile b/www/davical/Makefile
index fb5fcb53acc..52008b28582 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -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-alarms.php
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 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 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; \
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 62a2ce44d7f..c066859b1d5 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -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-hyphenation
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}
diff --git a/www/drivel/hacks.mk b/www/drivel/hacks.mk
index fe9b0ce5665..1275ecca40f 100644
--- a/www/drivel/hacks.mk
+++ b/www/drivel/hacks.mk
@@ -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
diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index 8777c320c87..35ed7038d09 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -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.conf \
${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[^ ]*
diff --git a/www/drupal8/Makefile b/www/drupal8/Makefile
index 868f990c284..52af74e72ec 100644
--- a/www/drupal8/Makefile
+++ b/www/drupal8/Makefile
@@ -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.conf \
${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[^ ]*
diff --git a/www/e2guardian/Makefile b/www/e2guardian/Makefile
index 165483825bb..f2aae55e007 100644
--- a/www/e2guardian/Makefile
+++ b/www/e2guardian/Makefile
@@ -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
diff --git a/www/elinks/options.mk b/www/elinks/options.mk
index ce77e0de127..2468ac1a209 100644
--- a/www/elinks/options.mk
+++ b/www/elinks/options.mk
@@ -1,24 +1,24 @@
-# $NetBSD: options.mk,v 1.16 2012/11/04 21:50:53 wiz 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
+# $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_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=${BUILDLINK_PREFIX.openssl}
.include "../../security/gnutls/buildlink3.mk"
-CONFIGURE_ARGS+= --without-openssl
+CONFIGURE_ARGS+= --without-openssl
.endif
# Requires fsplib, which is not currently in pkgsrc.
diff --git a/www/eliom/Makefile b/www/eliom/Makefile
index 8245cecef34..b2a4323aad9 100644
--- a/www/eliom/Makefile
+++ b/www/eliom/Makefile
@@ -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
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index ea938a310e9..6356da38bfa 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -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
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 182ada763fc..2352457a15b 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -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"
diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile
index 791f48c3e9c..2fdb31efe2b 100644
--- a/www/fengoffice/Makefile
+++ b/www/fengoffice/Makefile
@@ -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:
diff --git a/www/firefox-l10n/Makefile b/www/firefox-l10n/Makefile
index 095fd2b83bf..0819e6caa89 100644
--- a/www/firefox-l10n/Makefile
+++ b/www/firefox-l10n/Makefile
@@ -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}
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 8198f992c8f..16f38e7843a 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -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/libavutil/mem.c
.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
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index fb294c152f9..c35bf6bffe4 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -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
diff --git a/www/firefox/options.mk b/www/firefox/options.mk
index f8411a6d94a..3c8ef6a399d 100644
--- a/www/firefox/options.mk
+++ b/www/firefox/options.mk
@@ -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-modules
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
diff --git a/www/firefox52-l10n/Makefile b/www/firefox52-l10n/Makefile
index a5e2325ae18..a8fb64eaafe 100644
--- a/www/firefox52-l10n/Makefile
+++ b/www/firefox52-l10n/Makefile
@@ -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}
diff --git a/www/firefox52/Makefile b/www/firefox52/Makefile
index 78c5ccbacc3..d2a8ea730bc 100644
--- a/www/firefox52/Makefile
+++ b/www/firefox52/Makefile
@@ -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/libavutil/mem.c
.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
diff --git a/www/firefox52/mozilla-common.mk b/www/firefox52/mozilla-common.mk
index 2fdc4ffe9d4..472dbf5caca 100644
--- a/www/firefox52/mozilla-common.mk
+++ b/www/firefox52/mozilla-common.mk
@@ -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
diff --git a/www/firefox52/options.mk b/www/firefox52/options.mk
index 2f723a6737c..67f4701b197 100644
--- a/www/firefox52/options.mk
+++ b/www/firefox52/options.mk
@@ -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-modules
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
diff --git a/www/firefox60-l10n/Makefile b/www/firefox60-l10n/Makefile
index 83828ffda2a..2e22c224629 100644
--- a/www/firefox60-l10n/Makefile
+++ b/www/firefox60-l10n/Makefile
@@ -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}
diff --git a/www/firefox60/Makefile b/www/firefox60/Makefile
index e8b3bee9b7d..7b0dfd0fbf5 100644
--- a/www/firefox60/Makefile
+++ b/www/firefox60/Makefile
@@ -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/libavutil/mem.c
.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
diff --git a/www/firefox60/mozilla-common.mk b/www/firefox60/mozilla-common.mk
index c929cee215b..e08afc1d3ae 100644
--- a/www/firefox60/mozilla-common.mk
+++ b/www/firefox60/mozilla-common.mk
@@ -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"
diff --git a/www/firefox60/options.mk b/www/firefox60/options.mk
index 92f64c18dc0..4e1fcf0d058 100644
--- a/www/firefox60/options.mk
+++ b/www/firefox60/options.mk
@@ -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-modules
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
diff --git a/www/firefox68-l10n/Makefile b/www/firefox68-l10n/Makefile
index 7523808219c..f7b220547be 100644
--- a/www/firefox68-l10n/Makefile
+++ b/www/firefox68-l10n/Makefile
@@ -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}
diff --git a/www/firefox68/Makefile b/www/firefox68/Makefile
index 77847823e2e..ecda048d43a 100644
--- a/www/firefox68/Makefile
+++ b/www/firefox68/Makefile
@@ -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/libavutil/mem.c
.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
diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk
index 49f9c629a06..4fd5697e4e6 100644
--- a/www/firefox68/mozilla-common.mk
+++ b/www/firefox68/mozilla-common.mk
@@ -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
diff --git a/www/firefox68/options.mk b/www/firefox68/options.mk
index 44fc26388ce..e03d7aa1b45 100644
--- a/www/firefox68/options.mk
+++ b/www/firefox68/options.mk
@@ -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-modules
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
diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index 88526b67bf8..220bd6af8b4 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -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 ${G1DIR}/.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
diff --git a/www/ganglia-webfrontend/options.mk b/www/ganglia-webfrontend/options.mk
index e485009b0f8..cff32a3f223 100644
--- a/www/ganglia-webfrontend/options.mk
+++ b/www/ganglia-webfrontend/options.mk
@@ -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
diff --git a/www/go-cssmin/Makefile b/www/go-cssmin/Makefile
index c089f482268..17efdbf62c4 100644
--- a/www/go-cssmin/Makefile
+++ b/www/go-cssmin/Makefile
@@ -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
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"
diff --git a/www/go-gohtml/Makefile b/www/go-gohtml/Makefile
index 050a757eca3..749f429096c 100644
--- a/www/go-gohtml/Makefile
+++ b/www/go-gohtml/Makefile
@@ -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
HOMEPAGE= https://github.com/yosssi/gohtml
diff --git a/www/goaccess/Makefile b/www/goaccess/Makefile
index 91fa7212adc..1c69a855b28 100644
--- a/www/goaccess/Makefile
+++ b/www/goaccess/Makefile
@@ -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
diff --git a/www/goaccess/options.mk b/www/goaccess/options.mk
index bbe0cb952c7..1202fe73d86 100644
--- a/www/goaccess/options.mk
+++ b/www/goaccess/options.mk
@@ -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
diff --git a/www/gtkasp2php/Makefile b/www/gtkasp2php/Makefile
index a543ada82dc..1b6cec90344 100644
--- a/www/gtkasp2php/Makefile
+++ b/www/gtkasp2php/Makefile
@@ -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 convert asp pages to php pages
MAKE_JOBS_SAFE= no
-BUILD_TARGET= all gui
+BUILD_TARGET= all gui
INSTALLATION_DIRS+= bin
.include "../../x11/gtk/buildlink3.mk"
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 4a0bca02b8a..5f2659cc970 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -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}; \
diff --git a/www/horde/options.mk b/www/horde/options.mk
index 8bb06f91ec8..27f17754a63 100644
--- a/www/horde/options.mk
+++ b/www/horde/options.mk
@@ -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:../../databases/php-pgsql
### 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
diff --git a/www/htmldoc/Makefile.common b/www/htmldoc/Makefile.common
index f788f8dd96d..0ce8d37b64e 100644
--- a/www/htmldoc/Makefile.common
+++ b/www/htmldoc/Makefile.common
@@ -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}
diff --git a/www/hugo/Makefile b/www/hugo/Makefile
index 0950aec9436..9932cc32425 100644
--- a/www/hugo/Makefile
+++ b/www/hugo/Makefile
@@ -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
HOMEPAGE= https://gohugo.io/
diff --git a/www/ies4linux/Makefile b/www/ies4linux/Makefile
index c0227d7dab2..4182920d4dc 100644
--- a/www/ies4linux/Makefile
+++ b/www/ies4linux/Makefile
@@ -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
#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..|${PREFIX}/${SHAREDIR}|g"
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
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index a67ceaf1d95..56e927008a9 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -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]*:../../databases/p5-DB_File
.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::Common\)|\1::Iff::PKG_OPTIONS|'
.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
diff --git a/www/kahua/Makefile b/www/kahua/Makefile
index 07c4cc27eba..492c050ca1f 100644
--- a/www/kahua/Makefile
+++ b/www/kahua/Makefile
@@ -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
diff --git a/www/khtml/Makefile b/www/khtml/Makefile
index 349024d9140..d6faecee32d 100644
--- a/www/khtml/Makefile
+++ b/www/khtml/Makefile
@@ -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:=frameworks/${KF5VER:R}/portingAids/}
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
diff --git a/www/librest/Makefile b/www/librest/Makefile
index 8b430628b1d..ab77ff89de8 100644
--- a/www/librest/Makefile
+++ b/www/librest/Makefile
@@ -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"
diff --git a/www/librest07/Makefile b/www/librest07/Makefile
index f4629d4b156..bade76cb250 100644
--- a/www/librest07/Makefile
+++ b/www/librest07/Makefile
@@ -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/Projects/Librest
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
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 707f28a6c2a..c269eb62840 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -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}
diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk
index eb7b6c7952b..c12c110c478 100644
--- a/www/lighttpd/options.mk
+++ b/www/lighttpd/options.mk
@@ -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"
diff --git a/www/llgal/Makefile b/www/llgal/Makefile
index 176bcf7dede..13b707a43b6 100644
--- a/www/llgal/Makefile
+++ b/www/llgal/Makefile
@@ -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
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 91dfb8b4a26..dda5d102513 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -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}
diff --git a/www/lynx/options.mk b/www/lynx/options.mk
index 5e0975229f6..df58bb771b6 100644
--- a/www/lynx/options.mk
+++ b/www/lynx/options.mk
@@ -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
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 1d712c20402..1cca37ef3f9 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -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:=midori-browser/}
GITHUB_PROJECT= core
GITHUB_RELEASE= v${PKGVERSION_NOREV}
-MAINTAINER= pkgsrc-users@NetBSD.org
-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
+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
diff --git a/www/mimetex/Makefile b/www/mimetex/Makefile
index 756c0191d4a..8ae8421ed3f 100644
--- a/www/mimetex/Makefile
+++ b/www/mimetex/Makefile
@@ -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"
diff --git a/www/mono-xsp/Makefile b/www/mono-xsp/Makefile
index eb28bc74c02..445e43ba48c 100644
--- a/www/mono-xsp/Makefile
+++ b/www/mono-xsp/Makefile
@@ -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.XSP.Security/Makefile
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"
diff --git a/www/moodle/Makefile b/www/moodle/Makefile
index 4fc7e56ebe8..b1e9ca0b375 100644
--- a/www/moodle/Makefile
+++ b/www/moodle/Makefile
@@ -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
diff --git a/www/netscape/Makefile b/www/netscape/Makefile
index 19b730a3647..64215cbdac1 100644
--- a/www/netscape/Makefile
+++ b/www/netscape/Makefile
@@ -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-like browser
.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}
diff --git a/www/nginx/Makefile.common b/www/nginx/Makefile.common
index 6222fc115c8..60f5e30fa71 100644
--- a/www/nginx/Makefile.common
+++ b/www/nginx/Makefile.common
@@ -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
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index 29c904cbb16..5376a11a14a 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -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)
diff --git a/www/ocaml-cohttp/Makefile b/www/ocaml-cohttp/Makefile
index 897d43fb129..2b6550eccf6 100644
--- a/www/ocaml-cohttp/Makefile
+++ b/www/ocaml-cohttp/Makefile
@@ -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
diff --git a/www/ocaml-curl/Makefile b/www/ocaml-curl/Makefile
index cee16fdfe6d..725c8005741 100644
--- a/www/ocaml-curl/Makefile
+++ b/www/ocaml-curl/Makefile
@@ -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/projects/ocurl/
COMMENT= OCaml bindings to the CURL library
LICENSE= mit
-MAKE_JOBS_SAFE= no
+MAKE_JOBS_SAFE= no
USE_TOOLS= gmake
GNU_CONFIGURE= yes
diff --git a/www/ocaml-uri/buildlink3.mk b/www/ocaml-uri/buildlink3.mk
index 0c9cd935261..844d54eeaf7 100644
--- a/www/ocaml-uri/buildlink3.mk
+++ b/www/ocaml-uri/buildlink3.mk
@@ -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
diff --git a/www/ocsigen-i18n/Makefile b/www/ocsigen-i18n/Makefile
index 12763e27d53..62fb57eacba 100644
--- a/www/ocsigen-i18n/Makefile
+++ b/www/ocsigen-i18n/Makefile
@@ -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/ocsigen-i18n/
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
diff --git a/www/ocsigen-start/Makefile b/www/ocsigen-start/Makefile
index 58b3c9456ba..eb552bb815d 100644
--- a/www/ocsigen-start/Makefile
+++ b/www/ocsigen-start/Makefile
@@ -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
diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile
index ac49bf4a022..01d674bfc1a 100644
--- a/www/ocsigen/Makefile
+++ b/www/ocsigen/Makefile
@@ -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
diff --git a/www/ocsigen/options.mk b/www/ocsigen/options.mk
index 2409b574fe3..b4bd1d9604c 100644
--- a/www/ocsigen/options.mk
+++ b/www/ocsigen/options.mk
@@ -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
diff --git a/www/opera/Makefile b/www/opera/Makefile
index fd74177eb31..5af9a56caa6 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -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
diff --git a/www/p5-AnyEvent-HTTP/Makefile b/www/p5-AnyEvent-HTTP/Makefile
index 99b48c4aea9..6a0a339acf2 100644
--- a/www/p5-AnyEvent-HTTP/Makefile
+++ b/www/p5-AnyEvent-HTTP/Makefile
@@ -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 but non-blocking HTTP/HTTPS client
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
diff --git a/www/p5-AnyEvent-HTTPD/Makefile b/www/p5-AnyEvent-HTTPD/Makefile
index caed489119b..12f36c9a041 100644
--- a/www/p5-AnyEvent-HTTPD/Makefile
+++ b/www/p5-AnyEvent-HTTPD/Makefile
@@ -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 based web (application) server
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
diff --git a/www/p5-App-Nopaste/Makefile b/www/p5-App-Nopaste/Makefile
index 92bb0acd36c..8fad58a44d1 100644
--- a/www/p5-App-Nopaste/Makefile
+++ b/www/p5-App-Nopaste/Makefile
@@ -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 access to any pastebin
LICENSE= ${PERL5_LICENSE}
USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/App/Nopaste/.packlist
+PERL5_PACKLIST= auto/App/Nopaste/.packlist
REPLACE_PERL+= script/nopaste
diff --git a/www/p5-CGI-Compile/Makefile b/www/p5-CGI-Compile/Makefile
index 7c4cafca7ab..8b272318825 100644
--- a/www/p5-CGI-Compile/Makefile
+++ b/www/p5-CGI-Compile/Makefile
@@ -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/CGI-Compile
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
diff --git a/www/p5-CGI-Cookie-XS/Makefile b/www/p5-CGI-Cookie-XS/Makefile
index 63b158b823c..a3e5117ae93 100644
--- a/www/p5-CGI-Cookie-XS/Makefile
+++ b/www/p5-CGI-Cookie-XS/Makefile
@@ -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"
diff --git a/www/p5-CGI-Emulate-PSGI/Makefile b/www/p5-CGI-Emulate-PSGI/Makefile
index a75fa6c8c8a..e7f581aeff7 100644
--- a/www/p5-CGI-Emulate-PSGI/Makefile
+++ b/www/p5-CGI-Emulate-PSGI/Makefile
@@ -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]*:../../devel/p5-Test-Requires
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"
diff --git a/www/p5-CGI-PSGI/Makefile b/www/p5-CGI-PSGI/Makefile
index e0cfd27d6e7..20dd3660df5 100644
--- a/www/p5-CGI-PSGI/Makefile
+++ b/www/p5-CGI-PSGI/Makefile
@@ -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 to the PSGI protocol
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
diff --git a/www/p5-CGI-Simple/Makefile b/www/p5-CGI-Simple/Makefile
index a884890854a..51073832c22 100644
--- a/www/p5-CGI-Simple/Makefile
+++ b/www/p5-CGI-Simple/Makefile
@@ -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]*:../../devel/p5-IO-stringy
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"
diff --git a/www/p5-CSS-Tiny/Makefile b/www/p5-CSS-Tiny/Makefile
index e9b2e790927..48ef5c2ab18 100644
--- a/www/p5-CSS-Tiny/Makefile
+++ b/www/p5-CSS-Tiny/Makefile
@@ -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 .css files with as little code as possible
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"
diff --git a/www/p5-Catalyst-Action-REST/Makefile b/www/p5-Catalyst-Action-REST/Makefile
index 6f0acc28e66..4bac37ce4bf 100644
--- a/www/p5-Catalyst-Action-REST/Makefile
+++ b/www/p5-Catalyst-Action-REST/Makefile
@@ -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-libwww
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"
diff --git a/www/p5-Catalyst-Action-RenderView/Makefile b/www/p5-Catalyst-Action-RenderView/Makefile
index 4c6d0ba1ac2..619730b9e3d 100644
--- a/www/p5-Catalyst-Action-RenderView/Makefile
+++ b/www/p5-Catalyst-Action-RenderView/Makefile
@@ -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]*:../../devel/p5-MRO-Compat
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"
diff --git a/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile b/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile
index b25e80fe412..e272a747b86 100644
--- a/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile
+++ b/www/p5-Catalyst-Authentication-Credential-HTTP-Proxy/Makefile
@@ -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-libwww
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
diff --git a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
index e8971b55b98..fa5f49b3c82 100644
--- a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
+++ b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
@@ -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]*:../../devel/p5-Test-Needs
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
diff --git a/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile b/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile
index b31145255b9..abd5c946536 100644
--- a/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile
@@ -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:../../devel/p5-Test-Simple
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"
diff --git a/www/p5-Catalyst-Controller-BindLex/Makefile b/www/p5-Catalyst-Controller-BindLex/Makefile
index ea317db6809..bfed3785e71 100644
--- a/www/p5-Catalyst-Controller-BindLex/Makefile
+++ b/www/p5-Catalyst-Controller-BindLex/Makefile
@@ -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
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
diff --git a/www/p5-Catalyst-Controller-FormBuilder/Makefile b/www/p5-Catalyst-Controller-FormBuilder/Makefile
index c8b6200e6d3..53c165c3418 100644
--- a/www/p5-Catalyst-Controller-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Controller-FormBuilder/Makefile
@@ -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:../../devel/p5-Tie-IxHash
# 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
diff --git a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
index 43cbe2e486e..f58fd67d08f 100644
--- a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
+++ b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
@@ -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]*:../../devel/p5-Regexp-Assemble
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"
diff --git a/www/p5-Catalyst-Devel/Makefile b/www/p5-Catalyst-Devel/Makefile
index af228f7a4f6..27a40968923 100644
--- a/www/p5-Catalyst-Devel/Makefile
+++ b/www/p5-Catalyst-Devel/Makefile
@@ -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]*:../../devel/p5-namespace-clean
#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"
diff --git a/www/p5-Catalyst-DispatchType-Regex/Makefile b/www/p5-Catalyst-DispatchType-Regex/Makefile
index 5c61347b399..bafe5c889e3 100644
--- a/www/p5-Catalyst-DispatchType-Regex/Makefile
+++ b/www/p5-Catalyst-DispatchType-Regex/Makefile
@@ -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:../../textproc/p5-Text-SimpleTable
#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"
diff --git a/www/p5-Catalyst-Engine-JobQueue-POE/Makefile b/www/p5-Catalyst-Engine-JobQueue-POE/Makefile
index 06a421d59f2..51ba57dd5ba 100644
--- a/www/p5-Catalyst-Engine-JobQueue-POE/Makefile
+++ b/www/p5-Catalyst-Engine-JobQueue-POE/Makefile
@@ -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:../../www/p5-Catalyst-Runtime
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"
diff --git a/www/p5-Catalyst-Engine-PSGI/Makefile b/www/p5-Catalyst-Engine-PSGI/Makefile
index 809e298401e..838ee82ca86 100644
--- a/www/p5-Catalyst-Engine-PSGI/Makefile
+++ b/www/p5-Catalyst-Engine-PSGI/Makefile
@@ -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]*:../../net/p5-Test-TCP
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"
diff --git a/www/p5-Catalyst-Manual/Makefile b/www/p5-Catalyst-Manual/Makefile
index 56c8a3d93f6..4870bf93f42 100644
--- a/www/p5-Catalyst-Manual/Makefile
+++ b/www/p5-Catalyst-Manual/Makefile
@@ -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/Catalyst-Manual
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"
diff --git a/www/p5-Catalyst-Model-File/Makefile b/www/p5-Catalyst-Model-File/Makefile
index fec22332fc3..1ff7f705265 100644
--- a/www/p5-Catalyst-Model-File/Makefile
+++ b/www/p5-Catalyst-Model-File/Makefile
@@ -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]*:../../devel/p5-MRO-Compat
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
diff --git a/www/p5-Catalyst-Plugin-Authentication/Makefile b/www/p5-Catalyst-Plugin-Authentication/Makefile
index 942590db09e..39ebeafd31c 100644
--- a/www/p5-Catalyst-Plugin-Authentication/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication/Makefile
@@ -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]*:../../www/p5-Catalyst-Runtime
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
diff --git a/www/p5-Catalyst-Plugin-ConfigLoader/Makefile b/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
index 1c913feee2a..3988b8dc8a4 100644
--- a/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
+++ b/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
@@ -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:../../devel/p5-Data-Visitor
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
diff --git a/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile b/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
index d13172b31e5..9b983dbc9ae 100644
--- a/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
@@ -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/p5-MRO-Compat
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
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile b/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
index 7cc101b36be..6c7dd70aedc 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
@@ -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:../../databases/p5-DBIx-Class
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:
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
index f848ffcfe4a..b27f0fa3f20 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
@@ -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]*:../../devel/p5-namespace-clean
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
diff --git a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
index b176ab39b06..e61383110c8 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
@@ -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/Catalyst-Plugin-Session-Store-FastMmap
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"
diff --git a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
index f4121f8e697..7f8ba54b280 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
@@ -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:../../www/p5-Catalyst-Runtime
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
diff --git a/www/p5-Catalyst-Runtime/Makefile b/www/p5-Catalyst-Runtime/Makefile
index 8501b6b646d..dfc8da5bbfe 100644
--- a/www/p5-Catalyst-Runtime/Makefile
+++ b/www/p5-Catalyst-Runtime/Makefile
@@ -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-MethodOverride-[0-9]*:../../www/p5-Plack-Middlewar
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"
diff --git a/www/p5-Catalyst-View-Jemplate/Makefile b/www/p5-Catalyst-View-Jemplate/Makefile
index 6362f2c2ec0..91fd8337b2e 100644
--- a/www/p5-Catalyst-View-Jemplate/Makefile
+++ b/www/p5-Catalyst-View-Jemplate/Makefile
@@ -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]*:../../devel/p5-File-Find-Rule
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"
diff --git a/www/p5-Catalyst-View-TT/Makefile b/www/p5-Catalyst-View-TT/Makefile
index 2086498e734..0339831c7da 100644
--- a/www/p5-Catalyst-View-TT/Makefile
+++ b/www/p5-Catalyst-View-TT/Makefile
@@ -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]*:../../www/p5-Template-Timer
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"
diff --git a/www/p5-CatalystX-CRUD-View-Excel/Makefile b/www/p5-CatalystX-CRUD-View-Excel/Makefile
index 539f7d1e116..35257c8b027 100644
--- a/www/p5-CatalystX-CRUD-View-Excel/Makefile
+++ b/www/p5-CatalystX-CRUD-View-Excel/Makefile
@@ -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/CatalystX-CRUD-View-Excel
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
diff --git a/www/p5-CatalystX-CRUD-YUI/Makefile b/www/p5-CatalystX-CRUD-YUI/Makefile
index e76eb77c251..9d1c07ed1af 100644
--- a/www/p5-CatalystX-CRUD-YUI/Makefile
+++ b/www/p5-CatalystX-CRUD-YUI/Makefile
@@ -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-[0-9]*:../../www/p5-Catalyst-Action-Rend
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
diff --git a/www/p5-Cookie-Baker/Makefile b/www/p5-Cookie-Baker/Makefile
index c3a434f8a6f..5ea4fca6cc3 100644
--- a/www/p5-Cookie-Baker/Makefile
+++ b/www/p5-Cookie-Baker/Makefile
@@ -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 string generator/parser
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
diff --git a/www/p5-Cookie-XS/Makefile b/www/p5-Cookie-XS/Makefile
index c3495d0c767..2fdb372ad30 100644
--- a/www/p5-Cookie-XS/Makefile
+++ b/www/p5-Cookie-XS/Makefile
@@ -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/Cookie-XS
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"
diff --git a/www/p5-Dancer-Session-Cookie/Makefile b/www/p5-Dancer-Session-Cookie/Makefile
index b1efc21fec8..5275d3f8112 100644
--- a/www/p5-Dancer-Session-Cookie/Makefile
+++ b/www/p5-Dancer-Session-Cookie/Makefile
@@ -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 backend for Dancer
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
diff --git a/www/p5-Dancer/Makefile b/www/p5-Dancer/Makefile
index b8aebcbaa71..0b1bac1b2e8 100644
--- a/www/p5-Dancer/Makefile
+++ b/www/p5-Dancer/Makefile
@@ -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 web application framework
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
diff --git a/www/p5-Dancer2/Makefile b/www/p5-Dancer2/Makefile
index a01d1d5689b..08ff898b3d3 100644
--- a/www/p5-Dancer2/Makefile
+++ b/www/p5-Dancer2/Makefile
@@ -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 application framework
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
diff --git a/www/p5-File-Mork/Makefile b/www/p5-File-Mork/Makefile
index eecbf9eabf6..40b0e098ff8 100644
--- a/www/p5-File-Mork/Makefile
+++ b/www/p5-File-Mork/Makefile
@@ -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/SIMONW/File-Mork-0.3
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"
diff --git a/www/p5-HTML-FormFu/Makefile b/www/p5-HTML-FormFu/Makefile
index 640cc91d90f..ebd293da27b 100644
--- a/www/p5-HTML-FormFu/Makefile
+++ b/www/p5-HTML-FormFu/Makefile
@@ -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:../../textproc/p5-YAML-LibYAML
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
diff --git a/www/p5-HTML-Lint/Makefile b/www/p5-HTML-Lint/Makefile
index ca516081c92..a3f2ddb78fd 100644
--- a/www/p5-HTML-Lint/Makefile
+++ b/www/p5-HTML-Lint/Makefile
@@ -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 errors in a string or file
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
diff --git a/www/p5-HTML-Mason-PSGIHandler/Makefile b/www/p5-HTML-Mason-PSGIHandler/Makefile
index 6255baf8b79..29b4fda34f9 100644
--- a/www/p5-HTML-Mason-PSGIHandler/Makefile
+++ b/www/p5-HTML-Mason-PSGIHandler/Makefile
@@ -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/HTML-Mason-PSGIHandler
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
diff --git a/www/p5-HTML-Prototype-Useful/Makefile b/www/p5-HTML-Prototype-Useful/Makefile
index 724c9b9b3ca..847c1aec6bd 100644
--- a/www/p5-HTML-Prototype-Useful/Makefile
+++ b/www/p5-HTML-Prototype-Useful/Makefile
@@ -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 Prototype library
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"
diff --git a/www/p5-HTML-Prototype/Makefile b/www/p5-HTML-Prototype/Makefile
index 7d14956a7eb..648711e541f 100644
--- a/www/p5-HTML-Prototype/Makefile
+++ b/www/p5-HTML-Prototype/Makefile
@@ -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:../../devel/p5-Class-Accessor
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"
diff --git a/www/p5-HTML-Selector-XPath/Makefile b/www/p5-HTML-Selector-XPath/Makefile
index 9913cbe4909..27128670d90 100644
--- a/www/p5-HTML-Selector-XPath/Makefile
+++ b/www/p5-HTML-Selector-XPath/Makefile
@@ -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/HTML-Selector-XPath
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"
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index ef6ffefb5fd..003f6fe5792 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -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
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"
diff --git a/www/p5-HTML-StripScripts-Parser/Makefile b/www/p5-HTML-StripScripts-Parser/Makefile
index 68e56ed435d..a1f7b1bb79c 100644
--- a/www/p5-HTML-StripScripts-Parser/Makefile
+++ b/www/p5-HTML-StripScripts-Parser/Makefile
@@ -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/HTML-HTML-StripScripts-Parser
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
diff --git a/www/p5-HTML-TreeBuilder-LibXML/Makefile b/www/p5-HTML-TreeBuilder-LibXML/Makefile
index 7a97d75a5f7..980545d30e9 100644
--- a/www/p5-HTML-TreeBuilder-LibXML/Makefile
+++ b/www/p5-HTML-TreeBuilder-LibXML/Makefile
@@ -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 XPath compatible interface with libxml
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
diff --git a/www/p5-HTML-TreeBuilder-XPath/Makefile b/www/p5-HTML-TreeBuilder-XPath/Makefile
index defebeea3b9..fecfc9f00de 100644
--- a/www/p5-HTML-TreeBuilder-XPath/Makefile
+++ b/www/p5-HTML-TreeBuilder-XPath/Makefile
@@ -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 support to HTML::TreeBuilder
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
diff --git a/www/p5-HTMLObject/Makefile b/www/p5-HTMLObject/Makefile
index 2618db7b21d..bdf703f0080 100644
--- a/www/p5-HTMLObject/Makefile
+++ b/www/p5-HTMLObject/Makefile
@@ -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
diff --git a/www/p5-HTTP-Date/Makefile b/www/p5-HTTP-Date/Makefile
index 51019647256..2e4bf992617 100644
--- a/www/p5-HTTP-Date/Makefile
+++ b/www/p5-HTTP-Date/Makefile
@@ -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"
diff --git a/www/p5-HTTP-GHTTP/Makefile b/www/p5-HTTP-GHTTP/Makefile
index 5d2a3d04cfa..2b24c120b32 100644
--- a/www/p5-HTTP-GHTTP/Makefile
+++ b/www/p5-HTTP-GHTTP/Makefile
@@ -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
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"
diff --git a/www/p5-HTTP-OAI/Makefile b/www/p5-HTTP-OAI/Makefile
index 8554168f8be..7a3cd1ede38 100644
--- a/www/p5-HTTP-OAI/Makefile
+++ b/www/p5-HTTP-OAI/Makefile
@@ -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:../../textproc/p5-XML-SAX
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"
diff --git a/www/p5-HTTP-Parser/Makefile b/www/p5-HTTP-Parser/Makefile
index df21f83554c..af23217f05e 100644
--- a/www/p5-HTTP-Parser/Makefile
+++ b/www/p5-HTTP-Parser/Makefile
@@ -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 request into HTTP::Request/Response object
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
diff --git a/www/p5-HTTP-Server-EV/Makefile b/www/p5-HTTP-Server-EV/Makefile
index 08f6e5b6dcc..6bd671d88a7 100644
--- a/www/p5-HTTP-Server-EV/Makefile
+++ b/www/p5-HTTP-Server-EV/Makefile
@@ -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]*:../../www/p5-AnyEvent-HTTP
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"
diff --git a/www/p5-HTTP-Server-Simple-PSGI/Makefile b/www/p5-HTTP-Server-Simple-PSGI/Makefile
index 3d39f994e06..a0471cbb88c 100644
--- a/www/p5-HTTP-Server-Simple-PSGI/Makefile
+++ b/www/p5-HTTP-Server-Simple-PSGI/Makefile
@@ -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::Simple
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
diff --git a/www/p5-HTTP-Tiny-Mech/Makefile b/www/p5-HTTP-Tiny-Mech/Makefile
index 18df516d64f..a552722a188 100644
--- a/www/p5-HTTP-Tiny-Mech/Makefile
+++ b/www/p5-HTTP-Tiny-Mech/Makefile
@@ -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 in an HTTP::Tiny compatible interface
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"
diff --git a/www/p5-Handel/Makefile b/www/p5-Handel/Makefile
index a6f19fdb0d8..d9ac4c832ca 100644
--- a/www/p5-Handel/Makefile
+++ b/www/p5-Handel/Makefile
@@ -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:../../www/p5-HTML-FillInForm
# 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"
diff --git a/www/p5-JSON-RPC/Makefile b/www/p5-JSON-RPC/Makefile
index 0196f8ae1b2..d6c73334ec9 100644
--- a/www/p5-JSON-RPC/Makefile
+++ b/www/p5-JSON-RPC/Makefile
@@ -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-Plack
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"
diff --git a/www/p5-Kwiki-Users-Remote/Makefile b/www/p5-Kwiki-Users-Remote/Makefile
index 68ee54ff627..d428a1a2f74 100644
--- a/www/p5-Kwiki-Users-Remote/Makefile
+++ b/www/p5-Kwiki-Users-Remote/Makefile
@@ -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/}
diff --git a/www/p5-Mojolicious/Makefile b/www/p5-Mojolicious/Makefile
index eb8fe34b71d..d850322fe4e 100644
--- a/www/p5-Mojolicious/Makefile
+++ b/www/p5-Mojolicious/Makefile
@@ -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 A Box!
LICENSE= artistic-2.0
USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Mojolicious/.packlist
+PERL5_PACKLIST= auto/Mojolicious/.packlist
REPLACE_PERL+= script/*
diff --git a/www/p5-Net-HTTP/Makefile b/www/p5-Net-HTTP/Makefile
index a4947213f3c..b4d911cc0b1 100644
--- a/www/p5-Net-HTTP/Makefile
+++ b/www/p5-Net-HTTP/Makefile
@@ -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"
diff --git a/www/p5-POE-Component-Server-PSGI/Makefile b/www/p5-POE-Component-Server-PSGI/Makefile
index 216ffdaee82..f404b8484e6 100644
--- a/www/p5-POE-Component-Server-PSGI/Makefile
+++ b/www/p5-POE-Component-Server-PSGI/Makefile
@@ -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 POE
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
diff --git a/www/p5-POE-Component-Server-SOAP/Makefile b/www/p5-POE-Component-Server-SOAP/Makefile
index e5a4aa4b8bf..07f39ebdd96 100644
--- a/www/p5-POE-Component-Server-SOAP/Makefile
+++ b/www/p5-POE-Component-Server-SOAP/Makefile
@@ -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 POE
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
diff --git a/www/p5-POE-Filter-HTTP-Parser/Makefile b/www/p5-POE-Filter-HTTP-Parser/Makefile
index 569906225a1..a454d74fec3 100644
--- a/www/p5-POE-Filter-HTTP-Parser/Makefile
+++ b/www/p5-POE-Filter-HTTP-Parser/Makefile
@@ -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 clients or servers
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
diff --git a/www/p5-PSGI/Makefile b/www/p5-PSGI/Makefile
index af74c8f07c0..bd19e04836f 100644
--- a/www/p5-PSGI/Makefile
+++ b/www/p5-PSGI/Makefile
@@ -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"
diff --git a/www/p5-ParallelUserAgent/Makefile b/www/p5-ParallelUserAgent/Makefile
index 6af149a1478..28fe62e1947 100644
--- a/www/p5-ParallelUserAgent/Makefile
+++ b/www/p5-ParallelUserAgent/Makefile
@@ -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
diff --git a/www/p5-Plack-App-Proxy/Makefile b/www/p5-Plack-App-Proxy/Makefile
index 1ac03bfc83a..35c4f24aafc 100644
--- a/www/p5-Plack-App-Proxy/Makefile
+++ b/www/p5-Plack-App-Proxy/Makefile
@@ -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"
diff --git a/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile b/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
index ed1c246813a..357a70e329b 100644
--- a/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
@@ -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 application
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
diff --git a/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile b/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
index cb3faf44a3f..ddeffd9d1ec 100644
--- a/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
@@ -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/Plack-Handler-AnyEvent-SCGI
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
diff --git a/www/p5-Plack-Middleware-Auth-Digest/Makefile b/www/p5-Plack-Middleware-Auth-Digest/Makefile
index 86cfcccbcb8..238b154ce6d 100644
--- a/www/p5-Plack-Middleware-Auth-Digest/Makefile
+++ b/www/p5-Plack-Middleware-Auth-Digest/Makefile
@@ -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 digest authentication
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
diff --git a/www/p5-Plack-Middleware-ConsoleLogger/Makefile b/www/p5-Plack-Middleware-ConsoleLogger/Makefile
index e00ed487df9..886f155d122 100644
--- a/www/p5-Plack-Middleware-ConsoleLogger/Makefile
+++ b/www/p5-Plack-Middleware-ConsoleLogger/Makefile
@@ -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/Plack-Middleware-ConsoleLogger
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
diff --git a/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile b/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
index 06b6195b993..6cbd043eebd 100644
--- a/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
+++ b/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
@@ -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, if it's not already set
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
diff --git a/www/p5-Plack-Middleware-MethodOverride/Makefile b/www/p5-Plack-Middleware-MethodOverride/Makefile
index 711830af876..b66d8a7ef6e 100644
--- a/www/p5-Plack-Middleware-MethodOverride/Makefile
+++ b/www/p5-Plack-Middleware-MethodOverride/Makefile
@@ -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"
diff --git a/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile b/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
index 5177196d39b..a4ff431909d 100644
--- a/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
+++ b/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
@@ -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 if it's not required
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
diff --git a/www/p5-Plack-Middleware-ReverseProxy/Makefile b/www/p5-Plack-Middleware-ReverseProxy/Makefile
index 5bf42ca6793..57dfd3f4024 100644
--- a/www/p5-Plack-Middleware-ReverseProxy/Makefile
+++ b/www/p5-Plack-Middleware-ReverseProxy/Makefile
@@ -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 reverse proxy
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
diff --git a/www/p5-Plack-Middleware-Session/Makefile b/www/p5-Plack-Middleware-Session/Makefile
index 725730c9149..4b8adeb8676 100644
--- a/www/p5-Plack-Middleware-Session/Makefile
+++ b/www/p5-Plack-Middleware-Session/Makefile
@@ -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 management
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
diff --git a/www/p5-Plack-Test-Agent/Makefile b/www/p5-Plack-Test-Agent/Makefile
index 68c1de57257..1715aaa6109 100644
--- a/www/p5-Plack-Test-Agent/Makefile
+++ b/www/p5-Plack-Test-Agent/Makefile
@@ -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]*:../../devel/p5-Test-Memory-Cycle
#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"
diff --git a/www/p5-Plack-Test-ExternalServer/Makefile b/www/p5-Plack-Test-ExternalServer/Makefile
index 37580242dbd..7d09f1316c9 100644
--- a/www/p5-Plack-Test-ExternalServer/Makefile
+++ b/www/p5-Plack-Test-ExternalServer/Makefile
@@ -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 servers
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
diff --git a/www/p5-Plack/Makefile b/www/p5-Plack/Makefile
index 79a206174c5..a8184a2b700 100644
--- a/www/p5-Plack/Makefile
+++ b/www/p5-Plack/Makefile
@@ -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:../../www/p5-Cookie-Baker
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"
diff --git a/www/p5-Pod-POM-Web/Makefile b/www/p5-Pod-POM-Web/Makefile
index 32709c29a93..cb613b16512 100644
--- a/www/p5-Pod-POM-Web/Makefile
+++ b/www/p5-Pod-POM-Web/Makefile
@@ -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 Perldoc server
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"
diff --git a/www/p5-Reaction/Makefile b/www/p5-Reaction/Makefile
index 70f8b1e9daf..c0ee60db5fa 100644
--- a/www/p5-Reaction/Makefile
+++ b/www/p5-Reaction/Makefile
@@ -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/Reaction
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
diff --git a/www/p5-Rose-HTML-Objects/Makefile b/www/p5-Rose-HTML-Objects/Makefile
index 0b9a8e30113..fb700fbe814 100644
--- a/www/p5-Rose-HTML-Objects/Makefile
+++ b/www/p5-Rose-HTML-Objects/Makefile
@@ -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 {} \;
diff --git a/www/p5-Router-Simple/Makefile b/www/p5-Router-Simple/Makefile
index 4f7802c16f5..6fdbc718ac6 100644
--- a/www/p5-Router-Simple/Makefile
+++ b/www/p5-Router-Simple/Makefile
@@ -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"
diff --git a/www/p5-Session-Storage-Secure/Makefile b/www/p5-Session-Storage-Secure/Makefile
index bd4580d1214..e044b38e61c 100644
--- a/www/p5-Session-Storage-Secure/Makefile
+++ b/www/p5-Session-Storage-Secure/Makefile
@@ -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, serialized session data with integrity
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
diff --git a/www/p5-Starlet/Makefile b/www/p5-Starlet/Makefile
index d03f6dcd4c3..3276b912c59 100644
--- a/www/p5-Starlet/Makefile
+++ b/www/p5-Starlet/Makefile
@@ -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 HTTP/1.0 server
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
diff --git a/www/p5-Starman/Makefile b/www/p5-Starman/Makefile
index 1c8836e23d4..c53f1ae5f35 100644
--- a/www/p5-Starman/Makefile
+++ b/www/p5-Starman/Makefile
@@ -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/Starman
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
diff --git a/www/p5-Task-CatInABox/Makefile b/www/p5-Task-CatInABox/Makefile
index 5897fa711d9..d23108502ce 100644
--- a/www/p5-Task-CatInABox/Makefile
+++ b/www/p5-Task-CatInABox/Makefile
@@ -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]*:../../databases/p5-DBIx-Class-TimeStamp
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"
diff --git a/www/p5-Task-Catalyst-Tutorial/Makefile b/www/p5-Task-Catalyst-Tutorial/Makefile
index 29e07835943..f488674ce2e 100644
--- a/www/p5-Task-Catalyst-Tutorial/Makefile
+++ b/www/p5-Task-Catalyst-Tutorial/Makefile
@@ -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/*.pl
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"
diff --git a/www/p5-Tatsumaki/Makefile b/www/p5-Tatsumaki/Makefile
index 35eeded5e53..e6c2d144350 100644
--- a/www/p5-Tatsumaki/Makefile
+++ b/www/p5-Tatsumaki/Makefile
@@ -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 framework based on Plack and AnyEvent
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
diff --git a/www/p5-Template-Plugin-Subst/Makefile b/www/p5-Template-Plugin-Subst/Makefile
index ea176a4740a..d5343680fc4 100644
--- a/www/p5-Template-Plugin-Subst/Makefile
+++ b/www/p5-Template-Plugin-Subst/Makefile
@@ -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"
diff --git a/www/p5-Template-Stash-EscapeHTML/Makefile b/www/p5-Template-Stash-EscapeHTML/Makefile
index 8d151c719e5..64480840a1a 100644
--- a/www/p5-Template-Stash-EscapeHTML/Makefile
+++ b/www/p5-Template-Stash-EscapeHTML/Makefile
@@ -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"
diff --git a/www/p5-Test-HTTP-Server-Simple/Makefile b/www/p5-Test-HTTP-Server-Simple/Makefile
index 4e2db6e760a..1e8b43fa38d 100644
--- a/www/p5-Test-HTTP-Server-Simple/Makefile
+++ b/www/p5-Test-HTTP-Server-Simple/Makefile
@@ -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::More functions for HTTP::Server::Simple
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
diff --git a/www/p5-Test-WWW-Mechanize-Catalyst/Makefile b/www/p5-Test-WWW-Mechanize-Catalyst/Makefile
index 155c3afdf93..d5d54b878da 100644
--- a/www/p5-Test-WWW-Mechanize-Catalyst/Makefile
+++ b/www/p5-Test-WWW-Mechanize-Catalyst/Makefile
@@ -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-Session-State-Cookie-[0-9]*:../../www/p5-Cata
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
diff --git a/www/p5-Test-WWW-Mechanize-PSGI/Makefile b/www/p5-Test-WWW-Mechanize-PSGI/Makefile
index a797dd1a77b..6bc747d30d0 100644
--- a/www/p5-Test-WWW-Mechanize-PSGI/Makefile
+++ b/www/p5-Test-WWW-Mechanize-PSGI/Makefile
@@ -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 programs using WWW::Mechanize
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
diff --git a/www/p5-Twiggy/Makefile b/www/p5-Twiggy/Makefile
index d0c446551a4..9aa9cf61a56 100644
--- a/www/p5-Twiggy/Makefile
+++ b/www/p5-Twiggy/Makefile
@@ -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
diff --git a/www/p5-URI-ws/Makefile b/www/p5-URI-ws/Makefile
index d7925787bff..8e346a2c083 100644
--- a/www/p5-URI-ws/Makefile
+++ b/www/p5-URI-ws/Makefile
@@ -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/URI-ws
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
diff --git a/www/p5-WWW-Mechanize-Cached/Makefile b/www/p5-WWW-Mechanize-Cached/Makefile
index ee7884b195e..f155888ebb3 100644
--- a/www/p5-WWW-Mechanize-Cached/Makefile
+++ b/www/p5-WWW-Mechanize-Cached/Makefile
@@ -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]*:../../www/p5-WWW-Mechanize
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
diff --git a/www/p5-WWW-Mechanize-GZip/Makefile b/www/p5-WWW-Mechanize-GZip/Makefile
index 27bdc378ea2..6916b301514 100644
--- a/www/p5-WWW-Mechanize-GZip/Makefile
+++ b/www/p5-WWW-Mechanize-GZip/Makefile
@@ -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 with gzip-compression
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
diff --git a/www/p5-WWW-Mechanize-Timed/Makefile b/www/p5-WWW-Mechanize-Timed/Makefile
index d5b46d9c059..e741781ee66 100644
--- a/www/p5-WWW-Mechanize-Timed/Makefile
+++ b/www/p5-WWW-Mechanize-Timed/Makefile
@@ -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:../../www/p5-LWPx-TimedHTTP
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"
diff --git a/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile b/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
index b94e519ffea..2c9541eaced 100644
--- a/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
+++ b/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
@@ -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> from Perl
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
diff --git a/www/p5-WWW-Pastebin-RafbNet-Create/Makefile b/www/p5-WWW-Pastebin-RafbNet-Create/Makefile
index 86a40e62578..be6afcb4610 100644
--- a/www/p5-WWW-Pastebin-RafbNet-Create/Makefile
+++ b/www/p5-WWW-Pastebin-RafbNet-Create/Makefile
@@ -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/WWW-Pastebin-RafbNet-Create
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
diff --git a/www/p5-WWW-RobotRules/Makefile b/www/p5-WWW-RobotRules/Makefile
index 2bd2513036c..df9564254c8 100644
--- a/www/p5-WWW-RobotRules/Makefile
+++ b/www/p5-WWW-RobotRules/Makefile
@@ -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
diff --git a/www/p5-WWW-Shorten/Makefile b/www/p5-WWW-Shorten/Makefile
index 220d6530a0d..9375099fbf0 100644
--- a/www/p5-WWW-Shorten/Makefile
+++ b/www/p5-WWW-Shorten/Makefile
@@ -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 shortening sites
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
diff --git a/www/p5-Web-Scraper/Makefile b/www/p5-Web-Scraper/Makefile
index 42faca57bc6..86a8cfdc5b0 100644
--- a/www/p5-Web-Scraper/Makefile
+++ b/www/p5-Web-Scraper/Makefile
@@ -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/Web-Scraper
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
diff --git a/www/php-apcu_bc/Makefile b/www/php-apcu_bc/Makefile
index 42c7865c986..91bf8fd81d6 100644
--- a/www/php-apcu_bc/Makefile
+++ b/www/php-apcu_bc/Makefile
@@ -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
diff --git a/www/php-basercms/Makefile b/www/php-basercms/Makefile
index 2ad56499905..75e102e7e9b 100644
--- a/www/php-basercms/Makefile
+++ b/www/php-basercms/Makefile
@@ -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
diff --git a/www/php-glpi/Makefile b/www/php-glpi/Makefile
index 31f9e8028a7..a626e7a2555 100644
--- a/www/php-glpi/Makefile
+++ b/www/php-glpi/Makefile
@@ -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/tcpdf/tools/tcpdf_addfont.php
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}
diff --git a/www/php-phrasea2/Makefile b/www/php-phrasea2/Makefile
index 6e43e4ed850..f8c0f6cf7e2 100644
--- a/www/php-phrasea2/Makefile
+++ b/www/php-phrasea2/Makefile
@@ -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"
diff --git a/www/php-tt-rss/options.mk b/www/php-tt-rss/options.mk
index 9af98dbfccb..7ec66b314a6 100644
--- a/www/php-tt-rss/options.mk
+++ b/www/php-tt-rss/options.mk
@@ -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
diff --git a/www/phraseanet-indexer/Makefile b/www/phraseanet-indexer/Makefile
index 5daaf3101d1..cd9f63dc9c6 100644
--- a/www/phraseanet-indexer/Makefile
+++ b/www/phraseanet-indexer/Makefile
@@ -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/phraseanet_indexer
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
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 2dc8565e8b2..ec2d0174ee2 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -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}
diff --git a/www/py-beautifulsoup/Makefile b/www/py-beautifulsoup/Makefile
index f1b2ef0a26d..e78d7d839ab 100644
--- a/www/py-beautifulsoup/Makefile
+++ b/www/py-beautifulsoup/Makefile
@@ -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"
diff --git a/www/py-blosxom/Makefile b/www/py-blosxom/Makefile
index bf89f143662..cfdfd8c50b1 100644
--- a/www/py-blosxom/Makefile
+++ b/www/py-blosxom/Makefile
@@ -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 reissued tarball with no changes
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' \
diff --git a/www/py-cloudfiles/Makefile b/www/py-cloudfiles/Makefile
index 97460702aad..876e8954bc8 100644
--- a/www/py-cloudfiles/Makefile
+++ b/www/py-cloudfiles/Makefile
@@ -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
HOMEPAGE= https://github.com/ncw/python-cloudfiles/
diff --git a/www/py-django14/options.mk b/www/py-django14/options.mk
index f67b88492ab..2d8dd1ce537 100644
--- a/www/py-django14/options.mk
+++ b/www/py-django14/options.mk
@@ -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
diff --git a/www/py-flask-wtf/options.mk b/www/py-flask-wtf/options.mk
index 936c0d978bf..880cd0c2224 100644
--- a/www/py-flask-wtf/options.mk
+++ b/www/py-flask-wtf/options.mk
@@ -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
diff --git a/www/py-graphite-web/Makefile b/www/py-graphite-web/Makefile
index 94e5b86958e..95f595f19a3 100644
--- a/www/py-graphite-web/Makefile
+++ b/www/py-graphite-web/Makefile
@@ -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
@@ -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}.example \
${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
diff --git a/www/py-python-digest/Makefile b/www/py-python-digest/Makefile
index 6616f64c923..7a1a693eab6 100644
--- a/www/py-python-digest/Makefile
+++ b/www/py-python-digest/Makefile
@@ -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"
diff --git a/www/py-recaptcha/Makefile b/www/py-recaptcha/Makefile
index 9305a8f3c74..eec940836be 100644
--- a/www/py-recaptcha/Makefile
+++ b/www/py-recaptcha/Makefile
@@ -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/recaptcha-client/}
MAINTAINER= pkgsrc-users@NetBSD.org
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"
diff --git a/www/py-scgi/Makefile b/www/py-scgi/Makefile
index 06df69e7f59..cc323194c14 100644
--- a/www/py-scgi/Makefile
+++ b/www/py-scgi/Makefile
@@ -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
diff --git a/www/py-simpletal/Makefile b/www/py-simpletal/Makefile
index 37786b76a09..d7b07d4a605 100644
--- a/www/py-simpletal/Makefile
+++ b/www/py-simpletal/Makefile
@@ -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
diff --git a/www/py-sparqlwrapper/Makefile b/www/py-sparqlwrapper/Makefile
index b9705d674e5..5c1d4b05374 100644
--- a/www/py-sparqlwrapper/Makefile
+++ b/www/py-sparqlwrapper/Makefile
@@ -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
diff --git a/www/py-trytond-webdav/Makefile b/www/py-trytond-webdav/Makefile
index 8d59811eac2..63c606b6dd8 100644
--- a/www/py-trytond-webdav/Makefile
+++ b/www/py-trytond-webdav/Makefile
@@ -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
diff --git a/www/py-twill/Makefile b/www/py-twill/Makefile
index 574e009c1c8..023da5e4c0d 100644
--- a/www/py-twill/Makefile
+++ b/www/py-twill/Makefile
@@ -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]*:../../textproc/py-cssselect
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 \
diff --git a/www/py-webassets/Makefile b/www/py-webassets/Makefile
index 4ac1fb656a6..dd734fe4a63 100644
--- a/www/py-webassets/Makefile
+++ b/www/py-webassets/Makefile
@@ -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"
diff --git a/www/py-webpy/Makefile b/www/py-webpy/Makefile
index ffcb7ffa785..3bc6d3fd513 100644
--- a/www/py-webpy/Makefile
+++ b/www/py-webpy/Makefile
@@ -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"
diff --git a/www/py-wtforms-components/options.mk b/www/py-wtforms-components/options.mk
index 573fa1cffb0..bcee1a4df46 100644
--- a/www/py-wtforms-components/options.mk
+++ b/www/py-wtforms-components/options.mk
@@ -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]*:../../databases/py-pymysql
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
diff --git a/www/qDecoder/Makefile b/www/qDecoder/Makefile
index a2444836e55..c236226aef0 100644
--- a/www/qDecoder/Makefile
+++ b/www/qDecoder/Makefile
@@ -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/C++ (CGI Library)
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
diff --git a/www/ruby-borges/Makefile b/www/ruby-borges/Makefile
index 071adc43ee1..1b384c75295 100644
--- a/www/ruby-borges/Makefile
+++ b/www/ruby-borges/Makefile
@@ -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"
diff --git a/www/ruby-jekyll-watch/Makefile b/www/ruby-jekyll-watch/Makefile
index 9693b3006e2..cda2a8320be 100644
--- a/www/ruby-jekyll-watch/Makefile
+++ b/www/ruby-jekyll-watch/Makefile
@@ -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"
diff --git a/www/ruby-pygments.rb/Makefile b/www/ruby-pygments.rb/Makefile
index 17fce0e49b8..b4085d5a5c2 100644
--- a/www/ruby-pygments.rb/Makefile
+++ b/www/ruby-pygments.rb/Makefile
@@ -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"
diff --git a/www/ruby-rest-client/Makefile b/www/ruby-rest-client/Makefile
index bfe265c028b..26f96559260 100644
--- a/www/ruby-rest-client/Makefile
+++ b/www/ruby-rest-client/Makefile
@@ -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
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
diff --git a/www/ruby-webunit/Makefile b/www/ruby-webunit/Makefile
index 2aea6af5436..d0cf30816f7 100644
--- a/www/ruby-webunit/Makefile
+++ b/www/ruby-webunit/Makefile
@@ -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
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
diff --git a/www/screws/Makefile b/www/screws/Makefile
index 8890ed9340f..cd6f7be7680 100644
--- a/www/screws/Makefile
+++ b/www/screws/Makefile
@@ -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
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index aa3977b7e9b..957edc3fc29 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -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}${PREFIX}/lib/${PKGBASE}
#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
diff --git a/www/seamonkey/options.mk b/www/seamonkey/options.mk
index f6096fd0e93..58ef7ff3aad 100644
--- a/www/seamonkey/options.mk
+++ b/www/seamonkey/options.mk
@@ -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
diff --git a/www/shibboleth-sp/Makefile b/www/shibboleth-sp/Makefile
index 111f14dde80..7acc4b77130 100644
--- a/www/shibboleth-sp/Makefile
+++ b/www/shibboleth-sp/Makefile
@@ -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}
diff --git a/www/siege/options.mk b/www/siege/options.mk
index dab487b6830..adbef87bf34 100644
--- a/www/siege/options.mk
+++ b/www/siege/options.mk
@@ -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
diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 71073d04e8f..0b8619d3068 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -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_SCRIPT:Q}
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"
diff --git a/www/squid3/options.mk b/www/squid3/options.mk
index 68f406382b6..a4946d7031a 100644
--- a/www/squid3/options.mk
+++ b/www/squid3/options.mk
@@ -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_group eacl_unix_group
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"
diff --git a/www/squidGuard/Makefile b/www/squidGuard/Makefile
index d05304da72d..f9d4d4d20a3 100644
--- a/www/squidGuard/Makefile
+++ b/www/squidGuard/Makefile
@@ -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
diff --git a/www/squidview/Makefile b/www/squidview/Makefile
index b6c90d04b91..a6d2e418512 100644
--- a/www/squidview/Makefile
+++ b/www/squidview/Makefile
@@ -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"
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index c59bb432f1d..7e0486c725a 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -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.org/images/logos/
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
diff --git a/www/typo3_62/Makefile b/www/typo3_62/Makefile
index a594327f495..21680697332 100644
--- a/www/typo3_62/Makefile
+++ b/www/typo3_62/Makefile
@@ -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} TYPO3DIR=${TYPO3DIR} TYPO3NAME=${TYPO3NAME}
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}/, \
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 8bbc4512d9d..bc8ac0fc49a 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -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
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index fc3dea99083..e259420706f 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -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
diff --git a/www/webkit24-gtk/options.mk b/www/webkit24-gtk/options.mk
index 9e2c9b8e2dc..7c1b91aa9a0 100644
--- a/www/webkit24-gtk/options.mk
+++ b/www/webkit24-gtk/options.mk
@@ -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"
diff --git a/www/wml/Makefile b/www/wml/Makefile
index dfd4e8ee8fe..569c6dcfb0d 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -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/lynx
.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}
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 3f4159b2729..adde8e1bcb3 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -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
+MAINTAINER= ginger@email.su
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
diff --git a/www/wwwoffle/options.mk b/www/wwwoffle/options.mk
index ad1d891b9ef..464b5392dd7 100644
--- a/www/wwwoffle/options.mk
+++ b/www/wwwoffle/options.mk
@@ -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 libgcrypt
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --with-ipv6
+CONFIGURE_ARGS+= --with-ipv6
.endif
.if !empty(PKG_OPTIONS:Mgnutls)
diff --git a/www/z-push/Makefile b/www/z-push/Makefile
index 413e79e57b2..b42b7b3a2b1 100644
--- a/www/z-push/Makefile
+++ b/www/z-push/Makefile
@@ -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