pkgsrc-Changes archive

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

CVS commit: pkgsrc/security



Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Nov  4 21:13:04 UTC 2019

Modified Files:
        pkgsrc/security/Bastille: Makefile
        pkgsrc/security/CoolKey: Makefile
        pkgsrc/security/EasyPG: Makefile
        pkgsrc/security/apg: Makefile
        pkgsrc/security/asignify: Makefile
        pkgsrc/security/botan: Makefile
        pkgsrc/security/ccid: Makefile
        pkgsrc/security/cvm: Makefile
        pkgsrc/security/cyrus-sasl: Makefile Makefile.common options.mk
        pkgsrc/security/dirb: Makefile
        pkgsrc/security/dnssec-tools: Makefile
        pkgsrc/security/flawfinder: Makefile
        pkgsrc/security/gnome-keyring-sharp: options.mk
        pkgsrc/security/gnupg-pkcs11-scd: Makefile
        pkgsrc/security/go-crypt: Makefile
        pkgsrc/security/go-sftp: Makefile
        pkgsrc/security/gpgmepp: Makefile
        pkgsrc/security/gss: Makefile
        pkgsrc/security/heimdal: Makefile builtin.mk
        pkgsrc/security/hitch: Makefile
        pkgsrc/security/honeyd: options.mk
        pkgsrc/security/honeyd-arpd: Makefile
        pkgsrc/security/hs-digest: Makefile
        pkgsrc/security/john: Makefile
        pkgsrc/security/kauth: Makefile
        pkgsrc/security/lasso: Makefile Makefile.common
        pkgsrc/security/libbf: Makefile
        pkgsrc/security/libcrack: Makefile
        pkgsrc/security/libgpg-error: Makefile
        pkgsrc/security/libprelude-lua: Makefile
        pkgsrc/security/libpreludedb-perl: buildlink3.mk
        pkgsrc/security/libressl: Makefile
        pkgsrc/security/libtcpa: Makefile
        pkgsrc/security/lynis: Makefile
        pkgsrc/security/mbedtls1: options.mk
        pkgsrc/security/mit-krb5: builtin.mk
        pkgsrc/security/mixminion: Makefile
        pkgsrc/security/msu: Makefile
        pkgsrc/security/msudir: Makefile
        pkgsrc/security/netramet: Makefile
        pkgsrc/security/ocaml-ssl: Makefile
        pkgsrc/security/openpam: builtin.mk
        pkgsrc/security/opensc: options.mk
        pkgsrc/security/openssh: options.mk
        pkgsrc/security/openssl: Makefile builtin.mk
        pkgsrc/security/openvas-plugins: Makefile
        pkgsrc/security/openvas-server: options.mk
        pkgsrc/security/p11-kit: Makefile
        pkgsrc/security/p5-Authen-CAS-Client: Makefile
        pkgsrc/security/p5-Crypt-Eksblowfish: Makefile
        pkgsrc/security/p5-Digest-CRC: Makefile
        pkgsrc/security/p5-Digest-Perl-MD5: Makefile
        pkgsrc/security/pakchois: Makefile
        pkgsrc/security/pam-krb5: Makefile
        pkgsrc/security/pam-passwdqc: Makefile
        pkgsrc/security/pam-pwauth_suid: Makefile
        pkgsrc/security/pam-tacplus: Makefile
        pkgsrc/security/pcsc-lite: Makefile
        pkgsrc/security/pgp2: options.mk
        pkgsrc/security/php-ssh2: Makefile
        pkgsrc/security/php-ssh2-0: Makefile
        pkgsrc/security/pinentry: Makefile
        pkgsrc/security/pinentry-fltk: Makefile
        pkgsrc/security/pinentry-gtk2: Makefile
        pkgsrc/security/pinentry-mac: Makefile
        pkgsrc/security/pinepgp: options.mk
        pkgsrc/security/pks: Makefile
        pkgsrc/security/prelude-correlator: Makefile
        pkgsrc/security/prelude-lml: Makefile
        pkgsrc/security/prelude-manager: Makefile
        pkgsrc/security/prelude-pflogger: Makefile
        pkgsrc/security/py-Des: Makefile
        pkgsrc/security/py-OpenSSL: Makefile
        pkgsrc/security/py-SSLCrypto: Makefile
        pkgsrc/security/py-acme-tiny: Makefile
        pkgsrc/security/py-backports.ssl_match_hostname: Makefile
        pkgsrc/security/py-denyhosts: Makefile
        pkgsrc/security/py-gnupg: Makefile
        pkgsrc/security/py-openid: Makefile
        pkgsrc/security/py-prewikka: Makefile
        pkgsrc/security/py-slowaes: Makefile
        pkgsrc/security/py-smbpasswd: Makefile
        pkgsrc/security/py-urllib2-kerberos: Makefile
        pkgsrc/security/py-yara: Makefile
        pkgsrc/security/qca2-qt5: buildlink3.mk
        pkgsrc/security/qore-asn1-module: options.mk
        pkgsrc/security/qore-ssh2-module: Makefile options.mk
        pkgsrc/security/qore-xmlsec-module: Makefile options.mk
        pkgsrc/security/racoon2: Makefile
        pkgsrc/security/rainbowcrack: Makefile
        pkgsrc/security/scrypt: Makefile
        pkgsrc/security/seahorse: Makefile
        pkgsrc/security/sign: Makefile
        pkgsrc/security/skey: builtin.mk
        pkgsrc/security/smtpd: Makefile
        pkgsrc/security/snoopy: Makefile
        pkgsrc/security/softhsm: Makefile
        pkgsrc/security/srp_client: Makefile
        pkgsrc/security/sshfp: Makefile
        pkgsrc/security/ssldump: Makefile
        pkgsrc/security/sslwrap: Makefile
        pkgsrc/security/ssss: Makefile
        pkgsrc/security/sudo: options.mk
        pkgsrc/security/tcp_wrappers: builtin.mk
        pkgsrc/security/tor-browser: Makefile options.mk
        pkgsrc/security/validns: Makefile
        pkgsrc/security/volatility: Makefile
        pkgsrc/security/yara: Makefile
        pkgsrc/security/zebedee: Makefile
        pkgsrc/security/zoneminder: Makefile

Log Message:
security: align variable assignments

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

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/Bastille/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/CoolKey/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/EasyPG/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/security/apg/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/asignify/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/security/botan/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/ccid/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/security/cvm/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/security/cyrus-sasl/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/cyrus-sasl/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/cyrus-sasl/options.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/security/dirb/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/dnssec-tools/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/security/flawfinder/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/gnome-keyring-sharp/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/gnupg-pkcs11-scd/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/go-crypt/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/go-sftp/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/gpgmepp/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/security/gss/Makefile
cvs rdiff -u -r1.133 -r1.134 pkgsrc/security/heimdal/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/heimdal/builtin.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/hitch/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/honeyd/options.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/honeyd-arpd/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/hs-digest/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/security/john/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/kauth/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/lasso/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/lasso/Makefile.common
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/libbf/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/libcrack/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/security/libgpg-error/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/libprelude-lua/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/libpreludedb-perl/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/libressl/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/libtcpa/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/lynis/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/mbedtls1/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/mit-krb5/builtin.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/security/mixminion/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/msu/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/msudir/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/netramet/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/security/ocaml-ssl/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/openpam/builtin.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/opensc/options.mk
cvs rdiff -u -r1.37 -r1.38 pkgsrc/security/openssh/options.mk
cvs rdiff -u -r1.242 -r1.243 pkgsrc/security/openssl/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/openssl/builtin.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/openvas-plugins/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/security/openvas-server/options.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/p11-kit/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/p5-Authen-CAS-Client/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/p5-Crypt-Eksblowfish/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/p5-Digest-CRC/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/p5-Digest-Perl-MD5/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/pakchois/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/pam-krb5/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/pam-passwdqc/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/pam-pwauth_suid/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/pam-tacplus/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/pcsc-lite/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/pgp2/options.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/php-ssh2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/php-ssh2-0/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/security/pinentry/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/pinentry-fltk/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/security/pinentry-gtk2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/pinentry-mac/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/pinepgp/options.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/security/pks/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/security/prelude-correlator/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/security/prelude-lml/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/security/prelude-manager/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/prelude-pflogger/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/py-Des/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/security/py-OpenSSL/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/py-SSLCrypto/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/py-acme-tiny/Makefile
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/security/py-backports.ssl_match_hostname/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/py-denyhosts/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/py-gnupg/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/py-openid/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/security/py-prewikka/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/py-slowaes/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/py-smbpasswd/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/py-urllib2-kerberos/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/py-yara/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/qca2-qt5/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/qore-asn1-module/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/qore-ssh2-module/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/qore-ssh2-module/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/qore-xmlsec-module/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/qore-xmlsec-module/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/racoon2/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/rainbowcrack/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/scrypt/Makefile
cvs rdiff -u -r1.153 -r1.154 pkgsrc/security/seahorse/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/sign/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/skey/builtin.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/smtpd/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/snoopy/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/softhsm/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/security/srp_client/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/sshfp/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/ssldump/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/sslwrap/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/ssss/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/security/sudo/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/tcp_wrappers/builtin.mk
cvs rdiff -u -r1.50 -r1.51 pkgsrc/security/tor-browser/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/tor-browser/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/validns/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/volatility/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/yara/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/security/zebedee/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/security/zoneminder/Makefile

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

Modified files:

Index: pkgsrc/security/Bastille/Makefile
diff -u pkgsrc/security/Bastille/Makefile:1.15 pkgsrc/security/Bastille/Makefile:1.16
--- pkgsrc/security/Bastille/Makefile:1.15      Sun Aug 11 13:22:44 2019
+++ pkgsrc/security/Bastille/Makefile   Mon Nov  4 21:12:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:22:44 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 21:12:51 rillig Exp $
 #
 
 DISTNAME=      Bastille-3.0.9
@@ -19,7 +19,7 @@ USE_LANGUAGES=                # none
 USE_TOOLS+=            bash:run perl:run
 NO_BUILD=              yes
 
-CHECK_INTERPRETER_SKIP+=share/Bastille/bastille-tmpdir.csh
+CHECK_INTERPRETER_SKIP+=       share/Bastille/bastille-tmpdir.csh
 
 BUILD_DEPENDS+=                checkperms>=1.4:../../sysutils/checkperms
 DEPENDS+=              p5-Tk-[0-9]*:../../x11/p5-Tk

Index: pkgsrc/security/CoolKey/Makefile
diff -u pkgsrc/security/CoolKey/Makefile:1.7 pkgsrc/security/CoolKey/Makefile:1.8
--- pkgsrc/security/CoolKey/Makefile:1.7        Wed Aug 16 20:45:44 2017
+++ pkgsrc/security/CoolKey/Makefile    Mon Nov  4 21:12:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/08/16 20:45:44 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 21:12:51 rillig Exp $
 #
 
 DISTNAME=      coolkey-1.1.0
@@ -31,9 +31,9 @@ USE_TOOLS+=   gsed
 USE_LANGUAGES= c c++
 AUTOCONF_REQD= 2.59
 
-CONFIGURE_ARGS+=        --sharedstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=        --localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sharedstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --disable-dependency-tracking
 
 PKGCONFIG_OVERRIDE+=   src/libckyapplet/libckyapplet.pc.in

Index: pkgsrc/security/EasyPG/Makefile
diff -u pkgsrc/security/EasyPG/Makefile:1.20 pkgsrc/security/EasyPG/Makefile:1.21
--- pkgsrc/security/EasyPG/Makefile:1.20        Fri Sep 29 12:40:28 2017
+++ pkgsrc/security/EasyPG/Makefile     Mon Nov  4 21:12:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/09/29 12:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 21:12:51 rillig Exp $
 
 DISTNAME=      epg-0.0.16
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/epg/EasyPG/}
@@ -10,8 +10,8 @@ MAINTAINER=   gdt%NetBSD.org@localhost
 HOMEPAGE=      http://www.easypg.org/
 COMMENT=       GnuPG interface for emacs
 
-GNU_CONFIGURE= YES
-MAKE_FLAGS+=   lispdir=${EMACS_LISPPREFIX:Q}
+GNU_CONFIGURE=         YES
+MAKE_FLAGS+=           lispdir=${EMACS_LISPPREFIX:Q}
 INSTALL_MAKE_FLAGS+=   lispdir=${DESTDIR}${EMACS_LISPPREFIX:Q}
 
 INFO_FILES=    yes
@@ -19,7 +19,7 @@ INFO_FILES=   yes
 # per README: GnuPG 1.4.3
 DEPENDS+=      gnupg>=1.4.3:../../security/gnupg
 # per README: GNU Emacs 21.4, XEmacs 21.4, or later
-EMACS_VERSIONS_ACCEPTED=  emacs21 emacs21nox xemacs214 xemacs215
+EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox xemacs214 xemacs215
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/apg/Makefile
diff -u pkgsrc/security/apg/Makefile:1.27 pkgsrc/security/apg/Makefile:1.28
--- pkgsrc/security/apg/Makefile:1.27   Sun Aug 11 13:22:44 2019
+++ pkgsrc/security/apg/Makefile        Mon Nov  4 21:12:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/08/11 13:22:44 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/04 21:12:51 rillig Exp $
 #
 
 DISTNAME=      apg-2.3.0b
@@ -16,10 +16,10 @@ MAKE_ENV+=  FLAGS=${CFLAGS:M*:Q} INSTALL_
 USE_TOOLS+=    perl:run
 REPLACE_PERL=  perl/apgcli.pl
 
-OPSYSVARS+=    APG_CS_CLIBS
+OPSYSVARS+=            APG_CS_CLIBS
 APG_CS_CLIBS.Linux+=   -lnsl
 APG_CS_CLIBS.SunOS+=   -lnsl -lsocket
-MAKE_ENV+=     APG_CS_CLIBS=${APG_CS_CLIBS:Q}
+MAKE_ENV+=             APG_CS_CLIBS=${APG_CS_CLIBS:Q}
 
 INSTALLATION_DIRS+=    bin sbin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
 

Index: pkgsrc/security/asignify/Makefile
diff -u pkgsrc/security/asignify/Makefile:1.3 pkgsrc/security/asignify/Makefile:1.4
--- pkgsrc/security/asignify/Makefile:1.3       Sun Jul 30 22:32:21 2017
+++ pkgsrc/security/asignify/Makefile   Mon Nov  4 21:12:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/07/30 22:32:21 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/04 21:12:51 rillig Exp $
 
 DISTNAME=      asignify-20150220
 CATEGORIES=    security
@@ -16,6 +16,6 @@ USE_LIBTOOL=  yes
 USE_TOOLS+=    automake
 
 pre-configure:
-               cd ${WRKSRC}; sh ./autogen.sh
+       cd ${WRKSRC}; sh ./autogen.sh
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/botan/Makefile
diff -u pkgsrc/security/botan/Makefile:1.52 pkgsrc/security/botan/Makefile:1.53
--- pkgsrc/security/botan/Makefile:1.52 Mon Sep  2 13:19:54 2019
+++ pkgsrc/security/botan/Makefile      Mon Nov  4 21:12:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/09/02 13:19:54 adam Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/04 21:12:51 rillig Exp $
 
 DISTNAME=      Botan-1.10.17
 PKGNAME=       ${DISTNAME:tl}
@@ -15,7 +15,7 @@ LICENSE=      2-clause-bsd
 HAS_CONFIGURE=         yes
 USE_LANGUAGES=         c++03
 
-PYTHON_FOR_BUILD_ONLY= yes
+PYTHON_FOR_BUILD_ONLY=         yes
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 1.8.14; 1.10 is supposedly better
 
 CONFIG_SHELL=          ${PYTHONBIN}
@@ -32,12 +32,12 @@ PLIST_VARS+=        x86 x86_64 i386
 
 .if ${MACHINE_ARCH} == "x86_64"
 CONFIGURE_ARGS+=       --cpu=amd64
-PLIST.x86_64=  yes
-PLIST.x86=     yes
+PLIST.x86_64=          yes
+PLIST.x86=             yes
 .elif ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=       --cpu=i386
-PLIST.i386=    yes
-PLIST.x86=     yes
+PLIST.i386=            yes
+PLIST.x86=             yes
 .elif ${MACHINE_ARCH} == "powerpc"
 CONFIGURE_ARGS+=       --cpu=ppc
 .elif ${MACHINE_ARCH} == "powerpc64"

Index: pkgsrc/security/ccid/Makefile
diff -u pkgsrc/security/ccid/Makefile:1.29 pkgsrc/security/ccid/Makefile:1.30
--- pkgsrc/security/ccid/Makefile:1.29  Tue Sep 17 23:09:42 2019
+++ pkgsrc/security/ccid/Makefile       Mon Nov  4 21:12:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/09/17 23:09:42 perseant Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/04 21:12:52 rillig Exp $
 #
 
 DISTNAME=      ccid-1.4.27
@@ -30,8 +30,8 @@ USE_LANGUAGES=        c c++
 # PTHREAD vars.  Not yet reported upstream.
 PTHREAD_AUTO_VARS=     yes
 
-CONFIGURE_ARGS+=        --sharedstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sharedstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
 REPLACE_PERL=          src/convert_version.pl src/create_Info_plist.pl
 

Index: pkgsrc/security/cvm/Makefile
diff -u pkgsrc/security/cvm/Makefile:1.23 pkgsrc/security/cvm/Makefile:1.24
--- pkgsrc/security/cvm/Makefile:1.23   Thu May 23 19:23:14 2019
+++ pkgsrc/security/cvm/Makefile        Mon Nov  4 21:12:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:14 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/04 21:12:52 rillig Exp $
 #
 
 DISTNAME=              cvm-0.97
@@ -47,9 +47,9 @@ DJB_CONFIG_CMDS=                                                      \
 .include "../../mk/bsd.prefs.mk"
 
 .if ${SHLIB_TYPE} == "dylib"
-CVM_LIB_EXT=dylib
+CVM_LIB_EXT=   dylib
 .else
-CVM_LIB_EXT=so
+CVM_LIB_EXT=   so
 .endif
 
 LDFLAGS.SunOS+=        -lsocket -lnsl

Index: pkgsrc/security/cyrus-sasl/Makefile
diff -u pkgsrc/security/cyrus-sasl/Makefile:1.75 pkgsrc/security/cyrus-sasl/Makefile:1.76
--- pkgsrc/security/cyrus-sasl/Makefile:1.75    Sun Dec  9 21:05:35 2018
+++ pkgsrc/security/cyrus-sasl/Makefile Mon Nov  4 21:12:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2018/12/09 21:05:35 adam Exp $
+# $NetBSD: Makefile,v 1.76 2019/11/04 21:12:52 rillig Exp $
 
 COMMENT=       Simple Authentication and Security Layer
 
