84 files changed, 84 insertions, 42 deletions

diff --git a/mail/althea/Makefile b/mail/althea/Makefile
index ac0d0ac14451..09b1b4b5b1a4 100644
--- a/mail/althea/Makefile
+++ b/mail/althea/Makefile
@@ -14,6 +14,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Yet another GTK-based mail reader for X. Supports IMAP
+
 USE_REINPLACE=	yes
 USE_GTK=	yes
 USE_OPENSSL=	yes
diff --git a/mail/althea/pkg-comment b/mail/althea/pkg-comment
deleted file mode 100644
index bf3bdc8533d4..000000000000
--- a/mail/althea/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another GTK-based mail reader for X. Supports IMAP
diff --git a/mail/cvsmail/Makefile b/mail/cvsmail/Makefile
index 3009154a23b3..e49d07e204fc 100644
--- a/mail/cvsmail/Makefile
+++ b/mail/cvsmail/Makefile
@@ -13,6 +13,8 @@ DISTNAME=	mailutils-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A small program to add cvsweb links to FreeBSD commit messages
+
 ALL_TARGET=	cvsmail
 MANCOMPRESSED=	no
 MAN1=		cvsmail.1
diff --git a/mail/cvsmail/pkg-comment b/mail/cvsmail/pkg-comment
deleted file mode 100644
index 3c067cca3815..000000000000
--- a/mail/cvsmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small program to add cvsweb links to FreeBSD commit messages
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 1f95d80cb7af..c7f2afe2c9f5 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -15,6 +15,8 @@ DISTNAME=	${PORTNAME}-imapd-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
+
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
 		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
diff --git a/mail/cyrus/pkg-comment b/mail/cyrus/pkg-comment
deleted file mode 100644
index b26e555b2c72..000000000000
--- a/mail/cyrus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
diff --git a/mail/emil/Makefile b/mail/emil/Makefile
index 96926011abd2..2101210e145f 100644
--- a/mail/emil/Makefile
+++ b/mail/emil/Makefile
@@ -17,6 +17,8 @@ DISTNAME=	${PORTNAME}-2.1.0-beta9
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Mail format/encoding converter
+
 GNU_CONFIGURE=	yes
 MAN1=		emil.1 emil.cf.1
 
diff --git a/mail/emil/pkg-comment b/mail/emil/pkg-comment
deleted file mode 100644
index f409b8b0d629..000000000000
--- a/mail/emil/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mail format/encoding converter
diff --git a/mail/glacier/Makefile b/mail/glacier/Makefile
index f21aa5bc7f24..0a48404da555 100644
--- a/mail/glacier/Makefile
+++ b/mail/glacier/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://linuxberg.tele.net/files/gnome/network/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Another GNOME mail user agent
+
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/mail/glacier/pkg-comment b/mail/glacier/pkg-comment
deleted file mode 100644
index d26745bcfc1c..000000000000
--- a/mail/glacier/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Another GNOME mail user agent
diff --git a/mail/gtkgrepmail/Makefile b/mail/gtkgrepmail/Makefile
index 45bcb17580e2..4c289f7f03ae 100644
--- a/mail/gtkgrepmail/Makefile
+++ b/mail/gtkgrepmail/Makefile
@@ -13,6 +13,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A gtk front-end to grepmail
+
 BUILD_DEPENDS=	grepmail:${PORTSDIR}/mail/grepmail \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
diff --git a/mail/gtkgrepmail/pkg-comment b/mail/gtkgrepmail/pkg-comment
deleted file mode 100644
index 5d8a2bb58b10..000000000000
--- a/mail/gtkgrepmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A gtk front-end to grepmail
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index b2eb842d47e0..f8bf9598b0c5 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	BSD mail utility with MIME extensions
+
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
diff --git a/mail/heirloom-mailx/pkg-comment b/mail/heirloom-mailx/pkg-comment
deleted file mode 100644
index 42d27213389f..000000000000
--- a/mail/heirloom-mailx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-BSD mail utility with MIME extensions
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 42d5f2dfa3ea..0e4222cb7ed6 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -15,6 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A mail library
+
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 		db3.3:${PORTSDIR}/databases/db3
 
