pkgsrc-Changes archive

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

CVS commit: pkgsrc/mail



Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Nov  2 16:25:29 UTC 2019

Modified Files:
        pkgsrc/mail/GNUMail: Makefile
        pkgsrc/mail/Pantomime: Makefile
        pkgsrc/mail/alpine: Makefile
        pkgsrc/mail/amavisd-milter: Makefile options.mk
        pkgsrc/mail/bmf: Makefile
        pkgsrc/mail/claws-mail: Makefile.common
        pkgsrc/mail/claws-mail-archive: Makefile
        pkgsrc/mail/claws-mail-attachwarner: Makefile
        pkgsrc/mail/claws-mail-attremover: Makefile
        pkgsrc/mail/claws-mail-fetchinfo: Makefile
        pkgsrc/mail/claws-mail-mailmbox: Makefile
        pkgsrc/mail/claws-mail-managesieve: Makefile
        pkgsrc/mail/claws-mail-newmail: Makefile
        pkgsrc/mail/claws-mail-notification: Makefile
        pkgsrc/mail/claws-mail-rssyl: Makefile
        pkgsrc/mail/claws-mail-spamreport: Makefile
        pkgsrc/mail/claws-mail-tnef: Makefile
        pkgsrc/mail/claws-mail-vcalendar: Makefile
        pkgsrc/mail/cucipop: Makefile
        pkgsrc/mail/cyrus-imapd24: Makefile
        pkgsrc/mail/distribute: Makefile
        pkgsrc/mail/dk-milter: Makefile
        pkgsrc/mail/dkim-milter: Makefile
        pkgsrc/mail/dnsbl-milter: Makefile
        pkgsrc/mail/dovecot: Makefile options.mk
        pkgsrc/mail/drac: Makefile
        pkgsrc/mail/dspam: options.mk
        pkgsrc/mail/elm-me: Makefile
        pkgsrc/mail/exim: options.mk
        pkgsrc/mail/faces: Makefile
        pkgsrc/mail/fetchmail: options.mk
        pkgsrc/mail/fetchmailconf: Makefile
        pkgsrc/mail/fetchyahoo: Makefile
        pkgsrc/mail/fml: Makefile
        pkgsrc/mail/fml4: Makefile
        pkgsrc/mail/freepops: Makefile
        pkgsrc/mail/fromto: Makefile
        pkgsrc/mail/gnarwl: Makefile
        pkgsrc/mail/greylisting-spp: options.mk
        pkgsrc/mail/heirloom-mailx: Makefile
        pkgsrc/mail/imapproxy: Makefile
        pkgsrc/mail/ja-mh: Makefile
        pkgsrc/mail/jchkmail: Makefile
        pkgsrc/mail/libmilter: builtin.mk
        pkgsrc/mail/maildrop: Makefile
        pkgsrc/mail/mailhops: Makefile
        pkgsrc/mail/mailman: Makefile
        pkgsrc/mail/mailserv: Makefile
        pkgsrc/mail/mailsort: Makefile
        pkgsrc/mail/mailwrapper: Makefile
        pkgsrc/mail/mess822: Makefile
        pkgsrc/mail/mew: Makefile
        pkgsrc/mail/milter-greylist: Makefile
        pkgsrc/mail/milter-manager: Makefile
        pkgsrc/mail/mush: Makefile
        pkgsrc/mail/mutt: Makefile options.mk
        pkgsrc/mail/neomutt: options.mk
        pkgsrc/mail/newspipe: Makefile
        pkgsrc/mail/nullmailer: options.mk
        pkgsrc/mail/oe2mbx: Makefile
        pkgsrc/mail/opensmtpd: Makefile
        pkgsrc/mail/p5-Catalyst-View-Email: Makefile
        pkgsrc/mail/p5-Email-Address: Makefile
        pkgsrc/mail/p5-Email-Address-XS: Makefile
        pkgsrc/mail/p5-Email-Folder: Makefile
        pkgsrc/mail/p5-Email-FolderType: Makefile
        pkgsrc/mail/p5-Email-LocalDelivery: Makefile
        pkgsrc/mail/p5-Email-MessageID: Makefile
        pkgsrc/mail/p5-Mail-Alias: Makefile
        pkgsrc/mail/p5-Mail-SPF: Makefile
        pkgsrc/mail/p5-Mail-SRS: Makefile
        pkgsrc/mail/p5-Mail-Sender: Makefile
        pkgsrc/mail/p5-Mail-Sender-Easy: Makefile
        pkgsrc/mail/perdition: Makefile.common
        pkgsrc/mail/pine: Makefile
        pkgsrc/mail/pine-pgp-filters: Makefile
        pkgsrc/mail/poppassd: Makefile
        pkgsrc/mail/postfix: Makefile.common
        pkgsrc/mail/prayer: Makefile
        pkgsrc/mail/procmail: Makefile
        pkgsrc/mail/py-libgmail: Makefile
        pkgsrc/mail/qmail: Makefile options.mk
        pkgsrc/mail/qmail-conf: Makefile
        pkgsrc/mail/qpopper: options.mk
        pkgsrc/mail/queue-repair: Makefile
        pkgsrc/mail/quickml: options.mk
        pkgsrc/mail/re-alpine: Makefile options.mk
        pkgsrc/mail/ripmime: Makefile
        pkgsrc/mail/roundcube-plugin-enigma: Makefile
        pkgsrc/mail/rspamd: Makefile
        pkgsrc/mail/sma: Makefile
        pkgsrc/mail/spamassassin: Makefile options.mk
        pkgsrc/mail/ssmtp: Makefile
        pkgsrc/mail/sympa: Makefile
        pkgsrc/mail/thunderbird: Makefile
        pkgsrc/mail/thunderbird-enigmail: Makefile
        pkgsrc/mail/thunderbird-l10n: Makefile
        pkgsrc/mail/thunderbird52: Makefile
        pkgsrc/mail/thunderbird52-l10n: Makefile
        pkgsrc/mail/thunderbird60: Makefile
        pkgsrc/mail/thunderbird60-l10n: Makefile
        pkgsrc/mail/tmda: Makefile
        pkgsrc/mail/turba: options.mk
        pkgsrc/mail/up-imapproxy: Makefile
        pkgsrc/mail/wl-snapshot: Makefile
        pkgsrc/mail/xmailwatcher: Makefile

Log Message:
mail: align variable assignments

pkglint -Wall -F --only aligned -r

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/mail/GNUMail/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/mail/Pantomime/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/mail/alpine/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/amavisd-milter/Makefile \
    pkgsrc/mail/amavisd-milter/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/bmf/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/claws-mail/Makefile.common
cvs rdiff -u -r1.64 -r1.65 pkgsrc/mail/claws-mail-archive/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/mail/claws-mail-attachwarner/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/mail/claws-mail-attremover/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/mail/claws-mail-fetchinfo/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/mail/claws-mail-mailmbox/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/claws-mail-managesieve/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/mail/claws-mail-newmail/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/mail/claws-mail-notification/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/mail/claws-mail-rssyl/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/mail/claws-mail-spamreport/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/mail/claws-mail-tnef/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/mail/claws-mail-vcalendar/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/mail/cucipop/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/mail/cyrus-imapd24/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/mail/distribute/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/dk-milter/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mail/dkim-milter/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/dnsbl-milter/Makefile
cvs rdiff -u -r1.196 -r1.197 pkgsrc/mail/dovecot/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/dovecot/options.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/drac/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mail/dspam/options.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/mail/elm-me/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/exim/options.mk
cvs rdiff -u -r1.67 -r1.68 pkgsrc/mail/faces/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/fetchmail/options.mk
cvs rdiff -u -r1.101 -r1.102 pkgsrc/mail/fetchmailconf/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/fetchyahoo/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/fml/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/fml4/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/mail/freepops/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/fromto/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/gnarwl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/greylisting-spp/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/heirloom-mailx/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/imapproxy/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/ja-mh/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/jchkmail/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/libmilter/builtin.mk
cvs rdiff -u -r1.68 -r1.69 pkgsrc/mail/maildrop/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/mailhops/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/mail/mailman/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/mailserv/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/mailsort/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mail/mailwrapper/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mail/mess822/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/mail/mew/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/mail/milter-greylist/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/mail/milter-manager/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mail/mush/Makefile
cvs rdiff -u -r1.214 -r1.215 pkgsrc/mail/mutt/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mail/mutt/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/neomutt/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/newspipe/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/nullmailer/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/oe2mbx/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/opensmtpd/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/p5-Catalyst-View-Email/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/p5-Email-Address/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/p5-Email-Address-XS/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/p5-Email-Folder/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/p5-Email-FolderType/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/p5-Email-LocalDelivery/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/p5-Email-MessageID/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/p5-Mail-Alias/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/p5-Mail-SPF/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mail/p5-Mail-SRS/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/p5-Mail-Sender/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/p5-Mail-Sender-Easy/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/perdition/Makefile.common
cvs rdiff -u -r1.136 -r1.137 pkgsrc/mail/pine/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/pine-pgp-filters/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/poppassd/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mail/postfix/Makefile.common
cvs rdiff -u -r1.62 -r1.63 pkgsrc/mail/prayer/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/mail/procmail/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/py-libgmail/Makefile
cvs rdiff -u -r1.114 -r1.115 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/mail/qmail/options.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mail/qmail-conf/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/qpopper/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/queue-repair/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/mail/quickml/options.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/re-alpine/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/re-alpine/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/ripmime/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/roundcube-plugin-enigma/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/sma/Makefile
cvs rdiff -u -r1.135 -r1.136 pkgsrc/mail/spamassassin/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/spamassassin/options.mk
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mail/ssmtp/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/mail/sympa/Makefile
cvs rdiff -u -r1.233 -r1.234 pkgsrc/mail/thunderbird/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/thunderbird-enigmail/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/mail/thunderbird-l10n/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/thunderbird52/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/thunderbird52-l10n/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/thunderbird60/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/thunderbird60-l10n/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/mail/tmda/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/turba/options.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mail/up-imapproxy/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/wl-snapshot/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/xmailwatcher/Makefile

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

Modified files:

Index: pkgsrc/mail/GNUMail/Makefile
diff -u pkgsrc/mail/GNUMail/Makefile:1.51 pkgsrc/mail/GNUMail/Makefile:1.52
--- pkgsrc/mail/GNUMail/Makefile:1.51   Wed Apr  3 00:32:50 2019
+++ pkgsrc/mail/GNUMail/Makefile        Sat Nov  2 16:25:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/04/03 00:32:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/02 16:25:17 rillig Exp $
 
 DISTNAME=      GNUMail-1.2.0
 PKGREVISION=   16
@@ -15,7 +15,7 @@ USE_LANGUAGES=        objc
 NO_CONFIGURE=  yes
 MAKE_FILE=     GNUmakefile
 
-FIX_GNUSTEP_INSTALLATION_DIR= yes
+FIX_GNUSTEP_INSTALLATION_DIR=          yes
 .for dir in Account Advanced Clock Colors Compose Face Filtering       \
        Fonts Import MIME PGP Receiving Sending Viewing
 SUBST_FILES.gnustep_installation_dir+= Bundles/${dir}/GNUmakefile

Index: pkgsrc/mail/Pantomime/Makefile
diff -u pkgsrc/mail/Pantomime/Makefile:1.43 pkgsrc/mail/Pantomime/Makefile:1.44
--- pkgsrc/mail/Pantomime/Makefile:1.43 Wed Apr  3 00:32:50 2019
+++ pkgsrc/mail/Pantomime/Makefile      Sat Nov  2 16:25:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/04/03 00:32:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/02 16:25:17 rillig Exp $
 
 DISTNAME=      Pantomime-1.2.0
 PKGREVISION=   16
@@ -15,10 +15,10 @@ USE_LANGUAGES=      objc
 PRIVILEGED_STAGES+=    build
 PRIVILEGED_STAGES+=    clean
 
-NO_CONFIGURE=  yes
+NO_CONFIGURE=          yes
 #MAKE_JOBS_SAFE=       no
-MAKE_ENV+=     ADDITIONAL_CPPFLAGS=-DMKDIR
-MAKE_FILE=     GNUmakefile
+MAKE_ENV+=             ADDITIONAL_CPPFLAGS=-DMKDIR
+MAKE_FILE=             GNUmakefile
 
 .include "../../devel/gnustep-base/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/mail/alpine/Makefile
diff -u pkgsrc/mail/alpine/Makefile:1.42 pkgsrc/mail/alpine/Makefile:1.43
--- pkgsrc/mail/alpine/Makefile:1.42    Tue Jul 24 12:39:36 2018
+++ pkgsrc/mail/alpine/Makefile Sat Nov  2 16:25:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/07/24 12:39:36 bsiegert Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/02 16:25:17 rillig Exp $
 
 DISTNAME=      alpine-2.21
 CATEGORIES=    mail
@@ -10,26 +10,26 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Program for Internet News and E-mail
 LICENSE=       apache-2.0
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE}
-CONFIGURE_ARGS+= --with-ssl-certs-dir=${SSLCERTS:Q}
-CONFIGURE_ARGS+= --with-ssl-include-dir=${SSLBASE}/include
-CONFIGURE_ARGS+= --with-ssl-lib-dir=${SSLBASE}/lib
-CONFIGURE_ARGS+= --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf
-CONFIGURE_ARGS+= --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed
-CONFIGURE_ARGS+= --with-passfile=.pine-passfile
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-ssl-dir=${SSLBASE}
+CONFIGURE_ARGS+=       --with-ssl-certs-dir=${SSLCERTS:Q}
+CONFIGURE_ARGS+=       --with-ssl-include-dir=${SSLBASE}/include
+CONFIGURE_ARGS+=       --with-ssl-lib-dir=${SSLBASE}/lib
+CONFIGURE_ARGS+=       --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf
+CONFIGURE_ARGS+=       --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed
+CONFIGURE_ARGS+=       --with-passfile=.pine-passfile
 # disabled, for Web Alpine Support
 CONFIGURE_ARGS+=       --without-tcl
 
 USE_LIBTOOL=   yes
 
-MAKE_JOBS_SAFE=         no
+MAKE_JOBS_SAFE=                no
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M4.99.*) && empty(OS_VERSION:M[5-9]*)
-CONFIGURE_ARGS+= --without-pthread
+CONFIGURE_ARGS+=       --without-pthread
 .endif
 
 # mach/mach.h defines panic, differently.

Index: pkgsrc/mail/amavisd-milter/Makefile
diff -u pkgsrc/mail/amavisd-milter/Makefile:1.1 pkgsrc/mail/amavisd-milter/Makefile:1.2
--- pkgsrc/mail/amavisd-milter/Makefile:1.1     Wed Dec 21 12:05:51 2016
+++ pkgsrc/mail/amavisd-milter/Makefile Sat Nov  2 16:25:18 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2016/12/21 12:05:51 kivinen Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 16:25:18 rillig Exp $
 #
 
 DISTNAME=      amavisd-milter-1.6.1
 PKGREVISION=   1
 CATEGORIES=    mail
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=amavisd-milter/}
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=amavisd-milter/}
 
 MAINTAINER=    kivinen%iki.fi@localhost
 HOMEPAGE=      http://amavisd-milter.sourceforge.net/
@@ -13,11 +13,11 @@ LICENSE=    modified-bsd
 
 .include "options.mk"
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-milterinc=${BUILDLINK_PREFIX.libmilter}/include
 CONFIGURE_ARGS+=       --with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib
 
-RCD_SCRIPTS=    amavisd-milter
+RCD_SCRIPTS=   amavisd-milter
 
 .include "../../mail/libmilter/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/amavisd-milter/options.mk
diff -u pkgsrc/mail/amavisd-milter/options.mk:1.1 pkgsrc/mail/amavisd-milter/options.mk:1.2
--- pkgsrc/mail/amavisd-milter/options.mk:1.1   Wed Dec 21 12:05:51 2016
+++ pkgsrc/mail/amavisd-milter/options.mk       Sat Nov  2 16:25:18 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2016/12/21 12:05:51 kivinen Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 16:25:18 rillig Exp $
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.amavisd-milter
-PKG_SUPPORTED_OPTIONS=  # empty
-PKG_SUGGESTED_OPTIONS=  # empty
+PKG_OPTIONS_VAR=       PKG_OPTIONS.amavisd-milter
+PKG_SUPPORTED_OPTIONS= # empty
+PKG_SUGGESTED_OPTIONS= # empty
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/mail/bmf/Makefile
diff -u pkgsrc/mail/bmf/Makefile:1.12 pkgsrc/mail/bmf/Makefile:1.13
--- pkgsrc/mail/bmf/Makefile:1.12       Tue Aug  1 14:59:01 2017
+++ pkgsrc/mail/bmf/Makefile    Sat Nov  2 16:25:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/08/01 14:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 16:25:18 rillig Exp $
 #
 
 DISTNAME=      bmf-0.9.4
@@ -12,6 +12,6 @@ COMMENT=      Self contained and extremely ef
 HAS_CONFIGURE= YES
 
 CONFIGURE_ARGS+=       --without-mysql
-MAKE_ENV+=     BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/${PKGMANDIR}
+MAKE_ENV+=             BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/${PKGMANDIR}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/claws-mail/Makefile.common
diff -u pkgsrc/mail/claws-mail/Makefile.common:1.19 pkgsrc/mail/claws-mail/Makefile.common:1.20
--- pkgsrc/mail/claws-mail/Makefile.common:1.19 Sun Jun  9 22:09:18 2019
+++ pkgsrc/mail/claws-mail/Makefile.common      Sat Nov  2 16:25:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2019/06/09 22:09:18 nia Exp $
+# $NetBSD: Makefile.common,v 1.20 2019/11/02 16:25:18 rillig Exp $
 
 # used by mail/claws-mail/plugins.mk
 
@@ -24,7 +24,7 @@ GNU_CONFIGURE=                YES
 # Force gnome detection off to avoid installing some extra files
 CONFIGURE_ENV+=                ac_cv_path_GNOME_CONFIG="no"
 
-CONFIGURE_ARGS+=        --enable-enchant
+CONFIGURE_ARGS+=       --enable-enchant
 CONFIGURE_ARGS+=       --enable-nls
 CONFIGURE_ARGS+=       --enable-compface
 CONFIGURE_ARGS+=       --disable-manual

Index: pkgsrc/mail/claws-mail-archive/Makefile
diff -u pkgsrc/mail/claws-mail-archive/Makefile:1.64 pkgsrc/mail/claws-mail-archive/Makefile:1.65
--- pkgsrc/mail/claws-mail-archive/Makefile:1.64        Thu Aug 22 12:23:25 2019
+++ pkgsrc/mail/claws-mail-archive/Makefile     Sat Nov  2 16:25:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2019/08/22 12:23:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.65 2019/11/02 16:25:18 rillig Exp $
 #
 
 PLUGIN_NAME=    archive
@@ -8,7 +8,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Adds archiving to Claws-Mail
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-attachwarner/Makefile
diff -u pkgsrc/mail/claws-mail-attachwarner/Makefile:1.67 pkgsrc/mail/claws-mail-attachwarner/Makefile:1.68
--- pkgsrc/mail/claws-mail-attachwarner/Makefile:1.67   Thu Aug 22 12:23:26 2019
+++ pkgsrc/mail/claws-mail-attachwarner/Makefile        Sat Nov  2 16:25:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2019/08/22 12:23:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2019/11/02 16:25:18 rillig Exp $
 #
 
 PLUGIN_NAME=    attachwarner
@@ -8,7 +8,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Warns if a message mentions an attachment without attaching files
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-attremover/Makefile
diff -u pkgsrc/mail/claws-mail-attremover/Makefile:1.66 pkgsrc/mail/claws-mail-attremover/Makefile:1.67
--- pkgsrc/mail/claws-mail-attremover/Makefile:1.66     Thu Aug 22 12:23:26 2019
+++ pkgsrc/mail/claws-mail-attremover/Makefile  Sat Nov  2 16:25:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2019/08/22 12:23:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2019/11/02 16:25:18 rillig Exp $
 #
 
 PLUGIN_NAME=    att_remover
@@ -8,7 +8,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Permanently deletes attachments from mail
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-fetchinfo/Makefile
diff -u pkgsrc/mail/claws-mail-fetchinfo/Makefile:1.67 pkgsrc/mail/claws-mail-fetchinfo/Makefile:1.68
--- pkgsrc/mail/claws-mail-fetchinfo/Makefile:1.67      Thu Aug 22 12:23:26 2019
+++ pkgsrc/mail/claws-mail-fetchinfo/Makefile   Sat Nov  2 16:25:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2019/08/22 12:23:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2019/11/02 16:25:18 rillig Exp $
 #
 
 PLUGIN_NAME=    fetchinfo
@@ -8,7 +8,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Inserts headers containing some download information
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-mailmbox/Makefile
diff -u pkgsrc/mail/claws-mail-mailmbox/Makefile:1.66 pkgsrc/mail/claws-mail-mailmbox/Makefile:1.67
--- pkgsrc/mail/claws-mail-mailmbox/Makefile:1.66       Thu Aug 22 12:23:26 2019
+++ pkgsrc/mail/claws-mail-mailmbox/Makefile    Sat Nov  2 16:25:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2019/08/22 12:23:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2019/11/02 16:25:18 rillig Exp $
 #
 
 PLUGIN_NAME=    mailmbox
