De-pkg-comment.

194 files changed, 98 insertions, 98 deletions

diff --git a/x11-servers/Xatm/Makefile b/x11-servers/Xatm/Makefile
index 17ed5014f020..0fb8d0940531 100644
--- a/x11-servers/Xatm/Makefile
+++ b/x11-servers/Xatm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/
 DISTNAME=	${PORTNAME}+cid-${PORTVERSION}
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	XFree86 Font Server with Xatm
 
 BROKEN=		"Does not build"
 
diff --git a/x11-servers/Xatm/pkg-comment b/x11-servers/Xatm/pkg-comment
deleted file mode 100644
index 2a5780909bea..000000000000
--- a/x11-servers/Xatm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86 Font Server with Xatm
diff --git a/x11-servers/XttXF86srv-3DLabs/Makefile b/x11-servers/XttXF86srv-3DLabs/Makefile
index ceeb2e27bf10..e8f52bab09a8 100644
--- a/x11-servers/XttXF86srv-3DLabs/Makefile
+++ b/x11-servers/XttXF86srv-3DLabs/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for SVGA Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-3DLabs/pkg-comment b/x11-servers/XttXF86srv-3DLabs/pkg-comment
deleted file mode 100644
index 1bd5130583ae..000000000000
--- a/x11-servers/XttXF86srv-3DLabs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for SVGA Graphics Cards
diff --git a/x11-servers/XttXF86srv-8514/Makefile b/x11-servers/XttXF86srv-8514/Makefile
index 83034729f353..a963f65ab441 100644
--- a/x11-servers/XttXF86srv-8514/Makefile
+++ b/x11-servers/XttXF86srv-8514/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for 8514 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-8514/pkg-comment b/x11-servers/XttXF86srv-8514/pkg-comment
deleted file mode 100644
index ccbcc5c7c06e..000000000000
--- a/x11-servers/XttXF86srv-8514/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for 8514 Graphics Cards
diff --git a/x11-servers/XttXF86srv-AGX/Makefile b/x11-servers/XttXF86srv-AGX/Makefile
index 9eee421647a9..fca40c0cc368 100644
--- a/x11-servers/XttXF86srv-AGX/Makefile
+++ b/x11-servers/XttXF86srv-AGX/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for AGX Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-AGX/pkg-comment b/x11-servers/XttXF86srv-AGX/pkg-comment
deleted file mode 100644
index fa4fc6186d15..000000000000
--- a/x11-servers/XttXF86srv-AGX/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for AGX Graphics Cards
diff --git a/x11-servers/XttXF86srv-I128/Makefile b/x11-servers/XttXF86srv-I128/Makefile
index 84ce15835775..5f13494ac0a6 100644
--- a/x11-servers/XttXF86srv-I128/Makefile
+++ b/x11-servers/XttXF86srv-I128/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for I128 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-I128/pkg-comment b/x11-servers/XttXF86srv-I128/pkg-comment
deleted file mode 100644
index 31d71f71c0d0..000000000000
--- a/x11-servers/XttXF86srv-I128/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for I128 Graphics Cards
diff --git a/x11-servers/XttXF86srv-Mach32/Makefile b/x11-servers/XttXF86srv-Mach32/Makefile
index 37b8640a038a..2229a90ee4bf 100644
--- a/x11-servers/XttXF86srv-Mach32/Makefile
+++ b/x11-servers/XttXF86srv-Mach32/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for Mach32 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-Mach32/pkg-comment b/x11-servers/XttXF86srv-Mach32/pkg-comment
deleted file mode 100644
index 5779e3c860d4..000000000000
--- a/x11-servers/XttXF86srv-Mach32/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for Mach32 Graphics Cards
diff --git a/x11-servers/XttXF86srv-Mach64/Makefile b/x11-servers/XttXF86srv-Mach64/Makefile
index fa05e19424cc..fa0417dae578 100644
--- a/x11-servers/XttXF86srv-Mach64/Makefile
+++ b/x11-servers/XttXF86srv-Mach64/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for Mach64 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-Mach64/pkg-comment b/x11-servers/XttXF86srv-Mach64/pkg-comment
deleted file mode 100644
index 09f7881a5437..000000000000
--- a/x11-servers/XttXF86srv-Mach64/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for Mach64 Graphics Cards
diff --git a/x11-servers/XttXF86srv-Mach8/Makefile b/x11-servers/XttXF86srv-Mach8/Makefile
index bf88b707855a..e7356d545daf 100644
--- a/x11-servers/XttXF86srv-Mach8/Makefile
+++ b/x11-servers/XttXF86srv-Mach8/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for Mach8 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-Mach8/pkg-comment b/x11-servers/XttXF86srv-Mach8/pkg-comment
deleted file mode 100644
index f3437f99caf1..000000000000
--- a/x11-servers/XttXF86srv-Mach8/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for Mach8 Graphics Cards
diff --git a/x11-servers/XttXF86srv-Mono/Makefile b/x11-servers/XttXF86srv-Mono/Makefile
index 03b3ff7d984e..d93ff0407e30 100644
--- a/x11-servers/XttXF86srv-Mono/Makefile
+++ b/x11-servers/XttXF86srv-Mono/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for Mono Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-Mono/pkg-comment b/x11-servers/XttXF86srv-Mono/pkg-comment
deleted file mode 100644
index 2276735dc5eb..000000000000
--- a/x11-servers/XttXF86srv-Mono/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for Mono Graphics Cards
diff --git a/x11-servers/XttXF86srv-P9000/Makefile b/x11-servers/XttXF86srv-P9000/Makefile
index 9b774e1cbd01..66e21f51a690 100644
--- a/x11-servers/XttXF86srv-P9000/Makefile
+++ b/x11-servers/XttXF86srv-P9000/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for P9000 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-P9000/pkg-comment b/x11-servers/XttXF86srv-P9000/pkg-comment
deleted file mode 100644
index cd63a8f47081..000000000000
--- a/x11-servers/XttXF86srv-P9000/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for P9000 Graphics Cards
diff --git a/x11-servers/XttXF86srv-S3/Makefile b/x11-servers/XttXF86srv-S3/Makefile
index a1b038bc0d2f..72af2fc91e56 100644
--- a/x11-servers/XttXF86srv-S3/Makefile
+++ b/x11-servers/XttXF86srv-S3/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for S3 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-S3/pkg-comment b/x11-servers/XttXF86srv-S3/pkg-comment
deleted file mode 100644
index 613e70fc2dc5..000000000000
--- a/x11-servers/XttXF86srv-S3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for S3 Graphics Cards
diff --git a/x11-servers/XttXF86srv-S3V/Makefile b/x11-servers/XttXF86srv-S3V/Makefile
index 616df49b4a6d..088a511958ce 100644
--- a/x11-servers/XttXF86srv-S3V/Makefile
+++ b/x11-servers/XttXF86srv-S3V/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for S3V Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-S3V/pkg-comment b/x11-servers/XttXF86srv-S3V/pkg-comment
deleted file mode 100644
index c06469d843cc..000000000000
--- a/x11-servers/XttXF86srv-S3V/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for S3V Graphics Cards
diff --git a/x11-servers/XttXF86srv-SVGA/Makefile b/x11-servers/XttXF86srv-SVGA/Makefile
index 3b47754cd064..ae474f073aab 100644
--- a/x11-servers/XttXF86srv-SVGA/Makefile
+++ b/x11-servers/XttXF86srv-SVGA/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for SVGA Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-SVGA/pkg-comment b/x11-servers/XttXF86srv-SVGA/pkg-comment
deleted file mode 100644
index 1bd5130583ae..000000000000
--- a/x11-servers/XttXF86srv-SVGA/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for SVGA Graphics Cards
diff --git a/x11-servers/XttXF86srv-VGA16/Makefile b/x11-servers/XttXF86srv-VGA16/Makefile
index 6d171f071757..c59e478dfbf7 100644
--- a/x11-servers/XttXF86srv-VGA16/Makefile
+++ b/x11-servers/XttXF86srv-VGA16/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for VGA16 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-VGA16/pkg-comment b/x11-servers/XttXF86srv-VGA16/pkg-comment
deleted file mode 100644
index e8e8398cd338..000000000000
--- a/x11-servers/XttXF86srv-VGA16/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for VGA16 Graphics Cards
diff --git a/x11-servers/XttXF86srv-W32/Makefile b/x11-servers/XttXF86srv-W32/Makefile
index b7c810093baa..9ee0a62ed8f3 100644
--- a/x11-servers/XttXF86srv-W32/Makefile
+++ b/x11-servers/XttXF86srv-W32/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Server for W32 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-W32/pkg-comment b/x11-servers/XttXF86srv-W32/pkg-comment
deleted file mode 100644
index b0ec0369058c..000000000000
--- a/x11-servers/XttXF86srv-W32/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for W32 Graphics Cards
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index 4605ca5d81f4..b5d2fcceaa06 100644
--- a/x11-servers/XttXF86srv-common/Makefile
+++ b/x11-servers/XttXF86srv-common/Makefile
@@ -18,7 +18,8 @@ PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,${XFREE_VERSION}/fixes,}
 PATCHFILES=	fix-01-r128 fix-04-s3trio3d2x fix-05-s3trio3d fix-06-s3trio3d2x\
 		fix-07-s3trio64v2gx+netfinity fix-08-s3savage_ix+mx
 
-MAINTAINER=	taguchi@tohoku.iij.ad.jp
+MAINTAINER?=	taguchi@tohoku.iij.ad.jp
+COMMENT?=	Common files for X True Type Servers
 
 RUN_DEPENDS+=	mkttfdir:${PORTSDIR}/print/perlftlib
 
diff --git a/x11-servers/XttXF86srv-common/pkg-comment b/x11-servers/XttXF86srv-common/pkg-comment
deleted file mode 100644
index c7bedbe5b220..000000000000
--- a/x11-servers/XttXF86srv-common/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Common files for X True Type Servers
diff --git a/x11-servers/XttXF86srv-xfs/Makefile b/x11-servers/XttXF86srv-xfs/Makefile
index 9129eb55bfe2..c3bee9945589 100644
--- a/x11-servers/XttXF86srv-xfs/Makefile
+++ b/x11-servers/XttXF86srv-xfs/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
+COMMENT=	A X True Type Font Server
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF86srv-xfs/pkg-comment b/x11-servers/XttXF86srv-xfs/pkg-comment
deleted file mode 100644
index 09d47c566e11..000000000000
--- a/x11-servers/XttXF86srv-xfs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Font Server
diff --git a/x11-servers/XttXF98srv-EGC/Makefile b/x11-servers/XttXF98srv-EGC/Makefile
index 205453488978..11cd7f684e4c 100644
--- a/x11-servers/XttXF98srv-EGC/Makefile
+++ b/x11-servers/XttXF98srv-EGC/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 EGC Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-EGC/pkg-comment b/x11-servers/XttXF98srv-EGC/pkg-comment
deleted file mode 100644
index 838dadadd9c1..000000000000
--- a/x11-servers/XttXF98srv-EGC/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 EGC Graphics Cards
diff --git a/x11-servers/XttXF98srv-GA968/Makefile b/x11-servers/XttXF98srv-GA968/Makefile
index c6eb4b1f8332..57c9dff97bdb 100644
--- a/x11-servers/XttXF98srv-GA968/Makefile
+++ b/x11-servers/XttXF98srv-GA968/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 GA968 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-GA968/pkg-comment b/x11-servers/XttXF98srv-GA968/pkg-comment
deleted file mode 100644
index a0f9557234b0..000000000000
--- a/x11-servers/XttXF98srv-GA968/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 GA968 Graphics Cards
diff --git a/x11-servers/XttXF98srv-GANBWAP/Makefile b/x11-servers/XttXF98srv-GANBWAP/Makefile
index 5db7d3853e3c..98de4965ec60 100644
--- a/x11-servers/XttXF98srv-GANBWAP/Makefile
+++ b/x11-servers/XttXF98srv-GANBWAP/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 GANBWAP Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-GANBWAP/pkg-comment b/x11-servers/XttXF98srv-GANBWAP/pkg-comment
deleted file mode 100644
index bb2c418e181d..000000000000
--- a/x11-servers/XttXF98srv-GANBWAP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 GANBWAP Graphics Cards
diff --git a/x11-servers/XttXF98srv-MGA/Makefile b/x11-servers/XttXF98srv-MGA/Makefile
index 30e1658c45e9..c71c5929679b 100644
--- a/x11-servers/XttXF98srv-MGA/Makefile
+++ b/x11-servers/XttXF98srv-MGA/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-servers
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
+COMMENT=	A X True Type Server for X98 MGA Graphics Cards
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/x11-servers/XttXF98srv-MGA/pkg-comment b/x11-servers/XttXF98srv-MGA/pkg-comment
deleted file mode 100644
index 3e746f6a4050..000000000000
--- a/x11-servers/XttXF98srv-MGA/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 MGA Graphics Cards
diff --git a/x11-servers/XttXF98srv-NEC480/Makefile b/x11-servers/XttXF98srv-NEC480/Makefile
index c6b05f26b6d0..ae588515f60f 100644
--- a/x11-servers/XttXF98srv-NEC480/Makefile
+++ b/x11-servers/XttXF98srv-NEC480/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 NEC480 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-NEC480/pkg-comment b/x11-servers/XttXF98srv-NEC480/pkg-comment
deleted file mode 100644
index fee894fe8145..000000000000
--- a/x11-servers/XttXF98srv-NEC480/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 NEC480 Graphics Cards
diff --git a/x11-servers/XttXF98srv-NECS3/Makefile b/x11-servers/XttXF98srv-NECS3/Makefile
index a4ec6ffdd756..d5ec126db961 100644
--- a/x11-servers/XttXF98srv-NECS3/Makefile
+++ b/x11-servers/XttXF98srv-NECS3/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 NECS3 Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-NECS3/pkg-comment b/x11-servers/XttXF98srv-NECS3/pkg-comment
deleted file mode 100644
index 433b4896cf3d..000000000000
--- a/x11-servers/XttXF98srv-NECS3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 NECS3 Graphics Cards
diff --git a/x11-servers/XttXF98srv-NKVNEC/Makefile b/x11-servers/XttXF98srv-NKVNEC/Makefile
index 5642ae0b73e8..8c137f596669 100644
--- a/x11-servers/XttXF98srv-NKVNEC/Makefile
+++ b/x11-servers/XttXF98srv-NKVNEC/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 NKVNEC Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-NKVNEC/pkg-comment b/x11-servers/XttXF98srv-NKVNEC/pkg-comment
deleted file mode 100644
index a65ec107a049..000000000000
--- a/x11-servers/XttXF98srv-NKVNEC/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 NKVNEC Graphics Cards
diff --git a/x11-servers/XttXF98srv-PWLB/Makefile b/x11-servers/XttXF98srv-PWLB/Makefile
index e4421addcfa1..d1f68439c8d8 100644
--- a/x11-servers/XttXF98srv-PWLB/Makefile
+++ b/x11-servers/XttXF98srv-PWLB/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 PWLB Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-PWLB/pkg-comment b/x11-servers/XttXF98srv-PWLB/pkg-comment
deleted file mode 100644
index 513b77ffdcc2..000000000000
--- a/x11-servers/XttXF98srv-PWLB/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 PWLB Graphics Cards
diff --git a/x11-servers/XttXF98srv-PWSKB/Makefile b/x11-servers/XttXF98srv-PWSKB/Makefile
index fe7d4267e643..7e24239eccb5 100644
--- a/x11-servers/XttXF98srv-PWSKB/Makefile
+++ b/x11-servers/XttXF98srv-PWSKB/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 PWSKB Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-PWSKB/pkg-comment b/x11-servers/XttXF98srv-PWSKB/pkg-comment
deleted file mode 100644
index e4f12cc030e5..000000000000
--- a/x11-servers/XttXF98srv-PWSKB/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 PWSKB Graphics Cards
diff --git a/x11-servers/XttXF98srv-SVGA/Makefile b/x11-servers/XttXF98srv-SVGA/Makefile
index aeb797b7fc1e..c90285b1899c 100644
--- a/x11-servers/XttXF98srv-SVGA/Makefile
+++ b/x11-servers/XttXF98srv-SVGA/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 SVGA Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-SVGA/pkg-comment b/x11-servers/XttXF98srv-SVGA/pkg-comment
deleted file mode 100644
index 77084baf545b..000000000000
--- a/x11-servers/XttXF98srv-SVGA/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 SVGA Graphics Cards
diff --git a/x11-servers/XttXF98srv-TGUI/Makefile b/x11-servers/XttXF98srv-TGUI/Makefile
index 94e32a614504..39b1f35c4e7d 100644
--- a/x11-servers/XttXF98srv-TGUI/Makefile
+++ b/x11-servers/XttXF98srv-TGUI/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 TGUI Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-TGUI/pkg-comment b/x11-servers/XttXF98srv-TGUI/pkg-comment
deleted file mode 100644
index 5684c9b7e055..000000000000
--- a/x11-servers/XttXF98srv-TGUI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 TGUI Graphics Cards
diff --git a/x11-servers/XttXF98srv-WABEP/Makefile b/x11-servers/XttXF98srv-WABEP/Makefile
index f8e95dc99467..7df26b7aaf38 100644
--- a/x11-servers/XttXF98srv-WABEP/Makefile
+++ b/x11-servers/XttXF98srv-WABEP/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 WABEP Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-WABEP/pkg-comment b/x11-servers/XttXF98srv-WABEP/pkg-comment
deleted file mode 100644
index a0e29cbff23e..000000000000
--- a/x11-servers/XttXF98srv-WABEP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 WABEP Graphics Cards
diff --git a/x11-servers/XttXF98srv-WABS/Makefile b/x11-servers/XttXF98srv-WABS/Makefile
index 01eca7645847..5904300a4669 100644
--- a/x11-servers/XttXF98srv-WABS/Makefile
+++ b/x11-servers/XttXF98srv-WABS/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 WABS Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-WABS/pkg-comment b/x11-servers/XttXF98srv-WABS/pkg-comment
deleted file mode 100644
index c03f6f084d7e..000000000000
--- a/x11-servers/XttXF98srv-WABS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 WABS Graphics Cards
diff --git a/x11-servers/XttXF98srv-WSNA/Makefile b/x11-servers/XttXF98srv-WSNA/Makefile
index f3285836724e..371007020159 100644
--- a/x11-servers/XttXF98srv-WSNA/Makefile
+++ b/x11-servers/XttXF98srv-WSNA/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
+COMMENT=	A X True Type Server for X98 WSNA Graphics Cards
 
 RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
