88 files changed, 45 insertions, 45 deletions

diff --git a/mail/althea/Makefile b/mail/althea/Makefile
index ac0d0ac14451..b94b9e64b99b 100644
--- a/mail/althea/Makefile
+++ b/mail/althea/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Yet another GTK-based mail reader for X. Supports IMAP
 
 USE_REINPLACE=	yes
 USE_GTK=	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/bbmail/Makefile b/mail/bbmail/Makefile
index c8011d131efb..dc827dbc2e7b 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://bbtools.thelinuxcommunity.org/sources/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A tool intended for Blackbox that checks for new mail
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/bbmail/pkg-comment b/mail/bbmail/pkg-comment
deleted file mode 100644
index 02c2bc61cec1..000000000000
--- a/mail/bbmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool intended for Blackbox that checks for new mail
diff --git a/mail/cvsmail/Makefile b/mail/cvsmail/Makefile
index 3009154a23b3..58e85b41872f 100644
--- a/mail/cvsmail/Makefile
+++ b/mail/cvsmail/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.smithurst.org/ben/software/mail/dists/
 DISTNAME=	mailutils-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A small program to add cvsweb links to FreeBSD commit messages
 
 ALL_TARGET=	cvsmail
 MANCOMPRESSED=	no
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..7c8af703f5b3 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 DISTNAME=	${PORTNAME}-imapd-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
 
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
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/drac/Makefile b/mail/drac/Makefile
index 4d12ad7a28c8..e5fe4d180ef6 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Dynamic Relay Authorization Control, a pop-before-smtp implementation
 
 .if defined(WITH_POSTFIX_DB3)
 LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
diff --git a/mail/drac/pkg-comment b/mail/drac/pkg-comment
deleted file mode 100644
index 15e2cb9e4464..000000000000
--- a/mail/drac/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dynamic Relay Authorization Control, a pop-before-smtp implementation
diff --git a/mail/emil/Makefile b/mail/emil/Makefile
index 96926011abd2..e022acb02840 100644
--- a/mail/emil/Makefile
+++ b/mail/emil/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES=	ftp://ftp.uu.se/pub/unix/networking/mail/emil/ \
 DISTNAME=	${PORTNAME}-2.1.0-beta9
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	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/faces/Makefile b/mail/faces/Makefile
index 2d1a2f46d0dc..e1edab8d7ab6 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	Visual mail, user and print face server
 
 LIB_DEPENDS=    intl.4:${PORTSDIR}/devel/gettext
 
