o Rollback PORTCOMMENT modifications while this feature's implementation

  is better studied
o Turn PORTCOMMENT variable in Makefile back into pkg-comment files

Approved by:	kris (portmgr hat),
		portmgr, re (silence)

92 files changed, 46 insertions, 88 deletions

diff --git a/mail/althea/Makefile b/mail/althea/Makefile
index 09b1b4b5b1a4..ac0d0ac14451 100644
--- a/mail/althea/Makefile
+++ b/mail/althea/Makefile
@@ -14,8 +14,6 @@ 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
new file mode 100644
index 000000000000..bf3bdc8533d4
--- /dev/null
+++ b/mail/althea/pkg-comment
@@ -0,0 +1 @@
+Yet another GTK-based mail reader for X. Supports IMAP
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 31487718541c..00dfe3fe86b7 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -19,7 +19,6 @@
 
 PORTNAME=	anubis
 PORTVERSION=	3.5.0
-PORTCOMMENT=	Outgoing SMTP mail processor
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/anubis/pkg-comment b/mail/anubis/pkg-comment
new file mode 100644
index 000000000000..7b6372685ae1
--- /dev/null
+++ b/mail/anubis/pkg-comment
@@ -0,0 +1 @@
+Outgoing SMTP mail processor
diff --git a/mail/cvsmail/Makefile b/mail/cvsmail/Makefile
index e49d07e204fc..3009154a23b3 100644
--- a/mail/cvsmail/Makefile
+++ b/mail/cvsmail/Makefile
@@ -13,8 +13,6 @@ 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
new file mode 100644
index 000000000000..3c067cca3815
--- /dev/null
+++ b/mail/cvsmail/pkg-comment
@@ -0,0 +1 @@
+A small program to add cvsweb links to FreeBSD commit messages
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index c7f2afe2c9f5..1f95d80cb7af 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -15,8 +15,6 @@ 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
new file mode 100644
index 000000000000..b26e555b2c72
--- /dev/null
+++ b/mail/cyrus/pkg-comment
@@ -0,0 +1 @@
+The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
diff --git a/mail/emil/Makefile b/mail/emil/Makefile
index 2101210e145f..96926011abd2 100644
--- a/mail/emil/Makefile
+++ b/mail/emil/Makefile
@@ -17,8 +17,6 @@ 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
new file mode 100644
index 000000000000..f409b8b0d629
--- /dev/null
+++ b/mail/emil/pkg-comment
@@ -0,0 +1 @@
+Mail format/encoding converter
diff --git a/mail/glacier/Makefile b/mail/glacier/Makefile
index 0a48404da555..f21aa5bc7f24 100644
--- a/mail/glacier/Makefile
+++ b/mail/glacier/Makefile
@@ -13,8 +13,6 @@ 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
new file mode 100644
index 000000000000..d26745bcfc1c
--- /dev/null
+++ b/mail/glacier/pkg-comment
@@ -0,0 +1 @@
+Another GNOME mail user agent
diff --git a/mail/gtkgrepmail/Makefile b/mail/gtkgrepmail/Makefile
index 4c289f7f03ae..45bcb17580e2 100644
--- a/mail/gtkgrepmail/Makefile
+++ b/mail/gtkgrepmail/Makefile
@@ -13,8 +13,6 @@ 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
new file mode 100644
index 000000000000..5d8a2bb58b10
--- /dev/null
+++ b/mail/gtkgrepmail/pkg-comment
@@ -0,0 +1 @@
+A gtk front-end to grepmail
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index f8bf9598b0c5..b2eb842d47e0 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -12,8 +12,6 @@ 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
new file mode 100644
index 000000000000..42d27213389f
--- /dev/null
+++ b/mail/heirloom-mailx/pkg-comment
@@ -0,0 +1 @@
+BSD mail utility with MIME extensions
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 0e4222cb7ed6..42d5f2dfa3ea 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -15,8 +15,6 @@ 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
new file mode 100644
index 000000000000..8e1b84cd2a6a
--- /dev/null
+++ b/mail/libetpan/pkg-comment
@@ -0,0 +1 @@
+A mail library
diff --git a/mail/librfc822/Makefile b/mail/librfc822/Makefile
index 97925ce43f54..7e1792804649 100644
--- a/mail/librfc822/Makefile
+++ b/mail/librfc822/Makefile
@@ -13,8 +13,6 @@ 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
new file mode 100644
index 000000000000..dbf366e91302
--- /dev/null
+++ b/mail/librfc822/pkg-comment
@@ -0,0 +1 @@
+A complete parser for RFC822 addresses
diff --git a/mail/mail2procmailrc/Makefile b/mail/mail2procmailrc/Makefile
index 87dad550e025..556addac6d2a 100644
--- a/mail/mail2procmailrc/Makefile
+++ b/mail/mail2procmailrc/Makefile
@@ -14,8 +14,6 @@ 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
new file mode 100644
index 000000000000..d8d6275683a6
--- /dev/null
+++ b/mail/mail2procmailrc/pkg-comment
@@ -0,0 +1 @@
+mail to procmailrc generator
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index ae3c847a2ad5..dc75feb5886f 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -14,8 +14,6 @@ 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
new file mode 100644
index 000000000000..8261c9926602
--- /dev/null
+++ b/mail/mailcrypt/pkg-comment
@@ -0,0 +1 @@
+An Emacs/PGP interface
diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile
index 1c3078ed443b..a5f7b1a96ccb 100644
--- a/mail/mailx/Makefile
+++ b/mail/mailx/Makefile
@@ -19,8 +19,6 @@ 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
new file mode 100644
index 000000000000..6a0deddcc1ad
--- /dev/null
+++ b/mail/mailx/pkg-comment
@@ -0,0 +1 @@
+Mail command with mailx extensions
diff --git a/mail/majorcool/Makefile b/mail/majorcool/Makefile
index 15c1f0abff2c..723ebb70ec9a 100644
--- a/mail/majorcool/Makefile
+++ b/mail/majorcool/Makefile
@@ -12,8 +12,6 @@ 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
new file mode 100644
index 000000000000..58ee04a827b2
--- /dev/null
+++ b/mail/majorcool/pkg-comment
@@ -0,0 +1 @@
+A Web Interface to Majordomo
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index 6c6013f81553..77ac5e276c21 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -13,8 +13,6 @@ 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
new file mode 100644
index 000000000000..f3a22ca4d62c
--- /dev/null
+++ b/mail/mbx2mbox/pkg-comment
@@ -0,0 +1 @@
+MS Outlook Express .mbx to mbox file converter
diff --git a/mail/ml/Makefile b/mail/ml/Makefile
index deba0f638a56..407cdb29208a 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -13,8 +13,6 @@ 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
new file mode 100644
index 000000000000..b63fe9e388d5
--- /dev/null
+++ b/mail/ml/pkg-comment
@@ -0,0 +1 @@
+An X11 IMAP client
diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile
index 630db0de11a2..f3d4531868ca 100644
--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@@ -12,8 +12,6 @@ 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
new file mode 100644
index 000000000000..53b262986fef
--- /dev/null
+++ b/mail/mmr/pkg-comment
@@ -0,0 +1 @@
+Curses based MIME Mail Reader
diff --git a/mail/mreport/Makefile b/mail/mreport/Makefile
index 02b8b18b81bb..41a029f139e5 100644
--- a/mail/mreport/Makefile
+++ b/mail/mreport/Makefile
@@ -12,8 +12,6 @@ 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
new file mode 100644
index 000000000000..4be74fb9869e
--- /dev/null
+++ b/mail/mreport/pkg-comment
@@ -0,0 +1 @@
+Sendmail logfile summary tool
diff --git a/mail/muttzilla/Makefile b/mail/muttzilla/Makefile
index 3025d4c8a24c..e3c51b7640c6 100644
--- a/mail/muttzilla/Makefile
+++ b/mail/muttzilla/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	http://www3.bc.sympatico.ca/brian_winters/mutt/
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Mutt MUA plugin for Netscape for use on "mailto:" URLs
-
 USE_REINPLACE=	yes
 
 pre-configure:
diff --git a/mail/muttzilla/pkg-comment b/mail/muttzilla/pkg-comment
new file mode 100644
index 000000000000..9745cb2c7441
--- /dev/null
+++ b/mail/muttzilla/pkg-comment
@@ -0,0 +1 @@
+Mutt MUA plugin for Netscape for use on "mailto:" URLs
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index f8bf9598b0c5..b2eb842d47e0 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -12,8 +12,6 @@ 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
new file mode 100644
index 000000000000..42d27213389f
--- /dev/null
+++ b/mail/nail/pkg-comment
@@ -0,0 +1 @@
+BSD mail utility with MIME extensions
diff --git a/mail/nbsmtp/Makefile b/mail/nbsmtp/Makefile
index dc7698f573eb..199d0e32745e 100644
--- a/mail/nbsmtp/Makefile
+++ b/mail/nbsmtp/Makefile
@@ -14,8 +14,6 @@ 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
new file mode 100644
index 000000000000..bd2b9bef1409
--- /dev/null
+++ b/mail/nbsmtp/pkg-comment
@@ -0,0 +1 @@
+Simple program for outgoing SMTP delivery
diff --git a/mail/p5-Mail-Bulkmail/Makefile b/mail/p5-Mail-Bulkmail/Makefile
index 7a6677486759..2a5a50b38b84 100644
--- a/mail/p5-Mail-Bulkmail/Makefile
+++ b/mail/p5-Mail-Bulkmail/Makefile
@@ -14,8 +14,6 @@ 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
new file mode 100644
index 000000000000..087d7c5f142d
--- /dev/null
+++ b/mail/p5-Mail-Bulkmail/pkg-comment
@@ -0,0 +1 @@
+Perl module for mailing lists
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index 2c207b0952b6..8666da5c4467 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -15,8 +15,6 @@ 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
new file mode 100644
index 000000000000..4960156d5409
--- /dev/null
+++ b/mail/p5-Mail-Folder/pkg-comment
@@ -0,0 +1 @@
+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 797b564f5c10..9741f93cf8d9 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -14,8 +14,6 @@ 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
new file mode 100644
index 000000000000..b13843d7e277
--- /dev/null
+++ b/mail/p5-Mail-MailStats/pkg-comment
@@ -0,0 +1 @@
+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 01f4ba884619..56b4254924c3 100644
--- a/mail/p5-Mail-Procmailrc/Makefile
+++ b/mail/p5-Mail-Procmailrc/Makefile
@@ -16,8 +16,6 @@ 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
new file mode 100644
index 000000000000..60ebd9eb7a13
--- /dev/null
+++ b/mail/p5-Mail-Procmailrc/pkg-comment
@@ -0,0 +1 @@
+A Perl OO interface to procmail rc files
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index 1b6b96b99f3d..9afacf29876f 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -13,8 +13,6 @@ 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
new file mode 100644
index 000000000000..85658c317433
--- /dev/null
+++ b/mail/pop3lite/pkg-comment
@@ -0,0 +1 @@
+A flexible, modular RFC-compliant POP3 daemon
diff --git a/mail/postilion/Makefile b/mail/postilion/Makefile
index 2f821fd362bf..132b5a5f7bad 100644
--- a/mail/postilion/Makefile
+++ b/mail/postilion/Makefile
@@ -12,8 +12,6 @@ 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
new file mode 100644
index 000000000000..83d09158b279
--- /dev/null
+++ b/mail/postilion/pkg-comment
@@ -0,0 +1 @@
+Mail client with the NeXt look
diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile
index bfb498ce87a3..0b735a8fe975 100644
--- a/mail/pymsgauth/Makefile
+++ b/mail/pymsgauth/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	pymsgauth
 PORTVERSION=	2.0.0