diff --git a/mail/libetpan/pkg-comment b/mail/libetpan/pkg-comment
deleted file mode 100644
index 8e1b84cd2a6a..000000000000
--- a/mail/libetpan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mail library
diff --git a/mail/librfc822/Makefile b/mail/librfc822/Makefile
index 7e1792804649..97925ce43f54 100644
--- a/mail/librfc822/Makefile
+++ b/mail/librfc822/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://cryp.to/librfc822/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A complete parser for RFC822 addresses
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/rfc822.hh ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/librfc822.a ${PREFIX}/lib
diff --git a/mail/librfc822/pkg-comment b/mail/librfc822/pkg-comment
deleted file mode 100644
index dbf366e91302..000000000000
--- a/mail/librfc822/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A complete parser for RFC822 addresses
diff --git a/mail/mail2procmailrc/Makefile b/mail/mail2procmailrc/Makefile
index 556addac6d2a..87dad550e025 100644
--- a/mail/mail2procmailrc/Makefile
+++ b/mail/mail2procmailrc/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	mail to procmailrc generator
+
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Curses/Widgets.pm:${PORTSDIR}/devel/p5-Curses-Widgets \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools
diff --git a/mail/mail2procmailrc/pkg-comment b/mail/mail2procmailrc/pkg-comment
deleted file mode 100644
index d8d6275683a6..000000000000
--- a/mail/mail2procmailrc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-mail to procmailrc generator
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index dc75feb5886f..ae3c847a2ad5 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An Emacs/PGP interface
+
 EMACS_PORT_NAME?=	emacs21
 
 GNU_CONFIGURE=	yes
diff --git a/mail/mailcrypt/pkg-comment b/mail/mailcrypt/pkg-comment
deleted file mode 100644
index 8261c9926602..000000000000
--- a/mail/mailcrypt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Emacs/PGP interface
diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile
index a5f7b1a96ccb..1c3078ed443b 100644
--- a/mail/mailx/Makefile
+++ b/mail/mailx/Makefile
@@ -19,6 +19,8 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Mail command with mailx extensions
+
 EXTRACT_ONLY=	mail-2.2.8.tar.gz
 WRKSRC=		${WRKDIR}/mail-2.2.8
 USE_PERL5=	yes
diff --git a/mail/mailx/pkg-comment b/mail/mailx/pkg-comment
deleted file mode 100644
index 6a0deddcc1ad..000000000000
--- a/mail/mailx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mail command with mailx extensions
diff --git a/mail/majorcool/Makefile b/mail/majorcool/Makefile
index 723ebb70ec9a..15c1f0abff2c 100644
--- a/mail/majorcool/Makefile
+++ b/mail/majorcool/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	ftp://ftp.nuug.no/pub/anders/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A Web Interface to Majordomo
+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_PACKAGE=	"Too many questions"
diff --git a/mail/majorcool/pkg-comment b/mail/majorcool/pkg-comment
deleted file mode 100644
index 58ee04a827b2..000000000000
--- a/mail/majorcool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Web Interface to Majordomo
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index 77ac5e276c21..6c6013f81553 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -13,6 +13,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	MS Outlook Express .mbx to mbox file converter
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/mail/mbx2mbox/pkg-comment b/mail/mbx2mbox/pkg-comment
deleted file mode 100644
index f3a22ca4d62c..000000000000
--- a/mail/mbx2mbox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MS Outlook Express .mbx to mbox file converter
diff --git a/mail/ml/Makefile b/mail/ml/Makefile
index 407cdb29208a..deba0f638a56 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://ftp.rge.com/pub/mail/ml/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An X11 IMAP client
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=	yes
 USE_MOTIF=	yes
diff --git a/mail/ml/pkg-comment b/mail/ml/pkg-comment
deleted file mode 100644
index b63fe9e388d5..000000000000
--- a/mail/ml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 IMAP client
diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile
index f3d4531868ca..630db0de11a2 100644
--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://www.devolution.com/~slouken/projects/mmr/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Curses based MIME Mail Reader
+
 ALL_TARGET=	# empty
 
 do-install:
diff --git a/mail/mmr/pkg-comment b/mail/mmr/pkg-comment
deleted file mode 100644
index 53b262986fef..000000000000
--- a/mail/mmr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Curses based MIME Mail Reader
diff --git a/mail/mreport/Makefile b/mail/mreport/Makefile
index 41a029f139e5..02b8b18b81bb 100644
--- a/mail/mreport/Makefile
+++ b/mail/mreport/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	ftp://ftp.datrix.co.za/pub/mreport/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Sendmail logfile summary tool
+
 USE_REINPLACE=	yes
 ALL_TARGET=	ALL
 MAN8=		mreport.8
diff --git a/mail/mreport/pkg-comment b/mail/mreport/pkg-comment
deleted file mode 100644
index 4be74fb9869e..000000000000
--- a/mail/mreport/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sendmail logfile summary tool
diff --git a/mail/muttzilla/Makefile b/mail/muttzilla/Makefile
index e3c51b7640c6..df5ed7dc3dbc 100644
--- a/mail/muttzilla/Makefile
+++ b/mail/muttzilla/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://www3.bc.sympatico.ca/brian_winters/mutt/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Mutt MUA plugin for Netscape for use on "mailto:" URL\'s
+
 USE_REINPLACE=	yes
 
 pre-configure:
diff --git a/mail/muttzilla/pkg-comment b/mail/muttzilla/pkg-comment
deleted file mode 100644
index be4d8c5d2b59..000000000000
--- a/mail/muttzilla/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mutt MUA plugin for Netscape for use on "mailto:" URL's
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index b2eb842d47e0..f8bf9598b0c5 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	BSD mail utility with MIME extensions
+
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
diff --git a/mail/nail/pkg-comment b/mail/nail/pkg-comment
deleted file mode 100644
index 42d27213389f..000000000000
--- a/mail/nail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-BSD mail utility with MIME extensions
diff --git a/mail/nbsmtp/Makefile b/mail/nbsmtp/Makefile
index 199d0e32745e..dc7698f573eb 100644
--- a/mail/nbsmtp/Makefile
+++ b/mail/nbsmtp/Makefile
@@ -14,6 +14,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Simple program for outgoing SMTP delivery
+
 NO_WRKSUBDIR=	yes
 
 do-install:
diff --git a/mail/nbsmtp/pkg-comment b/mail/nbsmtp/pkg-comment
deleted file mode 100644
index bd2b9bef1409..000000000000
--- a/mail/nbsmtp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple program for outgoing SMTP delivery
diff --git a/mail/p5-Mail-Bulkmail/Makefile b/mail/p5-Mail-Bulkmail/Makefile
index 2a5a50b38b84..7a6677486759 100644
--- a/mail/p5-Mail-Bulkmail/Makefile
+++ b/mail/p5-Mail-Bulkmail/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl module for mailing lists
+
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/mail/p5-Mail-Bulkmail/pkg-comment b/mail/p5-Mail-Bulkmail/pkg-comment
deleted file mode 100644
index 087d7c5f142d..000000000000
--- a/mail/p5-Mail-Bulkmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for mailing lists
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index 8666da5c4467..2c207b0952b6 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -15,6 +15,8 @@ DISTNAME=	MailFolder-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl module for a folder-independant interface to email folders
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync
diff --git a/mail/p5-Mail-Folder/pkg-comment b/mail/p5-Mail-Folder/pkg-comment
deleted file mode 100644
index 4960156d5409..000000000000
--- a/mail/p5-Mail-Folder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for a folder-independant interface to email folders
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index 9741f93cf8d9..797b564f5c10 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl module to detect newer messages in procmail-generated mailboxes
+
 BUILD_DEPENDS=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/mail/p5-Mail-MailStats/pkg-comment b/mail/p5-Mail-MailStats/pkg-comment
deleted file mode 100644
index b13843d7e277..000000000000
--- a/mail/p5-Mail-MailStats/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to detect newer messages in procmail-generated mailboxes
diff --git a/mail/p5-Mail-Procmailrc/Makefile b/mail/p5-Mail-Procmailrc/Makefile
index 56b4254924c3..01f4ba884619 100644
--- a/mail/p5-Mail-Procmailrc/Makefile
+++ b/mail/p5-Mail-Procmailrc/Makefile
@@ -16,6 +16,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A Perl OO interface to procmail rc files
+
 PERL_CONFIGURE=	YES
 
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Procmailrc/pkg-comment b/mail/p5-Mail-Procmailrc/pkg-comment
deleted file mode 100644
index 60ebd9eb7a13..000000000000
--- a/mail/p5-Mail-Procmailrc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl OO interface to procmail rc files
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 06a94b4e56ec..ba72f47d11e1 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A "pure perl" implementation of mail spooling, unspooling and sending
+
 BUILD_DEPENDS=	${SITE_PERL}/File/NFSLock.pm:${PORTSDIR}/devel/p5-File-NFSLock \
 		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
diff --git a/mail/p5-Mail-Spool/pkg-comment b/mail/p5-Mail-Spool/pkg-comment
deleted file mode 100644
index e2e86813e2d5..000000000000
--- a/mail/p5-Mail-Spool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A "pure perl" implementation of mail spooling, unspooling and sending
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index 9afacf29876f..1b6b96b99f3d 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -13,6 +13,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A flexible, modular RFC-compliant POP3 daemon
+
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
 USE_GMAKE=	yes
