170 files changed, 85 insertions, 85 deletions

diff --git a/mail/abook/Makefile b/mail/abook/Makefile
index 097b6af51357..d4137adec110 100644
--- a/mail/abook/Makefile
+++ b/mail/abook/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	leeym@FreeBSD.org
+COMMENT=	An addressbook program with mutt mail client support
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/abook/pkg-comment b/mail/abook/pkg-comment
deleted file mode 100644
index 822bc288f3df..000000000000
--- a/mail/abook/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An addressbook program with mutt mail client support
diff --git a/mail/adcomplain/Makefile b/mail/adcomplain/Makefile
index ca3f1860920b..9c8a67297e4c 100644
--- a/mail/adcomplain/Makefile
+++ b/mail/adcomplain/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	${PORTNAME}.pl
 EXTRACT_SUFX=	.uu
 
 MAINTAINER=	ache@FreeBSD.org
+COMMENT=	Complain about inappropriate commercial use (f.e. SPAM) of usenet/e-mail
 
 USE_PERL5=	yes
 
diff --git a/mail/adcomplain/pkg-comment b/mail/adcomplain/pkg-comment
deleted file mode 100644
index 3be37035de97..000000000000
--- a/mail/adcomplain/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Complain about inappropriate commercial use (f.e. SPAM) of usenet/e-mail
diff --git a/mail/autosig/Makefile b/mail/autosig/Makefile
index 11d6782ff09b..a7ca6a6c8341 100644
--- a/mail/autosig/Makefile
+++ b/mail/autosig/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.irendi.com/
 
 MAINTAINER=	leeym@FreeBSD.org
+COMMENT=	A random .signature generator with header file included
 
 MAKEFILE=	makefile
 ALL_TARGET=	${PORTNAME}
diff --git a/mail/autosig/pkg-comment b/mail/autosig/pkg-comment
deleted file mode 100644
index 532a12a41288..000000000000
--- a/mail/autosig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A random .signature generator with header file included
diff --git a/mail/biabam/Makefile b/mail/biabam/Makefile
index c82179440869..ebbd4ca68708 100644
--- a/mail/biabam/Makefile
+++ b/mail/biabam/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=		mail
 MASTER_SITES=		http://mmj.dk/biabam/
 
 MAINTAINER=		greid@FreeBSD.org
+COMMENT=	A command-line attachment mailer
 
 NO_BUILD=		yes
 
diff --git a/mail/biabam/pkg-comment b/mail/biabam/pkg-comment
deleted file mode 100644
index c35fb23700b3..000000000000
--- a/mail/biabam/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command-line attachment mailer
diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index 3022e0e7aa04..eeee38f6a30c 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -17,6 +17,7 @@ DISTNAME=	imap-${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	anders@FreeBSD.org
+COMMENT=	Mark Crispin's C-client mail access routines
 
 INSTALLS_SHLIB=	yes
 ALL_TARGET=	bsf
diff --git a/mail/cclient/pkg-comment b/mail/cclient/pkg-comment
deleted file mode 100644
index 9aa67750e2d7..000000000000
--- a/mail/cclient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mark Crispin's C-client mail access routines
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index a4c64ccac470..a5f7bd8e79cc 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
 
 MAINTAINER=	nbm@FreeBSD.org
+COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
diff --git a/mail/courier-imap/pkg-comment b/mail/courier-imap/pkg-comment
deleted file mode 100644
index ec04bc3c1ca0..000000000000
--- a/mail/courier-imap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IMAP (and POP3) server that provides access to Maildir mailboxes
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index e002baa8c8aa..b7ac02397440 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -26,6 +26,7 @@ PATCH_DIST_STRIP=	-p1
 #BUILD_DEPENDS=  ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db2
 
 MAINTAINER=	vanilla@FreeBSD.org
+COMMENT=	Cubic Circle's POP3 daemon (fully RFC1939 compliant)
 
 MAN8=   cucipop.8 #makevpopdb.8
 
diff --git a/mail/cucipop/pkg-comment b/mail/cucipop/pkg-comment
deleted file mode 100644
index 39613636e550..000000000000
--- a/mail/cucipop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cubic Circle's POP3 daemon (fully RFC1939 compliant)
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index 13ab06f023e4..6c5652aebb96 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile