92 files changed, 102 insertions, 102 deletions

diff --git a/mail/autorespond/Makefile b/mail/autorespond/Makefile
index 16000f7eaf50..b37ad82e40f7 100644
--- a/mail/autorespond/Makefile
+++ b/mail/autorespond/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	autorespond
-PORTVERSION= 	1.0.0
+PORTVERSION=	1.0.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.vpopmail.cx/
 
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 92554efa14e3..435b087bf889 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION= 	1.1.0
+PORTVERSION=	1.1.0
 #PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 92554efa14e3..435b087bf889 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION= 	1.1.0
+PORTVERSION=	1.1.0
 #PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
diff --git a/mail/biffer/Makefile b/mail/biffer/Makefile
index 25f635fe367f..5a5b16979bd7 100644
--- a/mail/biffer/Makefile
+++ b/mail/biffer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	biffer
-PORTVERSION= 	1.0
+PORTVERSION=	1.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.generalconcepts.com/resources/software/
 
diff --git a/mail/bulk_mailer/Makefile b/mail/bulk_mailer/Makefile
index 5da3fbe6880b..1cf928e394d4 100644
--- a/mail/bulk_mailer/Makefile
+++ b/mail/bulk_mailer/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	bulk_mailer
-PORTVERSION= 	1.13
+PORTVERSION=	1.13
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.utk.edu/pub/moore/bulk_mailer/
 
 MAINTAINER=	dlowe@saturn5.com
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=--cache-file=/dev/null
+CONFIGURE_ARGS=	--cache-file=/dev/null
 
 ALL_TARGET=	bulk_mailer
 
diff --git a/mail/cmail/Makefile b/mail/cmail/Makefile
index 29fd493803ba..466a59fc44a7 100644
--- a/mail/cmail/Makefile
+++ b/mail/cmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cmail
-PORTVERSION= 	2.10
+PORTVERSION=	2.10
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.eboai.org/pub/users/chip/
 EXTRACT_SUFX=	.tgz
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index b81402fae332..9da462462ca1 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	coolmail
-PORTVERSION= 	1.3
+PORTVERSION=	1.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=system/mail/biffs
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index cb66b91d19d5..2a394760c3c8 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -9,7 +9,7 @@
 #       Berkeley DB2 is in conflict with libc, so commented out. :-(
 
 PORTNAME=	cucipop
-PORTVERSION= 	1.31
+PORTVERSION=	1.31
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
 
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 4d58bec4ed8d..a3609b3fae95 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus
-PORTVERSION= 	1.6.24
+PORTVERSION=	1.6.24
 PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 4d58bec4ed8d..a3609b3fae95 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus
-PORTVERSION= 	1.6.24
+PORTVERSION=	1.6.24
 PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 4d58bec4ed8d..a3609b3fae95 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus
-PORTVERSION= 	1.6.24
+PORTVERSION=	1.6.24
 PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 4d58bec4ed8d..a3609b3fae95 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus
-PORTVERSION= 	1.6.24
+PORTVERSION=	1.6.24
 PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 4d58bec4ed8d..a3609b3fae95 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus
-PORTVERSION= 	1.6.24
+PORTVERSION=	1.6.24
 PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 4d58bec4ed8d..a3609b3fae95 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus
-PORTVERSION= 	1.6.24
+PORTVERSION=	1.6.24
 PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index 0fea2a6ff32f..7132b032fa16 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	distribute