@@ -8,7 +8,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Handles mailboxes in mbox format
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-managesieve/Makefile
diff -u pkgsrc/mail/claws-mail-managesieve/Makefile:1.27 pkgsrc/mail/claws-mail-managesieve/Makefile:1.28
--- pkgsrc/mail/claws-mail-managesieve/Makefile:1.27    Thu Aug 22 12:23:26 2019
+++ pkgsrc/mail/claws-mail-managesieve/Makefile Sat Nov  2 16:25:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/08/22 12:23:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/02 16:25:18 rillig Exp $
 #
 
 PLUGIN_NAME=    managesieve
@@ -8,7 +8,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Manage Sieve filters on servers that support the ManageSieve protocol
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-newmail/Makefile
diff -u pkgsrc/mail/claws-mail-newmail/Makefile:1.68 pkgsrc/mail/claws-mail-newmail/Makefile:1.69
--- pkgsrc/mail/claws-mail-newmail/Makefile:1.68        Thu Aug 22 12:23:26 2019
+++ pkgsrc/mail/claws-mail-newmail/Makefile     Sat Nov  2 16:25:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2019/08/22 12:23:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.69 2019/11/02 16:25:19 rillig Exp $
 #
 
 PLUGIN_NAME=    newmail
@@ -8,7 +8,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Write log file info on arriving email
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-notification/Makefile
diff -u pkgsrc/mail/claws-mail-notification/Makefile:1.69 pkgsrc/mail/claws-mail-notification/Makefile:1.70
--- pkgsrc/mail/claws-mail-notification/Makefile:1.69   Thu Aug 22 12:23:26 2019
+++ pkgsrc/mail/claws-mail-notification/Makefile        Sat Nov  2 16:25:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2019/08/22 12:23:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2019/11/02 16:25:19 rillig Exp $
 #
 
 PLUGIN_NAME=    notification
@@ -8,7 +8,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Provides various ways to notify the user of new and unread email
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-rssyl/Makefile
diff -u pkgsrc/mail/claws-mail-rssyl/Makefile:1.74 pkgsrc/mail/claws-mail-rssyl/Makefile:1.75
--- pkgsrc/mail/claws-mail-rssyl/Makefile:1.74  Thu Aug 22 12:23:27 2019
+++ pkgsrc/mail/claws-mail-rssyl/Makefile       Sat Nov  2 16:25:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2019/08/22 12:23:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2019/11/02 16:25:19 rillig Exp $
 #
 
 PLUGIN_NAME=    rssyl
@@ -8,7 +8,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Read RSS 1.0, 2.0 and Atom feeds in Claws-Mail
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-spamreport/Makefile
diff -u pkgsrc/mail/claws-mail-spamreport/Makefile:1.72 pkgsrc/mail/claws-mail-spamreport/Makefile:1.73
--- pkgsrc/mail/claws-mail-spamreport/Makefile:1.72     Thu Aug 22 12:23:27 2019
+++ pkgsrc/mail/claws-mail-spamreport/Makefile  Sat Nov  2 16:25:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2019/08/22 12:23:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.73 2019/11/02 16:25:19 rillig Exp $
 #
 
 PLUGIN_NAME=           spam_report
@@ -9,7 +9,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Report spam to various places
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-tnef/Makefile
diff -u pkgsrc/mail/claws-mail-tnef/Makefile:1.68 pkgsrc/mail/claws-mail-tnef/Makefile:1.69
--- pkgsrc/mail/claws-mail-tnef/Makefile:1.68   Thu Aug 22 12:23:27 2019
+++ pkgsrc/mail/claws-mail-tnef/Makefile        Sat Nov  2 16:25:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2019/08/22 12:23:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.69 2019/11/02 16:25:19 rillig Exp $
 #
 
 PLUGIN_NAME=    tnef_parse
@@ -8,7 +8,7 @@ PKGREVISION= 8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Handles TNEF attachments from Outlook
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/claws-mail-vcalendar/Makefile
diff -u pkgsrc/mail/claws-mail-vcalendar/Makefile:1.81 pkgsrc/mail/claws-mail-vcalendar/Makefile:1.82
--- pkgsrc/mail/claws-mail-vcalendar/Makefile:1.81      Thu Aug 22 12:23:27 2019
+++ pkgsrc/mail/claws-mail-vcalendar/Makefile   Sat Nov  2 16:25:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2019/08/22 12:23:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.82 2019/11/02 16:25:19 rillig Exp $
 #
 
 PLUGIN_NAME=    vcalendar
@@ -10,7 +10,7 @@ COMMENT=      Enable vCalendar message handli
 
 USE_TOOLS+=    perl
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=       --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=      claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 

Index: pkgsrc/mail/cucipop/Makefile
diff -u pkgsrc/mail/cucipop/Makefile:1.36 pkgsrc/mail/cucipop/Makefile:1.37
--- pkgsrc/mail/cucipop/Makefile:1.36   Mon Oct  8 12:19:07 2012
+++ pkgsrc/mail/cucipop/Makefile        Sat Nov  2 16:25:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2012/10/08 12:19:07 asau Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/02 16:25:19 rillig Exp $
 #
 
 DISTNAME=      cucipop-1.31
@@ -6,8 +6,8 @@ PKGREVISION=    3
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
 
-PATCH_SITES=   ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=    cucipop-1.31-v6-20010223.diff.gz
+PATCH_SITES=           ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES=            cucipop-1.31-v6-20010223.diff.gz
 PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/mail/cyrus-imapd24/Makefile
diff -u pkgsrc/mail/cyrus-imapd24/Makefile:1.61 pkgsrc/mail/cyrus-imapd24/Makefile:1.62
--- pkgsrc/mail/cyrus-imapd24/Makefile:1.61     Sun Aug 11 13:21:26 2019
+++ pkgsrc/mail/cyrus-imapd24/Makefile  Sat Nov  2 16:25:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2019/08/11 13:21:26 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2019/11/02 16:25:19 rillig Exp $
 
 DISTNAME=      cyrus-imapd-2.4.20
 PKGREVISION=   7
@@ -12,7 +12,7 @@ HOMEPAGE=     https://www.cyrusimap.org/
 COMMENT=       Cyrus IMAP server
 #LICENSE=      original-bsd # like license
 
-MAKE_JOBS_SAFE=no
+MAKE_JOBS_SAFE=        no
 
 USE_TOOLS+=            perl:run makedepend
 USE_PKGLOCALEDIR=      yes

Index: pkgsrc/mail/distribute/Makefile
diff -u pkgsrc/mail/distribute/Makefile:1.34 pkgsrc/mail/distribute/Makefile:1.35
--- pkgsrc/mail/distribute/Makefile:1.34        Sun Aug 11 13:21:26 2019
+++ pkgsrc/mail/distribute/Makefile     Sat Nov  2 16:25:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/08/11 13:21:26 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/02 16:25:19 rillig Exp $
 
 DISTNAME=      distribute-2.1-pl19
 PKGNAME=       distribute-2.1.26
@@ -22,8 +22,8 @@ INSTALLATION_DIRS=    libexec ${PKGMANDIR}/
 WRKSRC=                ${WRKDIR}/distribute-pl19
 USE_TOOLS+=    perl:run
 
-MAN1=          distribute.1
-DIST_SUBDIR=   distribute
+MAN1=                  distribute.1
+DIST_SUBDIR=           distribute
 PATCH_DIST_STRIP=      -p1
 
 # customize below if you would like to

Index: pkgsrc/mail/dk-milter/Makefile
diff -u pkgsrc/mail/dk-milter/Makefile:1.30 pkgsrc/mail/dk-milter/Makefile:1.31
--- pkgsrc/mail/dk-milter/Makefile:1.30 Wed Jul  4 13:40:23 2018
+++ pkgsrc/mail/dk-milter/Makefile      Sat Nov  2 16:25:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/02 16:25:20 rillig Exp $
 
 DISTNAME=      dk-milter-1.0.2
 PKGREVISION=   1
@@ -26,7 +26,7 @@ SUBST_SED.libs+=      -e 's|@LMBASE@|${BUILDL
 SUBST_SED.libs+=       -e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g'
 SUBST_SED.libs+=       -e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}|g'
 .if ${OPSYS} == SunOS
-SUBST_SED.libs+=        -e 's|-lrt|-lrt -lresolv|g'
+SUBST_SED.libs+=       -e 's|-lrt|-lrt -lresolv|g'
 .endif
 SUBST_MESSAGE.libs=    Fixing makefile references.
 

Index: pkgsrc/mail/dkim-milter/Makefile
diff -u pkgsrc/mail/dkim-milter/Makefile:1.33 pkgsrc/mail/dkim-milter/Makefile:1.34
--- pkgsrc/mail/dkim-milter/Makefile:1.33       Thu May 23 19:23:05 2019
+++ pkgsrc/mail/dkim-milter/Makefile    Sat Nov  2 16:25:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/05/23 19:23:05 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/02 16:25:20 rillig Exp $
 
 DISTNAME=      dkim-milter-2.8.3
 PKGREVISION=   5
@@ -8,7 +8,7 @@ MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:
 MAINTAINER=    imil%gcu.info@localhost
 HOMEPAGE=      https://sourceforge.net/projects/dkim-milter/
 COMMENT=       Open source DKIM filter software from Sendmail, Inc
-LICENSE=               sendmail-open-source-license
+LICENSE=       sendmail-open-source-license
 
 PKG_DESTDIR_SUPPORT=   destdir
 

Index: pkgsrc/mail/dnsbl-milter/Makefile
diff -u pkgsrc/mail/dnsbl-milter/Makefile:1.6 pkgsrc/mail/dnsbl-milter/Makefile:1.7
--- pkgsrc/mail/dnsbl-milter/Makefile:1.6       Mon Jun 24 10:59:41 2019
+++ pkgsrc/mail/dnsbl-milter/Makefile   Sat Nov  2 16:25:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/06/24 10:59:41 nia Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 16:25:20 rillig Exp $
 #
 
 VERSION=       6.45
@@ -12,7 +12,7 @@ HOMEPAGE=     https://www.five-ten-sg.com/dn
 COMMENT=       DNSBL Sendmail milter
 LICENSE=       gnu-gpl-v3
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 PKG_SYSCONFSUBDIR?=    dnsbl-milter
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}/${PKG_SYSCONFSUBDIR}
 CONFIGURE_ARGS+=       ac_cv_path_BASH=${SH}
@@ -33,11 +33,11 @@ EGDIR=              share/examples/dnsbl-milter
 
 CONFS=         dnsbl.conf hosts-ignore.conf tld.conf html-tags.conf
 .for f in ${CONFS}
-CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+CONF_FILES+=   ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 INSTALLATION_DIRS=     ${EGDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
-INSTALL_DIRS=  src man
+INSTALL_DIRS=          src man
 
 post-install:
        cd ${WRKSRC} && ${INSTALL_DATA} ${CONFS} ${DESTDIR}${PREFIX}/${EGDIR}

Index: pkgsrc/mail/dovecot/Makefile
diff -u pkgsrc/mail/dovecot/Makefile:1.196 pkgsrc/mail/dovecot/Makefile:1.197
--- pkgsrc/mail/dovecot/Makefile:1.196  Sat Jul 20 22:46:30 2019
+++ pkgsrc/mail/dovecot/Makefile        Sat Nov  2 16:25:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.196 2019/07/20 22:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.197 2019/11/02 16:25:20 rillig Exp $
 
 DOVECOT_VERSION=       1.2
 DOVECOT_SUBVERSION=    .17
@@ -11,7 +11,7 @@ MASTER_SITES=         http://www.dovecot.org/re
 DOVECOT_SIEVE_SITES=   http://pigeonhole.dovecot.org/releases/${DOVECOT_VERSION}/
 
 MANAGESIEVE_PATCH=                     dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}-managesieve-${MANAGESIEVE_VERSION}.diff.gz
-SITES.${MANAGESIEVE_PATCH}=    ${DOVECOT_SIEVE_SITES}
+SITES.${MANAGESIEVE_PATCH}=            ${DOVECOT_SIEVE_SITES}
 PATCH_DIST_STRIP.${MANAGESIEVE_PATCH}= -p1
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/mail/dovecot/options.mk
diff -u pkgsrc/mail/dovecot/options.mk:1.29 pkgsrc/mail/dovecot/options.mk:1.30
--- pkgsrc/mail/dovecot/options.mk:1.29 Tue Jun 14 09:37:18 2011
+++ pkgsrc/mail/dovecot/options.mk      Sat Nov  2 16:25:20 2019
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.29 2011/06/14 09:37:18 tron Exp $
+# $NetBSD: options.mk,v 1.30 2019/11/02 16:25:20 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.dovecot
-PKG_SUPPORTED_OPTIONS= dovecot-sieve dovecot-managesieve gssapi
-PKG_SUPPORTED_OPTIONS+=        kqueue ldap mysql pam pgsql sqlite
-PKG_OPTIONS_OPTIONAL_GROUPS= ssl
-PKG_OPTIONS_GROUP.ssl= gnutls ssl
-PKG_SUGGESTED_OPTIONS= pam ssl
+PKG_OPTIONS_VAR=               PKG_OPTIONS.dovecot
+PKG_SUPPORTED_OPTIONS=         dovecot-sieve dovecot-managesieve gssapi
+PKG_SUPPORTED_OPTIONS+=                kqueue ldap mysql pam pgsql sqlite
+PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
+PKG_OPTIONS_GROUP.ssl=         gnutls ssl
+PKG_SUGGESTED_OPTIONS=         pam ssl
 
 .if defined(PKG_HAVE_KQUEUE)
 PKG_SUGGESTED_OPTIONS+=        kqueue

Index: pkgsrc/mail/drac/Makefile
diff -u pkgsrc/mail/drac/Makefile:1.23 pkgsrc/mail/drac/Makefile:1.24
--- pkgsrc/mail/drac/Makefile:1.23      Tue Aug  1 17:40:13 2017
+++ pkgsrc/mail/drac/Makefile   Sat Nov  2 16:25:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/08/01 17:40:13 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/02 16:25:20 rillig Exp $
 
 DISTNAME=      drac
 PKGNAME=       drac-1.12
@@ -38,16 +38,16 @@ RPCGENFLAGS=        # empty
 .endif
 MAKE_FLAGS+=   RPCGENFLAGS=${RPCGENFLAGS:Q}
 
-CFLAGS.SunOS=  -DTI_RPC -DFCNTL_LOCK -DSYSINFO
-CFLAGS.BSDOS=  -DSOCK_RPC -DFCNTL_LOCK -DGETHOST
-CFLAGS.IRIX=   -DSOCK_RPC -DFCNTL_LOCK -DGETHOST
-CFLAGS.NetBSD= -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C
-CFLAGS.FreeBSD=        -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C
-CFLAGS.OpenBSD=        -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C
+CFLAGS.SunOS=          -DTI_RPC -DFCNTL_LOCK -DSYSINFO
+CFLAGS.BSDOS=          -DSOCK_RPC -DFCNTL_LOCK -DGETHOST
+CFLAGS.IRIX=           -DSOCK_RPC -DFCNTL_LOCK -DGETHOST
+CFLAGS.NetBSD=         -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C
+CFLAGS.FreeBSD=                -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C
+CFLAGS.OpenBSD=                -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C
 CFLAGS.Dragonfly=      -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C
-CFLAGS.Linux=  -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C
-CFLAGS.AIX=    -DD_BSD -DBSD_INCLUDES -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDEBUG
-LIBS.SunOS=    -lnsl
+CFLAGS.Linux=          -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C
+CFLAGS.AIX=            -DD_BSD -DBSD_INCLUDES -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDEBUG
+LIBS.SunOS=            -lnsl
 
 INSTALL_TARGET=        install install-man
 

Index: pkgsrc/mail/dspam/options.mk
diff -u pkgsrc/mail/dspam/options.mk:1.26 pkgsrc/mail/dspam/options.mk:1.27
--- pkgsrc/mail/dspam/options.mk:1.26   Fri Dec 31 06:13:46 2010
+++ pkgsrc/mail/dspam/options.mk        Sat Nov  2 16:25:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.26 2010/12/31 06:13:46 taca Exp $
+# $NetBSD: options.mk,v 1.27 2019/11/02 16:25:20 rillig Exp $
 
 .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
 DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS}
@@ -22,20 +22,20 @@ PKG_OPTIONS_LEGACY_OPTS+=   preferences-ex
 ### Default: procmail
 ###
 DSPAM_DELIVERY_AGENT?=         procmail
-BUILD_DEFS+=           DSPAM_DELIVERY_AGENT
+BUILD_DEFS+=                   DSPAM_DELIVERY_AGENT
 .if !empty(DSPAM_DELIVERY_AGENT:Mprocmail)
 DSPAM_DELIVERY_AGENT_BIN?=     ${PREFIX}/bin/procmail
-BUILD_DEPENDS+=                procmail-[0-9]*:../../mail/procmail
-CONFIGURE_ARGS+=       --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
+BUILD_DEPENDS+=                        procmail-[0-9]*:../../mail/procmail
+CONFIGURE_ARGS+=               --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
 .elif !empty(DSPAM_DELIVERY_AGENT:Mmaildrop)
 DSPAM_DELIVERY_AGENT_BIN?=     ${PREFIX}/bin/maildrop
-BUILD_DEPENDS+=                maildrop-[0-9]*:../../mail/maildrop
-CONFIGURE_ARGS+=       --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
+BUILD_DEPENDS+=                        maildrop-[0-9]*:../../mail/maildrop
+CONFIGURE_ARGS+=               --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
 .elif !empty(DSPAM_DELIVERY_AGENT)
 DSPAM_DELIVERY_AGENT_BIN?=     ${DSPAM_DELIVERY_AGENT}
-CONFIGURE_ARGS+=       --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
+CONFIGURE_ARGS+=               --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
 .else
-PKG_FAIL_REASON+=      "${PKGBASE}: unknown delivery agent \`${DSPAM_DELIVERY_AGENT}'"
+PKG_FAIL_REASON+=              "${PKGBASE}: unknown delivery agent \`${DSPAM_DELIVERY_AGENT}'"
 .endif
 
 PLIST_VARS+=           hash mysql pgsql sqlite

Index: pkgsrc/mail/elm-me/Makefile
diff -u pkgsrc/mail/elm-me/Makefile:1.36 pkgsrc/mail/elm-me/Makefile:1.37
--- pkgsrc/mail/elm-me/Makefile:1.36    Wed Jul  4 13:40:23 2018
+++ pkgsrc/mail/elm-me/Makefile Sat Nov  2 16:25:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/02 16:25:20 rillig Exp $
 
 DISTNAME=              elm-2.4ME+93
 PKGNAME=               elm-me-2.4.93
@@ -37,7 +37,7 @@ SUBST_SED.errno=      -e 's,^extern int errno
 
 # currently not set in files/config.sh
 # (should probably be a package option)
-#SPECIAL_PERMS+=       bin/elm ${ROOT_USER} mail 2755
+#SPECIAL_PERMS+=       bin/elm ${ROOT_USER} mail 2755
 
 pre-configure:
        ${CP} ${FILESDIR}/config.sh ${WRKSRC}/

Index: pkgsrc/mail/exim/options.mk
diff -u pkgsrc/mail/exim/options.mk:1.23 pkgsrc/mail/exim/options.mk:1.24
--- pkgsrc/mail/exim/options.mk:1.23    Fri Jun  7 12:20:32 2019
+++ pkgsrc/mail/exim/options.mk Sat Nov  2 16:25:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2019/06/07 12:20:32 tm Exp $
+# $NetBSD: options.mk,v 1.24 2019/11/02 16:25:20 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.exim
 PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