-PORTCOMMENT=	Automatically process qsecretary confirmation requests
 CATEGORIES=	mail python
 MASTER_SITES=	http://www.qcc.ca/~charlesc/software/pymsgauth/
 
diff --git a/mail/pymsgauth/pkg-comment b/mail/pymsgauth/pkg-comment
new file mode 100644
index 000000000000..f0b74de4ea21
--- /dev/null
+++ b/mail/pymsgauth/pkg-comment
@@ -0,0 +1 @@
+Automatically process qsecretary confirmation requests
diff --git a/mail/pyzor/Makefile b/mail/pyzor/Makefile
index df3fb1a940fb..f7762ee70fda 100644
--- a/mail/pyzor/Makefile
+++ b/mail/pyzor/Makefile
@@ -14,8 +14,6 @@ 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
new file mode 100644
index 000000000000..f88f303f9426
--- /dev/null
+++ b/mail/pyzor/pkg-comment
@@ -0,0 +1 @@
+A collaborative, networked system to detect and block spam
diff --git a/mail/qconfirm/Makefile b/mail/qconfirm/Makefile
index 17e293b1293b..f1a29932b937 100644
--- a/mail/qconfirm/Makefile
+++ b/mail/qconfirm/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	qconfirm
 PORTVERSION=	0.6.1
