Whitespace cleanup, courtesy of pkglint.

Patch provided by Sergey Svishchev in private mail.

36 files changed, 94 insertions, 94 deletions

diff --git a/mail/balsa2/options.mk b/mail/balsa2/options.mk
index bc6da08ea23..411a7970c02 100644
--- a/mail/balsa2/options.mk
+++ b/mail/balsa2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/05/31 18:22:23 ghen Exp $
+# $NetBSD: options.mk,v 1.6 2007/02/22 19:26:40 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.balsa2
@@ -7,7 +7,7 @@ PKG_SUPPORTED_OPTIONS=	ldap ssl
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+=        --with-ldap
+CONFIGURE_ARGS+=	--with-ldap
 .  include "../../databases/openldap-client/buildlink3.mk"
 .endif
 
diff --git a/mail/columba/Makefile b/mail/columba/Makefile
index cafba6b526b..ae3693527a9 100644
--- a/mail/columba/Makefile
+++ b/mail/columba/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2006/04/22 09:22:10 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:40 wiz Exp $
 #
 
 DISTNAME=	columba-unix-1.0_M2-bin
 PKGNAME=	columba-1.0M2
 PKGREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=columba/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=columba/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index 25e7561ec38..df0bd46b68d 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:40 wiz Exp $
 #
 
 DISTNAME=	demime-1.1d
@@ -13,10 +13,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://scifi.squawk.com/demime.html
 COMMENT=	Tool to scrub mime from mailing lists
 
-DEPENDS+=       p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-DEPENDS+=       p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+=       p5-HTML-Format-[0-9]*:../../www/p5-HTML-Format
-DEPENDS+=       p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
+DEPENDS+=	p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
+DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+=	p5-HTML-Format-[0-9]*:../../www/p5-HTML-Format
+DEPENDS+=	p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 USE_TOOLS+=	perl:run pod2man
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
index c77ce9bc202..56b8780280b 100644
--- a/mail/dovecot/options.mk
+++ b/mail/dovecot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2006/08/18 14:59:17 tv Exp $
+# $NetBSD: options.mk,v 1.19 2007/02/22 19:26:40 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
 PKG_SUPPORTED_OPTIONS=	gssapi inet6 kqueue ldap mysql pam pgsql sasl sqlite
@@ -16,7 +16,7 @@ PKG_SUGGESTED_OPTIONS+=	kqueue
 ### Build with OpenSSL or GNU TLS as the underlying crypto library.
 ###
 .if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=        --with-ssl=openssl
+CONFIGURE_ARGS+=	--with-ssl=openssl
 CONFIGURE_ENV+=		SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
 CONFIGURE_ENV+=		SSL_LIBS="-lssl -lcrypto"
 .  include "../../security/openssl/buildlink3.mk"
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 0aad23db867..da6e33e6085 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:41 wiz Exp $
 #
 
 DISTNAME=	drac
 PKGNAME=	drac-1.12
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cc.umanitoba.ca/src/
-EXTRACT_SUFX=   .tar.Z
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	groo@NetBSD.org
 HOMEPAGE=	http://mail.cc.umanitoba.ca/drac/
diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk
index 2433723b61e..b313446f22c 100644
--- a/mail/dspam/options.mk
+++ b/mail/dspam/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2007/01/18 14:22:38 obache Exp $
+# $NetBSD: options.mk,v 1.19 2007/02/22 19:26:41 wiz Exp $
 
 .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
 DSPAM_DELIVERY_AGENT:=	${DSPAM_DELIVERY_AGENT_ARGS}
@@ -173,9 +173,9 @@ CONFIGURE_ARGS+=	--enable-domain-scale
 ###
 BUILD_DEFS+=		DSPAM_PSFLAGS
 .if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
-DSPAM_PSFLAGS?=         -deaf
+DSPAM_PSFLAGS?=		-deaf
 .else
-DSPAM_PSFLAGS?=         aux
+DSPAM_PSFLAGS?=		aux
 .endif
 
 ###
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 3612af7e1be..096af42fc23 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:30 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:41 wiz Exp $
 
 DISTNAME=	exim-html-4.50
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
 		ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
-EXTRACT_SUFX=  	.tar.bz2
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.exim.org/
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 6eefbcb5332..836530e4151 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/07/10 20:32:59 sketch Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:41 wiz Exp $
 #
 
 DISTNAME=		gld-1.6
@@ -22,8 +22,8 @@ CONF_FILES_PERMS=	${EGDIR}/gld.conf ${PKG_SYSCONFDIR}/gld.conf	\
 RCD_SCRIPTS=		gld
 GLD_USER?=		gld
 GLD_GROUP?=		gld