@@ -18,19 +18,19 @@ PKG_SUGGESTED_OPTIONS+=     exim-tls inet6
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mexim-appendfile-maildir)
-LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILDIR=yes
+LOCAL_MAKEFILE_OPTIONS+=       SUPPORT_MAILDIR=yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-appendfile-mailstore)
-LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILSTORE=yes
+LOCAL_MAKEFILE_OPTIONS+=       SUPPORT_MAILSTORE=yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-auth-dovecot)
-LOCAL_MAKEFILE_OPTIONS+=AUTH_DOVECOT=yes
+LOCAL_MAKEFILE_OPTIONS+=       AUTH_DOVECOT=yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-appendfile-mbx)
-LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MBX=yes
+LOCAL_MAKEFILE_OPTIONS+=       SUPPORT_MBX=yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-build-eximon)
@@ -41,20 +41,20 @@ PLIST_SRC+=${PKGDIR}/PLIST.eximon
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-content-scan)
-LOCAL_MAKEFILE_OPTIONS+=WITH_CONTENT_SCAN=YES
+LOCAL_MAKEFILE_OPTIONS+=       WITH_CONTENT_SCAN=YES
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-lookup-cdb)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_CDB=YES
-DEPENDS+=cdb-[0-9]*:../../databases/cdb
+LOCAL_MAKEFILE_OPTIONS+= LOOKUP_CDB=YES
+DEPENDS+=      cdb-[0-9]*:../../databases/cdb
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-lookup-dnsdb)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DNSDB=YES
+LOCAL_MAKEFILE_OPTIONS+=       LOOKUP_DNSDB=YES
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-lookup-dsearch)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DSEARCH=YES
+LOCAL_MAKEFILE_OPTIONS+=       LOOKUP_DSEARCH=YES
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-lookup-ldap)
@@ -95,11 +95,11 @@ LOOKUP_LIBS+=-lwhoson
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-old-demime)
-LOCAL_MAKEFILE_OPTIONS+=WITH_OLD_DEMIME=YES
+LOCAL_MAKEFILE_OPTIONS+=       WITH_OLD_DEMIME=YES
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-router-iplookup)
-LOCAL_MAKEFILE_OPTIONS+=ROUTER_IPLOOKUP=yes
+LOCAL_MAKEFILE_OPTIONS+=       ROUTER_IPLOOKUP=yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-tcp-wrappers)
@@ -115,13 +115,13 @@ LOOKUP_LIBS+=-lssl -lcrypto
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-transport-lmtp)
-LOCAL_MAKEFILE_OPTIONS+=TRANSPORT_LMTP=yes
+LOCAL_MAKEFILE_OPTIONS+=       TRANSPORT_LMTP=yes
 .endif
 
 .if !empty(PKG_OPTIONS:Minet6)
-LOCAL_MAKEFILE_OPTIONS+=HAVE_IPV6=YES
+LOCAL_MAKEFILE_OPTIONS+=       HAVE_IPV6=YES
 .else
-LOCAL_MAKEFILE_OPTIONS+=HAVE_IPV6=NO
+LOCAL_MAKEFILE_OPTIONS+=       HAVE_IPV6=NO
 .endif
 
 .if !empty(PKG_OPTIONS:Mopendmarc)

Index: pkgsrc/mail/faces/Makefile
diff -u pkgsrc/mail/faces/Makefile:1.67 pkgsrc/mail/faces/Makefile:1.68
--- pkgsrc/mail/faces/Makefile:1.67     Sun Aug 11 13:21:27 2019
+++ pkgsrc/mail/faces/Makefile  Sat Nov  2 16:25:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2019/08/11 13:21:27 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2019/11/02 16:25:20 rillig Exp $
 
 DISTNAME=      faces-1.6.1
 PKGREVISION=   12
@@ -10,7 +10,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Visual mail, user and print face server
 LICENSE=       faces-license
 
-RESTRICTED=    Distribution not allowed if money exchanged
+RESTRICTED=            Distribution not allowed if money exchanged
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 

Index: pkgsrc/mail/fetchmail/options.mk
diff -u pkgsrc/mail/fetchmail/options.mk:1.18 pkgsrc/mail/fetchmail/options.mk:1.19
--- pkgsrc/mail/fetchmail/options.mk:1.18       Wed Sep 30 08:25:37 2015
+++ pkgsrc/mail/fetchmail/options.mk    Sat Nov  2 16:25:21 2019
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.18 2015/09/30 08:25:37 tnn Exp $
+# $NetBSD: options.mk,v 1.19 2019/11/02 16:25:21 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.fetchmail
-PKG_SUPPORTED_OPTIONS= kerberos4 kerberos gssapi ssl
+PKG_OPTIONS_VAR=               PKG_OPTIONS.fetchmail
+PKG_SUPPORTED_OPTIONS=         kerberos4 kerberos gssapi ssl
 PKG_OPTIONS_OPTIONAL_GROUPS=   socks
 PKG_OPTIONS_GROUP.socks=       socks4 dante
 
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS= ssl
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/mail/fetchmailconf/Makefile
diff -u pkgsrc/mail/fetchmailconf/Makefile:1.101 pkgsrc/mail/fetchmailconf/Makefile:1.102
--- pkgsrc/mail/fetchmailconf/Makefile:1.101    Mon Sep  2 13:19:56 2019
+++ pkgsrc/mail/fetchmailconf/Makefile  Sat Nov  2 16:25:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2019/09/02 13:19:56 adam Exp $
+# $NetBSD: Makefile,v 1.102 2019/11/02 16:25:21 rillig Exp $
 
 DISTNAME=      fetchmail-6.3.26
 PKGNAME=       ${DISTNAME:S/fetchmail/fetchmailconf/}
@@ -29,7 +29,7 @@ USE_LANGUAGES+=               c
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 INSTALL_TARGET=                install-pythonPYTHON
 
-PLIST_SUBST+=          PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=  PYSITELIB=${PYSITELIB}
 REPLACE_PYTHON=        fetchmailconf.py
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 6.3.22
 

Index: pkgsrc/mail/fetchyahoo/Makefile
diff -u pkgsrc/mail/fetchyahoo/Makefile:1.15 pkgsrc/mail/fetchyahoo/Makefile:1.16
--- pkgsrc/mail/fetchyahoo/Makefile:1.15        Sun Aug 11 13:21:27 2019
+++ pkgsrc/mail/fetchyahoo/Makefile     Sat Nov  2 16:25:21 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:21:27 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:21 rillig Exp $
 #
 
 DISTNAME=              fetchyahoo-2.11.0
 PKGREVISION=           8
 CATEGORIES=            mail
 MASTER_SITES=          http://fetchyahoo.sourceforge.net/
-#MASTER_SITES=         ${MASTER_SITE_SOURCEFORGE:=fetchyahoo/}
+#MASTER_SITES=         ${MASTER_SITE_SOURCEFORGE:=fetchyahoo/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://fetchyahoo.sourceforge.net/

Index: pkgsrc/mail/fml/Makefile
diff -u pkgsrc/mail/fml/Makefile:1.18 pkgsrc/mail/fml/Makefile:1.19
--- pkgsrc/mail/fml/Makefile:1.18       Sun Aug 11 13:21:27 2019
+++ pkgsrc/mail/fml/Makefile    Sat Nov  2 16:25:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:21:27 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 16:25:21 rillig Exp $
 #
 
 DISTNAME=      fml-7.99.1
@@ -59,7 +59,7 @@ PRINT_PLIST_AWK+=     /share\/examples\/fml/
                        /${FML_STAMP}/ \
                        { gsub(/${FML_STAMP}/, "$${FML_STAMP}"); }
 
