From 3a61aee4cd7edf6f0c15bae603650c4f4453fd69 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sat, 17 Feb 2001 17:52:59 +0000
Subject: Update to new COMMENT style: COMMENT var in Makefile instead of
 pkg/COMMENT.

---
 mail/balsa/Makefile                 | 3 ++-
 mail/balsa/pkg/COMMENT              | 1 -
 mail/bulk_mailer/Makefile           | 3 ++-
 mail/bulk_mailer/pkg/COMMENT        | 1 -
 mail/coolmail/Makefile              | 3 ++-
 mail/coolmail/pkg/COMMENT           | 1 -
 mail/cucipop/Makefile               | 3 ++-
 mail/cucipop/pkg/COMMENT            | 1 -
 mail/cyrus-imapd/Makefile           | 3 ++-
 mail/cyrus-imapd/pkg/COMMENT        | 1 -
 mail/distribute/Makefile            | 3 ++-
 mail/distribute/pkg/COMMENT         | 1 -
 mail/drac/Makefile                  | 3 ++-
 mail/drac/pkg/COMMENT               | 1 -
 mail/elm/Makefile                   | 3 ++-
 mail/elm/pkg/COMMENT                | 1 -
 mail/etach/Makefile                 | 3 ++-
 mail/etach/pkg/COMMENT              | 1 -
 mail/exim/Makefile                  | 3 ++-
 mail/exim/pkg/COMMENT               | 1 -
 mail/exmh/Makefile                  | 3 ++-
 mail/exmh/pkg/COMMENT               | 1 -
 mail/faces/Makefile                 | 3 ++-
 mail/faces/pkg/COMMENT              | 1 -
 mail/fetchmail/Makefile             | 3 ++-
 mail/fetchmail/pkg/COMMENT          | 1 -
 mail/fetchmailconf/Makefile         | 3 ++-
 mail/fetchmailconf/pkg/COMMENT      | 1 -
 mail/fromto/Makefile                | 3 ++-
 mail/fromto/pkg/COMMENT             | 1 -
 mail/grepmail/Makefile              | 3 ++-
 mail/grepmail/pkg/COMMENT           | 1 -
 mail/imap-uw-utils/Makefile         | 3 ++-
 mail/imap-uw-utils/pkg/COMMENT      | 1 -
 mail/imap-uw/Makefile               | 3 ++-
 mail/imap-uw/pkg/COMMENT            | 1 -
 mail/imp/Makefile                   | 3 ++-
 mail/imp/pkg/COMMENT                | 1 -
 mail/mailagent/Makefile             | 3 ++-
 mail/mailagent/pkg/COMMENT          | 1 -
 mail/maildrop/Makefile              | 3 ++-
 mail/maildrop/pkg/COMMENT           | 1 -
 mail/mailwrapper/Makefile           | 3 ++-
 mail/mailwrapper/pkg/COMMENT        | 1 -
 mail/majordomo/Makefile             | 3 ++-
 mail/majordomo/pkg/COMMENT          | 1 -
 mail/metamail/Makefile              | 3 ++-
 mail/metamail/pkg/COMMENT           | 1 -
 mail/mew/Makefile                   | 3 ++-
 mail/mew/pkg/COMMENT                | 1 -
 mail/mhonarc/Makefile               | 3 ++-
 mail/mhonarc/pkg/COMMENT            | 1 -
 mail/mush/Makefile                  | 3 ++-
 mail/mush/pkg/COMMENT               | 1 -
 mail/mutt-unstable/Makefile         | 3 ++-
 mail/mutt-unstable/pkg/COMMENT      | 1 -
 mail/mutt/Makefile                  | 3 ++-
 mail/mutt/pkg/COMMENT               | 1 -
 mail/nmh/Makefile                   | 3 ++-
 mail/nmh/pkg/COMMENT                | 1 -
 mail/p5-IMAP-Admin/Makefile         | 3 ++-
 mail/p5-IMAP-Admin/pkg/COMMENT      | 1 -
 mail/p5-MIME-tools/Makefile         | 3 ++-
 mail/p5-MIME-tools/pkg/COMMENT      | 1 -
 mail/p5-Mail-IMAPClient/Makefile    | 3 ++-
 mail/p5-Mail-IMAPClient/pkg/COMMENT | 1 -
 mail/p5-MailTools/Makefile          | 3 ++-
 mail/p5-MailTools/pkg/COMMENT       | 1 -
 mail/pine/Makefile                  | 3 ++-
 mail/pine/pkg/COMMENT               | 1 -
 mail/popa3d/Makefile                | 3 ++-
 mail/popa3d/pkg/COMMENT             | 1 -
 mail/postfix-current/Makefile       | 3 ++-
 mail/postfix-current/pkg/COMMENT    | 1 -
 mail/postfix/Makefile               | 3 ++-
 mail/postfix/pkg/COMMENT            | 1 -
 mail/procmail/Makefile              | 3 ++-
 mail/procmail/pkg/COMMENT           | 1 -
 mail/qpopper/Makefile               | 3 ++-
 mail/qpopper/pkg/COMMENT            | 1 -
 mail/rblcheck/Makefile              | 3 ++-
 mail/rblcheck/pkg/COMMENT           | 1 -
 mail/sendmail/Makefile              | 3 ++-
 mail/sendmail/pkg/COMMENT           | 1 -
 mail/sendmail88/Makefile            | 3 ++-
 mail/sendmail88/pkg/COMMENT         | 1 -
 mail/smtpfeed/Makefile              | 3 ++-
 mail/smtpfeed/pkg/COMMENT           | 1 -
 mail/spruce/Makefile                | 3 ++-
 mail/spruce/pkg/COMMENT             | 1 -
 mail/squirrelmail/Makefile          | 3 ++-
 mail/squirrelmail/pkg/COMMENT       | 1 -
 mail/sylpheed/Makefile              | 3 ++-
 mail/sylpheed/pkg/COMMENT           | 1 -
 mail/tnef/Makefile                  | 3 ++-
 mail/tnef/pkg/COMMENT               | 1 -
 mail/vm/Makefile                    | 3 ++-
 mail/vm/pkg/COMMENT                 | 1 -
 mail/wmmail/Makefile                | 3 ++-
 mail/wmmail/pkg/COMMENT             | 1 -
 mail/xbuffy/Makefile                | 3 ++-
 mail/xbuffy/pkg/COMMENT             | 1 -
 mail/xfmail/Makefile                | 3 ++-
 mail/xfmail/pkg/COMMENT             | 1 -
 mail/xmailbox/Makefile              | 3 ++-
 mail/xmailbox/pkg/COMMENT           | 1 -
 106 files changed, 106 insertions(+), 106 deletions(-)
 delete mode 100644 mail/balsa/pkg/COMMENT
 delete mode 100644 mail/bulk_mailer/pkg/COMMENT
 delete mode 100644 mail/coolmail/pkg/COMMENT
 delete mode 100644 mail/cucipop/pkg/COMMENT
 delete mode 100644 mail/cyrus-imapd/pkg/COMMENT
 delete mode 100644 mail/distribute/pkg/COMMENT
 delete mode 100644 mail/drac/pkg/COMMENT
 delete mode 100644 mail/elm/pkg/COMMENT
 delete mode 100644 mail/etach/pkg/COMMENT
 delete mode 100644 mail/exim/pkg/COMMENT
 delete mode 100644 mail/exmh/pkg/COMMENT
 delete mode 100644 mail/faces/pkg/COMMENT
 delete mode 100644 mail/fetchmail/pkg/COMMENT
 delete mode 100644 mail/fetchmailconf/pkg/COMMENT
 delete mode 100644 mail/fromto/pkg/COMMENT
 delete mode 100644 mail/grepmail/pkg/COMMENT
 delete mode 100644 mail/imap-uw-utils/pkg/COMMENT
 delete mode 100644 mail/imap-uw/pkg/COMMENT
 delete mode 100644 mail/imp/pkg/COMMENT
 delete mode 100644 mail/mailagent/pkg/COMMENT
 delete mode 100644 mail/maildrop/pkg/COMMENT
 delete mode 100644 mail/mailwrapper/pkg/COMMENT
 delete mode 100644 mail/majordomo/pkg/COMMENT
 delete mode 100644 mail/metamail/pkg/COMMENT
 delete mode 100644 mail/mew/pkg/COMMENT
 delete mode 100644 mail/mhonarc/pkg/COMMENT
 delete mode 100644 mail/mush/pkg/COMMENT
 delete mode 100644 mail/mutt-unstable/pkg/COMMENT
 delete mode 100644 mail/mutt/pkg/COMMENT
 delete mode 100644 mail/nmh/pkg/COMMENT
 delete mode 100644 mail/p5-IMAP-Admin/pkg/COMMENT
 delete mode 100644 mail/p5-MIME-tools/pkg/COMMENT
 delete mode 100644 mail/p5-Mail-IMAPClient/pkg/COMMENT
 delete mode 100644 mail/p5-MailTools/pkg/COMMENT
 delete mode 100644 mail/pine/pkg/COMMENT
 delete mode 100644 mail/popa3d/pkg/COMMENT
 delete mode 100644 mail/postfix-current/pkg/COMMENT
 delete mode 100644 mail/postfix/pkg/COMMENT
 delete mode 100644 mail/procmail/pkg/COMMENT
 delete mode 100644 mail/qpopper/pkg/COMMENT
 delete mode 100644 mail/rblcheck/pkg/COMMENT
 delete mode 100644 mail/sendmail/pkg/COMMENT
 delete mode 100644 mail/sendmail88/pkg/COMMENT
 delete mode 100644 mail/smtpfeed/pkg/COMMENT
 delete mode 100644 mail/spruce/pkg/COMMENT
 delete mode 100644 mail/squirrelmail/pkg/COMMENT
 delete mode 100644 mail/sylpheed/pkg/COMMENT
 delete mode 100644 mail/tnef/pkg/COMMENT
 delete mode 100644 mail/vm/pkg/COMMENT
 delete mode 100644 mail/wmmail/pkg/COMMENT
 delete mode 100644 mail/xbuffy/pkg/COMMENT
 delete mode 100644 mail/xfmail/pkg/COMMENT
 delete mode 100644 mail/xmailbox/pkg/COMMENT

