pkgsrc-Changes archive

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

CVS commit: pkgsrc/databases



Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Nov  2 15:38:12 UTC 2019

Modified Files:
        pkgsrc/databases/SQLiteCpp: buildlink3.mk
        pkgsrc/databases/apache-cassandra: Makefile.common
        pkgsrc/databases/couchdb: Makefile
        pkgsrc/databases/db3: Makefile
        pkgsrc/databases/gdbm: builtin.mk
        pkgsrc/databases/gdbm_compat: builtin.mk
        pkgsrc/databases/geneweb: Makefile
        pkgsrc/databases/gourmet: Makefile
        pkgsrc/databases/iodbc: Makefile
        pkgsrc/databases/ipa_sdb: options.mk
        pkgsrc/databases/jdbc-postgresql94: Makefile
        pkgsrc/databases/kyotocabinet: Makefile options.mk
        pkgsrc/databases/lbdb: Makefile
        pkgsrc/databases/libgda: Makefile
        pkgsrc/databases/lua-sqlite3: Makefile
        pkgsrc/databases/lua-tokyocabinet: Makefile
        pkgsrc/databases/metakit-lib: Makefile
        pkgsrc/databases/myodbc: options.mk
        pkgsrc/databases/mysql-cluster: Makefile.common
        pkgsrc/databases/mysql-workbench: Makefile
        pkgsrc/databases/mysql51-server: Makefile
        pkgsrc/databases/mysql55-client: Makefile.common
        pkgsrc/databases/mysql57-server: Makefile
        pkgsrc/databases/ocaml-dbm: Makefile
        pkgsrc/databases/ocaml-ldap: Makefile
        pkgsrc/databases/ocaml-macaque: Makefile
        pkgsrc/databases/ocaml-mysql: Makefile
        pkgsrc/databases/openldap-server: options.mk
        pkgsrc/databases/oraedit: Makefile
        pkgsrc/databases/p5-Class-DBI-Plugin-DeepAbstractSearch: Makefile
        pkgsrc/databases/p5-DBD-Sybase: Makefile
        pkgsrc/databases/p5-DBIx-Class: Makefile
        pkgsrc/databases/p5-DBIx-Class-DigestColumns: Makefile
        pkgsrc/databases/p5-DBIx-Class-Fixtures: Makefile
        pkgsrc/databases/p5-DBIx-Class-InflateColumn-FS: Makefile
        pkgsrc/databases/p5-DBIx-Class-InflateColumn-IP: Makefile
        pkgsrc/databases/p5-DBIx-Class-Schema-Loader: Makefile
        pkgsrc/databases/p5-DBIx-Class-TimeStamp: Makefile
        pkgsrc/databases/p5-DBIx-Class-UUIDColumns: Makefile
        pkgsrc/databases/p5-DBIx-Class-Validation: Makefile
        pkgsrc/databases/p5-Net-FileMaker: Makefile
        pkgsrc/databases/p5-Net-MySQL: Makefile
        pkgsrc/databases/p5-ORLite-Migrate: Makefile
        pkgsrc/databases/p5-Parse-Dia-SQL: Makefile
        pkgsrc/databases/p5-RRD-Simple: Makefile
        pkgsrc/databases/p5-Rose-DB: Makefile
        pkgsrc/databases/p5-Rose-DB-Object: Makefile
        pkgsrc/databases/p5-Rose-DBx-Garden-Catalyst: Makefile
        pkgsrc/databases/p5-Rose-DBx-Object-MoreHelpers: Makefile
        pkgsrc/databases/p5-Rose-DBx-TestDB: Makefile
        pkgsrc/databases/p5-SQL-Abstract: Makefile
        pkgsrc/databases/p5-SQL-Translator: Makefile
        pkgsrc/databases/p5-Search-QueryParser: Makefile
        pkgsrc/databases/p5-Sort-SQL: Makefile
        pkgsrc/databases/p5-qdbm: Makefile
        pkgsrc/databases/p5-sybperl: Makefile
        pkgsrc/databases/pgocaml: Makefile
        pkgsrc/databases/pgpool: Makefile
        pkgsrc/databases/pgtclng: Makefile
        pkgsrc/databases/php-oci8: Makefile
        pkgsrc/databases/phpldapadmin: Makefile
        pkgsrc/databases/phppgadmin: Makefile
        pkgsrc/databases/poco-data-mysql: Makefile
        pkgsrc/databases/postgresql10: Makefile.common
        pkgsrc/databases/postgresql10-contrib: Makefile
        pkgsrc/databases/postgresql11: Makefile.common
        pkgsrc/databases/postgresql11-contrib: Makefile
        pkgsrc/databases/postgresql12: Makefile.common
        pkgsrc/databases/postgresql12-contrib: Makefile
        pkgsrc/databases/postgresql94: Makefile.common
        pkgsrc/databases/postgresql94-contrib: Makefile
        pkgsrc/databases/postgresql95: Makefile.common
        pkgsrc/databases/postgresql95-contrib: Makefile
        pkgsrc/databases/postgresql96: Makefile.common
        pkgsrc/databases/postgresql96-contrib: Makefile
        pkgsrc/databases/pxtools: Makefile
        pkgsrc/databases/py-PgSQL: Makefile
        pkgsrc/databases/py-carbon: Makefile options.mk
        pkgsrc/databases/py-cassa: Makefile
        pkgsrc/databases/py-couchdb: Makefile
        pkgsrc/databases/py-cx_Oracle: Makefile
        pkgsrc/databases/py-datapkg: Makefile
        pkgsrc/databases/py-elixir: Makefile
        pkgsrc/databases/py-gdbm: Makefile
        pkgsrc/databases/py-metakit: Makefile
        pkgsrc/databases/py-sqlite: Makefile
        pkgsrc/databases/py-sqlite3: Makefile
        pkgsrc/databases/py-table: Makefile
        pkgsrc/databases/qdbm: buildlink3.mk
        pkgsrc/databases/qdbm-plus: Makefile
        pkgsrc/databases/qore-freetds-module: Makefile options.mk
        pkgsrc/databases/qore-mysql-module: Makefile options.mk
        pkgsrc/databases/qore-openldap-module: Makefile options.mk
        pkgsrc/databases/qore-pgsql-module: Makefile options.mk
        pkgsrc/databases/qore-sqlite3-module: Makefile options.mk
        pkgsrc/databases/redis: Makefile
        pkgsrc/databases/rrdtool: Makefile
        pkgsrc/databases/ruby-awesome_nested_set: Makefile
        pkgsrc/databases/ruby-odbc: Makefile
        pkgsrc/databases/ruby-vapor: Makefile
        pkgsrc/databases/sql-workbench: Makefile
        pkgsrc/databases/sqlrelay-odbc: Makefile
        pkgsrc/databases/tokyocabinet: Makefile options.mk
        pkgsrc/databases/tokyotyrant: Makefile
        pkgsrc/databases/virtuoso: Makefile options.mk
        pkgsrc/databases/yasql: Makefile

Log Message:
databases: align variable assignments

pkglint -Wall -F --only aligned -r

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/SQLiteCpp/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/apache-cassandra/Makefile.common
cvs rdiff -u -r1.60 -r1.61 pkgsrc/databases/couchdb/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/databases/db3/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/gdbm/builtin.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/gdbm_compat/builtin.mk
cvs rdiff -u -r1.53 -r1.54 pkgsrc/databases/geneweb/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/databases/gourmet/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/iodbc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/ipa_sdb/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/jdbc-postgresql94/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/kyotocabinet/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/kyotocabinet/options.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/databases/lbdb/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/libgda/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/lua-sqlite3/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/lua-tokyocabinet/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/metakit-lib/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/myodbc/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/mysql-cluster/Makefile.common
cvs rdiff -u -r1.75 -r1.76 pkgsrc/databases/mysql-workbench/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/databases/mysql51-server/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/databases/mysql55-client/Makefile.common
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/mysql57-server/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/ocaml-dbm/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/ocaml-ldap/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/ocaml-macaque/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/ocaml-mysql/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/openldap-server/options.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/oraedit/Makefile
cvs rdiff -u -r1.15 -r1.16 \
    pkgsrc/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/databases/p5-DBD-Sybase/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/p5-DBIx-Class/Makefile
cvs rdiff -u -r1.16 -r1.17 \
    pkgsrc/databases/p5-DBIx-Class-DigestColumns/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/p5-DBIx-Class-Fixtures/Makefile
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
cvs rdiff -u -r1.16 -r1.17 \
    pkgsrc/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
cvs rdiff -u -r1.39 -r1.40 \
    pkgsrc/databases/p5-DBIx-Class-Schema-Loader/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/p5-DBIx-Class-TimeStamp/Makefile
cvs rdiff -u -r1.16 -r1.17 \
    pkgsrc/databases/p5-DBIx-Class-UUIDColumns/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/p5-DBIx-Class-Validation/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/p5-Net-FileMaker/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/p5-Net-MySQL/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/p5-ORLite-Migrate/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/p5-Parse-Dia-SQL/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/p5-RRD-Simple/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/p5-Rose-DB/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/p5-Rose-DB-Object/Makefile
cvs rdiff -u -r1.23 -r1.24 \
    pkgsrc/databases/p5-Rose-DBx-Garden-Catalyst/Makefile
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/p5-Rose-DBx-TestDB/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/databases/p5-SQL-Abstract/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/databases/p5-SQL-Translator/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/p5-Search-QueryParser/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/p5-Sort-SQL/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/p5-qdbm/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/p5-sybperl/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/pgocaml/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/pgpool/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/pgtclng/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/php-oci8/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/databases/phpldapadmin/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/databases/phppgadmin/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/poco-data-mysql/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/postgresql10/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql10-contrib/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/postgresql11/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql11-contrib/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql12/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql12-contrib/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/postgresql94/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql94-contrib/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/postgresql95/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql95-contrib/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/postgresql96/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql96-contrib/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/pxtools/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/databases/py-PgSQL/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/py-carbon/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/py-carbon/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/py-cassa/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/py-couchdb/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/py-cx_Oracle/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/py-datapkg/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/py-elixir/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/py-gdbm/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/databases/py-metakit/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/py-sqlite/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/py-sqlite3/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/py-table/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/qdbm/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/qdbm-plus/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/qore-freetds-module/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/qore-freetds-module/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/qore-mysql-module/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/qore-mysql-module/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/qore-openldap-module/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/qore-openldap-module/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/qore-pgsql-module/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/qore-pgsql-module/options.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/qore-sqlite3-module/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/qore-sqlite3-module/options.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/databases/redis/Makefile
cvs rdiff -u -r1.135 -r1.136 pkgsrc/databases/rrdtool/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/ruby-awesome_nested_set/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/ruby-odbc/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/ruby-vapor/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/sql-workbench/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/sqlrelay-odbc/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/tokyocabinet/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/tokyocabinet/options.mk
cvs rdiff -u -r1.37 -r1.38 pkgsrc/databases/tokyotyrant/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/virtuoso/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/virtuoso/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/yasql/Makefile

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

Modified files:

Index: pkgsrc/databases/SQLiteCpp/buildlink3.mk
diff -u pkgsrc/databases/SQLiteCpp/buildlink3.mk:1.4 pkgsrc/databases/SQLiteCpp/buildlink3.mk:1.5
--- pkgsrc/databases/SQLiteCpp/buildlink3.mk:1.4        Wed Apr  3 00:32:29 2019
+++ pkgsrc/databases/SQLiteCpp/buildlink3.mk    Sat Nov  2 15:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2019/04/03 00:32:29 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2019/11/02 15:37:59 rillig Exp $
 
 BUILDLINK_TREE+=       SQLiteCpp
 
@@ -7,7 +7,7 @@ SQLITECPP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SQLiteCpp+=      SQLiteCpp>=2.2.0
 BUILDLINK_DEPMETHOD.SQLiteCpp?=                build
-BUILDLINK_ABI_DEPENDS.SQLiteCpp?=              SQLiteCpp>=2.2.0nb3
+BUILDLINK_ABI_DEPENDS.SQLiteCpp?=      SQLiteCpp>=2.2.0nb3
 BUILDLINK_PKGSRCDIR.SQLiteCpp?=                ../../databases/SQLiteCpp
 
 .include "../../databases/sqlite3/buildlink3.mk"

Index: pkgsrc/databases/apache-cassandra/Makefile.common
diff -u pkgsrc/databases/apache-cassandra/Makefile.common:1.3 pkgsrc/databases/apache-cassandra/Makefile.common:1.4
--- pkgsrc/databases/apache-cassandra/Makefile.common:1.3       Fri Jun  8 09:52:44 2018
+++ pkgsrc/databases/apache-cassandra/Makefile.common   Sat Nov  2 15:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2018/06/08 09:52:44 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.4 2019/11/02 15:37:59 rillig Exp $
 # used by databases/apache-cassandra/Makefile
 # used by databases/apache-cassandra2/Makefile
 #
@@ -69,10 +69,10 @@ REPLACE_BASH+=              bin/cassandra bin/cqlsh 
 INSTALLATION_DIRS+=    ${CASSANDRA_HOME} ${EGDIR} ${DOCDIR}
 INSTALLATION_DIRS+=    ${CASSANDRA_HOME} ${CASSANDRA_HOME}/bin ${EGDIR} ${DOCDIR}
 
