Clear moonlight beckons.

Requiem mors pacem pkg-comment, And be calm ports tree. E Nomini Patri, E Fili, E Spiritu Sancti.
author: Ade Lovett <ade@FreeBSD.org> 2003-03-07 06:36:20 +0000
committer: Ade Lovett <ade@FreeBSD.org> 2003-03-07 06:36:20 +0000
commit: 3195b6f71c9c4bf646bb409fd265132f3dd359d7 (patch)
tree: 546dd6e2e7a43531e8dc0884dc602d3e0d179571 /x11
parent: Cleaning up after the wonders of remote cvs (diff)
172 files changed, 86 insertions, 86 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 1752afac36d8..93e70776faa1 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -20,6 +20,7 @@ PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
 PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
 
 MAINTAINER=	anholt@freebsd.org
+COMMENT=	XFree86-4 Client environments
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		GLU.1:${PORTSDIR}/x11/XFree86-4-libraries \
diff --git a/x11/XFree86-4-clients/pkg-comment b/x11/XFree86-4-clients/pkg-comment
deleted file mode 100644
index 7da1ae3cf089..000000000000
--- a/x11/XFree86-4-clients/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 Client environments
diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index 711cd580cef9..0ac55f40a512 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -15,6 +15,7 @@ DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz X${PORTVERSION:S/.//g}src-2.tgz X${PO
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-2.tgz X${PORTVERSION:S/.//g}src-3.tgz
 
 MAINTAINER=	anholt@freebsd.org
+COMMENT=	XFree86-4 Document Files
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
diff --git a/x11/XFree86-4-documents/pkg-comment b/x11/XFree86-4-documents/pkg-comment
deleted file mode 100644
index 78e19cb3dffb..000000000000
--- a/x11/XFree86-4-documents/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 Document Files
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 0d7361907189..b6929fe67969 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -23,6 +23,7 @@ PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
 PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
 
 MAINTAINER=	anholt@freebsd.org
+COMMENT=	XFree86-4 include/(shared) library kit
 
 BUILD_DEPENDS=	${X11BASE}/lib/X11/config/version.def:${PORTSDIR}/devel/imake-4
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
diff --git a/x11/XFree86-4-libraries/pkg-comment b/x11/XFree86-4-libraries/pkg-comment
deleted file mode 100644
index e6a9bc44da9d..000000000000
--- a/x11/XFree86-4-libraries/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 include/(shared) library kit
diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index 53c9fae9ff8e..194f6eb641e1 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX=	XFree86-
 DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
 
 MAINTAINER=	anholt@freebsd.org
+COMMENT=	XFree86-4 man pages
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
diff --git a/x11/XFree86-4-manuals/pkg-comment b/x11/XFree86-4-manuals/pkg-comment
deleted file mode 100644
index 2c3233fb5c49..000000000000
--- a/x11/XFree86-4-manuals/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 man pages
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 58b609b83f0e..1cac1913f40c 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -28,6 +28,7 @@ RUN_DEPENDS=	xvinfo:${PORTSDIR}/x11/XFree86-4-clients \
 
 
 MAINTAINER=	anholt@FreeBSD.org
+COMMENT=	X11/XFree86 core distribution (complete, using mini/meta-ports)
 
 NO_BUILD=	yes
 LATEST_LINK=	XFree86
diff --git a/x11/XFree86-4/pkg-comment b/x11/XFree86-4/pkg-comment
deleted file mode 100644
index 381c4aa37b61..000000000000
--- a/x11/XFree86-4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11/XFree86 core distribution (complete, using mini/meta-ports)
diff --git a/x11/XFree86-contrib/Makefile b/x11/XFree86-contrib/Makefile
index e84f8fa7cdf3..299a5b6f8770 100644
--- a/x11/XFree86-contrib/Makefile
+++ b/x11/XFree86-contrib/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	X336contrib
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
+COMMENT=	XFree86 contrib programs
 
 # Define FORCE_PACKAGE from the command line if you want to override
 # this and build a package
diff --git a/x11/XFree86-contrib/pkg-comment b/x11/XFree86-contrib/pkg-comment
deleted file mode 100644
index 89249ff71f50..000000000000
--- a/x11/XFree86-contrib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86 contrib programs
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 60c6cb50d758..28e021b0b2e7 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -20,6 +20,7 @@ PATCH_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,jmz,g}
 PATCHFILES=	3.3.6-3.3.6a.diffs.gz
 
 MAINTAINER=	jmz@FreeBSD.org
+COMMENT=	X11R6.3/XFree86 core distribution
 
 LATEST_LINK=	XFree86-3
 WRKSRC=		${WRKDIR}/${DIST_SUBDIR}
diff --git a/x11/XFree86/pkg-comment b/x11/XFree86/pkg-comment
deleted file mode 100644
index 0ce81cd663de..000000000000
--- a/x11/XFree86/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11R6.3/XFree86 core distribution
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 167470ad9c58..e4a487bc6c37 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jim@FreeBSD.org
+COMMENT=	A color vt102 terminal emulator with transparency support
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
diff --git a/x11/aterm/pkg-comment b/x11/aterm/pkg-comment
deleted file mode 100644
index 51dd2923467d..000000000000
--- a/x11/aterm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A color vt102 terminal emulator with transparency support
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index c5c9c6da44de..d2c85c00e443 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.hut.fi/~pvsavola/files/
 
 MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	A GTK+ based program that lets you edit you XFree86 mouse cursors
 
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
 
diff --git a/x11/decurs/pkg-comment b/x11/decurs/pkg-comment
deleted file mode 100644
index 018ae8348beb..000000000000
--- a/x11/decurs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ based program that lets you edit you XFree86 mouse cursors
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 036afd4507dd..248e5122f77d 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	dgs
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	A display ghostscript system
 
 LIB_DEPENDS= 	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
diff --git a/x11/dgs/pkg-comment b/x11/dgs/pkg-comment
deleted file mode 100644
index 11f9603ff335..000000000000
--- a/x11/dgs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A display ghostscript system
diff --git a/x11/ebuttons/Makefile b/x11/ebuttons/Makefile
index 03d36a216654..019303314e0f 100644
--- a/x11/ebuttons/Makefile
+++ b/x11/ebuttons/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.moodfarm.demon.co.uk/download/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jhb@FreeBSD.org
+COMMENT=	A simple epplet that contains several buttons used to launch programs
 
 LIB_DEPENDS=	epplet.1:${PORTSDIR}/x11-wm/epplets
 
diff --git a/x11/ebuttons/pkg-comment b/x11/ebuttons/pkg-comment
deleted file mode 100644
index 6bcc3ec047e8..000000000000
--- a/x11/ebuttons/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple epplet that contains several buttons used to launch programs
diff --git a/x11/efancylauncher/Makefile b/x11/efancylauncher/Makefile
index 08d5f6c43300..7e336de5e927 100644
--- a/x11/efancylauncher/Makefile
+++ b/x11/efancylauncher/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://user.it.uu.se/~adavid/Epplets/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jhb@FreeBSD.org
+COMMENT=	A flexible and easily configurable button bar for Enlightenment
 
 LIB_DEPENDS=	epplet.1:${PORTSDIR}/x11-wm/epplets	# XXX
 
diff --git a/x11/efancylauncher/pkg-comment b/x11/efancylauncher/pkg-comment
deleted file mode 100644
index cfa2da85603e..000000000000
--- a/x11/efancylauncher/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A flexible and easily configurable button bar for Enlightenment
diff --git a/x11/emu/Makefile b/x11/emu/Makefile
index 8af8b5642c88..ed02af4a74a2 100644
--- a/x11/emu/Makefile
+++ b/x11/emu/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	me@FreeBSD.org
+COMMENT=	A terminal emulator for the X Window System
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/emu
diff --git a/x11/emu/pkg-comment b/x11/emu/pkg-comment
deleted file mode 100644
index 013bee55e2a6..000000000000
--- a/x11/emu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A terminal emulator for the X Window System
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index efe336f36253..ab2a935810fe 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kbyanc
 
 MAINTAINER=	kbyanc@posi.net
+COMMENT=	A simple epplet for launching arbitrary programs
 
 LIB_DEPENDS=	epplet.1:${PORTSDIR}/x11-wm/libepplet
 
diff --git a/x11/erun/pkg-comment b/x11/erun/pkg-comment
deleted file mode 100644
index 128a5b198944..000000000000
--- a/x11/erun/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple epplet for launching arbitrary programs
diff --git a/x11/eweather/Makefile b/x11/eweather/Makefile
index c23442dea9f5..fb1d39b67150 100644
--- a/x11/eweather/Makefile
+++ b/x11/eweather/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://pfnet.org/~cy/
 
 MAINTAINER=	jhb@FreeBSD.org
+COMMENT=	Weather epplet for Enlightenment similar to wmWeather
 
 RUN_DEPENDS=	GrabWeather:${PORTSDIR}/misc/wmweather
 LIB_DEPENDS=	epplet.1:${PORTSDIR}/x11-wm/epplets
diff --git a/x11/eweather/pkg-comment b/x11/eweather/pkg-comment
deleted file mode 100644
index a31c99e25721..000000000000
--- a/x11/eweather/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Weather epplet for Enlightenment similar to wmWeather
diff --git a/x11/finder/Makefile b/x11/finder/Makefile
index c9967edb447b..be53f9c50449 100644
--- a/x11/finder/Makefile
+++ b/x11/finder/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11 gnome
 MASTER_SITES=	http://lfh.hkcampus.net/~lfh-lck/programs/finder/
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	A small program that creates a finder bar on your Gnome system
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11/finder/pkg-comment b/x11/finder/pkg-comment
deleted file mode 100644
index 3312d81c0fec..000000000000
--- a/x11/finder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small program that creates a finder bar on your Gnome system
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d2a282f2c0e5..f0e74c2b2c12 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=		sources/gdm/2.2
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME version of xdm display manager
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/gdm/pkg-comment b/x11/gdm/pkg-comment
deleted file mode 100644
index f14f12f39ea0..000000000000
--- a/x11/gdm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME version of xdm display manager
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 1471cf2cc960..9decd8821746 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gdm-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME 2.0 version of xdm display manager
 
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
 		rsvg-2.4:${PORTSDIR}/graphics/librsvg2
diff --git a/x11/gdm2/pkg-comment b/x11/gdm2/pkg-comment
deleted file mode 100644
index cd5640b89cf3..000000000000
--- a/x11/gdm2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 version of xdm display manager
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index 6d314ae44f3f..749254462997 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	A customizable program to run programs, with tab-completion
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 
diff --git a/x11/gmrun/pkg-comment b/x11/gmrun/pkg-comment
deleted file mode 100644
index a422ad34b558..000000000000
--- a/x11/gmrun/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A customizable program to run programs, with tab-completion
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 13d2de49c425..477cccd0c031 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Applets components for the Gnome 2.0 Desktop Environment
 
 LIB_DEPENDS=	panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
 		gailutil.17:${PORTSDIR}/x11-toolkits/gail \
diff --git a/x11/gnome-applets/pkg-comment b/x11/gnome-applets/pkg-comment
deleted file mode 100644
index 7c21c7621f84..000000000000
--- a/x11/gnome-applets/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Applets components for the Gnome 2.0 Desktop Environment
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 8f1c292a4c49..e52b579c5693 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Additional UI API for GNOME 2.0
 
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
diff --git a/x11/gnome-desktop/pkg-comment b/x11/gnome-desktop/pkg-comment
deleted file mode 100644
index 98a49b89d936..000000000000
--- a/x11/gnome-desktop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional UI API for GNOME 2.0
diff --git a/x11/gnome-fifth-toe/Makefile b/x11/gnome-fifth-toe/Makefile
index 608bc69f9235..2625763cb0bf 100644
--- a/x11/gnome-fifth-toe/Makefile
+++ b/x11/gnome-fifth-toe/Makefile
@@ -14,6 +14,7 @@ DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The "meta-port" for the GNOME "Fifth-Toe" extra package set
 
 RUN_DEPENDS=	gabber:${PORTSDIR}/net/gabber \
 		galeon:${PORTSDIR}/www/galeon \
diff --git a/x11/gnome-fifth-toe/pkg-comment b/x11/gnome-fifth-toe/pkg-comment
deleted file mode 100644
index 76f066e9d170..000000000000
--- a/x11/gnome-fifth-toe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for the GNOME "Fifth-Toe" extra package set
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 5506f95e18a3..fa7fa20cf988 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	gnome-libs-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER?=	gnome@FreeBSD.org
+COMMENT=	Libraries for GNOME, a GNU desktop environment
 
 BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
diff --git a/x11/gnome-libs/pkg-comment b/x11/gnome-libs/pkg-comment
deleted file mode 100644
index bfd0b5184236..000000000000
--- a/x11/gnome-libs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Libraries for GNOME, a GNU desktop environment
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index c85e051b8d61..87bd6d503664 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Panel component for the GNOME 2.0 Desktop
 
 LIB_DEPENDS=	wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck \
 		gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop
diff --git a/x11/gnome-panel/pkg-comment b/x11/gnome-panel/pkg-comment
deleted file mode 100644
index 6cb423fbf296..000000000000
--- a/x11/gnome-panel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Panel component for the GNOME 2.0 Desktop
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index b18a2db68a72..bd607a331673 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Session component for the GNOME 2.0 desktop
 
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
diff --git a/x11/gnome-session/pkg-comment b/x11/gnome-session/pkg-comment
deleted file mode 100644
index 5b45249d18d9..000000000000
--- a/x11/gnome-session/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Session component for the GNOME 2.0 desktop
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index b555f0146410..20b1807bb831 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Terminal component for the GNOME 2.0 Desktop
 
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
diff --git a/x11/gnome-terminal/pkg-comment b/x11/gnome-terminal/pkg-comment
deleted file mode 100644
index c6ad4a4a6710..000000000000
--- a/x11/gnome-terminal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Terminal component for the GNOME 2.0 Desktop
diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile
index 5bb8ef3802e0..2e394462b81c 100644
--- a/x11/gnome/Makefile
+++ b/x11/gnome/Makefile
@@ -14,6 +14,7 @@ DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The "meta-port" for the GNOME integrated X11 desktop
 
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
 		gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \
diff --git a/x11/gnome/pkg-comment b/x11/gnome/pkg-comment
deleted file mode 100644
index c4330c2b9fbc..000000000000
--- a/x11/gnome/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for the GNOME integrated X11 desktop
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index db83f68e6483..10a636f347e5 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -13,6 +13,7 @@ DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The "meta-port" for the GNOME 2 integrated X11 desktop
 
 RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
diff --git a/x11/gnome2/pkg-comment b/x11/gnome2/pkg-comment
deleted file mode 100644
index a72e3996c5ff..000000000000
--- a/x11/gnome2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for the GNOME 2 integrated X11 desktop
diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile
index bc283f3334c0..26c7bbe1bd11 100644
--- a/x11/gnomeapplets/Makefile
+++ b/x11/gnomeapplets/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	sources/gnome-applets/1.4
 DISTNAME=	gnome-applets-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Applets components for the Gnome Desktop Environment
 
 LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
 
diff --git a/x11/gnomeapplets/pkg-comment b/x11/gnomeapplets/pkg-comment
deleted file mode 100644
index c3b7d33632d0..000000000000
--- a/x11/gnomeapplets/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Applets components for the Gnome Desktop Environment
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 13d2de49c425..477cccd0c031 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Applets components for the Gnome 2.0 Desktop Environment
 
 LIB_DEPENDS=	panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
 		gailutil.17:${PORTSDIR}/x11-toolkits/gail \
diff --git a/x11/gnomeapplets2/pkg-comment b/x11/gnomeapplets2/pkg-comment
deleted file mode 100644
index 7c21c7621f84..000000000000
--- a/x11/gnomeapplets2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Applets components for the Gnome 2.0 Desktop Environment
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 204d7eb5ed0a..4b92740e0653 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gnome-core-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER?=	gnome@FreeBSD.org
+COMMENT=	Core component for the Gnome Desktop Environment
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/gnomecore/pkg-comment b/x11/gnomecore/pkg-comment
deleted file mode 100644
index 83e7799e1157..000000000000
--- a/x11/gnomecore/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Core component for the Gnome Desktop Environment
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 8f1c292a4c49..e52b579c5693 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Additional UI API for GNOME 2.0
 
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
diff --git a/x11/gnomedesktop/pkg-comment b/x11/gnomedesktop/pkg-comment
deleted file mode 100644
index 98a49b89d936..000000000000
--- a/x11/gnomedesktop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional UI API for GNOME 2.0
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 5506f95e18a3..fa7fa20cf988 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	gnome-libs-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER?=	gnome@FreeBSD.org
+COMMENT=	Libraries for GNOME, a GNU desktop environment
 
 BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
diff --git a/x11/gnomelibs/pkg-comment b/x11/gnomelibs/pkg-comment
deleted file mode 100644
index bfd0b5184236..000000000000
--- a/x11/gnomelibs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Libraries for GNOME, a GNU desktop environment
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index c85e051b8d61..87bd6d503664 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Panel component for the GNOME 2.0 Desktop
 
 LIB_DEPENDS=	wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck \
 		gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop
diff --git a/x11/gnomepanel/pkg-comment b/x11/gnomepanel/pkg-comment
deleted file mode 100644
index 6cb423fbf296..000000000000
--- a/x11/gnomepanel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Panel component for the GNOME 2.0 Desktop
diff --git a/x11/gnomeres_applet/Makefile b/x11/gnomeres_applet/Makefile
index 1cee4f296e10..167327f94782 100644
--- a/x11/gnomeres_applet/Makefile
+++ b/x11/gnomeres_applet/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.sci.fi/~syrjala/gnomeres/
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	A GNOME applet for changing display modes
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
diff --git a/x11/gnomeres_applet/pkg-comment b/x11/gnomeres_applet/pkg-comment
deleted file mode 100644
index e2e7abefe3f0..000000000000
--- a/x11/gnomeres_applet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME applet for changing display modes
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index b18a2db68a72..bd607a331673 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Session component for the GNOME 2.0 desktop
 
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
diff --git a/x11/gnomesession/pkg-comment b/x11/gnomesession/pkg-comment
deleted file mode 100644
index 5b45249d18d9..000000000000
--- a/x11/gnomesession/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Session component for the GNOME 2.0 desktop
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index b555f0146410..20b1807bb831 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Terminal component for the GNOME 2.0 Desktop
 
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
diff --git a/x11/gnometerminal/pkg-comment b/x11/gnometerminal/pkg-comment
deleted file mode 100644
index c6ad4a4a6710..000000000000
--- a/x11/gnometerminal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Terminal component for the GNOME 2.0 Desktop
diff --git a/x11/gswitchit/Makefile b/x11/gswitchit/Makefile
index 4d365a3a623d..421a12d7f2a7 100644
--- a/x11/gswitchit/Makefile
+++ b/x11/gswitchit/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	A simple keyboard state indicator and switcher for GNOME Desktop
 
 LIB_DEPENDS=	xklavier.0:${PORTSDIR}/x11/libxklavier
 RUN_DEPENDS=	${X11BASE}/lib/X11/xkb/rules/xfree86.xml:${PORTSDIR}/x11/xfree86_xkb_xml
diff --git a/x11/gswitchit/pkg-comment b/x11/gswitchit/pkg-comment
deleted file mode 100644
index 76bc502b2353..000000000000
--- a/x11/gswitchit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple keyboard state indicator and switcher for GNOME Desktop
diff --git a/x11/gswitchit_applet/Makefile b/x11/gswitchit_applet/Makefile
index 4d365a3a623d..421a12d7f2a7 100644
--- a/x11/gswitchit_applet/Makefile
+++ b/x11/gswitchit_applet/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	A simple keyboard state indicator and switcher for GNOME Desktop
 
 LIB_DEPENDS=	xklavier.0:${PORTSDIR}/x11/libxklavier
 RUN_DEPENDS=	${X11BASE}/lib/X11/xkb/rules/xfree86.xml:${PORTSDIR}/x11/xfree86_xkb_xml
diff --git a/x11/gswitchit_applet/pkg-comment b/x11/gswitchit_applet/pkg-comment
deleted file mode 100644
index 76bc502b2353..000000000000
--- a/x11/gswitchit_applet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple keyboard state indicator and switcher for GNOME Desktop
diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile
index 66b2c2b39649..56a48f2f565c 100644
--- a/x11/gtk-theme-switch/Makefile
+++ b/x11/gtk-theme-switch/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.muhri.net/
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	A command line tool for switching GTK+ themes
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11/gtk-theme-switch/pkg-comment b/x11/gtk-theme-switch/pkg-comment
deleted file mode 100644
index ea093ac393f3..000000000000
--- a/x11/gtk-theme-switch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command line tool for switching GTK+ themes
diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile
index 66b2c2b39649..56a48f2f565c 100644
--- a/x11/gtk-theme-switch2/Makefile
+++ b/x11/gtk-theme-switch2/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.muhri.net/
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	A command line tool for switching GTK+ themes
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11/gtk-theme-switch2/pkg-comment b/x11/gtk-theme-switch2/pkg-comment
deleted file mode 100644
index ea093ac393f3..000000000000
--- a/x11/gtk-theme-switch2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command line tool for switching GTK+ themes
diff --git a/x11/gyroscope/Makefile b/x11/gyroscope/Makefile
index 0e7a00685dc0..89f4abe80751 100644
--- a/x11/gyroscope/Makefile
+++ b/x11/gyroscope/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://soupnazi.org/FreeBSD/ports/distfiles/
 
 MAINTAINER=	jim@FreeBSD.org
+COMMENT=	HTML color picker written using GTK
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/x11/gyroscope/pkg-comment b/x11/gyroscope/pkg-comment
deleted file mode 100644
index 8d3ce0290ae4..000000000000
--- a/x11/gyroscope/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML color picker written using GTK
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index 596c03d733e5..84f100cbe043 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 
 MAINTAINER=	sada@FreeBSD.org
+COMMENT=	Redirect any key to second mouse button
 
 USE_IMAKE=	yes
 
diff --git a/x11/kb2mb2/pkg-comment b/x11/kb2mb2/pkg-comment
deleted file mode 100644
index a441c126fc06..000000000000
--- a/x11/kb2mb2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Redirect any key to second mouse button
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index d9553204578f..4ee1d74f552b 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -14,6 +14,7 @@ DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	The "meta-port" for KDE
 
 RUN_DEPENDS+=	kjumpingcube:${PORTSDIR}/games/kdegames3 \
 		kdessh:${PORTSDIR}/misc/kdeutils3 \
diff --git a/x11/kde3/pkg-comment b/x11/kde3/pkg-comment
deleted file mode 100644
index 116b1bc848b5..000000000000
--- a/x11/kde3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for KDE
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 9229fcfd5f07..3fe945cc9002 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	This package provides the basic applications for the KDE system
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
diff --git a/x11/kde4-baseapps/pkg-comment b/x11/kde4-baseapps/pkg-comment
deleted file mode 100644
index 97d352251a71..000000000000
--- a/x11/kde4-baseapps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This package provides the basic applications for the KDE system
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 9229fcfd5f07..3fe945cc9002 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	This package provides the basic applications for the KDE system
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
diff --git a/x11/kde4-runtime/pkg-comment b/x11/kde4-runtime/pkg-comment
deleted file mode 100644
index 97d352251a71..000000000000
--- a/x11/kde4-runtime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This package provides the basic applications for the KDE system
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 9229fcfd5f07..3fe945cc9002 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	This package provides the basic applications for the KDE system
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
diff --git a/x11/kde4-workspace/pkg-comment b/x11/kde4-workspace/pkg-comment
deleted file mode 100644
index 97d352251a71..000000000000
--- a/x11/kde4-workspace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This package provides the basic applications for the KDE system
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index d9553204578f..4ee1d74f552b 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -14,6 +14,7 @@ DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	The "meta-port" for KDE
 
 RUN_DEPENDS+=	kjumpingcube:${PORTSDIR}/games/kdegames3 \
 		kdessh:${PORTSDIR}/misc/kdeutils3 \
diff --git a/x11/kde4/pkg-comment b/x11/kde4/pkg-comment
deleted file mode 100644
index 116b1bc848b5..000000000000
--- a/x11/kde4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for KDE
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 9229fcfd5f07..3fe945cc9002 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	This package provides the basic applications for the KDE system
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
diff --git a/x11/kdebase3/pkg-comment b/x11/kdebase3/pkg-comment
deleted file mode 100644
index 97d352251a71..000000000000
--- a/x11/kdebase3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This package provides the basic applications for the KDE system
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 9229fcfd5f07..3fe945cc9002 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	This package provides the basic applications for the KDE system
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
diff --git a/x11/kdebase4-runtime/pkg-comment b/x11/kdebase4-runtime/pkg-comment
deleted file mode 100644
index 97d352251a71..000000000000
--- a/x11/kdebase4-runtime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This package provides the basic applications for the KDE system
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 9229fcfd5f07..3fe945cc9002 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	This package provides the basic applications for the KDE system
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
diff --git a/x11/kdebase4-workspace/pkg-comment b/x11/kdebase4-workspace/pkg-comment
deleted file mode 100644
index 97d352251a71..000000000000
--- a/x11/kdebase4-workspace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This package provides the basic applications for the KDE system
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 9229fcfd5f07..3fe945cc9002 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	This package provides the basic applications for the KDE system
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
diff --git a/x11/kdebase4/pkg-comment b/x11/kdebase4/pkg-comment
deleted file mode 100644
index 97d352251a71..000000000000
--- a/x11/kdebase4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This package provides the basic applications for the KDE system
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 8d1b26df7345..53e55c1055e1 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	This is the base set of libraries needed by KDE programs
 
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/x11/kdelibs3/pkg-comment b/x11/kdelibs3/pkg-comment
deleted file mode 100644
index 991902d7e999..000000000000
--- a/x11/kdelibs3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This is the base set of libraries needed by KDE programs
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 8d1b26df7345..53e55c1055e1 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	This is the base set of libraries needed by KDE programs
 
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/x11/kdelibs4/pkg-comment b/x11/kdelibs4/pkg-comment
deleted file mode 100644
index 991902d7e999..000000000000
--- a/x11/kdelibs4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This is the base set of libraries needed by KDE programs
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
index d3966be96bc7..3b57d30228e8 100644
--- a/x11/libcapplet/Makefile
+++ b/x11/libcapplet/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://people.freebsd.org/~sobomax/
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A library for writing custom applets for GNOME Control Center
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/libcapplet/pkg-comment b/x11/libcapplet/pkg-comment
deleted file mode 100644
index 16e2bd987fdd..000000000000
--- a/x11/libcapplet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for writing custom applets for GNOME Control Center
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 02af321003bc..20f402817224 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
+COMMENT=	Libraries for GNOME, a GNU desktop environment
 
 BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 LIB_DEPENDS+=	xslt.1:${PORTSDIR}/textproc/libxslt \
diff --git a/x11/libgnome/pkg-comment b/x11/libgnome/pkg-comment
deleted file mode 100644
index bfd0b5184236..000000000000
--- a/x11/libgnome/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Libraries for GNOME, a GNU desktop environment
diff --git a/x11/libpanel/Makefile b/x11/libpanel/Makefile
index 755d4c9ab6e2..7f83f8fa555d 100644
--- a/x11/libpanel/Makefile
+++ b/x11/libpanel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://people.freebsd.org/~sobomax/
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A library for writing custom applets for GNOME Panel
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/libpanel/pkg-comment b/x11/libpanel/pkg-comment
deleted file mode 100644
index d9898111e495..000000000000
--- a/x11/libpanel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for writing custom applets for GNOME Panel
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 549def1b5cd1..0f910637057e 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	An utility library to make XKB stuff easier
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
diff --git a/x11/libxklavier/pkg-comment b/x11/libxklavier/pkg-comment
deleted file mode 100644
index 239a1ea38cf5..000000000000
--- a/x11/libxklavier/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An utility library to make XKB stuff easier
diff --git a/x11/linux-xalf/Makefile b/x11/linux-xalf/Makefile
index 9e487d1d7f20..ea1408c54a3e 100644
--- a/x11/linux-xalf/Makefile
+++ b/x11/linux-xalf/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX=	linux-
 EXTRACT_SUFX=	.rpm
 
 MAINTAINER=	gnome@freebsd.org
+COMMENT=	Linux X11 Application Launch Feedback
 
 LIB_DEPENDS=	xalflaunch.0:${PORTSDIR}/x11/xalf
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
diff --git a/x11/linux-xalf/pkg-comment b/x11/linux-xalf/pkg-comment
deleted file mode 100644
index e9b45a7b4991..000000000000
--- a/x11/linux-xalf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linux X11 Application Launch Feedback
diff --git a/x11/login.app/Makefile b/x11/login.app/Makefile
index 8ce116e0da9f..aa09725a82e5 100644
--- a/x11/login.app/Makefile
+++ b/x11/login.app/Makefile
@@ -16,6 +16,7 @@ DISTFILES=	Login.app-${PORTVERSION:S/.a/-Alpha-/}${EXTRACT_SUFX} \
 		Drone${EXTRACT_SUFX}
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	Nice looking login interface to your favorite X-Server
 
 LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker \
 		PropList.2:${PORTSDIR}/devel/libPropList
diff --git a/x11/login.app/pkg-comment b/x11/login.app/pkg-comment
deleted file mode 100644
index e17758c3a03a..000000000000
--- a/x11/login.app/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Nice looking login interface to your favorite X-Server
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 22fbed36bb1b..b20108653fa4 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Library that supports startup notification spec from freedesktop.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/x11/startup-notification/pkg-comment b/x11/startup-notification/pkg-comment
deleted file mode 100644
index a3a4ccee575f..000000000000
--- a/x11/startup-notification/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library that supports startup notification spec from freedesktop.org
diff --git a/x11/stockticker_applet/Makefile b/x11/stockticker_applet/Makefile
index 9ad710bff856..38edbaa3c4db 100644
--- a/x11/stockticker_applet/Makefile
+++ b/x11/stockticker_applet/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/_applet//}
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	An applet that displays stock quotes in the Gnome panel
 
 USE_GNOME=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/stockticker_applet/pkg-comment b/x11/stockticker_applet/pkg-comment
deleted file mode 100644
index 224731f66a43..000000000000
--- a/x11/stockticker_applet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An applet that displays stock quotes in the Gnome panel
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 5d185899471b..49d6cb30cc15 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -17,6 +17,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DAEMONPICS}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	kris@FreeBSD.org
+COMMENT=	WINGs Display Manager; an xdm replacement
 
 LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker \
 		PropList.2:${PORTSDIR}/devel/libPropList
diff --git a/x11/wdm/pkg-comment b/x11/wdm/pkg-comment
deleted file mode 100644
index a4b43be24ec8..000000000000
--- a/x11/wdm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WINGs Display Manager; an xdm replacement
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index 04942fc902aa..e1067e00c1cd 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ \
 MASTER_SITE_SUBDIR=	jim
 
 MAINTAINER=	jim@FreeBSD.org
+COMMENT=	A dockapp that displays 9 buttons to run apps of your choice
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11/wmbutton/pkg-comment b/x11/wmbutton/pkg-comment
deleted file mode 100644
index e36cc4d81d28..000000000000
--- a/x11/wmbutton/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockapp that displays 9 buttons to run apps of your choice
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 2aa3628ba0c9..3c61aa4e68ac 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://linux.nawebu.cz/wmcliphist/
 
 MAINTAINER=	pat@FreeBSD.org
+COMMENT=	Clipboard history management dockapp for Window Maker
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11/wmcliphist/pkg-comment b/x11/wmcliphist/pkg-comment
deleted file mode 100644
index a304f829f831..000000000000
--- a/x11/wmcliphist/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clipboard history management dockapp for Window Maker
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile
index 713cadea2851..7a1df1277c79 100644
--- a/x11/wrapper/Makefile
+++ b/x11/wrapper/Makefile
@@ -11,6 +11,7 @@ PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	trevor@FreeBSD.org
+COMMENT=	Wrapper for XFree86-4 server
 
 RUN_DEPENDS=	XFree86:${PORTSDIR}/x11-servers/XFree86-4-Server
 