diff --git a/mail/faces/pkg-comment b/mail/faces/pkg-comment
deleted file mode 100644
index d7569d00ce37..000000000000
--- a/mail/faces/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Visual mail, user and print face server
diff --git a/mail/glacier/Makefile b/mail/glacier/Makefile
index f21aa5bc7f24..bfb6adb2762c 100644
--- a/mail/glacier/Makefile
+++ b/mail/glacier/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://linuxberg.tele.net/files/gnome/network/
 # http://glacier.linuxave.net/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Another GNOME mail user agent
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	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..bd151cc7fea7 100644
--- a/mail/gtkgrepmail/Makefile
+++ b/mail/gtkgrepmail/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.terminus.net.au/unix/perl/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	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 \
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 d62aaf816bcc..74e2ffd54ff4 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	BSD mail utility with MIME extensions
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
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 c519dd10e9c2..322a5ebddc3c 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A mail library
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 		db4.0:${PORTSDIR}/databases/db4
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..1193bb772113 100644
--- a/mail/librfc822/Makefile
+++ b/mail/librfc822/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://cryp.to/librfc822/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A complete parser for RFC822 addresses
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/rfc822.hh ${PREFIX}/include
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..25ccff618a99 100644
--- a/mail/mail2procmailrc/Makefile
+++ b/mail/mail2procmailrc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.ghettohack.net/timball/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	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 \
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..b8bee4d399ef 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An Emacs/PGP interface
 
 EMACS_PORT_NAME?=	emacs21
 
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..7fa17358b237 100644
--- a/mail/mailx/Makefile
+++ b/mail/mailx/Makefile
@@ -18,6 +18,7 @@ PATCHFILES=	mailx.v05.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Mail command with mailx extensions
 
 EXTRACT_ONLY=	mail-2.2.8.tar.gz
 WRKSRC=		${WRKDIR}/mail-2.2.8
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..b69d3442b74c 100644
--- a/mail/majorcool/Makefile
+++ b/mail/majorcool/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.nuug.no/pub/anders/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A Web Interface to Majordomo
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
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..15e66f3e0345 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	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..d08e84991ed0 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://ftp.rge.com/pub/mail/ml/ \
 		http://people.netscape.com/max/ml/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An X11 IMAP client
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=	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..c0c7518dfa9f 100644
--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.devolution.com/~slouken/projects/mmr/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Curses based MIME Mail Reader
 
 ALL_TARGET=	# empty
 
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..decd95d5c3dd 100644
--- a/mail/mreport/Makefile
+++ b/mail/mreport/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail sysutils
 MASTER_SITES=	ftp://ftp.datrix.co.za/pub/mreport/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Sendmail logfile summary tool
 
 USE_REINPLACE=	yes
 ALL_TARGET=	ALL
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/nail/Makefile b/mail/nail/Makefile
index d62aaf816bcc..74e2ffd54ff4 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	BSD mail utility with MIME extensions
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
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..57db4e26ee51 100644
--- a/mail/nbsmtp/Makefile
+++ b/mail/nbsmtp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://physeeks.dyndns.org:8000/download/ \
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Simple program for outgoing SMTP delivery
 
 NO_WRKSUBDIR=	yes
 
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-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index b9583be255a9..f4f858643feb 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	IMAP
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Perl module for basic IMAP server administration
 
 PERL_CONFIGURE=	YES
 
diff --git a/mail/p5-IMAP-Admin/pkg-comment b/mail/p5-IMAP-Admin/pkg-comment
deleted file mode 100644
index e76ca1b23158..000000000000
--- a/mail/p5-IMAP-Admin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for basic IMAP server administration
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index 8666da5c4467..42f363226564 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX=	p5-
 DISTNAME=	MailFolder-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	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 \
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..d0934990563c 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	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-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 06a94b4e56ec..dd02ff5e2385 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	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 \
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/pear-Mail_Mime/Makefile b/mail/pear-Mail_Mime/Makefile
index 49f247ca087a..54f21f20cb20 100644
--- a/mail/pear-Mail_Mime/Makefile
+++ b/mail/pear-Mail_Mime/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	PEAR classes to create and decode MIME messages
 
 BUILD_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
 RUN_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