-CHECK_INTERPRETER_SKIP+= lib/fml/${FML_STAMP}/* \
+CHECK_INTERPRETER_SKIP+=       lib/fml/${FML_STAMP}/* \
                        libexec/fml/${FML_STAMP}/loader.in
 
 SUBST_CLASSES+=                fixpaths

Index: pkgsrc/mail/fml4/Makefile
diff -u pkgsrc/mail/fml4/Makefile:1.21 pkgsrc/mail/fml4/Makefile:1.22
--- pkgsrc/mail/fml4/Makefile:1.21      Sun Aug 11 13:21:28 2019
+++ pkgsrc/mail/fml4/Makefile   Sat Nov  2 16:25:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:21:28 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/02 16:25:21 rillig Exp $
 #
 
 DISTNAME=      fml-4.0-stable-20040215
@@ -23,11 +23,11 @@ BUILD_DEFS= FML_DATADIR
 
 .include "../../mk/bsd.prefs.mk"
 
-FML_DATADIR?=  ${VARBASE}/fml
-FML_USER?=     fml
-FML_GROUP?=    fml
-PKG_GROUPS=    ${FML_GROUP}
-PKG_USERS=     ${FML_USER}:${FML_GROUP}
+FML_DATADIR?=          ${VARBASE}/fml
+FML_USER?=             fml
+FML_GROUP?=            fml
+PKG_GROUPS=            ${FML_GROUP}
+PKG_USERS=             ${FML_USER}:${FML_GROUP}
 PKG_SHELL.${FML_USER}= /bin/csh
 
 REPLACE_PERL=  databases/examples/ldap-toymodel/dump.pl \

Index: pkgsrc/mail/freepops/Makefile
diff -u pkgsrc/mail/freepops/Makefile:1.42 pkgsrc/mail/freepops/Makefile:1.43
--- pkgsrc/mail/freepops/Makefile:1.42  Thu Aug 22 12:23:28 2019
+++ pkgsrc/mail/freepops/Makefile       Sat Nov  2 16:25:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/08/22 12:23:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/02 16:25:21 rillig Exp $
 #
 
 DISTNAME=      freepops-0.2.9
@@ -11,7 +11,7 @@ HOMEPAGE=     http://www.freepops.org/
 COMMENT=       POP3 gateway to AOL, Gmail, Hotmail, Juno, Yahoo, etc
 LICENSE=       gnu-gpl-v2
 
-MAKE_JOBS_SAFE=        no
+MAKE_JOBS_SAFE=                no
 LUA_VERSIONS_ACCEPTED= 51
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/mail/fromto/Makefile
diff -u pkgsrc/mail/fromto/Makefile:1.22 pkgsrc/mail/fromto/Makefile:1.23
--- pkgsrc/mail/fromto/Makefile:1.22    Sun Aug 11 13:21:28 2019
+++ pkgsrc/mail/fromto/Makefile Sat Nov  2 16:25:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:21:28 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/02 16:25:21 rillig Exp $
 
 DISTNAME=      fromto-1.5
 PKGREVISION=   7
@@ -10,7 +10,7 @@ MAINTAINER=   bad%NetBSD.org@localhost
 COMMENT=       Sendmail logfile viewer
 LICENSE=       fromto-license
 
-RESTRICTED=    Redistribution allowed for non-commercial purposes only
+RESTRICTED=            Redistribution allowed for non-commercial purposes only
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 

Index: pkgsrc/mail/gnarwl/Makefile
diff -u pkgsrc/mail/gnarwl/Makefile:1.8 pkgsrc/mail/gnarwl/Makefile:1.9
--- pkgsrc/mail/gnarwl/Makefile:1.8     Fri Feb  2 00:20:45 2018
+++ pkgsrc/mail/gnarwl/Makefile Sat Nov  2 16:25:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/02/02 00:20:45 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 16:25:21 rillig Exp $
 
 DISTNAME=      gnarwl-3.6
 PKGREVISION=   3
@@ -19,22 +19,22 @@ MAKE_JOBS_SAFE=     no
 GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake groff
 
-GNARWL_LIBS=   -L${BUILDLINK_PREFIX.openldap}/lib      \
+GNARWL_LIBS=           -L${BUILDLINK_PREFIX.openldap}/lib      \
                -W,-lR${BUILDLINK_PREFIX.openldap}/lib  \
                -L${BUILDLINK_PREFIX.gdbm}/lib          \
                -W,-lR${BUILDLINK_PREFIX.gdbm}/lib
-CONFIGURE_ENV+=        LDFLAGS=${GNARWL_LIBS:Q}
-CONFIGURE_ARGS+=--with-homedir=${GNARWL_HOME}
+CONFIGURE_ENV+=                LDFLAGS=${GNARWL_LIBS:Q}
+CONFIGURE_ARGS+=       --with-homedir=${GNARWL_HOME}
 
 LDFLAGS.SunOS+=        -liconv
 
-GNARWL_USER?=  gnarwl
-GNARWL_GROUP?= gnarwl
-GNARWL_HOME?=  ${VARBASE}/gnarwl
-BUILD_DEFS+=   GNARWL_USER GNARWL_GROUP
-PKG_GROUPS+=   ${GNARWL_GROUP}
-PKG_USERS+=    ${GNARWL_USER}:${GNARWL_GROUP}
-PKG_HOME.gnarwl=${GNARWL_HOME}
+GNARWL_USER?=          gnarwl
+GNARWL_GROUP?=         gnarwl
+GNARWL_HOME?=          ${VARBASE}/gnarwl
+BUILD_DEFS+=           GNARWL_USER GNARWL_GROUP
+PKG_GROUPS+=           ${GNARWL_GROUP}
+PKG_USERS+=            ${GNARWL_USER}:${GNARWL_GROUP}
+PKG_HOME.gnarwl=       ${GNARWL_HOME}
 
 GNARWL_MANDIR=         ${DESTDIR}${PREFIX}/${PKGMANDIR}
 
@@ -57,11 +57,11 @@ EGDIR=              ${PREFIX}/share/examples/gnarwl
 EGFILES=       badheaders.txt blacklist.txt footer.txt header.txt gnarwl.cfg
 
 .for files in ${EGFILES}
-CONF_FILES+=            ${EGDIR}/${files} ${PKG_SYSCONFDIR}/${files}
+CONF_FILES+=           ${EGDIR}/${files} ${PKG_SYSCONFDIR}/${files}
 .endfor
 
-MAKE_DIRS_PERMS+=${GNARWL_HOME} ${GNARWL_USER} ${GNARWL_GROUP} 0750
-SPECIAL_PERMS+=${PREFIX}/bin/gnarwl ${GNARWL_USER} ${GNARWL_GROUP} 04555
+MAKE_DIRS_PERMS+=      ${GNARWL_HOME} ${GNARWL_USER} ${GNARWL_GROUP} 0750
+SPECIAL_PERMS+=                ${PREFIX}/bin/gnarwl ${GNARWL_USER} ${GNARWL_GROUP} 04555
 
 .include "../../mk/dlopen.builtin.mk"
 .include "../../databases/openldap-client/buildlink3.mk"

Index: pkgsrc/mail/greylisting-spp/options.mk
diff -u pkgsrc/mail/greylisting-spp/options.mk:1.1 pkgsrc/mail/greylisting-spp/options.mk:1.2
--- pkgsrc/mail/greylisting-spp/options.mk:1.1  Sun Nov 11 01:59:23 2018
+++ pkgsrc/mail/greylisting-spp/options.mk      Sat Nov  2 16:25:21 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2018/11/11 01:59:23 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 16:25:21 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.greylisting-spp
 PKG_OPTIONS_OPTIONAL_GROUPS=   db
-PKG_OPTIONS_GROUP.db=           db4 sqlite sqlite3
+PKG_OPTIONS_GROUP.db=          db4 sqlite sqlite3
 PKG_SUGGESTED_OPTIONS=         sqlite3
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/mail/heirloom-mailx/Makefile
diff -u pkgsrc/mail/heirloom-mailx/Makefile:1.9 pkgsrc/mail/heirloom-mailx/Makefile:1.10
--- pkgsrc/mail/heirloom-mailx/Makefile:1.9     Sat Mar  5 11:28:48 2016
+++ pkgsrc/mail/heirloom-mailx/Makefile Sat Nov  2 16:25:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/03/05 11:28:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/02 16:25:22 rillig Exp $
 #
 
 DISTNAME=      heirloom-mailx_12.5.orig
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.gz
 MAINTAINER=    jgw%sdf.org@localhost
 HOMEPAGE=      http://heirloom.sourceforge.net/mailx.html
 COMMENT=       BSD mail utility with MIME extensions
-LICENSE=        original-bsd AND osl AND mpl-1.1
+LICENSE=       original-bsd AND osl AND mpl-1.1
 
 WRKSRC=                ${WRKDIR}/heirloom-mailx-12.5
 

Index: pkgsrc/mail/imapproxy/Makefile
diff -u pkgsrc/mail/imapproxy/Makefile:1.21 pkgsrc/mail/imapproxy/Makefile:1.22
--- pkgsrc/mail/imapproxy/Makefile:1.21 Tue Aug  8 16:39:11 2017
+++ pkgsrc/mail/imapproxy/Makefile      Sat Nov  2 16:25:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/08/08 16:39:11 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/02 16:25:22 rillig Exp $
 #
 
 DISTNAME=      squirrelmail-imap_proxy-1.2.7
@@ -13,24 +13,24 @@ COMMENT=    Simple connection caching IMAP 
 
 GNU_CONFIGURE= YES
 
-CONFIGURE_ARGS+=--exec_prefix=${DESTDIR}${PREFIX}
-BUILD_DEFS+=   VARBASE
-CFLAGS+=       -DDEFAULT_CONFIG_FILE=\"${PREFIX}/etc/imapproxy.conf\"
-CFLAGS+=       -DDEFAULT_PID_FILE=\"${VARBASE}/run/imapproxy.pid\"
-RCD_SCRIPTS=   imapproxy
+CONFIGURE_ARGS+=       --exec_prefix=${DESTDIR}${PREFIX}
+BUILD_DEFS+=           VARBASE
+CFLAGS+=               -DDEFAULT_CONFIG_FILE=\"${PREFIX}/etc/imapproxy.conf\"
+CFLAGS+=               -DDEFAULT_PID_FILE=\"${VARBASE}/run/imapproxy.pid\"
+RCD_SCRIPTS=           imapproxy
 
 IMAPPROXY_USER?=       imapproxy
 IMAPPROXY_GROUP?=      imapproxy
-IMAPPROXY_CHROOT?=      ${VARBASE}/chroot/imapproxy
-IMAPPROXY_DOC?=        share/doc/imapproxy
-IMAPPROXY_EXAMPLES?=           share/examples/imapproxy
-
-PKG_GROUPS_VARS+=       IMAPPROXY_GROUP
-PKG_USERS_VARS+=        IMAPPROXY_USER
-PKG_GROUPS=             ${IMAPPROXY_GROUP}
-PKG_USERS=              ${IMAPPROXY_USER}:${IMAPPROXY_GROUP}
-PKG_GECOS.${IMAPPROXY_USER}=    IMAP Proxy pseudo-user
-PKG_HOME.${IMAPPROXY_USER}=     ${IMAPPROXY_CHROOT}
+IMAPPROXY_CHROOT?=     ${VARBASE}/chroot/imapproxy
+IMAPPROXY_DOC?=                share/doc/imapproxy
+IMAPPROXY_EXAMPLES?=   share/examples/imapproxy
+
+PKG_GROUPS_VARS+=              IMAPPROXY_GROUP
+PKG_USERS_VARS+=               IMAPPROXY_USER
+PKG_GROUPS=                    ${IMAPPROXY_GROUP}
+PKG_USERS=                     ${IMAPPROXY_USER}:${IMAPPROXY_GROUP}
+PKG_GECOS.${IMAPPROXY_USER}=   IMAP Proxy pseudo-user
+PKG_HOME.${IMAPPROXY_USER}=    ${IMAPPROXY_CHROOT}
 
 INSTALLATION_DIRS+=    sbin
 INSTALLATION_DIRS+=    ${IMAPPROXY_DOC}

Index: pkgsrc/mail/ja-mh/Makefile
diff -u pkgsrc/mail/ja-mh/Makefile:1.13 pkgsrc/mail/ja-mh/Makefile:1.14
--- pkgsrc/mail/ja-mh/Makefile:1.13     Fri Nov 11 09:18:31 2011
+++ pkgsrc/mail/ja-mh/Makefile  Sat Nov  2 16:25:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/11/11 09:18:31 sbd Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/02 16:25:22 rillig Exp $
 
 DISTNAME=      mh-6.8.4-JP-3.05
 PKGNAME=       ja-mh6-3.05
@@ -26,9 +26,9 @@ PKG_DESTDIR_SUPPORT=  destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_JOBS_SAFE=        NO
-MANCOMPRESSED= yes
-GNU_CONFIGURE= yes
+MAKE_JOBS_SAFE=                NO
+MANCOMPRESSED=         yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-batchmode
 CONFIGURE_ARGS+=       --libexecdir=${PREFIX:Q}/libexec/mh
 CONFIGURE_ARGS+=       --enable-jmandir=${PREFIX:Q}/${PKGMANDIR:Q}/ja_JP.EUC

Index: pkgsrc/mail/jchkmail/Makefile
diff -u pkgsrc/mail/jchkmail/Makefile:1.15 pkgsrc/mail/jchkmail/Makefile:1.16
--- pkgsrc/mail/jchkmail/Makefile:1.15  Sun Sep 24 14:30:36 2017
+++ pkgsrc/mail/jchkmail/Makefile       Sat Nov  2 16:25:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/09/24 14:30:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:22 rillig Exp $
 
 DISTNAME=              jchkmail-1.3.1a
 PKGREVISION=           2
@@ -18,16 +18,16 @@ GNU_CONFIGURE=              yes
 CONFIGURE_ARGS+=       --with-rc-dir=${PREFIX}/share/examples/rc.d     \
                        --with-conf-dir=${PKG_SYSCONFDIR:Q}
 
-EGDIR=                 ${PREFIX}/share/examples/jchkmail
-PKG_SYSCONFSUBDIR=     jchkmail
-CONF_FILES+=           ${EGDIR}/j-chkmail.cf ${PKG_SYSCONFDIR}/j-chkmail.cf
-CONF_FILES+=           ${EGDIR}/j-local-users ${PKG_SYSCONFDIR}/j-local-users
-CONF_FILES+=           ${EGDIR}/j-error-msg ${PKG_SYSCONFDIR}/j-error-msg
-CONF_FILES+=           ${EGDIR}/j-nets ${PKG_SYSCONFDIR}/j-nets
-CONF_FILES+=           ${EGDIR}/j-host-access ${PKG_SYSCONFDIR}/j-host-access
-CONF_FILES+=           ${EGDIR}/j-user-access ${PKG_SYSCONFDIR}/j-user-access
-CONF_FILES+=           ${EGDIR}/j-regex ${PKG_SYSCONFDIR}/j-regex
-RCD_SCRIPTS=           jchkmail
+EGDIR=                         ${PREFIX}/share/examples/jchkmail
+PKG_SYSCONFSUBDIR=             jchkmail
+CONF_FILES+=                   ${EGDIR}/j-chkmail.cf ${PKG_SYSCONFDIR}/j-chkmail.cf
+CONF_FILES+=                   ${EGDIR}/j-local-users ${PKG_SYSCONFDIR}/j-local-users
+CONF_FILES+=                   ${EGDIR}/j-error-msg ${PKG_SYSCONFDIR}/j-error-msg
+CONF_FILES+=                   ${EGDIR}/j-nets ${PKG_SYSCONFDIR}/j-nets
+CONF_FILES+=                   ${EGDIR}/j-host-access ${PKG_SYSCONFDIR}/j-host-access
+CONF_FILES+=                   ${EGDIR}/j-user-access ${PKG_SYSCONFDIR}/j-user-access
+CONF_FILES+=                   ${EGDIR}/j-regex ${PKG_SYSCONFDIR}/j-regex
+RCD_SCRIPTS=                   jchkmail
 RCD_SCRIPT_SRC.jchkmail=       ${WRKSRC}/bin/jchkmail.init
 
 PTHREAD_AUTO_VARS=     yes

Index: pkgsrc/mail/libmilter/builtin.mk
diff -u pkgsrc/mail/libmilter/builtin.mk:1.6 pkgsrc/mail/libmilter/builtin.mk:1.7
--- pkgsrc/mail/libmilter/builtin.mk:1.6        Sat Nov 23 11:34:45 2013
+++ pkgsrc/mail/libmilter/builtin.mk    Sat Nov  2 16:25:22 2019
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.6 2013/11/23 11:34:45 obache Exp $
+# $NetBSD: builtin.mk,v 1.7 2019/11/02 16:25:22 rillig Exp $
 
 BUILTIN_PKG:=  libmilter
 
-BUILTIN_FIND_LIBS:=            milter
-BUILTIN_FIND_HEADERS_VAR:=     H_LIBMILTER
+BUILTIN_FIND_LIBS:=                    milter
+BUILTIN_FIND_HEADERS_VAR:=             H_LIBMILTER
 BUILTIN_FIND_HEADERS.H_LIBMILTER=      libmilter/mfapi.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
@@ -20,7 +20,7 @@ IS_BUILTIN.libmilter= no
 IS_BUILTIN.libmilter=  yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.libmilter
+MAKEVARS+=             IS_BUILTIN.libmilter
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -47,4 +47,4 @@ USE_BUILTIN.libmilter!=                                                       \
 .    endif
 .  endif  # PREFER.libmilter
 .endif
-MAKEVARS+=     USE_BUILTIN.libmilter
+MAKEVARS+=             USE_BUILTIN.libmilter

Index: pkgsrc/mail/maildrop/Makefile
diff -u pkgsrc/mail/maildrop/Makefile:1.68 pkgsrc/mail/maildrop/Makefile:1.69
--- pkgsrc/mail/maildrop/Makefile:1.68  Sun Aug 11 13:21:28 2019
+++ pkgsrc/mail/maildrop/Makefile       Sat Nov  2 16:25:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2019/08/11 13:21:28 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2019/11/02 16:25:22 rillig Exp $
 
 DISTNAME=      maildrop-3.0.0
 PKGREVISION=   2
@@ -23,7 +23,7 @@ DOCFILES=     README README.postfix README.d
 
 # These are the users that may invoke maildrop with the "-d user"
 # argument (mailbox delivery mode).
-MAILDROP_TRUSTED_USERS?=${REAL_ROOT_USER} ${COURIER_USER} ${QMAIL_DAEMON_USER}
+MAILDROP_TRUSTED_USERS?= ${REAL_ROOT_USER} ${COURIER_USER} ${QMAIL_DAEMON_USER}
 BUILD_DEFS+=           QMAIL_DAEMON_USER
 
 CONFIGURE_ARGS+=       --datadir=${DATADIR}

Index: pkgsrc/mail/mailhops/Makefile
diff -u pkgsrc/mail/mailhops/Makefile:1.15 pkgsrc/mail/mailhops/Makefile:1.16
--- pkgsrc/mail/mailhops/Makefile:1.15  Sun Aug 11 13:21:29 2019
+++ pkgsrc/mail/mailhops/Makefile       Sat Nov  2 16:25:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:21:29 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:22 rillig Exp $
 #
 
 DISTNAME=      mailhops-1.4
@@ -18,11 +18,11 @@ EXTRACT_CMD=        ${ECHO} ${CP} "$${extract_f
                                ${CP} "$${extract_file}" ${WRKSRC}/mailhops
 
 
-DEPENDS+=              p5-TimeDate-[0-9]*:../../time/p5-TimeDate
+DEPENDS+=              p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 
-USE_TOOLS+=            perl:run
+USE_TOOLS+=            perl:run
 
-REPLACE_PERL+=         mailhops
+REPLACE_PERL+=         mailhops
 
 do-build:
 

Index: pkgsrc/mail/mailman/Makefile
diff -u pkgsrc/mail/mailman/Makefile:1.88 pkgsrc/mail/mailman/Makefile:1.89
--- pkgsrc/mail/mailman/Makefile:1.88   Mon Sep  2 13:19:56 2019
+++ pkgsrc/mail/mailman/Makefile        Sat Nov  2 16:25:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2019/09/02 13:19:56 adam Exp $
+# $NetBSD: Makefile,v 1.89 2019/11/02 16:25:22 rillig Exp $
 
 DISTNAME=      mailman-2.1.29
 PKGNAME=       mailman-2.1.29
@@ -70,9 +70,9 @@ INSTALL_TEMPLATES+=   ${FILESDIR}/INSTALL
 DEINSTALL_TEMPLATES+=  ${FILESDIR}/DEINSTALL
 
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 2.1.14.1
-REPLACE_PYTHON+=       Mailman/Archiver/pipermail.py
-REPLACE_PYTHON+=       Mailman/Post.py
-REPLACE_PYTHON+=       bin/msgfmt.py
+REPLACE_PYTHON+=               Mailman/Archiver/pipermail.py
+REPLACE_PYTHON+=               Mailman/Post.py
+REPLACE_PYTHON+=               bin/msgfmt.py
 
 CONFIGURE_ARGS+=       --with-cgi-gid=${MAILMAN_CGIGROUP:Q}
 .if ${MAILMAN_CGIEXT} != "none"

Index: pkgsrc/mail/mailserv/Makefile
diff -u pkgsrc/mail/mailserv/Makefile:1.24 pkgsrc/mail/mailserv/Makefile:1.25
--- pkgsrc/mail/mailserv/Makefile:1.24  Sun Aug 11 13:21:29 2019
+++ pkgsrc/mail/mailserv/Makefile       Sat Nov  2 16:25:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:21:29 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/02 16:25:22 rillig Exp $
 #
 
 DISTNAME=      mailserv
@@ -18,11 +18,11 @@ USE_TOOLS+= perl:run
 NO_BUILD=      YES
 
 PKG_SYSCONFSUBDIR=     mailserv
-EGDIR=         ${PREFIX}/share/examples/mailserv
+EGDIR=                 ${PREFIX}/share/examples/mailserv
 CONF_FILES=
 .for cf in listproc listserv mail-list maiser majordomo-admin          \
        majordomo-share majordomo mlp pmdf smartlist subscribe
-CONF_FILES+=   ${EGDIR}/${cf}.cf ${PKG_SYSCONFDIR}/${cf}.cf
+CONF_FILES+=           ${EGDIR}/${cf}.cf ${PKG_SYSCONFDIR}/${cf}.cf
 .endfor
 
 INSTALLATION_DIRS=     libexec/cgi-bin

Index: pkgsrc/mail/mailsort/Makefile
diff -u pkgsrc/mail/mailsort/Makefile:1.8 pkgsrc/mail/mailsort/Makefile:1.9
--- pkgsrc/mail/mailsort/Makefile:1.8   Sun Aug 11 13:21:29 2019
+++ pkgsrc/mail/mailsort/Makefile       Sat Nov  2 16:25:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:21:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 16:25:23 rillig Exp $
 #
 
 DISTNAME=      mailsort-1.26
@@ -13,9 +13,9 @@ COMMENT=      Sort mbox mail folders by date
 LICENSE=       gnu-gpl-v2
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
-REPLACE_PERL+= mailsort
-USE_LANGUAGES= # none
-USE_TOOLS=     perl pod2man
+REPLACE_PERL+=         mailsort
+USE_LANGUAGES=         # none
+USE_TOOLS=             perl pod2man
 
 do-build:
        pod2man ${WRKSRC}/mailsort > ${WRKSRC}/mailsort.1

Index: pkgsrc/mail/mailwrapper/Makefile
diff -u pkgsrc/mail/mailwrapper/Makefile:1.28 pkgsrc/mail/mailwrapper/Makefile:1.29
--- pkgsrc/mail/mailwrapper/Makefile:1.28       Mon Oct  8 12:19:16 2012
+++ pkgsrc/mail/mailwrapper/Makefile    Sat Nov  2 16:25:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/10/08 12:19:16 asau Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/02 16:25:23 rillig Exp $
 
 DISTNAME=      mailwrapper-19990412
 PKGREVISION=   4
@@ -16,7 +16,7 @@ WRKSRC=                       ${WRKDIR}/mailwrapper
 EGDIR=                 ${PREFIX}/share/examples/mailwrapper
 
 MAILWRAPPER_BACKUP_SFX=        .pkgsrc.mailwrapper
-FILES_SUBST+=  MAILWRAPPER_BACKUP_SFX=${MAILWRAPPER_BACKUP_SFX:Q}
+FILES_SUBST+=          MAILWRAPPER_BACKUP_SFX=${MAILWRAPPER_BACKUP_SFX:Q}
 
 MAILWRAPPEES=  /usr/bin/mailq                                          \
                /usr/bin/newaliases     /usr/sbin/newaliases            \

Index: pkgsrc/mail/mess822/Makefile
diff -u pkgsrc/mail/mess822/Makefile:1.32 pkgsrc/mail/mess822/Makefile:1.33
--- pkgsrc/mail/mess822/Makefile:1.32   Wed Jun 19 17:43:28 2019
+++ pkgsrc/mail/mess822/Makefile        Sat Nov  2 16:25:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/06/19 17:43:28 schmonz Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/02 16:25:23 rillig Exp $
 #
 
 DISTNAME=              mess822-0.58
@@ -27,10 +27,10 @@ SUBST_STAGE.paths=  do-configure
 SUBST_FILES.paths=     hier.c
 SUBST_VARS.paths=      PKGMANDIR
 
-MESS822PATCHES=                qmailqueue:${QMAILQUEUE_PATCH}
-QMAILQUEUE_PATCH=      mess822-0.58-qmailqueue-20170527.patch
-PATCHFILES+=           ${QMAILQUEUE_PATCH}
-SITES.${QMAILQUEUE_PATCH}=https://schmonz.com/qmail/mess822qmailqueue/
+MESS822PATCHES=                        qmailqueue:${QMAILQUEUE_PATCH}
+QMAILQUEUE_PATCH=              mess822-0.58-qmailqueue-20170527.patch
+PATCHFILES+=                   ${QMAILQUEUE_PATCH}
+SITES.${QMAILQUEUE_PATCH}=     https://schmonz.com/qmail/mess822qmailqueue/
 
 BUILD_DEFS+=           MESS822PATCHES
 

Index: pkgsrc/mail/mew/Makefile
diff -u pkgsrc/mail/mew/Makefile:1.97 pkgsrc/mail/mew/Makefile:1.98
--- pkgsrc/mail/mew/Makefile:1.97       Wed Jun 20 12:03:04 2018
+++ pkgsrc/mail/mew/Makefile    Sat Nov  2 16:25:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2018/06/20 12:03:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.98 2019/11/02 16:25:23 rillig Exp $
 
 DISTNAME=      mew-6.8
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -25,14 +25,14 @@ EMACS_VERSIONS_ACCEPTED+=   emacs25 emacs2
 EMACS_VERSIONS_ACCEPTED+=      emacs21 emacs21nox
 EMACS_MODULES+=                        base
 
-MAKE_FLAGS+=   DESTDIR=${DESTDIR:Q}
-MAKE_FLAGS+=   prefix=${PREFIX:Q}
-MAKE_FLAGS+=   exec_prefix=${PREFIX:Q}
-MAKE_FLAGS+=   EMACS=${EMACS_BIN:Q}
-MAKE_FLAGS+=   elispdir=${EMACS_LISPPREFIX:Q}/mew
-MAKE_FLAGS+=   etcdir=${EMACS_ETCPREFIX:Q}/mew
-MAKE_FLAGS+=   infodir=${EMACS_INFOPREFIX:Q}
-MAKE_FLAGS+=   mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
+MAKE_FLAGS+=           DESTDIR=${DESTDIR:Q}
+MAKE_FLAGS+=           prefix=${PREFIX:Q}
+MAKE_FLAGS+=           exec_prefix=${PREFIX:Q}
+MAKE_FLAGS+=           EMACS=${EMACS_BIN:Q}
+MAKE_FLAGS+=           elispdir=${EMACS_LISPPREFIX:Q}/mew
+MAKE_FLAGS+=           etcdir=${EMACS_ETCPREFIX:Q}/mew
+MAKE_FLAGS+=           infodir=${EMACS_INFOPREFIX:Q}
+MAKE_FLAGS+=           mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
 CONFIGURE_ARGS+=       --with-etcdir=${EMACS_ETCPREFIX}/mew
 
 SUBST_CLASSES+=                local

Index: pkgsrc/mail/milter-greylist/Makefile
diff -u pkgsrc/mail/milter-greylist/Makefile:1.76 pkgsrc/mail/milter-greylist/Makefile:1.77
--- pkgsrc/mail/milter-greylist/Makefile:1.76   Thu Aug 22 12:23:28 2019
+++ pkgsrc/mail/milter-greylist/Makefile        Sat Nov  2 16:25:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2019/08/22 12:23:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.77 2019/11/02 16:25:23 rillig Exp $
 
 DISTNAME=      milter-greylist-4.4.3
 PKGREVISION=   14
@@ -36,15 +36,15 @@ INSTALLATION_DIRS+= share/examples/milte
 
 OWN_DIRS_PERMS+=       ${VARBASE}/milter-greylist ${MILTER_USER} ${MILTER_GROUP} 0755
 
-SUBST_CLASSES+=         paths
-SUBST_STAGE.paths=      pre-configure
-SUBST_FILES.paths=      greylist.conf greylist2.conf
-SUBST_SED.paths+=       -e "s|/var/run|${VARBASE}/run|g"
-SUBST_SED.paths+=       -e "s|/var/milter-greylist|${VARBASE}/milter-greylist|g"
-SUBST_MESSAGE.paths=    Fixing paths in conf examples.
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     greylist.conf greylist2.conf
+SUBST_SED.paths+=      -e "s|/var/run|${VARBASE}/run|g"
+SUBST_SED.paths+=      -e "s|/var/milter-greylist|${VARBASE}/milter-greylist|g"
+SUBST_MESSAGE.paths=   Fixing paths in conf examples.
 
-EGDIR=                  ${PREFIX}/share/examples/milter-greylist
-CONF_FILES=             ${EGDIR}/greylist.conf ${PKG_SYSCONFDIR}/greylist.conf
+EGDIR=                 ${PREFIX}/share/examples/milter-greylist
+CONF_FILES=            ${EGDIR}/greylist.conf ${PKG_SYSCONFDIR}/greylist.conf
 
 
 post-install:

Index: pkgsrc/mail/milter-manager/Makefile
diff -u pkgsrc/mail/milter-manager/Makefile:1.44 pkgsrc/mail/milter-manager/Makefile:1.45
--- pkgsrc/mail/milter-manager/Makefile:1.44    Sat Sep 14 18:13:50 2019
+++ pkgsrc/mail/milter-manager/Makefile Sat Nov  2 16:25:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2019/09/14 18:13:50 tsutsui Exp $
+# $NetBSD: Makefile,v 1.45 2019/11/02 16:25:23 rillig Exp $
 #
 
 DISTNAME=      milter-manager-2.0.5
@@ -27,11 +27,11 @@ CONFIGURE_ARGS+=    --with-ruby=${RUBY}
 CONFIGURE_ARGS+=       --enable-ruby-milter=${PREFIX}/${RUBY_VENDORLIB}
 CONFIGURE_ARGS+=       --with-bundled-ruby-glib2=no
 
-SUBST_CLASSES+=                libev_inc
-SUBST_STAGE.libev_inc= pre-configure
-SUBST_MESSAGE.libev_inc=Adjust include path for libevent from pkgsrc.
-SUBST_FILES.libev_inc= configure
-SUBST_SED.libev_inc=   's,/include/ev.h,/include/ev/ev.h,g'
+SUBST_CLASSES+=                        libev_inc
+SUBST_STAGE.libev_inc=         pre-configure
+SUBST_MESSAGE.libev_inc=       Adjust include path for libevent from pkgsrc.
+SUBST_FILES.libev_inc=         configure
+SUBST_SED.libev_inc=           's,/include/ev.h,/include/ev/ev.h,g'
 
 PKG_SYSCONFSUBDIR=     ${PKGBASE}
 
@@ -48,14 +48,14 @@ PKGCONFIG_OVERRIDE+=        ruby-milter-client.
 PKGCONFIG_OVERRIDE+=   ruby-milter-core.pc.in
 PKGCONFIG_OVERRIDE+=   ruby-milter-server.pc.in
 
-MILTER_MANAGER_USER?=  _milter
-MILTER_MANAGER_GROUP?= _milter
-MILTER_MANAGER_SOCKET_GROUP?=  mail
-PKG_GROUPS=            ${MILTER_MANAGER_GROUP} ${MILTER_MANAGER_SOCKET_GROUP}
-PKG_USERS=             ${MILTER_MANAGER_USER}:${MILTER_MANAGER_GROUP}
+MILTER_MANAGER_USER?=                  _milter
+MILTER_MANAGER_GROUP?=                 _milter
+MILTER_MANAGER_SOCKET_GROUP?=          mail
+PKG_GROUPS=                            ${MILTER_MANAGER_GROUP} ${MILTER_MANAGER_SOCKET_GROUP}
+PKG_USERS=                             ${MILTER_MANAGER_USER}:${MILTER_MANAGER_GROUP}
 PKG_GECOS.${MILTER_MANAGER_USER}=      Milter Manager
-PKG_GROUPS_VARS+=      MILTER_MANAGER_GROUP MILTER_MANAGER_SOCKET_GROUP
-PKG_USERS_VARS=                MILTER_MANAGER_USER
+PKG_GROUPS_VARS+=                      MILTER_MANAGER_GROUP MILTER_MANAGER_SOCKET_GROUP
+PKG_USERS_VARS=                                MILTER_MANAGER_USER
 
 FILES_SUBST+=          MILTER_MANAGER_USER=${MILTER_MANAGER_USER:Q}
 FILES_SUBST+=          MILTER_MANAGER_GROUP=${MILTER_MANAGER_GROUP:Q}

Index: pkgsrc/mail/mush/Makefile
diff -u pkgsrc/mail/mush/Makefile:1.31 pkgsrc/mail/mush/Makefile:1.32
--- pkgsrc/mail/mush/Makefile:1.31      Thu May 23 19:23:06 2019
+++ pkgsrc/mail/mush/Makefile   Sat Nov  2 16:25:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/05/23 19:23:06 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/02 16:25:23 rillig Exp $
 
 DISTNAME=      mush-7.2.5
 PKGNAME=       mush-7.2.6.b4.pl1
@@ -7,9 +7,9 @@ CATEGORIES=     mail
 MASTER_SITES=  # ftp://cse.ogi.edu/pub/mush/
 EXTRACT_SUFX=  .tar.Z
 
-PATCH_SITES=   # ftp://cse.ogi.edu/pub/mush/CONTRIB/
+PATCH_SITES=           # ftp://cse.ogi.edu/pub/mush/CONTRIB/
 PATCH_DIST_ARGS=       -s -d ${WRKDIR} -E -p1
-PATCHFILES=    patch-7.2.6-alpha-1 \
+PATCHFILES=            patch-7.2.6-alpha-1 \
                patch-7.2.6-alpha-2 \
                patch-7.2.6-alpha-3 \
                patch-7.2.6-beta-1 \

Index: pkgsrc/mail/mutt/Makefile
diff -u pkgsrc/mail/mutt/Makefile:1.214 pkgsrc/mail/mutt/Makefile:1.215
--- pkgsrc/mail/mutt/Makefile:1.214     Sat Sep 21 22:32:41 2019
+++ pkgsrc/mail/mutt/Makefile   Sat Nov  2 16:25:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.214 2019/09/21 22:32:41 tron Exp $
+# $NetBSD: Makefile,v 1.215 2019/11/02 16:25:23 rillig Exp $
 
 DISTNAME=              mutt-1.12.2
 CATEGORIES=            mail
@@ -60,7 +60,7 @@ SUBST_FILES.paths=    doc/Muttrc
 SUBST_VARS.paths+=     DOCDIR PREFIX
 SUBST_STAGE.paths=     pre-configure
 
-SPECIAL_PERMS+=        bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
+SPECIAL_PERMS+=                bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} sysconfdir=${EGDIR}
 
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/mail/mutt/options.mk
diff -u pkgsrc/mail/mutt/options.mk:1.31 pkgsrc/mail/mutt/options.mk:1.32
--- pkgsrc/mail/mutt/options.mk:1.31    Tue Jan 22 13:19:44 2019
+++ pkgsrc/mail/mutt/options.mk Sat Nov  2 16:25:23 2019
@@ -1,18 +1,18 @@
-# $NetBSD: options.mk,v 1.31 2019/01/22 13:19:44 wiz Exp $
+# $NetBSD: options.mk,v 1.32 2019/11/02 16:25:23 rillig Exp $
 
 # Global and legacy options
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.mutt
+PKG_OPTIONS_VAR=               PKG_OPTIONS.mutt
 PKG_OPTIONS_REQUIRED_GROUPS=   display
 PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
 PKG_OPTIONS_GROUP.display=     curses wide-curses slang
-PKG_OPTIONS_GROUP.ssl= gnutls openssl
-PKG_SUPPORTED_OPTIONS= debug gpgme idn smime sasl
+PKG_OPTIONS_GROUP.ssl=         gnutls openssl
+PKG_SUPPORTED_OPTIONS=         debug gpgme idn smime sasl
 # TODO: add kyoto cabinet and lmdb backend options for header cache
-PKG_SUPPORTED_OPTIONS+=        mutt-hcache mutt-compressed-mbox tokyocabinet mutt-smtp
-PKG_SUPPORTED_OPTIONS+=        gssapi
-PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime openssl
-PKG_SUGGESTED_OPTIONS+= gssapi mutt-compressed-mbox
+PKG_SUPPORTED_OPTIONS+=                mutt-hcache mutt-compressed-mbox tokyocabinet mutt-smtp
+PKG_SUPPORTED_OPTIONS+=                gssapi
+PKG_SUGGESTED_OPTIONS=         curses gpgme mutt-hcache mutt-smtp smime openssl
+PKG_SUGGESTED_OPTIONS+=                gssapi mutt-compressed-mbox
 # remove after 2019Q1
 PKG_OPTIONS_LEGACY_OPTS+=      ncurses:curses ncursesw:wide-curses
 PKG_OPTIONS_LEGACY_OPTS+=      ssl:openssl
@@ -153,7 +153,7 @@ CONFIGURE_ARGS+=    --with-idn=no
 ###
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=       --enable-debug
-CFLAGS+= -g
+CFLAGS+=               -g
 .endif
 
 ###

Index: pkgsrc/mail/neomutt/options.mk
diff -u pkgsrc/mail/neomutt/options.mk:1.12 pkgsrc/mail/neomutt/options.mk:1.13
--- pkgsrc/mail/neomutt/options.mk:1.12 Wed Jul  4 13:40:24 2018
+++ pkgsrc/mail/neomutt/options.mk      Sat Nov  2 16:25:23 2019
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.12 2018/07/04 13:40:24 jperkin Exp $
+# $NetBSD: options.mk,v 1.13 2019/11/02 16:25:23 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.neomutt
+PKG_OPTIONS_VAR=               PKG_OPTIONS.neomutt
 PKG_OPTIONS_REQUIRED_GROUPS=   display
 PKG_OPTIONS_GROUP.display=     curses ncurses ncursesw slang
-PKG_SUPPORTED_OPTIONS= debug gpgme gssapi idn ssl smime sasl
-PKG_SUPPORTED_OPTIONS+=        tokyocabinet
-PKG_SUGGESTED_OPTIONS= gpgme gssapi idn ncursesw sasl smime ssl
-PKG_SUGGESTED_OPTIONS+=        tokyocabinet
+PKG_SUPPORTED_OPTIONS=         debug gpgme gssapi idn ssl smime sasl
+PKG_SUPPORTED_OPTIONS+=                tokyocabinet
+PKG_SUGGESTED_OPTIONS=         gpgme gssapi idn ncursesw sasl smime ssl
+PKG_SUGGESTED_OPTIONS+=                tokyocabinet
 
 .include "../../mk/bsd.options.mk"
 
@@ -127,7 +127,7 @@ CONFIGURE_ARGS+=    --disable-idn
 ### Enable debugging support
 ###
 .if !empty(PKG_OPTIONS:Mdebug)
-CFLAGS+= -g
+CFLAGS+=       -g
 .endif
 
 ###

Index: pkgsrc/mail/newspipe/Makefile
diff -u pkgsrc/mail/newspipe/Makefile:1.15 pkgsrc/mail/newspipe/Makefile:1.16
--- pkgsrc/mail/newspipe/Makefile:1.15  Thu May 23 19:23:06 2019
+++ pkgsrc/mail/newspipe/Makefile       Sat Nov  2 16:25:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/05/23 19:23:06 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:24 rillig Exp $
 #
 
 DISTNAME=              newspipe.1.1.9
@@ -18,7 +18,7 @@ DEPENDS+=             ${PYPKGPREFIX}-html2text-[0-9
 
 WRKSRC=                        ${WRKDIR}
 
-NO_BUILD=              yes
+NO_BUILD=      yes
 REPLACE_PYTHON=        *.py
 
 SUBST_CLASSES+=                bin

Index: pkgsrc/mail/nullmailer/options.mk
diff -u pkgsrc/mail/nullmailer/options.mk:1.3 pkgsrc/mail/nullmailer/options.mk:1.4
--- pkgsrc/mail/nullmailer/options.mk:1.3       Sat Oct 13 14:38:54 2018
+++ pkgsrc/mail/nullmailer/options.mk   Sat Nov  2 16:25:24 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2018/10/13 14:38:54 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/02 16:25:24 rillig Exp $
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.nullmailer
-PKG_SUPPORTED_OPTIONS=  gnutls
-PKG_SUGGESTED_OPTIONS=  gnutls
+PKG_OPTIONS_VAR=       PKG_OPTIONS.nullmailer
+PKG_SUPPORTED_OPTIONS= gnutls
+PKG_SUGGESTED_OPTIONS= gnutls
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/mail/oe2mbx/Makefile
diff -u pkgsrc/mail/oe2mbx/Makefile:1.16 pkgsrc/mail/oe2mbx/Makefile:1.17
--- pkgsrc/mail/oe2mbx/Makefile:1.16    Sun Sep  3 08:36:56 2017
+++ pkgsrc/mail/oe2mbx/Makefile Sat Nov  2 16:25:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/09/03 08:36:56 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 16:25:24 rillig Exp $
 #
 
 DISTNAME=      oe2mbx-1.21
@@ -20,7 +20,7 @@ MAKE_ENV+=    INSTALL_PROGRAM=${INSTALL_PRO
                INSTALL_LIB=${INSTALL_LIB:Q} \
                INSTALL_DATA=${INSTALL_DATA:Q}
 
-BUILD_TARGET=  liboe oe2mbx
+BUILD_TARGET=          liboe oe2mbx
 INSTALLATION_DIRS=     bin lib include
 
 pre-build:

Index: pkgsrc/mail/opensmtpd/Makefile
diff -u pkgsrc/mail/opensmtpd/Makefile:1.12 pkgsrc/mail/opensmtpd/Makefile:1.13
--- pkgsrc/mail/opensmtpd/Makefile:1.12 Thu May 23 19:23:06 2019
+++ pkgsrc/mail/opensmtpd/Makefile      Sat Nov  2 16:25:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/05/23 19:23:06 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 16:25:24 rillig Exp $
 
 VERSION=       5.7.3p2
 DISTNAME=      opensmtpd-${VERSION}
@@ -10,8 +10,8 @@ HOMEPAGE=     https://www.opensmtpd.org/
 COMMENT=       The OpenSMTPD mail transfer agent, a replacement for sendmail
 LICENSE=       isc AND modified-bsd AND 2-clause-bsd
 
-CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
-CONFLICTS+=    esmtp>=1.2 nullmailer-[0-9]* postfix-[0-9]*
+CONFLICTS+=            courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
+CONFLICTS+=            esmtp>=1.2 nullmailer-[0-9]* postfix-[0-9]*
 BROKEN_FOR_PLATFORM=   OpenBSD-*-*
 
 BUILD_DEFS+=   VARBASE
@@ -31,8 +31,8 @@ PKG_HOME._smtpd=      ${SMTPD_HOME}
 PKG_GECOS._smtpq=      OpenSMTPD pseudo-user
 PKG_HOME._smtpq=       ${SMTPD_HOME}
 
-GNU_CONFIGURE= yes
-USE_DB185=     yes
+GNU_CONFIGURE=         yes
+USE_DB185=             yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --with-mantype=man
 CONFIGURE_ARGS+=       --with-privsep-path=${SMTPD_HOME}

Index: pkgsrc/mail/p5-Catalyst-View-Email/Makefile
diff -u pkgsrc/mail/p5-Catalyst-View-Email/Makefile:1.23 pkgsrc/mail/p5-Catalyst-View-Email/Makefile:1.24
--- pkgsrc/mail/p5-Catalyst-View-Email/Makefile:1.23    Sun Aug 11 13:21:31 2019
+++ pkgsrc/mail/p5-Catalyst-View-Email/Makefile Sat Nov  2 16:25:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:21:31 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/02 16:25:24 rillig Exp $
 
 DISTNAME=      Catalyst-View-Email-0.36
 PKGNAME=       p5-${DISTNAME}
@@ -28,7 +28,7 @@ USE_LANGUAGES=        # empty
 PERL5_PACKLIST=        auto/Catalyst/View/Email/.packlist
 
 # M:I:AI switch - this is EU:MM module
-#MAKE_ENV+=       PERL_AUTOINSTALL=--skipdeps
+#MAKE_ENV+=    PERL_AUTOINSTALL=--skipdeps
 
 EXTRACT_USING=         gtar
 

Index: pkgsrc/mail/p5-Email-Address/Makefile
diff -u pkgsrc/mail/p5-Email-Address/Makefile:1.29 pkgsrc/mail/p5-Email-Address/Makefile:1.30
--- pkgsrc/mail/p5-Email-Address/Makefile:1.29  Sun Aug 11 13:21:31 2019
+++ pkgsrc/mail/p5-Email-Address/Makefile       Sat Nov  2 16:25:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/08/11 13:21:31 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/02 16:25:24 rillig Exp $
 
 DISTNAME=      Email-Address-1.912
 PKGNAME=       p5-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=      ${PERL5_LICENSE}
 
 #DEPENDS+=     {perl>=5.7.3,p5-Test-Simple>=0.47}:../../devel/p5-Test-Simple
 
-PERL5_PACKLIST= auto/Email/Address/.packlist
+PERL5_PACKLIST=        auto/Email/Address/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/p5-Email-Address-XS/Makefile
diff -u pkgsrc/mail/p5-Email-Address-XS/Makefile:1.8 pkgsrc/mail/p5-Email-Address-XS/Makefile:1.9
--- pkgsrc/mail/p5-Email-Address-XS/Makefile:1.8        Sun Aug 11 13:21:31 2019
+++ pkgsrc/mail/p5-Email-Address-XS/Makefile    Sat Nov  2 16:25:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:21:31 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 16:25:24 rillig Exp $
 
 DISTNAME=      Email-Address-XS-1.04
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/E
 COMMENT=       Parse and format RFC 2822 email addresses and groups
 LICENSE=       ${PERL5_LICENSE}
 
-PERL5_PACKLIST= auto/Email/Address/XS/.packlist
+PERL5_PACKLIST=        auto/Email/Address/XS/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/p5-Email-Folder/Makefile
diff -u pkgsrc/mail/p5-Email-Folder/Makefile:1.18 pkgsrc/mail/p5-Email-Folder/Makefile:1.19
--- pkgsrc/mail/p5-Email-Folder/Makefile:1.18   Sun Aug 11 13:21:32 2019
+++ pkgsrc/mail/p5-Email-Folder/Makefile        Sat Nov  2 16:25:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:21:32 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 16:25:24 rillig Exp $
 
 DISTNAME=      Email-Folder-0.860
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/E
 COMMENT=       Perl 5 module to read all the messages from a folder
 LICENSE=       ${PERL5_LICENSE}
 
-PERL5_PACKLIST= auto/Email/Folder/.packlist
+PERL5_PACKLIST=        auto/Email/Folder/.packlist
 
 DEPENDS+=      p5-Email-FolderType>=0.6:../../mail/p5-Email-FolderType
 DEPENDS+=      p5-Email-Simple-[0-9]*:../../mail/p5-Email-Simple

Index: pkgsrc/mail/p5-Email-FolderType/Makefile
diff -u pkgsrc/mail/p5-Email-FolderType/Makefile:1.17 pkgsrc/mail/p5-Email-FolderType/Makefile:1.18
--- pkgsrc/mail/p5-Email-FolderType/Makefile:1.17       Sun Aug 11 13:21:32 2019
+++ pkgsrc/mail/p5-Email-FolderType/Makefile    Sat Nov  2 16:25:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:21:32 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 16:25:24 rillig Exp $
 
 DISTNAME=      Email-FolderType-0.814
 PKGNAME=       p5-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=      ${PERL5_LICENSE}
 
 DEPENDS+=      p5-Module-Pluggable-[0-9]*:../../devel/p5-Module-Pluggable
 
-PERL5_PACKLIST= auto/Email/FolderType/.packlist
+PERL5_PACKLIST=        auto/Email/FolderType/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/p5-Email-LocalDelivery/Makefile
diff -u pkgsrc/mail/p5-Email-LocalDelivery/Makefile:1.15 pkgsrc/mail/p5-Email-LocalDelivery/Makefile:1.16
--- pkgsrc/mail/p5-Email-LocalDelivery/Makefile:1.15    Sun Aug 11 13:21:32 2019
+++ pkgsrc/mail/p5-Email-LocalDelivery/Makefile Sat Nov  2 16:25:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:21:32 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:25 rillig Exp $
 
 DISTNAME=      Email-LocalDelivery-1.200
 PKGNAME=       p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://metacpan.org/release/E
 COMMENT=       Perl 5 module to deliver a piece of email - simply
 LICENSE=       ${PERL5_LICENSE}
 
-PERL5_PACKLIST= auto/Email/LocalDelivery/.packlist
+PERL5_PACKLIST=        auto/Email/LocalDelivery/.packlist
 
 DEPENDS+=      p5-Email-FolderType>=0.7:../../mail/p5-Email-FolderType
 DEPENDS+=      p5-Email-Simple>=1.998:../../mail/p5-Email-Simple

Index: pkgsrc/mail/p5-Email-MessageID/Makefile
diff -u pkgsrc/mail/p5-Email-MessageID/Makefile:1.24 pkgsrc/mail/p5-Email-MessageID/Makefile:1.25
--- pkgsrc/mail/p5-Email-MessageID/Makefile:1.24        Sun Aug 11 13:21:33 2019
+++ pkgsrc/mail/p5-Email-MessageID/Makefile     Sat Nov  2 16:25:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:21:33 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/02 16:25:25 rillig Exp $
 
 DISTNAME=      Email-MessageID-1.406
 PKGNAME=       p5-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE=      ${PERL5_LICENSE}
 DEPENDS+=      p5-Email-Address>=1.80:../../mail/p5-Email-Address
 #DEPENDS+=     {perl>5.7.3,p5-Test-Simple>=0.47}:../../devel/p5-Test-Simple
 
-PERL5_PACKLIST= auto/Email/MessageID/.packlist
+PERL5_PACKLIST=        auto/Email/MessageID/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/p5-Mail-Alias/Makefile
diff -u pkgsrc/mail/p5-Mail-Alias/Makefile:1.13 pkgsrc/mail/p5-Mail-Alias/Makefile:1.14
--- pkgsrc/mail/p5-Mail-Alias/Makefile:1.13     Sun Aug 11 13:21:35 2019
+++ pkgsrc/mail/p5-Mail-Alias/Makefile  Sat Nov  2 16:25:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:21:35 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/02 16:25:25 rillig Exp $
 
 DISTNAME=      Mail-Alias-1.12
 PKGNAME=       p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=      Perl 5 module to manipulate mai
 LICENSE=       ${PERL5_LICENSE}
 
 USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Mail/Alias/.packlist
+PERL5_PACKLIST=        auto/Mail/Alias/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/p5-Mail-SPF/Makefile
diff -u pkgsrc/mail/p5-Mail-SPF/Makefile:1.16 pkgsrc/mail/p5-Mail-SPF/Makefile:1.17
--- pkgsrc/mail/p5-Mail-SPF/Makefile:1.16       Sun Aug 11 13:21:37 2019
+++ pkgsrc/mail/p5-Mail-SPF/Makefile    Sat Nov  2 16:25:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:21:37 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 16:25:25 rillig Exp $
 
 DISTNAME=      Mail-SPF-v2.9.0
 PKGNAME=       p5-${DISTNAME:S/-v/-/}
@@ -12,7 +12,7 @@ COMMENT=      Perl implementation of the Send
 LICENSE=       modified-bsd
 
 BUILD_DEPENDS+=                p5-Net-DNS-Resolver-Programmable-[0-9]*:../../net/p5-Net-DNS-Resolver-Programmable
-#BUILD_DEPENDS+=               {perl>=5.6.2,p5-Test-Simple>=0.10}:../../devel/p5-Test-Simple
+#BUILD_DEPENDS+=       {perl>=5.6.2,p5-Test-Simple>=0.10}:../../devel/p5-Test-Simple
 
 #DEPENDS+=     {perl>=5.9.0,p5-version-[0-9]*}:../../devel/p5-version
 DEPENDS+=      p5-Error-[0-9]*:../../devel/p5-Error

Index: pkgsrc/mail/p5-Mail-SRS/Makefile
diff -u pkgsrc/mail/p5-Mail-SRS/Makefile:1.26 pkgsrc/mail/p5-Mail-SRS/Makefile:1.27
--- pkgsrc/mail/p5-Mail-SRS/Makefile:1.26       Sun Aug 11 13:21:38 2019
+++ pkgsrc/mail/p5-Mail-SRS/Makefile    Sat Nov  2 16:25:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/02 16:25:25 rillig Exp $
 
 DISTNAME=      Mail-SRS-0.31
 PKGNAME=       p5-${DISTNAME}
@@ -12,10 +12,10 @@ COMMENT=    SMTP envelope sender rewriting 
 
 CONFLICTS+=    libsrs2-[0-9]*
 
-#DEPENDS+=     {perl>=5.8.1,p5-DB_File>=1.806}:../../databases/p5-DB_File
-DEPENDS+=      p5-Digest-HMAC>=1.01:../../security/p5-Digest-HMAC
-DEPENDS+=      p5-MLDBM>=2.01:../../databases/p5-MLDBM
-#DEPENDS+=     p5-Storable>=2.04:../../devel/p5-Storable
+#DEPENDS+=             {perl>=5.8.1,p5-DB_File>=1.806}:../../databases/p5-DB_File
+DEPENDS+=              p5-Digest-HMAC>=1.01:../../security/p5-Digest-HMAC
+DEPENDS+=              p5-MLDBM>=2.01:../../databases/p5-MLDBM
+#DEPENDS+=             p5-Storable>=2.04:../../devel/p5-Storable
 #BUILD_DEPENDS+=       {perl>=5.6.2,p5-Test-Simple>=0.40}:../../devel/p5-Test-Simple
 
 PERL5_PACKLIST=        auto/Mail/SRS/.packlist

Index: pkgsrc/mail/p5-Mail-Sender/Makefile
diff -u pkgsrc/mail/p5-Mail-Sender/Makefile:1.22 pkgsrc/mail/p5-Mail-Sender/Makefile:1.23
--- pkgsrc/mail/p5-Mail-Sender/Makefile:1.22    Sun Aug 11 13:21:38 2019
+++ pkgsrc/mail/p5-Mail-Sender/Makefile Sat Nov  2 16:25:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/02 16:25:25 rillig Exp $
 
 DISTNAME=      Mail-Sender-0.903
 PKGNAME=       p5-${DISTNAME}
@@ -15,8 +15,8 @@ LICENSE=      ${PERL5_LICENSE}
 
 PERL5_PACKLIST=        auto/Mail/Sender/.packlist
 
-BUILD_TARGET=pure_all
-INSTALL_TARGET=pure_install
+BUILD_TARGET=  pure_all
+INSTALL_TARGET=        pure_install
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/p5-Mail-Sender-Easy/Makefile
diff -u pkgsrc/mail/p5-Mail-Sender-Easy/Makefile:1.17 pkgsrc/mail/p5-Mail-Sender-Easy/Makefile:1.18
--- pkgsrc/mail/p5-Mail-Sender-Easy/Makefile:1.17       Sun Aug 11 13:21:38 2019
+++ pkgsrc/mail/p5-Mail-Sender-Easy/Makefile    Sat Nov  2 16:25:25 2019
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 16:25:25 rillig Exp $
 #
 
 DISTNAME=      Mail-Sender-Easy-v0.0.5
 PKGNAME=       p5-${DISTNAME:S:-v:-:}
 PKGREVISION=   12
 CATEGORIES=    mail perl5
-MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DM/DMUEY/}
+MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DM/DMUEY/}
 
 MAINTAINER=    abs%NetBSD.org@localhost
 #HOMEPAGE=     http://search.cpan.org/~dmuey/Mail-Sender/
 COMMENT=       Simplified interface to Mail::Sender
 
 DEPENDS+=      p5-Mail-Sender>=0:../../mail/p5-Mail-Sender
-#DEPENDS+=       {perl>=5.9.0,p5-version>=0}:../../devel/p5-version
+#DEPENDS+=     {perl>=5.9.0,p5-version>=0}:../../devel/p5-version
 
 PERL5_PACKLIST=        auto/Mail/Sender/Easy/.packlist
 

Index: pkgsrc/mail/perdition/Makefile.common
diff -u pkgsrc/mail/perdition/Makefile.common:1.9 pkgsrc/mail/perdition/Makefile.common:1.10
--- pkgsrc/mail/perdition/Makefile.common:1.9   Mon Apr  8 11:17:16 2013
+++ pkgsrc/mail/perdition/Makefile.common       Sat Nov  2 16:25:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2013/04/08 11:17:16 rodent Exp $
+# $NetBSD: Makefile.common,v 1.10 2019/11/02 16:25:25 rillig Exp $
 #
 # used by mail/perdition-bdb/Makefile
 # used by mail/perdition-gdbm/Makefile
@@ -36,10 +36,10 @@ DEPENDS+=           perdition-${PERDITION_VERSION
 BUILD_DIRS?=           perdition/db/${PERDITION_PKGNAME}
 .endif
 
-PERDITION_SKIP_DISABLE?=${PERDITION_PKGNAME}
+PERDITION_SKIP_DISABLE?=       ${PERDITION_PKGNAME}
 .for f in mysql odbc pg gdbm bdb ldap ldap-doc
 .  if empty(PERDITION_SKIP_DISABLE:M$f)
-CONFIGURE_ARGS+=       --disable-${f}
+CONFIGURE_ARGS+=               --disable-${f}
 .  endif
 .endfor
 

Index: pkgsrc/mail/pine/Makefile
diff -u pkgsrc/mail/pine/Makefile:1.136 pkgsrc/mail/pine/Makefile:1.137
--- pkgsrc/mail/pine/Makefile:1.136     Thu Mar 23 17:32:39 2017
+++ pkgsrc/mail/pine/Makefile   Sat Nov  2 16:25:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2017/03/23 17:32:39 joerg Exp $
+# $NetBSD: Makefile,v 1.137 2019/11/02 16:25:26 rillig Exp $
 
 DISTNAME=      pine4.64
 PKGNAME=       pine-4.64
@@ -13,7 +13,7 @@ HOMEPAGE=     http://www.washington.edu/pine
 COMMENT=       Program for Internet News and E-mail
 LICENSE=       pine-license
 
-CONF_FILES=    ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf
+CONF_FILES=    ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf
 
 .include "../../mk/compiler.mk"
 

Index: pkgsrc/mail/pine-pgp-filters/Makefile
diff -u pkgsrc/mail/pine-pgp-filters/Makefile:1.13 pkgsrc/mail/pine-pgp-filters/Makefile:1.14
--- pkgsrc/mail/pine-pgp-filters/Makefile:1.13  Sun Sep  3 08:53:11 2017
+++ pkgsrc/mail/pine-pgp-filters/Makefile       Sat Nov  2 16:25:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/09/03 08:53:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/02 16:25:26 rillig Exp $
 #
 
 DISTNAME=              pine-pgp-filters-1.6
@@ -13,8 +13,8 @@ COMMENT=              Filters to integrate Pine with
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
 
-DOCDIR=                         ${PREFIX}/share/doc/pine-pgp-filters
-DOCFILES=              BUGS CHANGES INSTALL LICENSE README
+DOCDIR=                ${PREFIX}/share/doc/pine-pgp-filters
+DOCFILES=      BUGS CHANGES INSTALL LICENSE README
 
 DEPENDS+=      gnupg>=1.4.9:../../security/gnupg
 

Index: pkgsrc/mail/poppassd/Makefile
diff -u pkgsrc/mail/poppassd/Makefile:1.29 pkgsrc/mail/poppassd/Makefile:1.30
--- pkgsrc/mail/poppassd/Makefile:1.29  Thu May 23 19:23:07 2019
+++ pkgsrc/mail/poppassd/Makefile       Sat Nov  2 16:25:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/05/23 19:23:07 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/02 16:25:26 rillig Exp $
 #
 
 DISTNAME=              qpopper${VERSION}
@@ -22,8 +22,8 @@ SUBST_VARS.prefix=    PREFIX
 .include "../../mail/qpopper/Makefile.common"
 
 CONFIGURE_ARGS+=       --enable-poppassd --without-pam
-CONFIGURE_ENV+=        CDEFS='-DSMBPASSWD_BINARY=\"${LOCALBASE}/bin/smbpasswd\"'
-MAKE_ENV+=     ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q}
+CONFIGURE_ENV+=                CDEFS='-DSMBPASSWD_BINARY=\"${LOCALBASE}/bin/smbpasswd\"'
+MAKE_ENV+=             ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q}
 
 .include "options.mk"
 

Index: pkgsrc/mail/postfix/Makefile.common
diff -u pkgsrc/mail/postfix/Makefile.common:1.20 pkgsrc/mail/postfix/Makefile.common:1.21
--- pkgsrc/mail/postfix/Makefile.common:1.20    Mon Sep 23 20:00:07 2019
+++ pkgsrc/mail/postfix/Makefile.common Sat Nov  2 16:25:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2019/09/23 20:00:07 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.21 2019/11/02 16:25:26 rillig Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
 
@@ -121,7 +121,7 @@ CCARGS+=            -DNO_NISPLUS
 
 CFLAGS.SunOS+=         -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
-DESTDIR_INSTALLOPTIONS=-package install_root="${DESTDIR}"
+DESTDIR_INSTALLOPTIONS=        -package install_root="${DESTDIR}"
 
 do-configure:
        cd ${WRKSRC} &&                                                 \

Index: pkgsrc/mail/prayer/Makefile
diff -u pkgsrc/mail/prayer/Makefile:1.62 pkgsrc/mail/prayer/Makefile:1.63
--- pkgsrc/mail/prayer/Makefile:1.62    Sun Aug 11 13:21:40 2019
+++ pkgsrc/mail/prayer/Makefile Sat Nov  2 16:25:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2019/08/11 13:21:40 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2019/11/02 16:25:26 rillig Exp $
 
 DISTNAME=      prayer-1.3.5
 PKGREVISION=   2
@@ -8,7 +8,7 @@ MASTER_SITES=   ftp://ftp.csx.cam.ac.uk/pu
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=     http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
 COMMENT=       Small, fast, web mail interface
-LICENSE=               gnu-gpl-v2
+LICENSE=       gnu-gpl-v2
 
 BDB_ACCEPTED=          db4 db5
 USE_TOOLS+=            gmake perl
@@ -49,7 +49,7 @@ CONF_FILES+=  ${EGDIR}/motd.html ${PKG_SY
 
 VAR_PREFIX=    ${VARBASE}/spool/prayer
 
-OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
+OWN_DIRS_PERMS+=       ${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
 
 FILES_SUBST+=  OPSYS=${OPSYS}
 FILES_SUBST+=  VAR_PREFIX=${VAR_PREFIX:Q}

Index: pkgsrc/mail/procmail/Makefile
diff -u pkgsrc/mail/procmail/Makefile:1.51 pkgsrc/mail/procmail/Makefile:1.52
--- pkgsrc/mail/procmail/Makefile:1.51  Tue Jul  9 15:46:42 2019
+++ pkgsrc/mail/procmail/Makefile       Sat Nov  2 16:25:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/07/09 15:46:42 riastradh Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/02 16:25:26 rillig Exp $
 
 DISTNAME=      procmail-3.22
 PKGREVISION=   5
@@ -12,8 +12,8 @@ LICENSE=      artistic OR gnu-gpl-v2
 
 MAKE_JOBS_SAFE=        no
 
-MAKE_ENV+=     SHELL=${SH:Q} CHMOD=${CHMOD:Q}
-INSTALL_TARGET=        install-suid install.man
+MAKE_ENV+=             SHELL=${SH:Q} CHMOD=${CHMOD:Q}
+INSTALL_TARGET=                install-suid install.man
 UNLIMIT_RESOURCES=     datasize
 
 SPECIAL_PERMS+=        bin/procmail ${SETUID_ROOT_PERMS}
@@ -29,7 +29,7 @@ INSTALLATION_DIRS=    bin ${PKGMANDIR}/man1
 
 ### Inlining functions (implied by -O3 or higher) cause the strstr() test
 ### to enter an infinite loop so disable it.  This fixes PR pkg/30999.
-CFLAGS+=        -fno-inline-functions
+CFLAGS+=       -fno-inline-functions
 
 pre-configure:
        ${ECHO} "#define TRUSTED_IDS {${PROCMAIL_TRUSTED_IDS:Q}}"       \

Index: pkgsrc/mail/py-libgmail/Makefile
diff -u pkgsrc/mail/py-libgmail/Makefile:1.15 pkgsrc/mail/py-libgmail/Makefile:1.16
--- pkgsrc/mail/py-libgmail/Makefile:1.15       Mon Sep  2 13:19:56 2019
+++ pkgsrc/mail/py-libgmail/Makefile    Sat Nov  2 16:25:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/09/02 13:19:56 adam Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:26 rillig Exp $
 
 DISTNAME=      libgmail-0.1.11
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=     ${PYPKGPREFIX}-mechanize-[0-9]
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-mechanize
+PYTHON_VERSIONS_ACCEPTED=      27 # py-mechanize
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.114 pkgsrc/mail/qmail/Makefile:1.115
--- pkgsrc/mail/qmail/Makefile:1.114    Tue Aug 20 02:38:04 2019
+++ pkgsrc/mail/qmail/Makefile  Sat Nov  2 16:25:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2019/08/20 02:38:04 schmonz Exp $
+# $NetBSD: Makefile,v 1.115 2019/11/02 16:25:26 rillig Exp $
 #
 
 DISTNAME=              notqmail-1.07
@@ -110,20 +110,20 @@ SUBST_VARS.config=        SORT MV CP PKG_SYSCON
 
 SUBST_FILES.djbware+=  cdb_seek.c dns.c
 
-PKG_USERS_VARS+=       QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER
-PKG_USERS_VARS+=       QMAIL_ROOT_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER
-PKG_USERS_VARS+=       QMAIL_REMOTE_USER QMAIL_SEND_USER
-PKG_GROUPS_VARS+=      QMAIL_QMAIL_GROUP QMAIL_NOFILES_GROUP
-PKG_GROUPS=            ${QMAIL_QMAIL_GROUP} ${QMAIL_NOFILES_GROUP}
-PKG_USERS+=            ${QMAIL_ALIAS_USER}:${QMAIL_NOFILES_GROUP}
-PKG_USERS+=            ${QMAIL_DAEMON_USER}:${QMAIL_NOFILES_GROUP}
-PKG_USERS+=            ${QMAIL_LOG_USER}:${QMAIL_NOFILES_GROUP}
-PKG_USERS+=            ${QMAIL_PASSWD_USER}:${QMAIL_NOFILES_GROUP}
-PKG_USERS+=            ${QMAIL_QUEUE_USER}:${QMAIL_QMAIL_GROUP}
-PKG_USERS+=            ${QMAIL_REMOTE_USER}:${QMAIL_QMAIL_GROUP}
-PKG_USERS+=            ${QMAIL_SEND_USER}:${QMAIL_QMAIL_GROUP}
+PKG_USERS_VARS+=               QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER
+PKG_USERS_VARS+=               QMAIL_ROOT_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER
+PKG_USERS_VARS+=               QMAIL_REMOTE_USER QMAIL_SEND_USER
+PKG_GROUPS_VARS+=              QMAIL_QMAIL_GROUP QMAIL_NOFILES_GROUP
+PKG_GROUPS=                    ${QMAIL_QMAIL_GROUP} ${QMAIL_NOFILES_GROUP}
+PKG_USERS+=                    ${QMAIL_ALIAS_USER}:${QMAIL_NOFILES_GROUP}
+PKG_USERS+=                    ${QMAIL_DAEMON_USER}:${QMAIL_NOFILES_GROUP}
+PKG_USERS+=                    ${QMAIL_LOG_USER}:${QMAIL_NOFILES_GROUP}
+PKG_USERS+=                    ${QMAIL_PASSWD_USER}:${QMAIL_NOFILES_GROUP}
+PKG_USERS+=                    ${QMAIL_QUEUE_USER}:${QMAIL_QMAIL_GROUP}
+PKG_USERS+=                    ${QMAIL_REMOTE_USER}:${QMAIL_QMAIL_GROUP}
+PKG_USERS+=                    ${QMAIL_SEND_USER}:${QMAIL_QMAIL_GROUP}
 .for user in ${PKG_USERS:C/\:.*//}
