mail: align variable assignments

pkglint -Wall -F --only aligned -r

No manual corrections.

2 files changed, 39 insertions, 39 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index ae5ee3995e6..e807eb1c40f 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -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_SYSCONFDIR QMAIL_QUEUE_EXTRA
 
 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
-
-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}= \
+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}=	\
 				${SED} -e 's|"057"|"\\\\057"|' \
 				-e 's|"072"|"\\\\072"|' \
 				< ${MAILDIRUNIQ_PATCH}
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index a59970ad102..31fba1f03b7 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -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:../../sysutils/checkpassword
 .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 flags for syncdir.
 .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