@@ -58,7 +58,7 @@ PKG_USERS_VARS+=      CYRUS_USER
 
 PKG_GROUPS=            ${CYRUS_GROUP}
 PKG_USERS=             ${CYRUS_USER}:${CYRUS_GROUP}
-PKG_SHELL.${CYRUS_USER}=${SH}
+PKG_SHELL.${CYRUS_USER}= ${SH}
 
 MESSAGE_SUBST+=                PLUGINDIR=${PLUGINDIR:Q}
 

Index: pkgsrc/security/cyrus-sasl/Makefile.common
diff -u pkgsrc/security/cyrus-sasl/Makefile.common:1.29 pkgsrc/security/cyrus-sasl/Makefile.common:1.30
--- pkgsrc/security/cyrus-sasl/Makefile.common:1.29     Wed Oct  9 09:38:10 2019
+++ pkgsrc/security/cyrus-sasl/Makefile.common  Mon Nov  4 21:12:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2019/10/09 09:38:10 nros Exp $
+# $NetBSD: Makefile.common,v 1.30 2019/11/04 21:12:52 rillig Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -17,15 +17,15 @@
 # This Makefile fragment should be included _below_ any SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
 
-DISTNAME=      cyrus-sasl-2.1.27
-DISTFILES=     ${DISTNAME}-rc7${EXTRACT_SUFX}
-CATEGORIES=    security
-MASTER_SITES=  https://www.cyrusimap.org/releases/
-MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/
-#MASTER_SITES+=        ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
-#PATCHFILES+=  cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2
+DISTNAME=              cyrus-sasl-2.1.27
+DISTFILES=             ${DISTNAME}-rc7${EXTRACT_SUFX}
+CATEGORIES=            security
+MASTER_SITES=          https://www.cyrusimap.org/releases/
+MASTER_SITES+=         ftp://ftp.cyrusimap.org/cyrus-sasl/
+#MASTER_SITES+=                ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
+#PATCHFILES+=          cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2
 #SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \
-#              -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d
+#                      -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d
 #PATCH_DIST_STRIP=     -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/cyrus-sasl/options.mk
diff -u pkgsrc/security/cyrus-sasl/options.mk:1.2 pkgsrc/security/cyrus-sasl/options.mk:1.3
--- pkgsrc/security/cyrus-sasl/options.mk:1.2   Sun Sep 11 06:11:15 2016
+++ pkgsrc/security/cyrus-sasl/options.mk       Mon Nov  4 21:12:52 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2016/09/11 06:11:15 richard Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/04 21:12:52 rillig Exp $
 #
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.cyrus-sasl
+PKG_OPTIONS_VAR=               PKG_OPTIONS.cyrus-sasl
 PKG_OPTIONS_REQUIRED_GROUPS=   database
 PKG_OPTIONS_GROUP.database=    ndbm bdb gdbm
 
@@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS+=       ndbm
 .  elif !empty(SASL_DBTYPE:Mberkeley)
 PKG_SUGGESTED_OPTIONS+=        bdb
 .  else
-PKG_FAIL_REASON+=                      "Unknown SASL_DBTYPE: ${SASL_DBTYPE:Q}"
+PKG_FAIL_REASON+=      "Unknown SASL_DBTYPE: ${SASL_DBTYPE:Q}"
 .  endif
 .elif exists(/usr/include/ndbm.h) && ${OPSYS} != "Linux"
 PKG_SUGGESTED_OPTIONS+=        ndbm

Index: pkgsrc/security/dirb/Makefile
diff -u pkgsrc/security/dirb/Makefile:1.27 pkgsrc/security/dirb/Makefile:1.28
--- pkgsrc/security/dirb/Makefile:1.27  Thu Aug 22 12:23:44 2019
+++ pkgsrc/security/dirb/Makefile       Mon Nov  4 21:12:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/08/22 12:23:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/04 21:12:52 rillig Exp $
 #
 
 PKGNAME=       dirb-1.9
@@ -11,7 +11,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://dirb.sourceforge.net/
 COMMENT=       Web Content Scanner
 
-WRKSRC=${WRKDIR}/dirb
+WRKSRC=        ${WRKDIR}/dirb
 
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes

Index: pkgsrc/security/dnssec-tools/Makefile
diff -u pkgsrc/security/dnssec-tools/Makefile:1.30 pkgsrc/security/dnssec-tools/Makefile:1.31
--- pkgsrc/security/dnssec-tools/Makefile:1.30  Sun Aug 11 13:22:45 2019
+++ pkgsrc/security/dnssec-tools/Makefile       Mon Nov  4 21:12:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/08/11 13:22:45 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/04 21:12:52 rillig Exp $
 
 DISTNAME=      dnssec-tools-2.1
 PKGREVISION=   5
@@ -34,7 +34,7 @@ PERL5_PACKLIST+=      auto/Net/DNS/SEC/Tools/
 PERL5_PACKLIST+=       auto/convertar/.packlist
 PERL5_PACKLIST+=       auto/dnssec-tools/.packlist
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-nsec3
 CONFIGURE_ARGS+=       --with-resolv-conf=${PKG_SYSCONFDIR}/dnssec-tools/resolv.conf
 CONFIGURE_ARGS+=       --with-root-hints=${PKG_SYSCONFDIR}/dnssec-tools/root.hints

Index: pkgsrc/security/flawfinder/Makefile
diff -u pkgsrc/security/flawfinder/Makefile:1.26 pkgsrc/security/flawfinder/Makefile:1.27
--- pkgsrc/security/flawfinder/Makefile:1.26    Thu Apr 25 07:33:15 2019
+++ pkgsrc/security/flawfinder/Makefile Mon Nov  4 21:12:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/04/25 07:33:15 maya Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/04 21:12:52 rillig Exp $
 
 DISTNAME=      flawfinder-1.31
 PKGREVISION=   1
@@ -11,7 +11,7 @@ COMMENT=      Python program to find flaws in
 LICENSE=       gnu-gpl-v2
 
 NO_BUILD=              yes
-REPLACE_PYTHON=        flawfinder
+REPLACE_PYTHON=                flawfinder
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:

Index: pkgsrc/security/gnome-keyring-sharp/options.mk
diff -u pkgsrc/security/gnome-keyring-sharp/options.mk:1.1 pkgsrc/security/gnome-keyring-sharp/options.mk:1.2
--- pkgsrc/security/gnome-keyring-sharp/options.mk:1.1  Sat Jun 16 22:00:23 2012
+++ pkgsrc/security/gnome-keyring-sharp/options.mk      Mon Nov  4 21:12:52 2019
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.1 2012/06/16 22:00:23 dholland Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 21:12:52 rillig Exp $
 
-PKG_OPTIONS_VAR=PKG_OPTIONS.gnome-keyring-sharp
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gnome-keyring-sharp
 
 PKG_SUPPORTED_OPTIONS= ndesk-dbus
 PKG_SUGGESTED_OPTIONS= ndesk-dbus

Index: pkgsrc/security/gnupg-pkcs11-scd/Makefile
diff -u pkgsrc/security/gnupg-pkcs11-scd/Makefile:1.15 pkgsrc/security/gnupg-pkcs11-scd/Makefile:1.16
--- pkgsrc/security/gnupg-pkcs11-scd/Makefile:1.15      Sat Jul 20 22:46:47 2019
+++ pkgsrc/security/gnupg-pkcs11-scd/Makefile   Mon Nov  4 21:12:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/07/20 22:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 21:12:52 rillig Exp $
 
 VERSION=       0.7.0
 DISTNAME=      gnupg-pkcs11-scd-${VERSION}
@@ -12,8 +12,8 @@ HOMEPAGE=     http://gnupg-pkcs11.sourceforg
 COMMENT=       OpenSC smart card support for GnuPG
 LICENSE=       modified-bsd
 
-GNU_CONFIGURE= yes
-USE_TOOLS+=     pkg-config
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            pkg-config
 LIBS.OperatingSystem+= -ldl
 CONFIGURE_ARGS+=       --with-libgpg-error-prefix=${PREFIX}
 CONFIGURE_ARGS+=       --with-libassuan-prefix=${PREFIX}

Index: pkgsrc/security/go-crypt/Makefile
diff -u pkgsrc/security/go-crypt/Makefile:1.15 pkgsrc/security/go-crypt/Makefile:1.16
--- pkgsrc/security/go-crypt/Makefile:1.15      Fri Oct 18 14:58:56 2019
+++ pkgsrc/security/go-crypt/Makefile   Mon Nov  4 21:12:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/10/18 14:58:56 bsiegert Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 21:12:53 rillig Exp $
 
 # Making up a version number, as this is a snapshot after the latest release
 DISTNAME=      crypt-0.0.2b
@@ -7,7 +7,7 @@ PKGREVISION=    13
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=xordataexchange/}
 CATEGORIES=    security
 GITHUB_TAG=    749e360c8f236773f28fc6d3ddfce4a470795227
-GITHUB_PROJECT= ${PKGBASE:S/^go-//}
+GITHUB_PROJECT=        ${PKGBASE:S/^go-//}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://xordataexchange.github.io/crypt/

Index: pkgsrc/security/go-sftp/Makefile
diff -u pkgsrc/security/go-sftp/Makefile:1.15 pkgsrc/security/go-sftp/Makefile:1.16
--- pkgsrc/security/go-sftp/Makefile:1.15       Fri Oct 18 14:58:56 2019
+++ pkgsrc/security/go-sftp/Makefile    Mon Nov  4 21:12:53 2019
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2019/10/18 14:58:56 bsiegert Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 21:12:53 rillig Exp $
 
 DISTNAME=      sftp-1.0.0
 PKGNAME=       go-${DISTNAME}
 PKGREVISION=   13
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=pkg/}
 CATEGORIES=    security
-GITHUB_TAG=     ${PKGVERSION_NOREV}
-GITHUB_PROJECT= ${PKGBASE:S/^go-//}
+GITHUB_TAG=    ${PKGVERSION_NOREV}
+GITHUB_PROJECT=        ${PKGBASE:S/^go-//}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/pkg/sftp

Index: pkgsrc/security/gpgmepp/Makefile
diff -u pkgsrc/security/gpgmepp/Makefile:1.14 pkgsrc/security/gpgmepp/Makefile:1.15
--- pkgsrc/security/gpgmepp/Makefile:1.14       Wed Apr  3 00:33:04 2019
+++ pkgsrc/security/gpgmepp/Makefile    Mon Nov  4 21:12:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/04/03 00:33:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 21:12:53 rillig Exp $
 
 DISTNAME=      gpgmepp-15.12.2
 PKGREVISION=   13
@@ -11,7 +11,7 @@ HOMEPAGE=     https://projects.kde.org/gpgme
 COMMENT=       C++ bindings/wrapper for gpgme
 LICENSE=       gnu-lgpl-v2.1
 
-BUILD_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
+BUILD_DEPENDS+=        extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++

Index: pkgsrc/security/gss/Makefile
diff -u pkgsrc/security/gss/Makefile:1.23 pkgsrc/security/gss/Makefile:1.24
--- pkgsrc/security/gss/Makefile:1.23   Thu Jan 19 18:52:23 2017
+++ pkgsrc/security/gss/Makefile        Mon Nov  4 21:12:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:23 agc Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/04 21:12:53 rillig Exp $
 #
 
 DISTNAME=              gss-0.0.15
@@ -13,9 +13,9 @@ COMMENT=              GNU Generic Security Service L
 
 CONFLICTS+=            heimdal-[0-9]*
 
-USE_TOOLS+=            pkg-config msgfmt
-GNU_CONFIGURE=         yes
-USE_LIBTOOL=           yes
+USE_TOOLS+=    pkg-config msgfmt
+GNU_CONFIGURE= yes
+USE_LIBTOOL=   yes
 INFO_FILES=    yes
 
 PKGCONFIG_OVERRIDE+=   gss.pc.in

Index: pkgsrc/security/heimdal/Makefile
diff -u pkgsrc/security/heimdal/Makefile:1.133 pkgsrc/security/heimdal/Makefile:1.134
--- pkgsrc/security/heimdal/Makefile:1.133      Mon Oct 21 16:21:44 2019
+++ pkgsrc/security/heimdal/Makefile    Mon Nov  4 21:12:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2019/10/21 16:21:44 wiz Exp $
+# $NetBSD: Makefile,v 1.134 2019/11/04 21:12:53 rillig Exp $
 
 DISTNAME=      heimdal-1.5.3
 PKGREVISION=   21
@@ -103,8 +103,8 @@ PLIST.hcrypto=              yes
 
 # Linux does not have include/vis.h and expected include/glob.h.
 .if ${OPSYS} == "Linux"
-PLIST.vis=     yes
-PLIST.glob=    yes
+PLIST.vis=             yes
+PLIST.glob=            yes
 # Without this I get undefined references to pthread_getspecific
 PTHREAD_AUTO_VARS=     yes
 .endif

Index: pkgsrc/security/heimdal/builtin.mk
diff -u pkgsrc/security/heimdal/builtin.mk:1.16 pkgsrc/security/heimdal/builtin.mk:1.17
--- pkgsrc/security/heimdal/builtin.mk:1.16     Thu Sep 12 21:07:01 2019
+++ pkgsrc/security/heimdal/builtin.mk  Mon Nov  4 21:12:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2019/09/12 21:07:01 rillig Exp $
+# $NetBSD: builtin.mk,v 1.17 2019/11/04 21:12:53 rillig Exp $
 
 BUILTIN_PKG:=  heimdal
 
@@ -21,7 +21,7 @@ IS_BUILTIN.heimdal=   no
 IS_BUILTIN.heimdal=    yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.heimdal
+MAKEVARS+=             IS_BUILTIN.heimdal
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -38,17 +38,17 @@ BUILTIN_VERSION.heimdal!=   ${SH_KRB5_CONF
 # the version number of the software.  Match up heimdal versions with
 # OS versions for an approximate determination of the heimdal version.
 #
-_BLTN_HEIMDAL_VERSIONS=        0.6.3  0.6.2  0.6.1  0.6  0.5  0.4e  0.3f  0.3e
-_BLTN_HEIMDAL_0.6.3=   NetBSD-2.* NetBSD-[3-9]*-*
-_BLTN_HEIMDAL_0.6.2=   # empty
-_BLTN_HEIMDAL_0.6.1=   NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-*
-_BLTN_HEIMDAL_0.6=     NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-*
-_BLTN_HEIMDAL_0.5=     NetBSD-1.6[I-T]-*
-_BLTN_HEIMDAL_0.4e=    NetBSD-1.6[A-H]-*                               \
+_BLTN_HEIMDAL_VERSIONS=                0.6.3  0.6.2  0.6.1  0.6  0.5  0.4e  0.3f  0.3e
+_BLTN_HEIMDAL_0.6.3=           NetBSD-2.* NetBSD-[3-9]*-*
+_BLTN_HEIMDAL_0.6.2=           # empty
+_BLTN_HEIMDAL_0.6.1=           NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-*
+_BLTN_HEIMDAL_0.6=             NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-*
+_BLTN_HEIMDAL_0.5=             NetBSD-1.6[I-T]-*
+_BLTN_HEIMDAL_0.4e=            NetBSD-1.6[A-H]-*                               \
                        NetBSD-1.6-* NetBSD-1.6_*-* NetBSD-1.6.*-*      \
                        NetBSD-1.5[YZ]-* NetBSD-1.5Z*-*
-_BLTN_HEIMDAL_0.3f=    NetBSD-1.5X-*
-_BLTN_HEIMDAL_0.3e=    NetBSD-1.5[UVW]-*                               \
+_BLTN_HEIMDAL_0.3f=            NetBSD-1.5X-*
+_BLTN_HEIMDAL_0.3e=            NetBSD-1.5[UVW]-*                               \
                        NetBSD-1.5.*-*
 .    for _heimdal_version_ in ${_BLTN_HEIMDAL_VERSIONS}
 .      for _pattern_ in ${_BLTN_HEIMDAL_${_heimdal_version_}}
@@ -61,7 +61,7 @@ BUILTIN_VERSION.heimdal?=     0.2t
 .  endif
 BUILTIN_PKG.heimdal=           heimdal-${BUILTIN_VERSION.heimdal}
 .endif
-MAKEVARS+=     BUILTIN_PKG.heimdal
+MAKEVARS+=                     BUILTIN_PKG.heimdal
 
 ###
 ### Determine whether we should use the built-in implementation if it

Index: pkgsrc/security/hitch/Makefile
diff -u pkgsrc/security/hitch/Makefile:1.10 pkgsrc/security/hitch/Makefile:1.11
--- pkgsrc/security/hitch/Makefile:1.10 Thu Apr 25 07:33:15 2019
+++ pkgsrc/security/hitch/Makefile      Mon Nov  4 21:12:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/04/25 07:33:15 maya Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/04 21:12:53 rillig Exp $
 
 DISTNAME=      hitch-1.5.0
 PKGREVISION=   1
@@ -33,7 +33,7 @@ HITCH_OCSP?=          ${VARBASE}/db/hitch
 
 PKG_GROUPS+=           ${HITCH_GROUP}
 PKG_USERS+=            ${HITCH_USER}:${HITCH_GROUP}
-PKG_GECOS.${HITCH_USER}=hitch daemon user
+PKG_GECOS.${HITCH_USER}= hitch daemon user
 
 RCD_SCRIPTS=           hitch
 

Index: pkgsrc/security/honeyd/options.mk
diff -u pkgsrc/security/honeyd/options.mk:1.3 pkgsrc/security/honeyd/options.mk:1.4
--- pkgsrc/security/honeyd/options.mk:1.3       Mon Dec  5 20:50:56 2005
+++ pkgsrc/security/honeyd/options.mk   Mon Nov  4 21:12:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/12/05 20:50:56 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/04 21:12:53 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.honeyd
 PKG_SUPPORTED_OPTIONS= python rrdtool
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS=  python rrdtool
 ### Add python support
 ###
 .if !empty(PKG_OPTIONS:Mpython)
-.      include "../../lang/python/extension.mk"
+.  include "../../lang/python/extension.mk"
 CONFIGURE_ENV+=                _PATH_PYTHON=${PYTHONBIN:Q}
 .else
 CONFIGURE_ARGS+=       --without-python
@@ -19,5 +19,5 @@ CONFIGURE_ARGS+=      --without-python
 ### Add RRDTool support
 ###
 .if !empty(PKG_OPTIONS:Mrrdtool)
-.      include "../../databases/rrdtool/buildlink3.mk"
+.  include "../../databases/rrdtool/buildlink3.mk"
 .endif

Index: pkgsrc/security/honeyd-arpd/Makefile
diff -u pkgsrc/security/honeyd-arpd/Makefile:1.30 pkgsrc/security/honeyd-arpd/Makefile:1.31
--- pkgsrc/security/honeyd-arpd/Makefile:1.30   Sat Mar  5 11:29:21 2016
+++ pkgsrc/security/honeyd-arpd/Makefile        Mon Nov  4 21:12:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/03/05 11:29:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/04 21:12:53 rillig Exp $
 #
 
 DISTNAME=      arpd-0.2
@@ -15,7 +15,7 @@ RCD_SCRIPTS=  honeydarpd
 GNU_CONFIGURE= yes
 WRKSRC=                ${WRKDIR}/arpd
 
-CONFIGURE_ARGS+=    --with-libevent=${BUILDLINK_PREFIX.libevent}
+CONFIGURE_ARGS+=       --with-libevent=${BUILDLINK_PREFIX.libevent}
 
 INSTALLATION_DIRS=     sbin ${PKGMANDIR}/man8
 

Index: pkgsrc/security/hs-digest/Makefile
diff -u pkgsrc/security/hs-digest/Makefile:1.1 pkgsrc/security/hs-digest/Makefile:1.2
--- pkgsrc/security/hs-digest/Makefile:1.1      Mon Aug 18 21:18:48 2014
+++ pkgsrc/security/hs-digest/Makefile  Mon Nov  4 21:12:53 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/08/18 21:18:48 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/04 21:12:53 rillig Exp $
 
 DISTNAME=      digest-0.0.1.2
-CATEGORIES= security
+CATEGORIES=    security
 
-MAINTAINER= zecrazytux%zecrazytux.net@localhost
+MAINTAINER=    zecrazytux%zecrazytux.net@localhost
 COMMENT=       Various cryptographic hashes for bytestrings; CRC32 and Adler32
 LICENSE=       modified-bsd
 

Index: pkgsrc/security/john/Makefile
diff -u pkgsrc/security/john/Makefile:1.26 pkgsrc/security/john/Makefile:1.27
--- pkgsrc/security/john/Makefile:1.26  Thu May 23 19:23:14 2019
+++ pkgsrc/security/john/Makefile       Mon Nov  4 21:12:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/05/23 19:23:14 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/04 21:12:54 rillig Exp $
 #
 
 DISTNAME=      john-1.8.0
@@ -25,47 +25,47 @@ JOHN_ARCH.sparc64=  sparcv9
 JOHN_ARCH.x86_64=      x86-64
 JOHN_CC.gcc=           gcc
 JOHN_CC.sunpro=                cc
-BUILD_TARGET=  solaris-${JOHN_ARCH.${MACHINE_ARCH}}-${JOHN_CC.${PKGSRC_COMPILER}}
+BUILD_TARGET=          solaris-${JOHN_ARCH.${MACHINE_ARCH}}-${JOHN_CC.${PKGSRC_COMPILER}}
 .elif ${OPSYS} == "NetBSD"
 .  if ${MACHINE_ARCH} == "i386"
-BUILD_TARGET=  openbsd-x86-any
+BUILD_TARGET=          openbsd-x86-any
 .  elif ${MACHINE_ARCH} == "x86_64"
-BUILD_TARGET=  openbsd-x86-64
+BUILD_TARGET=          openbsd-x86-64
 .  elif ${MACHINE_ARCH} == "sparc64"
-BUILD_TARGET=  netbsd-sparc64
+BUILD_TARGET=          netbsd-sparc64
 .  elif ${MACHINE_ARCH} == "sparc"
-BUILD_TARGET=  openbsd-sparc
+BUILD_TARGET=          openbsd-sparc
 .  elif ${MACHINE_ARCH} == "alpha"
-BUILD_TARGET=  openbsd-alpha
+BUILD_TARGET=          openbsd-alpha
 .  elif ${MACHINE_ARCH} == "powerpc"
-BUILD_TARGET=  openbsd-ppc32
+BUILD_TARGET=          openbsd-ppc32
 .  elif ${MACHINE_ARCH} == "powerpc64"
-BUILD_TARGET=  openbsd-ppc64
+BUILD_TARGET=          openbsd-ppc64
 .  elif ${MACHINE_ARCH} == "vax"
-BUILD_TARGET=  netbsd-vax
+BUILD_TARGET=          netbsd-vax
 .  else
-BUILD_TARGET=  generic
+BUILD_TARGET=          generic
 .  endif
 .elif ${OPSYS} == "OpenBSD"
 .  if ${MACHINE_ARCH} == "i386"
-BUILD_TARGET=  openbsd-x86-any
+BUILD_TARGET=          openbsd-x86-any
 .  elif ${MACHINE_ARCH} == "x86_64"
-BUILD_TARGET=  openbsd-x86-64
+BUILD_TARGET=          openbsd-x86-64
 .  elif ${MACHINE_ARCH} == "sparc64"
-BUILD_TARGET=  openbsd-sparc64
+BUILD_TARGET=          openbsd-sparc64
 .  elif ${MACHINE_ARCH} == "sparc"
-BUILD_TARGET=  openbsd-sparc
+BUILD_TARGET=          openbsd-sparc
 .  elif ${MACHINE_ARCH} == "alpha"
-BUILD_TARGET=  openbsd-alpha
+BUILD_TARGET=          openbsd-alpha
 .  elif ${MACHINE_ARCH} == "powerpc"
-BUILD_TARGET=  openbsd-ppc32
+BUILD_TARGET=          openbsd-ppc32
 .  elif ${MACHINE_ARCH} == "powerpc64"
-BUILD_TARGET=  openbsd-ppc64
+BUILD_TARGET=          openbsd-ppc64
 .  else
-BUILD_TARGET=  generic
+BUILD_TARGET=          generic
 .  endif
 .else
-BUILD_TARGET=  generic
+BUILD_TARGET=          generic
 .endif
 
 INSTALLATION_DIRS=     bin share/john

Index: pkgsrc/security/kauth/Makefile
diff -u pkgsrc/security/kauth/Makefile:1.29 pkgsrc/security/kauth/Makefile:1.30
--- pkgsrc/security/kauth/Makefile:1.29 Wed Sep 18 14:17:16 2019
+++ pkgsrc/security/kauth/Makefile      Mon Nov  4 21:12:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/09/18 14:17:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/04 21:12:54 rillig Exp $
 
 DISTNAME=      kauth-${KF5VER}
 PKGREVISION=   1
@@ -9,7 +9,7 @@ COMMENT=        Abstraction to system policy an
 LICENSE=       gnu-lgpl-v2.1
 
 CONF_FILES+=   ${PREFIX}/share/examples/kauth/org.kde.kf5auth.conf \
-                ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kf5auth.conf
+               ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kf5auth.conf
 
 .include "../../meta-pkgs/kde/kf5.mk"
 

Index: pkgsrc/security/lasso/Makefile
diff -u pkgsrc/security/lasso/Makefile:1.38 pkgsrc/security/lasso/Makefile:1.39
--- pkgsrc/security/lasso/Makefile:1.38 Mon Sep  2 13:19:55 2019
+++ pkgsrc/security/lasso/Makefile      Mon Nov  4 21:12:54 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.38 2019/09/02 13:19:55 adam Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/04 21:12:54 rillig Exp $
 
 CONFIGURE_ARGS+=       --disable-python
 CONFIGURE_ARGS+=       --disable-php5
 CONFIGURE_ARGS+=       --disable-perl
 
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 2.4.1
-PYTHON_FOR_BUILD_ONLY= yes
+PYTHON_FOR_BUILD_ONLY=         yes
 
 EXTRACT_USING=         bsdtar
 

Index: pkgsrc/security/lasso/Makefile.common
diff -u pkgsrc/security/lasso/Makefile.common:1.13 pkgsrc/security/lasso/Makefile.common:1.14
--- pkgsrc/security/lasso/Makefile.common:1.13  Tue Jul 31 12:39:34 2018
+++ pkgsrc/security/lasso/Makefile.common       Mon Nov  4 21:12:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2018/07/31 12:39:34 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.14 2019/11/04 21:12:54 rillig Exp $
 #
 # used by security/lasso/Makefile
 # used by security/py-lasso/Makefile
@@ -12,14 +12,14 @@ HOMEPAGE=   http://lasso.entrouvert.org/
 COMMENT=       Liberty Alliance Single Sign On implementation
 LICENSE=       gnu-gpl-v2
 
-DISTINFO_FILE=          ${.CURDIR}/../../security/lasso/distinfo
-PATCHDIR=               ${.CURDIR}/../../security/lasso/patches
+DISTINFO_FILE=         ${.CURDIR}/../../security/lasso/distinfo
+PATCHDIR=              ${.CURDIR}/../../security/lasso/patches
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-sasl2=${PREFIX}
 CONFIGURE_ARGS+=       --with-zlib=${PREFIX}
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config perl
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config perl
 
 CFLAGS.NetBSD+=        -D_POSIX_C_SOURCE=199506
 

Index: pkgsrc/security/libbf/Makefile
diff -u pkgsrc/security/libbf/Makefile:1.18 pkgsrc/security/libbf/Makefile:1.19
--- pkgsrc/security/libbf/Makefile:1.18 Tue Jan  2 05:37:23 2018
+++ pkgsrc/security/libbf/Makefile      Mon Nov  4 21:12:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/01/02 05:37:23 maya Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/04 21:12:54 rillig Exp $
 #
 
 DISTNAME=      libbf-0.8.2b
@@ -14,9 +14,9 @@ WRKSRC=               ${WRKDIR}/bf
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386" && ${OBJECT_FMT} == "ELF"
-BF_ENC=asm/bx86-elf.o
+BF_ENC=        asm/bx86-elf.o
 .else
-BF_ENC=bf_enc.o
+BF_ENC=        bf_enc.o
 .endif
 
 MAKEFLAGS+=    BF_ENC=${BF_ENC:Q}

Index: pkgsrc/security/libcrack/Makefile
diff -u pkgsrc/security/libcrack/Makefile:1.20 pkgsrc/security/libcrack/Makefile:1.21
--- pkgsrc/security/libcrack/Makefile:1.20      Wed Aug 16 20:45:44 2017
+++ pkgsrc/security/libcrack/Makefile   Mon Nov  4 21:12:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/08/16 20:45:44 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 21:12:54 rillig Exp $
 #
 
 DISTNAME=      cracklib,2.7
@@ -8,7 +8,7 @@ CATEGORIES=     security
 MASTER_SITES=  http://www.crypticide.com/alecm/security/cracklib/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE= http://www.crypticide.com/alecm/security/cracklib/cracklib,2.7.txt
+#HOMEPAGE=     http://www.crypticide.com/alecm/security/cracklib/cracklib,2.7.txt
 COMMENT=       Password checking library
 
 USE_LIBTOOL=   YES

Index: pkgsrc/security/libgpg-error/Makefile
diff -u pkgsrc/security/libgpg-error/Makefile:1.73 pkgsrc/security/libgpg-error/Makefile:1.74
--- pkgsrc/security/libgpg-error/Makefile:1.73  Tue Oct  8 06:36:13 2019
+++ pkgsrc/security/libgpg-error/Makefile       Mon Nov  4 21:12:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2019/10/08 06:36:13 triaxx Exp $
+# $NetBSD: Makefile,v 1.74 2019/11/04 21:12:54 rillig Exp $
 
 DISTNAME=      libgpg-error-1.36
 PKGREVISION=   1
@@ -28,7 +28,7 @@ CONFIGURE_ENV+=               CC_FOR_BUILD=${CC:Q}\ $
 .endif
 
 .if !empty(MACHINE_PLATFORM:MDarwin-8.*-powerpc)
-CFLAGS+=       -D__DARWIN_UNIX03
+CFLAGS+=       -D__DARWIN_UNIX03
 .endif
 
 .if !empty(MACHINE_PLATFORM:MSunOS-5.10-*)

Index: pkgsrc/security/libprelude-lua/Makefile
diff -u pkgsrc/security/libprelude-lua/Makefile:1.17 pkgsrc/security/libprelude-lua/Makefile:1.18
--- pkgsrc/security/libprelude-lua/Makefile:1.17        Sat Jul 20 22:46:47 2019
+++ pkgsrc/security/libprelude-lua/Makefile     Mon Nov  4 21:12:54 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2019/07/20 22:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 21:12:54 rillig Exp $
 
 PKGNAME=               libprelude-lua-${VERSION}
 PKGREVISION=           13
-COMMENT=                Lua bindings to LibPrelude
+COMMENT=               Lua bindings to LibPrelude
 
 LUA_VERSIONS_ACCEPTED= 51
 

Index: pkgsrc/security/libpreludedb-perl/buildlink3.mk
diff -u pkgsrc/security/libpreludedb-perl/buildlink3.mk:1.4 pkgsrc/security/libpreludedb-perl/buildlink3.mk:1.5
--- pkgsrc/security/libpreludedb-perl/buildlink3.mk:1.4 Sun Aug 11 13:17:49 2019
+++ pkgsrc/security/libpreludedb-perl/buildlink3.mk     Mon Nov  4 21:12:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2019/08/11 13:17:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2019/11/04 21:12:54 rillig Exp $
 
 BUILDLINK_TREE+=       libpreludedb-perl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libpreludedb-perl
 LIBPRELUDEDB_PERL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpreludedb-perl+=      libpreludedb-perl>=0.9.15.3
-BUILDLINK_ABI_DEPENDS.libpreludedb-perl?=              libpreludedb-perl>=0.9.15.3nb18
+BUILDLINK_ABI_DEPENDS.libpreludedb-perl?=      libpreludedb-perl>=0.9.15.3nb18
 BUILDLINK_PKGSRCDIR.libpreludedb-perl?=                ../../security/libpreludedb-perl
 
 .endif # LIBPRELUDEDB_PERL_BUILDLINK3_MK

Index: pkgsrc/security/libressl/Makefile
diff -u pkgsrc/security/libressl/Makefile:1.12 pkgsrc/security/libressl/Makefile:1.13
--- pkgsrc/security/libressl/Makefile:1.12      Thu Jun 21 23:10:50 2018
+++ pkgsrc/security/libressl/Makefile   Mon Nov  4 21:12:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/06/21 23:10:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 21:12:54 rillig Exp $
 
 DISTNAME=      libressl-2.7.4
 CATEGORIES=    security
@@ -26,10 +26,10 @@ CONFIGURE_ARGS+=    --with-openssldir=${PKG
 
 INSTALLATION_DIRS+=    ${EGDIR} lib
 
-EGDIR=                         ${PREFIX}/libressl/share/examples/${PKGBASE}
-CONFS=                         cert.pem openssl.cnf x509v3.cnf
+EGDIR=                 ${PREFIX}/libressl/share/examples/${PKGBASE}
+CONFS=                 cert.pem openssl.cnf x509v3.cnf
 .for f in ${CONFS}
-CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 # Handle subprefix

Index: pkgsrc/security/libtcpa/Makefile
diff -u pkgsrc/security/libtcpa/Makefile:1.17 pkgsrc/security/libtcpa/Makefile:1.18
--- pkgsrc/security/libtcpa/Makefile:1.17       Sat Dec 15 16:53:02 2018
+++ pkgsrc/security/libtcpa/Makefile    Mon Nov  4 21:12:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/12/15 16:53:02 schmonz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/04 21:12:55 rillig Exp $
 #
 
 DISTNAME=              tpm-1.1b
@@ -14,7 +14,7 @@ COMMENT=              TCPA libraries and test progra
 
 WRKSRC=                        ${WRKDIR}/TPM
 
-SITES.tcpa_man_20031210.tgz= http://www.citi.umich.edu/u/rwash/projects/trusted/
+SITES.tcpa_man_20031210.tgz=   http://www.citi.umich.edu/u/rwash/projects/trusted/
 
 BUILD_DIRS=            libtcpa examples
 INSTALLATION_DIRS=     bin lib ${PKGMANDIR}/man3 share/doc/${PKGBASE}

Index: pkgsrc/security/lynis/Makefile
diff -u pkgsrc/security/lynis/Makefile:1.6 pkgsrc/security/lynis/Makefile:1.7
--- pkgsrc/security/lynis/Makefile:1.6  Thu May 23 19:23:15 2019
+++ pkgsrc/security/lynis/Makefile      Mon Nov  4 21:12:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/05/23 19:23:15 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/04 21:12:55 rillig Exp $
 #
 
 DISTNAME=      lynis-2.6.2
@@ -31,7 +31,7 @@ SUBST_MESSAGE.confdir=        Fixing conf path
 SUBST_FILES.confdir=   include/functions
 SUBST_SED.confdir=     -e "s,@CONFDIR@,${PKG_SYSCONFDIR},"
 
-WRKSRC=                ${WRKDIR}/lynis
+WRKSRC=                        ${WRKDIR}/lynis
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man8
 INSTALLATION_DIRS+=    share/examples/lynis
 INSTALLATION_DIRS+=    lib/lynis/db lib/lynis/extras
@@ -44,10 +44,10 @@ BUILD_DEFS+=        VARBASE
 AUTO_MKDIRS=   yes
 
 PKG_SYSCONFSUBDIR=     lynis
-CONF_FILES+=   share/examples/lynis/default.prf \
-               ${PKG_SYSCONFDIR}/default.prf
-CONF_FILES+=   share/examples/lynis/developer.prf \
-               ${PKG_SYSCONFDIR}/developer.prf
+CONF_FILES+=           share/examples/lynis/default.prf \
+                       ${PKG_SYSCONFDIR}/default.prf
+CONF_FILES+=           share/examples/lynis/developer.prf \
+                       ${PKG_SYSCONFDIR}/developer.prf
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/lynis                       \

Index: pkgsrc/security/mbedtls1/options.mk
diff -u pkgsrc/security/mbedtls1/options.mk:1.1 pkgsrc/security/mbedtls1/options.mk:1.2
--- pkgsrc/security/mbedtls1/options.mk:1.1     Thu Jun 16 09:21:11 2016
+++ pkgsrc/security/mbedtls1/options.mk Mon Nov  4 21:12:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2016/06/16 09:21:11 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 21:12:55 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mbedtls
 PKG_SUPPORTED_OPTIONS= mbedtls-tools tests zlib
@@ -21,13 +21,13 @@ CMAKE_ARGS+=                -DENABLE_PROGRAMS=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mtests)
-. if !empty(PKG_OPTIONS:Mmbedtls-tools)
-.  include "../../security/openssl/buildlink3.mk"
+.  if !empty(PKG_OPTIONS:Mmbedtls-tools)
+.    include "../../security/openssl/buildlink3.mk"
 CMAKE_ARGS+=           -DENABLE_TESTING=ON
 PLIST.tests=           yes
-. else
+.  else
 PKG_FAIL_REASON+=      "option tests needs option mbedtls-tools"
-. endif
+.  endif
 .else
 CMAKE_ARGS+=           -DENABLE_TESTING=OFF
 .endif

Index: pkgsrc/security/mit-krb5/builtin.mk
diff -u pkgsrc/security/mit-krb5/builtin.mk:1.15 pkgsrc/security/mit-krb5/builtin.mk:1.16
--- pkgsrc/security/mit-krb5/builtin.mk:1.15    Mon May  6 08:20:32 2019
+++ pkgsrc/security/mit-krb5/builtin.mk Mon Nov  4 21:12:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2019/05/06 08:20:32 wiz Exp $
+# $NetBSD: builtin.mk,v 1.16 2019/11/04 21:12:55 rillig Exp $
 
 BUILTIN_PKG:=  mit-krb5
 
@@ -31,7 +31,7 @@ IS_BUILTIN.mit-krb5=  no
 IS_BUILTIN.mit-krb5=   yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.mit-krb5
+MAKEVARS+=             IS_BUILTIN.mit-krb5
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -41,12 +41,12 @@ MAKEVARS+=  IS_BUILTIN.mit-krb5
     !empty(IS_BUILTIN.mit-krb5:M[yY][eE][sS])
 .  if empty(SH_KRB5_CONFIG:M__nonexistent__)
 BUILTIN_VERSION.mit-krb5!=     ${SH_KRB5_CONFIG} --version | \
-               ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//'
+                               ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//'
 .  endif
 BUILTIN_VERSION.mit-krb5?=     1.4.0
 BUILTIN_PKG.mit-krb5=          mit-krb5-${BUILTIN_VERSION.mit-krb5}
 .endif
-MAKEVARS+=     BUILTIN_PKG.mit-krb5
+MAKEVARS+=                     BUILTIN_PKG.mit-krb5
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -73,7 +73,7 @@ USE_BUILTIN.mit-krb5!=                                                        \
 .    endif
 .  endif
 .endif
-MAKEVARS+=     USE_BUILTIN.mit-krb5
+MAKEVARS+=             USE_BUILTIN.mit-krb5
 
 ###
 ### The section below only applies if we are not including this file

Index: pkgsrc/security/mixminion/Makefile
diff -u pkgsrc/security/mixminion/Makefile:1.32 pkgsrc/security/mixminion/Makefile:1.33
--- pkgsrc/security/mixminion/Makefile:1.32     Mon Sep  2 13:19:55 2019
+++ pkgsrc/security/mixminion/Makefile  Mon Nov  4 21:12:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/09/02 13:19:55 adam Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/04 21:12:55 rillig Exp $
 
 DISTNAME=              Mixminion-0.0.8alpha3
 PKGNAME=               ${DISTNAME:S/M/m/}
@@ -12,7 +12,7 @@ COMMENT=              Anonymous Type 3 remailer
 LICENSE=               mit
 
 REPLACE_PYTHON=        lib/mixminion/Main.py
-PYTHON_VERSIONS_ACCEPTED=   27 # not yet ported as of 0.0.8alpha3
+PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.0.8alpha3
 
 TEST_TARGET=           test
 

Index: pkgsrc/security/msu/Makefile
diff -u pkgsrc/security/msu/Makefile:1.11 pkgsrc/security/msu/Makefile:1.12
--- pkgsrc/security/msu/Makefile:1.11   Sun Sep  3 09:22:58 2017
+++ pkgsrc/security/msu/Makefile        Mon Nov  4 21:12:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/09/03 09:22:58 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/04 21:12:55 rillig Exp $
 
 DISTNAME=      msu-1.09
 CATEGORIES=    security
@@ -11,6 +11,6 @@ COMMENT=      Mini passwordless su
 
 MAKE_ENV+=     SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
-PKG_DESTDIR_SUPPORT=    destdir
+PKG_DESTDIR_SUPPORT=   destdir
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/msudir/Makefile
diff -u pkgsrc/security/msudir/Makefile:1.9 pkgsrc/security/msudir/Makefile:1.10
--- pkgsrc/security/msudir/Makefile:1.9 Sun Sep  3 09:22:58 2017
+++ pkgsrc/security/msudir/Makefile     Mon Nov  4 21:12:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/09/03 09:22:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/04 21:12:55 rillig Exp $
 
 DISTNAME=      msudir-0.15
 CATEGORIES=    security
@@ -11,6 +11,6 @@ COMMENT=      Easy setuid script management
 
 MAKE_ENV+=     SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
-PKG_DESTDIR_SUPPORT=    destdir
+PKG_DESTDIR_SUPPORT=   destdir
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/netramet/Makefile
diff -u pkgsrc/security/netramet/Makefile:1.12 pkgsrc/security/netramet/Makefile:1.13
--- pkgsrc/security/netramet/Makefile:1.12      Mon Sep 19 13:22:21 2016
+++ pkgsrc/security/netramet/Makefile   Mon Nov  4 21:12:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/09/19 13:22:21 wiedi Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 21:12:55 rillig Exp $
 #
 
 DISTNAME=      NeTraMet44
@@ -15,8 +15,8 @@ MAKE_JOBS_SAFE=       no
 
 GNU_CONFIGURE= YES
 
-CONFIGURE_ARGS+=--without-x
-MAKE_ENV+=     PCAP_LIB=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib
+CONFIGURE_ARGS+=       --without-x
+MAKE_ENV+=             PCAP_LIB=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib
 INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
 
 .include "../../net/libpcap/buildlink3.mk"

Index: pkgsrc/security/ocaml-ssl/Makefile
diff -u pkgsrc/security/ocaml-ssl/Makefile:1.35 pkgsrc/security/ocaml-ssl/Makefile:1.36
--- pkgsrc/security/ocaml-ssl/Makefile:1.35     Sat Aug 24 11:09:39 2019
+++ pkgsrc/security/ocaml-ssl/Makefile  Mon Nov  4 21:12:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/08/24 11:09:39 jaapb Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/04 21:12:55 rillig Exp $
 #
 
 DISTNAME=      ocaml-ssl-0.5.9
@@ -11,7 +11,7 @@ COMMENT=      SSL library for OCaml
 LICENSE=       gnu-lgpl-v2.1
 
 OCAML_USE_FINDLIB=     yes
-OCAML_USE_DUNE=        yes
+OCAML_USE_DUNE=                yes
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/security/openpam/builtin.mk
diff -u pkgsrc/security/openpam/builtin.mk:1.10 pkgsrc/security/openpam/builtin.mk:1.11
--- pkgsrc/security/openpam/builtin.mk:1.10     Tue May 15 07:57:32 2018
+++ pkgsrc/security/openpam/builtin.mk  Mon Nov  4 21:12:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2018/05/15 07:57:32 triaxx Exp $
+# $NetBSD: builtin.mk,v 1.11 2019/11/04 21:12:56 rillig Exp $
 
 BUILTIN_PKG:=  openpam
 
@@ -17,7 +17,7 @@ IS_BUILTIN.openpam=   no
 IS_BUILTIN.openpam=    yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.openpam
+MAKEVARS+=             IS_BUILTIN.openpam
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -31,7 +31,7 @@ BUILTIN_VERSION.openpam!=     \
                ${H_OPENPAM}
 BUILTIN_PKG.openpam=   openpam-${BUILTIN_VERSION.openpam}
 .endif
-MAKEVARS+=     BUILTIN_PKG.openpam
+MAKEVARS+=             BUILTIN_PKG.openpam
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -58,4 +58,4 @@ USE_BUILTIN.openpam!=                                                 \
 .    endif
 .  endif  # PREFER.openpam
 .endif
-MAKEVARS+=     USE_BUILTIN.openpam
+MAKEVARS+=             USE_BUILTIN.openpam

Index: pkgsrc/security/opensc/options.mk
diff -u pkgsrc/security/opensc/options.mk:1.4 pkgsrc/security/opensc/options.mk:1.5
--- pkgsrc/security/opensc/options.mk:1.4       Mon Mar 17 18:21:42 2014
+++ pkgsrc/security/opensc/options.mk   Mon Nov  4 21:12:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2014/03/17 18:21:42 gdt Exp $
+# $NetBSD: options.mk,v 1.5 2019/11/04 21:12:56 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.opensc
 
@@ -6,7 +6,7 @@ PKG_OPTIONS_VAR=        PKG_OPTIONS.opensc
 # that exactly one be chosen.
 PKG_OPTIONS_REQUIRED_GROUPS=   cardreader
 PKG_OPTIONS_GROUP.cardreader=  pcsc-lite openct
-PKG_SUGGESTED_OPTIONS= pcsc-lite
+PKG_SUGGESTED_OPTIONS=         pcsc-lite
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/security/openssh/options.mk
diff -u pkgsrc/security/openssh/options.mk:1.37 pkgsrc/security/openssh/options.mk:1.38
--- pkgsrc/security/openssh/options.mk:1.37     Fri Sep  6 09:03:00 2019
+++ pkgsrc/security/openssh/options.mk  Mon Nov  4 21:12:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.37 2019/09/06 09:03:00 manu Exp $
+# $NetBSD: options.mk,v 1.38 2019/11/04 21:12:56 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openssh
 PKG_SUPPORTED_OPTIONS= editline kerberos openssl pam legacymodsz
@@ -28,7 +28,7 @@ CONFIGURE_ENV+=               ac_cv_search_k_hasafs=n
 .endif
 
 .if !empty(PKG_OPTIONS:Mlegacymodsz)
-CONFIGURE_ARGS+=   CPPFLAGS="${CPPFLAGS} -DSSH_RSA_INSECURE_LEGACY_MIN_MOD_SZ=768"
+CONFIGURE_ARGS+=       CPPFLAGS="${CPPFLAGS} -DSSH_RSA_INSECURE_LEGACY_MIN_MOD_SZ=768"
 .endif
 
 #.if !empty(PKG_OPTIONS:Mhpn-patch)

Index: pkgsrc/security/openssl/Makefile
diff -u pkgsrc/security/openssl/Makefile:1.242 pkgsrc/security/openssl/Makefile:1.243
--- pkgsrc/security/openssl/Makefile:1.242      Sun Aug 11 13:22:48 2019
+++ pkgsrc/security/openssl/Makefile    Mon Nov  4 21:12:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.242 2019/08/11 13:22:48 wiz Exp $
+# $NetBSD: Makefile,v 1.243 2019/11/04 21:12:56 rillig Exp $
 
 DISTNAME=      openssl-1.0.2s
 PKGREVISION=   1
@@ -85,7 +85,7 @@ _OS=                  darwin
 _ARCH=                 ppc
 .  else
 _ARCH=                 ${MACHINE_ARCH}
-.endif
+.  endif
 CONFIGURE_ARGS+=       ${_OS}-${_ARCH}-cc
 
 SUBST_CLASSES+=                dl

Index: pkgsrc/security/openssl/builtin.mk
diff -u pkgsrc/security/openssl/builtin.mk:1.43 pkgsrc/security/openssl/builtin.mk:1.44
--- pkgsrc/security/openssl/builtin.mk:1.43     Thu Mar 26 08:05:02 2015
+++ pkgsrc/security/openssl/builtin.mk  Mon Nov  4 21:12:56 2019
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.43 2015/03/26 08:05:02 dholland Exp $
+# $NetBSD: builtin.mk,v 1.44 2019/11/04 21:12:56 rillig Exp $
 
 BUILTIN_PKG:=  openssl
 
-BUILTIN_FIND_LIBS:=            crypto des ssl
-BUILTIN_FIND_HEADERS_VAR:=     H_OPENSSLCONF H_OPENSSLV
+BUILTIN_FIND_LIBS:=                    crypto des ssl
+BUILTIN_FIND_HEADERS_VAR:=             H_OPENSSLCONF H_OPENSSLV
 BUILTIN_FIND_HEADERS.H_OPENSSLCONF=    openssl/opensslconf.h
 BUILTIN_FIND_HEADERS.H_OPENSSLV=       openssl/opensslv.h
 
@@ -19,7 +19,7 @@ IS_BUILTIN.openssl=   no
 IS_BUILTIN.openssl=    yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.openssl
+MAKEVARS+=             IS_BUILTIN.openssl
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -57,8 +57,8 @@ BUILTIN_VERSION.openssl!=                                             \
        ' ${H_OPENSSLV}
 BUILTIN_PKG.openssl=   openssl-${BUILTIN_VERSION.openssl}
 .endif
-MAKEVARS+=     BUILTIN_PKG.openssl
-MAKEVARS+=     BUILTIN_VERSION.openssl
+MAKEVARS+=             BUILTIN_PKG.openssl
+MAKEVARS+=             BUILTIN_VERSION.openssl
 
 .if !defined(BUILTIN_OPENSSL_HAS_THREADS) && \
     !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \
@@ -78,14 +78,14 @@ MAKEVARS+=  BUILTIN_OPENSSL_HAS_THREADS
 ###
 .if !defined(USE_BUILTIN.openssl)
 .  if ${PREFER.openssl} == "pkgsrc"
-USE_BUILTIN.openssl=   no
+USE_BUILTIN.openssl=           no
 .  else
-USE_BUILTIN.openssl=   ${IS_BUILTIN.openssl}
+USE_BUILTIN.openssl=           ${IS_BUILTIN.openssl}
 .    if defined(BUILTIN_PKG.openssl) && \
         !empty(IS_BUILTIN.openssl:M[yY][eE][sS])
-USE_BUILTIN.openssl=   yes
+USE_BUILTIN.openssl=           yes
 ### take care builtin check case, BUILDLINK_API_DEPENDS may not be defined yet.
-CHECK_BUILTIN.openssl?=        no
+CHECK_BUILTIN.openssl?=                no
 .      if !empty(CHECK_BUILTIN.openssl:M[yY][eE][sS])
 BUILDLINK_API_DEPENDS.openssl?=        openssl>=1.0.1c
 .      endif
@@ -104,12 +104,12 @@ USE_BUILTIN.openssl!=                                                     \
        defined(USE_FEATURES.openssl)
 .      if !empty(USE_FEATURES.openssl:Mthreads) && \
          !empty(BUILTIN_OPENSSL_HAS_THREADS:M[nN][oO])
-USE_BUILTIN.openssl=   no
+USE_BUILTIN.openssl=           no
 .      endif
 .    endif
 .  endif  # PREFER.openssl
 .endif
-MAKEVARS+=     USE_BUILTIN.openssl
+MAKEVARS+=                     USE_BUILTIN.openssl
 
 ###
 ### The section below only applies if we are not including this file

Index: pkgsrc/security/openvas-plugins/Makefile
diff -u pkgsrc/security/openvas-plugins/Makefile:1.13 pkgsrc/security/openvas-plugins/Makefile:1.14
--- pkgsrc/security/openvas-plugins/Makefile:1.13       Sat Jul 20 22:46:49 2019
+++ pkgsrc/security/openvas-plugins/Makefile    Mon Nov  4 21:12:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/07/20 22:46:49 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/04 21:12:56 rillig Exp $
 #
 
 DISTNAME=      openvas-plugins-1.0.5
@@ -29,9 +29,9 @@ NONFREE=      cisco_vpn_client_detect.nasl js
 
 post-extract:
        @${MKDIR} ${WRKSRC}/bin
-.      for f in ${NONFREE}
-               @${RM} ${WRKSRC}/scripts/${f}
-.      endfor
+.for f in ${NONFREE}
+       @${RM} ${WRKSRC}/scripts/${f}
+.endfor
 
 .include "../../security/openvas-libraries/buildlink3.mk"
 .include "../../security/openvas-libnasl/buildlink3.mk"

Index: pkgsrc/security/openvas-server/options.mk
diff -u pkgsrc/security/openvas-server/options.mk:1.1.1.1 pkgsrc/security/openvas-server/options.mk:1.2
--- pkgsrc/security/openvas-server/options.mk:1.1.1.1   Sun Jan  4 01:11:55 2009
+++ pkgsrc/security/openvas-server/options.mk   Mon Nov  4 21:12:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/01/04 01:11:55 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 21:12:56 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openvas-server
 
@@ -10,7 +10,7 @@ PKG_SUPPORTED_OPTIONS=        x11
 ### X11 support
 ###
 .if !empty(PKG_OPTIONS:Mx11)
-USE_X11=YES
+USE_X11=               YES
 CONFIGURE_ARGS+=       --with-x
 .else
 CONFIGURE_ARGS+=       --without-x

Index: pkgsrc/security/p11-kit/Makefile
diff -u pkgsrc/security/p11-kit/Makefile:1.14 pkgsrc/security/p11-kit/Makefile:1.15
--- pkgsrc/security/p11-kit/Makefile:1.14       Sun Mar 24 18:03:54 2019
+++ pkgsrc/security/p11-kit/Makefile    Mon Nov  4 21:12:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/03/24 18:03:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 21:12:56 rillig Exp $
 
 DISTNAME=      p11-kit-0.23.15
 CATEGORIES=    security
@@ -37,9 +37,9 @@ PLIST_SUBST+= DLEXT=${DLEXT:Q}
 
 PKGCONFIG_OVERRIDE+=   p11-kit/p11-kit-1.pc.in
 
-PKG_SYSCONFSUBDIR= pkcs11
-CONF_FILES+=   share/examples/p11-kit/pkcs11.conf.example \
-               ${PKG_SYSCONFDIR}/pkcs11.conf
+PKG_SYSCONFSUBDIR=     pkcs11
+CONF_FILES+=           share/examples/p11-kit/pkcs11.conf.example \
+                       ${PKG_SYSCONFDIR}/pkcs11.conf
 
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"

Index: pkgsrc/security/p5-Authen-CAS-Client/Makefile
diff -u pkgsrc/security/p5-Authen-CAS-Client/Makefile:1.20 pkgsrc/security/p5-Authen-CAS-Client/Makefile:1.21
--- pkgsrc/security/p5-Authen-CAS-Client/Makefile:1.20  Sun Aug 11 13:22:49 2019
+++ pkgsrc/security/p5-Authen-CAS-Client/Makefile       Mon Nov  4 21:12:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:22:49 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 21:12:56 rillig Exp $
 #
 
 DISTNAME=      Authen-CAS-Client-0.08
@@ -12,8 +12,8 @@ HOMEPAGE=     https://metacpan.org/release/A
 COMMENT=       Perl 5 module providing an interface for JA-SIG's CAS
 LICENSE=       2-clause-bsd
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST=        auto/Authen/CAS/Client/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Authen/CAS/Client/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 BUILD_DEPENDS+=        p5-Test-MockObject-[0-9]*:../../devel/p5-Test-MockObject

Index: pkgsrc/security/p5-Crypt-Eksblowfish/Makefile
diff -u pkgsrc/security/p5-Crypt-Eksblowfish/Makefile:1.19 pkgsrc/security/p5-Crypt-Eksblowfish/Makefile:1.20
--- pkgsrc/security/p5-Crypt-Eksblowfish/Makefile:1.19  Sun Aug 11 13:22:51 2019
+++ pkgsrc/security/p5-Crypt-Eksblowfish/Makefile       Mon Nov  4 21:12:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:22:51 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/04 21:12:57 rillig Exp $
 #
 
 DISTNAME=              Crypt-Eksblowfish-0.009
@@ -15,7 +15,7 @@ LICENSE=              ${PERL5_LICENSE}
 DEPENDS+=              p5-Class-Mix>=0.001:../../devel/p5-Class-Mix
 #DEPENDS+=             {perl>=5.10.1,p5-parent-[0-9]*}:../../devel/p5-parent
 #DEPENDS+=             {perl>=5.8.2,p5-MIME-Base64>=2.21}:../../converters/p5-MIME-Base64
-#BUILD_DEPENDS+=               {perl>=5.10.0,p5-ExtUtils-CBuilder>=0.15}:../../devel/p5-ExtUtils-CBuilder
+#BUILD_DEPENDS+=       {perl>=5.10.0,p5-ExtUtils-CBuilder>=0.15}:../../devel/p5-ExtUtils-CBuilder
 
 USE_LANGUAGES=         c
 PERL5_MODULE_TYPE=     Module::Build

Index: pkgsrc/security/p5-Digest-CRC/Makefile
diff -u pkgsrc/security/p5-Digest-CRC/Makefile:1.31 pkgsrc/security/p5-Digest-CRC/Makefile:1.32
--- pkgsrc/security/p5-Digest-CRC/Makefile:1.31 Sun Aug 11 13:22:55 2019
+++ pkgsrc/security/p5-Digest-CRC/Makefile      Mon Nov  4 21:12:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/08/11 13:22:55 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/04 21:12:57 rillig Exp $
 
 DISTNAME=      Digest-CRC-0.22.2
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/D
 COMMENT=       Perl5 extension interface for cyclic redundancy check algorithms
 LICENSE=       public-domain
 
-PERL5_PACKLIST=                auto/Digest/CRC/.packlist
+PERL5_PACKLIST=        auto/Digest/CRC/.packlist
 WRKSRC=                ${WRKDIR}/Digest-CRC-0.22
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/security/p5-Digest-Perl-MD5/Makefile
diff -u pkgsrc/security/p5-Digest-Perl-MD5/Makefile:1.13 pkgsrc/security/p5-Digest-Perl-MD5/Makefile:1.14
--- pkgsrc/security/p5-Digest-Perl-MD5/Makefile:1.13    Sun Aug 11 13:22:57 2019
+++ pkgsrc/security/p5-Digest-Perl-MD5/Makefile Mon Nov  4 21:12:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:22:57 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/04 21:12:57 rillig Exp $
 
 DISTNAME=      Digest-Perl-MD5-1.9
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/D
 COMMENT=       Perl implementation of Ron Rivests MD5 Algorithm
 LICENSE=       ${PERL5_LICENSE}
 
-CHECK_INTERPRETER_SKIP+= ${PERL5_SUB_INSTALLVENDORLIB}/Digest/Perl/MD5.pm
+CHECK_INTERPRETER_SKIP+=       ${PERL5_SUB_INSTALLVENDORLIB}/Digest/Perl/MD5.pm
 
 #DEPENDS+=     {perl>=5.7.3,p5-Digest>=1.00}:../../security/p5-Digest
 

Index: pkgsrc/security/pakchois/Makefile
diff -u pkgsrc/security/pakchois/Makefile:1.5 pkgsrc/security/pakchois/Makefile:1.6
--- pkgsrc/security/pakchois/Makefile:1.5       Tue Oct 23 18:16:47 2012
+++ pkgsrc/security/pakchois/Makefile   Mon Nov  4 21:12:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 18:16:47 asau Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/04 21:12:57 rillig Exp $
 #
 
 DISTNAME=      pakchois-0.4
@@ -20,8 +20,8 @@ PTHREAD_OPTS+=                require
 PKG_PTHREAD_FLAGS=     ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
 
 BROKEN_GETTEXT_DETECTION=      yes
-BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:M*}
-BUILDLINK_TRANSFORM+=  opt:-lpthread:${PKG_PTHREAD_FLAGS:M*}
+BUILDLINK_TRANSFORM+=          opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+BUILDLINK_TRANSFORM+=          opt:-lpthread:${PKG_PTHREAD_FLAGS:M*}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/security/pam-krb5/Makefile
diff -u pkgsrc/security/pam-krb5/Makefile:1.10 pkgsrc/security/pam-krb5/Makefile:1.11
--- pkgsrc/security/pam-krb5/Makefile:1.10      Sun Sep  3 08:53:14 2017
+++ pkgsrc/security/pam-krb5/Makefile   Mon Nov  4 21:12:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/09/03 08:53:14 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/04 21:12:57 rillig Exp $
 #
 
 DISTNAME=      pam-krb5-4.6
@@ -14,7 +14,7 @@ USE_LIBTOOL=  yes
 
 GNU_CONFIGURE= yes
 
-CPPFLAGS.NetBSD+=       -DNO_STATIC_MODULES
+CPPFLAGS.NetBSD+=      -DNO_STATIC_MODULES
 
 .include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"

Index: pkgsrc/security/pam-passwdqc/Makefile
diff -u pkgsrc/security/pam-passwdqc/Makefile:1.3 pkgsrc/security/pam-passwdqc/Makefile:1.4
--- pkgsrc/security/pam-passwdqc/Makefile:1.3   Tue Oct 23 18:16:48 2012
+++ pkgsrc/security/pam-passwdqc/Makefile       Mon Nov  4 21:12:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/23 18:16:48 asau Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/04 21:12:57 rillig Exp $
 #
 
 DISTNAME=      passwdqc-1.1.4
@@ -11,9 +11,9 @@ HOMEPAGE=     http://www.openwall.com/passwd
 COMMENT=       Password strength checker
 #LICENSE=      # TODO: (see mk/license.mk)
 
-BUILD_TARGET=  pam
-INSTALLATION_DIRS= lib/security ${PKGMANDIR}/man8 ${PKGMANDIR}/man5
-CFLAGS+=       -DNO_STATIC_MODULES
+BUILD_TARGET=          pam
+INSTALLATION_DIRS=     lib/security ${PKGMANDIR}/man8 ${PKGMANDIR}/man5
+CFLAGS+=               -DNO_STATIC_MODULES
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/libpasswdqc.so ${DESTDIR}${PREFIX}/lib

Index: pkgsrc/security/pam-pwauth_suid/Makefile
diff -u pkgsrc/security/pam-pwauth_suid/Makefile:1.9 pkgsrc/security/pam-pwauth_suid/Makefile:1.10
--- pkgsrc/security/pam-pwauth_suid/Makefile:1.9        Sun Aug 19 20:16:41 2018
+++ pkgsrc/security/pam-pwauth_suid/Makefile    Mon Nov  4 21:12:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/08/19 20:16:41 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/04 21:12:57 rillig Exp $
 
 DISTNAME=      pam-pwauth_suid-1.2
 PKGREVISION=   1
@@ -10,8 +10,8 @@ COMMENT=      PAM authentication module for u
 
 WRKSRC=                ${WRKDIR}
 
-PAMDEF+= -DPATH_HELPER=\"${PREFIX}/libexec/pwauth_suid_helper\"
-PAMDEF+= -DNO_STATIC_MODULES
+PAMDEF+=       -DPATH_HELPER=\"${PREFIX}/libexec/pwauth_suid_helper\"
+PAMDEF+=       -DNO_STATIC_MODULES
 
 INSTALLATION_DIRS=     lib/security libexec share/examples/pam-pwauth_suid
 

Index: pkgsrc/security/pam-tacplus/Makefile
diff -u pkgsrc/security/pam-tacplus/Makefile:1.9 pkgsrc/security/pam-tacplus/Makefile:1.10
--- pkgsrc/security/pam-tacplus/Makefile:1.9    Thu May 23 19:23:15 2019
+++ pkgsrc/security/pam-tacplus/Makefile        Mon Nov  4 21:12:57 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:15 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/04 21:12:57 rillig Exp $
 #
 
 DISTNAME=      pam_tacplus-1.3.6
-PKGNAME=        ${DISTNAME:S/_/-/}
+PKGNAME=       ${DISTNAME:S/_/-/}
 PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tacplus/}
@@ -14,7 +14,7 @@ LICENSE=      gnu-gpl-v2
 
 EGDIR=         ${PREFIX}/share/examples/pam_tacplus
 
-GNU_CONFIGURE=yes
+GNU_CONFIGURE= yes
 
 SUBST_CLASSES+=                egdir
 SUBST_STAGE.egdir=     pre-configure

Index: pkgsrc/security/pcsc-lite/Makefile
diff -u pkgsrc/security/pcsc-lite/Makefile:1.30 pkgsrc/security/pcsc-lite/Makefile:1.31
--- pkgsrc/security/pcsc-lite/Makefile:1.30     Thu Apr 25 07:33:16 2019
+++ pkgsrc/security/pcsc-lite/Makefile  Mon Nov  4 21:12:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/04/25 07:33:16 maya Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/04 21:12:57 rillig Exp $
 
 DISTNAME=      pcsc-lite-1.8.24
 PKGREVISION=   1
@@ -23,8 +23,8 @@ USE_LANGUAGES=        c c++
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=    spy
-#REPLACE_PYTHON=               src/spy/pcsc-spy
+PLIST_VARS+=           spy
+#REPLACE_PYTHON=       src/spy/pcsc-spy
 #.include "../../lang/python/application.mk"
 
 CONFIGURE_ARGS+=       --sharedstatedir=${VARBASE:Q}

Index: pkgsrc/security/pgp2/options.mk
diff -u pkgsrc/security/pgp2/options.mk:1.2 pkgsrc/security/pgp2/options.mk:1.3
--- pkgsrc/security/pgp2/options.mk:1.2 Thu Dec  1 20:18:29 2005
+++ pkgsrc/security/pgp2/options.mk     Mon Nov  4 21:12:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/12/01 20:18:29 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/04 21:12:58 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pgp2
 PKG_SUPPORTED_OPTIONS= rsaref
@@ -27,11 +27,11 @@ RSAOBJS=    rsaglue1.o
 FIX_RPATH+=    RSALIBS
 
 .if ${MACHINE_ARCH} == "m68k"
-.if !empty(PKG_OPTIONS:Mm68060-optimized)
+.  if !empty(PKG_OPTIONS:Mm68060-optimized)
 OBJS_EXT=
 ASMFLAG=       -m68060 -DPORTABLE -DMPORTABLE
-.else
+.  else
 OBJS_EXT=      mc68020.o
 ASMFLAG=
-.endif
+.  endif
 .endif

Index: pkgsrc/security/php-ssh2/Makefile
diff -u pkgsrc/security/php-ssh2/Makefile:1.11 pkgsrc/security/php-ssh2/Makefile:1.12
--- pkgsrc/security/php-ssh2/Makefile:1.11      Mon Jan 14 13:06:11 2019
+++ pkgsrc/security/php-ssh2/Makefile   Mon Nov  4 21:12:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/01/14 13:06:11 taca Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/04 21:12:58 rillig Exp $
 #
 
 MODNAME=               ssh2
@@ -10,7 +10,7 @@ HOMEPAGE=             https://www.libssh2.org/
 COMMENT=               PHP bindings to the functions of libssh2
 LICENSE=               php
 
-CONFLICTS=      ${PHP_PKG_PREFIX}-${MODNAME}<1.0
+CONFLICTS=     ${PHP_PKG_PREFIX}-${MODNAME}<1.0
 
 PHP_VERSIONS_ACCEPTED= 71 72
 

Index: pkgsrc/security/php-ssh2-0/Makefile
diff -u pkgsrc/security/php-ssh2-0/Makefile:1.2 pkgsrc/security/php-ssh2-0/Makefile:1.3
--- pkgsrc/security/php-ssh2-0/Makefile:1.2     Sat Dec 15 21:12:22 2018
+++ pkgsrc/security/php-ssh2-0/Makefile Mon Nov  4 21:12:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/12/15 21:12:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/04 21:12:58 rillig Exp $
 #
 
 MODNAME=               ssh2
@@ -10,12 +10,12 @@ HOMEPAGE=           https://www.libssh2.org/
 COMMENT=               PHP bindings to the functions of libssh2
 LICENSE=               php
 
-CONFLICTS=      ${PHP_PKG_PREFIX}-${MODNAME}>=1.0
+CONFLICTS=     ${PHP_PKG_PREFIX}-${MODNAME}>=1.0
 
 PHP_VERSIONS_ACCEPTED= 56
 
 CONFIGURE_ARGS+=       --with-ssh2=${PREFIX}
-#WRKSRC=                       ${WRKDIR}/${MODNAME}-${PECL_VERSION}
+#WRKSRC=               ${WRKDIR}/${MODNAME}-${PECL_VERSION}
 
 .include "../../security/libssh2/buildlink3.mk"
 .include "../../lang/php/ext.mk"

Index: pkgsrc/security/pinentry/Makefile
diff -u pkgsrc/security/pinentry/Makefile:1.49 pkgsrc/security/pinentry/Makefile:1.50
--- pkgsrc/security/pinentry/Makefile:1.49      Fri Jan 19 13:36:42 2018
+++ pkgsrc/security/pinentry/Makefile   Mon Nov  4 21:12:58 2019
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.49 2018/01/19 13:36:42 abs Exp $
+# $NetBSD: Makefile,v 1.50 2019/11/04 21:12:58 rillig Exp $
 
 COMMENT=               Applications for entering PINs or Passphrases
 
 CONFIGURE_ARGS+=       --enable-pinentry-tty
-CONFIGURE_ARGS+=        --enable-pinentry-emacs
-CONFIGURE_ARGS+=        --disable-pinentry-qt4
-CONFIGURE_ARGS+=        --disable-pinentry-gnome3
-CONFIGURE_ARGS+=        --disable-pinentry-gtk2
-CONFIGURE_ARGS+=        --disable-pinentry-fltk
+CONFIGURE_ARGS+=       --enable-pinentry-emacs
+CONFIGURE_ARGS+=       --disable-pinentry-qt4
+CONFIGURE_ARGS+=       --disable-pinentry-gnome3
+CONFIGURE_ARGS+=       --disable-pinentry-gtk2
+CONFIGURE_ARGS+=       --disable-pinentry-fltk
 
 .include               "../../security/pinentry/Makefile.common"
 

Index: pkgsrc/security/pinentry-fltk/Makefile
diff -u pkgsrc/security/pinentry-fltk/Makefile:1.2 pkgsrc/security/pinentry-fltk/Makefile:1.3
--- pkgsrc/security/pinentry-fltk/Makefile:1.2  Wed Feb 13 17:40:53 2019
+++ pkgsrc/security/pinentry-fltk/Makefile      Mon Nov  4 21:12:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/02/13 17:40:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/04 21:12:58 rillig Exp $
 
 PKGNAME=               ${DISTNAME:S/pinentry-/pinentry-fltk-/}
 COMMENT=               Applications for entering PINs or Passphrases, FLTK enabled
@@ -10,12 +10,12 @@ USE_LANGUAGES+=             c c++
 USE_TOOLS+=            pkg-config
 
 CONFIGURE_ARGS+=       --disable-pinentry-gtk2
-CONFIGURE_ARGS+=        --disable-pinentry-qt
-CONFIGURE_ARGS+=        --disable-pinentry-curses
-CONFIGURE_ARGS+=        --disable-pinentry-emacs
-#CONFIGURE_ARGS+=       --disable-fallback-curses
-CONFIGURE_ARGS+=        --disable-pinentry-gnome3
-CONFIGURE_ARGS+=        --disable-libsecret
+CONFIGURE_ARGS+=       --disable-pinentry-qt
+CONFIGURE_ARGS+=       --disable-pinentry-curses
+CONFIGURE_ARGS+=       --disable-pinentry-emacs
+#CONFIGURE_ARGS+=      --disable-fallback-curses
+CONFIGURE_ARGS+=       --disable-pinentry-gnome3
+CONFIGURE_ARGS+=       --disable-libsecret
 
 INSTALL_DIRS=          fltk
 

Index: pkgsrc/security/pinentry-gtk2/Makefile
diff -u pkgsrc/security/pinentry-gtk2/Makefile:1.48 pkgsrc/security/pinentry-gtk2/Makefile:1.49
--- pkgsrc/security/pinentry-gtk2/Makefile:1.48 Sun Jul 21 22:25:40 2019
+++ pkgsrc/security/pinentry-gtk2/Makefile      Mon Nov  4 21:12:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/07/21 22:25:40 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2019/11/04 21:12:58 rillig Exp $
 
 PKGNAME=               ${DISTNAME:S/pinentry-/pinentry-gtk2-/}
 PKGREVISION=           6
@@ -8,13 +8,13 @@ COMMENT=              Applications for entering PINs
 
 USE_TOOLS+=            pkg-config
 CONFIGURE_ARGS+=       --enable-pinentry-gtk2
-CONFIGURE_ARGS+=        --disable-pinentry-qt
-CONFIGURE_ARGS+=        --disable-pinentry-curses
-CONFIGURE_ARGS+=        --disable-pinentry-emacs
-#CONFIGURE_ARGS+=       --disable-fallback-curses
-CONFIGURE_ARGS+=        --disable-pinentry-gnome3
-CONFIGURE_ARGS+=        --disable-pinentry-fltk
-CONFIGURE_ARGS+=        --disable-libsecret
+CONFIGURE_ARGS+=       --disable-pinentry-qt
+CONFIGURE_ARGS+=       --disable-pinentry-curses
+CONFIGURE_ARGS+=       --disable-pinentry-emacs
+#CONFIGURE_ARGS+=      --disable-fallback-curses
+CONFIGURE_ARGS+=       --disable-pinentry-gnome3
+CONFIGURE_ARGS+=       --disable-pinentry-fltk
+CONFIGURE_ARGS+=       --disable-libsecret
 
 INSTALL_DIRS=          gtk+-2
 

Index: pkgsrc/security/pinentry-mac/Makefile
diff -u pkgsrc/security/pinentry-mac/Makefile:1.2 pkgsrc/security/pinentry-mac/Makefile:1.3
--- pkgsrc/security/pinentry-mac/Makefile:1.2   Wed May 31 21:30:15 2017
+++ pkgsrc/security/pinentry-mac/Makefile       Mon Nov  4 21:12:58 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2017/05/31 21:30:15 jym Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/04 21:12:58 rillig Exp $
 
-DISTNAME=      pinentry-mac-${PINENTRY_VERSION}
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=GPGTools/}
-PINENTRY_VERSION=0.9.4
-GITHUB_TAG=    v${PKGVERSION_NOREV}
-EXTRACT_SUFX=  .zip
-PKGREVISION=   1
+DISTNAME=              pinentry-mac-${PINENTRY_VERSION}
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=GPGTools/}
+PINENTRY_VERSION=      0.9.4
+GITHUB_TAG=            v${PKGVERSION_NOREV}
+EXTRACT_SUFX=          .zip
+PKGREVISION=           1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/GPGTools/pinentry-mac/
@@ -13,8 +13,8 @@ COMMENT=      Application for entering PINs o
 LICENSE=       gnu-gpl-v3
 CATEGORIES=    security
 