-PORTVERSION= 	2.1.24
+PORTVERSION=	2.1.24
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.foretune.co.jp/pub/network/mail/distribute/
 DISTNAME=	${PORTNAME}-2.1-pl19
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index fbb5ecf22693..550fa51c1470 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	elm
-PORTVERSION= 	2.5.3
+PORTVERSION=	2.5.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.virginia.edu/pub/elm/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/mail/emil/Makefile b/mail/emil/Makefile
index b67f3b85c864..96926011abd2 100644
--- a/mail/emil/Makefile
+++ b/mail/emil/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	emil
-PORTVERSION= 	2.1b9
+PORTVERSION=	2.1b9
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.uu.se/pub/unix/networking/mail/emil/ \
 		ftp://ftp.gwdg.de/pub/misc/emil/ \
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index f9c72338d02a..3669a4035e6e 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	exim
-PORTVERSION= 	3.20
+PORTVERSION=	3.20
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
 		http://www.exim.org/ftp/ \
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index f9c72338d02a..3669a4035e6e 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	exim
-PORTVERSION= 	3.20
+PORTVERSION=	3.20
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
 		http://www.exim.org/ftp/ \
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index f9c72338d02a..3669a4035e6e 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	exim
-PORTVERSION= 	3.20
+PORTVERSION=	3.20
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
 		http://www.exim.org/ftp/ \
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 2956ba379832..4ff8f6c5eb12 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ezmlm-idx
-PORTVERSION= 	0.40	
+PORTVERSION=	0.40	
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ezmlm.org/pub/patches/ \
 		ftp://ftp.rivertown.net/pub/ezmlm/ \
diff --git a/mail/ezmlm-web/Makefile b/mail/ezmlm-web/Makefile
index 2432dd523fd2..ae9268019a53 100644
--- a/mail/ezmlm-web/Makefile
+++ b/mail/ezmlm-web/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ezmlm-web
-PORTVERSION= 	2.1
+PORTVERSION=	2.1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://rucus.ru.ac.za/pub/mail/ezmlm/
 
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 2626a3ba4476..aea88dc0e202 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	faces
-PORTVERSION= 	1.6.1
+PORTVERSION=	1.6.1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/
 EXTRACT_SUFX=	.tar.Z
diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile
index e9e90322ce16..4a5402d42e1b 100644
--- a/mail/gbuffy/Makefile
+++ b/mail/gbuffy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gbuffy
-PORTVERSION= 	0.2.2
+PORTVERSION=	0.2.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.fiction.net/blong/programs/gbuffy/
 
diff --git a/mail/gkrellmmailwatch/Makefile b/mail/gkrellmmailwatch/Makefile
index 50ca9e567f2a..e961a678e19b 100644
--- a/mail/gkrellmmailwatch/Makefile
+++ b/mail/gkrellmmailwatch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellmmailwatch
-PORTVERSION= 	0.2
+PORTVERSION=	0.2
 CATEGORIES=	mail
 MASTER_SITES=	http://gkrellm.luon.net/files/
 DISTNAME=	mailwatch-${PORTVERSION}
diff --git a/mail/glacier/Makefile b/mail/glacier/Makefile
index 3c887629501d..324d0f79c1da 100644
--- a/mail/glacier/Makefile
+++ b/mail/glacier/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glacier
-PORTVERSION= 	0.0.2
+PORTVERSION=	0.0.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://linuxberg.tele.net/files/gnome/network/
 # http://glacier.linuxave.net/
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index 56b792d3c054..f7033428efe9 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	grepmail
-PORTVERSION= 	4.44
+PORTVERSION=	4.44
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index eb9668edf071..563016095a9d 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	hbiff
-PORTVERSION= 	1.2
+PORTVERSION=	1.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/misc/  \
 		${MASTER_SITE_LOCAL}
diff --git a/mail/im/Makefile b/mail/im/Makefile
index e64d0c825125..9aebe7553532 100644
--- a/mail/im/Makefile
+++ b/mail/im/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	im
-PORTVERSION= 	140
+PORTVERSION=	140
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
 		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index eeffb329f060..2411495c925e 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kbiff
-PORTVERSION= 	2.3.12
+PORTVERSION=	2.3.12
 CATEGORIES=	mail kde
 MASTER_SITES=	http://granroth.kde.org/kbiff/
 
