30 files changed, 118 insertions, 121 deletions

diff --git a/mail/adcomplain/Makefile b/mail/adcomplain/Makefile
index 91405a321602..ca3f1860920b 100644
--- a/mail/adcomplain/Makefile
+++ b/mail/adcomplain/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	adcomplain
-PORTVERSION= 	3.52
-CATEGORIES=     mail news
-MASTER_SITES=   http://www.rdrop.com/users/billmc/
+PORTVERSION=	3.52
+CATEGORIES=	mail news
+MASTER_SITES=	http://www.rdrop.com/users/billmc/
 DISTNAME=	${PORTNAME}.pl
 EXTRACT_SUFX=	.uu
 
-MAINTAINER=     ache@FreeBSD.org
+MAINTAINER=	ache@FreeBSD.org
 
-USE_PERL5=      yes
+USE_PERL5=	yes
 
-EXTRACT_CMD=    /usr/bin/uudecode
-EXTRACT_BEFORE_ARGS=    <
+EXTRACT_CMD=	/usr/bin/uudecode
+EXTRACT_BEFORE_ARGS=	<
 EXTRACT_AFTER_ARGS=	# empty
-NO_WRKSUBDIR=	YES
-NO_BUILD=       YES
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
 
 post-patch:
 	cd ${WRKSRC}; \
diff --git a/mail/arrow/Makefile b/mail/arrow/Makefile
index 374d05911fa0..f73271803993 100644
--- a/mail/arrow/Makefile
+++ b/mail/arrow/Makefile
@@ -43,8 +43,8 @@ INSTALL_DATA_DIR=	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755
 # program files
 PROGRAMFILES=		arrow/arrow
 # documents
-DOCFILES=       LICENSE README.binary
-DOCDIR_PREFIX=  ${PREFIX}/share/doc/${PORTNAME}
+DOCFILES=	LICENSE README.binary
+DOCDIR_PREFIX=	${PREFIX}/share/doc/${PORTNAME}
 # additional configuration and header files
 EXTRALIB_PREFIX=	${X11BASE}/lib/jx
 EXTRALIBFILES_MAKE_WRKSRC=	include/make
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 8814a6e1fbba..1c1ed9604f55 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	elm
-PORTVERSION=    2.4ME+82
+PORTVERSION=	2.4ME+82
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
@@ -20,8 +20,8 @@ MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
 		printmail.1 readmsg.1 elmcharset.1 elmterminal.1
 MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
 
-HAS_CONFIGURE=	Yes
-CONFIGURE_SCRIPT= Configure
+HAS_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ENV=	PREFIX="${PREFIX}"
 CONFIGURE_ARGS=	-S -d
 
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index 266148a6f659..3f12920b520d 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ezmlm
-PORTVERSION= 	0.53
+PORTVERSION=	0.53
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ezmlm.org/pub/qmail/ \
 		ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \
@@ -33,7 +33,7 @@ MAN1=		ezmlm-list.1 ezmlm-make.1 ezmlm-manage.1 ezmlm-reject.1 \
 		ezmlm-warn.1 ezmlm-weed.1
 MAN5=		ezmlm.5
 
-DIFF_MSG=       Cannot Make and Install with different PREFIX or QMAIL_DIR
+DIFF_MSG=	Cannot Make and Install with different PREFIX or QMAIL_DIR
 
 MY_PROGRAMS=	ezmlm-make ezmlm-manage ezmlm-send ezmlm-reject ezmlm-return \
 		ezmlm-warn ezmlm-weed ezmlm-list ezmlm-sub ezmlm-unsub
diff --git a/mail/junkfilter/Makefile b/mail/junkfilter/Makefile
index 828520623263..e88f14420589 100644
--- a/mail/junkfilter/Makefile
+++ b/mail/junkfilter/Makefile
@@ -30,7 +30,7 @@ JFFILES=	LICENSE addresses bodychk dialups headers ip jf jf-addresses \
 		junkfilter.opt junkfilter.readme junkfilter.three \
 		junkfilter.two junkfilter.user-default junkfilter.white white
 
-JFDOMFILES=     assorted general gulf-blocks harrismkt thehitman tsf-fannin
+JFDOMFILES=	assorted general gulf-blocks harrismkt thehitman tsf-fannin
 
 do-install:
 	${MKDIR} ${BINDIR}/domains
diff --git a/mail/knewmail/Makefile b/mail/knewmail/Makefile
index 5add7e256c8b..08e10264e7cc 100644
--- a/mail/knewmail/Makefile
+++ b/mail/knewmail/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	knewmail
-PORTVERSION= 	3.1
-CATEGORIES=    mail kde
-MASTER_SITES=  http://www.slac.com/mpilone/knewmail_home/downloads/
-EXTRACT_SUFX=  .src.tar.gz
+PORTVERSION=	3.1
+CATEGORIES=	mail kde
+MASTER_SITES=	http://www.slac.com/mpilone/knewmail_home/downloads/
+EXTRACT_SUFX=	.src.tar.gz
 
-MAINTAINER=    wellers@netvision.net.il
+MAINTAINER=	wellers@netvision.net.il
 
-LIB_DEPENDS=    kdecore.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 
 HAS_CONFIGURE=	yes
-KDEDIR=         ${PREFIX}
+KDEDIR=		${PREFIX}
 USE_QT=		yes
-CONFIGURE_ARGS= --prefix=${PREFIX}
+CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/mail/movemail/Makefile b/mail/movemail/Makefile
index f4e71964eb10..5149b5e91b68 100644
--- a/mail/movemail/Makefile
+++ b/mail/movemail/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	movemail
-PORTVERSION= 	1.0
-CATEGORIES=    mail
-MASTER_SITES=  http://www.de.freebsd.org/~wosch/src/
+PORTVERSION=	1.0
+CATEGORIES=	mail
+MASTER_SITES=	http://www.de.freebsd.org/~wosch/src/
 
-MAINTAINER=    wosch@FreeBSD.org
+MAINTAINER=	wosch@FreeBSD.org
 
 MAN1=		movemail.1
 MANCOMPRESSED=	maybe
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index cdc86491ec33..b835ea1a922a 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:  mutt w/pgp hooks
 # Date created:			  Thur July 25, 1996
 # Whom:				  David O'Brien (obrien@NUXI.com)
@@ -7,7 +6,7 @@
 #
 
 PORTNAME=	mutt
-PORTVERSION= 	1.2.5
+PORTVERSION=	1.2.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/ \
 		ftp://ftp.uib.no/pub/mutt/ \
@@ -43,7 +42,7 @@ WITH_DOCS=	yes
 .endif
 .endif
 
-LIB_DEPENDS=    intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 .if defined(WITH_SLANG)
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
 .elif defined(WITH_NCURSES_PORT)
@@ -51,7 +50,7 @@ LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
 CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .endif
 .if defined(WITH_SSL)
-USE_OPENSSL=    YES
+USE_OPENSSL=	yes
 .endif
 .if defined(WITH_DOCS)
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
@@ -60,8 +59,8 @@ BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 DIST_SUBDIR=	mutt
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=  CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
+CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--enable-pop --enable-imap --enable-flock --disable-fcntl \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \
 		--enable-compressed
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index cdc86491ec33..b835ea1a922a 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:  mutt w/pgp hooks
 # Date created:			  Thur July 25, 1996
 # Whom:				  David O'Brien (obrien@NUXI.com)
@@ -7,7 +6,7 @@
 #
 
 PORTNAME=	mutt
-PORTVERSION= 	1.2.5
+PORTVERSION=	1.2.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/ \
 		ftp://ftp.uib.no/pub/mutt/ \
@@ -43,7 +42,7 @@ WITH_DOCS=	yes
 .endif
 .endif
 
-LIB_DEPENDS=    intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 .if defined(WITH_SLANG)
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
 .elif defined(WITH_NCURSES_PORT)
@@ -51,7 +50,7 @@ LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
 CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .endif
 .if defined(WITH_SSL)
-USE_OPENSSL=    YES
+USE_OPENSSL=	yes
 .endif
 .if defined(WITH_DOCS)
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
@@ -60,8 +59,8 @@ BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 DIST_SUBDIR=	mutt
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=  CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
+CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--enable-pop --enable-imap --enable-flock --disable-fcntl \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \
 		--enable-compressed
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index cdc86491ec33..b835ea1a922a 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:  mutt w/pgp hooks
 # Date created:			  Thur July 25, 1996
 # Whom:				  David O'Brien (obrien@NUXI.com)