-PKG_HOME.${user}=      ${QMAILDIR}
+PKG_HOME.${user}=              ${QMAILDIR}
 .endfor
 PKG_HOME.${QMAIL_ALIAS_USER}=  ${QMAILDIR}/alias
 
@@ -141,14 +141,14 @@ QMAILPATCHES+=                    bigdns:${BIGDNS_PATCH}
 BIGDNS_PATCH=                  qmail-103.patch
 PATCHFILES+=                   ${BIGDNS_PATCH}
 SITES.${BIGDNS_PATCH}=         https://www.ckdhr.com/ckd/
-PATCH_DIST_STRIP.${BIGDNS_PATCH}=-p1
+PATCH_DIST_STRIP.${BIGDNS_PATCH}= -p1
 
-QMAILPATCHES+=                 maildiruniq:${MAILDIRUNIQ_PATCH}
-MAILDIRUNIQ_PATCH=             qmail-1.03-maildir-uniq.patch
-PATCHFILES+=                   ${MAILDIRUNIQ_PATCH}
-SITES.${MAILDIRUNIQ_PATCH}=    http://www.memoryhole.net/qmail/
-PATCH_DIST_STRIP.${MAILDIRUNIQ_PATCH}=-p1
-PATCH_DIST_CAT.${MAILDIRUNIQ_PATCH}= \
+QMAILPATCHES+=                         maildiruniq:${MAILDIRUNIQ_PATCH}
+MAILDIRUNIQ_PATCH=                     qmail-1.03-maildir-uniq.patch
+PATCHFILES+=                           ${MAILDIRUNIQ_PATCH}
+SITES.${MAILDIRUNIQ_PATCH}=            http://www.memoryhole.net/qmail/
+PATCH_DIST_STRIP.${MAILDIRUNIQ_PATCH}= -p1
+PATCH_DIST_CAT.${MAILDIRUNIQ_PATCH}=   \
                                ${SED} -e 's|"057"|"\\\\057"|' \
                                -e 's|"072"|"\\\\072"|' \
                                < ${MAILDIRUNIQ_PATCH}

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.66 pkgsrc/mail/qmail/options.mk:1.67
--- pkgsrc/mail/qmail/options.mk:1.66   Tue Aug 20 02:38:04 2019
+++ pkgsrc/mail/qmail/options.mk        Sat Nov  2 16:25:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.66 2019/08/20 02:38:04 schmonz Exp $
+# $NetBSD: options.mk,v 1.67 2019/11/02 16:25:26 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=                eai inet6 pam syncdir tai-system-clock tls
@@ -24,11 +24,11 @@ DEPENDS+=                   checkpassword>=0.90nb1:../..
 .endif
 
 .if !empty(PKG_OPTIONS:Mqmail-customerror)