diff --git a/x11/wrapper/pkg-comment b/x11/wrapper/pkg-comment
deleted file mode 100644
index 0f539c45afa1..000000000000
--- a/x11/wrapper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Wrapper for XFree86-4 server
diff --git a/x11/xalf/Makefile b/x11/xalf/Makefile
index cc00042a275e..f3672174cf59 100644
--- a/x11/xalf/Makefile
+++ b/x11/xalf/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	sources/xalf/0.12
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	X11 Application Launch Feedback
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11/xalf/pkg-comment b/x11/xalf/pkg-comment
deleted file mode 100644
index 558d80a59369..000000000000
--- a/x11/xalf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 Application Launch Feedback
diff --git a/x11/xantfarm/Makefile b/x11/xantfarm/Makefile
index 3193b9865b56..682b3b89dc9e 100644
--- a/x11/xantfarm/Makefile
+++ b/x11/xantfarm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.acme.com/software/xantfarm/
 DISTNAME=	${PORTNAME}_23oct1991
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	Ant hill simulation on X11 root window
 
 WRKSRC=		${WRKDIR}/xantfarm
 USE_IMAKE=	yes
diff --git a/x11/xantfarm/pkg-comment b/x11/xantfarm/pkg-comment
deleted file mode 100644
index beb91976d72b..000000000000
--- a/x11/xantfarm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ant hill simulation on X11 root window
diff --git a/x11/xco/Makefile b/x11/xco/Makefile
index 1c39d84d0b89..c436d57ffc8f 100644
--- a/x11/xco/Makefile
+++ b/x11/xco/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.cs.purdue.edu/pub/bingle/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	Display X11 color names and colors
 
 USE_IMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/x11/xco/pkg-comment b/x11/xco/pkg-comment