-ONLY_FOR_PLATFORM=Darwin-*-*
-USE_TOOLS=     pax
+ONLY_FOR_PLATFORM=     Darwin-*-*
+USE_TOOLS=             pax
 
 PINENTRY_APP_DIR=      ${PREFIX}/libexec/${PINENTRY_APP_NAME}
 PINENTRY_APP_NAME=     pinentry-mac.app
@@ -22,11 +22,11 @@ INSTALLATION_DIRS=  bin
 
 FILES_SUBST+=  PINENTRY_APP_DIR=${PINENTRY_APP_DIR:Q}
 
-SUBST_CLASSES+=         pinentry-mac-sh
-SUBST_STAGE.pinentry-mac-sh=   pre-configure
-SUBST_FILES.pinentry-mac-sh+=  ${WRKDIR}/pinentry-mac.sh
-SUBST_VARS.pinentry-mac-sh+=   PINENTRY_APP_DIR
-SUBST_MESSAGE.pinentry-mac-sh= Set path to the pinentry-mac .app directory.
+SUBST_CLASSES+=                        pinentry-mac-sh
+SUBST_STAGE.pinentry-mac-sh=   pre-configure
+SUBST_FILES.pinentry-mac-sh+=  ${WRKDIR}/pinentry-mac.sh
+SUBST_VARS.pinentry-mac-sh+=   PINENTRY_APP_DIR
+SUBST_MESSAGE.pinentry-mac-sh= Set path to the pinentry-mac .app directory.
 
 post-extract:
        ${CP} ${FILESDIR}/pinentry-mac.sh ${WRKDIR}