@@ -7,7 +6,7 @@
 #
 
 PORTNAME=	mutt
-PORTVERSION= 	1.2.5
+PORTVERSION=	1.2.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/ \
 		ftp://ftp.uib.no/pub/mutt/ \
@@ -43,7 +42,7 @@ WITH_DOCS=	yes
 .endif
 .endif
 
-LIB_DEPENDS=    intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 .if defined(WITH_SLANG)
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
 .elif defined(WITH_NCURSES_PORT)
@@ -51,7 +50,7 @@ LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
 CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .endif
 .if defined(WITH_SSL)
-USE_OPENSSL=    YES
+USE_OPENSSL=	yes
 .endif
 .if defined(WITH_DOCS)
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
@@ -60,8 +59,8 @@ BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 DIST_SUBDIR=	mutt
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=  CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
+CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--enable-pop --enable-imap --enable-flock --disable-fcntl \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \
 		--enable-compressed
diff --git a/mail/pgpsendmail/Makefile b/mail/pgpsendmail/Makefile
index 8a41901534c3..79eb307bcf04 100644
--- a/mail/pgpsendmail/Makefile
+++ b/mail/pgpsendmail/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	pgpsendmail
-PORTVERSION= 	1.4
+PORTVERSION=	1.4
 CATEGORIES=	mail
-MASTER_SITES=   ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
+MASTER_SITES=	ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
 DISTNAME=	PGPsendmail-v${PORTVERSION}
 
-MAINTAINER=     ache@FreeBSD.org
+MAINTAINER=	ache@FreeBSD.org
 
-BUILD_DEPENDS += pgp:${PORTSDIR}/security/pgp
+BUILD_DEPENDS+=	pgp:${PORTSDIR}/security/pgp
 
-WRKSRC=         ${WRKDIR}/pgpsendmail
-INSTALL_TARGET= all_install
+WRKSRC=		${WRKDIR}/pgpsendmail
+INSTALL_TARGET=	all_install
 MAN1=		pgppipe.1 sendpgppass.1
 MAN8=		pgpsendmail.8 pgpdaemon.8
 
diff --git a/mail/pop3gwd/Makefile b/mail/pop3gwd/Makefile
index 066851cf5725..2b4d8abc2e1b 100644
--- a/mail/pop3gwd/Makefile
+++ b/mail/pop3gwd/Makefile
@@ -8,8 +8,8 @@
 
 PORTNAME=	pop3gwd
 PORTVERSION=	1.2
-CATEGORIES=    	mail net
-MASTER_SITES=   http://www.go.dlr.de/linux/src/			\
+CATEGORIES=	mail net
+MASTER_SITES=	http://www.go.dlr.de/linux/src/			\
 		ftp://ftp.eos.hokudai.ac.jp/pub/mail/pop/	\
 		ftp://ftp.win.ne.jp/pub/network/mail/pop/
 
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index c2aa1c64f7c2..f69a84ee77b3 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=      	pop3lite
+PORTNAME=	pop3lite
 PORTVERSION=	0.1.3
-CATEGORIES=    	mail
-MASTER_SITES=  	${MASTER_SITE_SOURCEFORGE}
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	greid@ukug.uk.freebsd.org
diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index 097d8d9d8c82..4c64bc3ff26a 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	qpopper
-PORTVERSION= 	2.53
+PORTVERSION=	2.53
 CATEGORIES=	mail
-MASTER_SITES=   ftp://ftp.qualcomm.com/eudora/servers/unix/popper/old/
+MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/old/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
@@ -23,33 +23,33 @@ MAINTAINER=	ache@freebsd.org
 # If FULL_POPD_DEBUG variable present in the environment, popper builds
 # with more verbose debugging.
 
-O_DEFS=         -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
+O_DEFS=		-DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
 		-DBULLDB -DNONAUTHFILE='\"/etc/ftpusers\"'
 
 .if !defined(APOP_ONLY)
 .if exists(/usr/lib/libskey.a)
-P_LIBS=         -lskey
-O_DEFS+=        -DSKEY
+P_LIBS=		-lskey
+O_DEFS+=	-DSKEY
 .endif
 .else
-O_DEFS+=        -DAPOP_ONLY
+O_DEFS+=	-DAPOP_ONLY
 .endif
 
 .if defined(POPD_YOUBIN_SUPPORT)