-PORTCOMMENT=	Request delivery confirmation for mail message under qmail
 CATEGORIES=	mail
 MASTER_SITES=	http://smarden.org/qconfirm/
 
diff --git a/mail/qconfirm/pkg-comment b/mail/qconfirm/pkg-comment
new file mode 100644
index 000000000000..14b4a7e0d256
--- /dev/null
+++ b/mail/qconfirm/pkg-comment
@@ -0,0 +1 @@
+Request delivery confirmation for mail message under qmail
diff --git a/mail/qmail-notify/Makefile b/mail/qmail-notify/Makefile
index 2d510deb4db3..53a127b3da8c 100644
--- a/mail/qmail-notify/Makefile
+++ b/mail/qmail-notify/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	qmail-notify
 PORTVERSION=	0.93
-PORTCOMMENT=	Delayed delivery notification for qmail
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/qmail-notify/
 
diff --git a/mail/qmail-notify/pkg-comment b/mail/qmail-notify/pkg-comment
new file mode 100644
index 000000000000..26a312cdd21f
--- /dev/null
+++ b/mail/qmail-notify/pkg-comment
@@ -0,0 +1 @@
+Delayed delivery notification for qmail
diff --git a/mail/queue-repair/Makefile b/mail/queue-repair/Makefile
index efe91d3d3910..c1d848757224 100644
--- a/mail/queue-repair/Makefile
+++ b/mail/queue-repair/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	queue-repair
 PORTVERSION=	0.8.6
 PORTREVISION=	1
-PORTCOMMENT=	A qmail queue diagnostic and repair tool
 CATEGORIES=	mail python
 MASTER_SITES=	http://www.qcc.ca/~charlesc/software/queue_repair/
 
diff --git a/mail/queue-repair/pkg-comment b/mail/queue-repair/pkg-comment
new file mode 100644
index 000000000000..30fe719ce7a5
--- /dev/null
+++ b/mail/queue-repair/pkg-comment
@@ -0,0 +1 @@
+A qmail queue diagnostic and repair tool
diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile
index 988e65e1781d..3c34677e6045 100644
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@@ -14,8 +14,6 @@ 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
new file mode 100644
index 000000000000..7ad8836f4b2b
--- /dev/null
+++ b/mail/sentinel/pkg-comment
@@ -0,0 +1 @@
+Sentinel is a sendmail milter API implementation
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index c4bd85193a4b..d6b0a94fd989 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -15,8 +15,6 @@ 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
new file mode 100644
index 000000000000..8404ed301dbc
--- /dev/null
+++ b/mail/smail/pkg-comment
@@ -0,0 +1 @@
+A program used for receiving and delivering mail
diff --git a/mail/smtpclient/Makefile b/mail/smtpclient/Makefile
index 5309f71ad889..db79d36c1309 100644
--- a/mail/smtpclient/Makefile
+++ b/mail/smtpclient/Makefile
@@ -12,8 +12,6 @@ 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
new file mode 100644
index 000000000000..ccaea253f8b7
--- /dev/null
+++ b/mail/smtpclient/pkg-comment
@@ -0,0 +1 @@
+Simple SMTP client
diff --git a/mail/smtpd/Makefile b/mail/smtpd/Makefile
index 0e06b1ae9cf9..eb0a1ddde9e1 100644
--- a/mail/smtpd/Makefile
+++ b/mail/smtpd/Makefile
@@ -16,8 +16,6 @@ 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
new file mode 100644
index 000000000000..a5ed580b5094
--- /dev/null
+++ b/mail/smtpd/pkg-comment
@@ -0,0 +1 @@
+Obtuse smtpd/smtpfwdd, part of the Juniper firewall toolkit
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 779d23c472da..6a1a1b78693a 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -12,8 +12,6 @@ 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
new file mode 100644
index 000000000000..a30f9c546bed
--- /dev/null
+++ b/mail/smtpfeed/pkg-comment
@@ -0,0 +1 @@
+SMTP Fast Exploding External Deliverer for Sendmail
diff --git a/mail/smtpproxy/Makefile b/mail/smtpproxy/Makefile
index d441da8f5cf9..4dee74a3e2fd 100644
--- a/mail/smtpproxy/Makefile
+++ b/mail/smtpproxy/Makefile
@@ -12,8 +12,6 @@ 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
new file mode 100644
index 000000000000..13007358bedb
--- /dev/null
+++ b/mail/smtpproxy/pkg-comment
@@ -0,0 +1 @@
+SMTP proxy server
diff --git a/mail/stuphead/Makefile b/mail/stuphead/Makefile
index 23482a36aae1..eaf16a8f92db 100644
--- a/mail/stuphead/Makefile
+++ b/mail/stuphead/Makefile
@@ -16,8 +16,6 @@ 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
new file mode 100644
index 000000000000..11002cbcd7f8
--- /dev/null
+++ b/mail/stuphead/pkg-comment
@@ -0,0 +1 @@
+A lightweight MUA for X11
diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
index f8ca8873efd9..d002ae401406 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -13,8 +13,6 @@ 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
new file mode 100644
index 000000000000..daca3c48c049
--- /dev/null
+++ b/mail/teapop-devel/pkg-comment
@@ -0,0 +1 @@
+Yet another RFC1939 compliant POP3 server
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index f8ca8873efd9..d002ae401406 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -13,8 +13,6 @@ 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
new file mode 100644
index 000000000000..daca3c48c049
--- /dev/null
+++ b/mail/teapop/pkg-comment
@@ -0,0 +1 @@
+Yet another RFC1939 compliant POP3 server
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 3375616cedc3..786f40c5efb5 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -14,8 +14,6 @@ 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
new file mode 100644
index 000000000000..fe73a34ddfe2
--- /dev/null
+++ b/mail/tkrat2/pkg-comment
@@ -0,0 +1 @@
+A mail user agent for X with a Tcl/Tk user interface
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 9800c64fbba9..4e7d71b2cf42 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -14,8 +14,6 @@ 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
new file mode 100644
index 000000000000..c70f84b7bcf8
--- /dev/null
+++ b/mail/xmail/pkg-comment
@@ -0,0 +1 @@
+An X-based interface to the Berkeley mail program
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index fd0edb5f75c2..4867d91bfc56 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -13,8 +13,6 @@ 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
new file mode 100644
index 000000000000..e6908013858b
--- /dev/null
+++ b/mail/xmailbox/pkg-comment
@@ -0,0 +1 @@
+Mailbox checker with sound and animation for X Window System
diff --git a/mail/xpbiff-youbin/Makefile b/mail/xpbiff-youbin/Makefile
index efe887481d11..428bcfff4e82 100644
--- a/mail/xpbiff-youbin/Makefile
+++ b/mail/xpbiff-youbin/Makefile
@@ -12,8 +12,6 @@ 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}
@@ -21,5 +19,4 @@ PLIST=		${MASTERDIR}/pkg-plist
 
 RUN_DEPENDS=	youbin:${PORTSDIR}/mail/youbin
 
-
 .include	"${MASTERDIR}/Makefile"
diff --git a/mail/xpbiff-youbin/pkg-comment b/mail/xpbiff-youbin/pkg-comment
new file mode 100644
index 000000000000..bd18511e0ed5
--- /dev/null
+++ b/mail/xpbiff-youbin/pkg-comment
@@ -0,0 +1 @@
+A replacement for xbiff that handles popup window with mail header
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 97e7f5a8eea2..2f2efe6560d7 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -15,8 +15,6 @@ 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
new file mode 100644
index 000000000000..bd18511e0ed5
--- /dev/null
+++ b/mail/xpbiff/pkg-comment
@@ -0,0 +1 @@
+A replacement for xbiff that handles popup window with mail header