diff --git a/x11-servers/XttXF98srv-WSNA/pkg-comment b/x11-servers/XttXF98srv-WSNA/pkg-comment
deleted file mode 100644
index e3f02701b719..000000000000
--- a/x11-servers/XttXF98srv-WSNA/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X True Type Server for X98 WSNA Graphics Cards
diff --git a/x11-servers/x2vnc/Makefile b/x11-servers/x2vnc/Makefile
index d16fe45b9e6a..a01a7f8f7a29 100644
--- a/x11-servers/x2vnc/Makefile
+++ b/x11-servers/x2vnc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-servers
 MASTER_SITES=	http://www.hubbe.net/~hubbe/
 
 MAINTAINER=	chrise@scardini.com
+COMMENT=	A program to link multiple X and VNC servers together
 
 USE_IMAKE=	yes
 MAN1=		x2vnc.1
diff --git a/x11-servers/x2vnc/pkg-comment b/x11-servers/x2vnc/pkg-comment
deleted file mode 100644
index 8137671a6133..000000000000
--- a/x11-servers/x2vnc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to link multiple X and VNC servers together
diff --git a/x11-themes/fvwm-themes/Makefile b/x11-themes/fvwm-themes/Makefile
index 031db1d34591..c6da0549006c 100644
--- a/x11-themes/fvwm-themes/Makefile
+++ b/x11-themes/fvwm-themes/Makefile
@@ -15,6 +15,7 @@ DISTFILES=	fvwm-themes-base-${PORTVERSION}${EXTRACT_SUFX} \
 		fvwm-themes-extra-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	mkm@ieee.org
+COMMENT=	Themes for the Fvwm2 window manager
 
 BUILD_DEPENDS=	fvwm2:${PORTSDIR}/x11-wm/fvwm2 \
 		gm4:${PORTSDIR}/devel/m4
diff --git a/x11-themes/fvwm-themes/pkg-comment b/x11-themes/fvwm-themes/pkg-comment
deleted file mode 100644
index 3341606574a7..000000000000
--- a/x11-themes/fvwm-themes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Themes for the Fvwm2 window manager
diff --git a/x11-themes/geramik/Makefile b/x11-themes/geramik/Makefile
index bf15bb043bb0..3e5bc1cad812 100644
--- a/x11-themes/geramik/Makefile
+++ b/x11-themes/geramik/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.kde-look.org/content/files/ \
 DISTNAME=	3952-Geramik-${PORTVERSION}
 
 MAINTAINER=	haesu@TowardEX.com
+COMMENT=	A Keramik KDE styled theme for GTK
 
 WRKSRC=		${WRKDIR}/Geramik-${PORTVERSION}
 
diff --git a/x11-themes/geramik/pkg-comment b/x11-themes/geramik/pkg-comment
deleted file mode 100644
index 0302c5ab8231..000000000000
--- a/x11-themes/geramik/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Keramik KDE styled theme for GTK
diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index a4b308d42eb6..8134c1dd845a 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	8.0/en/os/i386/SRPMS
 DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 
 MAINTAINER=	rzheka@users.sourceforge.net
+COMMENT=	Bluecurve unified-look theme for GTK1 and GTK2 from RedHat 8.0
 
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
 		libtool:${PORTSDIR}/devel/libtool
diff --git a/x11-themes/gtk-bluecurve-theme/pkg-comment b/x11-themes/gtk-bluecurve-theme/pkg-comment
deleted file mode 100644
index b0be17a6a92c..000000000000
--- a/x11-themes/gtk-bluecurve-theme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bluecurve unified-look theme for GTK1 and GTK2 from RedHat 8.0
diff --git a/x11-themes/gtk-qnxtheme/Makefile b/x11-themes/gtk-qnxtheme/Makefile
index 3e3d82a3b74f..937c71874a15 100644
--- a/x11-themes/gtk-qnxtheme/Makefile
+++ b/x11-themes/gtk-qnxtheme/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://download.freshmeat.net/themes/qnxtheme/
 DISTNAME=	qnxtheme-default-${PORTVERSION}
 
 MAINTAINER=	flynn@energyhq.homeip.net
+COMMENT=	QNX-inspired theme for GTK1 and GTK2
 
 .if defined(WITH_GTK2)
 LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/x11-themes/gtk-qnxtheme/pkg-comment b/x11-themes/gtk-qnxtheme/pkg-comment
deleted file mode 100644
index b6b1c3c1e3cd..000000000000
--- a/x11-themes/gtk-qnxtheme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-QNX-inspired theme for GTK1 and GTK2
diff --git a/x11-themes/mkultra/Makefile b/x11-themes/mkultra/Makefile
index ea852cc83d39..23b67dd72f41 100644
--- a/x11-themes/mkultra/Makefile
+++ b/x11-themes/mkultra/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.kde-look.org/content/files/
 DISTNAME=	2865-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	flynn@energyhq.homeip.net
+COMMENT=	A lightweight native KWin style for KDE3
 
 BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake \
 		autoconf:${PORTSDIR}/devel/autoconf