diff --git a/mail/lbdb/Makefile b/mail/lbdb/Makefile
index 356db0102a1e..94d8a56170dd 100644
--- a/mail/lbdb/Makefile
+++ b/mail/lbdb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lbdb
-PORTVERSION= 	0.22
+PORTVERSION=	0.22
 CATEGORIES=	mail
 MASTER_SITES=	http://www.spinnaker.de/debian/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -15,7 +15,7 @@ MAINTAINER=	mwest@uct.ac.za
 
 WRKSRC=		${WRKDIR}/lbdb-${PORTVERSION}
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--libdir=${PREFIX}/libexec --enable-lbdb-dotlock
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/libexec --enable-lbdb-dotlock
 USE_GMAKE=	YES
 
 MAN1=		nodelist2lbdb.1 lbdbq.1 lbdb-fetchaddr.1 lbdb_dotlock.1
diff --git a/mail/mahogany/Makefile b/mail/mahogany/Makefile
index 427bea4a6c69..a90caaa50794 100644
--- a/mail/mahogany/Makefile
+++ b/mail/mahogany/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		mahogany
-PORTVERSION= 		0.60
+PORTVERSION=		0.60
 CATEGORIES=		mail python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mahogany
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 76acd63b60e9..ec9372734195 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		mailagent
-PORTVERSION= 		3.0.70
+PORTVERSION=		3.0.70
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/RAM
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index d92c3bbefa9a..1f92d55b5c5f 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mailcrypt
-PORTVERSION= 	3.5.5
+PORTVERSION=	3.5.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=    apps/crypto
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 4ab9e85972ae..70d724478dd6 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	maildrop
-PORTVERSION= 	0.64
+PORTVERSION=	0.64
 CATEGORIES=	mail
 MASTER_SITES=	http://www.flounder.net/~mrsam/maildrop/ \
 		${MASTER_SITE_SUNSITE}
diff --git a/mail/mailfilter/Makefile b/mail/mailfilter/Makefile
index 3e7f7a81520e..4c0d36205604 100644
--- a/mail/mailfilter/Makefile
+++ b/mail/mailfilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mailfilter
-PORTVERSION= 	1.0b
+PORTVERSION=	1.0b
 CATEGORIES=	mail
 MASTER_SITES=	ftp://samurai.ruin.org/pub/All/
 
diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile
index 033c78e15f12..9918cd3ceea5 100644
--- a/mail/mailx/Makefile
+++ b/mail/mailx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mailx
-PORTVERSION= 	0.5
+PORTVERSION=	0.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/FreeBSD/mailx/
diff --git a/mail/majorcool/Makefile b/mail/majorcool/Makefile
index a6f1e571b745..b57bdd693dcb 100644
--- a/mail/majorcool/Makefile
+++ b/mail/majorcool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	majorcool
-PORTVERSION= 	1.3.2
+PORTVERSION=	1.3.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.netsw.org/netsw/Network/Mail/Tools/ListManager/majordomo/ \
 		ftp://ftp.nhl.nl/pub/unix/MajorDomo/
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 85b1c420679c..fdfecce1ec62 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	majordomo
-PORTVERSION= 	1.94.5
+PORTVERSION=	1.94.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.greatcircle.com/pub/majordomo/1.94.5/ \
 		ftp://ftp.sgi.com/other/majordomo/1.94.5/
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index 938c0222b5b1..8e905dae190d 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mbx2mbox
-PORTVERSION= 	0.33
+PORTVERSION=	0.33
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/mh/Makefile b/mail/mh/Makefile
index ef2f1f707bfe..ae7fe9f30b1f 100644
--- a/mail/mh/Makefile
+++ b/mail/mh/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mh
-PORTVERSION= 	6.8.4
+PORTVERSION=	6.8.4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ics.uci.edu/pub/mh/tar/
 DISTNAME=	${PORTNAME}-6.8.3
diff --git a/mail/minimalist/Makefile b/mail/minimalist/Makefile
index 4546e7b795f9..808b173fc936 100644
--- a/mail/minimalist/Makefile
+++ b/mail/minimalist/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	minimalist
-PORTVERSION= 	2.2
+PORTVERSION=	2.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mml.org.ua/pub/minimalist/ \
 		http://www.giovannelli.it/~gmarco/files/