deleted file mode 100644
index fd44298dd0d1..000000000000
--- a/x11/xco/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display X11 color names and colors
diff --git a/x11/xcoloredit/Makefile b/x11/xcoloredit/Makefile
index 698e9429382e..345ef4d87160 100644
--- a/x11/xcoloredit/Makefile
+++ b/x11/xcoloredit/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	Find colour values by graphical colour mixing
 
 USE_IMAKE=	yes
 MAN1=		xcoloredit.1
diff --git a/x11/xcoloredit/pkg-comment b/x11/xcoloredit/pkg-comment
deleted file mode 100644
index 9b6d7b086bac..000000000000
--- a/x11/xcoloredit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Find colour values by graphical colour mixing
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index ba24451ec605..1418cbbfe0ea 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://download.sourceforge.net/xcut/ \
 		http://acsys.anu.edu.au/~tpot/xcut/
 
 MAINTAINER=	cy@FreeBSD.org
+COMMENT=	Manipulate X cut buffers from the commandline
 
 USE_IMAKE=	YES
 MAN1=		xcut.1
diff --git a/x11/xcut/pkg-comment b/x11/xcut/pkg-comment
deleted file mode 100644
index 3ec876e2333c..000000000000
--- a/x11/xcut/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Manipulate X cut buffers from the commandline
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index 4e526412d167..c3e6fddda151 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=		gpalmer@FreeBSD.org
+COMMENT=	A graphical shell for the X Window System
 
 USE_IMAKE=		yes
 USE_XPM=		yes