-QMAILPATCHES+=                 customerror:${CUSTOMERROR_PATCH}
-CUSTOMERROR_PATCH=             qmail-queue-custom-error-v2.netqmail-1.05.patch
-PATCHFILES+=                   ${CUSTOMERROR_PATCH}
-SITES.${CUSTOMERROR_PATCH}=    https://notes.sagredo.eu/files/qmail/patches/
-PATCH_DIST_STRIP.${CUSTOMERROR_PATCH}=-p1
+QMAILPATCHES+=                         customerror:${CUSTOMERROR_PATCH}
+CUSTOMERROR_PATCH=                     qmail-queue-custom-error-v2.netqmail-1.05.patch
+PATCHFILES+=                           ${CUSTOMERROR_PATCH}
+SITES.${CUSTOMERROR_PATCH}=            https://notes.sagredo.eu/files/qmail/patches/
+PATCH_DIST_STRIP.${CUSTOMERROR_PATCH}= -p1
 PATCH_DIST_CAT.${CUSTOMERROR_PATCH}=   ${SED} -e 's|vfork|fork|g' < ${CUSTOMERROR_PATCH}
 .endif
 
@@ -66,19 +66,19 @@ SUBST_MESSAGE.load=         Setting linker flag
 .endif
 
 .if !empty(PKG_OPTIONS:Mtai-system-clock)
-QMAILPATCHES+=                 taileapsecs:${TAILEAPSECS_PATCH}
-TAILEAPSECS_PATCH=             netqmail-1.05-TAI-leapsecs.patch
-PATCHFILES+=                   ${TAILEAPSECS_PATCH}
-SITES.${TAILEAPSECS_PATCH}=    https://su.bze.ro/software/
-PATCH_DIST_STRIP.${TAILEAPSECS_PATCH}=-p1
-PATCH_DIST_CAT.${TAILEAPSECS_PATCH}= \
+QMAILPATCHES+=                         taileapsecs:${TAILEAPSECS_PATCH}
+TAILEAPSECS_PATCH=                     netqmail-1.05-TAI-leapsecs.patch
+PATCHFILES+=                           ${TAILEAPSECS_PATCH}
+SITES.${TAILEAPSECS_PATCH}=            https://su.bze.ro/software/
+PATCH_DIST_STRIP.${TAILEAPSECS_PATCH}= -p1
+PATCH_DIST_CAT.${TAILEAPSECS_PATCH}=   \
                                ${SED} -e 's|"/etc/leapsecs.dat"|"@PKG_SYSCONFDIR@/leapsecs.dat"|' \
                                < ${TAILEAPSECS_PATCH}
-SUBST_CLASSES+=                        libtai
-SUBST_STAGE.libtai=            do-configure
-SUBST_FILES.libtai=            leapsecs_read.c
-SUBST_SED.libtai=              -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR.libtai}|g'
-DEPENDS+=                      libtai>=0.60nb5:../../devel/libtai
+SUBST_CLASSES+=                                libtai
+SUBST_STAGE.libtai=                    do-configure
+SUBST_FILES.libtai=                    leapsecs_read.c
+SUBST_SED.libtai=                      -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR.libtai}|g'
+DEPENDS+=                              libtai>=0.60nb5:../../devel/libtai
 .endif
 
 PLIST_VARS+=                   tls

Index: pkgsrc/mail/qmail-conf/Makefile
diff -u pkgsrc/mail/qmail-conf/Makefile:1.32 pkgsrc/mail/qmail-conf/Makefile:1.33
--- pkgsrc/mail/qmail-conf/Makefile:1.32        Sun Jul 29 23:20:30 2018
+++ pkgsrc/mail/qmail-conf/Makefile     Sat Nov  2 16:25:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2018/07/29 23:20:30 schmonz Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/02 16:25:26 rillig Exp $
 #
 
 DISTNAME=              qmail-conf-0.60
@@ -6,7 +6,7 @@ PKGREVISION=            5
 CATEGORIES=            mail
 MASTER_SITES=          http://woodsheep.jp/qmail-conf/
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} djbdns-1.05${EXTRACT_SUFX}
-SITES.djbdns-1.05.tar.gz=http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/
+SITES.djbdns-1.05.tar.gz= http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://woodsheep.jp/qmail-conf.html

Index: pkgsrc/mail/qpopper/options.mk
diff -u pkgsrc/mail/qpopper/options.mk:1.13 pkgsrc/mail/qpopper/options.mk:1.14
--- pkgsrc/mail/qpopper/options.mk:1.13 Tue Jun 12 15:45:58 2012
+++ pkgsrc/mail/qpopper/options.mk      Sat Nov  2 16:25:27 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.13 2012/06/12 15:45:58 wiz Exp $
+# $NetBSD: options.mk,v 1.14 2019/11/02 16:25:27 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.qpopper
-PKG_SUPPORTED_OPTIONS= drac inet6 kerberos pam qpopper-servermode ssl
-PKG_SUGGESTED_OPTIONS= inet6 ssl
+PKG_OPTIONS_VAR=               PKG_OPTIONS.qpopper
+PKG_SUPPORTED_OPTIONS=         drac inet6 kerberos pam qpopper-servermode ssl
+PKG_SUGGESTED_OPTIONS=         inet6 ssl
 PKG_OPTIONS_LEGACY_VARS+=      QPOPPER_SERVERMODE:qpopper-servermode
 PKG_OPTIONS_LEGACY_VARS+=      QPOPPER_USE_DRAC:drac
 