diff --git a/mail/ml/Makefile b/mail/ml/Makefile
index ed63ed3739fc..bf7f20d4d2c8 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=		ml
-PORTVERSION= 		3.4
-CATEGORIES=		mail
-MASTER_SITES=		http://people.netscape.com/max/ml/
+PORTNAME=	ml
+PORTVERSION=	3.4
+CATEGORIES=	mail
+MASTER_SITES=	http://people.netscape.com/max/ml/
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
-USE_IMAKE=		yes
-USE_MOTIF=		yes
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+USE_IMAKE=	yes
+USE_MOTIF=	yes
 
 pre-configure:
 	@${ECHO_MSG} "===>  Building c-client"
diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile
index a4fa52744ef4..b5d34b4f9a67 100644
--- a/mail/mmc/Makefile
+++ b/mail/mmc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mmc
-PORTVERSION= 	0.5
+PORTVERSION=	0.5
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile
index 0c0287b9fe33..dc09c91d8d7c 100644
--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mmr
-PORTVERSION= 	1.5.4
+PORTVERSION=	1.5.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.devolution.com/~slouken/projects/mmr/
 
diff --git a/mail/mreport/Makefile b/mail/mreport/Makefile
index bb7d14f2f767..0cf3d2974be9 100644
--- a/mail/mreport/Makefile
+++ b/mail/mreport/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mreport
-PORTVERSION= 	0.9
+PORTVERSION=	0.9
 CATEGORIES=	mail sysutils
 MASTER_SITES=	ftp://ftp.datrix.co.za/pub/mreport/
 
diff --git a/mail/muttzilla/Makefile b/mail/muttzilla/Makefile
index d55db059da4f..4576012eabed 100644
--- a/mail/muttzilla/Makefile
+++ b/mail/muttzilla/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	muttzilla
-PORTVERSION= 	0.40
+PORTVERSION=	0.40
 CATEGORIES=	mail www
 MASTER_SITES=	http://www3.bc.sympatico.ca/brian_winters/mutt/
 
diff --git a/mail/newmail/Makefile b/mail/newmail/Makefile
index d306565e311d..962fe4273ac7 100644
--- a/mail/newmail/Makefile
+++ b/mail/newmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	newmail
-PORTVERSION= 	1.0.1
+PORTVERSION=	1.0.1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ugh.net.au/pub/unix/newmail/ \
 		ftp://css.tuu.utas.edu.au/pub/unix/newmail/
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index a756088b4bc2..a3b603662441 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	p5-MIME-Tools
-PORTVERSION= 	5.409
+PORTVERSION=	5.409
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	MIME
diff --git a/mail/p5-Mail-CClient/Makefile b/mail/p5-Mail-CClient/Makefile
index d51b2fd87e4d..c1866139f8f1 100644
--- a/mail/p5-Mail-CClient/Makefile
+++ b/mail/p5-Mail-CClient/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		CClient
-PORTVERSION= 		1.0
+PORTVERSION=		1.0
 CATEGORIES=		mail perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index 6d9aedadac20..13d05b737066 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Mail-Ezmlm
-PORTVERSION= 	0.02.1
+PORTVERSION=	0.02.1
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index b211b527db97..9bde909c260e 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Mail-Folder
-PORTVERSION= 	0.07
+PORTVERSION=	0.07
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index d79bc886e81e..82aa632f221c 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Mail-Tools
-PORTVERSION= 	1.15
+PORTVERSION=	1.15
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
diff --git a/mail/pine4-ssl/Makefile b/mail/pine4-ssl/Makefile
index c7abbd022b3b..e3a8427deae4 100644
--- a/mail/pine4-ssl/Makefile
+++ b/mail/pine4-ssl/Makefile
@@ -11,7 +11,7 @@
 # Good luck to you. :-P
 
 PORTNAME=	pine4-ssl
-PORTVERSION= 	4.21.1.4
+PORTVERSION=	4.21.1.4
 PORTREVISION=	1
 CATEGORIES=	mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 0e2a4135ac5d..4e040d0f2fec 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	popa3d
-PORTVERSION= 	0.4
+PORTVERSION=	0.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.openwall.com/popa3d/ \
 		ftp://ftp.openwall.com/popa3d/ \
diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index 4426b0a5c6fe..e0acd9cff9c5 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	poppassd
-PORTVERSION= 	4.0
+PORTVERSION=	4.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/password/
 DISTNAME=	pwserve-4
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 5ee8e7b0beca..fff6ab724d38 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.13
+PORTVERSION=	19991231.13
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
diff --git a/mail/postilion/Makefile b/mail/postilion/Makefile
index 326c7bc0a37e..588efe54d0b0 100644
--- a/mail/postilion/Makefile
+++ b/mail/postilion/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postilion
-PORTVERSION= 	0.9.3c
+PORTVERSION=	0.9.3c
 CATEGORIES=	mail tk82
 MASTER_SITES=	http://www.postilion.org/
 
diff --git a/mail/premail/Makefile b/mail/premail/Makefile
index b0a2204fff5a..f33f9188b1b8 100644
--- a/mail/premail/Makefile
+++ b/mail/premail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	premail
 PORTVERSION=	0.46
-PORTREVISION=   1
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	ftp://ftp.jpunix.com/pub/remailer-tools/ \
 		ftp://ftp.kiarchive.ru/pub/unix/crypto/
diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index b60f7e7112c2..49c890fe3c28 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmail
-PORTVERSION= 	${QMAIL_VERSION}.${LDAP_PATCH_DATE}
+PORTVERSION=	${QMAIL_VERSION}.${LDAP_PATCH_DATE}
 PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-ldap
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 6303fa29d7da..162f826b5ffa 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qpopper
-PORTVERSION= 	3.1.2
+PORTVERSION=	3.1.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
 		ftp://ftp.gmxuk.net/pub/qpopper/ \
diff --git a/mail/rftp/Makefile b/mail/rftp/Makefile
index e9e93fbd26f8..409273335e16 100644
--- a/mail/rftp/Makefile
+++ b/mail/rftp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rftp
-PORTVERSION= 	1.2
+PORTVERSION=	1.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://toxic.magnesium.net/pub/FreeBSD/rftp/
 
diff --git a/mail/rlytest/Makefile b/mail/rlytest/Makefile
index 2085f81e4e12..932b121edcb4 100644
--- a/mail/rlytest/Makefile
+++ b/mail/rlytest/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rlytest
-PORTVERSION= 	1.20
+PORTVERSION=	1.20
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.unicom.com/sw/rlytest/
 DISTNAME=	${PORTNAME}
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index 0e2f5a445c40..a29fb08fe5c1 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	serialmail
-PORTVERSION= 	0.75
+PORTVERSION=	0.75
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.qmail.org/pub/koobera.math.uic.edu/pub/software/ \
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
index c0807f24606e..ef2a68b39da7 100644
--- a/mail/sigrot/Makefile
+++ b/mail/sigrot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sigrot
-PORTVERSION= 	1.0
+PORTVERSION=	1.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/mail/misc
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index 685f2defdc26..0e2e9fd56947 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smail
-PORTVERSION= 	3.2.0.111
+PORTVERSION=	3.2.0.111
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/ \
 		ftp://ftp.planix.com/pub/Smail/ \
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 707f01163541..3029808e84e6 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spruce
-PORTVERSION= 	0.6.5
+PORTVERSION=	0.6.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.xtorshun.org/spruce/v0.6/ \
 		http://fundy.linuxberg.com/files/x11/network/
diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
index cfa920c26eff..ba1d553ed93d 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	teapop
-PORTVERSION= 	0.28
+PORTVERSION=	0.28
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
 		http://www.toontown.org/pub/teapop/
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index cfa920c26eff..ba1d553ed93d 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	teapop
-PORTVERSION= 	0.28
+PORTVERSION=	0.28
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
 		http://www.toontown.org/pub/teapop/