diff --git a/x11/xdtm/pkg-comment b/x11/xdtm/pkg-comment
deleted file mode 100644
index bca27b7d1197..000000000000
--- a/x11/xdtm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical shell for the X Window System
diff --git a/x11/xfedor/Makefile b/x11/xfedor/Makefile
index bff148ec2080..e7d586dc0b80 100644
--- a/x11/xfedor/Makefile
+++ b/x11/xfedor/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/x11/util/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ache@FreeBSD.org
+COMMENT=	A .bdf fonts/.xbm bitmaps/.xpm colored pixmaps/mouse cursor editor
 
 USE_IMAKE=	yes
 USE_XPM=	yes
diff --git a/x11/xfedor/pkg-comment b/x11/xfedor/pkg-comment
deleted file mode 100644
index fd6aa8d13fb2..000000000000
--- a/x11/xfedor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A .bdf fonts/.xbm bitmaps/.xpm colored pixmaps/mouse cursor editor
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index 5f22a377da27..a1423b63d4e6 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	A little set of XML files useful for dealing with XKB rules
 
 LIB_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv \
 		intl.4:${PORTSDIR}/devel/gettext
diff --git a/x11/xfree86_xkb_xml/pkg-comment b/x11/xfree86_xkb_xml/pkg-comment
deleted file mode 100644
index 3089197af011..000000000000
--- a/x11/xfree86_xkb_xml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A little set of XML files useful for dealing with XKB rules
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index 5033816ecfd1..9f82d3df42d6 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}sc.2_41
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jmz@FreeBSD.org
+COMMENT=	An X11 image grabber
 
 USE_X_PREFIX=	yes
 
