diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 6a3eb740878..baad7233146 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/19 16:19:45 danh Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/28 19:35:31 danh Exp $
+
+COMMENT= 	"synchronize IMAP4 and maildir mailboxes"
 
 DISTNAME=	isync-0.4
 CATEGORIES=	mail
-NEED_VERSION=	1.356
+NEED_VERSION=	1.364
 MASTER_SITES=	http://www.sigpipe.org/isync/
 
 HOMEPAGE=	http://www.sigpipe.org/isync/
diff --git a/mail/isync/pkg/COMMENT b/mail/isync/pkg/COMMENT
deleted file mode 100644
index 890bcf64d3c..00000000000
--- a/mail/isync/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-synchronize IMAP4 and maildir mailboxes
diff --git a/mail/solid-pop3d/Makefile b/mail/solid-pop3d/Makefile
index bfbaf52ae65..50f4bd3bf71 100644
--- a/mail/solid-pop3d/Makefile
+++ b/mail/solid-pop3d/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2000/11/21 13:19:17 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2001/03/28 19:35:31 danh Exp $
+
+COMMENT=	"flexible POP3 server"
 
 VERSION=	0.15
 DISTNAME=	solid-pop3d-${VERSION}
 CATEGORIES=	mail
-NEED_VERSION=	1.334
+NEED_VERSION=	1.364
 MASTER_SITES=	http://solidpop3d.pld.org.pl/ \
 		ftp://ftp.rudykot.pl/pub/solidpop3d/ \
 		ftp://sedez.iq.pl/pub/solidpop3d/ \
diff --git a/mail/solid-pop3d/pkg/COMMENT b/mail/solid-pop3d/pkg/COMMENT
deleted file mode 100644
index e5ab484565f..00000000000
--- a/mail/solid-pop3d/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-flexible POP3 server
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 95cccc1572a..69d53313b0a 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2000/09/27 16:53:18 danh Exp $
+# $OpenBSD: Makefile,v 1.17 2001/03/28 19:35:31 danh Exp $
+
+COMMENT=	"command-driven interactive function plotting program"
 
 DISTNAME=	gnuplot-3.7.1
 CATEGORIES=	math graphics
-NEED_VERSION=	1.337
+NEED_VERSION=	1.364
 MASTER_SITES=	ftp://ftp.gnuplot.vt.edu/pub/gnuplot/ \
 		ftp://ftp.irisa.fr/pub/gnuplot/ \
 		ftp://ftp.cc.monash.edu.au/pub/gnuplot/ \
diff --git a/math/gnuplot/pkg/COMMENT b/math/gnuplot/pkg/COMMENT
deleted file mode 100644
index 93bd1131170..00000000000
--- a/math/gnuplot/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-command-driven interactive function plotting program
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 82a41f42a7a..6eaca5a7161 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2001/02/05 18:12:02 danh Exp $
+# $OpenBSD: Makefile,v 1.9 2001/03/28 19:35:32 danh Exp $
+
+COMMENT=	"Cistron RADIUS server"
 
 DISTNAME=	radiusd-cistron-1.6.4
 CATEGORIES=	net
-NEED_VERSION=	1.352
+NEED_VERSION=	1.364
 MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/radius/ \
 		ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.mma.com.br/pub/cistron-radius/
diff --git a/net/radiusd-cistron/pkg/COMMENT b/net/radiusd-cistron/pkg/COMMENT
deleted file mode 100644
index 85ab90aaba9..00000000000
--- a/net/radiusd-cistron/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Cistron RADIUS server
diff --git a/net/radiusd-lucent/Makefile b/net/radiusd-lucent/Makefile
index 278b3fba573..fcea558e647 100644
--- a/net/radiusd-lucent/Makefile
+++ b/net/radiusd-lucent/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/13 02:10:57 danh Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/28 19:35:32 danh Exp $
+
+COMMENT=	"Lucent remote access RADIUS server"
 
 DISTNAME=	radius21
 PKGNAME=	radiusd-lucent-2.1
 CATEGORIES=	net