(limited to 'mail')

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index b27503fad7c..3099ee2b551 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/12/05 12:11:42 rh Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/17 18:24:39 wiz Exp $
 #
 
 DISTNAME=	balsa-1.0.0
@@ -8,6 +8,7 @@ MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.balsa.net/
+COMMENT=	GNOME EMail client
 
 DEPENDS+=	libpspell-*:../../textproc/libpspell
 DEPENDS+=	pth-*:../../devel/pth
diff --git a/mail/balsa/pkg/COMMENT b/mail/balsa/pkg/COMMENT
deleted file mode 100644
index facb392ae23..00000000000
--- a/mail/balsa/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GNOME EMail client
diff --git a/mail/bulk_mailer/Makefile b/mail/bulk_mailer/Makefile
index ae0d3cbd3a5..7731571bf9f 100644
--- a/mail/bulk_mailer/Makefile
+++ b/mail/bulk_mailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/05 12:48:36 abs Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 18:24:40 wiz Exp $
 #
 
 DISTNAME=	bulk_mailer-1.13
@@ -6,6 +6,7 @@ CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.utk.edu/pub/moore/bulk_mailer/
 
 MAINTAINER=	abs@netbsd.org
+COMMENT=	Assist in delivery of mail to large numbers of recipients
 
 HAS_CONFIGURE=	YES
 ALL_TARGET=	bulk_mailer
diff --git a/mail/bulk_mailer/pkg/COMMENT b/mail/bulk_mailer/pkg/COMMENT
deleted file mode 100644
index 3e2f3ef2417..00000000000
--- a/mail/bulk_mailer/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Assist in delivery of mail to large numbers of recipients
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index 619cdb6d72b..f214d9745cd 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:44 tron Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 18:24:41 wiz Exp $
 
 DISTNAME=		coolmail-1.3
 CATEGORIES=		mail x11
@@ -6,6 +6,7 @@ MASTER_SITES=		${MASTER_SITE_SUNSITE:=system/mail/biffs/}
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		root@garbled.net
+COMMENT=		xbiff replacement with 3D animation and sound
 
 MAKE_ENV+=		X11BASE=${PREFIX}
 USE_X11BASE=		yes
diff --git a/mail/coolmail/pkg/COMMENT b/mail/coolmail/pkg/COMMENT
deleted file mode 100644
index e3545392b59..00000000000
--- a/mail/coolmail/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-xbiff replacement with 3D animation and sound
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 99244b0a3b1..1c0b511479f 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/01/28 03:28:53 itojun Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/17 18:24:41 wiz Exp $
 #
 
 DISTNAME=       cucipop-1.31
@@ -10,6 +10,7 @@ PATCHFILES=	cucipop-1.31-v6-20010128.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	The Cubic Circle POP3 mail server
 
 LICENSE=	shareware
 
diff --git a/mail/cucipop/pkg/COMMENT b/mail/cucipop/pkg/COMMENT
deleted file mode 100644
index 4adab9ec234..00000000000
--- a/mail/cucipop/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Cubic Circle POP3 mail server
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 851f41c4348..88912de49ee 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/12/10 19:33:03 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/02/17 18:24:42 wiz Exp $
 
 DISTNAME=		cyrus-imapd-1.6.24
 PKGNAME=		${DISTNAME}nb1
@@ -8,6 +8,7 @@ MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://asg.web.cmu.edu/cyrus/imapd/
+COMMENT=		IMAP server
 
 DEPENDS+=		tcl>=8.3.2:../../lang/tcl
 DEPENDS+=		cyrus-sasl>=1.5.24nb2:../../security/cyrus-sasl
diff --git a/mail/cyrus-imapd/pkg/COMMENT b/mail/cyrus-imapd/pkg/COMMENT
deleted file mode 100644
index 72cc6f0fc69..00000000000
--- a/mail/cyrus-imapd/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-IMAP server
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index 43ffe1ae4c0..7b8f53850e2 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/01/30 16:16:33 wrstuden Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/17 18:24:43 wiz Exp $
 # FreeBSD: ports/mail/distribute/Makefile,v 1.2 1999/08/25 06:50:06 obrien Exp
 #
 
@@ -14,6 +14,7 @@ PATCHFILES=	patch.20.gz patch.21e.gz patch.22e.gz patch.23e.gz \
 MAINTAINER=	itojun@itojun.org
 # in japanese
 HOMEPAGE=	http://www.foretune.co.jp/distribute/
+COMMENT=	Mail dispatcher for mailing list.  Fits nicely with majordomo
 
 USE_PERL5=	YES
 
diff --git a/mail/distribute/pkg/COMMENT b/mail/distribute/pkg/COMMENT
deleted file mode 100644
index 2e55632a2f6..00000000000
--- a/mail/distribute/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Mail dispatcher for mailing list.  Fits nicely with majordomo
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 5fb5f0014e4..a1018c833a8 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/04/11 23:39:29 groo Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 18:24:43 wiz Exp $
 #
 
 DISTNAME=	drac
@@ -10,5 +10,6 @@ EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	groo@netbsd.org
 HOMEPAGE=	http://mail.cc.umanitoba.ca/drac/
+COMMENT=	Dynamic Relay Authorization Control
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/drac/pkg/COMMENT b/mail/drac/pkg/COMMENT
deleted file mode 100644
index f0a12c221b1..00000000000
--- a/mail/drac/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Dynamic Relay Authorization Control
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index e4cf9c0a1d4..cb876a69e3f 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/01/13 19:35:37 tv Exp $
+# $NetBSD: Makefile,v 1.15 2001/02/17 18:24:44 wiz Exp $
 # FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp
 #
 
@@ -11,6 +11,7 @@ MASTER_SITES=		ftp://ftp.ozone.fmi.fi/KEH/ \
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.myxa.com/old/elm.html
+COMMENT=		ELM Mail User Agent
 
 CONFLICTS=		elm-*ME+*
 
diff --git a/mail/elm/pkg/COMMENT b/mail/elm/pkg/COMMENT
deleted file mode 100644
index 4dcc379db14..00000000000
--- a/mail/elm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-ELM Mail User Agent
diff --git a/mail/etach/Makefile b/mail/etach/Makefile
index 249f72e67d7..084e40e6276 100644
--- a/mail/etach/Makefile
+++ b/mail/etach/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/01/26 21:45:00 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 18:24:44 wiz Exp $
 
 DISTNAME=		etach-1.1.6
 CATEGORIES=		mail
@@ -6,6 +6,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=etach/}
 
 MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://etach.sourceforge.net
+COMMENT=		Emacs Lisp package for dealing with MIME email attachments
 
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
diff --git a/mail/etach/pkg/COMMENT b/mail/etach/pkg/COMMENT
deleted file mode 100644
index 181c2f41266..00000000000
--- a/mail/etach/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Emacs Lisp package for dealing with MIME email attachments
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index be4cc7feedd..bbe6e5b903f 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/01/29 11:34:30 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/02/17 18:24:45 wiz Exp $
 
 DISTNAME=	exim-3.20
 CATEGORIES=	mail net
@@ -9,6 +9,7 @@ DISTFILES=	exim-3.20.tar.gz exim-html-3.20.tar.gz
 
 MAINTAINER=	ad@netbsd.org
 HOMEPAGE=	http://www.exim.org/
+COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 
 USE_PERL5=	yes
 
diff --git a/mail/exim/pkg/COMMENT b/mail/exim/pkg/COMMENT
deleted file mode 100644
index 547d216998a..00000000000
--- a/mail/exim/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Exim mail transfer agent, a replacement for sendmail
diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index 474d71221a2..2ca1017dd5c 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/08/31 16:30:44 jwise Exp $
+# $NetBSD: Makefile,v 1.24 2001/02/17 18:24:45 wiz Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/02/15 05:36:54 peter Exp
 #
 
@@ -8,6 +8,7 @@ MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/exmh/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.beedub.com/exmh/
+COMMENT=	X11/TK based mail reader front end to MH
 
 DEPENDS+=	tk-8.3.2:../../x11/tk
 DEPENDS+=	nmh>=1.0:../../mail/nmh
diff --git a/mail/exmh/pkg/COMMENT b/mail/exmh/pkg/COMMENT
deleted file mode 100644
index a5273198f05..00000000000
--- a/mail/exmh/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X11/TK based mail reader front end to MH
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 974834bb68b..8b6a767977d 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/02/03 01:52:19 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.19 2001/02/17 18:24:46 wiz Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/17 18:47:53 max Exp
 #
 
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/ \
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	visual mail, user and print face server
 
 WRKSRC=		${WRKDIR}/faces
 