diff --git a/x11-themes/mkultra/pkg-comment b/x11-themes/mkultra/pkg-comment
deleted file mode 100644
index 0dea9dbb1fdf..000000000000
--- a/x11-themes/mkultra/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight native KWin style for KDE3
diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile
index e694502e59cb..2596f57a8996 100644
--- a/x11-themes/qinx/Makefile
+++ b/x11-themes/qinx/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm kde
 MASTER_SITES=	http://www.usermode.org/code/
 
 MAINTAINER=	david@usermode.org
+COMMENT=	A QNX Photon like window decoration and widget style for KDE
 
 USE_KDEBASE_VER=3
 GNU_CONFIGURE=	yes
diff --git a/x11-themes/qinx/pkg-comment b/x11-themes/qinx/pkg-comment
deleted file mode 100644
index a286c828fbb7..000000000000
--- a/x11-themes/qinx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A QNX Photon like window decoration and widget style for KDE
diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile
index 4f2ef1e991ce..dcf4dd2144e6 100644
--- a/x11-themes/qt-bluecurve-theme/Makefile
+++ b/x11-themes/qt-bluecurve-theme/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	8.0/en/os/i386/SRPMS
 DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 
 MAINTAINER=	rzheka@users.sourceforge.net
+COMMENT=	Bluecurve unified-look theme for QT3 from RedHat 8.0
 
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
 		libtool:${PORTSDIR}/devel/libtool
diff --git a/x11-themes/qt-bluecurve-theme/pkg-comment b/x11-themes/qt-bluecurve-theme/pkg-comment
deleted file mode 100644
index 177f51bbed6e..000000000000
--- a/x11-themes/qt-bluecurve-theme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bluecurve unified-look theme for QT3 from RedHat 8.0
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index bf1ba872ba4c..c572354a9053 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://tcltk.sourceforge.net/pub/tcltk/blt/ \
 DISTNAME=	BLT${PORTVERSION}
 
 MAINTAINER=	kjc@csl.sony.co.jp
+COMMENT=	A Tk extension (with shared libs)
 
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
diff --git a/x11-toolkits/blt/pkg-comment b/x11-toolkits/blt/pkg-comment
deleted file mode 100644
index 760956095a7e..000000000000
--- a/x11-toolkits/blt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Tk extension (with shared libs)
diff --git a/x11-toolkits/eazel-themes/Makefile b/x11-toolkits/eazel-themes/Makefile
index 824c25ce7b50..dbaec4713c1c 100644
--- a/x11-toolkits/eazel-themes/Makefile
+++ b/x11-toolkits/eazel-themes/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	sobomax
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.//g}
 
 MAINTAINER=	sobomax@altavista.net
+COMMENT=	A nice GTK+ and Sawfish themes created by Eazel
 
 RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish \
 		${X11BASE}/lib/gtk/themes/engines/libpixmap.so:${PORTSDIR}/x11-toolkits/gtk-engines