Index: pkgsrc/security/pinepgp/options.mk
diff -u pkgsrc/security/pinepgp/options.mk:1.2 pkgsrc/security/pinepgp/options.mk:1.3
--- pkgsrc/security/pinepgp/options.mk:1.2      Tue Sep 12 02:32:17 2017
+++ pkgsrc/security/pinepgp/options.mk  Mon Nov  4 21:12:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2017/09/12 02:32:17 ryoon Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/04 21:12:58 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pinepgp
 
@@ -9,17 +9,17 @@ PLIST_VARS=           gpg pgp5
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgpg)
-DEPENDS+=      gnupg>=1.2.3:../../security/gnupg
+DEPENDS+=              gnupg>=1.2.3:../../security/gnupg
 CONFIGURE_ARGS+=       --with-gpg
-PLIST.gpg=yes
+PLIST.gpg=             yes
 .else
 CONFIGURE_ARGS+=       --without-gpg
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgp5)
-DEPENDS+=      pgp5>=5.0:../../security/pgp5
+DEPENDS+=              pgp5>=5.0:../../security/pgp5
 CONFIGURE_ARGS+=       --with-pgp5
-PLIST.pgp5=yes
+PLIST.pgp5=            yes
 .else
 CONFIGURE_ARGS+=       --without-pgp5
 .endif