diff --git a/mail/pop3lite/pkg-comment b/mail/pop3lite/pkg-comment
deleted file mode 100644
index 85658c317433..000000000000
--- a/mail/pop3lite/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A flexible, modular RFC-compliant POP3 daemon
diff --git a/mail/postilion/Makefile b/mail/postilion/Makefile
index 132b5a5f7bad..2f821fd362bf 100644
--- a/mail/postilion/Makefile
+++ b/mail/postilion/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://www.postilion.org/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Mail client with the NeXt look
+
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
 		c-client4:${PORTSDIR}/mail/cclient
 RUN_DEPENDS=	${LOCALBASE}/lib/Img1.2/pkgIndex.tcl:${PORTSDIR}/graphics/libimg
diff --git a/mail/postilion/pkg-comment b/mail/postilion/pkg-comment
deleted file mode 100644
index 83d09158b279..000000000000
--- a/mail/postilion/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mail client with the NeXt look
diff --git a/mail/pyzor/Makefile b/mail/pyzor/Makefile
index f7762ee70fda..df3fb1a940fb 100644
--- a/mail/pyzor/Makefile
+++ b/mail/pyzor/Makefile
@@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A collaborative, networked system to detect and block spam
+
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/mail/pyzor/pkg-comment b/mail/pyzor/pkg-comment
deleted file mode 100644
index f88f303f9426..000000000000
--- a/mail/pyzor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collaborative, networked system to detect and block spam
diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile
index 3c34677e6045..988e65e1781d 100644
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Sentinel is a sendmail milter API implementation
+
 USE_REINPLACE=	yes
 MAKEFILE=	Makefile.FreeBSD
 ALL_TARGET=	sentinel
diff --git a/mail/sentinel/pkg-comment b/mail/sentinel/pkg-comment
deleted file mode 100644
index 7ad8836f4b2b..000000000000
--- a/mail/sentinel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sentinel is a sendmail milter API implementation
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index d6b0a94fd989..c4bd85193a4b 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -15,6 +15,8 @@ MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A program used for receiving and delivering mail
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
 .if !exists(/usr/include/tcpd.h)
 LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
diff --git a/mail/smail/pkg-comment b/mail/smail/pkg-comment
deleted file mode 100644
index 8404ed301dbc..000000000000
--- a/mail/smail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program used for receiving and delivering mail
diff --git a/mail/smtpclient/Makefile b/mail/smtpclient/Makefile
index db79d36c1309..5309f71ad889 100644
--- a/mail/smtpclient/Makefile
+++ b/mail/smtpclient/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://www.engelschall.com/sw/smtpclient/distrib/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Simple SMTP client
+
 GNU_CONFIGURE=	yes
 MAN1=		smtpclient.1
 
diff --git a/mail/smtpclient/pkg-comment b/mail/smtpclient/pkg-comment
deleted file mode 100644
index ccaea253f8b7..000000000000
--- a/mail/smtpclient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple SMTP client
diff --git a/mail/smtpd/Makefile b/mail/smtpd/Makefile
index eb0a1ddde9e1..0e06b1ae9cf9 100644
--- a/mail/smtpd/Makefile
+++ b/mail/smtpd/Makefile
@@ -16,6 +16,8 @@ PATCHFILES=	patch-smtpd-2.0-RBL.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Obtuse smtpd/smtpfwdd, part of the Juniper firewall toolkit
+
 RUN_DEPENDS=	${LOCALBASE}/sbin/sendmail:${PORTSDIR}/mail/sendmail-old
 
 #  Directory where smtpd will chroot to, and put the received mail
diff --git a/mail/smtpd/pkg-comment b/mail/smtpd/pkg-comment
deleted file mode 100644
index a5ed580b5094..000000000000
--- a/mail/smtpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Obtuse smtpd/smtpfwdd, part of the Juniper firewall toolkit
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 6a1a1b78693a..779d23c472da 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	SMTP Fast Exploding External Deliverer for Sendmail
+
 RUN_DEPENDS=	${LOCALBASE}/sbin/sendmail:${PORTSDIR}/mail/sendmail
 
 NO_PACKAGE=	"complex configuration for sendmail.cf needed"
diff --git a/mail/smtpfeed/pkg-comment b/mail/smtpfeed/pkg-comment
deleted file mode 100644
index a30f9c546bed..000000000000
--- a/mail/smtpfeed/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SMTP Fast Exploding External Deliverer for Sendmail
diff --git a/mail/smtpproxy/Makefile b/mail/smtpproxy/Makefile
index 4dee74a3e2fd..d441da8f5cf9 100644
--- a/mail/smtpproxy/Makefile
+++ b/mail/smtpproxy/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://www.quietsche-entchen.de/download/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	SMTP proxy server
+
 USE_REINPLACE=	yes
 MAKEFILE=	makefile
 