-PKG_GROUPS=             ${GLD_GROUP}
-PKG_USERS=              ${GLD_USER}:${GLD_GROUP}
+PKG_GROUPS=		${GLD_GROUP}
+PKG_USERS=		${GLD_USER}:${GLD_GROUP}
 PKG_GECOS.${GLD_USER}=	Greylisting Daemon user
 BUILD_DEFS+=		GLD_USER GLD_GROUP
 
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index a4f8d5c3d56..4cbeba21ca8 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.113 2007/02/15 06:45:35 tron Exp $
+# $NetBSD: Makefile,v 1.114 2007/02/22 19:26:41 wiz Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
 # upgrade this package you *must* test it on a system with Kerberos libraries
 # but not running Kerberos before committing the changes.
 
-DISTNAME=       imap-2004g
-PKGNAME=        ${DISTNAME:S/-/-uw-/}
+DISTNAME=	imap-2004g
+PKGNAME=	${DISTNAME:S/-/-uw-/}
 PKGREVISION=	2
-CATEGORIES=     mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index fb296c59f08..217d4d43885 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 04:25:46 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:41 wiz Exp $
 
 DISTNAME=	kbiff-3.8
 PKGREVISION=	5
@@ -8,12 +8,12 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://www.granroth.org/kbiff/index.html
-COMMENT= 	Mail notification utility for KDE
+COMMENT=	Mail notification utility for KDE
 
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-GNU_CONFIGURE=          yes
+GNU_CONFIGURE=		yes
 SHLIBTOOL_OVERRIDE=	# empty
 
 BUILDLINK_DEPMETHOD.libXt?=	build
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index b9d44f15b51..b622fc7d8de 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2006/11/07 09:26:37 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2007/02/22 19:26:41 wiz Exp $
 
 DISTNAME=	maildrop-2.0.2
-CATEGORIES=     security
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX=   .tar.bz2
+CATEGORIES=	security
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jlam@pkgsrc.org
 COMMENT=	Courier mail delivery agent with filtering abilities
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 83dcc2d7e56..0039bf86394 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2006/09/09 02:43:10 obache Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:41 wiz Exp $
 
 DISTNAME=		majordomo-1.94.5
 PKGREVISION=		2
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.sgi.com/other/majordomo/1.94.5/ \
 			ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
-EXTRACT_SUFX=   	.tgz
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=		packages@biology.nmsu.edu
 HOMEPAGE=		http://www.greatcircle.com/majordomo/
diff --git a/mail/mdfrm/Makefile b/mail/mdfrm/Makefile
index 71ac1e01e07..4f0b8fc9709 100644
--- a/mail/mdfrm/Makefile
+++ b/mail/mdfrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:41 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:41 wiz Exp $
 #
 
 DISTNAME=	mdfrm.pl
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	#
 MAINTAINER=	zuntum@NetBSD.org
 COMMENT=	Print a summary of mail in a Maildir waiting to be read
 
-DEPENDS+=       p5-TimeDate-[0-9]*:../../time/p5-TimeDate
+DEPENDS+=	p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 
 WRKSRC=		${WRKDIR}
 USE_TOOLS+=	perl:run
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index ebcd15234b8..3c9ccb805f0 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/01/07 09:13:58 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2007/02/22 19:26:41 wiz Exp $
 
 DISTNAME=	nail-11.25
 CATEGORIES=	mail
@@ -27,7 +27,7 @@ MAKE_ENV+=	"SENDMAIL=/usr/lib/sendmail"
 
 EGDIR=		${PREFIX}/share/examples/nail
 
-CONF_FILES=     ${EGDIR}/nail.rc ${PKG_SYSCONFDIR}/nail.rc
+CONF_FILES=	${EGDIR}/nail.rc ${PKG_SYSCONFDIR}/nail.rc
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/mail/newspipe/Makefile b/mail/newspipe/Makefile
index 4cb7a389a9f..38c83582023 100644
--- a/mail/newspipe/Makefile
+++ b/mail/newspipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:09:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:42 wiz Exp $
 #
 
 DISTNAME=		newspipe.1.1.9
@@ -14,9 +14,9 @@ COMMENT=		Read RSS/Atom feeds as email messages
 
 WRKSRC=			${WRKDIR}
 