Index: pkgsrc/security/pks/Makefile
diff -u pkgsrc/security/pks/Makefile:1.35 pkgsrc/security/pks/Makefile:1.36
--- pkgsrc/security/pks/Makefile:1.35   Wed Jul  4 13:40:35 2018
+++ pkgsrc/security/pks/Makefile        Mon Nov  4 21:12:58 2019
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/04 21:12:58 rillig Exp $
 
-DISTNAME=      pks-0.9.4
-PKGREVISION=   5
-CATEGORIES=    security www
-#MASTER_SITES+=        http://www.mit.edu/people/marc/pks/
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pks/}
-#PATCH_SITES=  http://www.mit.edu/people/marc/pks/
-PATCHFILES=    pks094-patch2 \
-               pks094-patch3
+DISTNAME=              pks-0.9.4
+PKGREVISION=           5
+CATEGORIES=            security www
+#MASTER_SITES+=                http://www.mit.edu/people/marc/pks/
+MASTER_SITES+=         ${MASTER_SITE_SOURCEFORGE:=pks/}
+#PATCH_SITES=          http://www.mit.edu/people/marc/pks/
+PATCHFILES=            pks094-patch2 \
+                       pks094-patch3
 PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/prelude-correlator/Makefile
diff -u pkgsrc/security/prelude-correlator/Makefile:1.23 pkgsrc/security/prelude-correlator/Makefile:1.24
--- pkgsrc/security/prelude-correlator/Makefile:1.23    Mon Sep  2 13:19:54 2019
+++ pkgsrc/security/prelude-correlator/Makefile Mon Nov  4 21:12:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/09/02 13:19:54 adam Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/04 21:12:59 rillig Exp $
 
 DISTNAME=      prelude-correlator-0.9.0-beta8
 PKGNAME=       prelude-correlator-${DISTNAME:S/-beta/beta/:C/.*-//}
@@ -12,14 +12,14 @@ COMMENT=    Intrusion event correlation eng
 
 BUILD_DEFS+=           VARBASE
 
-RCD_SCRIPTS=           preludecorrelator
+RCD_SCRIPTS=                   preludecorrelator
 PRELUDE_CORRELATOR_PID_DIR=    ${VARBASE}/run/prelude-correlator
-PRELUDE_USER?=         _prelude
-PRELUDE_GROUP?=                _prelude
-PRELUDE_HOME?=         ${VARBASE}/db/prelude-correlator
-INSTALLATION_DIRS=     sbin
-OWN_DIRS=              ${PKG_SYSCONFDIR}/prelude-correlator
-EGDIR=                 ${PREFIX}/share/examples
+PRELUDE_USER?=                 _prelude
+PRELUDE_GROUP?=                        _prelude
+PRELUDE_HOME?=                 ${VARBASE}/db/prelude-correlator
+INSTALLATION_DIRS=             sbin
+OWN_DIRS=                      ${PKG_SYSCONFDIR}/prelude-correlator
+EGDIR=                         ${PREFIX}/share/examples
 
 PKG_GROUPS_VARS+=      PRELUDE_GROUP
 PKG_USERS_VARS+=       PRELUDE_USER

Index: pkgsrc/security/prelude-lml/Makefile
diff -u pkgsrc/security/prelude-lml/Makefile:1.44 pkgsrc/security/prelude-lml/Makefile:1.45
--- pkgsrc/security/prelude-lml/Makefile:1.44   Sat Jul 20 22:46:49 2019
+++ pkgsrc/security/prelude-lml/Makefile        Mon Nov  4 21:12:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2019/07/20 22:46:49 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2019/11/04 21:12:59 rillig Exp $
 #
 
 DISTNAME=              prelude-lml-0.9.15
@@ -66,7 +66,7 @@ CONF_FILES_PERMS+=    ${EGDIR}/prelude-lml.
                        ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
 
 # From plugins/pcre/ruleset/Makefile.in
-ruleset_DATA = \
+ruleset_DATA = \
        apc-emu.rules           \
        arbor.rules             \
        arpwatch.rules          \
@@ -145,7 +145,7 @@ unsupported_ruleset_DATA = \
        zywall.rules            \
        zyxel.rules
 .  for f in ${unsupported_ruleset_DATA}
-CONF_FILES+=   ${EGDIR}/ruleset/${f:Q} ${PKG_SYSCONFDIR}/ruleset/${f:Q}
+CONF_FILES+=           ${EGDIR}/ruleset/${f:Q} ${PKG_SYSCONFDIR}/ruleset/${f:Q}
 .  endfor
 .endif
 

Index: pkgsrc/security/prelude-manager/Makefile
diff -u pkgsrc/security/prelude-manager/Makefile:1.49 pkgsrc/security/prelude-manager/Makefile:1.50
--- pkgsrc/security/prelude-manager/Makefile:1.49       Sat Jul 20 22:46:49 2019
+++ pkgsrc/security/prelude-manager/Makefile    Mon Nov  4 21:12:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2019/07/20 22:46:49 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2019/11/04 21:12:59 rillig Exp $
 #
 
 DISTNAME=              prelude-manager-0.9.15
@@ -24,13 +24,13 @@ CONFIGURE_ARGS+=    --sysconfdir=${PKG_SYSC
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=       --with-libpreludedb-prefix=${BUILDLINK_PREFIX.libpreludedb}
 
-RCD_SCRIPTS=           preludemanager
+RCD_SCRIPTS=                   preludemanager
 PRELUDE_MANAGER_PID_DIR=       ${VARBASE}/run/prelude-manager
-PRELUDE_USER?=         _prelude
-PRELUDE_GROUP?=                _prelude
-PRELUDE_HOME?=         ${VARBASE}/spool/prelude-manager
-OWN_DIRS_PERMS+=       ${PRELUDE_HOME} ${PRELUDE_USER} ${PRELUDE_GROUP} 750
-OWN_DIRS+=             ${PKG_SYSCONFDIR}/prelude-manager
+PRELUDE_USER?=                 _prelude
+PRELUDE_GROUP?=                        _prelude
+PRELUDE_HOME?=                 ${VARBASE}/spool/prelude-manager
+OWN_DIRS_PERMS+=               ${PRELUDE_HOME} ${PRELUDE_USER} ${PRELUDE_GROUP} 750
+OWN_DIRS+=                     ${PKG_SYSCONFDIR}/prelude-manager
 
 INSTALLATION_DIRS=     sbin
 

Index: pkgsrc/security/prelude-pflogger/Makefile
diff -u pkgsrc/security/prelude-pflogger/Makefile:1.21 pkgsrc/security/prelude-pflogger/Makefile:1.22
--- pkgsrc/security/prelude-pflogger/Makefile:1.21      Sat Jul 20 22:46:49 2019
+++ pkgsrc/security/prelude-pflogger/Makefile   Mon Nov  4 21:12:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/07/20 22:46:49 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 21:12:59 rillig Exp $
 #
 
 DISTNAME=      prelude-pflogger-0.9.0-rc2
@@ -48,9 +48,9 @@ SUBST_FILES.code=     run-prelude-pflogger.c
 SUBST_VARS.code=       PREFIX
 SUBST_VARS.code+=      PRELUDE_USER
 
-SUBST_CLASSES+=         make
-SUBST_STAGE.make=       pre-configure
-SUBST_FILES.make=       Makefile.am
+SUBST_CLASSES+=                make
+SUBST_STAGE.make=      pre-configure
+SUBST_FILES.make=      Makefile.am
 SUBST_VARS.make=       EGDIR
 
 RCD_SCRIPTS=           pflogger

Index: pkgsrc/security/py-Des/Makefile
diff -u pkgsrc/security/py-Des/Makefile:1.1 pkgsrc/security/py-Des/Makefile:1.2
--- pkgsrc/security/py-Des/Makefile:1.1 Sun Nov  4 21:57:11 2012
+++ pkgsrc/security/py-Des/Makefile     Mon Nov  4 21:12:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/11/04 21:57:11 pettai Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/04 21:12:59 rillig Exp $
 #
 
 DISTNAME=      pyDes-2.0.1
@@ -11,7 +11,7 @@ HOMEPAGE=     http://twhiteman.netfirms.com/
 COMMENT=       DES implementation in python
 LICENSE=       public-domain
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=        yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-OpenSSL/Makefile
diff -u pkgsrc/security/py-OpenSSL/Makefile:1.52 pkgsrc/security/py-OpenSSL/Makefile:1.53
--- pkgsrc/security/py-OpenSSL/Makefile:1.52    Tue Jan 22 09:12:09 2019
+++ pkgsrc/security/py-OpenSSL/Makefile Mon Nov  4 21:12:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/01/22 09:12:09 adam Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/04 21:12:59 rillig Exp $
 
 DISTNAME=      pyOpenSSL-19.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -18,7 +18,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test>=3.0.
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 # https://github.com/pyca/pyopenssl/issues/656
-PYSETUPTESTTARGET=      pytest
+PYSETUPTESTTARGET=     pytest
 
 .include "../../lang/python/egg.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/security/py-SSLCrypto/Makefile
diff -u pkgsrc/security/py-SSLCrypto/Makefile:1.20 pkgsrc/security/py-SSLCrypto/Makefile:1.21
--- pkgsrc/security/py-SSLCrypto/Makefile:1.20  Mon Sep  2 13:19:55 2019
+++ pkgsrc/security/py-SSLCrypto/Makefile       Mon Nov  4 21:12:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:55 adam Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 21:12:59 rillig Exp $
 
 DISTNAME=      SSLCrypto-0.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Python bindings for openssl
 
 DEPENDS+=      ${PYPKGPREFIX}-pyrex>=0.9.4.1:../../lang/py-pyrex
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-pyrex
+PYTHON_VERSIONS_ACCEPTED=      27 # py-pyrex
 
 .include "../../lang/python/distutils.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/security/py-acme-tiny/Makefile
diff -u pkgsrc/security/py-acme-tiny/Makefile:1.4 pkgsrc/security/py-acme-tiny/Makefile:1.5
--- pkgsrc/security/py-acme-tiny/Makefile:1.4   Mon Jul 22 01:36:14 2019
+++ pkgsrc/security/py-acme-tiny/Makefile       Mon Nov  4 21:12:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/07/22 01:36:14 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/04 21:12:59 rillig Exp $
 
 DISTNAME=      acme-tiny-4.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,9 +13,9 @@ LICENSE=      mit
 GITHUB_PROJECT=        acme-tiny
 GITHUB_TAG=    ${PKGVERSION_NOREV}
 
-NO_BUILD=      yes
-INSTALLATION_DIRS=bin share/doc/${PYPKGPREFIX}-acme-tiny
-PLIST_SUBST+=  PYPKGPREFIX=${PYPKGPREFIX}
+NO_BUILD=              yes
+INSTALLATION_DIRS=     bin share/doc/${PYPKGPREFIX}-acme-tiny
+PLIST_SUBST+=          PYPKGPREFIX=${PYPKGPREFIX}
 
 REPLACE_PYTHON=        acme_tiny.py
 

Index: pkgsrc/security/py-backports.ssl_match_hostname/Makefile
diff -u pkgsrc/security/py-backports.ssl_match_hostname/Makefile:1.12 pkgsrc/security/py-backports.ssl_match_hostname/Makefile:1.13
--- pkgsrc/security/py-backports.ssl_match_hostname/Makefile:1.12       Mon Sep  2 13:19:55 2019
+++ pkgsrc/security/py-backports.ssl_match_hostname/Makefile    Mon Nov  4 21:12:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/09/02 13:19:55 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/04 21:12:59 rillig Exp $
 
 DISTNAME=      backports.ssl_match_hostname-3.5.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=      python-software-foundation
 
 DEPENDS+=      ${PYPKGPREFIX}-backports-[0-9]*:../../devel/py-backports
 
-PYTHON_VERSIONS_ACCEPTED=       27 # included in 3.2+
+PYTHON_VERSIONS_ACCEPTED=      27 # included in 3.2+
 
 post-install:
        rm ${DESTDIR}${PREFIX}/${PYSITELIB}/backports/__init__.*

Index: pkgsrc/security/py-denyhosts/Makefile
diff -u pkgsrc/security/py-denyhosts/Makefile:1.19 pkgsrc/security/py-denyhosts/Makefile:1.20
--- pkgsrc/security/py-denyhosts/Makefile:1.19  Mon Sep  2 13:19:55 2019
+++ pkgsrc/security/py-denyhosts/Makefile       Mon Nov  4 21:13:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/09/02 13:19:55 adam Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/04 21:13:00 rillig Exp $
 
 VER=           2.6
 DISTNAME=      DenyHosts-${VER}
@@ -12,7 +12,7 @@ MAINTAINER=   he%NetBSD.org@localhost
 HOMEPAGE=      http://denyhosts.sourceforge.net/
 COMMENT=       Watch auth log for invalid ssh login attempts and block hosts
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=        yes
 
 CONF_FILES+=   ${PREFIX}/share/denyhosts/denyhosts.cfg-dist \
                ${PREFIX}/etc/denyhosts.conf
@@ -20,16 +20,16 @@ CONF_FILES+=        ${PREFIX}/share/denyhosts/d
 FILES_SUBST+=  PYTHONBIN=${PYTHONBIN:Q}
 
 SUBST_CLASSES+=        cf
-SUBST_STAGE.cf= post-configure
+SUBST_STAGE.cf=        post-configure
 SUBST_VARS.cf= VARBASE PREFIX VARBASE PKG_SYSCONFDIR PYTHONBIN
 SUBST_FILES.cf=        setup.py denyhosts.cfg-dist daemon-control-dist
 
-REPLACE_PYTHON=        daemon-control-dist plugins/test_deny.py setup.py
-REPLACE_PYTHON+= scripts/restricted_from_invalid.py
-REPLACE_PYTHON+= scripts/restricted_from_passwd.py
+REPLACE_PYTHON=                daemon-control-dist plugins/test_deny.py setup.py
+REPLACE_PYTHON+=       scripts/restricted_from_invalid.py
+REPLACE_PYTHON+=       scripts/restricted_from_passwd.py
 
-PYTHON_SELF_CONFLICT=  yes
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_SELF_CONFLICT=          yes
+PYTHON_VERSIONS_ACCEPTED=      27
 
 RCD_SCRIPTS+=  denyhosts
 SMF_NAME=      denyhost

Index: pkgsrc/security/py-gnupg/Makefile
diff -u pkgsrc/security/py-gnupg/Makefile:1.25 pkgsrc/security/py-gnupg/Makefile:1.26
--- pkgsrc/security/py-gnupg/Makefile:1.25      Mon Sep  2 13:19:54 2019
+++ pkgsrc/security/py-gnupg/Makefile   Mon Nov  4 21:13:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/09/02 13:19:54 adam Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/04 21:13:00 rillig Exp $
 
 DISTNAME=      GnuPGInterface-0.3.2
 PKGNAME=       ${PYPKGPREFIX}-gnupg-0.3.2
@@ -15,7 +15,7 @@ DEPENDS+=     gnupg>=1.0.0:../../security/gn
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-openid/Makefile
diff -u pkgsrc/security/py-openid/Makefile:1.14 pkgsrc/security/py-openid/Makefile:1.15
--- pkgsrc/security/py-openid/Makefile:1.14     Mon Sep  2 13:19:54 2019
+++ pkgsrc/security/py-openid/Makefile  Mon Nov  4 21:13:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/09/02 13:19:54 adam Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 21:13:00 rillig Exp $
 
 DISTVERS=      2.2.5
 GITREF=                b666238
@@ -13,8 +13,8 @@ HOMEPAGE=     http://www.openidenabled.com/o
 COMMENT=       Python module for OpenID
 LICENSE=       apache-2.0
 
-PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED=       27
+PYDISTUTILSPKG=        yes
+PYTHON_VERSIONS_ACCEPTED= 27
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-prewikka/Makefile
diff -u pkgsrc/security/py-prewikka/Makefile:1.51 pkgsrc/security/py-prewikka/Makefile:1.52
--- pkgsrc/security/py-prewikka/Makefile:1.51   Mon Sep  2 13:19:56 2019
+++ pkgsrc/security/py-prewikka/Makefile        Mon Nov  4 21:13:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/09/02 13:19:56 adam Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/04 21:13:00 rillig Exp $
 
 DISTNAME=              prewikka-${VERSION}
 PKGNAME=               ${PYPKGPREFIX}-prewikka-${VERSION}
@@ -21,10 +21,10 @@ USE_TOOLS+=         msgfmt
 
 .include "../../mk/bsd.prefs.mk"
 
-PYDISTUTILSPKG=                yes
-PYSETUP=               setup.py
+PYDISTUTILSPKG=        yes
+PYSETUP=       setup.py
 REPLACE_PYTHON=        scripts/prewikka-httpd
-PYTHON_VERSIONS_ACCEPTED=       27 # py-cheetah
+PYTHON_VERSIONS_ACCEPTED= 27 # py-cheetah
 
 PREWIKKA_USER?=                prewikka
 PREWIKKA_GROUP?=       prewikka
@@ -53,7 +53,7 @@ FILES_SUBST+= PREWIKKA_USER=${PREWIKKA_U
 MAKE_ENV+=     EXAMPLEDIR=share/examples/${PKGBASE}
 
 INSTALLATION_DIRS+=    share/examples/${PKGBASE} sbin
-CONF_FILES+=   ${PREFIX}/share/examples/${PKGBASE}/prewikka.conf ${PKG_SYSCONFDIR}/prewikka.conf
+CONF_FILES+=           ${PREFIX}/share/examples/${PKGBASE}/prewikka.conf ${PKG_SYSCONFDIR}/prewikka.conf
 
 pre-patch:
        cp ${FILESDIR}/runPrewikka.c ${WRKSRC}

Index: pkgsrc/security/py-slowaes/Makefile
diff -u pkgsrc/security/py-slowaes/Makefile:1.7 pkgsrc/security/py-slowaes/Makefile:1.8
--- pkgsrc/security/py-slowaes/Makefile:1.7     Mon Sep  2 13:19:56 2019
+++ pkgsrc/security/py-slowaes/Makefile Mon Nov  4 21:13:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/09/02 13:19:56 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 21:13:00 rillig Exp $
 
 DISTNAME=      slowaes-0.1a1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=     https://pypi.python.org/pypi/s
 COMMENT=       Implementation of AES in pure Python
 LICENSE=       apache-2.0
 
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 0.1a1
+PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.1a1
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-smbpasswd/Makefile
diff -u pkgsrc/security/py-smbpasswd/Makefile:1.10 pkgsrc/security/py-smbpasswd/Makefile:1.11
--- pkgsrc/security/py-smbpasswd/Makefile:1.10  Mon Sep  4 18:08:27 2017
+++ pkgsrc/security/py-smbpasswd/Makefile       Mon Nov  4 21:13:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/09/04 18:08:27 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/04 21:13:00 rillig Exp $
 #
 
 DISTNAME=      py-smbpasswd-1.0.1
@@ -10,7 +10,7 @@ MAINTAINER=   bouyer%NetBSD.org@localhost
 HOMEPAGE=      https://barryp.org/software/py-smbpasswd/
 COMMENT=       Python SMB Password Hash Generator
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=        yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-urllib2-kerberos/Makefile
diff -u pkgsrc/security/py-urllib2-kerberos/Makefile:1.7 pkgsrc/security/py-urllib2-kerberos/Makefile:1.8
--- pkgsrc/security/py-urllib2-kerberos/Makefile:1.7    Mon Sep  2 13:19:55 2019
+++ pkgsrc/security/py-urllib2-kerberos/Makefile        Mon Nov  4 21:13:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/09/02 13:19:55 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 21:13:00 rillig Exp $
 #
 
 DISTNAME=      urllib2_kerberos-0.1.6
@@ -13,7 +13,7 @@ LICENSE=      apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-kerberos>=1.1:../../security/py-kerberos
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-yara/Makefile
diff -u pkgsrc/security/py-yara/Makefile:1.9 pkgsrc/security/py-yara/Makefile:1.10
--- pkgsrc/security/py-yara/Makefile:1.9        Mon Sep  2 13:19:55 2019
+++ pkgsrc/security/py-yara/Makefile    Mon Nov  4 21:13:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/09/02 13:19:55 adam Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/04 21:13:01 rillig Exp $
 
 DISTNAME=      yara-python-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-yara-${VERSION}
@@ -9,7 +9,7 @@ MASTER_SITES=   ${MASTER_SITE_GITHUB:=Viru
 
 COMMENT=       Yara python bindings
 
-PYTHON_VERSIONS_ACCEPTED=    27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 .include "../../security/yara/Makefile.common"
 .include "../../security/yara/buildlink3.mk"

Index: pkgsrc/security/qca2-qt5/buildlink3.mk
diff -u pkgsrc/security/qca2-qt5/buildlink3.mk:1.7 pkgsrc/security/qca2-qt5/buildlink3.mk:1.8
--- pkgsrc/security/qca2-qt5/buildlink3.mk:1.7  Wed Apr  3 00:33:05 2019
+++ pkgsrc/security/qca2-qt5/buildlink3.mk      Mon Nov  4 21:13:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2019/04/03 00:33:05 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2019/11/04 21:13:01 rillig Exp $
 
 BUILDLINK_TREE+=       qca2-qt5
 
@@ -7,7 +7,7 @@ QCA2_QT5_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qca2-qt5+=       qca2-qt5>=2.1.3
 BUILDLINK_ABI_DEPENDS.qca2-qt5?=       qca2-qt5>=2.1.3nb6
-BUILDLINK_PKGSRCDIR.qca2-qt5?= ../../security/qca2-qt5
+BUILDLINK_PKGSRCDIR.qca2-qt5?=         ../../security/qca2-qt5
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif # QCA2_QT5_BUILDLINK3_MK

Index: pkgsrc/security/qore-asn1-module/options.mk
diff -u pkgsrc/security/qore-asn1-module/options.mk:1.1 pkgsrc/security/qore-asn1-module/options.mk:1.2
--- pkgsrc/security/qore-asn1-module/options.mk:1.1     Tue Dec 30 16:01:22 2014
+++ pkgsrc/security/qore-asn1-module/options.mk Mon Nov  4 21:13:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/30 16:01:22 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 21:13:01 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qore-asn1-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/security/qore-ssh2-module/Makefile
diff -u pkgsrc/security/qore-ssh2-module/Makefile:1.9 pkgsrc/security/qore-ssh2-module/Makefile:1.10
--- pkgsrc/security/qore-ssh2-module/Makefile:1.9       Fri Jun  8 20:02:30 2018
+++ pkgsrc/security/qore-ssh2-module/Makefile   Mon Nov  4 21:13:01 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2018/06/08 20:02:30 nros Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/04 21:13:01 rillig Exp $
 
 DISTNAME=      qore-ssh2-module-1.2
 CATEGORIES=    security
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=qorelanguage/}
-EXTRACT_SUFX=   .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=qorelanguage/}
+EXTRACT_SUFX=  .tar.bz2
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 GITHUB_PROJECT=        module-ssh2
 
@@ -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/security/qore-ssh2-module/options.mk
diff -u pkgsrc/security/qore-ssh2-module/options.mk:1.1 pkgsrc/security/qore-ssh2-module/options.mk:1.2
--- pkgsrc/security/qore-ssh2-module/options.mk:1.1     Tue Dec 30 16:02:08 2014
+++ pkgsrc/security/qore-ssh2-module/options.mk Mon Nov  4 21:13:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/30 16:02:08 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 21:13:01 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qore-ssh2-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/security/qore-xmlsec-module/Makefile
diff -u pkgsrc/security/qore-xmlsec-module/Makefile:1.5 pkgsrc/security/qore-xmlsec-module/Makefile:1.6
--- pkgsrc/security/qore-xmlsec-module/Makefile:1.5     Fri Jun  8 20:49:42 2018
+++ pkgsrc/security/qore-xmlsec-module/Makefile Mon Nov  4 21:13:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/06/08 20:49:42 nros Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/04 21:13:01 rillig Exp $
 
 DISTNAME=      qore-xmlsec-module-0.0.2
 PKGREVISION=   8
@@ -15,9 +15,9 @@ USE_LIBTOOL=  yes
 USE_LANGUAGES= c c++11
 PTHREAD_OPTS+= native
 
-CONFIGURE_ARGS+=--with-xmlsec-dir=${BUILDLINK_PREFIX.xmlsec1}
-CONFIGURE_ARGS+=--with-libxml2-dir=${BUILDLINK_PREFIX.libxml2}
-CONFIGURE_ARGS+=--with-qore-dir=${BUILDLINK_PREFIX.qore}
+CONFIGURE_ARGS+=       --with-xmlsec-dir=${BUILDLINK_PREFIX.xmlsec1}
+CONFIGURE_ARGS+=       --with-libxml2-dir=${BUILDLINK_PREFIX.libxml2}
+CONFIGURE_ARGS+=       --with-qore-dir=${BUILDLINK_PREFIX.qore}
 
 INSTALLATION_DIRS+=     share/doc/${PKGBASE}
 post-install:

Index: pkgsrc/security/qore-xmlsec-module/options.mk
diff -u pkgsrc/security/qore-xmlsec-module/options.mk:1.1 pkgsrc/security/qore-xmlsec-module/options.mk:1.2
--- pkgsrc/security/qore-xmlsec-module/options.mk:1.1   Tue Dec 30 16:03:28 2014
+++ pkgsrc/security/qore-xmlsec-module/options.mk       Mon Nov  4 21:13:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/30 16:03:28 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/04 21:13:01 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qore-xmlsec-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/security/racoon2/Makefile
diff -u pkgsrc/security/racoon2/Makefile:1.16 pkgsrc/security/racoon2/Makefile:1.17
--- pkgsrc/security/racoon2/Makefile:1.16       Sun Aug 11 13:23:00 2019
+++ pkgsrc/security/racoon2/Makefile    Mon Nov  4 21:13:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:23:00 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/04 21:13:01 rillig Exp $
 #
 
 PKGREVISION=           2
@@ -9,7 +9,7 @@ CATEGORIES=             security net
 
 DISTNAME=              racoon2
 PKGNAME=               racoon2-20180701
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=zoulasc/}
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=zoulasc/}
 GITHUB_PROJECT=                racoon2
 GITHUB_TAG=            b2a193fc9875d1fb89c0a51690745379bc135fcf
 