diff --git a/mail/smtpproxy/pkg-comment b/mail/smtpproxy/pkg-comment
deleted file mode 100644
index 13007358bedb..000000000000
--- a/mail/smtpproxy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SMTP proxy server
diff --git a/mail/stuphead/Makefile b/mail/stuphead/Makefile
index eaf16a8f92db..23482a36aae1 100644
--- a/mail/stuphead/Makefile
+++ b/mail/stuphead/Makefile
@@ -16,6 +16,8 @@ PATCHFILES=	${PORTNAME}-${PORTVERSION}-1.patch
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A lightweight MUA for X11
+
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_REINPLACE=	yes
diff --git a/mail/stuphead/pkg-comment b/mail/stuphead/pkg-comment
deleted file mode 100644
index 11002cbcd7f8..000000000000
--- a/mail/stuphead/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight MUA for X11
diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
index d002ae401406..f8ca8873efd9 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Yet another RFC1939 compliant POP3 server
+
 .if defined(WITH_PGSQL)
 LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 .endif
diff --git a/mail/teapop-devel/pkg-comment b/mail/teapop-devel/pkg-comment
deleted file mode 100644
index daca3c48c049..000000000000
--- a/mail/teapop-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another RFC1939 compliant POP3 server
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index d002ae401406..f8ca8873efd9 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Yet another RFC1939 compliant POP3 server
+
 .if defined(WITH_PGSQL)
 LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 .endif
diff --git a/mail/teapop/pkg-comment b/mail/teapop/pkg-comment
deleted file mode 100644
index daca3c48c049..000000000000
--- a/mail/teapop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another RFC1939 compliant POP3 server
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 786f40c5efb5..3375616cedc3 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -14,6 +14,8 @@ MASTER_SITES=	ftp://ftp.md.chalmers.se/pub/tkrat/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A mail user agent for X with a Tcl/Tk user interface
+
 LIB_DEPENDS=	tcl83:${PORTSDIR}/lang/tcl83 \
 		tk83:${PORTSDIR}/x11-toolkits/tk83 \
 		c-client4.8:${PORTSDIR}/mail/cclient
diff --git a/mail/tkrat2/pkg-comment b/mail/tkrat2/pkg-comment
deleted file mode 100644
index fe73a34ddfe2..000000000000
--- a/mail/tkrat2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mail user agent for X with a Tcl/Tk user interface
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 4e7d71b2cf42..9800c64fbba9 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An X-based interface to the Berkeley mail program
+
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		xmail.1
diff --git a/mail/xmail/pkg-comment b/mail/xmail/pkg-comment
deleted file mode 100644
index c70f84b7bcf8..000000000000
--- a/mail/xmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X-based interface to the Berkeley mail program
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 4867d91bfc56..fd0edb5f75c2 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -13,6 +13,8 @@ MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=		ports@FreeBSD.org
 
+PORTCOMMENT=		Mailbox checker with sound and animation for X Window System
+
 USE_REINPLACE=		yes
 USE_IMAKE=		yes
 USE_XPM=		yes
diff --git a/mail/xmailbox/pkg-comment b/mail/xmailbox/pkg-comment
deleted file mode 100644
index e6908013858b..000000000000
--- a/mail/xmailbox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mailbox checker with sound and animation for X Window System
diff --git a/mail/xpbiff-youbin/Makefile b/mail/xpbiff-youbin/Makefile
index 516b2eed1862..efe887481d11 100644
--- a/mail/xpbiff-youbin/Makefile
+++ b/mail/xpbiff-youbin/Makefile
@@ -12,6 +12,8 @@ PORTVERSION=	1.27
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A replacement for xbiff that handles popup window with mail header via youbin
+
 YOUBIN=		yes
 MASTERDIR=	${.CURDIR}/../xpbiff
 PKGDIR=		${.CURDIR}
diff --git a/mail/xpbiff-youbin/pkg-comment b/mail/xpbiff-youbin/pkg-comment
deleted file mode 100644
index e00b5156b3bc..000000000000
--- a/mail/xpbiff-youbin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A replacement for xbiff that handles popup window with mail header via youbin
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 2f2efe6560d7..97e7f5a8eea2 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -15,6 +15,8 @@ DISTFILES=	xpbiff-1.27-with-YOUBIN.tar.gz.uu
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A replacement for xbiff that handles popup window with mail header
+
 USE_IMAKE=	yes
 USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/mail/xpbiff/pkg-comment b/mail/xpbiff/pkg-comment
deleted file mode 100644
index bd18511e0ed5..000000000000
--- a/mail/xpbiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A replacement for xbiff that handles popup window with mail header