-NEED_VERSION=	1.334
+NEED_VERSION=	1.364
 MASTER_SITES=	ftp://ftp.livingston.com/pub/le/radius/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/net/radiusd-lucent/pkg/COMMENT b/net/radiusd-lucent/pkg/COMMENT
deleted file mode 100644
index 27b06039913..00000000000
--- a/net/radiusd-lucent/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Lucent remote access RADIUS server
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index aa5642e28c6..9179efed1b5 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2001/03/19 03:53:25 danh Exp $
+# $OpenBSD: Makefile,v 1.13 2001/03/28 19:35:32 danh Exp $
+
+COMMENT=	"system to store and display time-series data"
 
 VERSION=	1.0.33
 DISTNAME=	rrdtool-${VERSION}
 CATEGORIES=     net
-NEED_VERSION=	1.358
+NEED_VERSION=	1.364
 MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/ \
 		ftp://ftp.sunet.se/pub/network/monitoring/rrdtool/ \
 		http://ftp.sunet.se/pub/network/monitoring/rrdtool/
diff --git a/net/rrdtool/pkg/COMMENT b/net/rrdtool/pkg/COMMENT
deleted file mode 100644
index 840b8d01109..00000000000
--- a/net/rrdtool/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-system to store and display time-series data
diff --git a/net/sing/Makefile b/net/sing/Makefile
index c333c845fa8..6ffb73b1f58 100644
--- a/net/sing/Makefile
+++ b/net/sing/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/22 15:08:54 danh Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/28 19:35:33 danh Exp $
+
+COMMENT=	"send ICMP nasty garbage"
 
 DISTNAME=	SING-1.0
 PKGNAME=	${DISTNAME:L}
 CATEGORIES=	net security
-NEED_VERSION=	1.356
+NEED_VERSION=	1.364
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= sing
 EXTRACT_SUFX=	.tgz
diff --git a/net/sing/pkg/COMMENT b/net/sing/pkg/COMMENT
deleted file mode 100644
index aa71a1d9ee5..00000000000
--- a/net/sing/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-send ICMP nasty garbage
diff --git a/sysutils/radiusreport/Makefile b/sysutils/radiusreport/Makefile
index ad2608dd005..1abbf6425da 100644
--- a/sysutils/radiusreport/Makefile
+++ b/sysutils/radiusreport/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2000/09/23 19:59:55 danh Exp $
+# $OpenBSD: Makefile,v 1.6 2001/03/28 19:35:33 danh Exp $
+
+COMMENT=	"RADIUS log file analysis tool"
 
 DISTNAME=	radiusreport-0.3b6
 CATEGORIES=	sysutils
-NEED_VERSION=	1.334
+NEED_VERSION=	1.364
 MASTER_SITES=	http://www.tibus.net/pgregg/projects/radiusreport/
 EXTRACT_SUFX=	.tar
 
diff --git a/sysutils/radiusreport/pkg/COMMENT b/sysutils/radiusreport/pkg/COMMENT
deleted file mode 100644
index 8826234b09e..00000000000
--- a/sysutils/radiusreport/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-RADIUS log file analysis tool
diff --git a/sysutils/safecat/Makefile b/sysutils/safecat/Makefile
index f8b790fa8e2..7b97218b7e4 100644
--- a/sysutils/safecat/Makefile
+++ b/sysutils/safecat/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2001/03/09 14:08:21 danh Exp $
+# $OpenBSD: Makefile,v 1.3 2001/03/28 19:35:33 danh Exp $
+
+COMMENT=	"copy stdin to a qmail-style maildir"
 
 DISTNAME=	safecat-1.5
 CATEGORIES=	sysutils
-NEED_VERSION=	1.358
+NEED_VERSION=	1.364
 MASTER_SITES=	http://www.nb.net/~lbudney/linux/software/safecat/ \
 		http://sunsite.unc.edu/pub/Linux/utils/file/
 