-CHECK_SSP_SUPPORTED=   no
-CHECK_INTERPRETER_SKIP+=share/cassandra/interface/cassandra.thrift
-CHECK_INTERPRETER_SKIP+=share/cassandra/pylib/setup.py
-CHECK_INTERPRETER_SKIP+=share/cassandra/tools/bin/token-generator
+CHECK_SSP_SUPPORTED=           no
+CHECK_INTERPRETER_SKIP+=       share/cassandra/interface/cassandra.thrift
+CHECK_INTERPRETER_SKIP+=       share/cassandra/pylib/setup.py
+CHECK_INTERPRETER_SKIP+=       share/cassandra/tools/bin/token-generator
 
 # Skip checks on other arch libs to keep this simple
 CHECK_SHLIBS_SKIP+=    share/cassandra/lib/sigar-bin/*

Index: pkgsrc/databases/couchdb/Makefile
diff -u pkgsrc/databases/couchdb/Makefile:1.60 pkgsrc/databases/couchdb/Makefile:1.61
--- pkgsrc/databases/couchdb/Makefile:1.60      Mon Oct 28 15:43:24 2019
+++ pkgsrc/databases/couchdb/Makefile   Sat Nov  2 15:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2019/10/28 15:43:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.61 2019/11/02 15:38:00 rillig Exp $
 
 DISTNAME=              apache-couchdb-2.3.1
 PKGNAME=               ${DISTNAME:S/apache-//}
@@ -29,11 +29,11 @@ COUCH_RUNDIR?=              ${VARBASE}/run/couchdb
 COUCH_USER?=           couchdb
 COUCH_GROUP?=          ${COUCH_USER}
 
-PKG_GROUPS+=           ${COUCH_GROUP}
-PKG_USERS+=            ${COUCH_USER}:${COUCH_GROUP}
-PKG_GECOS.${COUCH_USER}=CouchDB Server User
-PKG_HOME.${COUCH_USER}=        ${COUCH_DBDIR}
-PKG_SHELL.${COUCH_USER}=${COMMAND_SHELL}
+PKG_GROUPS+=                   ${COUCH_GROUP}
+PKG_USERS+=                    ${COUCH_USER}:${COUCH_GROUP}
+PKG_GECOS.${COUCH_USER}=       CouchDB Server User
+PKG_HOME.${COUCH_USER}=                ${COUCH_DBDIR}
+PKG_SHELL.${COUCH_USER}=       ${COMMAND_SHELL}
 
 FILES_SUBST+=          COUCH_USER=${COUCH_USER}
 FILES_SUBST+=          COUCH_GROUP=${COUCH_GROUP}

Index: pkgsrc/databases/db3/Makefile
diff -u pkgsrc/databases/db3/Makefile:1.41 pkgsrc/databases/db3/Makefile:1.42
--- pkgsrc/databases/db3/Makefile:1.41  Wed Jul 10 10:37:13 2019
+++ pkgsrc/databases/db3/Makefile       Sat Nov  2 15:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/07/10 10:37:13 nia Exp $
+# $NetBSD: Makefile,v 1.42 2019/11/02 15:38:00 rillig Exp $
 
 DISTNAME=      db-3.3.11
 PKGNAME=       db3-3.11.2
@@ -11,9 +11,9 @@ HOMEPAGE=     https://www.oracle.com/databas
 COMMENT=       Sleepycat Software's Berkeley DB version 3
 LICENSE=       sleepycat-license # minus ASM stanza
 
-PATCH_SITES=   http://www.oracle.com/technology/products/berkeley-db/db/update/3.3.11/
-PATCHFILES=    patch.3.3.11.1 patch.3.3.11.2
-PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -p0
+PATCH_SITES=           http://www.oracle.com/technology/products/berkeley-db/db/update/3.3.11/
+PATCHFILES=            patch.3.3.11.1 patch.3.3.11.2
+PATCH_DIST_ARGS=       -d ${WRKSRC}/.. --forward --quiet -p0
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/build_unix
 USE_LIBTOOL=           yes

Index: pkgsrc/databases/gdbm/builtin.mk
diff -u pkgsrc/databases/gdbm/builtin.mk:1.3 pkgsrc/databases/gdbm/builtin.mk:1.4
--- pkgsrc/databases/gdbm/builtin.mk:1.3        Mon Mar 20 06:02:26 2017
+++ pkgsrc/databases/gdbm/builtin.mk    Sat Nov  2 15:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2017/03/20 06:02:26 adam Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/02 15:38:00 rillig Exp $
 
 BUILTIN_PKG:=                  gdbm
 BUILTIN_FIND_HEADERS_VAR=      GDBM_H
@@ -16,7 +16,7 @@ IS_BUILTIN.gdbm=      no
 IS_BUILTIN.gdbm=       yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.gdbm
+MAKEVARS+=             IS_BUILTIN.gdbm
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -66,4 +66,4 @@ USE_BUILTIN.gdbm!=                                                    \
 .    endif
 .  endif
 .endif
-MAKEVARS+=     USE_BUILTIN.gdbm
+MAKEVARS+=             USE_BUILTIN.gdbm

Index: pkgsrc/databases/gdbm_compat/builtin.mk
diff -u pkgsrc/databases/gdbm_compat/builtin.mk:1.5 pkgsrc/databases/gdbm_compat/builtin.mk:1.6
--- pkgsrc/databases/gdbm_compat/builtin.mk:1.5 Mon Mar 20 06:02:27 2017
+++ pkgsrc/databases/gdbm_compat/builtin.mk     Sat Nov  2 15:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2017/03/20 06:02:27 adam Exp $
+# $NetBSD: builtin.mk,v 1.6 2019/11/02 15:38:00 rillig Exp $
 
 BUILTIN_PKG:=                  gdbm_compat
 BUILTIN_FIND_HEADERS_VAR=      NDBM_H
@@ -17,7 +17,7 @@ IS_BUILTIN.gdbm_compat=       no
 IS_BUILTIN.gdbm_compat=        yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.gdbm_compat
+MAKEVARS+=             IS_BUILTIN.gdbm_compat
 
 ##
 ## Include databases/gdbm/builtin.mk so that BUILTIN_PKG.gdbm and
@@ -62,4 +62,4 @@ USE_BUILTIN.gdbm_compat!=                                             \
 .    endif
 .  endif
 .endif
-MAKEVARS+=     USE_BUILTIN.gdbm_compat
+MAKEVARS+=                     USE_BUILTIN.gdbm_compat

Index: pkgsrc/databases/geneweb/Makefile
diff -u pkgsrc/databases/geneweb/Makefile:1.53 pkgsrc/databases/geneweb/Makefile:1.54
--- pkgsrc/databases/geneweb/Makefile:1.53      Mon Nov 12 16:10:17 2018
+++ pkgsrc/databases/geneweb/Makefile   Sat Nov  2 15:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/11/12 16:10:17 jaapb Exp $
+# $NetBSD: Makefile,v 1.54 2019/11/02 15:38:00 rillig Exp $
 #
 
 DISTNAME=      geneweb-5.01
@@ -37,7 +37,7 @@ CONFLICTS+=   coreutils-[0-9]*
 # Stripped OCAML binaries don't seem to work any more.
 # Installing unstripped binaries until this is fixed.
 # (not checked in 5.01)
-INSTALL_PROGRAM= ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+INSTALL_PROGRAM=       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
 INSTALLATION_DIRS=     bin libexec sbin share/examples/geneweb \
                        share/doc/geneweb share/geneweb/etc \

Index: pkgsrc/databases/gourmet/Makefile
diff -u pkgsrc/databases/gourmet/Makefile:1.58 pkgsrc/databases/gourmet/Makefile:1.59
--- pkgsrc/databases/gourmet/Makefile:1.58      Mon Sep  2 13:19:46 2019
+++ pkgsrc/databases/gourmet/Makefile   Sat Nov  2 15:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2019/09/02 13:19:46 adam Exp $
+# $NetBSD: Makefile,v 1.59 2019/11/02 15:38:01 rillig Exp $
 
 DISTNAME=              gourmet-0.8.5.14
 PKGREVISION=           40
@@ -9,8 +9,8 @@ MAINTAINER=             pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://grecipe-manager.sourceforge.net/
 COMMENT=               Recipe database
 
-USE_PKGLOCALEDIR=      yes
-PYTHON_VERSIONS_ACCEPTED=       27 # py-metakit, py-imaging, py-gtk2
+USE_PKGLOCALEDIR=              yes
+PYTHON_VERSIONS_ACCEPTED=      27 # py-metakit, py-imaging, py-gtk2
 
 REPLACE_PYTHON+=       build_rpms.py
 REPLACE_PYTHON+=       setup.py

Index: pkgsrc/databases/iodbc/Makefile
diff -u pkgsrc/databases/iodbc/Makefile:1.24 pkgsrc/databases/iodbc/Makefile:1.25
--- pkgsrc/databases/iodbc/Makefile:1.24        Thu Aug 21 19:38:55 2014
+++ pkgsrc/databases/iodbc/Makefile     Sat Nov  2 15:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2014/08/21 19:38:55 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/02 15:38:01 rillig Exp $
 
 DISTNAME=      libiodbc-3.52.9
 PKGNAME=       ${DISTNAME:S/^lib//}
@@ -10,13 +10,13 @@ HOMEPAGE=   http://www.iodbc.org/dataspace
 COMMENT=       ODBC 3.x driver manager
 LICENSE=       gnu-lgpl-v2
 
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --disable-gui
-CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/iodbc
+USE_LIBTOOL=                   yes
+GNU_CONFIGURE=                 yes
+CONFIGURE_ARGS+=               --disable-gui
+CONFIGURE_ARGS+=               --includedir=${PREFIX}/include/iodbc
 GNU_CONFIGURE_LIBSUBDIR=       iodbc
-CONFIGURE_ARGS+=       --pkgconfigdir=${PREFIX}/lib/pkgconfig
-CONFIGURE_ARGS+=       --with-iodbc-inidir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=               --pkgconfigdir=${PREFIX}/lib/pkgconfig
+CONFIGURE_ARGS+=               --with-iodbc-inidir=${PKG_SYSCONFDIR}
 
 DL_AUTO_VARS=          yes
 

Index: pkgsrc/databases/ipa_sdb/options.mk
diff -u pkgsrc/databases/ipa_sdb/options.mk:1.2 pkgsrc/databases/ipa_sdb/options.mk:1.3
--- pkgsrc/databases/ipa_sdb/options.mk:1.2     Mon Jan 22 12:23:39 2007
+++ pkgsrc/databases/ipa_sdb/options.mk Sat Nov  2 15:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/01/22 12:23:39 obache Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/02 15:38:01 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ipa_sdb
 PKG_SUPPORTED_OPTIONS= ipa-without-autorules ipa-without-limits \
@@ -10,26 +10,26 @@ PKG_SUPPORTED_OPTIONS=      ipa-without-autor
 ### Disable dynamic rules support
 ###
 .if !empty(PKG_OPTIONS:Mipa-without-autorules)
-CONFIGURE_ARGS+= --disable-autorules
+CONFIGURE_ARGS+=       --disable-autorules
 .endif
 
 ###
 ### Disable limits support
 ###
 .if !empty(PKG_OPTIONS:Mipa-without-limits)
-CONFIGURE_ARGS+= --disable-limits
+CONFIGURE_ARGS+=       --disable-limits
 .endif
 
 ###
 ### Disable static rules support
 ###
 .if !empty(PKG_OPTIONS:Mipa-without-rules)
-CONFIGURE_ARGS+= --disable-rules
+CONFIGURE_ARGS+=       --disable-rules
 .endif
 
 ###
 ### Disable thresholds support
 ###
 .if !empty(PKG_OPTIONS:Mipa-without-thresholds)
-CONFIGURE_ARGS+= --disable-thresholds
+CONFIGURE_ARGS+=       --disable-thresholds
 .endif

Index: pkgsrc/databases/jdbc-postgresql94/Makefile
diff -u pkgsrc/databases/jdbc-postgresql94/Makefile:1.3 pkgsrc/databases/jdbc-postgresql94/Makefile:1.4
--- pkgsrc/databases/jdbc-postgresql94/Makefile:1.3     Wed Aug 16 20:21:06 2017
+++ pkgsrc/databases/jdbc-postgresql94/Makefile Sat Nov  2 15:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/08/16 20:21:06 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 15:38:01 rillig Exp $
 
 DISTNAME=              postgresql-jdbc-9.4-${PGBUILD}.src
 PKGNAME=               jdbc-postgresql94-${PGBUILD}
@@ -21,7 +21,7 @@ USE_JAVA=             run
 USE_JAVA2=             6
 NO_BUILD=              YES
 
-DOCDIR=                 share/doc/java/${PKGBASE}
+DOCDIR=                        share/doc/java/${PKGBASE}
 PLIST_SUBST+=          JARFILE=${JARFILE:Q}
 PLIST_SUBST+=          DOCDIR=${DOCDIR:Q}
 

Index: pkgsrc/databases/kyotocabinet/Makefile
diff -u pkgsrc/databases/kyotocabinet/Makefile:1.4 pkgsrc/databases/kyotocabinet/Makefile:1.5
--- pkgsrc/databases/kyotocabinet/Makefile:1.4  Thu Jul 11 09:25:24 2019
+++ pkgsrc/databases/kyotocabinet/Makefile      Sat Nov  2 15:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/07/11 09:25:24 nia Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/02 15:38:01 rillig Exp $
 #
 
 DISTNAME=      kyotocabinet-1.2.76
@@ -11,10 +11,10 @@ HOMEPAGE=   https://fallabs.com/kyotocabin
 COMMENT=       Straightforward implementation of DBM
 LICENSE=       gnu-gpl-v3
 
-GNU_CONFIGURE= yes
-USE_GCC_RUNTIME=yes
-USE_TOOLS+=    gmake pkg-config
-USE_LANGUAGES= c c++
+GNU_CONFIGURE=         yes
+USE_GCC_RUNTIME=       yes
+USE_TOOLS+=            gmake pkg-config
+USE_LANGUAGES=         c c++
 
 PKGCONFIG_OVERRIDE+=   kyotocabinet.pc.in
 

Index: pkgsrc/databases/kyotocabinet/options.mk
diff -u pkgsrc/databases/kyotocabinet/options.mk:1.1 pkgsrc/databases/kyotocabinet/options.mk:1.2
--- pkgsrc/databases/kyotocabinet/options.mk:1.1        Fri Nov 21 11:29:52 2014
+++ pkgsrc/databases/kyotocabinet/options.mk    Sat Nov  2 15:38:01 2019
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2014/11/21 11:29:52 obache Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:01 rillig Exp $
 #
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.kyotocabinet
-PKG_SUPPORTED_OPTIONS= zlib
+PKG_OPTIONS_VAR=               PKG_OPTIONS.kyotocabinet
+PKG_SUPPORTED_OPTIONS=         zlib
 PKG_OPTIONS_OPTIONAL_GROUPS=   codec
 PKG_OPTIONS_GROUP.codec=       lzma lzo
-PKG_SUGGESTED_OPTIONS= zlib
+PKG_SUGGESTED_OPTIONS=         zlib
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/databases/lbdb/Makefile
diff -u pkgsrc/databases/lbdb/Makefile:1.35 pkgsrc/databases/lbdb/Makefile:1.36
--- pkgsrc/databases/lbdb/Makefile:1.35 Sun Aug 11 13:18:19 2019
+++ pkgsrc/databases/lbdb/Makefile      Sat Nov  2 15:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/08/11 13:18:19 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/02 15:38:01 rillig Exp $
 
 DISTNAME=              lbdb_0.48.1
 PKGNAME=               ${DISTNAME:S/_/-/}
@@ -16,13 +16,13 @@ DEPENDS+=           p5-perl-ldap>=0.20:../../data
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake perl:run
 
-GNU_CONFIGURE_LIBSUBDIR=../libexec/lbdb
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --enable-lbdb_dotlock
-CONFIGURE_ARGS+=       --without-getent
-CONFIGURE_ARGS+=       --without-evolution-addressbook-export
-CONFIGURE_ARGS+=       --without-pgp
-CONFIGURE_ARGS+=       --without-pgpk
+GNU_CONFIGURE_LIBSUBDIR=       ../libexec/lbdb
+CONFIGURE_ARGS+=               --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=               --enable-lbdb_dotlock
+CONFIGURE_ARGS+=               --without-getent
+CONFIGURE_ARGS+=               --without-evolution-addressbook-export
+CONFIGURE_ARGS+=               --without-pgp
+CONFIGURE_ARGS+=               --without-pgpk
 
 CONFIGURE_ENV+=                SH=${TOOLS_SH}
 CONFIGURE_ENV+=                AWK=${TOOLS_AWK}

Index: pkgsrc/databases/libgda/Makefile
diff -u pkgsrc/databases/libgda/Makefile:1.38 pkgsrc/databases/libgda/Makefile:1.39
--- pkgsrc/databases/libgda/Makefile:1.38       Fri May 17 08:20:34 2019
+++ pkgsrc/databases/libgda/Makefile    Sat Nov  2 15:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/05/17 08:20:34 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/02 15:38:01 rillig Exp $
 
 .include "Makefile.common"
 .include "options.mk"
@@ -10,8 +10,8 @@ CONFIGURE_ARGS+=      --with-odbc=no --with-b
 
 TEST_TARGET=           check
 
-CHECK_INTERPRETER_SKIP=  share/libgda-5.0/gda_trml2html/trml2html.py
-CHECK_INTERPRETER_SKIP+= share/libgda-5.0/gda_trml2pdf/trml2pdf.py
+CHECK_INTERPRETER_SKIP=                share/libgda-5.0/gda_trml2html/trml2html.py
+CHECK_INTERPRETER_SKIP+=       share/libgda-5.0/gda_trml2pdf/trml2pdf.py
 
 PKG_SYSCONFSUBDIR=     libgda-5.0
 EGDIR=                 ${PREFIX}/share/examples/libgda

Index: pkgsrc/databases/lua-sqlite3/Makefile
diff -u pkgsrc/databases/lua-sqlite3/Makefile:1.19 pkgsrc/databases/lua-sqlite3/Makefile:1.20
--- pkgsrc/databases/lua-sqlite3/Makefile:1.19  Wed Apr  3 00:32:30 2019
+++ pkgsrc/databases/lua-sqlite3/Makefile       Sat Nov  2 15:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/04/03 00:32:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 15:38:01 rillig Exp $
 
 DISTNAME=      lua-sqlite3-0.4.1
 PKGNAME=       ${LUA_PKGPREFIX}-sqlite3-0.4.1
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=      --with-lua=${LUA_INTERP
 
 CFLAGS+=               -fPIC
 
-INSTALLATION_DIRS+=    ${LUA_LDIR} ${LUA_CDIR}
+INSTALLATION_DIRS+=    ${LUA_LDIR} ${LUA_CDIR}
 
 post-install:
        mv ${DESTDIR}${PREFIX}/${LUA_CDIR}/*.lua \

Index: pkgsrc/databases/lua-tokyocabinet/Makefile
diff -u pkgsrc/databases/lua-tokyocabinet/Makefile:1.27 pkgsrc/databases/lua-tokyocabinet/Makefile:1.28
--- pkgsrc/databases/lua-tokyocabinet/Makefile:1.27     Thu Jul 11 09:25:24 2019
+++ pkgsrc/databases/lua-tokyocabinet/Makefile  Sat Nov  2 15:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/07/11 09:25:24 nia Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/02 15:38:01 rillig Exp $
 #
 
 DISTNAME=      tokyocabinet-lua-1.10
@@ -28,11 +28,11 @@ MAKE_ENV+=  INCLUDEDIR=${BUILDLINK_PREFIX
 .include "../../mk/bsd.prefs.mk"
 
 .if ${SHLIB_TYPE} == "dylib"
-SOEXT=                 dylib
+SOEXT=         dylib
 .else
-SOEXT=                 so
+SOEXT=         so
 .endif
-PLIST_SUBST+=  SOEXT=${SOEXT}
+PLIST_SUBST+=  SOEXT=${SOEXT}
 
 post-extract:
        ${CHMOD} -R go-w ${WRKSRC}

Index: pkgsrc/databases/metakit-lib/Makefile
diff -u pkgsrc/databases/metakit-lib/Makefile:1.21 pkgsrc/databases/metakit-lib/Makefile:1.22
--- pkgsrc/databases/metakit-lib/Makefile:1.21  Tue Oct  2 21:25:22 2012
+++ pkgsrc/databases/metakit-lib/Makefile       Sat Nov  2 15:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/02 21:25:22 asau Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/02 15:38:02 rillig Exp $
 #
 
 VERSION=       2.4.9.7
@@ -11,14 +11,14 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.equi4.com/metakit/
 COMMENT=       Embedded database library
 
-GNU_CONFIGURE= yes
-CONFIGURE_DIRS=        builds
-CONFIGURE_SCRIPT= ../unix/configure
+GNU_CONFIGURE=         yes
+CONFIGURE_DIRS=                builds
+CONFIGURE_SCRIPT=      ../unix/configure
 CONFIGURE_ARGS+=       --without-tcl
-BUILD_DIRS=    builds
-USE_LANGUAGES= c c++
-USE_LIBTOOL=   yes
-TEST_TARGET=   test
+BUILD_DIRS=            builds
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
+TEST_TARGET=           test
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/include/mk4io.h ${DESTDIR}${PREFIX}/include

Index: pkgsrc/databases/myodbc/options.mk
diff -u pkgsrc/databases/myodbc/options.mk:1.7 pkgsrc/databases/myodbc/options.mk:1.8
--- pkgsrc/databases/myodbc/options.mk:1.7      Tue Sep 26 09:40:10 2017
+++ pkgsrc/databases/myodbc/options.mk  Sat Nov  2 15:38:02 2019
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.7 2017/09/26 09:40:10 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2019/11/02 15:38:02 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.myodbc
+PKG_OPTIONS_VAR=               PKG_OPTIONS.myodbc
 PKG_OPTIONS_REQUIRED_GROUPS=   db
-PKG_OPTIONS_GROUP.db=  iodbc unixodbc
-PKG_SUGGESTED_OPTIONS= iodbc
+PKG_OPTIONS_GROUP.db=          iodbc unixodbc
+PKG_SUGGESTED_OPTIONS=         iodbc
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/databases/mysql-cluster/Makefile.common
diff -u pkgsrc/databases/mysql-cluster/Makefile.common:1.15 pkgsrc/databases/mysql-cluster/Makefile.common:1.16
--- pkgsrc/databases/mysql-cluster/Makefile.common:1.15 Mon Feb  5 18:09:35 2018
+++ pkgsrc/databases/mysql-cluster/Makefile.common      Sat Nov  2 15:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2018/02/05 18:09:35 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.16 2019/11/02 15:38:02 rillig Exp $
 #
 # used by databases/mysql-cluster/Makefile
 
@@ -121,9 +121,9 @@ SUBST_SED.fixpaths= -e "s,${WRAPPER_BIND
 SUBST_SED.fixpaths+=   -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g"
 
 .if ${SHLIB_TYPE} == "dylib"
-SOEXT="dylib"
+SOEXT= "dylib"
 .else
-SOEXT="so"
+SOEXT= "so"
 .endif
 
 CMAKE_ARGS+=   -DWITH_EDITLINE=bundled

Index: pkgsrc/databases/mysql-workbench/Makefile
diff -u pkgsrc/databases/mysql-workbench/Makefile:1.75 pkgsrc/databases/mysql-workbench/Makefile:1.76
--- pkgsrc/databases/mysql-workbench/Makefile:1.75      Sun Jul 21 22:24:35 2019
+++ pkgsrc/databases/mysql-workbench/Makefile   Sat Nov  2 15:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2019/07/21 22:24:35 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2019/11/02 15:38:02 rillig Exp $
 
 DISTNAME=      mysql-workbench-gpl-5.2.33b-src
 PKGNAME=       ${DISTNAME:S/-gpl//:S/b-src$//}
@@ -13,15 +13,15 @@ LICENSE=    gnu-gpl-v2
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/b-src$/-src/}
 
-USE_LANGUAGES=         c c++11
-USE_LIBTOOL=           yes
-USE_TOOLS+=            bash gmake pkg-config
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-system-ctemplate
+USE_LANGUAGES=                 c c++11
+USE_LIBTOOL=                   yes
+USE_TOOLS+=                    bash gmake pkg-config
+GNU_CONFIGURE=                 yes
+CONFIGURE_ARGS+=               --with-system-ctemplate
 LUA_VERSIONS_INCOMPATIBLE=     52 53
 
-CHECK_PORTABILITY_SKIP=        build/make_dmg.sh
-CHECK_PORTABILITY_SKIP+=ext/ctemplate/ctemplate-src/configure.ac
+CHECK_PORTABILITY_SKIP=                build/make_dmg.sh
+CHECK_PORTABILITY_SKIP+=       ext/ctemplate/ctemplate-src/configure.ac
 
 SUBST_CLASSES+=                python
 SUBST_STAGE.python=    pre-configure

Index: pkgsrc/databases/mysql51-server/Makefile
diff -u pkgsrc/databases/mysql51-server/Makefile:1.33 pkgsrc/databases/mysql51-server/Makefile:1.34
--- pkgsrc/databases/mysql51-server/Makefile:1.33       Sun Aug 11 13:18:20 2019
+++ pkgsrc/databases/mysql51-server/Makefile    Sat Nov  2 15:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/08/11 13:18:20 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/02 15:38:02 rillig Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 PKGREVISION=   4
@@ -19,13 +19,13 @@ PLIST.embedded=             yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mndb-cluster)
-CONFIGURE_ARGS+=       --with-plugins=innobase,ndbcluster
-REPLACE_PERL+=         storage/ndb/tools/ndb_error_reporter \
+CONFIGURE_ARGS+=               --with-plugins=innobase,ndbcluster
+REPLACE_PERL+=                 storage/ndb/tools/ndb_error_reporter \
                        storage/ndb/tools/ndb_size.pl
-PLIST.ndb=             yes
+PLIST.ndb=                     yes
 BUILDLINK_DEPMETHOD.readline=  full
 .else
-CONFIGURE_ARGS+=       --with-plugins=innobase
+CONFIGURE_ARGS+=               --with-plugins=innobase
 .endif
 
 .if !empty(PKG_OPTIONS:Mpstack)

Index: pkgsrc/databases/mysql55-client/Makefile.common
diff -u pkgsrc/databases/mysql55-client/Makefile.common:1.65 pkgsrc/databases/mysql55-client/Makefile.common:1.66
--- pkgsrc/databases/mysql55-client/Makefile.common:1.65        Tue Apr 30 14:09:52 2019
+++ pkgsrc/databases/mysql55-client/Makefile.common     Sat Nov  2 15:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.65 2019/04/30 14:09:52 abs Exp $
+# $NetBSD: Makefile.common,v 1.66 2019/11/02 15:38:02 rillig Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
@@ -60,7 +60,7 @@ CMAKE_ARGS+=          -DINSTALL_SCRIPTDIR="bin"
 CMAKE_ARGS+=           -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
 CMAKE_ARGS+=           -DINSTALL_SUPPORTFILESDIR="share/mysql"
 CMAKE_ARGS+=           -DMYSQL_DATADIR=${MYSQL_DATADIR}
-CMAKE_ARGS+=            -DWITH_SSL=system
+CMAKE_ARGS+=           -DWITH_SSL=system
 
 # always use our own readline, not MySQL bundled one
 CMAKE_ARGS+=           -DWITH_LIBEDIT=OFF

Index: pkgsrc/databases/mysql57-server/Makefile
diff -u pkgsrc/databases/mysql57-server/Makefile:1.27 pkgsrc/databases/mysql57-server/Makefile:1.28
--- pkgsrc/databases/mysql57-server/Makefile:1.27       Mon Oct 14 20:19:29 2019
+++ pkgsrc/databases/mysql57-server/Makefile    Sat Nov  2 15:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/10/14 20:19:29 adam Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/02 15:38:02 rillig Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 COMMENT=       MySQL 5, a free SQL database (server)
@@ -10,10 +10,10 @@ CONFLICTS=  mysql3-server-[0-9]*
 CMAKE_ARGS+=           -DINSTALL_INFODIR=${PKGINFODIR}
 
 .if !empty(PKG_OPTIONS:Membedded-server)
-CMAKE_ARGS+=           -DWITH_EMBEDDED_SERVER=ON
-PLIST.embedded=                yes
+CMAKE_ARGS+=                   -DWITH_EMBEDDED_SERVER=ON
+PLIST.embedded=                        yes
 .else
-CMAKE_ARGS+=           -DWITH_EMBEDDED_SERVER=OFF
+CMAKE_ARGS+=                   -DWITH_EMBEDDED_SERVER=OFF
 # We only need readline to placate the configure script if we don't build
 # the embedded server as it is the only binary linked against "readline".
 BUILDLINK_DEPMETHOD.editline=  build

Index: pkgsrc/databases/ocaml-dbm/Makefile
diff -u pkgsrc/databases/ocaml-dbm/Makefile:1.19 pkgsrc/databases/ocaml-dbm/Makefile:1.20
--- pkgsrc/databases/ocaml-dbm/Makefile:1.19    Mon Nov 12 16:10:16 2018
+++ pkgsrc/databases/ocaml-dbm/Makefile Sat Nov  2 15:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/11/12 16:10:16 jaapb Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 15:38:02 rillig Exp $
 #
 
 PKGNAME=       ocaml-dbm-${VERSION}
@@ -16,9 +16,9 @@ LICENSE=      gnu-lgpl-v2
 
 CONFLICTS=     ocaml-findlib<1.4nb1
 
-HAS_CONFIGURE= yes
-USE_TOOLS+=    gmake
-MAKE_ENV+=     HAS_OCAMLOPT="${OCAML_USE_OPT_COMPILER}"
+HAS_CONFIGURE=         yes
+USE_TOOLS+=            gmake
+MAKE_ENV+=             HAS_OCAMLOPT="${OCAML_USE_OPT_COMPILER}"
 OCAML_USE_FINDLIB=     yes
 
 post-install:

Index: pkgsrc/databases/ocaml-ldap/Makefile
diff -u pkgsrc/databases/ocaml-ldap/Makefile:1.10 pkgsrc/databases/ocaml-ldap/Makefile:1.11
--- pkgsrc/databases/ocaml-ldap/Makefile:1.10   Mon Nov 12 16:10:17 2018
+++ pkgsrc/databases/ocaml-ldap/Makefile        Sat Nov  2 15:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/11/12 16:10:17 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/02 15:38:02 rillig Exp $
 
 VERSION=       2.3.0
 GITHUB_PROJECT=        ocamldap
@@ -14,8 +14,8 @@ HOMEPAGE=     http://ocamldap.sourceforge.ne
 COMMENT=       OCamL implementation of the LDAP protocol
 LICENSE=       gnu-lgpl-v2.1
 
-HAS_CONFIGURE= yes
-USE_LANGUAGES= # none
+HAS_CONFIGURE=         yes
+USE_LANGUAGES=         # none
 OCAML_USE_OASIS=       yes
 
 .include "../../mk/ocaml.mk"

Index: pkgsrc/databases/ocaml-macaque/Makefile
diff -u pkgsrc/databases/ocaml-macaque/Makefile:1.3 pkgsrc/databases/ocaml-macaque/Makefile:1.4
--- pkgsrc/databases/ocaml-macaque/Makefile:1.3 Mon Nov 12 16:10:17 2018
+++ pkgsrc/databases/ocaml-macaque/Makefile     Sat Nov  2 15:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/11/12 16:10:17 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 15:38:03 rillig Exp $
 
 GITHUB_PROJECT=        macaque
 DISTNAME=      ${GITHUB_PROJECT}-0.7.4
@@ -12,8 +12,8 @@ HOMEPAGE=     https://github.com/ocsigen/mac
 COMMENT=       Language for SQL queries in OCaml
 LICENSE=       gnu-lgpl-v2.1
 
-HAS_CONFIGURE= yes
-USE_LANGUAGES= c
+HAS_CONFIGURE=         yes
+USE_LANGUAGES=         c
 OCAML_USE_FINDLIB=     yes
 OCAML_USE_OASIS_DYNRUN=        yes
 

Index: pkgsrc/databases/ocaml-mysql/Makefile
diff -u pkgsrc/databases/ocaml-mysql/Makefile:1.28 pkgsrc/databases/ocaml-mysql/Makefile:1.29
--- pkgsrc/databases/ocaml-mysql/Makefile:1.28  Mon Nov 12 16:10:17 2018
+++ pkgsrc/databases/ocaml-mysql/Makefile       Sat Nov  2 15:38:03 2019
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.28 2018/11/12 16:10:17 jaapb Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/02 15:38:03 rillig Exp $
 #
 
 VERSION=       1.2.0
 GITHUB_PROJECT=        ocaml-mysql
 GITHUB_TAG=    v${VERSION}
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=           7
-CATEGORIES=            databases
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=ygrek/}
+PKGREVISION=   7
+CATEGORIES=    databases
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ygrek/}
 
 MAINTAINER=            jaapb%NetBSD.org@localhost
 HOMEPAGE=              http://ocaml-mysql.forge.ocamlcore.org/

Index: pkgsrc/databases/openldap-server/options.mk
diff -u pkgsrc/databases/openldap-server/options.mk:1.22 pkgsrc/databases/openldap-server/options.mk:1.23
--- pkgsrc/databases/openldap-server/options.mk:1.22    Sat Sep 28 08:07:51 2019
+++ pkgsrc/databases/openldap-server/options.mk Sat Nov  2 15:38:03 2019
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.22 2019/09/28 08:07:51 adam Exp $
+# $NetBSD: options.mk,v 1.23 2019/11/02 15:38:03 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap-server
-PKG_SUPPORTED_OPTIONS= bdb dso inet6 sasl slapi slp smbk5pwd
+PKG_OPTIONS_VAR=               PKG_OPTIONS.openldap-server
+PKG_SUPPORTED_OPTIONS=         bdb dso inet6 sasl slapi slp smbk5pwd
 PKG_OPTIONS_OPTIONAL_GROUPS+=  odbc
-PKG_OPTIONS_GROUP.odbc=        iodbc unixodbc
-PKG_SUGGESTED_OPTIONS= bdb inet6
+PKG_OPTIONS_GROUP.odbc=                iodbc unixodbc
+PKG_SUGGESTED_OPTIONS=         bdb inet6
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/databases/oraedit/Makefile
diff -u pkgsrc/databases/oraedit/Makefile:1.25 pkgsrc/databases/oraedit/Makefile:1.26
--- pkgsrc/databases/oraedit/Makefile:1.25      Thu Apr 25 07:32:41 2019
+++ pkgsrc/databases/oraedit/Makefile   Sat Nov  2 15:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/04/25 07:32:41 maya Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/02 15:38:03 rillig Exp $
 
 DISTNAME=      oraedit-0.1.4
 PKGREVISION=   6
@@ -11,7 +11,7 @@ COMMENT=      Editor of PL/SQL source stored 
 
 NO_BUILD=      yes
 
-REPLACE_PYTHON=        oraedit
+REPLACE_PYTHON=                oraedit
 INSTALLATION_DIRS=     bin
 
 do-configure:;

Index: pkgsrc/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
diff -u pkgsrc/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile:1.15 pkgsrc/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile:1.16
--- pkgsrc/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile:1.15       Sun Aug 11 13:18:23 2019
+++ pkgsrc/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile    Sat Nov  2 15:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:18:23 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 15:38:03 rillig Exp $
 #
 
 DISTNAME=      Class-DBI-Plugin-DeepAbstractSearch-0.08
@@ -11,9 +11,9 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://metacpan.org/pod/Class::DBI::Plugin::DeepAbstractSearch
 COMMENT=       Implement deep_search_where() for Class::DBI
 
-DEPENDS+=      p5-Class-DBI>=0.96:../../databases/p5-Class-DBI
-DEPENDS+=      p5-Class-DBI-Plugin>=0.02:../../databases/p5-Class-DBI-Plugin
-DEPENDS+=      p5-SQL-Abstract>=1.18:../../databases/p5-SQL-Abstract
+DEPENDS+=              p5-Class-DBI>=0.96:../../databases/p5-Class-DBI
+DEPENDS+=              p5-Class-DBI-Plugin>=0.02:../../databases/p5-Class-DBI-Plugin
+DEPENDS+=              p5-SQL-Abstract>=1.18:../../databases/p5-SQL-Abstract
 #BUILD_DEPENDS+=       {perl>=5.6.2,p5-Test-Simple>=0.32}:../../devel/p5-Test-Simple
 
 PERL5_PACKLIST=        auto/Class/DBI/Plugin/DeepAbstractSearch/.packlist

Index: pkgsrc/databases/p5-DBD-Sybase/Makefile
diff -u pkgsrc/databases/p5-DBD-Sybase/Makefile:1.54 pkgsrc/databases/p5-DBD-Sybase/Makefile:1.55
--- pkgsrc/databases/p5-DBD-Sybase/Makefile:1.54        Sun Aug 11 13:18:25 2019
+++ pkgsrc/databases/p5-DBD-Sybase/Makefile     Sat Nov  2 15:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/08/11 13:18:25 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2019/11/02 15:38:03 rillig Exp $
 
 DISTNAME=              DBD-Sybase-1.15
 PKGNAME=               p5-${DISTNAME}
@@ -18,13 +18,13 @@ BUILD_DEFS+=                SYBASE
 
 .if defined(USE_SYBASE_OPENCLIENT) && empty(USE_SYBASE_OPENCLIENT:M[Nn][Oo])
 .  if defined(SYBASE) || exists(${SYBASE}/lib/libct.so)
-BUILDLINK_PASSTHRU_DIRS=${SYBASE}
-_SYBASE=               ${SYBASE}
+BUILDLINK_PASSTHRU_DIRS=       ${SYBASE}
+_SYBASE=                       ${SYBASE}
 .  else
-PKG_FAIL_REASON+=      "You must define SYBASE to the base directory of your Open Client."
+PKG_FAIL_REASON+=              "You must define SYBASE to the base directory of your Open Client."
 .  endif
 .else
-_SYBASE=               ${BUILDLINK_PREFIX.freetds}
+_SYBASE=                       ${BUILDLINK_PREFIX.freetds}
 .endif
 
 PERL5_LDFLAGS+=                ${COMPILER_RPATH_FLAG}${_SYBASE}/lib

Index: pkgsrc/databases/p5-DBIx-Class/Makefile
diff -u pkgsrc/databases/p5-DBIx-Class/Makefile:1.45 pkgsrc/databases/p5-DBIx-Class/Makefile:1.46
--- pkgsrc/databases/p5-DBIx-Class/Makefile:1.45        Sun Aug 11 13:18:26 2019
+++ pkgsrc/databases/p5-DBIx-Class/Makefile     Sat Nov  2 15:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/08/11 13:18:26 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/02 15:38:03 rillig Exp $
 
 DISTNAME=      DBIx-Class-0.082841
 PKGNAME=       p5-${DISTNAME}
@@ -33,16 +33,16 @@ DEPENDS+=   p5-Sub-Name>=0.04:../../devel/
 DEPENDS+=      p5-Try-Tiny>=0.07:../../devel/p5-Try-Tiny
 DEPENDS+=      p5-namespace-clean>=0.24:../../devel/p5-namespace-clean
 
-BUILD_DEPENDS+=        p5-DBD-SQLite>=1.40:../../databases/p5-DBD-SQLite
-BUILD_DEPENDS+= p5-Package-Stash>=0.28:../../devel/p5-Package-Stash
+BUILD_DEPENDS+=                p5-DBD-SQLite>=1.40:../../databases/p5-DBD-SQLite
+BUILD_DEPENDS+=                p5-Package-Stash>=0.28:../../devel/p5-Package-Stash
 #BUILD_DEPENDS+=       {perl>=5.10.1,p5-File-Temp>=0.22}:../../devel/p5-File-Temp
-BUILD_DEPENDS+=        p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=                p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 #BUILD_DEPENDS+=       {perl>=5.10.1,p5-Test-Simple>=0.92}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=        p5-Test-Warn>=0.21:../../devel/p5-Test-Warn
-BUILD_DEPENDS+=        p5-Class-DBI>=0:../../databases/p5-Class-DBI
-BUILD_DEPENDS+=        p5-SQL-Translator>=0.11018:../../databases/p5-SQL-Translator
+BUILD_DEPENDS+=                p5-Test-Warn>=0.21:../../devel/p5-Test-Warn
+BUILD_DEPENDS+=                p5-Class-DBI>=0:../../databases/p5-Class-DBI
+BUILD_DEPENDS+=                p5-SQL-Translator>=0.11018:../../databases/p5-SQL-Translator
 # for make test
-BUILD_DEPENDS+=        p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
+BUILD_DEPENDS+=                p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
 
 REPLACE_PERL=  script/dbicadmin
 

Index: pkgsrc/databases/p5-DBIx-Class-DigestColumns/Makefile
diff -u pkgsrc/databases/p5-DBIx-Class-DigestColumns/Makefile:1.16 pkgsrc/databases/p5-DBIx-Class-DigestColumns/Makefile:1.17
--- pkgsrc/databases/p5-DBIx-Class-DigestColumns/Makefile:1.16  Sun Aug 11 13:18:26 2019
+++ pkgsrc/databases/p5-DBIx-Class-DigestColumns/Makefile       Sat Nov  2 15:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:26 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:03 rillig Exp $
 
 DISTNAME=      DBIx-Class-DigestColumns-0.06000
 PKGNAME=       p5-${DISTNAME}
@@ -13,12 +13,12 @@ COMMENT=    Automatic digest columns for DB
 DEPENDS+=      p5-DBIx-Class>=0.06002:../../databases/p5-DBIx-Class
 #DEPENDS+=     {perl>=5.7.3,p5-Digest-MD5>=0}:../../security/p5-Digest-MD5
 
-BUILD_DEPENDS+= p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite
+BUILD_DEPENDS+=        p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite
 
 USE_LANGUAGES= # empty
 PERL5_PACKLIST=        auto/DBIx/Class/DigestColumns/.packlist
 
-PERL5_MODULE_TYPE=     Module::Build
+PERL5_MODULE_TYPE=     Module::Build
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/p5-DBIx-Class-Fixtures/Makefile
diff -u pkgsrc/databases/p5-DBIx-Class-Fixtures/Makefile:1.30 pkgsrc/databases/p5-DBIx-Class-Fixtures/Makefile:1.31
--- pkgsrc/databases/p5-DBIx-Class-Fixtures/Makefile:1.30       Sun Aug 11 13:18:27 2019
+++ pkgsrc/databases/p5-DBIx-Class-Fixtures/Makefile    Sat Nov  2 15:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/08/11 13:18:27 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/02 15:38:03 rillig Exp $
 
 DISTNAME=      DBIx-Class-Fixtures-1.001039
 PKGNAME=       p5-${DISTNAME}
@@ -34,8 +34,8 @@ DEPENDS+=     p5-Test-Compile>=0:../../devel
 BUILD_DEPENDS+=        p5-Test-TempDir-Tiny>=0:../../devel/p5-Test-TempDir-Tiny
 BUILD_DEPENDS+=        p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST=        auto/DBIx/Class/Fixtures/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/DBIx/Class/Fixtures/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
diff -u pkgsrc/databases/p5-DBIx-Class-InflateColumn-FS/Makefile:1.9 pkgsrc/databases/p5-DBIx-Class-InflateColumn-FS/Makefile:1.10
--- pkgsrc/databases/p5-DBIx-Class-InflateColumn-FS/Makefile:1.9        Sun Aug 11 13:18:27 2019
+++ pkgsrc/databases/p5-DBIx-Class-InflateColumn-FS/Makefile    Sat Nov  2 15:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/08/11 13:18:27 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/02 15:38:04 rillig Exp $
 
 DISTNAME=      DBIx-Class-InflateColumn-FS-0.01007
 PKGNAME=       p5-${DISTNAME}
@@ -19,8 +19,8 @@ DEPENDS+=     p5-DBIx-Class-UUIDColumns>=0.0
 DEPENDS+=      p5-Path-Class-[0-9]*:../../devel/p5-Path-Class
 
 # For test really
-BUILD_DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
-BUILD_DEPENDS+= p5-DBICx-TestDatabase-[0-9]*:../../databases/p5-DBICx-TestDatabase
+BUILD_DEPENDS+=        p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
+BUILD_DEPENDS+=        p5-DBICx-TestDatabase-[0-9]*:../../databases/p5-DBICx-TestDatabase
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1
 

Index: pkgsrc/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
diff -u pkgsrc/databases/p5-DBIx-Class-InflateColumn-IP/Makefile:1.16 pkgsrc/databases/p5-DBIx-Class-InflateColumn-IP/Makefile:1.17
--- pkgsrc/databases/p5-DBIx-Class-InflateColumn-IP/Makefile:1.16       Sun Aug 11 13:18:27 2019
+++ pkgsrc/databases/p5-DBIx-Class-InflateColumn-IP/Makefile    Sat Nov  2 15:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:27 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:04 rillig Exp $
 
 DISTNAME=      DBIx-Class-InflateColumn-IP-0.02003
 PKGNAME=       p5-${DISTNAME}
@@ -18,7 +18,7 @@ PERL5_PACKLIST=       auto/DBIx/Class/InflateC
 DEPENDS+=      p5-DBIx-Class>=0.07005:../../databases/p5-DBIx-Class
 DEPENDS+=      p5-NetAddr-IP-[0-9]*:../../net/p5-NetAddr-IP
 # For test really
-BUILD_DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
+BUILD_DEPENDS+=        p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/p5-DBIx-Class-Schema-Loader/Makefile
diff -u pkgsrc/databases/p5-DBIx-Class-Schema-Loader/Makefile:1.39 pkgsrc/databases/p5-DBIx-Class-Schema-Loader/Makefile:1.40
--- pkgsrc/databases/p5-DBIx-Class-Schema-Loader/Makefile:1.39  Sun Aug 11 13:18:28 2019
+++ pkgsrc/databases/p5-DBIx-Class-Schema-Loader/Makefile       Sat Nov  2 15:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/08/11 13:18:28 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/02 15:38:04 rillig Exp $
 
 DISTNAME=      DBIx-Class-Schema-Loader-0.07049
 PKGNAME=       p5-${DISTNAME}
@@ -13,20 +13,20 @@ LICENSE=    ${PERL5_LICENSE}
 
 .include "options.mk"
 
-BUILD_DEPENDS+=        p5-Config-Any-[0-9]*:../../devel/p5-Config-Any
-BUILD_DEPENDS+=        p5-Config-General-[0-9]*:../../devel/p5-Config-General
-BUILD_DEPENDS+=        p5-DBD-SQLite>=1.29:../../databases/p5-DBD-SQLite
+BUILD_DEPENDS+=                p5-Config-Any-[0-9]*:../../devel/p5-Config-Any
+BUILD_DEPENDS+=                p5-Config-General-[0-9]*:../../devel/p5-Config-General
+BUILD_DEPENDS+=                p5-DBD-SQLite>=1.29:../../databases/p5-DBD-SQLite
 #BUILD_DEPENDS+=       {perl>=5.10.1,p5-File-Path>=2.07}:../../devel/p5-File-Path
-BUILD_DEPENDS+=        p5-Moose>=1.1200:../../devel/p5-Moose
-BUILD_DEPENDS+=        p5-MooseX-MarkAsMethods>=0.13:../../devel/p5-MooseX-MarkAsMethods
-BUILD_DEPENDS+=        p5-MooseX-NonMoose>=0.16:../../devel/p5-MooseX-NonMoose
+BUILD_DEPENDS+=                p5-Moose>=1.1200:../../devel/p5-Moose
+BUILD_DEPENDS+=                p5-MooseX-MarkAsMethods>=0.13:../../devel/p5-MooseX-MarkAsMethods
+BUILD_DEPENDS+=                p5-MooseX-NonMoose>=0.16:../../devel/p5-MooseX-NonMoose
 #BUILD_DEPENDS+=       {perl>=5.18.0,p5-Pod-Simple>=3.22}:../../textproc/p5-Pod-Simple
-BUILD_DEPENDS+=        p5-Text-Unidecode>=0:../../textproc/p5-Text-Unidecode
-BUILD_DEPENDS+=        p5-Test-Exception>=0.31:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=                p5-Text-Unidecode>=0:../../textproc/p5-Text-Unidecode
+BUILD_DEPENDS+=                p5-Test-Exception>=0.31:../../devel/p5-Test-Exception
 # BUILD_DEPENDS+=      p5-Test-Kwalitee-[0-9]*:../../devel/p5-Test-Kwalitee
 #BUILD_DEPENDS+=       {perl>=5.12.0,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=        p5-Test-Warn>=0.21:../../devel/p5-Test-Warn
-BUILD_DEPENDS+=        p5-namespace-autoclean>=0.09:../../devel/p5-namespace-autoclean
+BUILD_DEPENDS+=                p5-Test-Warn>=0.21:../../devel/p5-Test-Warn
+BUILD_DEPENDS+=                p5-namespace-autoclean>=0.09:../../devel/p5-namespace-autoclean
 
 DEPENDS+=      p5-Carp-Clan-[0-9]*:../../devel/p5-Carp-Clan
 DEPENDS+=      p5-Class-Accessor-Grouped>=0.10008:../../devel/p5-Class-Accessor-Grouped
@@ -61,8 +61,8 @@ BUILD_DEPENDS+=       p5-Text-Diff-[0-9]*:../.
 # Avoid complaints if we do not have DB2, Oracle, Pg and mysql
 MAKE_ENV+=     DBIC_FEATURE_NOQUESTIONS=1
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST=        auto/DBIx/Class/Schema/Loader/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/DBIx/Class/Schema/Loader/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 pre-configure:

Index: pkgsrc/databases/p5-DBIx-Class-TimeStamp/Makefile
diff -u pkgsrc/databases/p5-DBIx-Class-TimeStamp/Makefile:1.23 pkgsrc/databases/p5-DBIx-Class-TimeStamp/Makefile:1.24
--- pkgsrc/databases/p5-DBIx-Class-TimeStamp/Makefile:1.23      Sun Aug 11 13:18:28 2019
+++ pkgsrc/databases/p5-DBIx-Class-TimeStamp/Makefile   Sat Nov  2 15:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:18:28 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/02 15:38:04 rillig Exp $
 
 DISTNAME=      DBIx-Class-TimeStamp-0.14
 PKGNAME=       p5-${DISTNAME}
@@ -12,14 +12,14 @@ COMMENT=    DBIx::Class component to automa
 LICENSE=       ${PERL5_LICENSE}
 
 PERL5_MODULE_TYPE=     Module::Install::Bundled
-USE_LANGUAGES= # empty
-PERL5_PACKLIST=        auto/DBIx/Class/TimeStamp/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/DBIx/Class/TimeStamp/.packlist
 
-BUILD_DEPENDS+=        p5-Class-Accessor-Grouped-[0-9]*:../../devel/p5-Class-Accessor-Grouped
-BUILD_DEPENDS+=        p5-DateTime-Format-MySQL-[0-9]*:../../time/p5-DateTime-Format-MySQL
-BUILD_DEPENDS+=        p5-DateTime-Format-SQLite-[0-9]*:../../time/p5-DateTime-Format-SQLite
+BUILD_DEPENDS+=                p5-Class-Accessor-Grouped-[0-9]*:../../devel/p5-Class-Accessor-Grouped
+BUILD_DEPENDS+=                p5-DateTime-Format-MySQL-[0-9]*:../../time/p5-DateTime-Format-MySQL
+BUILD_DEPENDS+=                p5-DateTime-Format-SQLite-[0-9]*:../../time/p5-DateTime-Format-SQLite
 #BUILD_DEPENDS+=       {perl>=5.10,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
-BUILD_DEPENDS+=        p5-Time-Warp-[0-9]*:../../time/p5-Time-Warp
+BUILD_DEPENDS+=                p5-Time-Warp-[0-9]*:../../time/p5-Time-Warp
 
 DEPENDS+=      p5-DBIx-Class>=0.08009:../../databases/p5-DBIx-Class
 DEPENDS+=      p5-DBIx-Class-DynamicDefault>=0.03:../../databases/p5-DBIx-Class-DynamicDefault

Index: pkgsrc/databases/p5-DBIx-Class-UUIDColumns/Makefile
diff -u pkgsrc/databases/p5-DBIx-Class-UUIDColumns/Makefile:1.16 pkgsrc/databases/p5-DBIx-Class-UUIDColumns/Makefile:1.17
--- pkgsrc/databases/p5-DBIx-Class-UUIDColumns/Makefile:1.16    Sun Aug 11 13:18:28 2019
+++ pkgsrc/databases/p5-DBIx-Class-UUIDColumns/Makefile Sat Nov  2 15:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:28 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:04 rillig Exp $
 
 DISTNAME=      DBIx-Class-UUIDColumns-0.02006
 PKGNAME=       p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=     p5-DBIx-Class>=0.07005:../../d
 DEPENDS+=      p5-Data-UUID>=0:../../devel/p5-Data-UUID
 DEPENDS+=      p5-Class-Accessor-Grouped>=0:../../devel/p5-Class-Accessor-Grouped
 
-BUILD_DEPENDS+= p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite
+BUILD_DEPENDS+=        p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite
 
 USE_LANGUAGES= # empty
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1

Index: pkgsrc/databases/p5-DBIx-Class-Validation/Makefile
diff -u pkgsrc/databases/p5-DBIx-Class-Validation/Makefile:1.19 pkgsrc/databases/p5-DBIx-Class-Validation/Makefile:1.20
--- pkgsrc/databases/p5-DBIx-Class-Validation/Makefile:1.19     Sun Aug 11 13:18:28 2019
+++ pkgsrc/databases/p5-DBIx-Class-Validation/Makefile  Sat Nov  2 15:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:18:28 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 15:38:04 rillig Exp $
 
 DISTNAME=      DBIx-Class-Validation-0.02005
 PKGNAME=       p5-${DISTNAME}
@@ -15,11 +15,11 @@ DEPENDS+=   p5-DBIx-Class>=0.07005:../../d
 DEPENDS+=      p5-FormValidator-Simple>=0.17:../../textproc/p5-FormValidator-Simple
 DEPENDS+=      p5-Data-FormValidator-[0-9]*:../../textproc/p5-Data-FormValidator
 
-BUILD_DEPENDS+= p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite
+BUILD_DEPENDS+=        p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite
 BUILD_DEPENDS+=        p5-DateTime-Format-SQLite-[0-9]*:../../time/p5-DateTime-Format-SQLite
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST=        auto/DBIx/Class/Validation/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/DBIx/Class/Validation/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1

Index: pkgsrc/databases/p5-Net-FileMaker/Makefile
diff -u pkgsrc/databases/p5-Net-FileMaker/Makefile:1.5 pkgsrc/databases/p5-Net-FileMaker/Makefile:1.6
--- pkgsrc/databases/p5-Net-FileMaker/Makefile:1.5      Sun Aug 11 13:18:31 2019
+++ pkgsrc/databases/p5-Net-FileMaker/Makefile  Sat Nov  2 15:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/08/11 13:18:31 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 15:38:04 rillig Exp $
 
 DISTNAME=      Net-FileMaker-0.064
 PKGNAME=       p5-${DISTNAME}
@@ -12,9 +12,9 @@ COMMENT=      Perl Module to interact with Fi
 LICENSE=       ${PERL5_LICENSE}
 
 # for make test
-BUILD_DEPENDS+=p5-XML-Twig-[0-9]*:../../textproc/p5-XML-Twig
-BUILD_DEPENDS+=p5-DateTime-[0-9]*:../../time/p5-DateTime
-BUILD_DEPENDS+=p5-DateTime-Format-CLDR-[0-9]*:../../time/p5-DateTime-Format-CLDR
+BUILD_DEPENDS+=        p5-XML-Twig-[0-9]*:../../textproc/p5-XML-Twig
+BUILD_DEPENDS+=        p5-DateTime-[0-9]*:../../time/p5-DateTime
+BUILD_DEPENDS+=        p5-DateTime-Format-CLDR-[0-9]*:../../time/p5-DateTime-Format-CLDR
 
 PERL5_PACKLIST=        auto/Net/FileMaker/.packlist
 

Index: pkgsrc/databases/p5-Net-MySQL/Makefile
diff -u pkgsrc/databases/p5-Net-MySQL/Makefile:1.16 pkgsrc/databases/p5-Net-MySQL/Makefile:1.17
--- pkgsrc/databases/p5-Net-MySQL/Makefile:1.16 Sun Aug 11 13:18:31 2019
+++ pkgsrc/databases/p5-Net-MySQL/Makefile      Sat Nov  2 15:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:31 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:04 rillig Exp $
 #
 
 DISTNAME=      Net-MySQL-0.11
@@ -11,7 +11,7 @@ MAINTAINER=   ficovh%yahoo.com@localhost
 HOMEPAGE=      https://cpan.metacpan.org/authors/id/O/OY/OYAMA/
 COMMENT=       Net::MySQL - Pure Perl MySQL network protocol interface
 
-DEPENDS+=       p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
+DEPENDS+=      p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
 
 PERL5_PACKLIST=        auto/Net/MySQL/.packlist
 USE_LANGUAGES= # none

Index: pkgsrc/databases/p5-ORLite-Migrate/Makefile
diff -u pkgsrc/databases/p5-ORLite-Migrate/Makefile:1.19 pkgsrc/databases/p5-ORLite-Migrate/Makefile:1.20
--- pkgsrc/databases/p5-ORLite-Migrate/Makefile:1.19    Sun Aug 11 13:18:31 2019
+++ pkgsrc/databases/p5-ORLite-Migrate/Makefile Sat Nov  2 15:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:18:31 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 15:38:05 rillig Exp $
 
 DISTNAME=      ORLite-Migrate-1.10
 PKGNAME=       p5-${DISTNAME}
@@ -23,7 +23,7 @@ DEPENDS+=     p5-Probe-Perl>=0.01:../../deve
 BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.580
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/ORLite/Migrate/.packlist
+PERL5_PACKLIST=        auto/ORLite/Migrate/.packlist
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1
 

Index: pkgsrc/databases/p5-Parse-Dia-SQL/Makefile
diff -u pkgsrc/databases/p5-Parse-Dia-SQL/Makefile:1.8 pkgsrc/databases/p5-Parse-Dia-SQL/Makefile:1.9
--- pkgsrc/databases/p5-Parse-Dia-SQL/Makefile:1.8      Sun Aug 11 13:18:32 2019
+++ pkgsrc/databases/p5-Parse-Dia-SQL/Makefile  Sat Nov  2 15:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:18:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 15:38:05 rillig Exp $
 
 DISTNAME=      Parse-Dia-SQL-0.30
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/P
 COMMENT=       Perl module to convert Dia diagrams to SQL
 LICENSE=       gnu-gpl-v2 OR gnu-gpl-v3
 
-BUILD_DEPENDS+= p5-CPAN-Meta-[0-9]*:../../devel/p5-CPAN-Meta
+BUILD_DEPENDS+=        p5-CPAN-Meta-[0-9]*:../../devel/p5-CPAN-Meta
 
 DEPENDS+=      p5-Log-Log4perl-[0-9]*:../../devel/p5-Log-Log4perl
 DEPENDS+=      p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
@@ -19,7 +19,7 @@ DEPENDS+=     p5-Text-Table-[0-9]*:../../tex
 DEPENDS+=      p5-XML-DOM-[0-9]*:../../textproc/p5-XML-DOM
 DEPENDS+=      p5-HTML-Lint-[0-9]*:../../www/p5-HTML-Lint
 
-PERL5_PACKLIST= auto/Parse/Dia/SQL/.packlist
+PERL5_PACKLIST=        auto/Parse/Dia/SQL/.packlist
 
 REPLACE_PERL+= bin/parsediasql
 

Index: pkgsrc/databases/p5-RRD-Simple/Makefile
diff -u pkgsrc/databases/p5-RRD-Simple/Makefile:1.42 pkgsrc/databases/p5-RRD-Simple/Makefile:1.43
--- pkgsrc/databases/p5-RRD-Simple/Makefile:1.42        Sun Aug 11 13:18:32 2019
+++ pkgsrc/databases/p5-RRD-Simple/Makefile     Sat Nov  2 15:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/08/11 13:18:32 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/02 15:38:05 rillig Exp $
 
 DISTNAME=      RRD-Simple-1.44
 PKGNAME=       p5-${DISTNAME}
@@ -11,10 +11,10 @@ HOMEPAGE=   https://metacpan.org/release/R
 COMMENT=       RRD::Simple implementation for Perl
 LICENSE=       apache-2.0
 
-BUILD_DEPENDS+= p5-Test-Pod>=1.26:../../devel/p5-Test-Pod
-BUILD_DEPENDS+= p5-Pod-Coverage>=0.18:../../textproc/p5-Pod-Coverage
-BUILD_DEPENDS+= p5-Test-Pod-Coverage>=1.08:../../devel/p5-Test-Pod-Coverage
-BUILD_DEPENDS+= p5-Test-Deep>=0.096:../../devel/p5-Test-Deep
+BUILD_DEPENDS+=        p5-Test-Pod>=1.26:../../devel/p5-Test-Pod
+BUILD_DEPENDS+=        p5-Pod-Coverage>=0.18:../../textproc/p5-Pod-Coverage
+BUILD_DEPENDS+=        p5-Test-Pod-Coverage>=1.08:../../devel/p5-Test-Pod-Coverage
+BUILD_DEPENDS+=        p5-Test-Deep>=0.096:../../devel/p5-Test-Deep
 
 PERL5_MODULE_TYPE=     Module::Build
 PERL5_PACKLIST=                auto/RRD/Simple/.packlist

Index: pkgsrc/databases/p5-Rose-DB/Makefile
diff -u pkgsrc/databases/p5-Rose-DB/Makefile:1.30 pkgsrc/databases/p5-Rose-DB/Makefile:1.31
--- pkgsrc/databases/p5-Rose-DB/Makefile:1.30   Sun Aug 11 13:18:32 2019
+++ pkgsrc/databases/p5-Rose-DB/Makefile        Sat Nov  2 15:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/08/11 13:18:32 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/02 15:38:05 rillig Exp $
 
 DISTNAME=      Rose-DB-0.778
 PKGNAME=       p5-${DISTNAME}
@@ -23,7 +23,7 @@ DEPENDS+=     p5-SQL-ReservedWords-[0-9]*:..
 DEPENDS+=      p5-Time-Clock-[0-9]*:../../time/p5-Time-Clock
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Rose/DB/.packlist
+PERL5_PACKLIST=        auto/Rose/DB/.packlist
 
 post-extract:
        ${FIND} ${WRKSRC} -name "*.pm" -type f -exec ${CHMOD} -x {} \;

Index: pkgsrc/databases/p5-Rose-DB-Object/Makefile
diff -u pkgsrc/databases/p5-Rose-DB-Object/Makefile:1.27 pkgsrc/databases/p5-Rose-DB-Object/Makefile:1.28
--- pkgsrc/databases/p5-Rose-DB-Object/Makefile:1.27    Sun Aug 11 13:18:32 2019
+++ pkgsrc/databases/p5-Rose-DB-Object/Makefile Sat Nov  2 15:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/08/11 13:18:32 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/02 15:38:05 rillig Exp $
 
 DISTNAME=      Rose-DB-Object-0.815
 PKGNAME=       p5-${DISTNAME}
@@ -21,7 +21,7 @@ DEPENDS+=     p5-Rose-Object>=0.854:../../de
 DEPENDS+=      p5-Time-Clock-[0-9]*:../../time/p5-Time-Clock
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Rose/DB/Object/.packlist
+PERL5_PACKLIST=        auto/Rose/DB/Object/.packlist
 
 post-extract:
        ${FIND} ${WRKSRC} -name "*.pm" -type f -exec ${CHMOD} -x {} \;

Index: pkgsrc/databases/p5-Rose-DBx-Garden-Catalyst/Makefile
diff -u pkgsrc/databases/p5-Rose-DBx-Garden-Catalyst/Makefile:1.23 pkgsrc/databases/p5-Rose-DBx-Garden-Catalyst/Makefile:1.24
--- pkgsrc/databases/p5-Rose-DBx-Garden-Catalyst/Makefile:1.23  Sun Aug 11 13:18:33 2019
+++ pkgsrc/databases/p5-Rose-DBx-Garden-Catalyst/Makefile       Sat Nov  2 15:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:18:33 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/02 15:38:05 rillig Exp $
 
 DISTNAME=      Rose-DBx-Garden-Catalyst-0.180
 PKGNAME=       p5-${DISTNAME}
@@ -36,17 +36,17 @@ DEPENDS+=   p5-Tree-Simple-VisitorFactory-
 #DEPENDS+=     {perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
 
 # For tests:
-BUILD_DEPENDS+=        sqlite3>=0:../../databases/sqlite3
+BUILD_DEPENDS+=                sqlite3>=0:../../databases/sqlite3
 #BUILD_DEPENDS+=       {perl>5.10,p5-IPC-Cmd>=0}:../../devel/p5-IPC-Cmd
 
-SUBST_CLASSES+=        sqlite3
+SUBST_CLASSES+=                sqlite3
 SUBST_MESSAGE.sqlite3= Fixing sqlite3-using test
 SUBST_STAGE.sqlite3=   post-configure
 SUBST_FILES.sqlite3=   t/lib/MyDB.pm
 SUBST_SED.sqlite3=     -e "s!\"sqlite3!\"${PREFIX}/bin/sqlite3!"
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Rose/DBx/Garden/Catalyst/.packlist
+PERL5_PACKLIST=        auto/Rose/DBx/Garden/Catalyst/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
diff -u pkgsrc/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile:1.18 pkgsrc/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile:1.19
--- pkgsrc/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile:1.18       Sun Aug 11 13:18:33 2019
+++ pkgsrc/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile    Sat Nov  2 15:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:18:33 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 15:38:05 rillig Exp $
 
 DISTNAME=      Rose-DBx-Object-MoreHelpers-0.100
 PKGNAME=       p5-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=     p5-Rose-DB-Object>=0.770:../..
 DEPENDS+=      p5-Rose-DBx-TestDB-[0-9]*:../../databases/p5-Rose-DBx-TestDB
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Rose/DBx/Object/MoreHelpers/.packlist
+PERL5_PACKLIST=        auto/Rose/DBx/Object/MoreHelpers/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/p5-Rose-DBx-TestDB/Makefile
diff -u pkgsrc/databases/p5-Rose-DBx-TestDB/Makefile:1.16 pkgsrc/databases/p5-Rose-DBx-TestDB/Makefile:1.17
--- pkgsrc/databases/p5-Rose-DBx-TestDB/Makefile:1.16   Sun Aug 11 13:18:33 2019
+++ pkgsrc/databases/p5-Rose-DBx-TestDB/Makefile        Sat Nov  2 15:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:33 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:05 rillig Exp $
 
 DISTNAME=      Rose-DBx-TestDB-0.05
 PKGNAME=       p5-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=     p5-Rose-DB-[0-9]*:../../databa
 #DEPENDS+=     {perl>=5.6.1,p5-File-Temp-[0-9]*}:../../devel/p5-File-Temp
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Rose/DBx/TestDB/.packlist
+PERL5_PACKLIST=        auto/Rose/DBx/TestDB/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/p5-SQL-Abstract/Makefile
diff -u pkgsrc/databases/p5-SQL-Abstract/Makefile:1.44 pkgsrc/databases/p5-SQL-Abstract/Makefile:1.45
--- pkgsrc/databases/p5-SQL-Abstract/Makefile:1.44      Sun Aug 11 13:18:33 2019
+++ pkgsrc/databases/p5-SQL-Abstract/Makefile   Sat Nov  2 15:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2019/08/11 13:18:33 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2019/11/02 15:38:05 rillig Exp $
 
 DISTNAME=      SQL-Abstract-1.86
 PKGNAME=       p5-${DISTNAME}
@@ -16,12 +16,12 @@ DEPENDS+=   p5-Getopt-Long-Descriptive>=0.
 DEPENDS+=      p5-Hash-Merge>=0.12:../../devel/p5-Hash-Merge
 #DEPENDS+=     {perl>=5.7.3,p5-Scalar-List-Utils-[0-9]*}:../../devel/p5-Scalar-List-Utils
 
-BUILD_DEPENDS+=        p5-Moo-[0-9]*:../../devel/p5-Moo
-BUILD_DEPENDS+=        p5-Test-Deep>=0.101:../../devel/p5-Test-Deep
-BUILD_DEPENDS+=        p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=                p5-Moo-[0-9]*:../../devel/p5-Moo
+BUILD_DEPENDS+=                p5-Test-Deep>=0.101:../../devel/p5-Test-Deep
+BUILD_DEPENDS+=                p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 #BUILD_DEPENDS+=       {perl>=5.10.1,p5-Test-Simple>=0.92}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=        p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
-BUILD_DEPENDS+=        p5-Tree-DAG_Node>=0:../../devel/p5-Tree-DAG_Node
+BUILD_DEPENDS+=                p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
+BUILD_DEPENDS+=                p5-Tree-DAG_Node>=0:../../devel/p5-Tree-DAG_Node
 
 PERL5_PACKLIST=                auto/SQL/Abstract/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled

Index: pkgsrc/databases/p5-SQL-Translator/Makefile
diff -u pkgsrc/databases/p5-SQL-Translator/Makefile:1.37 pkgsrc/databases/p5-SQL-Translator/Makefile:1.38
--- pkgsrc/databases/p5-SQL-Translator/Makefile:1.37    Sun Sep 15 06:27:08 2019
+++ pkgsrc/databases/p5-SQL-Translator/Makefile Sat Nov  2 15:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/09/15 06:27:08 mef Exp $
+# $NetBSD: Makefile,v 1.38 2019/11/02 15:38:06 rillig Exp $
 
 DISTNAME=      SQL-Translator-1.60
 PKGNAME=       p5-${DISTNAME}
@@ -37,15 +37,15 @@ DEPENDS+=   p5-XML-LibXML>=1.69:../../text
 DEPENDS+=      p5-YAML>=0.66:../../textproc/p5-YAML
 
 #BUILD_DEPENDS+=       {perl>=5.10,p5-PathTools-[0-9]*}:../../devel/p5-PathTools
-BUILD_DEPENDS+=        p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
-BUILD_DEPENDS+=        p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
-BUILD_DEPENDS+=        p5-XML-Writer>=0.500:../../textproc/p5-XML-Writer
+BUILD_DEPENDS+=                p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
+BUILD_DEPENDS+=                p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=                p5-XML-Writer>=0.500:../../textproc/p5-XML-Writer
 # for make test
-BUILD_DEPENDS+=        p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
+BUILD_DEPENDS+=                p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
 
-USE_LANGUAGES= # empty
-PERL5_MODULE_TYPE= Module::Install::Bundled
-PERL5_PACKLIST=        auto/SQL/Translator/.packlist
+USE_LANGUAGES=         # empty
+PERL5_MODULE_TYPE=     Module::Install::Bundled
+PERL5_PACKLIST=                auto/SQL/Translator/.packlist
 
 REPLACE_PERL+= script/*
 

Index: pkgsrc/databases/p5-Search-QueryParser/Makefile
diff -u pkgsrc/databases/p5-Search-QueryParser/Makefile:1.16 pkgsrc/databases/p5-Search-QueryParser/Makefile:1.17
--- pkgsrc/databases/p5-Search-QueryParser/Makefile:1.16        Sun Aug 11 13:18:34 2019
+++ pkgsrc/databases/p5-Search-QueryParser/Makefile     Sat Nov  2 15:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:34 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:06 rillig Exp $
 
 DISTNAME=      Search-QueryParser-0.94
 PKGNAME=       p5-${DISTNAME}
@@ -9,7 +9,7 @@ MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=.
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://metacpan.org/release/Search-QueryParser
 COMMENT=       Parses a query string into a data suitable for search engines
-LICENSE=  ${PERL5_LICENSE}
+LICENSE=       ${PERL5_LICENSE}
 
 PERL5_PACKLIST=        auto/Search/QueryParser/.packlist
 

Index: pkgsrc/databases/p5-Sort-SQL/Makefile
diff -u pkgsrc/databases/p5-Sort-SQL/Makefile:1.19 pkgsrc/databases/p5-Sort-SQL/Makefile:1.20
--- pkgsrc/databases/p5-Sort-SQL/Makefile:1.19  Sun Aug 11 13:18:34 2019
+++ pkgsrc/databases/p5-Sort-SQL/Makefile       Sat Nov  2 15:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:18:34 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 15:38:06 rillig Exp $
 
 DISTNAME=      Sort-SQL-0.08
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Manipulate SQL sort strings
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Sort/SQL/.packlist
+PERL5_PACKLIST=        auto/Sort/SQL/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/p5-qdbm/Makefile
diff -u pkgsrc/databases/p5-qdbm/Makefile:1.22 pkgsrc/databases/p5-qdbm/Makefile:1.23
--- pkgsrc/databases/p5-qdbm/Makefile:1.22      Sun Aug 11 13:18:35 2019
+++ pkgsrc/databases/p5-qdbm/Makefile   Sat Nov  2 15:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:18:35 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/02 15:38:06 rillig Exp $
 #
 
 PKGREVISION= 5
@@ -14,7 +14,7 @@ LICENSE=      gnu-lgpl-v2.1
 
 MAKE_JOBS_SAFE=                no
 
-MY_SUBDIR=perl
+MY_SUBDIR=     perl
 BUILD_DIRS=    ${MY_SUBDIR}
 CONFIGURE_DIRS=        ${MY_SUBDIR}
 
@@ -23,7 +23,7 @@ USE_TOOLS+=           perl
 PERL5_CONFIGURE=       no
 TEST_TARGET=           check
 
-PERL5_PACKLIST= auto/Curia/.packlist auto/Depot/.packlist auto/Villa/.packlist
+PERL5_PACKLIST=        auto/Curia/.packlist auto/Depot/.packlist auto/Villa/.packlist
 REPLACE_PERL=  ${MY_SUBDIR}/curia/plcrtest ${MY_SUBDIR}/depot/pldptest \
                ${MY_SUBDIR}/villa/plvltest
 

Index: pkgsrc/databases/p5-sybperl/Makefile
diff -u pkgsrc/databases/p5-sybperl/Makefile:1.38 pkgsrc/databases/p5-sybperl/Makefile:1.39
--- pkgsrc/databases/p5-sybperl/Makefile:1.38   Sun Aug 11 13:18:35 2019
+++ pkgsrc/databases/p5-sybperl/Makefile        Sat Nov  2 15:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/08/11 13:18:35 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/02 15:38:06 rillig Exp $
 
 DISTNAME=      sybperl-2.19
 PKGNAME=       p5-${DISTNAME}
@@ -17,13 +17,13 @@ BUILD_DEFS+=                SYBASE
 
 .if defined(USE_SYBASE_OPENCLIENT) && empty(USE_SYBASE_OPENCLIENT:M[Nn][Oo])
 .  if defined(SYBASE) || exists(${SYBASE}/lib/libct.so)
-BUILDLINK_PASSTHRU_DIRS=${SYBASE}
-_SYBASE=               ${SYBASE}
+BUILDLINK_PASSTHRU_DIRS=       ${SYBASE}
+_SYBASE=                       ${SYBASE}
 .  else
-PKG_FAIL_REASON+=      "You must define SYBASE to the base directory of your Open Client."
+PKG_FAIL_REASON+=              "You must define SYBASE to the base directory of your Open Client."
 .  endif
 .else
-_SYBASE=               ${BUILDLINK_PREFIX.freetds}
+_SYBASE=                       ${BUILDLINK_PREFIX.freetds}
 .endif
 
 PERL5_LDFLAGS+=                ${COMPILER_RPATH_FLAG}${_SYBASE}/lib

Index: pkgsrc/databases/pgocaml/Makefile
diff -u pkgsrc/databases/pgocaml/Makefile:1.14 pkgsrc/databases/pgocaml/Makefile:1.15
--- pkgsrc/databases/pgocaml/Makefile:1.14      Thu Jul  4 09:18:37 2019
+++ pkgsrc/databases/pgocaml/Makefile   Sat Nov  2 15:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/07/04 09:18:37 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/02 15:38:06 rillig Exp $
 
 GITHUB_PROJECT=        pgocaml
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -12,12 +12,12 @@ HOMEPAGE=   http://pgocaml.forge.ocamlcore
 COMMENT=       Native PostgreSQL binding for OCaml
 LICENSE=       gnu-lgpl-v2
 
-HAS_CONFIGURE= yes
-USE_LANGUAGES= c
-USE_TOOLS+=    gmake
+HAS_CONFIGURE=         yes
+USE_LANGUAGES=         c
+USE_TOOLS+=            gmake
 CONFIGURE_ARGS+=       --disable-p4
 
-OCAML_USE_OASIS= yes
+OCAML_USE_OASIS=       yes
 
 .include "../../mk/ocaml.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"

Index: pkgsrc/databases/pgpool/Makefile
diff -u pkgsrc/databases/pgpool/Makefile:1.12 pkgsrc/databases/pgpool/Makefile:1.13
--- pkgsrc/databases/pgpool/Makefile:1.12       Sun Sep  3 08:36:52 2017
+++ pkgsrc/databases/pgpool/Makefile    Sat Nov  2 15:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/09/03 08:36:52 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 15:38:06 rillig Exp $
 
 DISTNAME=      pgpool-3.4.1
 CATEGORIES=    databases
@@ -10,7 +10,7 @@ COMMENT=      Connection pooling/replication 
 
 GNU_CONFIGURE= yes
 
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
 INSTALLATION_DIRS=     share/examples
 

Index: pkgsrc/databases/pgtclng/Makefile
diff -u pkgsrc/databases/pgtclng/Makefile:1.16 pkgsrc/databases/pgtclng/Makefile:1.17
--- pkgsrc/databases/pgtclng/Makefile:1.16      Sun Sep  3 08:36:52 2017
+++ pkgsrc/databases/pgtclng/Makefile   Sat Nov  2 15:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/09/03 08:36:52 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:06 rillig Exp $
 #
 
 VER=           1.5.3
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=      --with-postgres-lib=${P
 
 CPPFLAGS+=     -DUSE_INTERP_ERRORLINE
 
-PGTCLLIBNAME           = libpgtcl${VER:C/\.//g}.so
+PGTCLLIBNAME           =       libpgtcl${VER:C/\.//g}.so
 
 post-install:
        cd ${DESTDIR}${PREFIX}/lib && ln -s pgtcl${VER}/${PGTCLLIBNAME} libpgtcl.so

Index: pkgsrc/databases/php-oci8/Makefile
diff -u pkgsrc/databases/php-oci8/Makefile:1.4 pkgsrc/databases/php-oci8/Makefile:1.5
--- pkgsrc/databases/php-oci8/Makefile:1.4      Wed Oct  5 22:09:39 2016
+++ pkgsrc/databases/php-oci8/Makefile  Sat Nov  2 15:38:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/10/05 22:09:39 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/02 15:38:07 rillig Exp $
 
 MODNAME=               oci8
 CATEGORIES+=           databases
@@ -14,10 +14,10 @@ PKG_FAIL_REASON+=   "You must set ORACLE_H
 PKG_FAIL_REASON+=      "The location of ORACLE_HOME does not exist"
 .endif
 
-BUILDLINK_PASSTHRU_DIRS+=       ${ORACLE_HOME}
+BUILDLINK_PASSTHRU_DIRS+=      ${ORACLE_HOME}
 CONFIGURE_ARGS+=               --with-${MODNAME}=shared,${ORACLE_HOME}
 
-ONLY_FOR_PLATFORM=      Linux-*-* SunOS-*-*
+ONLY_FOR_PLATFORM=     Linux-*-* SunOS-*-*
 
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/phpldapadmin/Makefile
diff -u pkgsrc/databases/phpldapadmin/Makefile:1.39 pkgsrc/databases/phpldapadmin/Makefile:1.40
--- pkgsrc/databases/phpldapadmin/Makefile:1.39 Sun Nov 29 11:25:53 2015
+++ pkgsrc/databases/phpldapadmin/Makefile      Sat Nov  2 15:38:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2015/11/29 11:25:53 taca Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/02 15:38:07 rillig Exp $
 
 DISTNAME=      phpldapadmin-${VERSION}
 PKGREVISION=   1
@@ -24,7 +24,7 @@ USE_TOOLS+=   pax
 VERSION=       1.2.3
 NO_BUILD=      YES
 
-CONF_FILES+=  ${PREFIX}/share/examples/phpldapadmin/config.php.example \
+CONF_FILES+=   ${PREFIX}/share/examples/phpldapadmin/config.php.example \
                ${PREFIX}/share/phpldapadmin/config/config.php
 CONF_FILES+=   ${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf \
                ${PKG_SYSCONFDIR}/phpldapadmin.conf

Index: pkgsrc/databases/phppgadmin/Makefile
diff -u pkgsrc/databases/phppgadmin/Makefile:1.31 pkgsrc/databases/phppgadmin/Makefile:1.32
--- pkgsrc/databases/phppgadmin/Makefile:1.31   Wed Sep 17 10:50:15 2014
+++ pkgsrc/databases/phppgadmin/Makefile        Sat Nov  2 15:38:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2014/09/17 10:50:15 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/02 15:38:07 rillig Exp $
 
 DISTNAME=      phpPgAdmin-5.1
 PKGNAME=       ${DISTNAME:S/PgAdmin/pgadmin/}
@@ -25,9 +25,9 @@ CONF_FILES=   ${EGDIR}/config.inc.php-dist
 DOC_FILES=     CREDITS DEVELOPERS FAQ HISTORY INSTALL LICENSE TODO \
                TRANSLATORS
 
-REPLACE_INTERPRETER+=  pkgsrc-php
-REPLACE.pkgsrc-php.old=        .*php
-REPLACE.pkgsrc-php.new=        ${PREFIX}/bin/php
+REPLACE_INTERPRETER+=          pkgsrc-php
+REPLACE.pkgsrc-php.old=                .*php
+REPLACE.pkgsrc-php.new=                ${PREFIX}/bin/php
 REPLACE_FILES.pkgsrc-php=      build_tests.php
 
 do-configure:

Index: pkgsrc/databases/poco-data-mysql/Makefile
diff -u pkgsrc/databases/poco-data-mysql/Makefile:1.12 pkgsrc/databases/poco-data-mysql/Makefile:1.13
--- pkgsrc/databases/poco-data-mysql/Makefile:1.12      Wed Jul  4 13:40:13 2018
+++ pkgsrc/databases/poco-data-mysql/Makefile   Sat Nov  2 15:38:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 15:38:07 rillig Exp $
 #
 
 PKGNAME=       poco-data-mysql-${POCO_VERSION}
@@ -33,8 +33,8 @@ SUBST_CLASSES+=               paths
 SUBST_MESSAGE.paths=   pkgsrc-izing paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     Data/MySQL/Makefile
-SUBST_SED.paths=    -e 's,@MYSQLLIBDIR@,${BUILDLINK_DIR}/${BUILDLINK_LIBDIRS.mysql-client},g'
-SUBST_SED.paths+=    -e 's,@MYSQLINCDIR@,${BUILDLINK_DIR}/${BUILDLINK_INCDIRS.mysql-client},g'
+SUBST_SED.paths=       -e 's,@MYSQLLIBDIR@,${BUILDLINK_DIR}/${BUILDLINK_LIBDIRS.mysql-client},g'
+SUBST_SED.paths+=      -e 's,@MYSQLINCDIR@,${BUILDLINK_DIR}/${BUILDLINK_INCDIRS.mysql-client},g'
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../databases/poco-data/buildlink3.mk"

Index: pkgsrc/databases/postgresql10/Makefile.common
diff -u pkgsrc/databases/postgresql10/Makefile.common:1.16 pkgsrc/databases/postgresql10/Makefile.common:1.17
--- pkgsrc/databases/postgresql10/Makefile.common:1.16  Fri Oct 25 12:01:19 2019
+++ pkgsrc/databases/postgresql10/Makefile.common       Sat Nov  2 15:38:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2019/10/25 12:01:19 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.17 2019/11/02 15:38:07 rillig Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -80,8 +80,8 @@ CONFIGURE_ENV+=               pgac_cv_prog_cc_ldflags
 .endif
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-CONFIGURE_ARGS.MirBSD+=        --disable-thread-safety
-CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety
+CONFIGURE_ARGS.MirBSD+=                --disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=       --disable-thread-safety
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers

Index: pkgsrc/databases/postgresql10-contrib/Makefile
diff -u pkgsrc/databases/postgresql10-contrib/Makefile:1.4 pkgsrc/databases/postgresql10-contrib/Makefile:1.5
--- pkgsrc/databases/postgresql10-contrib/Makefile:1.4  Mon Mar  4 07:21:55 2019
+++ pkgsrc/databases/postgresql10-contrib/Makefile      Sat Nov  2 15:38:07 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2019/03/04 07:21:55 markd Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/02 15:38:07 rillig Exp $
 
 PKGNAME=       ${DISTNAME:C/-/10-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql10/Makefile.common"
 
-DEPENDS+=       postgresql10-server>=${PKGVERSION_NOREV}:../../databases/postgresql10-server
+DEPENDS+=      postgresql10-server>=${PKGVERSION_NOREV}:../../databases/postgresql10-server
 
 BUILD_MAKE_FLAGS=      USE_PGXS=1
 

Index: pkgsrc/databases/postgresql11/Makefile.common
diff -u pkgsrc/databases/postgresql11/Makefile.common:1.9 pkgsrc/databases/postgresql11/Makefile.common:1.10
--- pkgsrc/databases/postgresql11/Makefile.common:1.9   Fri Oct 25 08:00:46 2019
+++ pkgsrc/databases/postgresql11/Makefile.common       Sat Nov  2 15:38:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2019/10/25 08:00:46 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.10 2019/11/02 15:38:07 rillig Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -80,8 +80,8 @@ CONFIGURE_ENV+=               pgac_cv_prog_cc_ldflags
 .endif
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-CONFIGURE_ARGS.MirBSD+=        --disable-thread-safety
-CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety
+CONFIGURE_ARGS.MirBSD+=                --disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=       --disable-thread-safety
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers

Index: pkgsrc/databases/postgresql11-contrib/Makefile
diff -u pkgsrc/databases/postgresql11-contrib/Makefile:1.1 pkgsrc/databases/postgresql11-contrib/Makefile:1.2
--- pkgsrc/databases/postgresql11-contrib/Makefile:1.1  Tue Oct 23 16:02:52 2018
+++ pkgsrc/databases/postgresql11-contrib/Makefile      Sat Nov  2 15:38:07 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2018/10/23 16:02:52 adam Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 15:38:07 rillig Exp $
 
 PKGNAME=       ${DISTNAME:C/-/11-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql11/Makefile.common"
 
-DEPENDS+=       postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server
+DEPENDS+=      postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server
 
 BUILD_MAKE_FLAGS=      USE_PGXS=1
 

Index: pkgsrc/databases/postgresql12/Makefile.common
diff -u pkgsrc/databases/postgresql12/Makefile.common:1.2 pkgsrc/databases/postgresql12/Makefile.common:1.3
--- pkgsrc/databases/postgresql12/Makefile.common:1.2   Thu Oct 24 07:57:13 2019
+++ pkgsrc/databases/postgresql12/Makefile.common       Sat Nov  2 15:38:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2019/10/24 07:57:13 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.3 2019/11/02 15:38:07 rillig Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -83,8 +83,8 @@ CONFIGURE_ENV+=               pgac_cv_prog_cc_ldflags
 .endif
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-CONFIGURE_ARGS.MirBSD+=        --disable-thread-safety
-CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety
+CONFIGURE_ARGS.MirBSD+=                --disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=       --disable-thread-safety
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers

Index: pkgsrc/databases/postgresql12-contrib/Makefile
diff -u pkgsrc/databases/postgresql12-contrib/Makefile:1.1 pkgsrc/databases/postgresql12-contrib/Makefile:1.2
--- pkgsrc/databases/postgresql12-contrib/Makefile:1.1  Mon Oct  7 19:21:49 2019
+++ pkgsrc/databases/postgresql12-contrib/Makefile      Sat Nov  2 15:38:08 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2019/10/07 19:21:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 15:38:08 rillig Exp $
 
 PKGNAME=       ${DISTNAME:C/-/12-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql12/Makefile.common"
 
-DEPENDS+=       postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server
+DEPENDS+=      postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server
 
 BUILD_MAKE_FLAGS=      USE_PGXS=1
 

Index: pkgsrc/databases/postgresql94/Makefile.common
diff -u pkgsrc/databases/postgresql94/Makefile.common:1.34 pkgsrc/databases/postgresql94/Makefile.common:1.35
--- pkgsrc/databases/postgresql94/Makefile.common:1.34  Thu Oct 31 21:33:35 2019
+++ pkgsrc/databases/postgresql94/Makefile.common       Sat Nov  2 15:38:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2019/10/31 21:33:35 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.35 2019/11/02 15:38:08 rillig Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -84,14 +84,14 @@ CONFIGURE_ENV+=             pgac_cv_prog_cc_ldflags
 .endif
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-CONFIGURE_ARGS.MirBSD+=        --disable-thread-safety
-CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety
+CONFIGURE_ARGS.MirBSD+=                --disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=       --disable-thread-safety
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
 # of 2 up to 32768, and the default size is 8196.  Please don't change
 # this value unless you know what you are doing.
-BUILD_DEFS+=   PGSQL_BLCKSZ
+BUILD_DEFS+=           PGSQL_BLCKSZ
 .if defined(PGSQL_BLCKSZ)
 CONFIGURE_ARGS+=       --with-blocksize=${PGSQL_BLCKSZ}
 .endif

Index: pkgsrc/databases/postgresql94-contrib/Makefile
diff -u pkgsrc/databases/postgresql94-contrib/Makefile:1.3 pkgsrc/databases/postgresql94-contrib/Makefile:1.4
--- pkgsrc/databases/postgresql94-contrib/Makefile:1.3  Fri Nov  9 18:12:26 2018
+++ pkgsrc/databases/postgresql94-contrib/Makefile      Sat Nov  2 15:38:08 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2018/11/09 18:12:26 adam Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 15:38:08 rillig Exp $
 
 PKGNAME=       ${DISTNAME:C/-/94-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql94/Makefile.common"
 
-DEPENDS+=       postgresql94-server>=${PKGVERSION_NOREV}:../../databases/postgresql94-server
+DEPENDS+=      postgresql94-server>=${PKGVERSION_NOREV}:../../databases/postgresql94-server
 
 BUILD_MAKE_FLAGS=      USE_PGXS=1
 

Index: pkgsrc/databases/postgresql95/Makefile.common
diff -u pkgsrc/databases/postgresql95/Makefile.common:1.27 pkgsrc/databases/postgresql95/Makefile.common:1.28
--- pkgsrc/databases/postgresql95/Makefile.common:1.27  Mon Oct  7 19:28:29 2019
+++ pkgsrc/databases/postgresql95/Makefile.common       Sat Nov  2 15:38:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2019/10/07 19:28:29 adam Exp $
+# $NetBSD: Makefile.common,v 1.28 2019/11/02 15:38:08 rillig Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -84,14 +84,14 @@ CONFIGURE_ENV+=             pgac_cv_prog_cc_ldflags
 .endif
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-CONFIGURE_ARGS.MirBSD+=        --disable-thread-safety
-CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety
+CONFIGURE_ARGS.MirBSD+=                --disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=       --disable-thread-safety
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
 # of 2 up to 32768, and the default size is 8196.  Please don't change
 # this value unless you know what you are doing.
-BUILD_DEFS+=   PGSQL_BLCKSZ
+BUILD_DEFS+=           PGSQL_BLCKSZ
 .if defined(PGSQL_BLCKSZ)
 CONFIGURE_ARGS+=       --with-blocksize=${PGSQL_BLCKSZ}
 .endif

Index: pkgsrc/databases/postgresql95-contrib/Makefile
diff -u pkgsrc/databases/postgresql95-contrib/Makefile:1.5 pkgsrc/databases/postgresql95-contrib/Makefile:1.6
--- pkgsrc/databases/postgresql95-contrib/Makefile:1.5  Fri Nov  9 18:12:26 2018
+++ pkgsrc/databases/postgresql95-contrib/Makefile      Sat Nov  2 15:38:08 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2018/11/09 18:12:26 adam Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 15:38:08 rillig Exp $
 
 PKGNAME=       ${DISTNAME:C/-/95-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql95/Makefile.common"
 
-DEPENDS+=       postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server
+DEPENDS+=      postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server
 
 BUILD_MAKE_FLAGS=      USE_PGXS=1
 

Index: pkgsrc/databases/postgresql96/Makefile.common
diff -u pkgsrc/databases/postgresql96/Makefile.common:1.21 pkgsrc/databases/postgresql96/Makefile.common:1.22
--- pkgsrc/databases/postgresql96/Makefile.common:1.21  Mon Oct  7 19:28:29 2019
+++ pkgsrc/databases/postgresql96/Makefile.common       Sat Nov  2 15:38:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2019/10/07 19:28:29 adam Exp $
+# $NetBSD: Makefile.common,v 1.22 2019/11/02 15:38:08 rillig Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -84,14 +84,14 @@ CONFIGURE_ENV+=             pgac_cv_prog_cc_ldflags
 .endif
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-CONFIGURE_ARGS.MirBSD+=        --disable-thread-safety
-CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety
+CONFIGURE_ARGS.MirBSD+=                --disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=       --disable-thread-safety
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
 # of 2 up to 32768, and the default size is 8196.  Please don't change
 # this value unless you know what you are doing.
-BUILD_DEFS+=   PGSQL_BLCKSZ
+BUILD_DEFS+=           PGSQL_BLCKSZ
 .if defined(PGSQL_BLCKSZ)
 CONFIGURE_ARGS+=       --with-blocksize=${PGSQL_BLCKSZ}
 .endif

Index: pkgsrc/databases/postgresql96-contrib/Makefile
diff -u pkgsrc/databases/postgresql96-contrib/Makefile:1.5 pkgsrc/databases/postgresql96-contrib/Makefile:1.6
--- pkgsrc/databases/postgresql96-contrib/Makefile:1.5  Fri Nov  9 18:12:27 2018
+++ pkgsrc/databases/postgresql96-contrib/Makefile      Sat Nov  2 15:38:08 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2018/11/09 18:12:27 adam Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 15:38:08 rillig Exp $
 
 PKGNAME=       ${DISTNAME:C/-/96-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql96/Makefile.common"
 
-DEPENDS+=       postgresql96-server>=${PKGVERSION_NOREV}:../../databases/postgresql96-server
+DEPENDS+=      postgresql96-server>=${PKGVERSION_NOREV}:../../databases/postgresql96-server
 
 BUILD_MAKE_FLAGS=      USE_PGXS=1
 

Index: pkgsrc/databases/pxtools/Makefile
diff -u pkgsrc/databases/pxtools/Makefile:1.16 pkgsrc/databases/pxtools/Makefile:1.17
--- pkgsrc/databases/pxtools/Makefile:1.16      Tue Oct  2 21:25:48 2012
+++ pkgsrc/databases/pxtools/Makefile   Sat Nov  2 15:38:08 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2012/10/02 21:25:48 asau Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:08 rillig Exp $
 #
 
-DISTNAME=              pxtools-0.0.20
+DISTNAME=      pxtools-0.0.20
 PKGREVISION=   3
-CATEGORIES=            databases
-MASTER_SITES=          http://jan.kneschke.de/projects/pxtools/download/
+CATEGORIES=    databases
+MASTER_SITES=  http://jan.kneschke.de/projects/pxtools/download/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://jan.kneschke.de/projects/pxtools/

Index: pkgsrc/databases/py-PgSQL/Makefile
diff -u pkgsrc/databases/py-PgSQL/Makefile:1.31 pkgsrc/databases/py-PgSQL/Makefile:1.32
--- pkgsrc/databases/py-PgSQL/Makefile:1.31     Mon Sep  2 13:19:47 2019
+++ pkgsrc/databases/py-PgSQL/Makefile  Sat Nov  2 15:38:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/09/02 13:19:47 adam Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/02 15:38:08 rillig Exp $
 
 DISTNAME=      pyPgSQL-2.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,7 +11,7 @@ HOMEPAGE=     http://pypgsql.sourceforge.net
 COMMENT=       Python DB-API 2.0 compliant interface to PostgreSQL
 
 WRKSRC=                ${WRKDIR}/pypgsql
-PYTHON_VERSIONS_ACCEPTED=       27 # py-mxDateTime
+PYTHON_VERSIONS_ACCEPTED= 27 # py-mxDateTime
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"

Index: pkgsrc/databases/py-carbon/Makefile
diff -u pkgsrc/databases/py-carbon/Makefile:1.9 pkgsrc/databases/py-carbon/Makefile:1.10
--- pkgsrc/databases/py-carbon/Makefile:1.9     Mon Sep  2 13:19:47 2019
+++ pkgsrc/databases/py-carbon/Makefile Sat Nov  2 15:38:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/09/02 13:19:47 adam Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/02 15:38:09 rillig Exp $
 
 DISTNAME=      carbon-0.9.15
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=     ${PYPKGPREFIX}-whisper>=${PKGV
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-whisper
+PYTHON_VERSIONS_ACCEPTED=      27 # py-whisper
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -27,12 +27,12 @@ RCD_SCRIPTS=                carbon-aggregator carbon-c
 FILES_SUBST+=          GRAPHITE_USER=${GRAPHITE_USER} GRAPHITE_GROUP=${GRAPHITE_GROUP} \
                        GRAPHITE_DIR=${GRAPHITE_DIR}
 
-OWN_DIRS_PERMS+= ${GRAPHITE_DIR} ${WWW_USER} ${GRAPHITE_GROUP} 0775
-OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/lists ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/rrd ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/whisper ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+= ${VARBASE}/run/graphite ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+=       ${GRAPHITE_DIR} ${WWW_USER} ${GRAPHITE_GROUP} 0775
+OWN_DIRS_PERMS+=       ${GRAPHITE_DIR}/lists ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+=       ${GRAPHITE_DIR}/rrd ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+=       ${GRAPHITE_DIR}/whisper ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+=       ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+=       ${VARBASE}/run/graphite ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
 
 
 SUBST_CLASSES+=                dirs
@@ -43,11 +43,11 @@ SUBST_VARS.dirs=    GRAPHITE_DIR GRAPHITE_E
                        PKG_SYSCONFDIR VARBASE
 
 # NetBSD has posix_fallocate in libc, but fs can't actually use it.
-SUBST_CLASSES.NetBSD+= fallocate
-SUBST_STAGE.fallocate= pre-configure
-SUBST_MESSAGE.fallocate=Patching for NetBSD defaults
-SUBST_FILES.fallocate= conf/carbon.conf.example
-SUBST_SED.fallocate=   -e 's,^\(WHISPER_FALLOCATE_CREATE *= *\)\(.*\),\1False,'
+SUBST_CLASSES.NetBSD+=         fallocate
+SUBST_STAGE.fallocate=         pre-configure
+SUBST_MESSAGE.fallocate=       Patching for NetBSD defaults
+SUBST_FILES.fallocate=         conf/carbon.conf.example
+SUBST_SED.fallocate=           -e 's,^\(WHISPER_FALLOCATE_CREATE *= *\)\(.*\),\1False,'
 
 PKG_SYSCONFSUBDIR=     graphite
 

Index: pkgsrc/databases/py-carbon/options.mk
diff -u pkgsrc/databases/py-carbon/options.mk:1.6 pkgsrc/databases/py-carbon/options.mk:1.7
--- pkgsrc/databases/py-carbon/options.mk:1.6   Mon Sep  2 13:19:47 2019
+++ pkgsrc/databases/py-carbon/options.mk       Sat Nov  2 15:38:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2019/09/02 13:19:47 adam Exp $
+# $NetBSD: options.mk,v 1.7 2019/11/02 15:38:09 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-carbon
 PKG_SUPPORTED_OPTIONS= amqp ldap memcached
@@ -18,7 +18,7 @@ DEPENDS+=     ${PYPKGPREFIX}-txamqp-[0-9]*:.
 ###
 .if !empty(PKG_OPTIONS:Mldap)
 DEPENDS+=      ${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap
-PYTHON_VERSIONS_ACCEPTED=       27 # py-ldap
+PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap
 .endif
 
 ###
@@ -26,5 +26,5 @@ PYTHON_VERSIONS_ACCEPTED=      27 # py-ldap
 ###
 .if !empty(PKG_OPTIONS:Mmemcached)
 DEPENDS+=      ${PYPKGPREFIX}-memcached-[0-9]*:../../devel/py-memcached
-PYTHON_VERSIONS_ACCEPTED=       27 # py-memcached
+PYTHON_VERSIONS_ACCEPTED= 27 # py-memcached
 .endif

Index: pkgsrc/databases/py-cassa/Makefile
diff -u pkgsrc/databases/py-cassa/Makefile:1.15 pkgsrc/databases/py-cassa/Makefile:1.16
--- pkgsrc/databases/py-cassa/Makefile:1.15     Mon Sep  2 13:19:48 2019
+++ pkgsrc/databases/py-cassa/Makefile  Sat Nov  2 15:38:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/09/02 13:19:48 adam Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 15:38:09 rillig Exp $
 
 DISTNAME=      pycassa-0.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -10,7 +10,7 @@ HOMEPAGE=     https://github.com/pycassa/pyc
 COMMENT=       Python client library for Cassandra
 
 PYDISTUTILSPKG=                yes
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED= 27
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-couchdb/Makefile
diff -u pkgsrc/databases/py-couchdb/Makefile:1.12 pkgsrc/databases/py-couchdb/Makefile:1.13
--- pkgsrc/databases/py-couchdb/Makefile:1.12   Mon Sep  2 13:19:48 2019
+++ pkgsrc/databases/py-couchdb/Makefile        Sat Nov  2 15:38:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/09/02 13:19:48 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 15:38:09 rillig Exp $
 
 DISTNAME=      CouchDB-0.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -13,7 +13,7 @@ LICENSE=      modified-bsd
 DEPENDS+=      ${PYPKGPREFIX}-simplejson>=2.0.9:../../converters/py-simplejson
 DEPENDS+=      ${PYPKGPREFIX}-httplib2>=0.5.0:../../www/py-httplib2
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/databases/py-cx_Oracle/Makefile
diff -u pkgsrc/databases/py-cx_Oracle/Makefile:1.3 pkgsrc/databases/py-cx_Oracle/Makefile:1.4
--- pkgsrc/databases/py-cx_Oracle/Makefile:1.3  Sat Apr  6 12:08:38 2013
+++ pkgsrc/databases/py-cx_Oracle/Makefile      Sat Nov  2 15:38:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/04/06 12:08:38 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 15:38:09 rillig Exp $
 #
 
 DISTNAME=      cx_Oracle-5.0.2
@@ -22,7 +22,7 @@ PKG_FAIL_REASON+=     "The location of ORACL
 
 BUILDLINK_PASSTHRU_DIRS+=      ${ORACLE_HOME}
 BUILDLINK_PASSTHRU_RPATHDIRS+= ${ORACLE_HOME}
-LDFLAGS+=      -Wl,-rpath,${ORACLE_HOME}/lib
+LDFLAGS+=                      -Wl,-rpath,${ORACLE_HOME}/lib
 
 ALL_ENV+=      ORACLE_HOME=${ORACLE_HOME:Q}
 

Index: pkgsrc/databases/py-datapkg/Makefile
diff -u pkgsrc/databases/py-datapkg/Makefile:1.18 pkgsrc/databases/py-datapkg/Makefile:1.19
--- pkgsrc/databases/py-datapkg/Makefile:1.18   Mon Sep  2 13:19:47 2019
+++ pkgsrc/databases/py-datapkg/Makefile        Sat Nov  2 15:38:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/09/02 13:19:47 adam Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 15:38:09 rillig Exp $
 
 DISTNAME=      datapkg-0.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=      mit
 DEPENDS+=      ${PYPKGPREFIX}-ckanclient>=0.3:../../databases/py-ckanclient
 
 CONFLICTS=     datapkg-[0-9]*
-PYTHON_VERSIONS_ACCEPTED=       27 # py-ckanclient
+PYTHON_VERSIONS_ACCEPTED= 27 # py-ckanclient
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-elixir/Makefile
diff -u pkgsrc/databases/py-elixir/Makefile:1.16 pkgsrc/databases/py-elixir/Makefile:1.17
--- pkgsrc/databases/py-elixir/Makefile:1.16    Mon Sep  2 13:19:47 2019
+++ pkgsrc/databases/py-elixir/Makefile Sat Nov  2 15:38:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/09/02 13:19:47 adam Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:09 rillig Exp $
 
 DISTNAME=      Elixir-0.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=     ${PYPKGPREFIX}-crypto-[0-9]*:.
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-sqlite2
+PYTHON_VERSIONS_ACCEPTED=      27 # py-sqlite2
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-gdbm/Makefile
diff -u pkgsrc/databases/py-gdbm/Makefile:1.38 pkgsrc/databases/py-gdbm/Makefile:1.39
--- pkgsrc/databases/py-gdbm/Makefile:1.38      Sun Jan 28 20:10:45 2018
+++ pkgsrc/databases/py-gdbm/Makefile   Sat Nov  2 15:38:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2018/01/28 20:10:45 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/02 15:38:09 rillig Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-gdbm-${PY_DISTVERSION}
 PKGREVISION=   1
@@ -18,12 +18,12 @@ GDBM_MODNAME=       gdbm
 .endif
 
 EXTRACT_ELEMENTS=      ${PYSUBDIR}/Modules/${GDBM_MODNAME}module.c
-PYDISTUTILSPKG=        yes
-PY_PATCHPLIST= yes
+PYDISTUTILSPKG=                yes
+PY_PATCHPLIST=         yes
 
-PY_SETUP_SUBST+= GDBMPREFIX=${BUILDLINK_PREFIX.gdbm}
-PY_SETUP_SUBST+= GDBM_MODNAME=${GDBM_MODNAME}
-PLIST_SUBST+=  GDBM_MODNAME=${GDBM_MODNAME}
+PY_SETUP_SUBST+=       GDBMPREFIX=${BUILDLINK_PREFIX.gdbm}
+PY_SETUP_SUBST+=       GDBM_MODNAME=${GDBM_MODNAME}
+PLIST_SUBST+=          GDBM_MODNAME=${GDBM_MODNAME}
 PYSETUPINSTALLARGS+=   --install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
 # ignore errors due to missing files (EXTRACT_ELEMENTS!)

Index: pkgsrc/databases/py-metakit/Makefile
diff -u pkgsrc/databases/py-metakit/Makefile:1.36 pkgsrc/databases/py-metakit/Makefile:1.37
--- pkgsrc/databases/py-metakit/Makefile:1.36   Mon Sep  2 13:19:46 2019
+++ pkgsrc/databases/py-metakit/Makefile        Sat Nov  2 15:38:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/09/02 13:19:46 adam Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/02 15:38:09 rillig Exp $
 
 DISTNAME=      metakit-2.4.9.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,16 +12,16 @@ COMMENT=    Embedded database library
 PATCHDIR=      ${.CURDIR}/../metakit-lib/patches
 DISTINFO_FILE= ${.CURDIR}/../metakit-lib/distinfo
 
-GNU_CONFIGURE= yes
-CONFIGURE_DIRS=        builds
-CONFIGURE_SCRIPT= ../unix/configure
-CONFIGURE_ARGS+= --with-python=${LOCALBASE}/${PYINC},${LOCALBASE}/${PYSITELIB}
-USE_LANGUAGES= c c++03
-USE_LIBTOOL=   yes
-BUILD_TARGET=  python
-INSTALL_TARGET=        install-python
-MAKE_ENV+=     PYINC=${LOCALBASE}/${PYINC} PYSITELIB=${LOCALBASE}/${PYSITELIB}
-PY_PATCHPLIST= yes
+GNU_CONFIGURE=                 yes
+CONFIGURE_DIRS=                        builds
+CONFIGURE_SCRIPT=              ../unix/configure
+CONFIGURE_ARGS+=               --with-python=${LOCALBASE}/${PYINC},${LOCALBASE}/${PYSITELIB}
+USE_LANGUAGES=                 c c++03
+USE_LIBTOOL=                   yes
+BUILD_TARGET=                  python
+INSTALL_TARGET=                        install-python
+MAKE_ENV+=                     PYINC=${LOCALBASE}/${PYINC} PYSITELIB=${LOCALBASE}/${PYSITELIB}
+PY_PATCHPLIST=                 yes
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 2.4.9.7
 
 INSTALLATION_DIRS+=    ${PYSITELIB}

Index: pkgsrc/databases/py-sqlite/Makefile
diff -u pkgsrc/databases/py-sqlite/Makefile:1.28 pkgsrc/databases/py-sqlite/Makefile:1.29
--- pkgsrc/databases/py-sqlite/Makefile:1.28    Mon Sep  2 13:19:48 2019
+++ pkgsrc/databases/py-sqlite/Makefile Sat Nov  2 15:38:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/09/02 13:19:48 adam Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/02 15:38:09 rillig Exp $
 
 DISTNAME=      pysqlite-1.0.1
 PKGNAME=       ${PYPKGPREFIX}-sqlite-1.0.1
@@ -12,7 +12,7 @@ COMMENT=      SQLite database adapter for Pyt
 
 WRKSRC=                ${WRKDIR}/pysqlite
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-mxDateTime
+PYTHON_VERSIONS_ACCEPTED=      27 # py-mxDateTime
 
 .include "../../databases/sqlite/buildlink3.mk"
 .include "../../lang/python/distutils.mk"

Index: pkgsrc/databases/py-sqlite3/Makefile
diff -u pkgsrc/databases/py-sqlite3/Makefile:1.34 pkgsrc/databases/py-sqlite3/Makefile:1.35
--- pkgsrc/databases/py-sqlite3/Makefile:1.34   Wed Apr  3 00:32:32 2019
+++ pkgsrc/databases/py-sqlite3/Makefile        Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/04/03 00:32:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/02 15:38:10 rillig Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-sqlite3-${PY_DISTVERSION}
 PKGREVISION=   15
@@ -15,7 +15,7 @@ EXTRACT_ELEMENTS=     ${PYSUBDIR}/Modules/_s
 
 # part of python itself; using distutils.mk will install a useless egg
 PYDISTUTILSPKG=                yes
-PY_SETUP_SUBST+=       SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3}
+PY_SETUP_SUBST+=       SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3}
 PYSETUPINSTALLARGS+=   --install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
 # ignore errors due to missing files (EXTRACT_ELEMENTS!)

Index: pkgsrc/databases/py-table/Makefile
diff -u pkgsrc/databases/py-table/Makefile:1.23 pkgsrc/databases/py-table/Makefile:1.24
--- pkgsrc/databases/py-table/Makefile:1.23     Mon Sep  2 13:19:46 2019
+++ pkgsrc/databases/py-table/Makefile  Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/09/02 13:19:46 adam Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/02 15:38:10 rillig Exp $
 
 DISTNAME=      pytable-0.8.3a
 PKGNAME=       ${PYPKGPREFIX}-table-0.8.3a
@@ -13,7 +13,7 @@ COMMENT=      Python RDBMS wrapper for variou
 DEPENDS+=      ${PYPKGPREFIX}-basicproperty-[0-9]*:../../lang/py-basicproperty
 
 # py-basicproperty isn't compatible to 3.x
-PYTHON_VERSIONS_ACCEPTED=    27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/databases/qdbm/buildlink3.mk
diff -u pkgsrc/databases/qdbm/buildlink3.mk:1.12 pkgsrc/databases/qdbm/buildlink3.mk:1.13
--- pkgsrc/databases/qdbm/buildlink3.mk:1.12    Sun Jan  7 13:03:59 2018
+++ pkgsrc/databases/qdbm/buildlink3.mk Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:03:59 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2019/11/02 15:38:10 rillig Exp $
 
 BUILDLINK_TREE+=       qdbm
 
@@ -12,9 +12,9 @@ BUILDLINK_PKGSRCDIR.qdbm?=    ../../databas
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
-CONFIGURE_ARGS+=       --enable-pthread
-BUILDLINK_CFLAGS.qdbm+=        ${PTHREAD_CFLAGS}
-BUILDLINK_LDFLAGS.qdbm+=${PTHREAD_LDFLAGS}
+CONFIGURE_ARGS+=               --enable-pthread
+BUILDLINK_CFLAGS.qdbm+=                ${PTHREAD_CFLAGS}
+BUILDLINK_LDFLAGS.qdbm+=       ${PTHREAD_LDFLAGS}
 .endif
 
 .include "../../archivers/bzip2/buildlink3.mk"

Index: pkgsrc/databases/qdbm-plus/Makefile
diff -u pkgsrc/databases/qdbm-plus/Makefile:1.10 pkgsrc/databases/qdbm-plus/Makefile:1.11
--- pkgsrc/databases/qdbm-plus/Makefile:1.10    Thu Jul 11 09:25:25 2019
+++ pkgsrc/databases/qdbm-plus/Makefile Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/07/11 09:25:25 nia Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/02 15:38:10 rillig Exp $
 #
 
 .include "../../databases/qdbm/Makefile.common"
@@ -17,7 +17,7 @@ CONFIGURE_DIRS=       ${MY_SUBDIR}
 
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
-TEST_TARGET=           check
+TEST_TARGET=   check
 
 .include "../../databases/qdbm/buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"

Index: pkgsrc/databases/qore-freetds-module/Makefile
diff -u pkgsrc/databases/qore-freetds-module/Makefile:1.12 pkgsrc/databases/qore-freetds-module/Makefile:1.13
--- pkgsrc/databases/qore-freetds-module/Makefile:1.12  Sat Jul 20 22:46:14 2019
+++ pkgsrc/databases/qore-freetds-module/Makefile       Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/07/20 22:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 15:38:10 rillig Exp $
 
 DISTNAME=      qore-sybase-modules-1.0.4
 PKGNAME=       ${DISTNAME:S/sybase-modules/freetds-module/}
@@ -20,8 +20,8 @@ USE_LANGUAGES=        c c++11
 USE_TOOLS+=    pax
 PTHREAD_OPTS+= require
 
-CONFIGURE_ARGS+=--with-sybase=no
-CONFIGURE_ARGS+=--with-libsuffix=""
+CONFIGURE_ARGS+=       --with-sybase=no
+CONFIGURE_ARGS+=       --with-libsuffix=""
 
 INSTALLATION_DIRS+=     share/doc/${PKGBASE}
 post-install:

Index: pkgsrc/databases/qore-freetds-module/options.mk
diff -u pkgsrc/databases/qore-freetds-module/options.mk:1.1 pkgsrc/databases/qore-freetds-module/options.mk:1.2
--- pkgsrc/databases/qore-freetds-module/options.mk:1.1 Tue Dec 30 15:41:23 2014
+++ pkgsrc/databases/qore-freetds-module/options.mk     Sat Nov  2 15:38:10 2019
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2014/12/30 15:41:23 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:10 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qore
 PKG_SUPPORTED_OPTIONS= debug
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=        --enable-debug
+CONFIGURE_ARGS+=       --enable-debug
 .else
-CONFIGURE_ARGS+=        --disable-debug
+CONFIGURE_ARGS+=       --disable-debug
 .endif

Index: pkgsrc/databases/qore-mysql-module/Makefile
diff -u pkgsrc/databases/qore-mysql-module/Makefile:1.7 pkgsrc/databases/qore-mysql-module/Makefile:1.8
--- pkgsrc/databases/qore-mysql-module/Makefile:1.7     Fri Jun  8 19:25:39 2018
+++ pkgsrc/databases/qore-mysql-module/Makefile Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/06/08 19:25:39 nros Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/02 15:38:10 rillig Exp $
 
 DISTNAME=      qore-mysql-module-2.0.2.1
 CATEGORIES=    databases
@@ -18,7 +18,7 @@ USE_LANGUAGES=        c c++11
 USE_TOOLS+=    gmake pax
 PTHREAD_OPTS+= native
 
-CONFIGURE_ARGS+=--with-libsuffix=""
+CONFIGURE_ARGS+=       --with-libsuffix=""
 
 #install docs
 INSTALLATION_DIRS+=    share/doc/${PKGBASE}

Index: pkgsrc/databases/qore-mysql-module/options.mk
diff -u pkgsrc/databases/qore-mysql-module/options.mk:1.1 pkgsrc/databases/qore-mysql-module/options.mk:1.2
--- pkgsrc/databases/qore-mysql-module/options.mk:1.1   Tue Dec 30 15:42:24 2014
+++ pkgsrc/databases/qore-mysql-module/options.mk       Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/30 15:42:24 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:10 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qore-mysql-module
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  debug
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=        --enable-debug
+CONFIGURE_ARGS+=       --enable-debug
 .else
-CONFIGURE_ARGS+=        --disable-debug
+CONFIGURE_ARGS+=       --disable-debug
 .endif

Index: pkgsrc/databases/qore-openldap-module/Makefile
diff -u pkgsrc/databases/qore-openldap-module/Makefile:1.7 pkgsrc/databases/qore-openldap-module/Makefile:1.8
--- pkgsrc/databases/qore-openldap-module/Makefile:1.7  Fri Jun  8 20:49:41 2018
+++ pkgsrc/databases/qore-openldap-module/Makefile      Sat Nov  2 15:38:10 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2018/06/08 20:49:41 nros Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/02 15:38:10 rillig Exp $
 
 DISTNAME=      qore-openldap-module-1.1
 PKGREVISION=   3
 CATEGORIES=    databases
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=qorelanguage/}
-EXTRACT_SUFX=   .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=qorelanguage/}
+EXTRACT_SUFX=  .tar.bz2
 GITHUB_PROJECT=        module-openldap
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
@@ -19,7 +19,7 @@ USE_LANGUAGES=        c c++11
 USE_TOOLS+=    gmake pax
 PTHREAD_OPTS+= native
 
-CONFIGURE_ARGS+=--with-libsuffix=""
+CONFIGURE_ARGS+=       --with-libsuffix=""
 
 #install docs
 INSTALLATION_DIRS+=share/doc/${PKGBASE}

Index: pkgsrc/databases/qore-openldap-module/options.mk
diff -u pkgsrc/databases/qore-openldap-module/options.mk:1.1 pkgsrc/databases/qore-openldap-module/options.mk:1.2
--- pkgsrc/databases/qore-openldap-module/options.mk:1.1        Tue Dec 30 15:43:31 2014
+++ pkgsrc/databases/qore-openldap-module/options.mk    Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/30 15:43:31 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:10 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qore-openldap-module
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  debug
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=        --enable-debug
+CONFIGURE_ARGS+=       --enable-debug
 .else
-CONFIGURE_ARGS+=        --disable-debug
+CONFIGURE_ARGS+=       --disable-debug
 .endif

Index: pkgsrc/databases/qore-pgsql-module/Makefile
diff -u pkgsrc/databases/qore-pgsql-module/Makefile:1.8 pkgsrc/databases/qore-pgsql-module/Makefile:1.9
--- pkgsrc/databases/qore-pgsql-module/Makefile:1.8     Fri Jun  8 19:04:49 2018
+++ pkgsrc/databases/qore-pgsql-module/Makefile Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/06/08 19:04:49 nros Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 15:38:10 rillig Exp $
 
 DISTNAME=      qore-pgsql-module-2.4.1
 CATEGORIES=    databases
@@ -18,7 +18,7 @@ USE_LANGUAGES=        c c++11
 USE_TOOLS+=    gmake pax
 PTHREAD_OPTS+= native
 
-CONFIGURE_ARGS+=--with-libsuffix=""
+CONFIGURE_ARGS+=       --with-libsuffix=""
 
 #This is needed in order to comply the with MIT license and binary distribution
 #Install docs

Index: pkgsrc/databases/qore-pgsql-module/options.mk
diff -u pkgsrc/databases/qore-pgsql-module/options.mk:1.1 pkgsrc/databases/qore-pgsql-module/options.mk:1.2
--- pkgsrc/databases/qore-pgsql-module/options.mk:1.1   Tue Dec 30 15:44:25 2014
+++ pkgsrc/databases/qore-pgsql-module/options.mk       Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/30 15:44:25 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:10 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qore-pgsql-module
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  debug
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=        --enable-debug
+CONFIGURE_ARGS+=       --enable-debug
 .else
-CONFIGURE_ARGS+=        --disable-debug
+CONFIGURE_ARGS+=       --disable-debug
 .endif

Index: pkgsrc/databases/qore-sqlite3-module/Makefile
diff -u pkgsrc/databases/qore-sqlite3-module/Makefile:1.20 pkgsrc/databases/qore-sqlite3-module/Makefile:1.21
--- pkgsrc/databases/qore-sqlite3-module/Makefile:1.20  Wed Apr  3 00:32:32 2019
+++ pkgsrc/databases/qore-sqlite3-module/Makefile       Sat Nov  2 15:38:10 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2019/04/03 00:32:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/02 15:38:10 rillig Exp $
 
 DISTNAME=      qore-sqlite3-module-1.0.1
 PKGREVISION=   20
 CATEGORIES=    databases
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=qore/}
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=qore/}
 
 MAINTAINER=    nros%NetBSD.org@localhost
 HOMEPAGE=      http://www.qore.org/
@@ -15,7 +15,7 @@ USE_LIBTOOL=  yes
 USE_LANGUAGES= c c++11
 PTHREAD_OPTS+= native
 
-CONFIGURE_ARGS+=--with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
+CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
 
 INSTALLATION_DIRS+=     share/doc/${PKGBASE}
 post-install:

Index: pkgsrc/databases/qore-sqlite3-module/options.mk
diff -u pkgsrc/databases/qore-sqlite3-module/options.mk:1.1 pkgsrc/databases/qore-sqlite3-module/options.mk:1.2
--- pkgsrc/databases/qore-sqlite3-module/options.mk:1.1 Tue Dec 30 15:45:04 2014
+++ pkgsrc/databases/qore-sqlite3-module/options.mk     Sat Nov  2 15:38:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/30 15:45:04 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:10 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qore-sqlite3-module
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  debug
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=        --enable-debug
+CONFIGURE_ARGS+=       --enable-debug
 .else
-CONFIGURE_ARGS+=        --disable-debug
+CONFIGURE_ARGS+=       --disable-debug
 .endif

Index: pkgsrc/databases/redis/Makefile
diff -u pkgsrc/databases/redis/Makefile:1.44 pkgsrc/databases/redis/Makefile:1.45
--- pkgsrc/databases/redis/Makefile:1.44        Sun May 19 07:56:38 2019
+++ pkgsrc/databases/redis/Makefile     Sat Nov  2 15:38:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2019/05/19 07:56:38 adam Exp $
+# $NetBSD: Makefile,v 1.45 2019/11/02 15:38:11 rillig Exp $
 
 DISTNAME=      redis-5.0.5
 CATEGORIES=    databases
@@ -35,20 +35,20 @@ REDIS_PIDDIR?=              ${VARBASE}/run
 OWN_DIRS_PERMS+=       ${REDIS_DATADIR} ${REDIS_USER} ${REDIS_GROUP} 0770
 OWN_DIRS_PERMS+=       ${REDIS_LOGDIR} ${REDIS_USER} ${REDIS_GROUP} 0770
 
-PKG_GROUPS+=           ${REDIS_GROUP}
-PKG_USERS+=            ${REDIS_USER}:${REDIS_GROUP}
-PKG_GECOS.${REDIS_USER}=Redis daemon user
-PKG_HOME.${REDIS_USER}=        ${REDIS_DBDIR}
+PKG_GROUPS+=                   ${REDIS_GROUP}
+PKG_USERS+=                    ${REDIS_USER}:${REDIS_GROUP}
+PKG_GECOS.${REDIS_USER}=       Redis daemon user
+PKG_HOME.${REDIS_USER}=                ${REDIS_DBDIR}
 
 FILES_SUBST+=          REDIS_USER=${REDIS_USER}
 FILES_SUBST+=          REDIS_GROUP=${REDIS_GROUP}
 FILES_SUBST+=          REDIS_DATADIR=${REDIS_DATADIR}
 
-SUBST_CLASSES+=                fix-paths
-SUBST_STAGE.fix-paths= pre-configure
-SUBST_MESSAGE.fix-paths=Fixing paths.
-SUBST_FILES.fix-paths= redis.conf
-SUBST_VARS.fix-paths=  REDIS_DATADIR REDIS_LOGDIR REDIS_PIDDIR
+SUBST_CLASSES+=                        fix-paths
+SUBST_STAGE.fix-paths=         pre-configure
+SUBST_MESSAGE.fix-paths=       Fixing paths.
+SUBST_FILES.fix-paths=         redis.conf
+SUBST_VARS.fix-paths=          REDIS_DATADIR REDIS_LOGDIR REDIS_PIDDIR
 
 CHECK_PORTABILITY_SKIP+=       deps/jemalloc/configure
 

Index: pkgsrc/databases/rrdtool/Makefile
diff -u pkgsrc/databases/rrdtool/Makefile:1.135 pkgsrc/databases/rrdtool/Makefile:1.136
--- pkgsrc/databases/rrdtool/Makefile:1.135     Sun Aug 11 13:18:36 2019
+++ pkgsrc/databases/rrdtool/Makefile   Sat Nov  2 15:38:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2019/08/11 13:18:36 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2019/11/02 15:38:11 rillig Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -42,10 +42,10 @@ post-install:
 RRDCACHED_USER?=       rrdcached
 RRDCACHED_GROUP?=      ${RRDCACHED_USER}
 
-PKG_USERS_VARS=                RRDCACHED_USER
-PKG_GROUPS_VARS=       RRDCACHED_GROUP
-PKG_GROUPS=            ${RRDCACHED_GROUP}
-PKG_USERS=             ${RRDCACHED_USER}:${RRDCACHED_GROUP}
+PKG_USERS_VARS=                        RRDCACHED_USER
+PKG_GROUPS_VARS=               RRDCACHED_GROUP
+PKG_GROUPS=                    ${RRDCACHED_GROUP}
+PKG_USERS=                     ${RRDCACHED_USER}:${RRDCACHED_GROUP}
 PKG_GECOS.${RRDCACHED_USER}=   RRDCacheD daemon user
 
 OPSYSVARS+=            SOEXT

Index: pkgsrc/databases/ruby-awesome_nested_set/Makefile
diff -u pkgsrc/databases/ruby-awesome_nested_set/Makefile:1.11 pkgsrc/databases/ruby-awesome_nested_set/Makefile:1.12
--- pkgsrc/databases/ruby-awesome_nested_set/Makefile:1.11      Mon Dec 17 14:34:16 2018
+++ pkgsrc/databases/ruby-awesome_nested_set/Makefile   Sat Nov  2 15:38:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/12/17 14:34:16 taca Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/02 15:38:11 rillig Exp $
 
 DISTNAME=      awesome_nested_set-3.1.4
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=      mit
 DEPENDS+=      ${RUBY_ACTIVERECORD_DEPENDS}
 
 RUBY_RAILS_ACCEPTED=   42 51
-USE_LANGUAGES= # none
+USE_LANGUAGES=         # none
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/ruby-odbc/Makefile
diff -u pkgsrc/databases/ruby-odbc/Makefile:1.17 pkgsrc/databases/ruby-odbc/Makefile:1.18
--- pkgsrc/databases/ruby-odbc/Makefile:1.17    Sat May  5 14:14:35 2018
+++ pkgsrc/databases/ruby-odbc/Makefile Sat Nov  2 15:38:11 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2018/05/05 14:14:35 taca Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 15:38:11 rillig Exp $
 
 DISTNAME=      ruby-odbc-0.99999
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
 CATEGORIES=    databases
 MASTER_SITES=  http://www.ch-werner.de/rubyodbc/
 # needs EXTRACT_SUFX since DISTFILE isn't Ruby's gem format.
-EXTRACT_SUFX=  .tar.gz
+EXTRACT_SUFX=  .tar.gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.ch-werner.de/rubyodbc/

Index: pkgsrc/databases/ruby-vapor/Makefile
diff -u pkgsrc/databases/ruby-vapor/Makefile:1.28 pkgsrc/databases/ruby-vapor/Makefile:1.29
--- pkgsrc/databases/ruby-vapor/Makefile:1.28   Sun Oct  9 21:41:58 2016
+++ pkgsrc/databases/ruby-vapor/Makefile        Sat Nov  2 15:38:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/10/09 21:41:58 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/02 15:38:11 rillig Exp $
 
 DISTNAME=      vapor-0.81
 PKGREVISION=   10
@@ -15,7 +15,7 @@ CONFLICTS+=   ruby[1-9][0-9]-vapor-*
 DEPENDS+=      ${RUBY_PKGPREFIX}-dbd-pg>=0.0.20:../../databases/ruby-dbd-pg
 
 USE_TOOLS=     pax
-USE_RUBY_SETUP= yes
+USE_RUBY_SETUP=        yes
 RUBY_SETUP=    install.rb
 REPLACE_RUBY=  doc/examples/university/createperson \
                doc/examples/university/createuni \

Index: pkgsrc/databases/sql-workbench/Makefile
diff -u pkgsrc/databases/sql-workbench/Makefile:1.6 pkgsrc/databases/sql-workbench/Makefile:1.7
--- pkgsrc/databases/sql-workbench/Makefile:1.6 Thu Oct 10 13:32:04 2019
+++ pkgsrc/databases/sql-workbench/Makefile     Sat Nov  2 15:38:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/10/10 13:32:04 gdt Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 15:38:11 rillig Exp $
 
 DISTNAME=      Workbench-Build124
 PKGNAME=       sql-workbench-124
@@ -11,8 +11,8 @@ HOMEPAGE=     http://www.sql-workbench.net/
 COMMENT=       JDBC-based cross-platform SQL query tool
 
 # Apache, except not granted to certain entities
-LICENSE=       generic-nonlicense
-RESTRICTED=    Some entities are not permitted to use/download.
+LICENSE=               generic-nonlicense
+RESTRICTED=            Some entities are not permitted to use/download.
 NO_SRC_ON_FTP=         ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 NO_SRC_ON_CDROM=       ${RESTRICTED}

Index: pkgsrc/databases/sqlrelay-odbc/Makefile
diff -u pkgsrc/databases/sqlrelay-odbc/Makefile:1.20 pkgsrc/databases/sqlrelay-odbc/Makefile:1.21
--- pkgsrc/databases/sqlrelay-odbc/Makefile:1.20        Thu Aug 22 12:22:59 2019
+++ pkgsrc/databases/sqlrelay-odbc/Makefile     Sat Nov  2 15:38:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/22 12:22:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/02 15:38:11 rillig Exp $
 
 PKGNAME=               ${DISTNAME:S/sqlrelay/sqlrelay-odbc/}
 PKGREVISION=           9
@@ -9,14 +9,14 @@ COMMENT=              ODBC support for SQL Relay
 LICENSE=               gnu-lgpl-v2
 
 CONFIGURE_ARGS+=       --with-odbc-prefix=${BUILDLINK_PREFIX.unixodbc}
-CONFIGURE_ARGS+=        --disable-postgresql
-CONFIGURE_ARGS+=        --disable-sqlite
-CONFIGURE_ARGS+=        --disable-freetds
-CONFIGURE_ARGS+=        --disable-mysql
+CONFIGURE_ARGS+=       --disable-postgresql
+CONFIGURE_ARGS+=       --disable-sqlite
+CONFIGURE_ARGS+=       --disable-freetds
+CONFIGURE_ARGS+=       --disable-mysql
 
-BUILD_DIRS=             src/connections
+BUILD_DIRS=            src/connections
 
-INSTALLATION_DIRS+=     libexec/sqlrelay
+INSTALLATION_DIRS+=    libexec/sqlrelay
 
 do-install:
        ${LIBTOOL} --mode=install ${INSTALL_LIB} \

Index: pkgsrc/databases/tokyocabinet/Makefile
diff -u pkgsrc/databases/tokyocabinet/Makefile:1.45 pkgsrc/databases/tokyocabinet/Makefile:1.46
--- pkgsrc/databases/tokyocabinet/Makefile:1.45 Thu Jul 11 09:25:26 2019
+++ pkgsrc/databases/tokyocabinet/Makefile      Sat Nov  2 15:38:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/07/11 09:25:26 nia Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/02 15:38:11 rillig Exp $
 #
 
 DISTNAME=      tokyocabinet-1.4.48
@@ -10,10 +10,10 @@ HOMEPAGE=   https://fallabs.com/tokyocabin
 COMMENT=       Modern implementation of DBM
 LICENSE=       gnu-lgpl-v2.1
 
-GNU_CONFIGURE= yes
-USE_GCC_RUNTIME=yes
-USE_TOOLS+=    gmake pkg-config
-USE_LANGUAGES= c99
+GNU_CONFIGURE=         yes
+USE_GCC_RUNTIME=       yes
+USE_TOOLS+=            gmake pkg-config
+USE_LANGUAGES=         c99
 
 PKGCONFIG_OVERRIDE+=   tokyocabinet.pc.in
 

Index: pkgsrc/databases/tokyocabinet/options.mk
diff -u pkgsrc/databases/tokyocabinet/options.mk:1.1 pkgsrc/databases/tokyocabinet/options.mk:1.2
--- pkgsrc/databases/tokyocabinet/options.mk:1.1        Sat Dec 19 12:56:45 2009
+++ pkgsrc/databases/tokyocabinet/options.mk    Sat Nov  2 15:38:11 2019
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2009/12/19 12:56:45 obache Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:11 rillig Exp $
 #
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.tokyocabinet
-PKG_SUPPORTED_OPTIONS= zlib bzip2
+PKG_OPTIONS_VAR=               PKG_OPTIONS.tokyocabinet
+PKG_SUPPORTED_OPTIONS=         zlib bzip2
 PKG_OPTIONS_OPTIONAL_GROUPS=   codec
 PKG_OPTIONS_GROUP.codec=       lzma lzo
-PKG_SUGGESTED_OPTIONS= zlib bzip2
+PKG_SUGGESTED_OPTIONS=         zlib bzip2
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/databases/tokyotyrant/Makefile
diff -u pkgsrc/databases/tokyotyrant/Makefile:1.37 pkgsrc/databases/tokyotyrant/Makefile:1.38
--- pkgsrc/databases/tokyotyrant/Makefile:1.37  Thu Jul 11 09:25:26 2019
+++ pkgsrc/databases/tokyotyrant/Makefile       Sat Nov  2 15:38:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/07/11 09:25:26 nia Exp $
+# $NetBSD: Makefile,v 1.38 2019/11/02 15:38:12 rillig Exp $
 #
 
 DISTNAME=      tokyotyrant-1.1.41
@@ -11,9 +11,9 @@ HOMEPAGE=     https://fallabs.com/tokyotyran
 COMMENT=       Network interface of Tokyo Cabinet
 LICENSE=       gnu-lgpl-v2.1
 
-GNU_CONFIGURE= yes
-USE_GCC_RUNTIME=yes
-USE_TOOLS+=    gmake pkg-config
+GNU_CONFIGURE=         yes
+USE_GCC_RUNTIME=       yes
+USE_TOOLS+=            gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=   tokyotyrant.pc.in
 

Index: pkgsrc/databases/virtuoso/Makefile
diff -u pkgsrc/databases/virtuoso/Makefile:1.23 pkgsrc/databases/virtuoso/Makefile:1.24
--- pkgsrc/databases/virtuoso/Makefile:1.23     Sun Jul 21 22:24:35 2019
+++ pkgsrc/databases/virtuoso/Makefile  Sat Nov  2 15:38:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/07/21 22:24:35 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/02 15:38:12 rillig Exp $
 #
 
 DISTNAME=      virtuoso-opensource-6.1.6
@@ -11,13 +11,13 @@ HOMEPAGE=   https://virtuoso.openlinksw.co
 COMMENT=       Universal SQL/Application server
 LICENSE=       gnu-gpl-v2 # with exemptions
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-jdk2 --without-jdk3 --without-jdk4 \
                        --with-iodbc=${PREFIX} \
                        --with-layout=pkgsrc --localstatedir=${PREFIX}
-USE_TOOLS+=    pkg-config gmake
-USE_LANGUAGES= c c++
-USE_LIBTOOL=   yes
+USE_TOOLS+=            pkg-config gmake
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
 
 PKGCONFIG_OVERRIDE+=   libsrc/zlib/zlib.pc.in
 

Index: pkgsrc/databases/virtuoso/options.mk
diff -u pkgsrc/databases/virtuoso/options.mk:1.1 pkgsrc/databases/virtuoso/options.mk:1.2
--- pkgsrc/databases/virtuoso/options.mk:1.1    Sat Apr 13 13:16:02 2013
+++ pkgsrc/databases/virtuoso/options.mk        Sat Nov  2 15:38:12 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2013/04/13 13:16:02 jaapb Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:12 rillig Exp $
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.virtuoso
-PKG_SUPPORTED_OPTIONS=          imagemagick ldap
+PKG_OPTIONS_VAR=               PKG_OPTIONS.virtuoso
+PKG_SUPPORTED_OPTIONS=         imagemagick ldap
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/databases/yasql/Makefile
diff -u pkgsrc/databases/yasql/Makefile:1.22 pkgsrc/databases/yasql/Makefile:1.23
--- pkgsrc/databases/yasql/Makefile:1.22        Sun Aug 11 13:18:37 2019
+++ pkgsrc/databases/yasql/Makefile     Sat Nov  2 15:38:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:18:37 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/02 15:38:12 rillig Exp $
 
 DISTNAME=      yasql-1.81
 PKGREVISION=   9
@@ -17,7 +17,7 @@ USE_TOOLS+=   perl:run
 GNU_CONFIGURE= yes
 NO_BUILD=      yes
 
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
 CONF_FILES+=   ${PREFIX}/share/examples/yasql/yasql.conf \
                ${PKG_SYSCONFDIR}/yasql.conf



Home | Main Index | Thread Index | Old Index