diff --git a/mail/faces/pkg/COMMENT b/mail/faces/pkg/COMMENT
deleted file mode 100644
index 95c19f954ea..00000000000
--- a/mail/faces/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-visual mail, user and print face server
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 156f3eeea1a..a362b510220 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2001/02/07 05:16:39 fredb Exp $
+# $NetBSD: Makefile,v 1.84 2001/02/17 18:24:46 wiz Exp $
 #
 
 DISTNAME=       fetchmail-5.6.0
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/ \
 
 MAINTAINER=	mycroft@netbsd.org
 HOMEPAGE=	http://www.tuxedo.org/~esr/fetchmail/
+COMMENT=	batch mail retrieval/forwarding utility for pop2, pop3, apop, imap
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
 
diff --git a/mail/fetchmail/pkg/COMMENT b/mail/fetchmail/pkg/COMMENT
deleted file mode 100644
index a4f65c8b71c..00000000000
--- a/mail/fetchmail/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-batch mail retrieval/forwarding utility for pop2, pop3, apop, imap
diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile
index 8c5417af57a..ad6827c84d2 100644
--- a/mail/fetchmailconf/Makefile
+++ b/mail/fetchmailconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/01/04 16:52:34 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/02/17 18:24:47 wiz Exp $
 
 DISTNAME=	fetchmail-5.6.0
 PKGNAME=	${DISTNAME:S/fetchmail/fetchmailconf/}
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/ \
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.tuxedo.org/~esr/fetchmail/
+COMMENT=	Configuration tool for fetchmail
 
 DEPENDS+=	${DISTNAME}:../../mail/fetchmail
 DEPENDS+=	py-Tk-*:../../x11/py-Tk
diff --git a/mail/fetchmailconf/pkg/COMMENT b/mail/fetchmailconf/pkg/COMMENT
deleted file mode 100644
index 79ae523a68e..00000000000
--- a/mail/fetchmailconf/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Configuration tool for fetchmail
diff --git a/mail/fromto/Makefile b/mail/fromto/Makefile
index 3aab7192681..d854a0393cb 100644
--- a/mail/fromto/Makefile
+++ b/mail/fromto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/03/12 17:40:14 bad Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 18:24:47 wiz Exp $
 #
 
 DISTNAME=	fromto-1.5
@@ -7,6 +7,7 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
 EXTRACT_SUFX=	#empty
 
 MAINTAINER=	bad@netbsd.org
+COMMENT=	Sendmail logfile viewer
 
 USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
diff --git a/mail/fromto/pkg/COMMENT b/mail/fromto/pkg/COMMENT
deleted file mode 100644
index 9e00b84e8dd..00000000000
--- a/mail/fromto/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Sendmail logfile viewer
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index e949b754807..f63c5d3cb2e 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/10 19:08:09 bad Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/17 18:24:48 wiz Exp $
 #
 
 DISTNAME=	grepmail-4.45
@@ -7,6 +7,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=grepmail/}
 
 MAINTAINER=	david@fundy.net
 HOMEPAGE=	http://grepmail.sourceforge.net/
+COMMENT=	mbox formatted file search utility
 
 USE_PERL5=	# defined
 CONFIGURE_ENV=	PERL=${PERL5}
diff --git a/mail/grepmail/pkg/COMMENT b/mail/grepmail/pkg/COMMENT
deleted file mode 100644
index 3c2bbd826db..00000000000
--- a/mail/grepmail/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-mbox formatted file search utility
diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile
index 18da25d6c17..aab651670ab 100644
--- a/mail/imap-uw-utils/Makefile
+++ b/mail/imap-uw-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/13 15:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 18:24:49 wiz Exp $
 
 DISTNAME=	imap-utils
 PKGNAME=	imap-uw-utils-20001220
@@ -8,6 +8,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.washington.edu/imap/
+COMMENT=	UW IMAP mailbox utilities
 
 DEPENDS+=	imap-uw>=2000:../../mail/imap-uw
 
diff --git a/mail/imap-uw-utils/pkg/COMMENT b/mail/imap-uw-utils/pkg/COMMENT
deleted file mode 100644
index 247c9fd6766..00000000000
--- a/mail/imap-uw-utils/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-UW IMAP mailbox utilities
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 6bdd5202803..b228fae7449 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/02/12 03:31:34 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/02/17 18:24:48 wiz Exp $
 
 DISTNAME=       imap-2000c
 PKGNAME=        imap-uw-2000.0.3nb1
@@ -8,6 +8,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.washington.edu/imap/
+COMMENT=	University of Washington's IMAP, POP2, and POP3 servers
 
 USE_LIBTOOL=	# defined
 USE_SSL=	# defined
diff --git a/mail/imap-uw/pkg/COMMENT b/mail/imap-uw/pkg/COMMENT
deleted file mode 100644
index a369e136da4..00000000000
--- a/mail/imap-uw/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-University of Washington's IMAP, POP2, and POP3 servers
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index c4d43f6ee75..533b8669f42 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/12 16:13:07 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 18:24:49 wiz Exp $
 
 DISTNAME=	imp-2.2.4
 CATEGORIES=	mail www
@@ -6,6 +6,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.horde.org/imp/
+COMMENT=	Internet Messaging Program
 
 DEPENDS+=	horde>=1.2.4:../../www/horde
 DEPENDS+=	php-imap>3.0.17:../../www/php4-imap
diff --git a/mail/imp/pkg/COMMENT b/mail/imp/pkg/COMMENT
deleted file mode 100644
index 8f7301500b6..00000000000
--- a/mail/imp/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Internet Messaging Program
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 550893bc418..dcb273a5ad9 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/27 02:46:04 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/17 18:24:50 wiz Exp $
 # FreeBSD: ports/mail/mailagent/Makefile,v 1.28 1999/08/31 06:47:24 mharo Exp
 #
 
@@ -8,6 +8,7 @@ CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:S/by-module/by-authors\/id\/RAM/g}
 
 MAINTAINER=		itojun@itojun.org
+COMMENT=		Sophisticated automatic mail-processing tool
 
 USE_PERL5=		# defined
 
