Clear moonlight beckons.

Requiem mors pacem pkg-comment,
And be calm ports tree.

E Nomini Patri, E Fili, E Spiritu Sancti.

74 files changed, 37 insertions, 37 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 1499aee..f0fb5d9 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	stable
 DISTNAME=	AfterStep-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
+COMMENT=	A stable version of the AfterStep window manager
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/x11-wm/afterstep-stable/pkg-comment b/x11-wm/afterstep-stable/pkg-comment
deleted file mode 100644
index 1c91e8e..0000000
--- a/x11-wm/afterstep-stable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A stable version of the AfterStep window manager
diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile
index 4de9098..d709d0f 100644
--- a/x11-wm/amaterus/Makefile
+++ b/x11-wm/amaterus/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.taiyaki.org/amaterus/src/
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	A GTK+ window manager
 
 LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
diff --git a/x11-wm/amaterus/pkg-comment b/x11-wm/amaterus/pkg-comment
deleted file mode 100644
index 6eb48d1..0000000
--- a/x11-wm/amaterus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ window manager
diff --git a/x11-wm/bbapm/Makefile b/x11-wm/bbapm/Makefile
index 32d7b81..9a9896e 100644
--- a/x11-wm/bbapm/Makefile
+++ b/x11-wm/bbapm/Makefile
@@ -15,6 +15,7 @@ PATCHFILES=	bbapm-0.0.1-freebsd-patch-2.diff
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	APM monitor for the Blackbox slit
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-wm/bbapm/pkg-comment b/x11-wm/bbapm/pkg-comment
deleted file mode 100644
index d2ac289..0000000
--- a/x11-wm/bbapm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-APM monitor for the Blackbox slit
diff --git a/x11-wm/bbrun/Makefile b/x11-wm/bbrun/Makefile
index aaf1853..1048b55 100644
--- a/x11-wm/bbrun/Makefile
+++ b/x11-wm/bbrun/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.dwave.net/~jking/bbrun/
 
 MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	A Run box for Blackbox
 
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
diff --git a/x11-wm/bbrun/pkg-comment b/x11-wm/bbrun/pkg-comment
deleted file mode 100644
index 99685f9..0000000
--- a/x11-wm/bbrun/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Run box for Blackbox
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 4a959e9..b829edf 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -20,6 +20,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	vanilla@FreeBSD.org
+COMMENT=	A very artistic X window manager
 
 LIB_DEPENDS=	Fnlib.0:${PORTSDIR}/graphics/fnlib \
 		ghttp.1:${PORTSDIR}/www/libghttp \
diff --git a/x11-wm/e16/pkg-comment b/x11-wm/e16/pkg-comment
deleted file mode 100644
index e654583..0000000
--- a/x11-wm/e16/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very artistic X window manager
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 4a959e9..b829edf 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -20,6 +20,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	vanilla@FreeBSD.org
+COMMENT=	A very artistic X window manager
 
 LIB_DEPENDS=	Fnlib.0:${PORTSDIR}/graphics/fnlib \
 		ghttp.1:${PORTSDIR}/www/libghttp \
diff --git a/x11-wm/enlightenment-devel/pkg-comment b/x11-wm/enlightenment-devel/pkg-comment
deleted file mode 100644
index e654583..0000000
--- a/x11-wm/enlightenment-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very artistic X window manager
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 4a959e9..b829edf 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -20,6 +20,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	vanilla@FreeBSD.org
+COMMENT=	A very artistic X window manager
 
 LIB_DEPENDS=	Fnlib.0:${PORTSDIR}/graphics/fnlib \
 		ghttp.1:${PORTSDIR}/www/libghttp \
diff --git a/x11-wm/enlightenment/pkg-comment b/x11-wm/enlightenment/pkg-comment
deleted file mode 100644
index e654583..0000000
--- a/x11-wm/enlightenment/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very artistic X window manager
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index 2615162..7e79f13 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://flwm.sourceforge.net/ \
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	demon@FreeBSD.org
+COMMENT=	The Fast Light Window Manager
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
diff --git a/x11-wm/flwm/pkg-comment b/x11-wm/flwm/pkg-comment
deleted file mode 100644
index 3871b70..0000000
--- a/x11-wm/flwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Fast Light Window Manager
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index e68b6d3..5d7cce1 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-1/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/1.x/
 
 MAINTAINER=	me@FreeBSD.org
+COMMENT=	The fvwm window manager
 
 NO_LATEST_LINK=	yes
 USE_IMAKE=	yes
diff --git a/x11-wm/fvwm/pkg-comment b/x11-wm/fvwm/pkg-comment
deleted file mode 100644
index 602130d..0000000
--- a/x11-wm/fvwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The fvwm window manager
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index efb6208..e8c45fd 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -14,6 +14,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cy@FreeBSD.org
+COMMENT=	Popular virtual window manager for X
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
diff --git a/x11-wm/fvwm2-devel/pkg-comment b/x11-wm/fvwm2-devel/pkg-comment
deleted file mode 100644
index cda5684..0000000
--- a/x11-wm/fvwm2-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Popular virtual window manager for X
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 03f977da..771cb34 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -14,6 +14,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cy@FreeBSD.org
+COMMENT=	Popular virtual window manager for X
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/x11-wm/fvwm2/pkg-comment b/x11-wm/fvwm2/pkg-comment
deleted file mode 100644
index cda5684..0000000
--- a/x11-wm/fvwm2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Popular virtual window manager for X
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 03f977da..771cb34 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -14,6 +14,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cy@FreeBSD.org
+COMMENT=	Popular virtual window manager for X
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/x11-wm/fvwm24/pkg-comment b/x11-wm/fvwm24/pkg-comment
deleted file mode 100644
index cda5684..0000000
--- a/x11-wm/fvwm24/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Popular virtual window manager for X
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index 5e67be2..6ca5d1a 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-Autoconf
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	demon@FreeBSD.org
+COMMENT=	Win95 lookalike version of the fvwm2 window manager
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
 RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
diff --git a/x11-wm/fvwm95/pkg-comment b/x11-wm/fvwm95/pkg-comment
deleted file mode 100644
index 11d22d4..0000000
--- a/x11-wm/fvwm95/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Win95 lookalike version of the fvwm2 window manager
diff --git a/x11-wm/gnome2wmaker/Makefile b/x11-wm/gnome2wmaker/Makefile
index f7307fa..84eaf1f 100644
--- a/x11-wm/gnome2wmaker/Makefile
+++ b/x11-wm/gnome2wmaker/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm gnome
 MASTER_SITES=	http://ulli.on.openave.net/gnome2wmaker/
 
 MAINTAINER=	reg@FreeBSD.org
+COMMENT=	Inserts the GNOME menu into the WindowMaker menu
 
 LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList
 RUN_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
diff --git a/x11-wm/gnome2wmaker/pkg-comment b/x11-wm/gnome2wmaker/pkg-comment
deleted file mode 100644
index 3b621f6..0000000
--- a/x11-wm/gnome2wmaker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Inserts the GNOME menu into the WindowMaker menu
diff --git a/x11-wm/icemc/Makefile b/x11-wm/icemc/Makefile
index 965665d..ca2d11a 100644
--- a/x11-wm/icemc/Makefile
+++ b/x11-wm/icemc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.algorithm.at/comp/icemc/
 
 MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	QT-based menu editor for IceWM
 
 USE_X_PREFIX=	yes
 USE_QT_VER=	3
diff --git a/x11-wm/icemc/pkg-comment b/x11-wm/icemc/pkg-comment
deleted file mode 100644
index d3475f8..0000000
--- a/x11-wm/icemc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-QT-based menu editor for IceWM
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 7e8557d..b33bb00 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	Window Manager designed for speed, usability and consistency
 
 BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
diff --git a/x11-wm/icewm/pkg-comment b/x11-wm/icewm/pkg-comment
deleted file mode 100644
index f4f1c1e..0000000
--- a/x11-wm/icewm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Window Manager designed for speed, usability and consistency
diff --git a/x11-wm/kdeartwork3/Makefile b/x11-wm/kdeartwork3/Makefile
index 1107dbc..85bf229 100644
--- a/x11-wm/kdeartwork3/Makefile
+++ b/x11-wm/kdeartwork3/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Additional themes, sounds, wallpapers and window styles for KDE
 
 USE_KDEBASE_VER=3
 PREFIX=		${KDE_PREFIX}
diff --git a/x11-wm/kdeartwork3/pkg-comment b/x11-wm/kdeartwork3/pkg-comment
deleted file mode 100644
index 3fec02a..0000000
--- a/x11-wm/kdeartwork3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional themes, sounds, wallpapers and window styles for KDE
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 8c278c6..f3715d4 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/ \
 		http://soupnazi.org/FreeBSD/ports/distfiles/
 
 MAINTAINER=	jim@FreeBSD.org
+COMMENT=	Standard library for Window Maker dock apps
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-wm/libdockapp/pkg-comment b/x11-wm/libdockapp/pkg-comment
deleted file mode 100644
index a637cfc..0000000
--- a/x11-wm/libdockapp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Standard library for Window Maker dock apps
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index aaca2dd..5bfaed5 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A window manager for the adult in you
 
 LIB_DEPENDS=	gconf-2:${PORTSDIR}/devel/gconf2 \
 		glade-2.0.0:${PORTSDIR}/devel/libglade2 \
diff --git a/x11-wm/metacity/pkg-comment b/x11-wm/metacity/pkg-comment
deleted file mode 100644
index 2b13345..0000000
--- a/x11-wm/metacity/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A window manager for the adult in you
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index f091add..27df429 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -14,6 +14,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} mini-icons.tar.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	Macintosh like window manager for X11
 
 USE_IMAKE=	yes
 USE_XPM=	yes
diff --git a/x11-wm/mlvwm/pkg-comment b/x11-wm/mlvwm/pkg-comment
deleted file mode 100644
index ce2618f..0000000
--- a/x11-wm/mlvwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Macintosh like window manager for X11
diff --git a/x11-wm/mosfet-liquid/Makefile b/x11-wm/mosfet-liquid/Makefile
index 81dc736..0c2eb09 100644
--- a/x11-wm/mosfet-liquid/Makefile
+++ b/x11-wm/mosfet-liquid/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.mosfet.org/
 DISTNAME=	${PORTNAME}${PORTVERSION}-pre4
 
 MAINTAINER=	kde@freebsd.org
+COMMENT=	A High Performance Liquid KDE style engine
 
 BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake \
 		autoconf:${PORTSDIR}/devel/autoconf
diff --git a/x11-wm/mosfet-liquid/pkg-comment b/x11-wm/mosfet-liquid/pkg-comment
deleted file mode 100644
index ff7e890..0000000
--- a/x11-wm/mosfet-liquid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A High Performance Liquid KDE style engine
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 7934ae1..a4b0358 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -20,6 +20,7 @@ PATCHFILES=	olvwm4.Patch01.Z \
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	green@FreeBSD.org
+COMMENT=	OpenLook Virtual Window manager
 
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
diff --git a/x11-wm/olvwm/pkg-comment b/x11-wm/olvwm/pkg-comment
deleted file mode 100644
index 8a02560..0000000
--- a/x11-wm/olvwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OpenLook Virtual Window manager
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index b51acda..efd3c63 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	phluid
 LIB_DEPENDS=	Imlib2.1:${PORTSDIR}/graphics/imlib2
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	a window manager that emphasizes efficiency, speed, and beauty
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/phluid/pkg-comment b/x11-wm/phluid/pkg-comment
deleted file mode 100644
index 46d404f..0000000
--- a/x11-wm/phluid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-a window manager that emphasizes efficiency, speed, and beauty
diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile
index 915d1ac..a48b4ee 100644
--- a/x11-wm/pwm/Makefile
+++ b/x11-wm/pwm/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
 
 MAINTAINER=	nbm@FreeBSD.org
+COMMENT=	A lightweight window manager with emphasis on usability
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11-wm/pwm/pkg-comment b/x11-wm/pwm/pkg-comment
deleted file mode 100644
index 4c00dc3..0000000
--- a/x11-wm/pwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight window manager with emphasis on usability
diff --git a/x11-wm/qnxstyle/Makefile b/x11-wm/qnxstyle/Makefile
index 7ec8378..8cfcb64 100644
--- a/x11-wm/qnxstyle/Makefile
+++ b/x11-wm/qnxstyle/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.kde-look.org/content/files/
 DISTNAME=	$(KDELOOKITEM)-${PORTNAME}-$(PORTVERSION)
 
 MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	A QNX style/theme for KDE3
 
 BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
diff --git a/x11-wm/qnxstyle/pkg-comment b/x11-wm/qnxstyle/pkg-comment
deleted file mode 100644
index 6c49264..0000000
--- a/x11-wm/qnxstyle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A QNX style/theme for KDE3
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index c8222cc..f20c845 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://www.qvwm.org/pub/qvwm/ \
 		ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	Windows 95/98/NT like window manager for X11
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-wm/qvwm/pkg-comment b/x11-wm/qvwm/pkg-comment
deleted file mode 100644
index d3992ff..0000000
--- a/x11-wm/qvwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Windows 95/98/NT like window manager for X11
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 63e7d12..60091a8 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -16,6 +16,7 @@ DIST_SUBDIR=	gnome
 DISTNAME=	${PORTNAME}-${PORTVERSION}-gtk1
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Lisp configurable window manager
 
 LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep \
 		Xft.2:${PORTSDIR}/x11-fonts/Xft
diff --git a/x11-wm/sawfish/pkg-comment b/x11-wm/sawfish/pkg-comment
deleted file mode 100644
index 7b3f278..0000000
--- a/x11-wm/sawfish/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lisp configurable window manager
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index 2e898c4..0fbcffb 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}-gtk2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Lisp configurable window manager
 
 LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep \
 		Xft.2:${PORTSDIR}/x11-fonts/Xft
diff --git a/x11-wm/sawfish2/pkg-comment b/x11-wm/sawfish2/pkg-comment
deleted file mode 100644
index 7b3f278..0000000
--- a/x11-wm/sawfish2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lisp configurable window manager
diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile
index 3d3bab8..fd85252 100644
--- a/x11-wm/scwm/Makefile
+++ b/x11-wm/scwm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://scwm.mit.edu/pub/scwm/
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	Scheme configurable window manager
 
 LIB_DEPENDS=	guile.10:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	${X11BASE}/share/scwm/pixmaps/Animator.xpm:${PORTSDIR}/graphics/scwm-icons
diff --git a/x11-wm/scwm/pkg-comment b/x11-wm/scwm/pkg-comment
deleted file mode 100644
index c8c2af3..0000000
--- a/x11-wm/scwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Scheme configurable window manager
diff --git a/x11-wm/spager/Makefile b/x11-wm/spager/Makefile
index 3e66fde5..663c69e 100644
--- a/x11-wm/spager/Makefile
+++ b/x11-wm/spager/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.stanford.edu/~satyakid/
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	A pager for sawfish without GNOME
 
 RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
 
diff --git a/x11-wm/spager/pkg-comment b/x11-wm/spager/pkg-comment
deleted file mode 100644
index f771003..0000000
--- a/x11-wm/spager/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pager for sawfish without GNOME
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index 6bb5813..8354075 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	window_managers
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	gpalmer@FreeBSD.org
+COMMENT=	Twm with a virtual desktop
 
 WRKSRC=		${WRKDIR}/tvtwm
 USE_IMAKE=	yes
diff --git a/x11-wm/tvtwm/pkg-comment b/x11-wm/tvtwm/pkg-comment
deleted file mode 100644
index 2058f8c..0000000
--- a/x11-wm/tvtwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Twm with a virtual desktop
diff --git a/x11-wm/w9wm/Makefile b/x11-wm/w9wm/Makefile
index a1cf984..649e33c 100644
--- a/x11-wm/w9wm/Makefile
+++ b/x11-wm/w9wm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://inferno.cs.univ-paris8.fr/~drieu/w9wm/src/
 
 MAINTAINER=	greid@ukug.uk.freebsd.org
+COMMENT=	A hack of 9wm to give virtual screens
 
 USE_X_PREFIX=	yes
 MAKEFILE=	Makefile.no-imake
diff --git a/x11-wm/w9wm/pkg-comment b/x11-wm/w9wm/pkg-comment
deleted file mode 100644
index 073696d..0000000
--- a/x11-wm/w9wm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A hack of 9wm to give virtual screens
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 4149a3a..1735757 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	source/release
 DISTNAME=	WindowMaker-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	GNUStep-compliant NeXTStep window manager clone
 
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png \
diff --git a/x11-wm/windowmaker/pkg-comment b/x11-wm/windowmaker/pkg-comment
deleted file mode 100644
index 5eb139c..0000000
--- a/x11-wm/windowmaker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNUStep-compliant NeXTStep window manager clone
diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index 04d205e..3b308f7 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.all-day-breakfast.com/wm2/
 DISTNAME=	${PORTNAME}-4
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	A very simple window manager for X
 
 USE_X_PREFIX=	yes
 ALL_TARGET=	depend wm2
diff --git a/x11-wm/wm2/pkg-comment b/x11-wm/wm2/pkg-comment
deleted file mode 100644
index 3b8f2f4..0000000
--- a/x11-wm/wm2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very simple window manager for X
diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile
index 8716e7c..070e12b 100644
--- a/x11-wm/wmcp/Makefile
+++ b/x11-wm/wmcp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	misc windowmaker
 MASTER_SITES=	http://soupnazi.org/FreeBSD/ports/distfiles/
 
 MAINTAINER=	jim@FreeBSD.org
+COMMENT=	A dockable pager for Window Maker
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11-wm/wmcp/pkg-comment b/x11-wm/wmcp/pkg-comment
deleted file mode 100644
index 9ae513d..0000000
--- a/x11-wm/wmcp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockable pager for Window Maker
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 25662d3..ed602d5 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://ductape.net/~reeve/downloads/ \
 DISTNAME=	wmG-${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	Small GTK-based GNOME-compliant window manager
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11-wm/wmg/pkg-comment b/x11-wm/wmg/pkg-comment
deleted file mode 100644
index 6f28791..0000000
--- a/x11-wm/wmg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small GTK-based GNOME-compliant window manager
diff --git a/x11-wm/xwmm/Makefile b/x11-wm/xwmm/Makefile
index 07612e9..575564f 100644
--- a/x11-wm/xwmm/Makefile
+++ b/x11-wm/xwmm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	asami
 
 MAINTAINER=	kde@freebsd.org
+COMMENT=	A simple utility managing multiple Window Managers with Qt
 
 USE_X_PREFIX=	yes
 USE_QT_VER=	2
diff --git a/x11-wm/xwmm/pkg-comment b/x11-wm/xwmm/pkg-comment
deleted file mode 100644
index 805f49d..0000000
--- a/x11-wm/xwmm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple utility managing multiple Window Managers with Qt