diff --git a/sysutils/safecat/pkg/COMMENT b/sysutils/safecat/pkg/COMMENT
deleted file mode 100644
index 18df58c89b3..00000000000
--- a/sysutils/safecat/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-copy stdin to a qmail-style maildir
diff --git a/www/mod_frontpage/Makefile b/www/mod_frontpage/Makefile
index 00d4850486d..65d918cea9c 100644
--- a/www/mod_frontpage/Makefile
+++ b/www/mod_frontpage/Makefile
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/03/04 17:21:21 danh Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/28 19:35:33 danh Exp $
+
+COMMENT=	"allows use of Microsoft FrontPage extentions with Apache"
 
 VERSION=	1.5.1
 APVERSION=	1.3.17
 DISTNAME=	mod_frontpage-${VERSION}-${APVERSION}
 PKGNAME=	mod_frontpage-${VERSION}
 CATEGORIES=	www
-NEED_VERSION=	1.358
+NEED_VERSION=	1.364
 MASTER_SITES=	http://home.edo.uni-dortmund.de/~chripo/download/ \
 		ftp://ftp.edo.uni-dortmund.de/pub/mod_frontpage/
 
diff --git a/www/mod_frontpage/pkg/COMMENT b/www/mod_frontpage/pkg/COMMENT
deleted file mode 100644
index 4ec5b1f6b8d..00000000000
--- a/www/mod_frontpage/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-allows use of Microsoft FrontPage extentions with Apache
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 3b39c8cb66e..da41febb0bc 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2000/11/20 00:46:31 danh Exp $
+# $OpenBSD: Makefile,v 1.9 2001/03/28 19:35:34 danh Exp $
+
+COMMENT=	"web server log file analysis program"
 
 DISTNAME=	webalizer-2.01-06-src
 PKGNAME=	webalizer-2.01.06
 CATEGORIES=     www
-NEED_VERSION=	1.340
+NEED_VERSION=	1.364
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/
 EXTRACT_SUFX=	.tgz
 
diff --git a/www/webalizer/pkg/COMMENT b/www/webalizer/pkg/COMMENT
deleted file mode 100644
index 86687c61f8b..00000000000
--- a/www/webalizer/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-web server log file analysis program
diff --git a/x11/fvwm95/Makefile b/x11/fvwm95/Makefile
index 9e70d9a7646..ce483be21a6 100644
--- a/x11/fvwm95/Makefile
+++ b/x11/fvwm95/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2000/09/24 05:26:00 form Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/28 19:35:34 danh Exp $
+
+COMMENT=	"win95-like window manager based on fvwm 2.x"
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
 PKGNAME=	fvwm95-2.0.43a
 CATEGORIES=     x11
-NEED_VERSION=	1.334
+NEED_VERSION=	1.364
 MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/fvwm95/	\
 		ftp://ftp.plig.org/pub/fvwm95/
 EXTRACT_SUFX=	.tgz
diff --git a/x11/fvwm95/pkg/COMMENT b/x11/fvwm95/pkg/COMMENT
deleted file mode 100644
index 0ac2d069594..00000000000
--- a/x11/fvwm95/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-win95-like window manager based on fvwm 2.x
diff --git a/x11/qvwm/Makefile b/x11/qvwm/Makefile
index 53dd8334edc..00b318c12ea 100644
--- a/x11/qvwm/Makefile
+++ b/x11/qvwm/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2000/09/23 20:03:20 danh Exp $
+# $OpenBSD: Makefile,v 1.6 2001/03/28 19:35:34 danh Exp $
+
+COMMENT=	"Windows 95/98/NT like window manager"
 
 DISTNAME=	qvwm-1.1.8
 CATEGORIES=     x11
-NEED_VERSION=	1.334
+NEED_VERSION=	1.364
 MASTER_SITES=	ftp://ftp.qvwm.org/pub/qvwm/
 
 HOMEPAGE=	http://www.qvwm.org/
diff --git a/x11/qvwm/pkg/COMMENT b/x11/qvwm/pkg/COMMENT
deleted file mode 100644
index 01f8c5ec0e4..00000000000
--- a/x11/qvwm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Windows 95/98/NT like window manager