diff --git a/x11-toolkits/eazel-themes/pkg-comment b/x11-toolkits/eazel-themes/pkg-comment
deleted file mode 100644
index f70ef880f13a..000000000000
--- a/x11-toolkits/eazel-themes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A nice GTK+ and Sawfish themes created by Eazel
diff --git a/x11-toolkits/fl_editor/Makefile b/x11-toolkits/fl_editor/Makefile
index 1e2f7fccfd5d..890929fc9d46 100644
--- a/x11-toolkits/fl_editor/Makefile
+++ b/x11-toolkits/fl_editor/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://robertk.com/source/fl_editor/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	cyrille.lefevre@laposte.net
+COMMENT=	Text Editor Widgets for the Fast Light ToolKit
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
diff --git a/x11-toolkits/fl_editor/pkg-comment b/x11-toolkits/fl_editor/pkg-comment
deleted file mode 100644
index c721df44fc7f..000000000000
--- a/x11-toolkits/fl_editor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text Editor Widgets for the Fast Light ToolKit
diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index e35f475fcfa3..d2fd43f5cf24 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	cyrille.lefevre@laposte.net
+COMMENT=	Virtual Widgets for the Fast Light ToolKit
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
diff --git a/x11-toolkits/flvw/pkg-comment b/x11-toolkits/flvw/pkg-comment
deleted file mode 100644
index 13f353f9b782..000000000000
--- a/x11-toolkits/flvw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Virtual Widgets for the Fast Light ToolKit
diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile
index bed1992cbd50..f3ba57ad4cda 100644
--- a/x11-toolkits/gauche-gtk/Makefile
+++ b/x11-toolkits/gauche-gtk/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	Gauche-${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	fuyuki@hadaly.org
+COMMENT=	GTK2 binding for Gauche
 
 LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
diff --git a/x11-toolkits/gauche-gtk/pkg-comment b/x11-toolkits/gauche-gtk/pkg-comment
deleted file mode 100644
index faa2146d65dc..000000000000
--- a/x11-toolkits/gauche-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK2 binding for Gauche
diff --git a/x11-toolkits/geramik/Makefile b/x11-toolkits/geramik/Makefile
index bf15bb043bb0..3e5bc1cad812 100644
--- a/x11-toolkits/geramik/Makefile
+++ b/x11-toolkits/geramik/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.kde-look.org/content/files/ \
 DISTNAME=	3952-Geramik-${PORTVERSION}
 
 MAINTAINER=	haesu@TowardEX.com
+COMMENT=	A Keramik KDE styled theme for GTK
 
 WRKSRC=		${WRKDIR}/Geramik-${PORTVERSION}
 
diff --git a/x11-toolkits/geramik/pkg-comment b/x11-toolkits/geramik/pkg-comment
deleted file mode 100644
index 0302c5ab8231..000000000000
--- a/x11-toolkits/geramik/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Keramik KDE styled theme for GTK
diff --git a/x11-toolkits/gtk-bluecurve-theme/Makefile b/x11-toolkits/gtk-bluecurve-theme/Makefile
index a4b308d42eb6..8134c1dd845a 100644
--- a/x11-toolkits/gtk-bluecurve-theme/Makefile
+++ b/x11-toolkits/gtk-bluecurve-theme/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	8.0/en/os/i386/SRPMS
 DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 
 MAINTAINER=	rzheka@users.sourceforge.net
+COMMENT=	Bluecurve unified-look theme for GTK1 and GTK2 from RedHat 8.0
 
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
 		libtool:${PORTSDIR}/devel/libtool
diff --git a/x11-toolkits/gtk-bluecurve-theme/pkg-comment b/x11-toolkits/gtk-bluecurve-theme/pkg-comment
deleted file mode 100644
index b0be17a6a92c..000000000000
--- a/x11-toolkits/gtk-bluecurve-theme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bluecurve unified-look theme for GTK1 and GTK2 from RedHat 8.0
diff --git a/x11-toolkits/gtk-qnxtheme/Makefile b/x11-toolkits/gtk-qnxtheme/Makefile
index 3e3d82a3b74f..937c71874a15 100644
--- a/x11-toolkits/gtk-qnxtheme/Makefile
+++ b/x11-toolkits/gtk-qnxtheme/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://download.freshmeat.net/themes/qnxtheme/
 DISTNAME=	qnxtheme-default-${PORTVERSION}
 
 MAINTAINER=	flynn@energyhq.homeip.net
+COMMENT=	QNX-inspired theme for GTK1 and GTK2
 
 .if defined(WITH_GTK2)
 LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/x11-toolkits/gtk-qnxtheme/pkg-comment b/x11-toolkits/gtk-qnxtheme/pkg-comment
deleted file mode 100644
index b6b1c3c1e3cd..000000000000
--- a/x11-toolkits/gtk-qnxtheme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-QNX-inspired theme for GTK1 and GTK2
diff --git a/x11-toolkits/gtk12-apireference/Makefile b/x11-toolkits/gtk12-apireference/Makefile
index e60905d31ddc..99a9a55d5d4b 100644
--- a/x11-toolkits/gtk12-apireference/Makefile
+++ b/x11-toolkits/gtk12-apireference/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://developer.gnome.org/doc/API/
 DISTFILES=	glib-docs.tar.gz gtk-docs.tar.gz gdk-docs.tar.gz
 
 MAINTAINER=	edwin@mavetju.org
+COMMENT=	API reference for the Gimp Toolkit for X11 GUI
 
 NO_BUILD=	yes
 PREFIX=		${X11BASE}
diff --git a/x11-toolkits/gtk12-apireference/pkg-comment b/x11-toolkits/gtk12-apireference/pkg-comment
deleted file mode 100644
index 7d61abf0ce97..000000000000
--- a/x11-toolkits/gtk12-apireference/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-API reference for the Gimp Toolkit for X11 GUI
diff --git a/x11-toolkits/gtk20-apireference/Makefile b/x11-toolkits/gtk20-apireference/Makefile
index 83896f8e24ec..82205537a4db 100644
--- a/x11-toolkits/gtk20-apireference/Makefile
+++ b/x11-toolkits/gtk20-apireference/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://developer.gnome.org/doc/API/
 DISTFILES=	glib-2.0-docs.tar.gz gtk-2.0-docs.tar.gz gdk-2.0-docs.tar.gz
 
 MAINTAINER=	edwin@mavetju.org
+COMMENT=	API reference for the Gimp Toolkit v2.0 for X11 GUI
 
 NO_BUILD=	yes
 NO_CHECKSUM=	yes		# they're rebuild too often to keep track of
diff --git a/x11-toolkits/gtk20-apireference/pkg-comment b/x11-toolkits/gtk20-apireference/pkg-comment
deleted file mode 100644
index 8c144867c59c..000000000000
--- a/x11-toolkits/gtk20-apireference/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-API reference for the Gimp Toolkit v2.0 for X11 GUI
diff --git a/x11-toolkits/gtkada-devel/Makefile b/x11-toolkits/gtkada-devel/Makefile
index 03c5c2d37bea..80105f38f9e8 100644
--- a/x11-toolkits/gtkada-devel/Makefile
+++ b/x11-toolkits/gtkada-devel/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	GtkAda-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sam@inf.enst.fr
+COMMENT=	Gtk binding for Ada
 
 BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
 
diff --git a/x11-toolkits/gtkada-devel/pkg-comment b/x11-toolkits/gtkada-devel/pkg-comment
deleted file mode 100644
index f15972f8c0dc..000000000000
--- a/x11-toolkits/gtkada-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gtk binding for Ada
diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile
index 03c5c2d37bea..80105f38f9e8 100644
--- a/x11-toolkits/gtkada/Makefile
+++ b/x11-toolkits/gtkada/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	GtkAda-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sam@inf.enst.fr
+COMMENT=	Gtk binding for Ada
 
 BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
 
diff --git a/x11-toolkits/gtkada/pkg-comment b/x11-toolkits/gtkada/pkg-comment
deleted file mode 100644
index f15972f8c0dc..000000000000
--- a/x11-toolkits/gtkada/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gtk binding for Ada
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 7cec8526196c..0164e6cb16b2 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.student.oulu.fi/~jlof/gtkglarea/download/
 
 MAINTAINER=	jaeger16@yahoo.com
+COMMENT=	An OpenGL widget for the GTK+ GUI toolkit
 
 USE_X_PREFIX=	yes
 USE_MESA=	yes
diff --git a/x11-toolkits/gtkglarea/pkg-comment b/x11-toolkits/gtkglarea/pkg-comment
deleted file mode 100644
index 6ee885114334..000000000000
--- a/x11-toolkits/gtkglarea/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An OpenGL widget for the GTK+ GUI toolkit
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 46a2f8891aa4..ad077f015248 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	fuyuki@hadaly.org
+COMMENT=	An OpenGL extension to GTK
 
 LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
diff --git a/x11-toolkits/gtkglext/pkg-comment b/x11-toolkits/gtkglext/pkg-comment
deleted file mode 100644
index 428c19b782fe..000000000000
--- a/x11-toolkits/gtkglext/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An OpenGL extension to GTK
diff --git a/x11-toolkits/ocaml-lablgtk/Makefile b/x11-toolkits/ocaml-lablgtk/Makefile
index 1eb1251ece88..b2a7c33c1ec3 100644
--- a/x11-toolkits/ocaml-lablgtk/Makefile
+++ b/x11-toolkits/ocaml-lablgtk/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX=	ocaml-
 PKGNAMESUFFIX=	${SFXGL}${SFXGNOME}${SFXGLADE}
 
 MAINTAINER=	rk@ronald.org
+COMMENT=	An Objective Caml interface to gtk+
 
 BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml
 RUN_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml
diff --git a/x11-toolkits/ocaml-lablgtk/pkg-comment b/x11-toolkits/ocaml-lablgtk/pkg-comment
deleted file mode 100644
index c5305aeb32a5..000000000000
--- a/x11-toolkits/ocaml-lablgtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Objective Caml interface to gtk+
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index d6348ce87738..8766e17efaed 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.prima.eu.org/download/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dmitry@karasik.eu.org
+COMMENT=	An extensible Perl toolkit for multi-platform GUI development
 
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png \
diff --git a/x11-toolkits/p5-Prima/pkg-comment b/x11-toolkits/p5-Prima/pkg-comment
deleted file mode 100644
index 9f5755149f51..000000000000
--- a/x11-toolkits/p5-Prima/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extensible Perl toolkit for multi-platform GUI development
diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile
index c20c46fd77d1..8430f3a45146 100644
--- a/x11-toolkits/p5-Tk-Date/Makefile
+++ b/x11-toolkits/p5-Tk-Date/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Tk
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Tk::Date - a date/time widget for perl/Tk
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk/FireButton.pm:${PORTSDIR}/x11-toolkits/p5-Tk-GBARR
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-Tk-Date/pkg-comment b/x11-toolkits/p5-Tk-Date/pkg-comment
deleted file mode 100644
index d570c16b0353..000000000000
--- a/x11-toolkits/p5-Tk-Date/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tk::Date - a date/time widget for perl/Tk
diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile
index a4c859ed88b4..9c888338993f 100644
--- a/x11-toolkits/p5-Tk-FileDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FileDialog/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
 
 MAINTAINER=	minter@lunenburg.org
+COMMENT=	Tk::FileDialog - A file selector dialog for perl/Tk
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 
diff --git a/x11-toolkits/p5-Tk-FileDialog/pkg-comment b/x11-toolkits/p5-Tk-FileDialog/pkg-comment
deleted file mode 100644
index df738735c61e..000000000000
--- a/x11-toolkits/p5-Tk-FileDialog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tk::FileDialog - A file selector dialog for perl/Tk
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index bfcb4d1a3114..f2cc52776f19 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Tk
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Some collection of Tk Widgets
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-Tk-GBARR/pkg-comment b/x11-toolkits/p5-Tk-GBARR/pkg-comment
deleted file mode 100644
index 9e1a783717cd..000000000000
--- a/x11-toolkits/p5-Tk-GBARR/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Some collection of Tk Widgets
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index 2028cbb721eb..aee01c7060fd 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Tk
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	User configuration window for Tk with interface to Getopt::Long
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-Tk-Getopt/pkg-comment b/x11-toolkits/p5-Tk-Getopt/pkg-comment
deleted file mode 100644
index 0b148646246f..000000000000
--- a/x11-toolkits/p5-Tk-Getopt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-User configuration window for Tk with interface to Getopt::Long
diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile
index 3c05cb9a1613..c2d855449222 100644
--- a/x11-toolkits/p5-Tk-HistEntry/Makefile
+++ b/x11-toolkits/p5-Tk-HistEntry/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Tk
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Tk::HistEntry - Entry widget with history capability
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-Tk-HistEntry/pkg-comment b/x11-toolkits/p5-Tk-HistEntry/pkg-comment
deleted file mode 100644
index 821dd2c38d7f..000000000000
--- a/x11-toolkits/p5-Tk-HistEntry/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tk::HistEntry - Entry widget with history capability
diff --git a/x11-toolkits/py-xlib/Makefile b/x11-toolkits/py-xlib/Makefile
index 379318d4eb3b..ec83785a9e6a 100644
--- a/x11-toolkits/py-xlib/Makefile
+++ b/x11-toolkits/py-xlib/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-xlib-${PORTVERSION}
 
 MAINTAINER=	mwm@mired.org
+COMMENT=	X11 library for Python
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/x11-toolkits/py-xlib/pkg-comment b/x11-toolkits/py-xlib/pkg-comment
deleted file mode 100644
index b2b2930b4045..000000000000
--- a/x11-toolkits/py-xlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 library for Python
diff --git a/x11-toolkits/qt-bluecurve-theme/Makefile b/x11-toolkits/qt-bluecurve-theme/Makefile
index 4f2ef1e991ce..dcf4dd2144e6 100644
--- a/x11-toolkits/qt-bluecurve-theme/Makefile
+++ b/x11-toolkits/qt-bluecurve-theme/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	8.0/en/os/i386/SRPMS
 DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 
 MAINTAINER=	rzheka@users.sourceforge.net
+COMMENT=	Bluecurve unified-look theme for QT3 from RedHat 8.0
 
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
 		libtool:${PORTSDIR}/devel/libtool
diff --git a/x11-toolkits/qt-bluecurve-theme/pkg-comment b/x11-toolkits/qt-bluecurve-theme/pkg-comment
deleted file mode 100644
index 177f51bbed6e..000000000000
--- a/x11-toolkits/qt-bluecurve-theme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bluecurve unified-look theme for QT3 from RedHat 8.0
diff --git a/x11-toolkits/qwt/Makefile b/x11-toolkits/qwt/Makefile
index dce6aad0778c..53eef6d4bae8 100644
--- a/x11-toolkits/qwt/Makefile
+++ b/x11-toolkits/qwt/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=qwt
 
 MAINTAINER=	bob@bomar.us
+COMMENT=	Qwt widget library for technical purposes
 
 USE_QT_VER=	3
 USE_BZIP2=	yes
diff --git a/x11-toolkits/qwt/pkg-comment b/x11-toolkits/qwt/pkg-comment
deleted file mode 100644
index b350a01e5d79..000000000000
--- a/x11-toolkits/qwt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Qwt widget library for technical purposes
diff --git a/x11-toolkits/qwt4/Makefile b/x11-toolkits/qwt4/Makefile
index dce6aad0778c..53eef6d4bae8 100644
--- a/x11-toolkits/qwt4/Makefile
+++ b/x11-toolkits/qwt4/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=qwt
 
 MAINTAINER=	bob@bomar.us
+COMMENT=	Qwt widget library for technical purposes
 
 USE_QT_VER=	3
 USE_BZIP2=	yes
diff --git a/x11-toolkits/qwt4/pkg-comment b/x11-toolkits/qwt4/pkg-comment
deleted file mode 100644
index b350a01e5d79..000000000000
--- a/x11-toolkits/qwt4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Qwt widget library for technical purposes
diff --git a/x11-toolkits/viewkit/Makefile b/x11-toolkits/viewkit/Makefile
index ec87942dc9ce..186b3c7d24b1 100644
--- a/x11-toolkits/viewkit/Makefile
+++ b/x11-toolkits/viewkit/Makefile
@@ -17,6 +17,7 @@ MASTER_SITE_SUBDIR=	fenner
 DISTNAME=       libvk-Apr19-2243
 
 MAINTAINER=	peterho@ned.dem.csiro.au
+COMMENT=	ViewKit workalike from Hungry Programmers
 
 BUILD_DEPENDS=   ${AUTOCONFIG}:${PORTSDIR}/devel/${AUTOCONFIG}
 
diff --git a/x11-toolkits/viewkit/pkg-comment b/x11-toolkits/viewkit/pkg-comment
deleted file mode 100644
index 96112c543d0f..000000000000
--- a/x11-toolkits/viewkit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ViewKit workalike from Hungry Programmers
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index be74934e07c5..58c6810901e4 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	xbae
 DISTNAME=	Xbae-${PORTVERSION}
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
+COMMENT=	A Motif-based widget which displays a grid of cells as a spreadsheet
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/xbae/pkg-comment b/x11-toolkits/xbae/pkg-comment
deleted file mode 100644
index b0f1deeca436..000000000000
--- a/x11-toolkits/xbae/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Motif-based widget which displays a grid of cells as a spreadsheet
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 5e7acfdd9c1f..cee83c5cee41 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-toolkits www
 MASTER_SITES=	http://www.xs4all.nl/~ripley/XmHTML/dist/
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
+COMMENT=	A Motif widget set for displaying HTML 3.2 documents
 
 # BUILD_DEPENDS is used instead of USE_LIBTOOL in order to avoid
 # GNU_CONFIGURE being set.
diff --git a/x11-toolkits/xmhtml/pkg-comment b/x11-toolkits/xmhtml/pkg-comment
deleted file mode 100644
index eaae1bc8148c..000000000000
--- a/x11-toolkits/xmhtml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Motif widget set for displaying HTML 3.2 documents
diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index d4a907aa6362..059fc7dedeea 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	stijn@win.tue.nl
+COMMENT=	Configurator for the Blackbox window manager
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/x11-wm/bbconf/pkg-comment b/x11-wm/bbconf/pkg-comment
deleted file mode 100644
index 0fb4e360b25a..000000000000
--- a/x11-wm/bbconf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Configurator for the Blackbox window manager
diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index 34f819a5ccaa..3ec40fffc27f 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	stijn@win.tue.nl
+COMMENT=	A keygrabber for the Blackbox window manager
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/bbkeys/pkg-comment b/x11-wm/bbkeys/pkg-comment
deleted file mode 100644
index cd6dec2493bb..000000000000
--- a/x11-wm/bbkeys/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A keygrabber for the Blackbox window manager
diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index ed61ef0fa610..795f131e2b42 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://bbtools.windsofstorm.net/sources/
 
 MAINTAINER=	stijn@win.tue.nl
+COMMENT=	A pager for the Blackbox window manager
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/bbpager/pkg-comment b/x11-wm/bbpager/pkg-comment
deleted file mode 100644
index 71306c864b48..000000000000
--- a/x11-wm/bbpager/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pager for the Blackbox window manager
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index 60fee03775a9..c592ae897c78 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	blackboxwm
 
 MAINTAINER=	stijn@win.tue.nl
+COMMENT=	A small and fast window manager for X11R6
 
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools
 
diff --git a/x11-wm/blackbox/pkg-comment b/x11-wm/blackbox/pkg-comment
deleted file mode 100644
index f19dc0187f91..000000000000
--- a/x11-wm/blackbox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small and fast window manager for X11R6
diff --git a/x11-wm/boxtools/Makefile b/x11-wm/boxtools/Makefile
index e49281e5976f..7bc3ac50540b 100644
--- a/x11-wm/boxtools/Makefile
+++ b/x11-wm/boxtools/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	blackboxwm
 DISTNAME=	blackbox-${PORTVERSION}
 
 MAINTAINER=	stijn@win.tue.nl
+COMMENT=	Style tools for the blackbox family of window managers
 
 MAN1=		bsetbg.1 bsetroot.1
 
diff --git a/x11-wm/boxtools/pkg-comment b/x11-wm/boxtools/pkg-comment
deleted file mode 100644
index 27a95a2c89fb..000000000000
--- a/x11-wm/boxtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Style tools for the blackbox family of window managers
diff --git a/x11-wm/fbdesk/Makefile b/x11-wm/fbdesk/Makefile
index 981505307aeb..4e466414e2f7 100644
--- a/x11-wm/fbdesk/Makefile
+++ b/x11-wm/fbdesk/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://fluxbox.sourceforge.net/download/
 
 MAINTAINER=	hendrik@scholz.net
+COMMENT=	A Fluxbox utility to create and manage icons on the desktop
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		Xft.2:${PORTSDIR}/x11-fonts/Xft
diff --git a/x11-wm/fbdesk/pkg-comment b/x11-wm/fbdesk/pkg-comment
deleted file mode 100644
index 2d5e1eff5ca5..000000000000
--- a/x11-wm/fbdesk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Fluxbox utility to create and manage icons on the desktop
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index b3b0695bcd38..bbcb67209bfe 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -19,6 +19,7 @@ PATCHFILES=	remember-0.1.14-4.gz
 .endif
 
 MAINTAINER=	hendrik@scholz.net
+COMMENT=	A small and fast window manager based on BlackBox
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
diff --git a/x11-wm/fluxbox-devel/pkg-comment b/x11-wm/fluxbox-devel/pkg-comment
deleted file mode 100644
index 545d4013ab93..000000000000
--- a/x11-wm/fluxbox-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small and fast window manager based on BlackBox
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index b3b0695bcd38..bbcb67209bfe 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -19,6 +19,7 @@ PATCHFILES=	remember-0.1.14-4.gz
 .endif
 
 MAINTAINER=	hendrik@scholz.net
+COMMENT=	A small and fast window manager based on BlackBox
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
diff --git a/x11-wm/fluxbox/pkg-comment b/x11-wm/fluxbox/pkg-comment
deleted file mode 100644
index 545d4013ab93..000000000000
--- a/x11-wm/fluxbox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small and fast window manager based on BlackBox
diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
index 361a9950875d..9401aaf93c95 100644
--- a/x11-wm/fluxconf/Makefile
+++ b/x11-wm/fluxconf/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://devaux.fabien.free.fr/flux/
 
 MAINTAINER=	hendrik@scholz.net
+COMMENT=	Fluxconf is a configuration program for the fluxbox window manager
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-wm/fluxconf/pkg-comment b/x11-wm/fluxconf/pkg-comment
deleted file mode 100644
index 690721f4138c..000000000000
--- a/x11-wm/fluxconf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fluxconf is a configuration program for the fluxbox window manager
diff --git a/x11-wm/fvwm-themes/Makefile b/x11-wm/fvwm-themes/Makefile
index 031db1d34591..c6da0549006c 100644
--- a/x11-wm/fvwm-themes/Makefile
+++ b/x11-wm/fvwm-themes/Makefile
@@ -15,6 +15,7 @@ DISTFILES=	fvwm-themes-base-${PORTVERSION}${EXTRACT_SUFX} \
 		fvwm-themes-extra-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	mkm@ieee.org
+COMMENT=	Themes for the Fvwm2 window manager
 
 BUILD_DEPENDS=	fvwm2:${PORTSDIR}/x11-wm/fvwm2 \
 		gm4:${PORTSDIR}/devel/m4
diff --git a/x11-wm/fvwm-themes/pkg-comment b/x11-wm/fvwm-themes/pkg-comment
deleted file mode 100644
index 3341606574a7..000000000000
--- a/x11-wm/fvwm-themes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Themes for the Fvwm2 window manager
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index 97865b48425c..bc2638399ff5 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -24,6 +24,7 @@ PATCH_SITE_SUBDIR=	sada
 PATCHFILES=	fvwm95-2.0.43a-Autoconf.I18N.diff.gz
 
 MAINTAINER=	ryo2@on.rim.or.jp
+COMMENT=	Win95 lookalike fvwm2 window manager with an I18N patch
 
 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-i18n/pkg-comment b/x11-wm/fvwm95-i18n/pkg-comment
deleted file mode 100644
index 4092967becc3..000000000000
--- a/x11-wm/fvwm95-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Win95 lookalike fvwm2 window manager with an I18N patch
diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index 0153bfb1d6e1..b5f73c49f1d1 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	fracture@allusion.net
+COMMENT=	Small window manager with themes and plugins
 
 .if defined(WANT_SOUND)
 LIB_DEPENDS=	esd.2:${PORTSDIR}/audio/esound
diff --git a/x11-wm/golem/pkg-comment b/x11-wm/golem/pkg-comment
deleted file mode 100644
index 6cfb13918622..000000000000
--- a/x11-wm/golem/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small window manager with themes and plugins
diff --git a/x11-wm/hackedbox/Makefile b/x11-wm/hackedbox/Makefile
index 158bfff688a6..a8b9699d55c5 100644
--- a/x11-wm/hackedbox/Makefile
+++ b/x11-wm/hackedbox/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://scrudgeware.org/downloads/hackedbox/
 
 MAINTAINER=	d.marks@student.umist.ac.uk
+COMMENT=	Hackedbox is a small and fast window manager based on Blackbox
 
 MAN1=		hackedbox.1
 DOCS=		AUTHORS ChangeLog INSTALL README TODO
diff --git a/x11-wm/hackedbox/pkg-comment b/x11-wm/hackedbox/pkg-comment
deleted file mode 100644
index ec914acdb80d..000000000000
--- a/x11-wm/hackedbox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hackedbox is a small and fast window manager based on Blackbox
diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile
index c33e7cd77bfe..930afa185462 100644
--- a/x11-wm/ion-2/Makefile
+++ b/x11-wm/ion-2/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.cs.tut.fi/~tuomov/dl/
 
 MAINTAINER=	ricci@cs.utah.edu
+COMMENT=	A window manager with a text-editorish, keyboard friendly interface
 
 MAN1=		ion.1x
 
diff --git a/x11-wm/ion-2/pkg-comment b/x11-wm/ion-2/pkg-comment
deleted file mode 100644
index da99ae290dd5..000000000000
--- a/x11-wm/ion-2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A window manager with a text-editorish, keyboard friendly interface
diff --git a/x11-wm/ion-devel/Makefile b/x11-wm/ion-devel/Makefile
index c33e7cd77bfe..930afa185462 100644
--- a/x11-wm/ion-devel/Makefile
+++ b/x11-wm/ion-devel/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.cs.tut.fi/~tuomov/dl/
 
 MAINTAINER=	ricci@cs.utah.edu
+COMMENT=	A window manager with a text-editorish, keyboard friendly interface
 
 MAN1=		ion.1x
 
diff --git a/x11-wm/ion-devel/pkg-comment b/x11-wm/ion-devel/pkg-comment
deleted file mode 100644
index da99ae290dd5..000000000000
--- a/x11-wm/ion-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A window manager with a text-editorish, keyboard friendly interface
diff --git a/x11-wm/ion/Makefile b/x11-wm/ion/Makefile
index c33e7cd77bfe..930afa185462 100644
--- a/x11-wm/ion/Makefile
+++ b/x11-wm/ion/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.cs.tut.fi/~tuomov/dl/
 
 MAINTAINER=	ricci@cs.utah.edu
+COMMENT=	A window manager with a text-editorish, keyboard friendly interface
 
 MAN1=		ion.1x
 
diff --git a/x11-wm/ion/pkg-comment b/x11-wm/ion/pkg-comment
deleted file mode 100644
index da99ae290dd5..000000000000
--- a/x11-wm/ion/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A window manager with a text-editorish, keyboard friendly interface
diff --git a/x11-wm/ion3/Makefile b/x11-wm/ion3/Makefile
index c33e7cd77bfe..930afa185462 100644
--- a/x11-wm/ion3/Makefile
+++ b/x11-wm/ion3/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.cs.tut.fi/~tuomov/dl/
 
 MAINTAINER=	ricci@cs.utah.edu
+COMMENT=	A window manager with a text-editorish, keyboard friendly interface
 
 MAN1=		ion.1x
 
diff --git a/x11-wm/ion3/pkg-comment b/x11-wm/ion3/pkg-comment
deleted file mode 100644
index da99ae290dd5..000000000000
--- a/x11-wm/ion3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A window manager with a text-editorish, keyboard friendly interface
diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile
index afc976c9bc8f..522ae66e6169 100644
--- a/x11-wm/kappdock/Makefile
+++ b/x11-wm/kappdock/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}-0.46-1
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.46
 
 MAINTAINER=	jeremy@external.org