diff --git a/mail/pear-Mail_Mime/pkg-comment b/mail/pear-Mail_Mime/pkg-comment
deleted file mode 100644
index a94306bcfd13..000000000000
--- a/mail/pear-Mail_Mime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PEAR classes to create and decode MIME messages
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index e2f0e2bcc311..80fae4783675 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail net security
 MASTER_SITES=	http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A POP3 & IMAP4 proxy that can map users to multiple backend servers
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 		popt.0:${PORTSDIR}/devel/popt \
diff --git a/mail/perdition/pkg-comment b/mail/perdition/pkg-comment
deleted file mode 100644
index 8890a3c31958..000000000000
--- a/mail/perdition/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A POP3 & IMAP4 proxy that can map users to multiple backend servers
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index 9afacf29876f..cbcd71b31f34 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A flexible, modular RFC-compliant POP3 daemon
 
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
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..2ec1f8b99765 100644
--- a/mail/postilion/Makefile
+++ b/mail/postilion/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail tk83
 MASTER_SITES=	http://www.postilion.org/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Mail client with the NeXt look
 
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
 		c-client4:${PORTSDIR}/mail/cclient
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 302cc39c2cdb..07c218b95cb0 100644
--- a/mail/pyzor/Makefile
+++ b/mail/pyzor/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A collaborative, networked system to detect and block spam
 
 USE_BZIP2=	yes
 USE_PYTHON=	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 d9101f8a52ed..f2a0cb55a27e 100644
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	smfilter
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Sentinel is a sendmail milter API implementation
 
 USE_REINPLACE=	yes
 
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..5815ddb4ad9b 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/ \
 		ftp://ftp.weird.com/pub/local/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A program used for receiving and delivering mail
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
 .if !exists(/usr/include/tcpd.h)
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..bfcbb4c53cbb 100644
--- a/mail/smtpclient/Makefile
+++ b/mail/smtpclient/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.engelschall.com/sw/smtpclient/distrib/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	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..adc368e6294c 100644
--- a/mail/smtpd/Makefile
+++ b/mail/smtpd/Makefile
@@ -15,6 +15,7 @@ PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	patch-smtpd-2.0-RBL.gz
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Obtuse smtpd/smtpfwdd, part of the Juniper firewall toolkit
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/sendmail:${PORTSDIR}/mail/sendmail-old
 
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/smtpproxy/Makefile b/mail/smtpproxy/Makefile
index 4dee74a3e2fd..fa6dbd26b3fc 100644
--- a/mail/smtpproxy/Makefile
+++ b/mail/smtpproxy/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.quietsche-entchen.de/download/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	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..471344cd1197 100644
--- a/mail/stuphead/Makefile
+++ b/mail/stuphead/Makefile
@@ -15,6 +15,7 @@ PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	${PORTNAME}-${PORTVERSION}-1.patch
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A lightweight MUA for X11
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
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 c2fc9446a883..352bef03e2bf 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
 		http://www.toontown.org/pub/teapop/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Yet another RFC1939 compliant POP3 server
 
 .if defined(WITH_PGSQL)
 POSTGRESQL_PORT?=	databases/postgresql7
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 c2fc9446a883..352bef03e2bf 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
 		http://www.toontown.org/pub/teapop/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Yet another RFC1939 compliant POP3 server
 
 .if defined(WITH_PGSQL)
 POSTGRESQL_PORT?=	databases/postgresql7
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 1d8ac9b678d5..1ac123d273e9 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.tkrat.org/pub/tkrat/ \
 		http://www.tkrat.org/downloads/stable/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A mail user agent for X with a Tcl/Tk user interface
 
 LIB_DEPENDS=	tcl83:${PORTSDIR}/lang/tcl83 \
 		tk83:${PORTSDIR}/x11-toolkits/tk83 \
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..4cfca9142b03 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	applications
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An X-based interface to the Berkeley mail program
 
 USE_IMAKE=	yes
 USE_XPM=	yes
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..76b2927b287d 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=		ports@FreeBSD.org
+COMMENT=	Mailbox checker with sound and animation for X Window System
 
 USE_REINPLACE=		yes
 USE_IMAKE=		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 428bcfff4e82..2cd81f4dcf62 100644
--- a/mail/xpbiff-youbin/Makefile
+++ b/mail/xpbiff-youbin/Makefile
@@ -11,6 +11,7 @@ PORTNAME=	xpbiff-youbin
 PORTVERSION=	1.27	
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A replacement for xbiff that handles popup window with mail header
 
 YOUBIN=		yes
 MASTERDIR=	${.CURDIR}/../xpbiff
diff --git a/mail/xpbiff-youbin/pkg-comment b/mail/xpbiff-youbin/pkg-comment
deleted file mode 100644
index bd18511e0ed5..000000000000
--- a/mail/xpbiff-youbin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A replacement for xbiff that handles popup window with mail header
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 2f2efe6560d7..409029500406 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/xpbiff/
 DISTNAME=	xpbiff
 DISTFILES=	xpbiff-1.27-with-YOUBIN.tar.gz.uu
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER?=	ports@FreeBSD.org
+COMMENT?=	A replacement for xbiff that handles popup window with mail header
 
 USE_IMAKE=	yes
 USE_XPM=	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