-O_DEFS+=        -DYOUBIN -DCALLED_FROM_POPD
+O_DEFS+=	-DYOUBIN -DCALLED_FROM_POPD
 .endif
 
-P_LIBS+=        -lmd -lutil
+P_LIBS+=	-lmd -lutil
 
-GNU_CONFIGURE=          yes
-CONFIGURE_ARGS=         --enable-apop=${PREFIX}/etc/popper/pop.auth \
-			--with-apopuid=pop
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-apop=${PREFIX}/etc/popper/pop.auth \
+		--with-apopuid=pop
 .if defined(FULL_POPD_DEBUG)
-CONFIGURE_ARGS+=        --enable-debugging
+CONFIGURE_ARGS+=	--enable-debugging
 .endif
-CONFIGURE_ENV=          LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
+CONFIGURE_ENV=	LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
-MAN8=   popauth.8 popper.8
+MAN8=	popauth.8 popper.8
 
 post-patch:
 	$(RM) ${WRKSRC}/md5.h
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index de6ce62660d3..e4b2a798b3e8 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	procmail
-PORTVERSION=    3.15
+PORTVERSION=	3.15
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.procmail.org/pub/procmail/ \
 		ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/
 
-MAINTAINER=     ache@FreeBSD.org
+MAINTAINER=	ache@FreeBSD.org
 
-INSTALL_TARGET= install-suid install.man
+INSTALL_TARGET=	install-suid install.man
 
 # It asks for list af directories to do test for file locking
 # (defaults to /tmp and ".", so return should suffice in most cases).
diff --git a/mail/prom-mew/Makefile b/mail/prom-mew/Makefile
index 6c9a87e5252b..41d6781204c9 100644
--- a/mail/prom-mew/Makefile
+++ b/mail/prom-mew/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	prom-mew
-PORTVERSION= 	1.93.4
+PORTVERSION=	1.93.4
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www02.so-net.ne.jp/~murata/software/pub/
 
-MAINTAINER=     kiri@pis.toba-cmt.ac.jp
+MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
 # This port requires Mew. But we can't decide which mew to depends, there is
 # NO RUN_DEPNDS mail/mew*.
diff --git a/mail/prom-wl/Makefile b/mail/prom-wl/Makefile
index c18b69b94682..644a4d80929a 100644
--- a/mail/prom-wl/Makefile
+++ b/mail/prom-wl/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	prom-wl
-PORTVERSION= 	1.0.2
+PORTVERSION=	1.0.2
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www02.so-net.ne.jp/~murata/software/pub/
 
-MAINTAINER=     kiri@pis.toba-cmt.ac.jp
+MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
 # This port requires Wanderlust. But we can't decide which Wanderlust to depends,
 # there is NO RUN_DEPNDS mail/wanderlust-*.
diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile
index ee2bd37a099b..2be4e7db933e 100644
--- a/mail/qmail-contrib/Makefile
+++ b/mail/qmail-contrib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmail-contrib
-PORTVERSION= 	0.1
+PORTVERSION=	0.1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.qmail.org/pub/software/ \
 		ftp://rucus.ru.ac.za/pub/mail/qmail/src/
@@ -17,7 +17,7 @@ MAINTAINER=	nbm@FreeBSD.org
 
 RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 
-NO_PACKAGE=     Unsure of djb\'s license
+NO_PACKAGE=	Unsure of djb\'s license
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup
@@ -25,7 +25,7 @@ INSTALL_TARGET=	setup
 MAN1=		dot-forward.1 fastforward.1 printforward.1 setforward.1
 MAN1+=		newaliases.1 printmaillist.1 setmaillist.1 newinclude.1
 
-PLIST_SUB=      DOCDIR=${DOCDIR}
+PLIST_SUB=	DOCDIR=${DOCDIR}
 
 .if exists(${PREFIX}/qmail/bin/qmail-send)
 QMAIL_DIR?=	${PREFIX}/qmail
@@ -36,9 +36,9 @@ PREFIX?=	/var/qmail
 .endif
 
 .if (${PREFIX} == "/usr/local")
-DOCDIR= share/doc/qmail
+DOCDIR=		share/doc/qmail
 .else
-DOCDIR= doc
+DOCDIR=		doc
 .endif
 
 FF_VER=		0.51