Index: pkgsrc/security/rainbowcrack/Makefile
diff -u pkgsrc/security/rainbowcrack/Makefile:1.11 pkgsrc/security/rainbowcrack/Makefile:1.12
--- pkgsrc/security/rainbowcrack/Makefile:1.11  Sat Mar  5 11:29:26 2016
+++ pkgsrc/security/rainbowcrack/Makefile       Mon Nov  4 21:13:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/03/05 11:29:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/04 21:13:02 rillig Exp $
 
 PKGNAME=               rainbowcrack-1.2
 DISTNAME=              rainbowcrack-1.2-src
@@ -7,7 +7,7 @@ CATEGORIES=             security
 MASTER_SITES=          # http://www.rainbowcrack.com/downloads/
 EXTRACT_SUFX=          .zip
 DISTFILES=             rainbowcrack-1.2-src.zip \
-                        rainbowcrack-1.2-openbsd-diffs.tar.gz
+                       rainbowcrack-1.2-openbsd-diffs.tar.gz
 
 MAINTAINER=            dhowland%users.sourceforge.net@localhost
 HOMEPAGE=              http://project-rainbowcrack.com/

Index: pkgsrc/security/scrypt/Makefile
diff -u pkgsrc/security/scrypt/Makefile:1.6 pkgsrc/security/scrypt/Makefile:1.7
--- pkgsrc/security/scrypt/Makefile:1.6 Mon Sep 16 05:13:28 2019
+++ pkgsrc/security/scrypt/Makefile     Mon Nov  4 21:13:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/09/16 05:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/04 21:13:02 rillig Exp $
 
 DISTNAME=      scrypt-1.3.0
 CATEGORIES=    security
@@ -10,8 +10,8 @@ HOMEPAGE=     https://www.tarsnap.com/scrypt
 COMMENT=       Encrypt and decrypt files
 LICENSE=       2-clause-bsd
 
-GNU_CONFIGURE= yes
-TEST_TARGET=   test
+GNU_CONFIGURE=         yes
+TEST_TARGET=           test
 UNLIMIT_RESOURCES=     datasize
 
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/security/seahorse/Makefile
diff -u pkgsrc/security/seahorse/Makefile:1.153 pkgsrc/security/seahorse/Makefile:1.154
--- pkgsrc/security/seahorse/Makefile:1.153     Sun Jul 21 22:24:11 2019
+++ pkgsrc/security/seahorse/Makefile   Mon Nov  4 21:13:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2019/07/21 22:24:11 wiz Exp $
+# $NetBSD: Makefile,v 1.154 2019/11/04 21:13:02 rillig Exp $
 
 DISTNAME=      seahorse-2.32.0
 PKGREVISION=   56
@@ -12,14 +12,14 @@ COMMENT=    GnuPG front end and bonobo comp
 #LICENSE=      gnu-gpl-v2 AND gnu-fdl-v1.1 AND gnu-lgpl-v2
 
 .if exists(/usr/bin/ssh) && exists(/usr/bin/ssh-add) && exists(/usr/bin/ssh-keygen)