diff --git a/x11/xgrab/pkg-comment b/x11/xgrab/pkg-comment
deleted file mode 100644
index a85a80ceeff3..000000000000
--- a/x11/xgrab/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 image grabber
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index 34aafb0d82e6..e079f65568be 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.jwz.org/xkeycaps/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jmz@FreeBSD.org
+COMMENT=	Graphically display and edit the keyboard mapping
 
 USE_IMAKE=	yes
 MAN1=		xkeycaps.1
diff --git a/x11/xkeycaps/pkg-comment b/x11/xkeycaps/pkg-comment
deleted file mode 100644
index 02b69e0def32..000000000000
--- a/x11/xkeycaps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphically display and edit the keyboard mapping
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index cdf9a2dce302..97775fb7c151 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	tg@FreeBSD.org
+COMMENT=	Like XLock session locker/screen saver, but just more
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/xlockmore/pkg-comment b/x11/xlockmore/pkg-comment
deleted file mode 100644
index 5b53a17d1292..000000000000
--- a/x11/xlockmore/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Like XLock session locker/screen saver, but just more
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index e62602791166..d735f30d5104 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://cclub.tutcc.tut.ac.jp/pub/xmascot/ \
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	Moving mascot on your X11 screen
 
 USE_IMAKE=	yes
 MAN1=		xmascot.1