diff --git a/mail/qmailadmin-devel/Makefile b/mail/qmailadmin-devel/Makefile
index 1e31e14360e0..6608fcaa6ae1 100644
--- a/mail/qmailadmin-devel/Makefile
+++ b/mail/qmailadmin-devel/Makefile
@@ -47,9 +47,9 @@ WEBDATASUBDIR?=
 #
 
 .if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=     ${LOCALBASE}/qmail
+QMAIL_DIR?=	${LOCALBASE}/qmail
 .else
-QMAIL_DIR?=     /var/qmail
+QMAIL_DIR?=	/var/qmail
 .endif
 
 # End of user-configurable variables
diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index 1e31e14360e0..6608fcaa6ae1 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -47,9 +47,9 @@ WEBDATASUBDIR?=
 #
 
 .if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=     ${LOCALBASE}/qmail
+QMAIL_DIR?=	${LOCALBASE}/qmail
 .else
-QMAIL_DIR?=     /var/qmail
+QMAIL_DIR?=	/var/qmail
 .endif
 
 # End of user-configurable variables
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index c1ef44f5da47..8f17e9a7260f 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmailanalog
-PORTVERSION= 	0.70
+PORTVERSION=	0.70
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.qmail.org/pub/software/
 
@@ -38,7 +38,7 @@ MYSUBDIR?=
 
 QMPREFIX?=	${PREFIX}/${MYSUBDIR}
 
-NO_MTREE=       yes
+NO_MTREE=	yes
 
 post-patch:
 	@perl -pi.bak -e "s|.usr.local.qmailanalog|${QMPREFIX}|" ${WRKSRC}/conf-home
diff --git a/mail/smtpd/Makefile b/mail/smtpd/Makefile
index dd850790edb2..04dd5d114b8e 100644
--- a/mail/smtpd/Makefile
+++ b/mail/smtpd/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	smtpd
-PORTVERSION= 	2.0
-CATEGORIES=    mail security
-MASTER_SITES=  ftp://ftp.obtuse.com/pub/smtpd/
+PORTVERSION=	2.0
+CATEGORIES=	mail security
+MASTER_SITES=	ftp://ftp.obtuse.com/pub/smtpd/
 
-PATCH_SITES=   ${MASTER_SITES}
-PATCHFILES=    patch-smtpd-2.0-RBL.gz
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	patch-smtpd-2.0-RBL.gz
 
-MAINTAINER=    jonny@jonny.eng.br
+MAINTAINER=	jonny@jonny.eng.br
 
 #  Directory where smtpd will chroot to, and put the received mail
 #  If you change it here, change also patches/patch-aa
diff --git a/mail/smunge/Makefile b/mail/smunge/Makefile
index bbbac894293f..c5034be7a59c 100644
--- a/mail/smunge/Makefile
+++ b/mail/smunge/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	http://www.i2pi.com/smunge/
 
 MAINTAINER=	midom@dammit.lt
 
-LIB_DEPENDS=    ldap:${PORTSDIR}/net/openldap
+LIB_DEPENDS=	ldap:${PORTSDIR}/net/openldap
 
 USE_GMAKE=	true
-WRKSRC=         ${WRKDIR}/
+WRKSRC=		${WRKDIR}
 ALL_TARGET=	smunged
 
 do-install:
diff --git a/mail/spambnc/Makefile b/mail/spambnc/Makefile
index 207d9ce8ae4b..9986e29dd94b 100644
--- a/mail/spambnc/Makefile
+++ b/mail/spambnc/Makefile
@@ -5,21 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=       	spambnc
-PORTVERSION=		111500
-CATEGORIES=     	mail
-MASTER_SITES=   	http://www.spambouncer.org/
-DISTFILES=		spambnc.tar.Z index.shtml
-EXTRACT_ONLY=		spambnc.tar.Z
+PORTNAME=	spambnc
+PORTVERSION=	111500
+CATEGORIES=	mail
+MASTER_SITES=	http://www.spambouncer.org/
+DISTFILES=	spambnc.tar.Z index.shtml
+EXTRACT_ONLY=	spambnc.tar.Z
 
-MAINTAINER=		greid@ukug.uk.freebsd.org
+MAINTAINER=	greid@ukug.uk.freebsd.org
 