diff --git a/mail/tkrat/Makefile b/mail/tkrat/Makefile
index 7f420b1c0500..6bbe9deb5344 100644
--- a/mail/tkrat/Makefile
+++ b/mail/tkrat/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tkrat
-PORTVERSION= 	1.2
+PORTVERSION=	1.2
 CATEGORIES=	mail tk82
 MASTER_SITES=	ftp://ftp.karen.hik.se/pub2/unix/mail/ratatosk/ \
 		ftp://ftp.mc.hik.se/pub/unix/mail/ratatosk/ \
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 86f3209e2b1c..5c864e186cba 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tkrat
-PORTVERSION= 	2.0
+PORTVERSION=	2.0
 CATEGORIES=	mail tk82
 MASTER_SITES=	ftp://ftp.md.chalmers.se/pub/tkrat/ \
 		ftp://ftp.sunet.se/pub/unix/mail/tkrat/
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 24e275d1e6cf..6d5dc5b8e7f4 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmbiff
-PORTVERSION= 	0.2
+PORTVERSION=	0.2
 CATEGORIES=	mail windowmaker afterstep
 MASTER_SITES=	http://ccat.elect.ru:8100/wmbiff/ \
 		${MASTER_SITE_LOCAL}
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 163079e8a023..c6dd28d12610 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmmail
-PORTVERSION= 	0.64
+PORTVERSION=	0.64
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	http://www.eecg.utoronto.ca/~chanb/WMMail.app/
 DISTNAME=	WMMail.app-${PORTVERSION}
diff --git a/mail/wmpop3/Makefile b/mail/wmpop3/Makefile
index 314da837ebc5..0fecafd4a243 100644
--- a/mail/wmpop3/Makefile
+++ b/mail/wmpop3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmpop3
-PORTVERSION= 	0.5.6a
+PORTVERSION=	0.5.6a
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	http://www.cs.mun.ca/~scotth/download/
 DISTFILES=	WMPop3-${PORTVERSION}.tar.gz
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index 63e9f77bfdcb..2f62ed8d2e42 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xbuffy
-PORTVERSION= 	3.3
+PORTVERSION=	3.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index f8aca42a753a..e1aa9444e625 100644
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	xfaces
-PORTVERSION= 	3.3
+PORTVERSION=	3.3
 CATEGORIES=	mail
 # xfaces-sounds.tar.gz only in LOCAL_PORTS
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/xfaces/ \
diff --git a/mail/xlbiff/Makefile b/mail/xlbiff/Makefile
index cdc36dca2f20..83616822e0eb 100644
--- a/mail/xlbiff/Makefile
+++ b/mail/xlbiff/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xlbiff
-PORTVERSION= 	3.0
+PORTVERSION=	3.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/  \
 		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 480ea692f58f..4e7d71b2cf42 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmail
-PORTVERSION= 	1.6
+PORTVERSION=	1.6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index d90bbe7932c6..68e0f59e404f 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		xmailbox
-PORTVERSION= 		2.5
+PORTVERSION=		2.5
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
diff --git a/mail/xpbiff-youbin/Makefile b/mail/xpbiff-youbin/Makefile
index 72ee2f78f67f..4df3402080d4 100644
--- a/mail/xpbiff-youbin/Makefile
+++ b/mail/xpbiff-youbin/Makefile
@@ -8,7 +8,7 @@
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
 
 PORTNAME=	xpbiff-youbin
-PORTVERSION= 	1.27	
+PORTVERSION=	1.27	
 
 MAINTAINER=	sanpei@FreeBSD.org
 
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 65a45bced470..a8d709123f07 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -20,9 +20,9 @@ NO_INSTALL_MANPAGES=	yes
 WRKSRC=		${WRKDIR}/xpbiff
 
 .if defined(PREFIX) && ${PREFIX} != ${LOCALBASE}
-YOUBINBINDIR= ${PREFIX}
+YOUBINBINDIR=	${PREFIX}
 .else
-YOUBINBINDIR= ${LOCALBASE}
+YOUBINBINDIR=	${LOCALBASE}
 .endif
 
 do-extract:
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index abf8816fac36..9f85720dffc0 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zmailer
-PORTVERSION= 	2.99.51
+PORTVERSION=	2.99.51
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/mail/zmailer/src/