Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT.

60 files changed, 66 insertions, 60 deletions

diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile
index 7722ef5258c..6194f51ba5d 100644
--- a/wm/9wm/Makefile
+++ b/wm/9wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/12/22 16:29:38 abs Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:28 wiz Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/05/28 06:18:20 fenner Exp
 #
 
@@ -9,6 +9,7 @@ EXTRACT_SUFX=		.shar.gz
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://dhog.g7.org/dhog/9wm.html
+COMMENT=		8 1/2-like Window Manager for X
 
 NO_WRKSUBDIR=		yes
 EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
diff --git a/wm/9wm/pkg/COMMENT b/wm/9wm/pkg/COMMENT
deleted file mode 100644
index 0f7c903f78d..00000000000
--- a/wm/9wm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-8 1/2-like Window Manager for X
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index 11ab0833695..a8389c0291a 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/05 09:01:05 tron Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/17 17:21:29 wiz Exp $
 
 DISTNAME=	AfterStep-1.8.0
 PKGNAME=	afterstep-1.8.0
@@ -9,6 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=		fb@enteract.com
 HOMEPAGE=		http://www.afterstep.org/
+COMMENT=		NeXT-like window manager for X11
 
 BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
diff --git a/wm/afterstep/pkg/COMMENT b/wm/afterstep/pkg/COMMENT
deleted file mode 100644
index 8fa4e62a6c9..00000000000
--- a/wm/afterstep/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-NeXT-like window manager for X11
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index 6e0a2db27ab..295d0b2de82 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:29 wiz Exp $
 #
 
 DISTNAME=	amiwm0.20pl48
@@ -8,6 +8,7 @@ MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/
 
 MAINTAINER=	rh@trapdoor.vip.at
 HOMEPAGE=	http://www.lysator.liu.se/~marcus/amiwm.html
+COMMENT=	X window manager with Amiga look and feel
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
diff --git a/wm/amiwm/pkg/COMMENT b/wm/amiwm/pkg/COMMENT
deleted file mode 100644
index 0f251e971c8..00000000000
--- a/wm/amiwm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X window manager with Amiga look and feel
diff --git a/wm/ascp/Makefile b/wm/ascp/Makefile
index e9106c33407..75d7151d363 100644
--- a/wm/ascp/Makefile
+++ b/wm/ascp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/18 13:50:41 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:30 wiz Exp $
 #
 
 DISTNAME=		ascp-1.0.3
@@ -8,6 +8,7 @@ EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://hubble.colorado.edu/~nwanua/htmldir/ascp.html
+COMMENT=		Configuration utility for AfterStep
 
 DEPENDS+=		afterstep-1.8.*:../../wm/afterstep
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
diff --git a/wm/ascp/pkg/COMMENT b/wm/ascp/pkg/COMMENT
deleted file mode 100644
index 15e71af56ca..00000000000
--- a/wm/ascp/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Configuration utility for AfterStep
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index 621b481ff7e..70224542e21 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:31 wiz Exp $
 #
 
 DISTNAME=	blackbox-0.61.1
@@ -7,6 +7,7 @@ MASTER_SITES=	ftp://portal.alug.org/pub/blackbox/0.6x.x/
 
 MAINTAINER=	djp@cpl.herston.uq.edu.au
 HOMEPAGE=	http://blackbox.alug.org/
+COMMENT=	small and fast X11R6 window manager
 
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
diff --git a/wm/blackbox/pkg/COMMENT b/wm/blackbox/pkg/COMMENT
deleted file mode 100644
index ac53a3cefea..00000000000
--- a/wm/blackbox/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-small and fast X11R6 window manager
diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index b62c1d0b9af..c2ddcf74822 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:32 wiz Exp $
 #
 
 DISTNAME=	ctwm-3.5
@@ -7,6 +7,7 @@ MASTER_SITES=	ftp://slhp1.epfl.ch/pub/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://woland.afti.nsu.ru/~reberger/xwinman/ctwm.html
+COMMENT=	Window manager with support for multiple virtual screens
 
 USE_IMAKE=	YES
 USE_XPM=	YES
diff --git a/wm/ctwm/pkg/COMMENT b/wm/ctwm/pkg/COMMENT
deleted file mode 100644
index a11cb7bed46..00000000000
--- a/wm/ctwm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Window manager with support for multiple virtual screens
diff --git a/wm/econf/Makefile b/wm/econf/Makefile
index ff0e27c53f5..c9c418ebe4e 100644
--- a/wm/econf/Makefile
+++ b/wm/econf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/18 13:50:42 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:33 wiz Exp $
 #
 
 DISTNAME=		enlightenment-conf-0.15
@@ -8,6 +8,7 @@ MASTER_SITES=		ftp://www.rasterman.com/pub/enlightenment/enlightenment/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.enlightenment.org/
+COMMENT=		configuration tool for easily setting up Enlightenment
 
 DEPENDS+=		control-center-*:../../x11/controlcenter
 
diff --git a/wm/econf/pkg/COMMENT b/wm/econf/pkg/COMMENT
deleted file mode 100644
index e8293092784..00000000000
--- a/wm/econf/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-configuration tool for easily setting up Enlightenment
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index d9165528b16..186e843fcaf 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:34 wiz Exp $
 
 DISTNAME=		enlightenment-0.16.4
 CATEGORIES=		x11 gnome wm
@@ -6,6 +6,7 @@ MASTER_SITES=		ftp://ftp.enlightenment.org/pub/e/enlightenment/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.enlightenment.org/
+COMMENT=		Window manager for X
 
 DEPENDS+=		esound>=0.2.18:../../audio/esound
 DEPENDS+=		imlib>=1.9.8:../../graphics/imlib
diff --git a/wm/enlightenment/pkg/COMMENT b/wm/enlightenment/pkg/COMMENT
deleted file mode 100644
index b81d2e83c68..00000000000
--- a/wm/enlightenment/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Window manager for X
diff --git a/wm/ethemes/Makefile b/wm/ethemes/Makefile
index acecfe568d3..f0a655ca8dc 100644
--- a/wm/ethemes/Makefile
+++ b/wm/ethemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/15 23:25:19 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:35 wiz Exp $
 
 DISTNAME=	ethemes-0.1
 CATEGORIES=	x11 wm
@@ -7,6 +7,7 @@ DISTFILES=	${E_THEMES}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://e.themes.org/
+COMMENT=	Themes for the window manager Enlightenment
 
 DEPENDS+=	enlightenment>=0.16.2:../../wm/enlightenment
 
diff --git a/wm/ethemes/pkg/COMMENT b/wm/ethemes/pkg/COMMENT
deleted file mode 100644
index 720698836b3..00000000000
--- a/wm/ethemes/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Themes for the window manager Enlightenment
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index 4d591dae5d4..fb28299f677 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:36 wiz Exp $
 #
 
 DISTNAME=	flwm-0.25
@@ -8,6 +8,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://flwm.sourceforge.net/
+COMMENT=	The Fast, Light Window Manager
 
 DEPENDS+=	fltk-*:../../x11/fltk
 
diff --git a/wm/flwm/pkg/COMMENT b/wm/flwm/pkg/COMMENT
deleted file mode 100644
index 493f6936a8f..00000000000
--- a/wm/flwm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Fast, Light Window Manager
diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
index 4611372c2ef..26361185981 100644
--- a/wm/fvwm1/Makefile
+++ b/wm/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/12/15 02:20:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:36 wiz Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -9,6 +9,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	cjs@netbsd.org
 HOMEPAGE=	http://www.fvwm.org/
+COMMENT=	Virtual window manager for X
 
 DEPENDS=	xpmroot-2.*:../../x11/xpmroot
 
diff --git a/wm/fvwm1/pkg/COMMENT b/wm/fvwm1/pkg/COMMENT
deleted file mode 100644
index af5e47f1228..00000000000
--- a/wm/fvwm1/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Virtual window manager for X
diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 066ca817287..d14d3cf997d 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/01/01 23:42:04 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:37 wiz Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.fvwm.org/
+COMMENT=	Newer version of X11 Virtual window manager
 
 DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
 DEPENDS+=	readline-*:../../devel/readline
diff --git a/wm/fvwm2/pkg/COMMENT b/wm/fvwm2/pkg/COMMENT
deleted file mode 100644
index 65ffabb66fc..00000000000
--- a/wm/fvwm2/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Newer version of X11 Virtual window manager
diff --git a/wm/fvwm95/Makefile b/wm/fvwm95/Makefile
index c732961694a..0a30767504f 100644
--- a/wm/fvwm95/Makefile
+++ b/wm/fvwm95/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:39 wiz Exp $
 # FreeBSD: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp
 #
 
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	ftp://mitac11.uia.ac.be/html-test/fvwm95.html
+COMMENT=	Win95 lookalike version of the fvwm2 window manager
 
 DEPENDS+=	rplay-3.*:../../audio/rplay
 DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
diff --git a/wm/fvwm95/pkg/COMMENT b/wm/fvwm95/pkg/COMMENT
deleted file mode 100644
index 11d22d488b5..00000000000
--- a/wm/fvwm95/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Win95 lookalike version of the fvwm2 window manager
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index 09193536abc..e0c4887692b 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:41 wiz Exp $
 
 PKGNAME=		${DISTNAME:S/-/-gnome-/}
 
+COMMENT=		small, fast and light-weight window manager (GNOME version)
+
 DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
 
 CONFLICTS+=		icewm-[0-9]*
diff --git a/wm/icewm-gnome/pkg/COMMENT b/wm/icewm-gnome/pkg/COMMENT
deleted file mode 100644
index 1141102dde7..00000000000
--- a/wm/icewm-gnome/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-small, fast and light-weight window manager (GNOME version)
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 8e7d8953d25..3017c1bf0bb 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:40 wiz Exp $
 #
 
+COMMENT=		small, fast and light-weight window manager
+
 USE_XPM=		YES
 
 CONFLICTS+=		icewm-gnome-[0-9]*
diff --git a/wm/icewm/pkg/COMMENT b/wm/icewm/pkg/COMMENT
deleted file mode 100644
index b82e64b0d2c..00000000000
--- a/wm/icewm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-small, fast and light-weight window manager
diff --git a/wm/lwm/Makefile b/wm/lwm/Makefile
index d0faa985961..614d45a0d45 100644
--- a/wm/lwm/Makefile
+++ b/wm/lwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:42 wiz Exp $
 #
 
 DISTNAME=	lwm
@@ -9,6 +9,7 @@ MASTER_SITES=	http://users.ch.genedata.com/~enh/lwm/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://users.ch.genedata.com/~enh/lwm/
+COMMENT=	Lightweight Window Manager
 
 DIST_SUBDIR=	${PKGNAME}
 
diff --git a/wm/lwm/pkg/COMMENT b/wm/lwm/pkg/COMMENT
deleted file mode 100644
index ffe9e0c4aaf..00000000000
--- a/wm/lwm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Lightweight Window Manager
diff --git a/wm/olvwm/Makefile b/wm/olvwm/Makefile
index 0badd54bd11..0bb3c0ef043 100644
--- a/wm/olvwm/Makefile
+++ b/wm/olvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:43 wiz Exp $
 #
 
 DISTNAME=	olvwm4.src4
@@ -8,6 +8,7 @@ MASTER_SITES=	http://www.akula.com/~jadler/sdo/olvwm/
 
 MAINTAINER=	w.wnuk@zodiac.mimuw.edu.pl
 HOMEPAGE=	http://www.akula.com/~jadler/sdo/olvwm/index.html
+COMMENT=	Open Look Virtual Window Manager
 
 DEPENDS+=	xview-lib>=3.2.1nb1:../../x11/xview-lib
 DEPENDS+=	xview-clients>=3.2.1:../../x11/xview-clients
diff --git a/wm/olvwm/pkg/COMMENT b/wm/olvwm/pkg/COMMENT
deleted file mode 100644
index 60cbeab8692..00000000000
--- a/wm/olvwm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Open Look Virtual Window Manager
diff --git a/wm/sawfish-replibs/Makefile b/wm/sawfish-replibs/Makefile
index a83166bc4d5..1fbebc64cc7 100644
--- a/wm/sawfish-replibs/Makefile
+++ b/wm/sawfish-replibs/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:45 wiz Exp $
 #
 
 PKGNAME=	sawfish-replibs-${SF_VERS}
 
+COMMENT=	librep Lisp libraries for sawfish
+
 do-build:
 	cd ${WRKSRC}/src && \
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} client.la
diff --git a/wm/sawfish-replibs/pkg/COMMENT b/wm/sawfish-replibs/pkg/COMMENT
deleted file mode 100644
index 9077bf3c46c..00000000000
--- a/wm/sawfish-replibs/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-librep Lisp libraries for sawfish
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index e5ce61a46da..d45ddcf3b3d 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2001/02/13 11:47:07 tron Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 17:21:44 wiz Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
 
+COMMENT=		GNOME-aware window manager that is fully configurable in Lisp
+
 DEPENDS+=		sawfish-replibs-${SF_VERS}:../../wm/sawfish-replibs
 
 USE_X11BASE=		# defined
diff --git a/wm/sawfish/pkg/COMMENT b/wm/sawfish/pkg/COMMENT
deleted file mode 100644
index fde6a39be7a..00000000000
--- a/wm/sawfish/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GNOME-aware window manager that is fully configurable in Lisp
diff --git a/wm/scwm/Makefile b/wm/scwm/Makefile
index 74d027cbd22..c9738e3c9e7 100644
--- a/wm/scwm/Makefile
+++ b/wm/scwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/12/15 02:24:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:46 wiz Exp $
 #
 
 DISTNAME=	scwm-0.9
@@ -7,6 +7,7 @@ MASTER_SITES=	ftp://scwm.mit.edu/pub/scwm/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://scwm.sourceforge.net/
+COMMENT=	Window manager with a powerful configuration (Guile Scheme) language
 
 DEPENDS+=	guile>=1.3.2:../../lang/guile
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
diff --git a/wm/scwm/pkg/COMMENT b/wm/scwm/pkg/COMMENT
deleted file mode 100644
index 354a9acb543..00000000000
--- a/wm/scwm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Window manager with a powerful configuration (Guile Scheme) language
diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile
index b7ef1016feb..f4e80b29a98 100644
--- a/wm/tvtwm/Makefile
+++ b/wm/tvtwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:47 wiz Exp $
 
 DISTNAME=	tvtwm.pl11
 PKGNAME=	tvtwm-11
@@ -6,6 +6,7 @@ CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=window_managers/}
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	Classic twm with virtual desktop support
 
 USE_IMAKE=	YES
 USE_XPM=	YES
diff --git a/wm/tvtwm/pkg/COMMENT b/wm/tvtwm/pkg/COMMENT
deleted file mode 100644
index efdcedb0ff8..00000000000
--- a/wm/tvtwm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Classic twm with virtual desktop support
diff --git a/wm/uwm/Makefile b/wm/uwm/Makefile
index 8d536aa65e4..c2f93da2682 100644
--- a/wm/uwm/Makefile
+++ b/wm/uwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:48 wiz Exp $
 
 DISTNAME=	X.V11R3uwm
 PKGNAME=	uwm-19881027
@@ -7,6 +7,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	packages@netbsd.org
 #HOMEPAGE=	http://www.x.org/
+COMMENT=	X11R3 window manager
 
 WRKSRC=		${WRKDIR}/X.V11R3/clients/uwm
 USE_IMAKE=	yes
diff --git a/wm/uwm/pkg/COMMENT b/wm/uwm/pkg/COMMENT
deleted file mode 100644
index 91181a17b15..00000000000
--- a/wm/uwm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X11R3 window manager
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 18a634f12f6..471ceca7239 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/07 05:16:40 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 17:21:49 wiz Exp $
 
 DISTNAME=		WindowMaker-0.62.1
 PKGNAME=		windowmaker-0.62.1
@@ -9,6 +9,7 @@ EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.windowmaker.org/
+COMMENT=		GNUStep-compliant NEXTSTEP(tm) window manager clone
 
 BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
 BUILD_DEPENDS+=		gettextize:../../devel/gettext
diff --git a/wm/windowmaker/pkg/COMMENT b/wm/windowmaker/pkg/COMMENT
deleted file mode 100644
index dfe74a130e3..00000000000
--- a/wm/windowmaker/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GNUStep-compliant NEXTSTEP(tm) window manager clone
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index 64c2f7b890d..68ada4986df 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:49 wiz Exp $
 
 DISTNAME=	wm2-4
 PKGNAME=	wm2-4.0
@@ -7,6 +7,7 @@ MASTER_SITES=	http://www.all-day-breakfast.com/wm2/
 
 MAINTAINER=	kuebart@mathematik.uni-ulm.de
 HOMEPAGE=	http://www.all-day-breakfast.com/wm2/
+COMMENT=	Minimalist window manager for X
 
 ALL_TARGET=	depend wm2
 
diff --git a/wm/wm2/pkg/COMMENT b/wm/wm2/pkg/COMMENT
deleted file mode 100644
index 4a260b05466..00000000000
--- a/wm/wm2/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Minimalist window manager for X
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 88a149655de..927437b29b9 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/15 23:25:17 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:51 wiz Exp $
 #
 
 DISTNAME=	wmakerconf-2.7
@@ -8,6 +8,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://ulli.linuxave.net/wmakerconf/
+COMMENT=	Gtk+ based configuration tool for Window Maker
 
 DEPENDS+=	imlib-*:../../graphics/imlib
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
diff --git a/wm/wmakerconf/pkg/COMMENT b/wm/wmakerconf/pkg/COMMENT
deleted file mode 100644
index 8b18836dddb..00000000000
--- a/wm/wmakerconf/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Gtk+ based configuration tool for Window Maker
diff --git a/wm/wmextra/Makefile b/wm/wmextra/Makefile
index 249e936bd25..7ecfb45adf9 100644
--- a/wm/wmextra/Makefile
+++ b/wm/wmextra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/18 13:50:41 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:52 wiz Exp $
 #
 
 DISTNAME=		WindowMaker-extra-0.1
@@ -9,6 +9,7 @@ MASTER_SITES=		ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.windowmaker.org/
+COMMENT=		Extras for window manager Window Maker
 
 DEPENDS+=		windowmaker-*:../../wm/windowmaker
 
diff --git a/wm/wmextra/pkg/COMMENT b/wm/wmextra/pkg/COMMENT
deleted file mode 100644
index f7ffe61fccb..00000000000
--- a/wm/wmextra/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Extras for window manager Window Maker
diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile
index b5665f402a4..ea40f1be921 100644
--- a/wm/wmthemes/Makefile
+++ b/wm/wmthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/01/13 19:22:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:53 wiz Exp $
 
 DISTNAME=	wmthemes-0.62nb1
 CATEGORIES=	x11 wm
@@ -7,6 +7,7 @@ DISTFILES=	${THEME_FILES}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://wm.themes.org/
+COMMENT=	Themes for the window manager WindowMaker
 
 DEPENDS+=	windowmaker-*:../../wm/windowmaker
 
diff --git a/wm/wmthemes/pkg/COMMENT b/wm/wmthemes/pkg/COMMENT
deleted file mode 100644
index adcd585be53..00000000000
--- a/wm/wmthemes/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Themes for the window manager WindowMaker
diff --git a/wm/wmx-current/Makefile b/wm/wmx-current/Makefile
index 753673237cf..2366c9e6572 100644
--- a/wm/wmx-current/Makefile
+++ b/wm/wmx-current/Makefile
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/01/18 20:17:11 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:55 wiz Exp $
 
 PKGNAME=	wmx-${WMX_VERS}
 
+COMMENT=	another X11 window manager based on wm2
+
 .include "../../wm/wmx-current/Makefile.common"
diff --git a/wm/wmx-current/pkg/COMMENT b/wm/wmx-current/pkg/COMMENT
deleted file mode 100644
index ca851528eed..00000000000
--- a/wm/wmx-current/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-another X11 window manager based on wm2
diff --git a/wm/wmx-gnome-current/Makefile b/wm/wmx-gnome-current/Makefile
index c6cc61a559a..a0c0c6f9ad3 100644
--- a/wm/wmx-gnome-current/Makefile
+++ b/wm/wmx-gnome-current/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/01/18 20:19:37 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:56 wiz Exp $
 
 PKGNAME=	wmx-gnome-${WMX_VERS}
 CATEGORIES+=	gnome
 
+COMMENT=	another X11 window manager based on wm2, with GNOME compliance
+
 CPPFLAGS+=	-DCONFIG_GNOME_COMPLIANCE=True
 CPPFLAGS+=	-DCONFIG_GNOME_BUTTON_COMPLIANCE=True
 CXXFLAGS+=	-DCONFIG_GNOME_COMPLIANCE=True
diff --git a/wm/wmx-gnome-current/pkg/COMMENT b/wm/wmx-gnome-current/pkg/COMMENT
deleted file mode 100644
index 6d5507a81fa..00000000000
--- a/wm/wmx-gnome-current/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-another X11 window manager based on wm2, with GNOME compliance
diff --git a/wm/wmx/Makefile b/wm/wmx/Makefile
index f3299a9ce05..1d5c175eb09 100644
--- a/wm/wmx/Makefile
+++ b/wm/wmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:54 wiz Exp $
 
 DISTNAME=	wmx-5
 PKGNAME=	wmx-5.0
@@ -7,6 +7,7 @@ MASTER_SITES=	http://www.all-day-breakfast.com/wmx/
 
 MAINTAINER=	kuebart@mathematik.uni-ulm.de
 HOMEPAGE=	http://www.all-day-breakfast.com/wmx/
+COMMENT=	another X11 window manager based on wm2
 
 USE_X11BASE=	YES
 USE_XPM=	YES
diff --git a/wm/wmx/pkg/COMMENT b/wm/wmx/pkg/COMMENT
deleted file mode 100644
index ca851528eed..00000000000
--- a/wm/wmx/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-another X11 window manager based on wm2