-DEPENDS+=               ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-DEPENDS+=               ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
-DEPENDS+=               ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
+DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+DEPENDS+=		${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
+DEPENDS+=		${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
 
 NO_BUILD=		yes
 PYTHON_PATCH_SCRIPTS=	*.py
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 20c34a7a20f..ade072febcd 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/12/16 13:18:54 schwarz Exp $
+# $NetBSD: Makefile,v 1.64 2007/02/22 19:26:42 wiz Exp $
 
 DISTNAME=		nmh-1.0.4
 PKGREVISION=		7
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--without-krb4
 .endif
 
 DOCDIR=			share/doc/nmh
-EGDIR=	 		${PREFIX}/share/examples/nmh
+EGDIR=		${PREFIX}/share/examples/nmh
 
 BUILD_DEFS+=		NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP
 
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index faee8e81570..d90ebbda222 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:42 wiz Exp $
 #
 
-DISTNAME=       IMAP-Admin-1.6.1
-PKGNAME=        p5-${DISTNAME}
+DISTNAME=	IMAP-Admin-1.6.1
+PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5iad
 PKGREVISION=	2
 CATEGORIES=	mail perl5
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
index fd6f857b6db..c4e701e1cad 100644
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ b/mail/p5-Mail-IMAPClient/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:42 wiz Exp $
 #
 
-DISTNAME=       Mail-IMAPClient-2.2.9
-PKGNAME=        p5-${DISTNAME}
+DISTNAME=	Mail-IMAPClient-2.2.9
+PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5mic
 PKGREVISION=	2
 CATEGORIES=	mail perl5
diff --git a/mail/p5-Mail-SPF-Query/Makefile b/mail/p5-Mail-SPF-Query/Makefile
index f06a09928a4..e20e008753c 100644
--- a/mail/p5-Mail-SPF-Query/Makefile
+++ b/mail/p5-Mail-SPF-Query/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/02/15 23:37:39 heinz Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:42 wiz Exp $
 
 DISTNAME=		Mail-SPF-Query-1.999
-PKGNAME=                p5-${DISTNAME}
+PKGNAME=		p5-${DISTNAME}
 SVR4_PKGNAME=		p5msq
 CATEGORIES=		mail perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Mail/}
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 4b7b53cc300..43226444012 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2006/10/14 12:11:56 adrianp Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:42 wiz Exp $
 
 DISTNAME=	Mail-1.1.14
 CATEGORIES=	mail
 
 CONFLICTS=	php-pear-Mail-[0-9]*
 
-DEPENDS+=       ${PHP_PKG_PREFIX}-pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP
 
 MAINTAINER=	adrianp@NetBSD.org
-HOMEPAGE= 	http://pear.php.net/package/Mail
+HOMEPAGE=	http://pear.php.net/package/Mail
 COMMENT=	PHP Class that provides multiple interfaces for sending emails
 
 .include "../../lang/php/pear.mk"
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 42ff72c8028..ea512ae93e0 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/01/07 09:13:59 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2007/02/22 19:26:42 wiz Exp $
 #
 
 DISTNAME=	procmail-3.22
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 MAKE_ENV+=	SHELL=${SH:Q} CHMOD=${CHMOD:Q}
 INSTALL_TARGET=	install-suid install.man
-UNLIMIT_RESOURCES=      datasize
+UNLIMIT_RESOURCES=	datasize
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 5f8364e6dbf..531adce9f64 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2007/02/03 03:02:36 schmonz Exp $
+# $NetBSD: options.mk,v 1.25 2007/02/22 19:26:42 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=	darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
@@ -55,7 +55,7 @@ QREGEX_PATCH=		qregex-20060423.patch
 PATCHFILES+=		${QREGEX_PATCH}
 SITES.${QREGEX_PATCH}=	http://www.arda.homeunix.net/store/qmail/
 PATCH_DIST_STRIP.${QREGEX_PATCH}=	-p3
-PLIST_SRC+=             ${PKGDIR}/PLIST.qregex
+PLIST_SRC+=		${PKGDIR}/PLIST.qregex
 .endif
 
 .if !empty(PKG_OPTIONS:Mqmail-realrcptto)
@@ -71,13 +71,13 @@ PKG_OPTIONS+=		sasl
 .  endif
 .  include "../../security/openssl/buildlink3.mk"
 TLSSASL_PATCH=		netqmail-1.05-tls-smtpauth-20060105.patch
-PATCHFILES+=            ${TLSSASL_PATCH}
+PATCHFILES+=		${TLSSASL_PATCH}
 SITES.${TLSSASL_PATCH}=	http://shupp.org/patches/
 .  if !empty(PKG_OPTIONS:Mtls)
 CFLAGS+=		-DTLS=20060104	# NOTE: update according to the patch
 DJB_INSTALL_TARGETS=	cert tmprsadh
 USE_TOOLS+=		gmake
-PLIST_SRC+=             ${PKGDIR}/PLIST.tls
+PLIST_SRC+=		${PKGDIR}/PLIST.tls
 .  endif
 .endif
 
diff --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk
index 2c19ce21476..e6fae09a9e5 100644
--- a/mail/qpopper/options.mk
+++ b/mail/qpopper/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: options.mk,v 1.12 2007/02/22 19:26:43 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qpopper
 PKG_SUPPORTED_OPTIONS=	drac inet6 kerberos pam qpopper-servermode ssl
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 # Please note this is currently experimental for platforms that support it
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+=        --with-pam
+CONFIGURE_ARGS+=	--with-pam
 .else
 CONFIGURE_ARGS+=	--without-pam
 .endif
diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
index aaeb54d2795..4dfca57944b 100644
--- a/mail/ripmime/Makefile
+++ b/mail/ripmime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:44 wiz Exp $
 #
 
-DISTNAME=       ripmime-1.4.0.2
+DISTNAME=	ripmime-1.4.0.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.pldaniels.com/ripmime/
 
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 6491e9c5c54..136c4960a2b 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2006/10/12 21:04:27 tv Exp $
+# $NetBSD: Makefile.common,v 1.40 2007/02/22 19:26:44 wiz Exp $
 #
 # Makefile fragment shared with libmilter
 #
@@ -27,7 +27,7 @@ MAKE_ENV+=	BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
 		SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
 SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
 
-BUILD_DEFS+=    SMRSH_CMDDIR
+BUILD_DEFS+=	SMRSH_CMDDIR
 
 WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
 USE_TOOLS+=	gm4
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
index 9e19c36438c..293c62ccb53 100644
--- a/mail/sma/Makefile
+++ b/mail/sma/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:59 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:44 wiz Exp $
 
-DISTNAME=       sma-1.4
+DISTNAME=	sma-1.4
 CATEGORIES=	mail
-MASTER_SITES=   http://www.klake.org/sma/dl/
+MASTER_SITES=	http://www.klake.org/sma/dl/
 
 MAINTAINER=	markus@core.de
 HOMEPAGE=	http://www.klake.org/sma/
 COMMENT=	Sendmail log analyser
 
-WRKSRC=         ${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 NO_CONFIGURE=	yes
 
 MAKE_FILE=	Makefile
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index d276d3d2887..2150b87cbd8 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/01/07 09:13:59 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:44 wiz Exp $
 
 DISTNAME=	smtpfeed-1.18
 PKGREVISION=	1
@@ -27,7 +27,7 @@ DOCS=	COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
 	ML-ADMIN ML-ADMIN.j OPTIONS OPTIONS.j README README.j \
 	RELEASE.NOTE SIGNAL SIGNAL.j TODO
 
-BUILD_DEFS+=    USE_INET6
+BUILD_DEFS+=	USE_INET6
 
 INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man8 share/doc/smtpfeed
 
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index 83ac64b99c3..374f1ed9348 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/23 00:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:44 wiz Exp $
 
 DISTNAME=		spamd-20060330
 CATEGORIES=		mail
@@ -25,7 +25,7 @@ PKG_USERS=		_spamd:_spamd
 PKG_GECOS._spamd=	Spam Daemon User
 PKG_HOME._spamd=	${SPAMD_HOME}
 
-RCD_SCRIPTS=            pfspamd
+RCD_SCRIPTS=		pfspamd
 
 SPAMD_CONF=		${PKG_SYSCONFDIR}/spamd.conf
 CONF_FILES=		${PREFIX}/share/examples/spamd/spamd.conf ${SPAMD_CONF}
diff --git a/mail/spamprobe/options.mk b/mail/spamprobe/options.mk
index b954d5b44e3..d4ae2b4772e 100644
--- a/mail/spamprobe/options.mk
+++ b/mail/spamprobe/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/01/07 10:27:51 hubertf Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:44 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.spamprobe
 PKG_SUPPORTED_OPTIONS=		bdb gif
@@ -7,9 +7,9 @@ PKG_SUGGESTED_OPTIONS=		gif
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mbdb)
-BDB_ACCEPTED=           db4 # db3 db2 (not tested)
+BDB_ACCEPTED=		db4 # db3 db2 (not tested)
 .include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ARGS+=        --with-db=${BDBBASE:Q}
+CONFIGURE_ARGS+=	--with-db=${BDBBASE:Q}
 .endif
 
 .if !empty(PKG_OPTIONS:Mgif)
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 9e8cdaad0d2..2b0a717fa3e 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2007/02/06 18:54:14 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2007/02/22 19:26:44 wiz Exp $
 
 .include "Makefile.common"
 
@@ -14,7 +14,7 @@ PKGCONFIG_OVERRIDE+=	sylpheed-claws.pc.in
 
 #BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=0.46
 
-CONFIGURE_ARGS+=        --enable-aspell
+CONFIGURE_ARGS+=	--enable-aspell
 CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--enable-openssl
 CONFIGURE_ARGS+=	--enable-gpgme
diff --git a/mail/sylpheed-claws/plugins.mk b/mail/sylpheed-claws/plugins.mk
index abda83894b8..010cd68717a 100644
--- a/mail/sylpheed-claws/plugins.mk
+++ b/mail/sylpheed-claws/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.7 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: plugins.mk,v 1.8 2007/02/22 19:26:44 wiz Exp $
 #
 
 .include "../../mail/sylpheed-claws/Makefile.common"
@@ -9,11 +9,11 @@ CONFIGURE_DIRS=	${WRKDIR}/${DISTNAME}
 BUILD_DIRS=	${WRKDIR}/${DISTNAME}/src/plugins/${PLUGIN_NAME}
 INSTALL_DIRS=	${WRKDIR}/${DISTNAME}/src/plugins/${PLUGIN_NAME}
 
-DEPENDS+=       sylpheed-claws>=${SYLPHEED_VERSION}:../../mail/sylpheed-claws
+DEPENDS+=	sylpheed-claws>=${SYLPHEED_VERSION}:../../mail/sylpheed-claws
 
 LIBTOOL_OVERRIDE=	../../../libtool
 
-CONFIGURE_ARGS+=        --disable-aspell
+CONFIGURE_ARGS+=	--disable-aspell
 CONFIGURE_ARGS+=	--disable-nls
 CONFIGURE_ARGS+=	--disable-openssl
 CONFIGURE_ARGS+=	--disable-gpgme
diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile
index a921a47a7b4..81a46e806f7 100644
--- a/mail/sylpheed-devel/Makefile
+++ b/mail/sylpheed-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/02/15 13:33:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.43 2007/02/22 19:26:45 wiz Exp $
 
 DISTNAME=	sylpheed-2.4.0beta4
 PKGNAME=	${DISTNAME:S/-/-devel-/}
@@ -13,7 +13,7 @@ COMMENT=	X based e-mail and netnews client
 CONFLICTS=		sylpheed-claws-[0-9]* sylpheed-[0-9]*
 
 USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=            yes
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake msgfmt pkg-config
 
 GNU_CONFIGURE=		yes
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index b6a42b25489..dfb84719f9e 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2007/02/04 09:00:57 xtraeme Exp $
+# $NetBSD: Makefile,v 1.103 2007/02/22 19:26:44 wiz Exp $
 
 DISTNAME=	sylpheed-2.3.1
 CATEGORIES=	mail news x11
@@ -12,7 +12,7 @@ COMMENT=	X based e-mail and netnews client
 CONFLICTS=		sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
 
 USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=            yes
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake msgfmt pkg-config
 
 GNU_CONFIGURE=		yes
diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index 1be691cb264..444590b048b 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/02/20 02:25:46 obache Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:45 wiz Exp $
 
 DISTNAME=	wl-2.14.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi>=1.14.6:../../devel/semi
 # apel and bbdb are included in xemacs-packages
 .if ${EMACS_FLAVOR} == "emacs"
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
-DEPENDS+=       ${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
 .endif
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}flim>=1.14.7:../../devel/flim
 
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 4f4a7bbe7dc..d261459089a 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:38 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:45 wiz Exp $
 #
 
-DISTNAME=       xmailbox-2.5
+DISTNAME=	xmailbox-2.5
 PKGREVISION=	2
 CATEGORIES=	mail x11
-MASTER_SITES=   ${MASTER_SITE_XCONTRIB:=applications/}
+MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 
 MAINTAINER=	bouyer@NetBSD.org
 COMMENT=	Enhanced xbiff, with pixmap and sound support
diff --git a/mail/xmailwatcher/Makefile b/mail/xmailwatcher/Makefile
index 9218a09f6ca..4d8930fdce5 100644
--- a/mail/xmailwatcher/Makefile
+++ b/mail/xmailwatcher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:39 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:45 wiz Exp $
 
 DISTNAME=		xmailwatcher
 PKGNAME=		${DISTNAME}-1.6
@@ -7,7 +7,7 @@ CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.dcs.ed.ac.uk/pub/X11/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT= 		Mailbox checker which displays sender and subject lines of mails
+COMMENT=	Mailbox checker which displays sender and subject lines of mails
 
 USE_IMAKE=		yes