-IGNOREFILES=		index.shtml
-NO_WRKSUBDIR=		yes
-NO_BUILD=		yes
+IGNOREFILES=	index.shtml
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
 
-SBFILES=		freemail legitlists notify procmail.rc sb-new.rc \
-			sb-old.rc sb.rc spam
+SBFILES=	freemail legitlists notify procmail.rc sb-new.rc \
+		sb-old.rc sb.rc spam
 
 do-install:
 	${MKDIR} ${PREFIX}/share/spambnc/
diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
index 01c5f5e06600..d7b7beceb534 100644
--- a/mail/vpopmail-devel/Makefile
+++ b/mail/vpopmail-devel/Makefile
@@ -51,9 +51,9 @@ LOGLEVEL?=	y
 APOPFILE?=	/etc/apop-secrets
 
 .if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=     ${LOCALBASE}/qmail
+QMAIL_DIR?=	${LOCALBASE}/qmail
 .else
-QMAIL_DIR?=     /var/qmail
+QMAIL_DIR?=	/var/qmail
 .endif
 
 # Uncomment this, or set PREFIX to /home if you have an existing
diff --git a/mail/vpopmail-stable/Makefile b/mail/vpopmail-stable/Makefile
index 01c5f5e06600..d7b7beceb534 100644
--- a/mail/vpopmail-stable/Makefile
+++ b/mail/vpopmail-stable/Makefile
@@ -51,9 +51,9 @@ LOGLEVEL?=	y
 APOPFILE?=	/etc/apop-secrets
 
 .if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=     ${LOCALBASE}/qmail
+QMAIL_DIR?=	${LOCALBASE}/qmail
 .else
-QMAIL_DIR?=     /var/qmail
+QMAIL_DIR?=	/var/qmail
 .endif
 
 # Uncomment this, or set PREFIX to /home if you have an existing
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 01c5f5e06600..d7b7beceb534 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -51,9 +51,9 @@ LOGLEVEL?=	y
 APOPFILE?=	/etc/apop-secrets
 
 .if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=     ${LOCALBASE}/qmail
+QMAIL_DIR?=	${LOCALBASE}/qmail
 .else
-QMAIL_DIR?=     /var/qmail
+QMAIL_DIR?=	/var/qmail
 .endif
 
 # Uncomment this, or set PREFIX to /home if you have an existing
diff --git a/mail/wanderlust-mule/Makefile b/mail/wanderlust-mule/Makefile
index 6723e07b30da..2350d4153fa5 100644
--- a/mail/wanderlust-mule/Makefile
+++ b/mail/wanderlust-mule/Makefile
@@ -15,7 +15,7 @@ MULE_VER=		2.3
 IS_SLAVE=		yes
 
 .if !defined(WITHOUT_X11) && !defined(WITHOUT_BITMAP)
-RUN_DEPENDS=    ${LOCALBASE}/${EMACS_SITE_LISPDIR}/bitmap/bitmap.el:${PORTSDIR}/editors/bitmap-mule
+RUN_DEPENDS=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/bitmap/bitmap.el:${PORTSDIR}/editors/bitmap-mule
 .endif
 
 .include <${MASTERDIR}/Makefile>
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 797c28edeb32..2bbcff0b3ab4 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfmail
-PORTVERSION= 	1.4.0
-CATEGORIES=     mail
+PORTVERSION=	1.4.0
+CATEGORIES=	mail
 MASTER_SITES=	ftp://xfmail.ufies.org/pub/xfmail/release/1.4.0/
 
 MAINTAINER=	gena@NetVision.net.il
diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile
index 0961ff27daaf..e392bcc80e10 100644
--- a/mail/youbin/Makefile
+++ b/mail/youbin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	youbin
-PORTVERSION= 	2.13
+PORTVERSION=	2.13
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.nuie.nagoya-u.ac.jp/pub/nagoya-u/ \
 		ftp://ftp.kyoto.wide.ad.jp/pub/net/
@@ -15,7 +15,7 @@ MAINTAINER=	max@FreeBSD.org
 
 USE_IMAKE=	yes
 USE_XPM=	yes
-#PREFIX?=         ${LOCALBASE}
+#PREFIX?=	${LOCALBASE}
 #MTREE_FILE?=	/etc/mtree/BSD.local.dist
 
 MAN1=		youbin.1