+COMMENT=	A dock-like applet for KDE3
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
diff --git a/x11-wm/kappdock/pkg-comment b/x11-wm/kappdock/pkg-comment
deleted file mode 100644
index 909c77baa1ab..000000000000
--- a/x11-wm/kappdock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dock-like applet for KDE3
diff --git a/x11-wm/larswm/Makefile b/x11-wm/larswm/Makefile
index 43f132058440..869bee493305 100644
--- a/x11-wm/larswm/Makefile
+++ b/x11-wm/larswm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://www-personal.umich.edu/~larsb/larswm/
 
 MAINTAINER=	lab@fnurt.net
+COMMENT=	Tiling Window Manager for X
 
 USE_IMAKE=	yes
 
diff --git a/x11-wm/larswm/pkg-comment b/x11-wm/larswm/pkg-comment
deleted file mode 100644
index 7dc4086cf4e0..000000000000
--- a/x11-wm/larswm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tiling Window Manager for X
diff --git a/x11-wm/mkultra/Makefile b/x11-wm/mkultra/Makefile
index ea852cc83d39..23b67dd72f41 100644
--- a/x11-wm/mkultra/Makefile
+++ b/x11-wm/mkultra/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.kde-look.org/content/files/
 DISTNAME=	2865-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	flynn@energyhq.homeip.net