Index: pkgsrc/mail/queue-repair/Makefile
diff -u pkgsrc/mail/queue-repair/Makefile:1.12 pkgsrc/mail/queue-repair/Makefile:1.13
--- pkgsrc/mail/queue-repair/Makefile:1.12      Thu Apr 25 07:33:04 2019
+++ pkgsrc/mail/queue-repair/Makefile   Sat Nov  2 16:25:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/04/25 07:33:04 maya Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 16:25:27 rillig Exp $
 #
 
 DISTNAME=              queue-repair-0.9.0
@@ -13,7 +13,7 @@ LICENSE=              gnu-gpl-v2
 
 SYMLINK3_PATCH=                queue-repair-0.9.0-symlink3-20180724.patch
 PATCHFILES+=           ${SYMLINK3_PATCH}
-SITES.${SYMLINK3_PATCH}=https://schmonz.com/qmail/queuerepairsymlink3/
+SITES.${SYMLINK3_PATCH}= https://schmonz.com/qmail/queuerepairsymlink3/
 
 REPLACE_PYTHON=                queue_repair.py
 

Index: pkgsrc/mail/quickml/options.mk
diff -u pkgsrc/mail/quickml/options.mk:1.1.1.1 pkgsrc/mail/quickml/options.mk:1.2
--- pkgsrc/mail/quickml/options.mk:1.1.1.1      Sun Jun 19 10:01:53 2011
+++ pkgsrc/mail/quickml/options.mk      Sat Nov  2 16:25:27 2019
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/06/19 10:01:53 obache Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 16:25:27 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.quickml
-PKG_SUPPORTED_OPTIONS+= quickml-analog quickml-limit
+PKG_SUPPORTED_OPTIONS+=        quickml-analog quickml-limit
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=   analog
 
 .if !empty(PKG_OPTIONS:Mlimit)
-LIMIT_PATCH=   quickml-0.7-limited.patch
-PATCHFILES+=   ${LIMIT_PATCH}
+LIMIT_PATCH=           quickml-0.7-limited.patch
+PATCHFILES+=           ${LIMIT_PATCH}
 #SITES.${LIMIT_PATCH}= http://linux.matchy.net/view.xcg?c=plugin;plugin=attach_download;p=QuickMLLimited;file_name=
 SITES.${LIMIT_PATCH}=  http://matchy.s28.xrea.com/hiki.xcg?c=plugin;plugin=attach_download;p=QuickMLLimited;file_name=
 PATCH_DIST_STRIP.${LIMIT_PATCH}=       -p1
@@ -17,10 +17,10 @@ PATCH_DIST_STRIP.${LIMIT_PATCH}=    -p1
 
 
 .if !empty(PKG_OPTIONS:Mquickml-analog)
-USE_TOOLS+=    gs:run
-DEPENDS+=      ImageMagick-[0-9]*:../../graphics/ImageMagick
-DEPENDS+=      gnuplot>=3.7:../../graphics/gnuplot
-PLIST.analog=  yes
+USE_TOOLS+=            gs:run
+DEPENDS+=              ImageMagick-[0-9]*:../../graphics/ImageMagick
+DEPENDS+=              gnuplot>=3.7:../../graphics/gnuplot
+PLIST.analog=          yes
 .else
 SUBST_CLASSES+=                analog
 SUBST_STAGE.analog=    pre-configure

Index: pkgsrc/mail/re-alpine/Makefile
diff -u pkgsrc/mail/re-alpine/Makefile:1.17 pkgsrc/mail/re-alpine/Makefile:1.18
--- pkgsrc/mail/re-alpine/Makefile:1.17 Mon Sep  4 18:08:25 2017
+++ pkgsrc/mail/re-alpine/Makefile      Sat Nov  2 16:25:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/09/04 18:08:25 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 16:25:27 rillig Exp $
 #
 
 DISTNAME=      re-alpine-2.03
@@ -15,24 +15,24 @@ CONFLICTS=  alpine-[0-9]*
 
 .include "options.mk"
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE}
-CONFIGURE_ARGS+= --with-ssl-certs-dir=${SSLCERTS:Q}
-CONFIGURE_ARGS+= --with-ssl-include-dir=${SSLBASE}/include
-CONFIGURE_ARGS+= --with-ssl-lib-dir=${SSLBASE}/lib
-CONFIGURE_ARGS+= --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf
-CONFIGURE_ARGS+= --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed
-CONFIGURE_ARGS+= --with-smime
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-ssl-dir=${SSLBASE}
+CONFIGURE_ARGS+=       --with-ssl-certs-dir=${SSLCERTS:Q}
+CONFIGURE_ARGS+=       --with-ssl-include-dir=${SSLBASE}/include
+CONFIGURE_ARGS+=       --with-ssl-lib-dir=${SSLBASE}/lib
+CONFIGURE_ARGS+=       --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf
+CONFIGURE_ARGS+=       --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed
+CONFIGURE_ARGS+=       --with-smime
 
 USE_LIBTOOL=   yes
 
-MAKE_JOBS_SAFE=         no
+MAKE_JOBS_SAFE=                no
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M4.99.*) && empty(OS_VERSION:M[5-9]*)
-CONFIGURE_ARGS+= --without-pthread
+CONFIGURE_ARGS+=       --without-pthread
 .endif
 
 SUBST_CLASSES.MirBSD+=         mirbsd

Index: pkgsrc/mail/re-alpine/options.mk
diff -u pkgsrc/mail/re-alpine/options.mk:1.2 pkgsrc/mail/re-alpine/options.mk:1.3
--- pkgsrc/mail/re-alpine/options.mk:1.2        Wed Oct 10 19:49:07 2012
+++ pkgsrc/mail/re-alpine/options.mk    Sat Nov  2 16:25:27 2019
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2012/10/10 19:49:07 markd Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/02 16:25:27 rillig Exp $
 #
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.alpine
-PKG_SUPPORTED_OPTIONS=  ldap kerberos pinepwd
-PKG_SUGGESTED_OPTIONS=  pinepwd
+PKG_OPTIONS_VAR=       PKG_OPTIONS.alpine
+PKG_SUPPORTED_OPTIONS= ldap kerberos pinepwd
+PKG_SUGGESTED_OPTIONS= pinepwd
 
 .include "../../mk/bsd.options.mk"
 
@@ -26,5 +26,5 @@ CONFIGURE_ARGS+=        --with-ldap
 .endif
 
 .if !empty(PKG_OPTIONS:Mpinepwd)
-CONFIGURE_ARGS+= --with-passfile=.pinepwd
+CONFIGURE_ARGS+=       --with-passfile=.pinepwd
 .endif

Index: pkgsrc/mail/ripmime/Makefile
diff -u pkgsrc/mail/ripmime/Makefile:1.13 pkgsrc/mail/ripmime/Makefile:1.14
--- pkgsrc/mail/ripmime/Makefile:1.13   Mon Dec 22 19:35:51 2014
+++ pkgsrc/mail/ripmime/Makefile        Sat Nov  2 16:25:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/12/22 19:35:51 shattered Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/02 16:25:27 rillig Exp $
 #
 
 DISTNAME=      ripmime-1.4.0.10
@@ -10,7 +10,7 @@ MAINTAINER=   reed%reedmedia.net@localhost
 HOMEPAGE=      http://www.pldaniels.com/ripmime/
 COMMENT=       Extract the attached files out of a MIME encoded email package
 
-MAKE_JOBS_SAFE=                no
+MAKE_JOBS_SAFE=        no
 MAKE_ENV+=     LIBS="${BUILDLINK_LDFLAGS} ${BUILDLINK_LDADD.iconv}"
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1

Index: pkgsrc/mail/roundcube-plugin-enigma/Makefile
diff -u pkgsrc/mail/roundcube-plugin-enigma/Makefile:1.6 pkgsrc/mail/roundcube-plugin-enigma/Makefile:1.7
--- pkgsrc/mail/roundcube-plugin-enigma/Makefile:1.6    Sun Sep  1 13:08:55 2019
+++ pkgsrc/mail/roundcube-plugin-enigma/Makefile        Sat Nov  2 16:25:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/09/01 13:08:55 taca Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 16:25:27 rillig Exp $
 
 PLUGIN=                enigma
 
@@ -8,7 +8,7 @@ LICENSE=        gnu-gpl-v3
 
 # JavaScript dependencies from bin/install-jsdeps.sh
 SITES.openpgp.min.js=  https://raw.githubusercontent.com/openpgpjs/openpgpjs/v2.6.2/dist/
-DISTFILES+=    openpgp.min.js
+DISTFILES+=            openpgp.min.js
 
 DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Crypt_GPG>=1.4.3:../../security/pear-Crypt_GPG
 

Index: pkgsrc/mail/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.54 pkgsrc/mail/rspamd/Makefile:1.55
--- pkgsrc/mail/rspamd/Makefile:1.54    Sun Aug 11 13:21:41 2019
+++ pkgsrc/mail/rspamd/Makefile Sat Nov  2 16:25:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/08/11 13:21:41 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2019/11/02 16:25:27 rillig Exp $
 
 DISTNAME=      rspamd-1.9.4
 PKGREVISION=   1
@@ -23,7 +23,7 @@ BUILD_DEFS+=  VARBASE
 # Not really true, but difficult to avoid picking up 5.3
 LUA_VERSIONS_ACCEPTED= 53
 
-CPPFLAGS.SunOS+=       -D__EXTENSIONS__
+CPPFLAGS.SunOS+=               -D__EXTENSIONS__
 BUILDLINK_TRANSFORM.Darwin+=   rm:-lrt
 
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd

Index: pkgsrc/mail/sma/Makefile
diff -u pkgsrc/mail/sma/Makefile:1.17 pkgsrc/mail/sma/Makefile:1.18
--- pkgsrc/mail/sma/Makefile:1.17       Thu Jan 23 12:20:47 2014
+++ pkgsrc/mail/sma/Makefile    Sat Nov  2 16:25:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/01/23 12:20:47 tron Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 16:25:27 rillig Exp $
 
 DISTNAME=      sma-1.4
 PKGREVISION=   1
@@ -19,7 +19,7 @@ BUILD_TARGET= sma
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "IRIX"
-CFLAGS+=       -DUSE_REGEXP
+CFLAGS+=               -DUSE_REGEXP
 .endif
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man8 share/doc/sma share/examples/sma
 

Index: pkgsrc/mail/spamassassin/Makefile
diff -u pkgsrc/mail/spamassassin/Makefile:1.135 pkgsrc/mail/spamassassin/Makefile:1.136
--- pkgsrc/mail/spamassassin/Makefile:1.135     Sun Aug 11 13:21:42 2019
+++ pkgsrc/mail/spamassassin/Makefile   Sat Nov  2 16:25:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2019/08/11 13:21:42 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2019/11/02 16:25:28 rillig Exp $
 
 DISTNAME=      Mail-SpamAssassin-3.4.2
 PKGNAME=       spamassassin-3.4.2
@@ -20,13 +20,13 @@ LICENSE=    apache-2.0
 
 SMF_METHODS=   spamassassin
 
-RULESARCHIVE=  Mail-SpamAssassin-rules-3.4.2.r1840640.tgz
-#RULESARCHIVEASC=${RULESARCHIVE}.asc
-#RULESARCHIVESHA=${RULESARCHIVE}.sha1
-FILES_SUBST+=  RULESARCHIVE=${RULESDIR}/${RULESARCHIVE}
-PLIST_SUBST+=  RULESARCHIVE=${RULESARCHIVE:Q}
-#PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q}
-#PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q}
+RULESARCHIVE=          Mail-SpamAssassin-rules-3.4.2.r1840640.tgz
+#RULESARCHIVEASC=      ${RULESARCHIVE}.asc
+#RULESARCHIVESHA=      ${RULESARCHIVE}.sha1
+FILES_SUBST+=          RULESARCHIVE=${RULESDIR}/${RULESARCHIVE}
+PLIST_SUBST+=          RULESARCHIVE=${RULESARCHIVE:Q}
+#PLIST_SUBST+=         RULESARCHIVEASC=${RULESARCHIVEASC:Q}
+#PLIST_SUBST+=         RULESARCHIVESHA=${RULESARCHIVESHA:Q}
 
 #DEPENDS+=     {perl>=5.9.3,p5-Archive-Tar>=1.23}:../../archivers/p5-Archive-Tar
 #DEPENDS+=     {perl>=5,p5-DB_File-[0-9]*}:../../databases/p5-DB_File