diff --git a/x11/xmascot/pkg-comment b/x11/xmascot/pkg-comment
deleted file mode 100644
index d74e5c2ba77c..000000000000
--- a/x11/xmascot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Moving mascot on your X11 screen
diff --git a/x11/xmold/Makefile b/x11/xmold/Makefile
index a965a1a8070e..429fc6126e42 100644
--- a/x11/xmold/Makefile
+++ b/x11/xmold/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://cclub.tutcc.tut.ac.jp/pub/xwin/ \
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	Mold spreading over your X11 screen
 
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/x11/xmold/pkg-comment b/x11/xmold/pkg-comment
deleted file mode 100644
index f0e9bfbb0184..000000000000
--- a/x11/xmold/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mold spreading over your X11 screen
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index fd8d0c744698..4467fa5d167b 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=   ${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mph
 
 MAINTAINER=	mph@freebsd.org
+COMMENT=	Displays a dialog box and prompts user for text
 
 USE_IMAKE=	yes
 
diff --git a/x11/xprompt/pkg-comment b/x11/xprompt/pkg-comment
deleted file mode 100644
index 373d8f163cee..000000000000
--- a/x11/xprompt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Displays a dialog box and prompts user for text
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 313d60e11dfa..69ad98447687 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.euronet.nl/~rja/Xsnow/
 
 MAINTAINER=	jmz@FreeBSD.org
+COMMENT=	Create a snowy and Santa-y desktop
 
 USE_IMAKE=	yes
 USE_XPM=	yes
diff --git a/x11/xsnow/pkg-comment b/x11/xsnow/pkg-comment
deleted file mode 100644
index 8a40e8949f7a..000000000000
--- a/x11/xsnow/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create a snowy and Santa-y desktop
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index 6e400958d2bb..7524e4442066 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 
 MAINTAINER=	joerg@FreeBSD.org
+COMMENT=	Create a full-screen image to adjust your monitor
 
 USE_IMAKE=	yes
 MAN1=		xtestpicture.1
diff --git a/x11/xtestpicture/pkg-comment b/x11/xtestpicture/pkg-comment
deleted file mode 100644
index c144412acdc7..000000000000
--- a/x11/xtestpicture/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create a full-screen image to adjust your monitor
diff --git a/x11/xtset/Makefile b/x11/xtset/Makefile
index 39ba3ec321a6..db8ccfdc054f 100644
--- a/x11/xtset/Makefile
+++ b/x11/xtset/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.lemis.com/pub/
 
 MAINTAINER=	grog@FreeBSD.Org
+COMMENT=	utility to set title on an xterm
 
 NO_WRKSUBDIR=	YES
 
diff --git a/x11/xtset/pkg-comment b/x11/xtset/pkg-comment
deleted file mode 100644
index 733d47fceb51..000000000000
--- a/x11/xtset/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-utility to set title on an xterm
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index c5aa43af1a87..ae736da6a72b 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.x.org/contrib/utilities/
 
 MAINTAINER=	tg@FreeBSD.org
+COMMENT=	X interface tool
 
 USE_IMAKE=	yes
 MAN1=		xwit.1
diff --git a/x11/xwit/pkg-comment b/x11/xwit/pkg-comment
deleted file mode 100644
index 2ace9ad64865..000000000000
--- a/x11/xwit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X interface tool
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index c9b0ab89544c..6446166a48b7 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	libs/X
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	Magnify, rotate, mirror the image on the X screen
 
 USE_IMAKE=	yes
 MAN1=		xzoom.1
diff --git a/x11/xzoom/pkg-comment b/x11/xzoom/pkg-comment
deleted file mode 100644
index 2aa073d5f7f1..000000000000
--- a/x11/xzoom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Magnify, rotate, mirror the image on the X screen
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index a3271eb87070..07980e65ae88 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A help browser for GNOME 2.0 desktop
 
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
 		gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml
diff --git a/x11/yelp/pkg-comment b/x11/yelp/pkg-comment
deleted file mode 100644
index 1b13a12addf7..000000000000
--- a/x11/yelp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A help browser for GNOME 2.0 desktop
author	Ade Lovett <ade@FreeBSD.org>	2003-03-07 06:36:20 +0000
committer	Ade Lovett <ade@FreeBSD.org>	2003-03-07 06:36:20 +0000
commit	3195b6f71c9c4bf646bb409fd265132f3dd359d7 (patch)
tree	546dd6e2e7a43531e8dc0884dc602d3e0d179571 /x11
parent	Cleaning up after the wonders of remote cvs (diff)