+COMMENT=	A lightweight native KWin style for KDE3
 
 BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake \
 		autoconf:${PORTSDIR}/devel/autoconf
diff --git a/x11-wm/mkultra/pkg-comment b/x11-wm/mkultra/pkg-comment
deleted file mode 100644
index 0dea9dbb1fdf..000000000000
--- a/x11-wm/mkultra/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight native KWin style for KDE3
diff --git a/x11-wm/oroborus/Makefile b/x11-wm/oroborus/Makefile
index 7f67555cbb85..e176d4549606 100644
--- a/x11-wm/oroborus/Makefile
+++ b/x11-wm/oroborus/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.dreamind.de/debian/dists/sid/main/source/x11/ \
 DISTNAME=	${PORTNAME}_${PORTVERSION}-1
 
 MAINTAINER=	matt@peterson.org
+COMMENT=	A small and simple GNOME-compatible window manager
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/x11-wm/oroborus/pkg-comment b/x11-wm/oroborus/pkg-comment
deleted file mode 100644
index 6e44bffa48a9..000000000000
--- a/x11-wm/oroborus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small and simple GNOME-compatible window manager
diff --git a/x11-wm/plwm/Makefile b/x11-wm/plwm/Makefile
index 661134bc61a9..4a0123d62d4e 100644
--- a/x11-wm/plwm/Makefile
+++ b/x11-wm/plwm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mwm@mired.org
+COMMENT=	A window manager construction kit
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
diff --git a/x11-wm/plwm/pkg-comment b/x11-wm/plwm/pkg-comment
deleted file mode 100644
index 1d680a4a0b9c..000000000000
--- a/x11-wm/plwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A window manager construction kit
diff --git a/x11-wm/qinx/Makefile b/x11-wm/qinx/Makefile
index e694502e59cb..2596f57a8996 100644
--- a/x11-wm/qinx/Makefile
+++ b/x11-wm/qinx/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm kde
 MASTER_SITES=	http://www.usermode.org/code/
 
 MAINTAINER=	david@usermode.org