-SSH_PATH=/usr/bin/ssh
-SSH_ADD_PATH=/usr/bin/ssh-add
-SSH_KEYGEN_PATH=/usr/bin/ssh-keygen
+SSH_PATH=              /usr/bin/ssh
+SSH_ADD_PATH=          /usr/bin/ssh-add
+SSH_KEYGEN_PATH=       /usr/bin/ssh-keygen
 .else
 DEPENDS+=              {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh
-SSH_PATH=${PREFIX}/bin/ssh
-SSH_ADD_PATH=${PREFIX}/bin/ssh-add
-SSH_KEYGEN_PATH=${PREFIX}/ssh-keygen
+SSH_PATH=              ${PREFIX}/bin/ssh
+SSH_ADD_PATH=          ${PREFIX}/bin/ssh-add
+SSH_KEYGEN_PATH=       ${PREFIX}/ssh-keygen
 .endif
 
 GNU_CONFIGURE=         yes
@@ -35,7 +35,7 @@ CONFIGURE_ENV+=               SSH_KEYGEN_PATH=${SSH_K
 CONFIGURE_ENV+=                GNUPG=${GPGME_GPG}
 
 PKGCONFIG_OVERRIDE+=   libcryptui/cryptui.pc.in
-GCONF_SCHEMAS=         seahorse.schemas
+GCONF_SCHEMAS=         seahorse.schemas
 
 # for PKCS11
 .include "../../security/gnome-keyring/buildlink3.mk"

Index: pkgsrc/security/sign/Makefile
diff -u pkgsrc/security/sign/Makefile:1.18 pkgsrc/security/sign/Makefile:1.19
--- pkgsrc/security/sign/Makefile:1.18  Wed Apr 18 19:56:42 2018
+++ pkgsrc/security/sign/Makefile       Mon Nov  4 21:13:02 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2018/04/18 19:56:42 kamil Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/04 21:13:02 rillig Exp $
 
-DISTNAME=       sign-1.0.7
+DISTNAME=      sign-1.0.7
 PKGREVISION=   1
 CATEGORIES=    security
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=apankrat/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=apankrat/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://swapped.cc/sign/

Index: pkgsrc/security/skey/builtin.mk
diff -u pkgsrc/security/skey/builtin.mk:1.5 pkgsrc/security/skey/builtin.mk:1.6
--- pkgsrc/security/skey/builtin.mk:1.5 Sat Nov 23 12:10:13 2013
+++ pkgsrc/security/skey/builtin.mk     Mon Nov  4 21:13:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2013/11/23 12:10:13 obache Exp $
+# $NetBSD: builtin.mk,v 1.6 2019/11/04 21:13:02 rillig Exp $
 
 BUILTIN_PKG:=  skey
 
@@ -17,7 +17,7 @@ IS_BUILTIN.skey=      no
 IS_BUILTIN.skey=       yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.skey
+MAKEVARS+=             IS_BUILTIN.skey
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -31,7 +31,7 @@ MAKEVARS+=    IS_BUILTIN.skey
 # XXX
 BUILTIN_PKG.skey=      skey-1.1.5
 .endif
-MAKEVARS+=     BUILTIN_PKG.skey
+MAKEVARS+=             BUILTIN_PKG.skey
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -58,4 +58,4 @@ USE_BUILTIN.skey!=                                                    \
 .    endif
 .  endif  # PREFER.skey
 .endif
-MAKEVARS+=     USE_BUILTIN.skey
+MAKEVARS+=             USE_BUILTIN.skey

Index: pkgsrc/security/smtpd/Makefile
diff -u pkgsrc/security/smtpd/Makefile:1.25 pkgsrc/security/smtpd/Makefile:1.26
--- pkgsrc/security/smtpd/Makefile:1.25 Mon Sep  4 18:01:00 2017
+++ pkgsrc/security/smtpd/Makefile      Mon Nov  4 21:13:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/09/04 18:01:00 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/04 21:13:02 rillig Exp $
 #
 
 DISTNAME=      smtpd-2.0
@@ -21,14 +21,14 @@ RCD_SCRIPTS=        smtpfwdd
 FILES_SUBST+=  SPOOL=${SPOOL:Q}
 
 # taken directly from the Makefile.
-CFLAGS.NetBSD+=        -DUSE_FLOCK -DUSE_MKSTEMP
+CFLAGS.NetBSD+=                -DUSE_FLOCK -DUSE_MKSTEMP
 CFLAGS.DragonFly+=     -DUSE_FLOCK -DUSE_MKSTEMP
-CFLAGS.SunOS+= -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_STRINGS_H -DBROKEN_SUN_INCLUDES
-CFLAGS.IRIX+=  -DGETOPT_EOF -DUSE_FLOCK -DNEEDS_FCNTL_H -DNEEDS_BSTRING_H -DIRIX_BROKEN_INCLUDES
-CFLAGS.AIX+=   -DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_STRINGS_H -DNEEDS_SELECT_H
-OPSYSVARS+=    LD_LIBS
-LD_LIBS.SunOS+=        -lnsl -lsocket -lresolv
-MAKE_ENV+=     LD_LIBS=${LD_LIBS:Q}
+CFLAGS.SunOS+=         -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_STRINGS_H -DBROKEN_SUN_INCLUDES
+CFLAGS.IRIX+=          -DGETOPT_EOF -DUSE_FLOCK -DNEEDS_FCNTL_H -DNEEDS_BSTRING_H -DIRIX_BROKEN_INCLUDES
+CFLAGS.AIX+=           -DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_STRINGS_H -DNEEDS_SELECT_H
+OPSYSVARS+=            LD_LIBS
+LD_LIBS.SunOS+=                -lnsl -lsocket -lresolv
+MAKE_ENV+=             LD_LIBS=${LD_LIBS:Q}
 
 INSTALLATION_DIRS=     sbin share/doc/smtpd share/examples/smtpd
 OWN_DIRS=              ${SPOOL}/etc
@@ -40,7 +40,7 @@ do-install:
            ${DESTDIR}${PREFIX}/share/doc/smtpd
 .for f in antirelay_check_rules_example antispam_check_rules.example \
            smtpd_check_rules.example
-               ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/smtpd
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/smtpd
 .endfor
 
 .include "../../devel/sysexits/buildlink3.mk"

Index: pkgsrc/security/snoopy/Makefile
diff -u pkgsrc/security/snoopy/Makefile:1.3 pkgsrc/security/snoopy/Makefile:1.4
--- pkgsrc/security/snoopy/Makefile:1.3 Mon Sep  9 09:28:40 2019
+++ pkgsrc/security/snoopy/Makefile     Mon Nov  4 21:13:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/09/09 09:28:40 nia Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/04 21:13:02 rillig Exp $
 
 DISTNAME=      snoopy-2.1.0
 CATEGORIES=    security
@@ -21,7 +21,7 @@ BUILDLINK_TRANSFORM+= rm:-Werror
 CPPFLAGS.SunOS+=       -D_POSIX_PTHREAD_SEMANTICS
 
 pre-configure:
-               set -e; cd ${WRKSRC}; \
-               aclocal; autoheader; automake -a --foreign -i; autoconf
+       set -e; cd ${WRKSRC}; \
+       aclocal; autoheader; automake -a --foreign -i; autoconf
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/softhsm/Makefile
diff -u pkgsrc/security/softhsm/Makefile:1.43 pkgsrc/security/softhsm/Makefile:1.44
--- pkgsrc/security/softhsm/Makefile:1.43       Thu May 23 19:23:16 2019
+++ pkgsrc/security/softhsm/Makefile    Mon Nov  4 21:13:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/05/23 19:23:16 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/04 21:13:02 rillig Exp $
 #
 
 DISTNAME=      softhsm-1.3.7
@@ -22,9 +22,9 @@ CONFIGURE_ARGS+=      --with-botan=${PREFIX}
 
 EGDIR=                 ${PREFIX}/share/examples/softhsm
 
-SUBST_CLASSES+=         paths
-SUBST_FILES.paths=      ${WRKSRC}/Makefile.in
-SUBST_STAGE.paths=      pre-configure
+SUBST_CLASSES+=                paths
+SUBST_FILES.paths=     ${WRKSRC}/Makefile.in
+SUBST_STAGE.paths=     pre-configure
 SUBST_VARS.paths=      EGDIR
 
 CXXFLAGS.NetBSD+=      -D_NETBSD_SOURCE

Index: pkgsrc/security/srp_client/Makefile
diff -u pkgsrc/security/srp_client/Makefile:1.42 pkgsrc/security/srp_client/Makefile:1.43
--- pkgsrc/security/srp_client/Makefile:1.42    Tue Jan  2 05:37:24 2018
+++ pkgsrc/security/srp_client/Makefile Mon Nov  4 21:13:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/01/02 05:37:24 maya Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/04 21:13:02 rillig Exp $
 
 DISTNAME=              srp-1.4.4
 PKGNAME=               srp-client-1.4.4
@@ -28,11 +28,11 @@ CONFIGURE_ARGS+=    --with-krb4
 .include "../../mk/bsd.prefs.mk"
 
 SED_PATTERN=   -e "s,include/kerberos,include/kerberosIV,"
-.if ${MACHINE_PLATFORM:MNetBSD-[01].[0-4]*-i386} == ""
+.  if ${MACHINE_PLATFORM:MNetBSD-[01].[0-4]*-i386} == ""
 SED_PATTERN+=  -e "s,-ldes,-ldes -lroken -lcom_err -lcrypt,"
-.else
+.  else
 SED_PATTERN+=  -e "s,-ldes,-ldes -lcom_err,"
-.endif
+.  endif
 
 post-patch:
        for FILE in ftp/ftp/Makefile.in ftp/ftpd/Makefile.in            \

Index: pkgsrc/security/sshfp/Makefile
diff -u pkgsrc/security/sshfp/Makefile:1.14 pkgsrc/security/sshfp/Makefile:1.15
--- pkgsrc/security/sshfp/Makefile:1.14 Thu Apr 25 07:33:17 2019
+++ pkgsrc/security/sshfp/Makefile      Mon Nov  4 21:13:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/04/25 07:33:17 maya Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 21:13:03 rillig Exp $
 
 DISTNAME=      sshfp-1.1.3
 PKGREVISION=   5
@@ -12,9 +12,9 @@ LICENSE=      gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 
-MANCOMPRESSED=                 yes
-NO_BUILD=                      yes
-REPLACE_PYTHON=                sshfp
+MANCOMPRESSED= yes
+NO_BUILD=      yes
+REPLACE_PYTHON=        sshfp
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/ssldump/Makefile
diff -u pkgsrc/security/ssldump/Makefile:1.31 pkgsrc/security/ssldump/Makefile:1.32
--- pkgsrc/security/ssldump/Makefile:1.31       Mon Sep  4 18:01:01 2017
+++ pkgsrc/security/ssldump/Makefile    Mon Nov  4 21:13:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/09/04 18:01:01 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/04 21:13:03 rillig Exp $
 #
 
 DISTNAME=      ssldump-0.9b3
@@ -13,10 +13,10 @@ COMMENT=    SSLv3/TLS network protocol anal
 GNU_CONFIGURE= YES
 USE_TOOLS+=    gmake
 
-CONFIGURE_ARGS+=--with-pcap-inc=${BUILDLINK_PREFIX.libpcap}/include \
-               --with-pcap-lib=${BUILDLINK_PREFIX.libpcap}/lib \
-               --with-openssl-inc=${BUILDLINK_PREFIX.openssl}/include \
-               --with-openssl-lib=${BUILDLINK_PREFIX.openssl}/lib
+CONFIGURE_ARGS+=       --with-pcap-inc=${BUILDLINK_PREFIX.libpcap}/include \
+                       --with-pcap-lib=${BUILDLINK_PREFIX.libpcap}/lib \
+                       --with-openssl-inc=${BUILDLINK_PREFIX.openssl}/include \
+                       --with-openssl-lib=${BUILDLINK_PREFIX.openssl}/lib
 
 INSTALL_MAKE_FLAGS+=   BINDIR=${DESTDIR}${PREFIX}/sbin \
                        MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}

Index: pkgsrc/security/sslwrap/Makefile
diff -u pkgsrc/security/sslwrap/Makefile:1.30 pkgsrc/security/sslwrap/Makefile:1.31
--- pkgsrc/security/sslwrap/Makefile:1.30       Sat Mar  5 11:29:26 2016
+++ pkgsrc/security/sslwrap/Makefile    Mon Nov  4 21:13:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/03/05 11:29:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/04 21:13:03 rillig Exp $
 
 DISTNAME=      ${PKGNAME_NOREV:S/-//}
 PKGNAME=       sslwrap-206
@@ -10,9 +10,9 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.rickk.com/sslwrap/
 COMMENT=       Simple SSL wrapper
 
-OPSYSVARS+=    LDADD
-LDADD.SunOS=   -lnsl -lsocket
-MAKE_ENV+=     LDADD=${LDADD:Q}
+OPSYSVARS+=            LDADD
+LDADD.SunOS=           -lnsl -lsocket
+MAKE_ENV+=             LDADD=${LDADD:Q}
 USE_BSD_MAKEFILE=      yes
 
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/security/ssss/Makefile
diff -u pkgsrc/security/ssss/Makefile:1.4 pkgsrc/security/ssss/Makefile:1.5
--- pkgsrc/security/ssss/Makefile:1.4   Tue Oct 23 18:16:59 2012
+++ pkgsrc/security/ssss/Makefile       Mon Nov  4 21:13:03 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2012/10/23 18:16:59 asau Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/04 21:13:03 rillig Exp $
 
 DISTNAME=      ssss-0.5
 PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  http://point-at-infinity.org/ssss/
-DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} ssss.1
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ssss.1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://point-at-infinity.org/ssss/

Index: pkgsrc/security/sudo/options.mk
diff -u pkgsrc/security/sudo/options.mk:1.22 pkgsrc/security/sudo/options.mk:1.23
--- pkgsrc/security/sudo/options.mk:1.22        Tue Aug 14 13:18:37 2018
+++ pkgsrc/security/sudo/options.mk     Mon Nov  4 21:13:03 2019
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.22 2018/08/14 13:18:37 adam Exp $
+# $NetBSD: options.mk,v 1.23 2019/11/04 21:13:03 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.sudo
-PKG_SUPPORTED_OPTIONS= ldap nls
-PKG_OPTIONS_OPTIONAL_GROUPS=auth
-PKG_OPTIONS_GROUP.auth=        kerberos pam skey
+PKG_OPTIONS_VAR=               PKG_OPTIONS.sudo
+PKG_SUPPORTED_OPTIONS=         ldap nls
+PKG_OPTIONS_OPTIONAL_GROUPS=   auth
+PKG_OPTIONS_GROUP.auth=                kerberos pam skey
 
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/skey.h)
 PKG_SUGGESTED_OPTIONS= skey

Index: pkgsrc/security/tcp_wrappers/builtin.mk
diff -u pkgsrc/security/tcp_wrappers/builtin.mk:1.9 pkgsrc/security/tcp_wrappers/builtin.mk:1.10
--- pkgsrc/security/tcp_wrappers/builtin.mk:1.9 Sat Nov 23 12:10:13 2013
+++ pkgsrc/security/tcp_wrappers/builtin.mk     Mon Nov  4 21:13:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2013/11/23 12:10:13 obache Exp $
+# $NetBSD: builtin.mk,v 1.10 2019/11/04 21:13:03 rillig Exp $
 
 BUILTIN_PKG:=  tcp_wrappers
 
@@ -20,7 +20,7 @@ IS_BUILTIN.tcp_wrappers=      no
 IS_BUILTIN.tcp_wrappers=       yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.tcp_wrappers
+MAKEVARS+=                     IS_BUILTIN.tcp_wrappers
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -47,4 +47,4 @@ USE_BUILTIN.tcp_wrappers!=                                            \
 .    endif
 .  endif  # PREFER.tcp_wrappers
 .endif
-MAKEVARS+=     USE_BUILTIN.tcp_wrappers
+MAKEVARS+=                     USE_BUILTIN.tcp_wrappers

Index: pkgsrc/security/tor-browser/Makefile
diff -u pkgsrc/security/tor-browser/Makefile:1.50 pkgsrc/security/tor-browser/Makefile:1.51
--- pkgsrc/security/tor-browser/Makefile:1.50   Wed Sep 18 14:17:16 2019
+++ pkgsrc/security/tor-browser/Makefile        Mon Nov  4 21:13:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2019/09/18 14:17:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2019/11/04 21:13:03 rillig Exp $
 
 DISTNAME=      src-firefox-tor-browser-60.8.0esr-8.5-1-build2
 PKGNAME=       tor-browser-8.5.4
@@ -61,10 +61,10 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-ffunctio
 .include "../../www/firefox60/mozilla-common.mk"
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpt.py
 
 CHECK_WRKREF_SKIP+=    lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
 

Index: pkgsrc/security/tor-browser/options.mk
diff -u pkgsrc/security/tor-browser/options.mk:1.4 pkgsrc/security/tor-browser/options.mk:1.5
--- pkgsrc/security/tor-browser/options.mk:1.4  Fri Jun 14 17:22:21 2019
+++ pkgsrc/security/tor-browser/options.mk      Mon Nov  4 21:13:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2019/06/14 17:22:21 nia Exp $
+# $NetBSD: options.mk,v 1.5 2019/11/04 21:13:03 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tor-browser
 PKG_SUPPORTED_OPTIONS+=        alsa debug debug-info mozilla-jemalloc pulseaudio
@@ -29,12 +29,12 @@ CONFIGURE_ARGS+=    --disable-jemalloc
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mgcc)
-.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
+.  if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
 # Modern gcc does not run any "tracking" passes when compiling with -O0,
 # which makes the generated debug info mostly useless. So explicitly
 # request them.
 O0TRACKING=-fvar-tracking-assignments -fvar-tracking
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -42,11 +42,11 @@ CONFIGURE_ARGS+=    --enable-debug="-g -O0 
 CONFIGURE_ARGS+=       --disable-install-strip
 PLIST.debug=           yes
 .else
-.if !empty(PKG_OPTIONS:Mdebug-info)
+.  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=       --enable-debug-symbols
-.else
+.  else
 CONFIGURE_ARGS+=       --disable-debug-symbols
-.endif
+.  endif
 CONFIGURE_ARGS+=       --disable-debug
 CONFIGURE_ARGS+=       --enable-optimize=-O2
 CONFIGURE_ARGS+=       --enable-install-strip

Index: pkgsrc/security/validns/Makefile
diff -u pkgsrc/security/validns/Makefile:1.15 pkgsrc/security/validns/Makefile:1.16
--- pkgsrc/security/validns/Makefile:1.15       Sat Jul  9 06:38:57 2016
+++ pkgsrc/security/validns/Makefile    Mon Nov  4 21:13:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/07/09 06:38:57 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 21:13:03 rillig Exp $
 #
 
 DISTNAME=      validns-0.8
@@ -15,7 +15,7 @@ LICENSE=      2-clause-bsd
 
 #BUILD_DEPENDS+=       p5-Test-Command-Simple-[0-9]*:../../devel/p5-Test-Command-Simple
 
-#USE_TOOLS+=perl
+#USE_TOOLS+=   perl
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 

Index: pkgsrc/security/volatility/Makefile
diff -u pkgsrc/security/volatility/Makefile:1.11 pkgsrc/security/volatility/Makefile:1.12
--- pkgsrc/security/volatility/Makefile:1.11    Mon Sep  2 13:19:54 2019
+++ pkgsrc/security/volatility/Makefile Mon Nov  4 21:13:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/09/02 13:19:54 adam Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/04 21:13:03 rillig Exp $
 
 DISTNAME=      volatility-2.4
 PKGREVISION=   1
@@ -14,10 +14,10 @@ DEPENDS+=   ${PYPKGPREFIX}-crypto-[0-9]*:.
 DEPENDS+=      ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
 DEPENDS+=      ${PYPKGPREFIX}-distorm3-[0-9]*:../../devel/py-distorm3
 
-PYDISTUTILSPKG= yes
-REPLACE_PYTHON= tools/vtype_diff.py
+PYDISTUTILSPKG=        yes
+REPLACE_PYTHON=        tools/vtype_diff.py
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/security/yara/Makefile
diff -u pkgsrc/security/yara/Makefile:1.7 pkgsrc/security/yara/Makefile:1.8
--- pkgsrc/security/yara/Makefile:1.7   Thu Jul 11 11:20:06 2019
+++ pkgsrc/security/yara/Makefile       Mon Nov  4 21:13:04 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2019/07/11 11:20:06 sevan Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 21:13:04 rillig Exp $
 
 DISTNAME=      yara-${VERSION}
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=VirusTotal/}
 
-COMMENT=        Pattern matching swiss knife for malware researchers
+COMMENT=       Pattern matching swiss knife for malware researchers
 
 USE_TOOLS+=    pkg-config automake autoreconf
 USE_LIBTOOL=   yes

Index: pkgsrc/security/zebedee/Makefile
diff -u pkgsrc/security/zebedee/Makefile:1.44 pkgsrc/security/zebedee/Makefile:1.45
--- pkgsrc/security/zebedee/Makefile:1.44       Sun Aug 11 13:23:02 2019
+++ pkgsrc/security/zebedee/Makefile    Mon Nov  4 21:13:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2019/08/11 13:23:02 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2019/11/04 21:13:04 rillig Exp $
 
 DISTNAME=      zebedee-2.5.3
 PKGREVISION=   14
@@ -25,7 +25,7 @@ SUBST_SED.paths=      -e 's,tclsh,${TCLSH},g'
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
-PTHREAD_CFLAGS+=  -DHAVE_PTHREADS
+PTHREAD_CFLAGS+=       -DHAVE_PTHREADS
 .endif
 
 .include "../../archivers/bzip2/buildlink3.mk"

Index: pkgsrc/security/zoneminder/Makefile
diff -u pkgsrc/security/zoneminder/Makefile:1.45 pkgsrc/security/zoneminder/Makefile:1.46
--- pkgsrc/security/zoneminder/Makefile:1.45    Sun Aug 11 13:23:02 2019
+++ pkgsrc/security/zoneminder/Makefile Mon Nov  4 21:13:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/08/11 13:23:02 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/04 21:13:04 rillig Exp $
 
 # See wip/zoneminder for a draft update to 1.29.0.
 PKGNAME=       ${DISTNAME:S/ZoneMinder-/zoneminder-/}
@@ -17,7 +17,7 @@ COMMENT=      Video camera security and surve
 LICENSE=       gnu-gpl-v2
 
 # NetBSD tar: Invalid header, starting valid header search.
-EXTRACT_USING=  gtar
+EXTRACT_USING= gtar
 
 DEPENDS+=      netpbm-[0-9]*:../../graphics/netpbm
 
@@ -138,7 +138,7 @@ DEPENDS+=   ${PHP_PKG_PREFIX}-pdo_mysql-[0
 
 # \todo Somehow, this permission setup still fails.
 # This directory contains state, so use OWN_DIRS instead of MAKE_DIRS.
-ZM_CACHE=      ${VARBASE}/cache/zoneminder
+ZM_CACHE=              ${VARBASE}/cache/zoneminder
 OWN_DIRS_PERMS+=       ${ZM_CACHE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 OWN_DIRS_PERMS+=       ${ZM_CACHE}/temp ${REAL_ROOT_USER} ${APACHE_GROUP} 775
 OWN_DIRS_PERMS+=       ${ZM_CACHE}/images ${REAL_ROOT_USER} ${APACHE_GROUP} 775
@@ -197,7 +197,7 @@ SUBST_CLASSES+=                     script-path
 SUBST_MESSAGE.script-path=     Adjusting paths in scripts.
 SUBST_STAGE.script-path=       pre-configure
 SUBST_FILES.script-path=       ${REPLACE_PERL} ${EXTRA_PERL}
-SUBST_SED.script-path= -e "s|^\\([\$$]ENV{PATH} *= *'\\).*';\$$|\\1${PREFIX}/bin:/bin:/usr/bin';|g"
+SUBST_SED.script-path=         -e "s|^\\([\$$]ENV{PATH} *= *'\\).*';\$$|\\1${PREFIX}/bin:/bin:/usr/bin';|g"
 
 SUBST_CLASSES+=                files
 SUBST_STAGE.files=     pre-configure



Home | Main Index | Thread Index | Old Index