diff --git a/mail/mailagent/pkg/COMMENT b/mail/mailagent/pkg/COMMENT
deleted file mode 100644
index e95b9a7d2e6..00000000000
--- a/mail/mailagent/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Sophisticated automatic mail-processing tool
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 256a2ae8bda..b24234c45c1 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/11/11 17:49:26 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 18:24:51 wiz Exp $
 #
 
 DISTNAME=	maildrop-1.2.2
@@ -7,6 +7,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.flounder.net/~mrsam/maildrop/
+COMMENT=	mail delivery agent with filtering abilities
 
 .if make(install-run-depends)	# only needed for building
 USE_PERL5=	YES
diff --git a/mail/maildrop/pkg/COMMENT b/mail/maildrop/pkg/COMMENT
deleted file mode 100644
index 4edbb8d055b..00000000000
--- a/mail/maildrop/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-mail delivery agent with filtering abilities
diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index 3d79bd0c47d..c7f52148254 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2000/08/21 21:01:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2001/02/17 18:24:52 wiz Exp $
 
 DISTNAME=	mailwrapper-19990412
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	NetBSD 1.4's wrapper to support arbitrary Mail Transport Agents
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
diff --git a/mail/mailwrapper/pkg/COMMENT b/mail/mailwrapper/pkg/COMMENT
deleted file mode 100644
index b381b0f644f..00000000000
--- a/mail/mailwrapper/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-NetBSD 1.4's wrapper to support arbitrary Mail Transport Agents
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index ec278a47977..fffd5b45fe0 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/01/29 11:34:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/02/17 18:24:52 wiz Exp $
 
 DISTNAME=		majordomo-1.94.4
 CATEGORIES=		mail
@@ -8,6 +8,7 @@ EXTRACT_SUFX=   	.tgz
 
 MAINTAINER=		packages@biology.nmsu.edu
 HOMEPAGE=		http://www.greatcircle.com/majordomo/
+COMMENT=		The Majordomo mailing list manager
 
 .if exists(/usr/sbin/user)
 ADDUSER=		/usr/sbin/useradd
diff --git a/mail/majordomo/pkg/COMMENT b/mail/majordomo/pkg/COMMENT
deleted file mode 100644
index ad957d301c7..00000000000
--- a/mail/majordomo/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Majordomo mailing list manager
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 78ce2fbab2d..27e8ecc1a5e 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/09/03 08:19:11 agc Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/17 18:24:53 wiz Exp $
 # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:27:26 asami Exp
 #
 
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	Implementation of MIME, the Multipurpose Internet Mail Extensions
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
diff --git a/mail/metamail/pkg/COMMENT b/mail/metamail/pkg/COMMENT
deleted file mode 100644
index 9944ee46080..00000000000
--- a/mail/metamail/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Implementation of MIME, the Multipurpose Internet Mail Extensions
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 9a918e7e79f..4c69ac1cc27 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 06:50:18 jun Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/17 18:24:54 wiz Exp $
 
 DISTNAME=	mew-1.95b105
 CATEGORIES=	mail
@@ -6,6 +6,7 @@ MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/beta/
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://www.mew.org/
+COMMENT=	Messaging in the Emacs World
 
 DEPENDS+=	emacs-20.*:../../editors/emacs
 
diff --git a/mail/mew/pkg/COMMENT b/mail/mew/pkg/COMMENT
deleted file mode 100644
index aba8f0ddba5..00000000000
--- a/mail/mew/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Messaging in the Emacs World
diff --git a/mail/mhonarc/Makefile b/mail/mhonarc/Makefile
index 1a4dc944d56..f6c0b116027 100644
--- a/mail/mhonarc/Makefile
+++ b/mail/mhonarc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/01/03 01:50:05 jwise Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/17 18:24:54 wiz Exp $
 #
 
 DISTNAME=	MHonArc2.4.7
@@ -9,6 +9,7 @@ MASTER_SITES=	http://www.oac.uci.edu/indiv/ehood/tar/ \
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.oac.uci.edu/indiv/ehood/mhonarc.html
+COMMENT=	Mailbox to HTML converter, suitable for list archives
 
 USE_PERL5=	YES
 
diff --git a/mail/mhonarc/pkg/COMMENT b/mail/mhonarc/pkg/COMMENT
deleted file mode 100644
index 0ff5b91cfdf..00000000000
--- a/mail/mhonarc/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Mailbox to HTML converter, suitable for list archives
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index 1a6c541ee5f..98ae0f35b41 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/17 18:24:55 wiz Exp $
 
 DISTNAME=	mush-7.2.5
 PKGNAME=	mush-7.2.6.b4.pl1
@@ -17,6 +17,7 @@ PATCHFILES=	patch-7.2.6-alpha-1 \
 		patch-7.2.6-beta-4
 
 MAINTAINER=	christos@netbsd.org
+COMMENT=	text-based mail client
 
 DIST_SUBDIR=	mush
 
diff --git a/mail/mush/pkg/COMMENT b/mail/mush/pkg/COMMENT
deleted file mode 100644
index f51d70e2b7f..00000000000
--- a/mail/mush/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-text-based mail client
diff --git a/mail/mutt-unstable/Makefile b/mail/mutt-unstable/Makefile
index 114adec10c3..49ea1429456 100644
--- a/mail/mutt-unstable/Makefile
+++ b/mail/mutt-unstable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/13 11:47:02 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 18:24:56 wiz Exp $
 
 DISTNAME=	mutt-unstable-20010212
 PKGNAME=	mutt-1.3.14.20010212i
@@ -7,6 +7,7 @@ MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/snapshots/
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.mutt.org/
+COMMENT=	text-based MIME mail client with PGP support
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
 BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
diff --git a/mail/mutt-unstable/pkg/COMMENT b/mail/mutt-unstable/pkg/COMMENT
deleted file mode 100644
index d26e554d40a..00000000000
--- a/mail/mutt-unstable/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-text-based MIME mail client with PGP support
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index d5f1f58c01d..700f3027cab 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2001/02/13 11:47:02 tron Exp $
+# $NetBSD: Makefile,v 1.67 2001/02/17 18:24:55 wiz Exp $
 
 DISTNAME=	mutt-1.2.5i
 CATEGORIES=	mail
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.mutt.org/
+COMMENT=	text-based MIME mail client with PGP support
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
 BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
diff --git a/mail/mutt/pkg/COMMENT b/mail/mutt/pkg/COMMENT
deleted file mode 100644
index d26e554d40a..00000000000
--- a/mail/mutt/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-text-based MIME mail client with PGP support
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index e08dd18858c..f3735a9c0d9 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2000/08/02 06:35:43 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2001/02/17 18:24:57 wiz Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
@@ -9,6 +9,7 @@ MASTER_SITES=		ftp://ftp.mhost.com/pub/nmh/ \
 
 MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.mhost.com/nmh/
+COMMENT=		Cleaned up MH mailer suite
 
 CONFLICTS=		ja-mh-*
 
diff --git a/mail/nmh/pkg/COMMENT b/mail/nmh/pkg/COMMENT
deleted file mode 100644
index 4bd08541a30..00000000000
--- a/mail/nmh/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Cleaned up MH mailer suite
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index bf1319ffc94..6fa2bd79a50 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/10/16 09:11:35 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 18:24:57 wiz Exp $
 #
 
 DISTNAME=       IMAP-Admin-1.3.7
@@ -7,6 +7,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IMAP/}
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	perl5 module for administration of RFC-2060 IMAP servers
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/IMAP/Admin/.packlist
diff --git a/mail/p5-IMAP-Admin/pkg/COMMENT b/mail/p5-IMAP-Admin/pkg/COMMENT
deleted file mode 100644
index dc1817e5567..00000000000
--- a/mail/p5-IMAP-Admin/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-perl5 module for administration of RFC-2060 IMAP servers
diff --git a/mail/p5-MIME-tools/Makefile b/mail/p5-MIME-tools/Makefile
index ac46bbf4e07..c117dbd7a52 100644
--- a/mail/p5-MIME-tools/Makefile
+++ b/mail/p5-MIME-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:13 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 18:24:58 wiz Exp $
 #
 
 DISTNAME=       MIME-tools-4.124
@@ -7,6 +7,7 @@ CATEGORIES=	perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MIME/}
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	perl5 modules for encoding and decoding MIME messages
 
 DEPENDS+=	p5-IO-stringy-*:../../devel/p5-IO-stringy
 DEPENDS+=	p5-MIME-Base64-*:../../converters/p5-MIME-Base64
diff --git a/mail/p5-MIME-tools/pkg/COMMENT b/mail/p5-MIME-tools/pkg/COMMENT
deleted file mode 100644
index 2763975d129..00000000000
--- a/mail/p5-MIME-tools/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-perl5 modules for encoding and decoding MIME messages
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
index 2d21d720e77..ca088f47a18 100644
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ b/mail/p5-Mail-IMAPClient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:14 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 18:24:58 wiz Exp $
 #
 
 DISTNAME=       Mail-IMAPClient-1.07
@@ -7,6 +7,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	perl5 module for talking to RFC-2060 IMAP servers
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Mail/IMAPClient/.packlist
diff --git a/mail/p5-Mail-IMAPClient/pkg/COMMENT b/mail/p5-Mail-IMAPClient/pkg/COMMENT
deleted file mode 100644
index ebc0a4c36f0..00000000000
--- a/mail/p5-Mail-IMAPClient/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-perl5 module for talking to RFC-2060 IMAP servers
diff --git a/mail/p5-MailTools/Makefile b/mail/p5-MailTools/Makefile
index b162b0fc695..71f1e06a691 100644
--- a/mail/p5-MailTools/Makefile
+++ b/mail/p5-MailTools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/09/03 15:08:13 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/02/17 18:24:59 wiz Exp $
 
 DISTNAME=	MailTools-1.13
 PKGNAME=	p5-MailTools-1.13
@@ -6,6 +6,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	perl5 modules related to mail applications
 
 BUILD_DEPENDS+=	${PERL5_SITEARCH}/auto/Net/.packlist:../../net/p5-Net
 
diff --git a/mail/p5-MailTools/pkg/COMMENT b/mail/p5-MailTools/pkg/COMMENT
deleted file mode 100644
index 594a34fe718..00000000000
--- a/mail/p5-MailTools/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-perl5 modules related to mail applications
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 967335a2fb1..4402ff86e38 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2001/02/16 19:02:09 abs Exp $
+# $NetBSD: Makefile,v 1.43 2001/02/17 18:24:59 wiz Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -10,6 +10,7 @@ MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.washington.edu/pine/
+COMMENT=	Program for Internet E-mail and News
 
 # This pkg doesn't build pico or libpico; the pico pkg does that part.
 DEPENDS+=	pico-4.0:../../editors/pico
diff --git a/mail/pine/pkg/COMMENT b/mail/pine/pkg/COMMENT
deleted file mode 100644
index a6b5ae32878..00000000000
--- a/mail/pine/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Program for Internet E-mail and News
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 0b045d1bb1a..7ee4e32a994 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/21 00:21:40 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/02/17 18:25:00 wiz Exp $
 #
 
 DISTNAME=	popa3d-0.4
@@ -14,6 +14,7 @@ PATCH_DIST_ARGS=	-d ${WRKDIR} -s
 
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.openwall.com/popa3d/
+COMMENT=	secure, reliable, performant, and small pop3 server
 
 .if exists(/usr/sbin/user)
 USER_CMD=	/usr/sbin/user
diff --git a/mail/popa3d/pkg/COMMENT b/mail/popa3d/pkg/COMMENT
deleted file mode 100644
index ea99c65dfa8..00000000000
--- a/mail/popa3d/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-secure, reliable, performant, and small pop3 server
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 97e70daaf87..e717c6960dd 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/02/05 06:23:06 itojun Exp $
+# $NetBSD: Makefile,v 1.16 2001/02/17 18:25:01 wiz Exp $
 
 DISTNAME=	snapshot-20010204
 PKGNAME=	postfix-20010204
@@ -11,6 +11,7 @@ PATCH_DIST_STRIP+=	-p1
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.postfix.org/
+COMMENT=	postfix smtp server and tools
 
 DIST_SUBDIR=	postfix
 
diff --git a/mail/postfix-current/pkg/COMMENT b/mail/postfix-current/pkg/COMMENT
deleted file mode 100644
index 194c0a89ae0..00000000000
--- a/mail/postfix-current/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-postfix smtp server and tools
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 69d7f7c0e1a..511b9a1a607 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/12/14 02:51:59 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2001/02/17 18:25:00 wiz Exp $
 
 DISTNAME=	postfix-19991231-pl13
 PKGNAME=	postfix-19991231pl13
@@ -15,6 +15,7 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	christos@netbsd.org
 HOMEPAGE=	http://www.postfix.org/
+COMMENT=	postfix smtp server and tools
 
 DIST_SUBDIR=	postfix
 
diff --git a/mail/postfix/pkg/COMMENT b/mail/postfix/pkg/COMMENT
deleted file mode 100644
index 194c0a89ae0..00000000000
--- a/mail/postfix/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-postfix smtp server and tools
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 48e4ee1edfe..5358ca4d644 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/01/29 11:34:31 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/02/17 18:25:02 wiz Exp $
 # FreeBSD Id: Makefile,v 1.24 1997/05/14 14:40:34 ache Exp
 #
 
@@ -8,6 +8,7 @@ MASTER_SITES=	ftp://ftp.procmail.org/pub/procmail/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.procmail.org/
+COMMENT=	Local mail delivery agent
 
 INSTALL_TARGET=	install-suid install.man
 MAKE_ENV=	SHELL=/bin/sh
diff --git a/mail/procmail/pkg/COMMENT b/mail/procmail/pkg/COMMENT
deleted file mode 100644
index 58a68a14581..00000000000
--- a/mail/procmail/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Local mail delivery agent
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index da75fbd7641..4f817de1386 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/12/14 19:46:03 itojun Exp $
+# $NetBSD: Makefile,v 1.26 2001/02/17 18:25:03 wiz Exp $
 #
 
 DISTNAME=		qpopper3.1.2
@@ -12,6 +12,7 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		mellon@fugue.com
 HOMEPAGE=		http://eudora.qualcomm.com/freeware/qpop.html
+COMMENT=		Qualcomm's POP server for Eudora
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec \
diff --git a/mail/qpopper/pkg/COMMENT b/mail/qpopper/pkg/COMMENT
deleted file mode 100644
index afa4aed65fe..00000000000
--- a/mail/qpopper/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Qualcomm's POP server for Eudora
diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile
index a74ff2ff39b..9c26e310b6e 100644
--- a/mail/rblcheck/Makefile
+++ b/mail/rblcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/11/11 17:49:26 tron Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/17 18:25:03 wiz Exp $
 # FreeBSD: ports/mail/rblcheck/Makefile,v 1.6 1999/08/25 06:50:47 obrien Exp
 #
 
@@ -9,6 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rblcheck/} \
 
 MAINTAINER=	itojun@itojun.org
 HOMEPAGE=	http://rblcheck.sourceforge.net/
+COMMENT=	Command-line interface to Paul Vixie's RBL filter
 
 DOCS=		BUGS CHANGES CREDITS INSTALL PLATFORMS TODO
 
diff --git a/mail/rblcheck/pkg/COMMENT b/mail/rblcheck/pkg/COMMENT
deleted file mode 100644
index 3b868720c23..00000000000
--- a/mail/rblcheck/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Command-line interface to Paul Vixie's RBL filter
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 071c61bc109..cde731183a9 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/02/01 10:33:23 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2001/02/17 18:25:04 wiz Exp $
 
 DISTNAME=	sendmail.8.11.2
 PKGNAME=	sendmail-8.11.2
@@ -17,6 +17,7 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.sendmail.org/
+COMMENT=	The well known Mail Transport Agent
 
 LICENSE=	no-profit
 
diff --git a/mail/sendmail/pkg/COMMENT b/mail/sendmail/pkg/COMMENT
deleted file mode 100644
index 41cca76bfe8..00000000000
--- a/mail/sendmail/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The well known Mail Transport Agent
diff --git a/mail/sendmail88/Makefile b/mail/sendmail88/Makefile
index 709f733c628..f3d9ae30501 100644
--- a/mail/sendmail88/Makefile
+++ b/mail/sendmail88/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/01/29 11:34:32 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 18:25:05 wiz Exp $
 
 DISTNAME=	sendmail.8.8.8
 PKGNAME=	sendmail-8.8.8
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.sendmail.org/
+COMMENT=	The well known Mail Transport Agent
 
 MANCOMPRESSED_IF_MANZ= YES
 WRKSRC=		${WRKDIR}/${PKGNAME}
diff --git a/mail/sendmail88/pkg/COMMENT b/mail/sendmail88/pkg/COMMENT
deleted file mode 100644
index 41cca76bfe8..00000000000
--- a/mail/sendmail88/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The well known Mail Transport Agent
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index a8e05f29c2b..c59f44287f5 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/14 00:32:39 itojun Exp $
+# $NetBSD: Makefile,v 1.14 2001/02/17 18:25:05 wiz Exp $
 # Based on FreeBSD Id: Makefile,v 1.27 1999/04/03 08:25:18 itojun Exp
 #
 
@@ -11,6 +11,7 @@ MASTER_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/ \
 
 MAINTAINER=	itojun@itojun.org
 HOMEPAGE=	http://www.kyoto.wide.ad.jp/mta/sendmail.html#smtpfeed
+COMMENT=	SMTP Fast Exploding External Deliverer for Sendmail
 
 # sendmail 8.x with WIDE patch works better with it, than stock 8.x.
 # require sendmail from pkgsrc.
diff --git a/mail/smtpfeed/pkg/COMMENT b/mail/smtpfeed/pkg/COMMENT
deleted file mode 100644
index a30f9c546be..00000000000
--- a/mail/smtpfeed/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-SMTP Fast Exploding External Deliverer for Sendmail
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index a38c8120102..6f5244bcaf2 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/06/25 19:55:13 mason Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/17 18:25:06 wiz Exp $
 #
 
 DISTNAME=       spruce-0.5.17
@@ -7,6 +7,7 @@ MASTER_SITES=   http://www.xtorshun.org/spruce/
 
 MAINTAINER=	mellon@isc.org
 HOMEPAGE=	http://www.xtorshun.org/spruce/
+COMMENT=	MIME-aware, GNOME-based email program
 
 DEPENDS+=	gnome-libs>=1.0.56:../../x11/gnome-libs
 
diff --git a/mail/spruce/pkg/COMMENT b/mail/spruce/pkg/COMMENT
deleted file mode 100644
index 4c79b7d0f28..00000000000
--- a/mail/spruce/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-MIME-aware, GNOME-based email program
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 1ed1114d70c..972c69840e6 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/12 15:15:43 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/17 18:25:06 wiz Exp $
 
 DISTNAME=	squirrelmail-1.0.2
 CATEGORIES=	mail www
@@ -9,6 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.squirrelmail.org/
+COMMENT=	PHP4 webmail package
 
 DEPENDS+=	php>=4.0.4.1nb1:../../www/php4
 
diff --git a/mail/squirrelmail/pkg/COMMENT b/mail/squirrelmail/pkg/COMMENT
deleted file mode 100644
index 5386207393d..00000000000
--- a/mail/squirrelmail/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-PHP4 webmail package
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index cbd6a25c42a..6f51d92fd51 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/11 02:23:26 kei Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 18:25:07 wiz Exp $
 
 DISTNAME=	sylpheed-0.3.23
 CATEGORIES=	mail x11
@@ -7,6 +7,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	oishi@ims.ac.jp
 HOMEPAGE=	http://sylpheed.good-day.net/index.cgi.en
+COMMENT=	an X based e-mail client
 
 DEPENDS+=	gtk+>=1.2.6:../../x11/gtk
 
diff --git a/mail/sylpheed/pkg/COMMENT b/mail/sylpheed/pkg/COMMENT
deleted file mode 100644
index dd573c23ae5..00000000000
--- a/mail/sylpheed/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-an X based e-mail client
diff --git a/mail/tnef/Makefile b/mail/tnef/Makefile
index 377cccfece8..7519217e7af 100644
--- a/mail/tnef/Makefile
+++ b/mail/tnef/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/01/18 16:08:50 rh Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 18:25:07 wiz Exp $
 #
 
 DISTNAME=	tnef-0.16
@@ -7,6 +7,7 @@ MASTER_SITES=	http://world.std.com/~damned/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://world.std.com/~damned/software.html
+COMMENT=	decode MS-TNEF MIME attachments
 
 GNU_CONFIGURE=	YES
 
diff --git a/mail/tnef/pkg/COMMENT b/mail/tnef/pkg/COMMENT
deleted file mode 100644
index 04891424cb2..00000000000
--- a/mail/tnef/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-decode MS-TNEF MIME attachments
diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index c282bbcae7c..6fb92f1cccf 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/01/28 03:16:54 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 18:25:08 wiz Exp $
 
 DISTNAME=		vm-6.90
 CATEGORIES=		mail
@@ -10,6 +10,7 @@ MASTER_SITES=		ftp://ftp.uni-mainz.de/pub/gnu/vm/ \
 
 MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://www.wonderworks.com/vm/
+COMMENT=		VM (View Mail) is an advanced mail user agent for Emacs
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/vm/pkg/COMMENT b/mail/vm/pkg/COMMENT
deleted file mode 100644
index e770ddb45a2..00000000000
--- a/mail/vm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-VM (View Mail) is an advanced mail user agent for Emacs
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 14ad7505be9..c8fa6ba8072 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/12/12 02:10:18 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/02/17 18:25:08 wiz Exp $
 
 DISTNAME=	WMMail.app-0.64
 PKGNAME=	wmmail-0.64
@@ -7,6 +7,7 @@ MASTER_SITES=	http://www.eecg.utoronto.ca/~chanb/WMMail.app/
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.eecg.toronto.edu/cgi-bin/cgiwrap/chanb/index.cgi?wmmail
+COMMENT=	xbiff like "mail-checker" for WindowMaker
 
 DEPENDS+=	windowmaker-*:../../wm/windowmaker
 
diff --git a/mail/wmmail/pkg/COMMENT b/mail/wmmail/pkg/COMMENT
deleted file mode 100644
index 15417326b00..00000000000
--- a/mail/wmmail/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-xbiff like "mail-checker" for WindowMaker
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index 2b00f9fea0f..336aed01a21 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/06 16:04:18 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 18:25:09 wiz Exp $
 #
 
 DISTNAME=	xbuffy-3.4
@@ -6,6 +6,7 @@ CATEGORIES=	mail x11
 MASTER_SITES=	ftp://ftp.virginia.edu/pub/xbuffy/
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	replacement for xbiff that handles multiple mail files
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
diff --git a/mail/xbuffy/pkg/COMMENT b/mail/xbuffy/pkg/COMMENT
deleted file mode 100644
index f6a175fef1a..00000000000
--- a/mail/xbuffy/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-replacement for xbiff that handles multiple mail files
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 5b64dcc6536..97bd6c8c984 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/09/28 20:34:04 fredb Exp $
+# $NetBSD: Makefile,v 1.15 2001/02/17 18:25:10 wiz Exp $
 #
 
 DISTNAME=		xfmail-1.3
@@ -7,6 +7,7 @@ MASTER_SITES=		ftp://burka.netvision.net.il/pub/xfmail/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://Burka.NetVision.net.il/xfmail/xfmail.html
+COMMENT=		Xforms based mail application for Unix operating systems
 
 DEPENDS+=		gdbm>=1.7.3:../../databases/gdbm
 DEPENDS+=		xforms>=0.88nb1:../../x11/xforms
diff --git a/mail/xfmail/pkg/COMMENT b/mail/xfmail/pkg/COMMENT
deleted file mode 100644
index faaeda81ba3..00000000000
--- a/mail/xfmail/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Xforms based mail application for Unix operating systems
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index fa335d40b70..2a8a8ab8c0e 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:29 tron Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 18:25:10 wiz Exp $
 #
 
 DISTNAME=       xmailbox-2.5
@@ -6,6 +6,7 @@ CATEGORIES=	mail x11
 MASTER_SITES=   ${MASTER_SITE_XCONTRIB:=applications/}
 
 MAINTAINER=	bouyer@netbsd.org
+COMMENT=	Enhanced xbiff, with pixmap and sound support
 
 USE_IMAKE=	YES
 USE_XPM=	YES
diff --git a/mail/xmailbox/pkg/COMMENT b/mail/xmailbox/pkg/COMMENT
deleted file mode 100644
index 312356a66e7..00000000000
--- a/mail/xmailbox/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Enhanced xbiff, with pixmap and sound support
-- 
cgit v1.2.3