+COMMENT=	A QNX Photon like window decoration and widget style for KDE
 
 USE_KDEBASE_VER=3
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/qinx/pkg-comment b/x11-wm/qinx/pkg-comment
deleted file mode 100644
index a286c828fbb7..000000000000
--- a/x11-wm/qinx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A QNX Photon like window decoration and widget style for KDE
diff --git a/x11-wm/ratmenu/Makefile b/x11-wm/ratmenu/Makefile
index fe619fb32211..eaad562c983e 100644
--- a/x11-wm/ratmenu/Makefile
+++ b/x11-wm/ratmenu/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.mired.org/downloads/
 
 MAINTAINER=	mwm@mired.org
+COMMENT=	A simple menu patterened for use with ratpoison
 
 USE_X_PREFIX=	yes
 ALL_TARGET=	ratmenu
diff --git a/x11-wm/ratmenu/pkg-comment b/x11-wm/ratmenu/pkg-comment
deleted file mode 100644
index c2924dd63f89..000000000000
--- a/x11-wm/ratmenu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple menu patterened for use with ratpoison
diff --git a/x11-wm/ratpoison/Makefile b/x11-wm/ratpoison/Makefile
index 31824de9e93b..38f1e5c5e73d 100644
--- a/x11-wm/ratpoison/Makefile
+++ b/x11-wm/ratpoison/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	storrsjm@email.uc.edu
+COMMENT=	Simple window manager with no fat library dependencies
 
 MAN1=		ratpoison.1
 USE_X_PREFIX=	yes
diff --git a/x11-wm/ratpoison/pkg-comment b/x11-wm/ratpoison/pkg-comment
deleted file mode 100644
index ce1f2b63252c..000000000000
--- a/x11-wm/ratpoison/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple window manager with no fat library dependencies
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index c4ac785ac863..8e23ddb7b224 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	waimea
 
 MAINTAINER=	danfe@regency.nsu.ru
+COMMENT=	An X11 window manager designed for maximum efficiency
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 
diff --git a/x11-wm/waimea/pkg-comment b/x11-wm/waimea/pkg-comment
deleted file mode 100644
index c7b52ee570b3..000000000000
--- a/x11-wm/waimea/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 window manager designed for maximum efficiency
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index c1fa9ada99dc..5b22f46e7a99 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://ulli.on.openave.net/wmakerconf/
 
 MAINTAINER=	nc-rotherdo@netcologne.de
+COMMENT=	A configuration tool for Window Maker
 
 RUN_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 .if !exists(/usr/bin/bzip2)
diff --git a/x11-wm/wmakerconf/pkg-comment b/x11-wm/wmakerconf/pkg-comment
deleted file mode 100644
index 289dd7128a53..000000000000
--- a/x11-wm/wmakerconf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A configuration tool for Window Maker
diff --git a/x11-wm/wmthemeinstall/Makefile b/x11-wm/wmthemeinstall/Makefile
index 44fcf60afbfb..0767b235787d 100644
--- a/x11-wm/wmthemeinstall/Makefile
+++ b/x11-wm/wmthemeinstall/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.jeremias.net/wmthemeinstall/download/
 
 MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	A neat theme manager for WindowMaker
 
 RUN_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
 
diff --git a/x11-wm/wmthemeinstall/pkg-comment b/x11-wm/wmthemeinstall/pkg-comment
deleted file mode 100644
index 1890910eeb68..000000000000
--- a/x11-wm/wmthemeinstall/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A neat theme manager for WindowMaker
diff --git a/x11-wm/wmx/Makefile b/x11-wm/wmx/Makefile
index f9a9b6b6a460..731a9c71ca33 100644
--- a/x11-wm/wmx/Makefile
+++ b/x11-wm/wmx/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.42.org/pub/wmx/ \
 DISTNAME=	${PORTNAME}-5sec6
 
 MAINTAINER=	sec@42.org
+COMMENT=	Extended version of wm2 - A simple window manager for X
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11-wm/wmx/pkg-comment b/x11-wm/wmx/pkg-comment
deleted file mode 100644
index a27feadebada..000000000000
--- a/x11-wm/wmx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extended version of wm2 - A simple window manager for X
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 981505307aeb..4e466414e2f7 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://fluxbox.sourceforge.net/download/
 
 MAINTAINER=	hendrik@scholz.net
+COMMENT=	A Fluxbox utility to create and manage icons on the desktop
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		Xft.2:${PORTSDIR}/x11-fonts/Xft
diff --git a/x11/fbdesk/pkg-comment b/x11/fbdesk/pkg-comment
deleted file mode 100644
index 2d5e1eff5ca5..000000000000
--- a/x11/fbdesk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Fluxbox utility to create and manage icons on the desktop