@@ -173,7 +173,7 @@ SA_UPDATE_FETCH_CMD=        ${TOOLS_PLATFORM.cu
 SA_UPDATE_FETCH_PROG=  fetch
 SA_UPDATE_FETCH_CMD=   ${TOOLS_PLATFORM.fetch}
 .else
-DEPENDS+=      wget-[0-9]*:../../net/wget
+DEPENDS+=              wget-[0-9]*:../../net/wget
 
 SA_UPDATE_FETCH_PROG=  wget
 SA_UPDATE_FETCH_CMD=   ${PREFIX}/bin/wget

Index: pkgsrc/mail/spamassassin/options.mk
diff -u pkgsrc/mail/spamassassin/options.mk:1.15 pkgsrc/mail/spamassassin/options.mk:1.16
--- pkgsrc/mail/spamassassin/options.mk:1.15    Sat Jan 26 18:23:05 2019
+++ pkgsrc/mail/spamassassin/options.mk Sat Nov  2 16:25:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2019/01/26 18:23:05 abs Exp $
+# $NetBSD: options.mk,v 1.16 2019/11/02 16:25:28 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.spamassassin
 PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg1
@@ -54,11 +54,11 @@ DEPENDS+=           p5-IO-Socket-INET6-[0-9]*:../
 # use gnupg2 instead of gnupg1
 #
 .if empty(PKG_OPTIONS:Mgnupg1)
-DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
-GPGPATH=       ${PREFIX}/bin/gpg2
+DEPENDS+=              gnupg2-[0-9]*:../../security/gnupg2
+GPGPATH=               ${PREFIX}/bin/gpg2
 .else
-DEPENDS+=      gnupg>=1.0.0:../../security/gnupg
-GPGPATH=       ${PREFIX}/bin/gpg
+DEPENDS+=              gnupg>=1.0.0:../../security/gnupg
+GPGPATH=               ${PREFIX}/bin/gpg
 .endif
 SUBST_CLASSES+=                gpgpath
 SUBST_STAGE.gpgpath=   pre-configure

Index: pkgsrc/mail/ssmtp/Makefile
diff -u pkgsrc/mail/ssmtp/Makefile:1.33 pkgsrc/mail/ssmtp/Makefile:1.34
--- pkgsrc/mail/ssmtp/Makefile:1.33     Thu May 23 19:23:09 2019
+++ pkgsrc/mail/ssmtp/Makefile  Sat Nov  2 16:25:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/05/23 19:23:09 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/02 16:25:28 rillig Exp $
 #
 # TLS functionality needs testing. Please let me know the result,
 # and preferably info about your system.
@@ -26,8 +26,8 @@ CONFIGURE_ARGS+=      --sysconfdir=${PKG_SYSC
 
 PKG_SYSCONFSUBDIR=     ${PKGBASE}
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES=    ${EGDIR}/ssmtp.conf ${PKG_SYSCONFDIR}/ssmtp.conf
-CONF_FILES+=   ${EGDIR}/revaliases ${PKG_SYSCONFDIR}/revaliases
+CONF_FILES=            ${EGDIR}/ssmtp.conf ${PKG_SYSCONFDIR}/ssmtp.conf
+CONF_FILES+=           ${EGDIR}/revaliases ${PKG_SYSCONFDIR}/revaliases
 
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}
 

Index: pkgsrc/mail/sympa/Makefile
diff -u pkgsrc/mail/sympa/Makefile:1.71 pkgsrc/mail/sympa/Makefile:1.72
--- pkgsrc/mail/sympa/Makefile:1.71     Sun Aug 11 13:21:42 2019
+++ pkgsrc/mail/sympa/Makefile  Sat Nov  2 16:25:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2019/08/11 13:21:42 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2019/11/02 16:25:28 rillig Exp $
 
 DISTNAME=      sympa-6.2.16
 PKGREVISION=   3
@@ -13,48 +13,48 @@ LICENSE=    gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=   destdir
 
-DEPENDS+=      mhonarc-[0-9]*:../../mail/mhonarc
-DEPENDS+=      p5-Archive-Zip>=1.05:../../archivers/p5-Archive-Zip
-DEPENDS+=      p5-AuthCAS>=1.5:../../security/p5-AuthCAS
-DEPENDS+=      p5-CGI>=2.52:../../www/p5-CGI
-DEPENDS+=      p5-CGI-Fast>=2.10:../../www/p5-CGI-Fast
-DEPENDS+=      p5-Crypt-CipherSaber>=0.50:../../security/p5-Crypt-CipherSaber
-DEPENDS+=      p5-DBD-Sybase>=0.90:../../databases/p5-DBD-Sybase
-DEPENDS+=      p5-DBI>=1.06:../../databases/p5-DBI
-#DEPENDS+=     {perl>=5.10,p5-Digest-MD5>=2.00}:../../security/p5-Digest-MD5
-DEPENDS+=      p5-Email-Date-Format>=1.002:../../mail/p5-Email-Date-Format
-DEPENDS+=      p5-FCGI>=0.67:../../www/p5-FCGI
-DEPENDS+=      p5-File-Copy-Recursive>=0.38:../../sysutils/p5-File-Copy-Recursive
-DEPENDS+=      p5-HTML-Format>=2.10:../../www/p5-HTML-Format
-DEPENDS+=      p5-HTML-StripScripts-Parser>=1.02:../../www/p5-HTML-StripScripts-Parser
-DEPENDS+=      p5-HTML-Tree>=4.2:../../www/p5-HTML-Tree
-DEPENDS+=      p5-IO-Socket-SSL>=0.90:../../security/p5-IO-Socket-SSL
-DEPENDS+=      p5-IO-stringy>=1.0:../../devel/p5-IO-stringy
-DEPENDS+=      p5-Locale-libintl>=1.16:../../misc/p5-Locale-libintl
-#DEPENDS+=     {perl>=5.7.3,p5-MIME-Base64>=1.0}:../../converters/p5-MIME-Base64
-DEPENDS+=      p5-MIME-EncWords>=1.014.000:../../mail/p5-MIME-EncWords
-DEPENDS+=      p5-MIME-Lite-HTML>=1.23:../../mail/p5-MIME-Lite-HTML
-DEPENDS+=      p5-MIME-tools>=5.209:../../mail/p5-MIME-tools
-DEPENDS+=      p5-MailTools>=1.51:../../mail/p5-MailTools
-#DEPENDS+=     {perl>=5.10,p5-Net>=1.0}:../../net/p5-Net
-DEPENDS+=      p5-Net-Netmask>=1.9015:../../devel/p5-Net-Netmask
-DEPENDS+=      p5-Net-SSLeay>=1.16:../../security/p5-Net-SSLeay
-DEPENDS+=      p5-Regexp-Common>=2.120:../../textproc/p5-Regexp-Common
-DEPENDS+=      p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite
-DEPENDS+=      p5-Template-Toolkit>=2.20:../../www/p5-Template-Toolkit
-DEPENDS+=      p5-Term-ProgressBar>=2.09:../../devel/p5-Term-ProgressBar
-#DEPENDS+=     {perl>=5.15.1,p5-Time-HiRes>=1.9724}:../../time/p5-Time-HiRes
-DEPENDS+=      p5-Unicode-LineBreak>=2012.02:../../textproc/p5-Unicode-LineBreak
-DEPENDS+=      p5-XML-LibXML>=1.61:../../textproc/p5-XML-LibXML
-DEPENDS+=      p5-libwww>=1.09:../../www/p5-libwww
-DEPENDS+=      p5-perl-ldap>=0.27:../../databases/p5-perl-ldap
-DEPENDS+=      p5-DateTime>=1.2000:../../time/p5-DateTime
-DEPENDS+=      p5-DateTime-Format-Mail>=0.401:../../time/p5-DateTime-Format-Mail
-DEPENDS+=      p5-Email-Simple>=2.208:../../mail/p5-Email-Simple
-DEPENDS+=      p5-File-NFSLock>=1.27:../../devel/p5-File-NFSLock
-DEPENDS+=      p5-Net-CIDR>=0.18:../../devel/p5-Net-CIDR
-DEPENDS+=      p5-Net-DNS>=1.01:../../net/p5-Net-DNS
-DEPENDS+=      p5-Proc-ProcessTable>=0.53:../../devel/p5-Proc-ProcessTable
+DEPENDS+=              mhonarc-[0-9]*:../../mail/mhonarc
+DEPENDS+=              p5-Archive-Zip>=1.05:../../archivers/p5-Archive-Zip
+DEPENDS+=              p5-AuthCAS>=1.5:../../security/p5-AuthCAS
+DEPENDS+=              p5-CGI>=2.52:../../www/p5-CGI
+DEPENDS+=              p5-CGI-Fast>=2.10:../../www/p5-CGI-Fast
+DEPENDS+=              p5-Crypt-CipherSaber>=0.50:../../security/p5-Crypt-CipherSaber
+DEPENDS+=              p5-DBD-Sybase>=0.90:../../databases/p5-DBD-Sybase
+DEPENDS+=              p5-DBI>=1.06:../../databases/p5-DBI
+#DEPENDS+=             {perl>=5.10,p5-Digest-MD5>=2.00}:../../security/p5-Digest-MD5
+DEPENDS+=              p5-Email-Date-Format>=1.002:../../mail/p5-Email-Date-Format
+DEPENDS+=              p5-FCGI>=0.67:../../www/p5-FCGI
+DEPENDS+=              p5-File-Copy-Recursive>=0.38:../../sysutils/p5-File-Copy-Recursive
+DEPENDS+=              p5-HTML-Format>=2.10:../../www/p5-HTML-Format
+DEPENDS+=              p5-HTML-StripScripts-Parser>=1.02:../../www/p5-HTML-StripScripts-Parser
+DEPENDS+=              p5-HTML-Tree>=4.2:../../www/p5-HTML-Tree
+DEPENDS+=              p5-IO-Socket-SSL>=0.90:../../security/p5-IO-Socket-SSL
+DEPENDS+=              p5-IO-stringy>=1.0:../../devel/p5-IO-stringy
+DEPENDS+=              p5-Locale-libintl>=1.16:../../misc/p5-Locale-libintl
+#DEPENDS+=             {perl>=5.7.3,p5-MIME-Base64>=1.0}:../../converters/p5-MIME-Base64
+DEPENDS+=              p5-MIME-EncWords>=1.014.000:../../mail/p5-MIME-EncWords
+DEPENDS+=              p5-MIME-Lite-HTML>=1.23:../../mail/p5-MIME-Lite-HTML
+DEPENDS+=              p5-MIME-tools>=5.209:../../mail/p5-MIME-tools
+DEPENDS+=              p5-MailTools>=1.51:../../mail/p5-MailTools
+#DEPENDS+=             {perl>=5.10,p5-Net>=1.0}:../../net/p5-Net
+DEPENDS+=              p5-Net-Netmask>=1.9015:../../devel/p5-Net-Netmask
+DEPENDS+=              p5-Net-SSLeay>=1.16:../../security/p5-Net-SSLeay
+DEPENDS+=              p5-Regexp-Common>=2.120:../../textproc/p5-Regexp-Common
+DEPENDS+=              p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite
+DEPENDS+=              p5-Template-Toolkit>=2.20:../../www/p5-Template-Toolkit
+DEPENDS+=              p5-Term-ProgressBar>=2.09:../../devel/p5-Term-ProgressBar
+#DEPENDS+=             {perl>=5.15.1,p5-Time-HiRes>=1.9724}:../../time/p5-Time-HiRes
+DEPENDS+=              p5-Unicode-LineBreak>=2012.02:../../textproc/p5-Unicode-LineBreak
+DEPENDS+=              p5-XML-LibXML>=1.61:../../textproc/p5-XML-LibXML
+DEPENDS+=              p5-libwww>=1.09:../../www/p5-libwww
+DEPENDS+=              p5-perl-ldap>=0.27:../../databases/p5-perl-ldap
+DEPENDS+=              p5-DateTime>=1.2000:../../time/p5-DateTime
+DEPENDS+=              p5-DateTime-Format-Mail>=0.401:../../time/p5-DateTime-Format-Mail
+DEPENDS+=              p5-Email-Simple>=2.208:../../mail/p5-Email-Simple
+DEPENDS+=              p5-File-NFSLock>=1.27:../../devel/p5-File-NFSLock
+DEPENDS+=              p5-Net-CIDR>=0.18:../../devel/p5-Net-CIDR
+DEPENDS+=              p5-Net-DNS>=1.01:../../net/p5-Net-DNS
+DEPENDS+=              p5-Proc-ProcessTable>=0.53:../../devel/p5-Proc-ProcessTable
 #DEPENDS.SunOS+=       {perl>=5.10,p5-DB_File>=1.75}:../../databases/p5-DB_File
 
 OPSYSVARS+=    DEPENDS
@@ -144,13 +144,13 @@ OWN_DIRS_PERMS+=  ${SYMPA_SPOOL}/outgoing
 OWN_DIRS_PERMS+=       ${SYMPA_SPOOL}/task ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=       ${SYMPA_SPOOL}/tmp ${SYMPA_USER} ${SYMPA_GROUP} 770
 
-SPECIAL_PERMS+=  ${SYMPA_BIN}/sympa_newaliases-wrapper ${REAL_ROOT_USER} ${SYMPA_GROUP} 4550
-SPECIAL_PERMS+=         ${SYMPA_BIN}/bouncequeue ${SYMPA_USER} ${SYMPA_GROUP} 4555
-SPECIAL_PERMS+=         ${SYMPA_BIN}/familyqueue ${SYMPA_USER} ${SYMPA_GROUP} 4555
-SPECIAL_PERMS+=         ${SYMPA_BIN}/queue ${SYMPA_USER} ${SYMPA_GROUP} 4555
-SPECIAL_PERMS+=         ${SYMPA_PREFIX}/libexec/cgi-bin/wwsympa-wrapper.fcgi \
+SPECIAL_PERMS+=        ${SYMPA_BIN}/sympa_newaliases-wrapper ${REAL_ROOT_USER} ${SYMPA_GROUP} 4550
+SPECIAL_PERMS+=        ${SYMPA_BIN}/bouncequeue ${SYMPA_USER} ${SYMPA_GROUP} 4555
+SPECIAL_PERMS+=        ${SYMPA_BIN}/familyqueue ${SYMPA_USER} ${SYMPA_GROUP} 4555
+SPECIAL_PERMS+=        ${SYMPA_BIN}/queue ${SYMPA_USER} ${SYMPA_GROUP} 4555
+SPECIAL_PERMS+=        ${SYMPA_PREFIX}/libexec/cgi-bin/wwsympa-wrapper.fcgi \
                         ${SYMPA_USER} ${SYMPA_GROUP} 6555
-SPECIAL_PERMS+=         ${SYMPA_PREFIX}/libexec/cgi-bin/sympa_soap_server-wrapper.fcgi \
+SPECIAL_PERMS+=        ${SYMPA_PREFIX}/libexec/cgi-bin/sympa_soap_server-wrapper.fcgi \
                         ${SYMPA_USER} ${SYMPA_GROUP} 6555
 
 CONF_FILES=    ${PREFIX}/share/examples/sympa/sympa.conf \

Index: pkgsrc/mail/thunderbird/Makefile
diff -u pkgsrc/mail/thunderbird/Makefile:1.233 pkgsrc/mail/thunderbird/Makefile:1.234
--- pkgsrc/mail/thunderbird/Makefile:1.233      Sat Nov  2 13:02:55 2019
+++ pkgsrc/mail/thunderbird/Makefile    Sat Nov  2 16:25:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.233 2019/11/02 13:02:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.234 2019/11/02 16:25:28 rillig Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird-${TB_VER}
@@ -31,16 +31,16 @@ LDFLAGS+=           ${COMPILER_RPATH_FLAG}${PREFI
 
 .include "../../mk/bsd.prefs.mk"
 
-#SUBST_CLASSES+=                       ext-compat
-#SUBST_STAGE.ext-compat=               pre-configure
+#SUBST_CLASSES+=               ext-compat
+#SUBST_STAGE.ext-compat=       pre-configure
 #SUBST_MESSAGE.ext-compat=     Fixing extension compatibility
-#SUBST_FILES.ext-compat=               mailnews/extensions/enigmail/package/install.rdf
+#SUBST_FILES.ext-compat=       mailnews/extensions/enigmail/package/install.rdf
 #SUBST_FILES.ext-compat+=      calendar/*/install.rdf
 #SUBST_FILES.ext-compat+=      calendar/*/*/install.rdf
 #SUBST_SED.ext-compat=         -e 's,\(<em:maxVersion>\).*<,\19.0<,g'
 
-CHECK_WRKREF_SKIP+=lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
-CHECK_WRKREF_SKIP+=lib/${MOZILLA}/chrome/messenger/content/messenger/buildconfig.html
+CHECK_WRKREF_SKIP+=    lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=    lib/${MOZILLA}/chrome/messenger/content/messenger/buildconfig.html
 
 post-extract:
        ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c

Index: pkgsrc/mail/thunderbird-enigmail/Makefile
diff -u pkgsrc/mail/thunderbird-enigmail/Makefile:1.12 pkgsrc/mail/thunderbird-enigmail/Makefile:1.13
--- pkgsrc/mail/thunderbird-enigmail/Makefile:1.12      Thu Oct 10 13:38:05 2019
+++ pkgsrc/mail/thunderbird-enigmail/Makefile   Sat Nov  2 16:25:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/10/10 13:38:05 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 16:25:28 rillig Exp $
 
 DISTNAME=      enigmail-2.1.2
 PKGNAME=       thunderbird-${DISTNAME}
@@ -28,9 +28,9 @@ DEPENDS+=             pinentry-gtk2-[0-9]*:../../se
 REPLACE_PERL+= util/fixlang.pl
 REPLACE_PERL+= util/make-lang-xpi.pl
 
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 2.1.2
-REPLACE_PYTHON+=       util/checkFiles.py
-REPLACE_PYTHON+=       util/run-tests.py
+PYTHON_VERSIONS_ACCEPTED=      27 # as of 2.1.2
+REPLACE_PYTHON+=               util/checkFiles.py
+REPLACE_PYTHON+=               util/run-tests.py
 
 WRKSRC=                ${WRKDIR}/enigmail
 GNU_CONFIGURE= yes

Index: pkgsrc/mail/thunderbird-l10n/Makefile
diff -u pkgsrc/mail/thunderbird-l10n/Makefile:1.83 pkgsrc/mail/thunderbird-l10n/Makefile:1.84
--- pkgsrc/mail/thunderbird-l10n/Makefile:1.83  Sat Nov  2 13:04:38 2019
+++ pkgsrc/mail/thunderbird-l10n/Makefile       Sat Nov  2 16:25:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2019/11/02 13:04:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.84 2019/11/02 16:25:28 rillig Exp $
 #
 
 TB_VER=                68.2.1
@@ -18,7 +18,7 @@ NO_BUILD=     yes
 
 INSTALLATION_DIRS=     lib/thunderbird/extensions
 
-TB_LOCALES=            ar ast be bg br ca cs cy                \
+TB_LOCALES=            ar ast be bg br ca cs cy                \
                         da de dsb el en-GB en-US es-AR es-ES et        \
                         eu fi fr fy-NL ga-IE gd gl he hr hsb   \
                         hy-AM hu id is it ja ko                        \

Index: pkgsrc/mail/thunderbird52/Makefile
diff -u pkgsrc/mail/thunderbird52/Makefile:1.5 pkgsrc/mail/thunderbird52/Makefile:1.6
--- pkgsrc/mail/thunderbird52/Makefile:1.5      Wed Sep 18 14:17:12 2019
+++ pkgsrc/mail/thunderbird52/Makefile  Sat Nov  2 16:25:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/09/18 14:17:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 16:25:28 rillig Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird${TB_VER:C/\..*$//}-${TB_VER}
@@ -34,10 +34,10 @@ LDFLAGS+=           ${COMPILER_RPATH_FLAG}${PREFI
 
 .include "../../mk/bsd.prefs.mk"
 
-#SUBST_CLASSES+=                       ext-compat
-#SUBST_STAGE.ext-compat=               pre-configure
+#SUBST_CLASSES+=               ext-compat
+#SUBST_STAGE.ext-compat=       pre-configure
 #SUBST_MESSAGE.ext-compat=     Fixing extension compatibility
-#SUBST_FILES.ext-compat=               mailnews/extensions/enigmail/package/install.rdf
+#SUBST_FILES.ext-compat=       mailnews/extensions/enigmail/package/install.rdf
 #SUBST_FILES.ext-compat+=      calendar/*/install.rdf
 #SUBST_FILES.ext-compat+=      calendar/*/*/install.rdf
 #SUBST_SED.ext-compat=         -e 's,\(<em:maxVersion>\).*<,\19.0<,g'
@@ -48,7 +48,7 @@ SUBST_MESSAGE.sys-dic=        Reference to syst
 SUBST_FILES.sys-dic=   mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp
 SUBST_VARS.sys-dic=    LOCALBASE
 
-CHECK_WRKREF_SKIP+=lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=    lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
 
 post-extract:
        mv ${WRKSRC}/mozilla/gfx/ycbcr/yuv_row_arm.s \

Index: pkgsrc/mail/thunderbird52-l10n/Makefile
diff -u pkgsrc/mail/thunderbird52-l10n/Makefile:1.1 pkgsrc/mail/thunderbird52-l10n/Makefile:1.2
--- pkgsrc/mail/thunderbird52-l10n/Makefile:1.1 Sun Dec 16 08:31:20 2018
+++ pkgsrc/mail/thunderbird52-l10n/Makefile     Sat Nov  2 16:25:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/12/16 08:31:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 16:25:28 rillig Exp $
 #
 
 TB_VER=                52.9.1
@@ -16,7 +16,7 @@ DISTFILES=    ${XPI_FILES}
 
 NO_BUILD=      yes
 
-TB_LOCALES=            ar ast be bg bn-BD br ca cs cy          \
+TB_LOCALES=            ar ast be bg bn-BD br ca cs cy          \
                         da de dsb el en-GB en-US es-AR es-ES et        \
                         eu fi fr fy-NL ga-IE gd gl he hr hsb   \
                         hy-AM hu id is it ja ko                        \

Index: pkgsrc/mail/thunderbird60/Makefile
diff -u pkgsrc/mail/thunderbird60/Makefile:1.1 pkgsrc/mail/thunderbird60/Makefile:1.2
--- pkgsrc/mail/thunderbird60/Makefile:1.1      Sat Sep 21 11:23:28 2019
+++ pkgsrc/mail/thunderbird60/Makefile  Sat Nov  2 16:25:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/09/21 11:23:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 16:25:29 rillig Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird60-${TB_VER}
@@ -32,15 +32,15 @@ LDFLAGS+=           ${COMPILER_RPATH_FLAG}${PREFI
 
 .include "../../mk/bsd.prefs.mk"
 
-#SUBST_CLASSES+=                       ext-compat
-#SUBST_STAGE.ext-compat=               pre-configure
+#SUBST_CLASSES+=               ext-compat
+#SUBST_STAGE.ext-compat=       pre-configure
 #SUBST_MESSAGE.ext-compat=     Fixing extension compatibility
-#SUBST_FILES.ext-compat=               mailnews/extensions/enigmail/package/install.rdf
+#SUBST_FILES.ext-compat=       mailnews/extensions/enigmail/package/install.rdf
 #SUBST_FILES.ext-compat+=      calendar/*/install.rdf
 #SUBST_FILES.ext-compat+=      calendar/*/*/install.rdf
 #SUBST_SED.ext-compat=         -e 's,\(<em:maxVersion>\).*<,\19.0<,g'
 
-CHECK_WRKREF_SKIP+=lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=    lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
 
 post-extract:
        mv ${WRKSRC}${MOZILLA_DIR}/gfx/ycbcr/yuv_row_arm.s \

Index: pkgsrc/mail/thunderbird60-l10n/Makefile
diff -u pkgsrc/mail/thunderbird60-l10n/Makefile:1.1 pkgsrc/mail/thunderbird60-l10n/Makefile:1.2
--- pkgsrc/mail/thunderbird60-l10n/Makefile:1.1 Sat Sep 21 11:25:51 2019
+++ pkgsrc/mail/thunderbird60-l10n/Makefile     Sat Nov  2 16:25:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/09/21 11:25:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 16:25:29 rillig Exp $
 #
 
 TB_VER=                60.9.0
@@ -18,7 +18,7 @@ NO_BUILD=     yes
 
 INSTALLATION_DIRS=     lib/thunderbird60/extensions
 
-TB_LOCALES=            ar ast be bg br ca cs cy                \
+TB_LOCALES=            ar ast be bg br ca cs cy                \
                         da de dsb el en-GB en-US es-AR es-ES et        \
                         eu fi fr fy-NL ga-IE gd gl he hr hsb   \
                         hy-AM hu id is it ja ko                        \

Index: pkgsrc/mail/tmda/Makefile
diff -u pkgsrc/mail/tmda/Makefile:1.63 pkgsrc/mail/tmda/Makefile:1.64
--- pkgsrc/mail/tmda/Makefile:1.63      Mon Sep  2 13:19:56 2019
+++ pkgsrc/mail/tmda/Makefile   Sat Nov  2 16:25:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2019/09/02 13:19:56 adam Exp $
+# $NetBSD: Makefile,v 1.64 2019/11/02 16:25:29 rillig Exp $
 
 DISTNAME=      tmda-1.1.12
 PKGREVISION=   6
@@ -12,7 +12,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Python-based SPAM reduction system
 
 REPLACE_PYTHON=        ${TMDA_PROGRAMS}
-PY_PATCHPLIST=         yes
+PY_PATCHPLIST= yes
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 1.1.12
 
 PKG_SYSCONFSUBDIR=     ${PKGBASE}

Index: pkgsrc/mail/turba/options.mk
diff -u pkgsrc/mail/turba/options.mk:1.5 pkgsrc/mail/turba/options.mk:1.6
--- pkgsrc/mail/turba/options.mk:1.5    Sun Sep 11 17:03:26 2016
+++ pkgsrc/mail/turba/options.mk        Sat Nov  2 16:25:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2016/09/11 17:03:26 taca Exp $
+# $NetBSD: options.mk,v 1.6 2019/11/02 16:25:29 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.turba
 PKG_SUPPORTED_OPTIONS= ldap mysql
@@ -17,6 +17,6 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-ldap>=4.3.3:
 ### Use MySQL for storing data
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
+DEPENDS+=              ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
 PHP_VERSIONS_ACCEPTED= 56
 .endif

Index: pkgsrc/mail/up-imapproxy/Makefile
diff -u pkgsrc/mail/up-imapproxy/Makefile:1.14 pkgsrc/mail/up-imapproxy/Makefile:1.15
--- pkgsrc/mail/up-imapproxy/Makefile:1.14      Thu May 23 19:23:09 2019
+++ pkgsrc/mail/up-imapproxy/Makefile   Sat Nov  2 16:25:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:09 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/02 16:25:29 rillig Exp $
 
 DISTNAME=      up-imapproxy-1.2.5
 PKGREVISION=   7
@@ -21,7 +21,7 @@ SUBST_MESSAGE.paths=  Fixing hard coded p
 CONF_FILES=    ${PREFIX}/share/examples/up-imapproxy/imapproxy.conf \
                        ${PKG_SYSCONFDIR}/imapproxy.conf
 
-INSTALLATION_DIRS+= sbin share/doc/up-imapproxy share/examples/up-imapproxy
+INSTALLATION_DIRS+=    sbin share/doc/up-imapproxy share/examples/up-imapproxy
 INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
 
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/mail/wl-snapshot/Makefile
diff -u pkgsrc/mail/wl-snapshot/Makefile:1.10 pkgsrc/mail/wl-snapshot/Makefile:1.11
--- pkgsrc/mail/wl-snapshot/Makefile:1.10       Tue Oct 22 03:55:12 2019
+++ pkgsrc/mail/wl-snapshot/Makefile    Sat Nov  2 16:25:29 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2019/10/22 03:55:12 mef Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/02 16:25:29 rillig Exp $
 
-DISTNAME=      wl-beta_2.15.9+0.20190919
+DISTNAME=      wl-beta_2.15.9+0.20190919
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/beta_//:S/+0//}
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/w/wl-beta/}

Index: pkgsrc/mail/xmailwatcher/Makefile
diff -u pkgsrc/mail/xmailwatcher/Makefile:1.15 pkgsrc/mail/xmailwatcher/Makefile:1.16
--- pkgsrc/mail/xmailwatcher/Makefile:1.15      Mon Oct  8 12:19:35 2012
+++ pkgsrc/mail/xmailwatcher/Makefile   Sat Nov  2 16:25:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 12:19:35 asau Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:29 rillig Exp $
 
 DISTNAME=              xmailwatcher
 PKGNAME=               ${DISTNAME}-1.6
@@ -6,7 +6,7 @@ PKGREVISION=            3
 CATEGORIES=            mail
 MASTER_SITES=          http://www.dcs.ed.ac.uk/home/gdmr/X11/
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Mailbox checker which displays sender and subject lines of mails
 
 USE_IMAKE=             yes



Home | Main Index | Thread Index | Old Index