De-pkg-comment.

author: knu <knu@FreeBSD.org> 2003-02-21 20:06:51 +0800
committer: knu <knu@FreeBSD.org> 2003-02-21 20:06:51 +0800
commit: cd63ab299ecbacc6d43a31ee82d010072422d9dd (patch)
tree: 0d9edac06427083a7190306179227388433844bb
parent: 65e31f0898c7896c7c141d199f912a2bc5d7a3c2 (diff)
download: freebsd-ports-gnome-cd63ab299ecbacc6d43a31ee82d010072422d9dd.tar.gz
freebsd-ports-gnome-cd63ab299ecbacc6d43a31ee82d010072422d9dd.tar.zst
freebsd-ports-gnome-cd63ab299ecbacc6d43a31ee82d010072422d9dd.zip
406 files changed, 207 insertions, 206 deletions
diff --git a/emulators/adamem/Makefile b/emulators/adamem/Makefile
index 7abedb64c5d3..714798c99e60 100644
--- a/emulators/adamem/Makefile
+++ b/emulators/adamem/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.komkon.org/~dekogel/files/coleco/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	karlj000@unbc.ca
+COMMENT=	ADAMEm is a portable Coleco ADAM and ColecoVision emulator
 
 NO_WRKSUBDIR=	yes
 USE_XLIB=	yes
diff --git a/emulators/adamem/pkg-comment b/emulators/adamem/pkg-comment
deleted file mode 100644
index ce90f291529f..000000000000
--- a/emulators/adamem/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ADAMEm is a portable Coleco ADAM and ColecoVision emulator
diff --git a/emulators/cinc/Makefile b/emulators/cinc/Makefile
index 4f7c8ed322c9..530c646c7ce3 100644
--- a/emulators/cinc/Makefile
+++ b/emulators/cinc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cinc
 
 MAINTAINER=	verm@drunkmonk.net
+COMMENT=	Bell Laboratories cardiac computer emulator
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/emulators/cinc/pkg-comment b/emulators/cinc/pkg-comment
deleted file mode 100644
index 173b7d170b26..000000000000
--- a/emulators/cinc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bell Laboratories cardiac computer emulator
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index fe5ad9be16f7..f1a6b4304ec8 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	fMSX22
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	dk@farm.org
+COMMENT=	The Portable MSX/MSX2/MSX2+ Emulator
 
 USE_XLIB=	yes
 NO_PACKAGE=	${RESTRICTED}
diff --git a/emulators/fmsx/pkg-comment b/emulators/fmsx/pkg-comment
deleted file mode 100644
index a3153954f3a9..000000000000
--- a/emulators/fmsx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Portable MSX/MSX2/MSX2+ Emulator
diff --git a/emulators/grustibus/Makefile b/emulators/grustibus/Makefile
index ad4baf9708dd..728ce6ac0596 100644
--- a/emulators/grustibus/Makefile
+++ b/emulators/grustibus/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	grustibus
 
 MAINTAINER=	verm@drunkmonk.net
+COMMENT=	An xmame frontend for Gnome
 
 RUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
 
diff --git a/emulators/grustibus/pkg-comment b/emulators/grustibus/pkg-comment
deleted file mode 100644
index 0a4513f85887..000000000000
--- a/emulators/grustibus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An xmame frontend for Gnome
diff --git a/emulators/its/Makefile b/emulators/its/Makefile
index 4b8a4f978879..dc34a7d23e34 100644
--- a/emulators/its/Makefile
+++ b/emulators/its/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX=	.bz2
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	kstailey@yahoo.com
+COMMENT=	Bootable ITS filesystem for KLH-10 PDP-10 emulator
 
 BUILD_DEPENDS=	kn10-ks:${PORTSDIR}/emulators/klh10
 RUN_DEPENDS=	kn10-ks:${PORTSDIR}/emulators/klh10
diff --git a/emulators/its/pkg-comment b/emulators/its/pkg-comment
deleted file mode 100644
index 3f2fb50f3590..000000000000
--- a/emulators/its/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bootable ITS filesystem for KLH-10 PDP-10 emulator
diff --git a/emulators/klh10/Makefile b/emulators/klh10/Makefile
index e6d909e392dd..2c6f3bb00031 100644
--- a/emulators/klh10/Makefile
+++ b/emulators/klh10/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tgz klh10-2.0a-aux.tgz
 
 MAINTAINER=	kstailey@yahoo.com
+COMMENT=	Emulator for DEC PDP-10
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/emulators/klh10/pkg-comment b/emulators/klh10/pkg-comment
deleted file mode 100644
index 3fec37868ec8..000000000000
--- a/emulators/klh10/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Emulator for DEC PDP-10
diff --git a/emulators/kmamerun/Makefile b/emulators/kmamerun/Makefile
index 8b5bf84318a1..f3f40a42df4f 100644
--- a/emulators/kmamerun/Makefile
+++ b/emulators/kmamerun/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kmamerun
 
 MAINTAINER=	smoberly@karamazov.org
+COMMENT=	KDE frontend for M.A.M.E. (Multiple Arcade Machine Emulator)
 
 RUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
 
diff --git a/emulators/kmamerun/pkg-comment b/emulators/kmamerun/pkg-comment
deleted file mode 100644
index 2842e16eb747..000000000000
--- a/emulators/kmamerun/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KDE frontend for M.A.M.E. (Multiple Arcade Machine Emulator)
diff --git a/emulators/linux-ePSXe/Makefile b/emulators/linux-ePSXe/Makefile
index f487f99c3216..83250e24f950 100644
--- a/emulators/linux-ePSXe/Makefile
+++ b/emulators/linux-ePSXe/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	epsxe152lin
 
 MAINTAINER=	jylefort@brutele.be
+COMMENT=	A Sony Playstation emulator (Linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
diff --git a/emulators/linux-ePSXe/pkg-comment b/emulators/linux-ePSXe/pkg-comment
deleted file mode 100644
index f6b86353de8d..000000000000
--- a/emulators/linux-ePSXe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Sony Playstation emulator (Linux version)
diff --git a/emulators/linux-peops-softgpu/Makefile b/emulators/linux-peops-softgpu/Makefile
index a1e8410d55bf..27884291945e 100644
--- a/emulators/linux-peops-softgpu/Makefile
+++ b/emulators/linux-peops-softgpu/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX=	linux-peops-
 DISTNAME=	gpupeopssoftx112
 
 MAINTAINER=	jylefort@brutele.be
+COMMENT=	A PSEmu Pro GPU plugin using a software X11 renderer (Linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
diff --git a/emulators/linux-peops-softgpu/pkg-comment b/emulators/linux-peops-softgpu/pkg-comment
deleted file mode 100644
index 037b719c269a..000000000000
--- a/emulators/linux-peops-softgpu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PSEmu Pro GPU plugin using a software X11 renderer (Linux version)
diff --git a/emulators/linux-peops-spu/Makefile b/emulators/linux-peops-spu/Makefile
index d722bc2d3193..b21d6965675d 100644
--- a/emulators/linux-peops-spu/Makefile
+++ b/emulators/linux-peops-spu/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX=	linux-peops-
 DISTNAME=	spupeopsoss103
 
 MAINTAINER=	jylefort@brutele.be
+COMMENT=	A PSEmu Pro SPU plugin using the OSS interface (Linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
diff --git a/emulators/linux-peops-spu/pkg-comment b/emulators/linux-peops-spu/pkg-comment
deleted file mode 100644
index 147ee585084d..000000000000
--- a/emulators/linux-peops-spu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PSEmu Pro SPU plugin using the OSS interface (Linux version)
diff --git a/emulators/linux-pete-mesagpu/Makefile b/emulators/linux-pete-mesagpu/Makefile
index c7c1315e5af1..cff971f59875 100644
--- a/emulators/linux-pete-mesagpu/Makefile
+++ b/emulators/linux-pete-mesagpu/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX=	linux-pete-
 DISTNAME=	gpupetemesagl168
 
 MAINTAINER=	jylefort@brutele.be
+COMMENT=	A PSEmu Pro GPU plugin using an OpenGL renderer (Linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk \
 		${LINUXBASE}/usr/X11R6/lib/libGL.so:${PORTSDIR}/graphics/linux_mesa3
diff --git a/emulators/linux-pete-mesagpu/pkg-comment b/emulators/linux-pete-mesagpu/pkg-comment
deleted file mode 100644
index 859ce6df1000..000000000000
--- a/emulators/linux-pete-mesagpu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PSEmu Pro GPU plugin using an OpenGL renderer (Linux version)
diff --git a/emulators/qcl/Makefile b/emulators/qcl/Makefile
index 251e5de939e4..bb04b66cfbce 100644
--- a/emulators/qcl/Makefile
+++ b/emulators/qcl/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://tph.tuwien.ac.at/~oemer/tgz/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	huntting@glarp.com
+COMMENT=	A quantum computer simulator
 
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
diff --git a/emulators/qcl/pkg-comment b/emulators/qcl/pkg-comment
deleted file mode 100644
index 4b54f54940b8..000000000000
--- a/emulators/qcl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A quantum computer simulator
diff --git a/emulators/quasi88/Makefile b/emulators/quasi88/Makefile
index 76e614c61819..873198921b4c 100644
--- a/emulators/quasi88/Makefile
+++ b/emulators/quasi88/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.117.ne.jp/~show/pc8801/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nishika@manbow.com
+COMMENT=	PC-8801 emulator for X
 
 USE_X_PREFIX=	yes
 USE_XLIB=	yes
diff --git a/emulators/quasi88/pkg-comment b/emulators/quasi88/pkg-comment
deleted file mode 100644
index d7505c8c6c9f..000000000000
--- a/emulators/quasi88/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PC-8801 emulator for X
diff --git a/emulators/scummvm/Makefile b/emulators/scummvm/Makefile
index af5c4c7bf408..3322175ccbea 100644
--- a/emulators/scummvm/Makefile
+++ b/emulators/scummvm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}-src
 
 MAINTAINER=	flynn@energyhq.homeip.net
+COMMENT=	Free implementation of LucasArts S.C.U.M.M. interpreter
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 
diff --git a/emulators/scummvm/pkg-comment b/emulators/scummvm/pkg-comment
deleted file mode 100644
index 312a3b1465c9..000000000000
--- a/emulators/scummvm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free implementation of LucasArts S.C.U.M.M. interpreter
diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile
index ae3c767288e5..304aef5fc6f6 100644
--- a/emulators/stonx/Makefile
+++ b/emulators/stonx/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.complang.tuwien.ac.at/pub/nino/stonx-current/
 DISTNAME=	STonX-0.6.7-epsilon
 
 MAINTAINER=	treif@mayn.de
+COMMENT=	AtariST emulator
 
 RESTRICTED=	"tos.img is copyrighted"
 NO_PACKAGE=	${RESTRICTED}
diff --git a/emulators/stonx/pkg-comment b/emulators/stonx/pkg-comment
deleted file mode 100644
index c065f3f05ef1..000000000000
--- a/emulators/stonx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-AtariST emulator
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index e3ecef18a082..f5a9c89414e9 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/
 
 MAINTAINER=	simond@irrelevant.org
+COMMENT=	Amiga emulator
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/emulators/uae/pkg-comment b/emulators/uae/pkg-comment
deleted file mode 100644
index 2a60a7b7cb2a..000000000000
--- a/emulators/uae/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Amiga emulator
diff --git a/emulators/vMac/Makefile b/emulators/vMac/Makefile
index 6949e7b1790e..4a2dc3451eda 100644
--- a/emulators/vMac/Makefile
+++ b/emulators/vMac/Makefile
@@ -13,6 +13,7 @@ DISTNAME=		${PORTNAME}-${PORTVERSION}-src
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		troll@digitalspark.net
+COMMENT=	Emulates a MacPlus machine!  Runs MacOS versions up to 7.5.5
 
 MAKEFILE=		Makefile
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/emulators/vMac/pkg-comment b/emulators/vMac/pkg-comment
deleted file mode 100644
index 772b4a10304f..000000000000
--- a/emulators/vMac/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Emulates a MacPlus machine!  Runs MacOS versions up to 7.5.5
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index 2a45d829fd4b..48a27ac1705f 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -27,6 +27,7 @@ PATCHFILES=	vmmon-freebsd-0.94.tar.gz \
 # Feel free to post your questions/reports/suggestions on this port to
 # freebsd-emulation mailing list with the following maintainer address CC'ed.
 MAINTAINER=	ak@freenet.co.uk
+COMMENT=	A virtual machine emulator - a full PC in a window
 
 BROKEN=		"Does not build"
 
diff --git a/emulators/vmware/pkg-comment b/emulators/vmware/pkg-comment
deleted file mode 100644
index 3e6b90a9f6e7..000000000000
--- a/emulators/vmware/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A virtual machine emulator - a full PC in a window
diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
index 00c5b6c80057..c2aa01a35e12 100644
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -19,6 +19,7 @@ DISTFILES=	VMware-${PORTVERSION:R}-${PORTVERSION:E}${EXTRACT_SUFX} \
 # Feel free to post your questions/reports/suggestions on this port to
 # freebsd-emulation mailing list with the following maintainer address CC'ed.
 MAINTAINER=	vsilyaev@mindspring.com
+COMMENT=	A virtual machine emulator - a full PC in a window
 
 RUN_DEPENDS=	${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc
 
diff --git a/emulators/vmware2/pkg-comment b/emulators/vmware2/pkg-comment
deleted file mode 100644
index 3e6b90a9f6e7..000000000000
--- a/emulators/vmware2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A virtual machine emulator - a full PC in a window
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index 00c5b6c80057..c2aa01a35e12 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -19,6 +19,7 @@ DISTFILES=	VMware-${PORTVERSION:R}-${PORTVERSION:E}${EXTRACT_SUFX} \
 # Feel free to post your questions/reports/suggestions on this port to
 # freebsd-emulation mailing list with the following maintainer address CC'ed.
 MAINTAINER=	vsilyaev@mindspring.com
+COMMENT=	A virtual machine emulator - a full PC in a window
 
 RUN_DEPENDS=	${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc
 
diff --git a/emulators/vmware3/pkg-comment b/emulators/vmware3/pkg-comment
deleted file mode 100644
index 3e6b90a9f6e7..000000000000
--- a/emulators/vmware3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A virtual machine emulator - a full PC in a window
diff --git a/emulators/vxtools/Makefile b/emulators/vxtools/Makefile
index 36dacc28865a..c91d9d5bcd0e 100644
--- a/emulators/vxtools/Makefile
+++ b/emulators/vxtools/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.penguin.cz/pub/users/mhi/vxfs/
 
 MAINTAINER=	mhi@penguin.cz
+COMMENT=	Command-line utilities for reading Veritas Filesystem (VxFS)
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/emulators/vxtools/pkg-comment b/emulators/vxtools/pkg-comment
deleted file mode 100644
index cec1ced38a93..000000000000
--- a/emulators/vxtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Command-line utilities for reading Veritas Filesystem (VxFS)
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 3659861d44fb..224ec1c0202d 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -18,6 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:xmame
 DIST_SUBDIR=	xmame
 
 MAINTAINER?=	stijn@win.tue.nl
+COMMENT?=	UNIX/X11 port of the Multi Arcade Machine Emulator (MAME)
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/emulators/xmame/pkg-comment b/emulators/xmame/pkg-comment
deleted file mode 100644
index c89235c53601..000000000000
--- a/emulators/xmame/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-UNIX/X11 port of the Multi Arcade Machine Emulator (MAME)
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 39309a1b3c6f..9810e0e0dd72 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	xmess
 PORTVERSION=	0.61.1
 
 MAINTAINER=	stijn@win.tue.nl
+COMMENT=	X11 emulator for game consoles
 
 MASTERDIR=	${.CURDIR}/../xmame
 COMMENTFILE=	${.CURDIR}/pkg-comment
diff --git a/emulators/xmess/pkg-comment b/emulators/xmess/pkg-comment
deleted file mode 100644
index f9579d155dbe..000000000000
--- a/emulators/xmess/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 emulator for game consoles
diff --git a/emulators/xpinmame/Makefile b/emulators/xpinmame/Makefile
index a3b05ca65764..722ad10cdcd5 100644
--- a/emulators/xpinmame/Makefile
+++ b/emulators/xpinmame/Makefile
@@ -12,9 +12,9 @@ PATCH_SITES+=	http://www.win.tue.nl/~stijn/xmame/
 PATCHFILES+=	${DISTNAME}-pinmame-${PINMAMEVERSION}.patch.gz
 
 MAINTAINER=	stijn@win.tue.nl
+COMMENT=	X11 emulator for pinball ROMs
 
 MASTERDIR=	${.CURDIR}/../xmame
-COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 MAMEMESS=	pinmame
diff --git a/emulators/xpinmame/pkg-comment b/emulators/xpinmame/pkg-comment
deleted file mode 100644
index 5affbb38d8e1..000000000000
--- a/emulators/xpinmame/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 emulator for pinball ROMs
diff --git a/emulators/yape/Makefile b/emulators/yape/Makefile
index 4b8cb201c1ba..ce8a9b024530 100644
--- a/emulators/yape/Makefile
+++ b/emulators/yape/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.cbm264.com/yape/download/
 DISTNAME=	yapeSDL-${PORTVERSION}
 
 MAINTAINER=	janos.mohacsi@bsd.hu
+COMMENT=	Yet Another Commodore +4 Emulator
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 
diff --git a/emulators/yape/pkg-comment b/emulators/yape/pkg-comment
deleted file mode 100644
index dbbbb6b523f3..000000000000
--- a/emulators/yape/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another Commodore +4 Emulator
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index cb4a0af26714..f707e56df0da 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	zsnes${PORTVERSION:S/.//}src
 
 MAINTAINER=	stijn@win.tue.nl
+COMMENT=	Intel x86 only Super Nintendo Entertainment System (SNES) Emulator
 
 # This must be >= 0.98!
 BUILD_DEPENDS=	nasm-0.98.33:${PORTSDIR}/devel/nasm
diff --git a/emulators/zsnes/pkg-comment b/emulators/zsnes/pkg-comment
deleted file mode 100644
index ba1d611ac90f..000000000000
--- a/emulators/zsnes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Intel x86 only Super Nintendo Entertainment System (SNES) Emulator
diff --git a/finance/openhbci/Makefile b/finance/openhbci/Makefile
index 00ac5d40f85f..7812134e6f31 100644
--- a/finance/openhbci/Makefile
+++ b/finance/openhbci/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	 	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=		heiner@bilch.com
+COMMENT=	HBCI is a bank-independent homebanking standard
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		CXXFLAGS=-pedantic
diff --git a/finance/openhbci/pkg-comment b/finance/openhbci/pkg-comment
deleted file mode 100644
index b1cfc71924b7..000000000000
--- a/finance/openhbci/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HBCI is a bank-independent homebanking standard
diff --git a/french/abispell-fr-FR/Makefile b/french/abispell-fr-FR/Makefile
index 10f38a0e8f98..cdf2bdaadb10 100644
--- a/french/abispell-fr-FR/Makefile
+++ b/french/abispell-fr-FR/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=     abiword
 DISTNAME=	abispell-fr-FR.i386
 
 MAINTAINER=     fab@gcu.info
+COMMENT=	French (France) ispell dictionary for AbiWord
 
 BUILD_DEPENDS=	AbiWord:${PORTSDIR}/editors/AbiWord
 
diff --git a/french/abispell-fr-FR/pkg-comment b/french/abispell-fr-FR/pkg-comment
deleted file mode 100644
index 4a93901023f5..000000000000
--- a/french/abispell-fr-FR/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-French (France) ispell dictionary for AbiWord
diff --git a/french/gfaim/Makefile b/french/gfaim/Makefile
index 145b21a0b578..dfb4905bfc8f 100644
--- a/french/gfaim/Makefile
+++ b/french/gfaim/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	french misc
 MASTER_SITES=	http://perso.club-internet.fr/lchretie/
 
 MAINTAINER=	sheepkiller@cultdeadsheep.org
+COMMENT=	Gfaim est un logiciel de recherche de recettes de cuisine
 
 USE_X_PREFIX= 	yes
 USE_GNOMENG=	yes
diff --git a/french/gfaim/pkg-comment b/french/gfaim/pkg-comment
deleted file mode 100644
index 2ffd0b7096a9..000000000000
--- a/french/gfaim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gfaim est un logiciel de recherche de recettes de cuisine
diff --git a/french/jdictionary-fre-hun/Makefile b/french/jdictionary-fre-hun/Makefile
index 3e2e592d7ca4..ffac2dadc529 100644
--- a/french/jdictionary-fre-hun/Makefile
+++ b/french/jdictionary-fre-hun/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=jdictionary
 DISTFILES=	Smart_French_Hungarian-1_0.jar
 
 MAINTAINER=	janos.mohacsi@bsd.hu
+COMMENT=	JDictionary plugin: French-Hungarian dictionary
 
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jdk13 \
diff --git a/french/jdictionary-fre-hun/pkg-comment b/french/jdictionary-fre-hun/pkg-comment
deleted file mode 100644
index c9e16b8b16ba..000000000000
--- a/french/jdictionary-fre-hun/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-JDictionary plugin: French-Hungarian dictionary
diff --git a/french/plgrenouille/Makefile b/french/plgrenouille/Makefile
index 5b49661c24e8..b4aca5eac58f 100644
--- a/french/plgrenouille/Makefile
+++ b/french/plgrenouille/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://blade.concept-micro.com/debian/
 DISTNAME=	${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	cyrille.lefevre@laposte.net
+COMMENT=	Un client pour determiner votre bande passante a un raccordement large bande
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
 
diff --git a/french/plgrenouille/pkg-comment b/french/plgrenouille/pkg-comment
deleted file mode 100644
index e73dc14cb61e..000000000000
--- a/french/plgrenouille/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Un client pour determiner votre bande passante a un raccordement large bande
diff --git a/french/xtel/Makefile b/french/xtel/Makefile
index 43c594dd5288..2e161aaa346f 100644
--- a/french/xtel/Makefile
+++ b/french/xtel/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	french comms emulators
 MASTER_SITES=	http://pficheux.free.fr/xtel/download/
 
 MAINTAINER=	thierry@pompo.net
+COMMENT=	An emulator for the french Minitel
 
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
diff --git a/french/xtel/pkg-comment b/french/xtel/pkg-comment
deleted file mode 100644
index 879b887a8dc2..000000000000
--- a/french/xtel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An emulator for the french Minitel
diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile
index af3c6a93f3d1..142906a6fb3c 100644
--- a/ftp/axel/Makefile
+++ b/ftp/axel/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	http://www.lintux.cx/downloads/
 
 MAINTAINER=	lintux@debian.org
+COMMENT=	A download accelerator
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
diff --git a/ftp/axel/pkg-comment b/ftp/axel/pkg-comment
deleted file mode 100644
index ce1401b27010..000000000000
--- a/ftp/axel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A download accelerator
diff --git a/ftp/fmirror/Makefile b/ftp/fmirror/Makefile
index 8faa07233b6e..0d27f23de89b 100644
--- a/ftp/fmirror/Makefile
+++ b/ftp/fmirror/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.guardian.no/pub/free/ftp/fmirror/
 
 MAINTAINER=	kiwi@oav.net
+COMMENT=	Program for mirroring files and directories from a remote FTP server
 
 #WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/ftp/fmirror/pkg-comment b/ftp/fmirror/pkg-comment
deleted file mode 100644
index d393d82f73a1..000000000000
--- a/ftp/fmirror/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Program for mirroring files and directories from a remote FTP server
diff --git a/ftp/frox/Makefile b/ftp/frox/Makefile
index 5f7c69d2e200..7d3be6f50041 100644
--- a/ftp/frox/Makefile
+++ b/ftp/frox/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= 	http://www.hollo.org/frox/download/ \
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sem@ciam.ru
+COMMENT=	Transparent FTP proxy with caching support
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/ftp/frox/pkg-comment b/ftp/frox/pkg-comment
deleted file mode 100644
index b136a5e6d124..000000000000
--- a/ftp/frox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Transparent FTP proxy with caching support
diff --git a/ftp/ftp-tls/Makefile b/ftp/ftp-tls/Makefile
index 8ce35c0db994..9deff518bb33 100644
--- a/ftp/ftp-tls/Makefile
+++ b/ftp/ftp-tls/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	ftp security
 MASTER_SITES=	ftp://ftp.runestig.com/pub/ftp-tls/
 
 MAINTAINER=	marius@alchemy.franken.de
+COMMENT=	Ftp client supporting FTP AUTH TLS
 
 USE_AUTOCONF=	YES
 GNU_CONFIGURE=	YES
diff --git a/ftp/ftp-tls/pkg-comment b/ftp/ftp-tls/pkg-comment
deleted file mode 100644
index 42913cefc2d3..000000000000
--- a/ftp/ftp-tls/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ftp client supporting FTP AUTH TLS
diff --git a/ftp/ftpcopy/Makefile b/ftp/ftpcopy/Makefile
index 761aac58bd56..413379e77295 100644
--- a/ftp/ftpcopy/Makefile
+++ b/ftp/ftpcopy/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://www.ohse.de/uwe/ftpcopy/
 
 MAINTAINER=	matthias.andree@web.de
+COMMENT=	Command line ftp tools for listing and mirroring
 
 WRKSRC=		${WRKDIR}/web/${DISTNAME}
 
diff --git a/ftp/ftpcopy/pkg-comment b/ftp/ftpcopy/pkg-comment
deleted file mode 100644
index 34f4d8747215..000000000000
--- a/ftp/ftpcopy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Command line ftp tools for listing and mirroring
diff --git a/ftp/ftpfind/Makefile b/ftp/ftpfind/Makefile
index 12bbca400521..bb66c4220748 100644
--- a/ftp/ftpfind/Makefile
+++ b/ftp/ftpfind/Makefile
@@ -12,5 +12,6 @@ MASTER_SITES=	http://hp.vector.co.jp/authors/VA013366/ \
 		http://www.tryplanet.com/t-ishii/programs/ftpfind/
 
 MAINTAINER=	t-ishii@tryplanet.com
+COMMENT=	Find directory&file on a ftp server
 
 .include <bsd.port.mk>
diff --git a/ftp/ftpfind/pkg-comment b/ftp/ftpfind/pkg-comment
deleted file mode 100644
index eabbb60305fb..000000000000
--- a/ftp/ftpfind/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Find directory&file on a ftp server
diff --git a/ftp/ftplocate/Makefile b/ftp/ftplocate/Makefile
index fba548857f4c..a44e9e321ff5 100644
--- a/ftp/ftplocate/Makefile
+++ b/ftp/ftplocate/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	ftp www
 MASTER_SITES=	ftp://ftp.ee.ncku.edu.tw/pub/ftplocate/
 
 MAINTAINER=	tung@turtle.ee.ncku.edu.tw
+COMMENT=	A ftp search engine supporting filename and description search
 
 BUILD_DEPENDS=  ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	glimpse:${PORTSDIR}/textproc/glimpse \
diff --git a/ftp/ftplocate/pkg-comment b/ftp/ftplocate/pkg-comment
deleted file mode 100644
index 366c8f1c4712..000000000000
--- a/ftp/ftplocate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A ftp search engine supporting filename and description search
diff --git a/ftp/ftpmirror/Makefile b/ftp/ftpmirror/Makefile
index 672cff082ce7..43fa44269af7 100644
--- a/ftp/ftpmirror/Makefile
+++ b/ftp/ftpmirror/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.intec.co.jp/pub/utils/ftpmirror/beta/
 
 MAINTAINER=	yasuf@big.or.jp
+COMMENT=	An utility to mirror directory hierarchy with FTP
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
 
diff --git a/ftp/ftpmirror/pkg-comment b/ftp/ftpmirror/pkg-comment
deleted file mode 100644
index 30bd2a0bd489..000000000000
--- a/ftp/ftpmirror/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An utility to mirror directory hierarchy with FTP
diff --git a/ftp/ftpproxy/Makefile b/ftp/ftpproxy/Makefile
index c8e0a2815429..1f37a533fc86 100644
--- a/ftp/ftpproxy/Makefile
+++ b/ftp/ftpproxy/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://www.ftpproxy.org/download/ \
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	philippe@le-berre.com
+COMMENT=	A ftp proxy
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_REINPLACE=	yes
diff --git a/ftp/ftpproxy/pkg-comment b/ftp/ftpproxy/pkg-comment
deleted file mode 100644
index 85fdd3290685..000000000000
--- a/ftp/ftpproxy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A ftp proxy
diff --git a/ftp/ftpsearch/Makefile b/ftp/ftpsearch/Makefile
index 4bd400b924a3..481f48bb0246 100644
--- a/ftp/ftpsearch/Makefile
+++ b/ftp/ftpsearch/Makefile
@@ -21,6 +21,7 @@ PATCHFILES=	ftpsearch-1.0.patch1 \
 		ftpsearch-1.0.patch8
 
 MAINTAINER=	Tor.Egge@idi.ntnu.no
+COMMENT=	A system for indexing contents on ftp servers
 
 NO_PACKAGE=	"Hostname compiled in"
 
diff --git a/ftp/ftpsearch/pkg-comment b/ftp/ftpsearch/pkg-comment
deleted file mode 100644
index 96fe018e6af1..000000000000
--- a/ftp/ftpsearch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A system for indexing contents on ftp servers
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index b4e841bf9a95..e89b7321ad38 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://gftp.seul.org/ \
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	lehmann@ans-netz.de
+COMMENT=	A free multithreaded GTK based ftp client
 
 GNU_CONFIGURE=	yes
 
diff --git a/ftp/gftp/pkg-comment b/ftp/gftp/pkg-comment
deleted file mode 100644
index f5e9514dc9ec..000000000000
--- a/ftp/gftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free multithreaded GTK based ftp client
diff --git a/ftp/jigdo/Makefile b/ftp/jigdo/Makefile
index 48d2f497a34f..4d85f49950c3 100644
--- a/ftp/jigdo/Makefile
+++ b/ftp/jigdo/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	http://home.in.tum.de/~atterer/jigdo/
 
 MAINTAINER=	bra@fsn.hu
+COMMENT=	An utility used to retrieve very large files over the Internet
 
 #BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww
 RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
diff --git a/ftp/jigdo/pkg-comment b/ftp/jigdo/pkg-comment
deleted file mode 100644
index deb859df317e..000000000000
--- a/ftp/jigdo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An utility used to retrieve very large files over the Internet
diff --git a/ftp/kwebget/Makefile b/ftp/kwebget/Makefile
index e09b3935081c..3177c37a4391 100644
--- a/ftp/kwebget/Makefile
+++ b/ftp/kwebget/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.kpage.de/download/
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	erich@tacni.net
+COMMENT=	A KDE frontend to wget
 
 RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
diff --git a/ftp/kwebget/pkg-comment b/ftp/kwebget/pkg-comment
deleted file mode 100644
index e1ef74a5c711..000000000000
--- a/ftp/kwebget/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A KDE frontend to wget
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 8b1223f96cbc..1fd6a4454111 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -32,6 +32,7 @@ MASTER_SITES=	ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/ \
 		ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/
 
 MAINTAINER=	fm@astral.ntu-kpi.kiev.ua
+COMMENT=	Shell-like command line ftp client
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
diff --git a/ftp/lftp/pkg-comment b/ftp/lftp/pkg-comment
deleted file mode 100644
index a2199e637448..000000000000
--- a/ftp/lftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Shell-like command line ftp client
diff --git a/ftp/lukemftpd/Makefile b/ftp/lukemftpd/Makefile
index 7f94c49a8a48..69cc69ae2c8c 100644
--- a/ftp/lukemftpd/Makefile
+++ b/ftp/lukemftpd/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
 
 MAINTAINER=	debolaz@debolaz.com
+COMMENT=	Enhanced ftp server from NetBSD
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/ftp/lukemftpd/pkg-comment b/ftp/lukemftpd/pkg-comment
deleted file mode 100644
index 7ceada755904..000000000000
--- a/ftp/lukemftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Enhanced ftp server from NetBSD
diff --git a/ftp/mirror/Makefile b/ftp/mirror/Makefile
index 1b0e577d60e3..ecc689c81ffa 100644
--- a/ftp/mirror/Makefile
+++ b/ftp/mirror/Makefile
@@ -18,6 +18,7 @@ PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	ftp.pl_wupatch
 
 MAINTAINER=	ryan@sasknow.com
+COMMENT=	Mirror packages on remote sites
 
 USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
diff --git a/ftp/mirror/pkg-comment b/ftp/mirror/pkg-comment
deleted file mode 100644
index 3d399859cce5..000000000000
--- a/ftp/mirror/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mirror packages on remote sites
diff --git a/ftp/ncftpd/Makefile b/ftp/ncftpd/Makefile
index e4d9d7f7708d..7b75dc0b2029 100644
--- a/ftp/ncftpd/Makefile
+++ b/ftp/ncftpd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.ncftp.com/ncftpd/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd4.4-${ARCH}-export
 
 MAINTAINER=	jus@security.za.net
+COMMENT=	A well known commercial FTP daemon with a 30-day evaluation license
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/ftp/ncftpd/pkg-comment b/ftp/ncftpd/pkg-comment
deleted file mode 100644
index 3b70b675b400..000000000000
--- a/ftp/ncftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A well known commercial FTP daemon with a 30-day evaluation license
diff --git a/ftp/pftpd/Makefile b/ftp/pftpd/Makefile
index a47a70b52aa4..9adbb539d4cc 100644
--- a/ftp/pftpd/Makefile
+++ b/ftp/pftpd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/unix/pftpd/
 
 MAINTAINER=	gslin@ccca.nctu.edu.tw
+COMMENT=	Multithreaded anonymous FTP daemon
 
 GNU_CONFIGURE=	yes
 
diff --git a/ftp/pftpd/pkg-comment b/ftp/pftpd/pkg-comment
deleted file mode 100644
index dbe03e336b2f..000000000000
--- a/ftp/pftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded anonymous FTP daemon
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index 17dd5141958d..5737340b8135 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -21,6 +21,7 @@ MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
 MASTER_SITE_SUBDIR=	pureftpd
 
 MAINTAINER=	j@pureftpd.org
+COMMENT=	A small, easy to set up, fast and very secure FTP server
 
 .if defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap2
diff --git a/ftp/pure-ftpd/pkg-comment b/ftp/pure-ftpd/pkg-comment
deleted file mode 100644
index b269edf9d819..000000000000
--- a/ftp/pure-ftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small, easy to set up, fast and very secure FTP server
diff --git a/ftp/twoftpd/Makefile b/ftp/twoftpd/Makefile
index d91fe452fd94..b8675124f5ac 100644
--- a/ftp/twoftpd/Makefile
+++ b/ftp/twoftpd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	http://untroubled.org/twoftpd/
 
 MAINTAINER=	gslin@ccca.nctu.edu.tw
+COMMENT=	A simple, secure, efficient FTP server
 
 MAN1=		twoftpd-auth.1 twoftpd-xfer.1
 
diff --git a/ftp/twoftpd/pkg-comment b/ftp/twoftpd/pkg-comment
deleted file mode 100644
index 2be43c493844..000000000000
--- a/ftp/twoftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple, secure, efficient FTP server
diff --git a/ftp/vcheck/Makefile b/ftp/vcheck/Makefile
index 1ab0732fb885..146d9e286bbb 100644
--- a/ftp/vcheck/Makefile
+++ b/ftp/vcheck/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	ftp
 MASTER_SITES= 	http://www.stud.tu-ilmenau.de/~gomar/stuff/vcheck/
 
 MAINTAINER=	svenasse@polaris.ca
+COMMENT=	Automatically check for and download most recent versions of software
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/ftp/vcheck/pkg-comment b/ftp/vcheck/pkg-comment
deleted file mode 100644
index 506791b78156..000000000000
--- a/ftp/vcheck/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Automatically check for and download most recent versions of software
diff --git a/ftp/xrmftp/Makefile b/ftp/xrmftp/Makefile
index 01fe46c70d69..6049f0ce004d 100644
--- a/ftp/xrmftp/Makefile
+++ b/ftp/xrmftp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.mat.uni.torun.pl/~rafmet/xrmftp/
 EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	matt@LUCIDA.CA
+COMMENT=	Graphical FTP client based on the xforms library
 
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 
diff --git a/ftp/xrmftp/pkg-comment b/ftp/xrmftp/pkg-comment
deleted file mode 100644
index 5145274f0307..000000000000
--- a/ftp/xrmftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphical FTP client based on the xforms library
diff --git a/games/0verkill/Makefile b/games/0verkill/Makefile
index 49e069953550..dff9e03a2f8c 100644
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mich@freebsdcluster.org
+COMMENT=	0verkill is a bloody 2D action deathmatch-like game in ASCII-ART
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/0verkill/pkg-comment b/games/0verkill/pkg-comment
deleted file mode 100644
index 28de234b783e..000000000000
--- a/games/0verkill/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-0verkill is a bloody 2D action deathmatch-like game in ASCII-ART
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 4ede7d182da6..52daf590ee9f 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	games/strategy
 DISTNAME=		3Dc-${PORTVERSION}
 
 MAINTAINER=		adam-ports@blacktabby.org
+COMMENT=	3-Dimensional Chess for X Window System
 
 LIB_DEPENDS=		Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
diff --git a/games/3dc/pkg-comment b/games/3dc/pkg-comment
deleted file mode 100644
index 8171abbfc047..000000000000
--- a/games/3dc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3-Dimensional Chess for X Window System
diff --git a/games/44bsd-hunt/Makefile b/games/44bsd-hunt/Makefile
index 1bad3c039182..5cad662259f6 100644
--- a/games/44bsd-hunt/Makefile
+++ b/games/44bsd-hunt/Makefile
@@ -10,6 +10,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.heitec.net/pub/distfiles/
 
 MAINTAINER=	bdluevel@heitec.net
+COMMENT=	Rogue-like multiplayer game
 
 MAN6=	hunt.6 huntd.6
 
diff --git a/games/44bsd-hunt/pkg-comment b/games/44bsd-hunt/pkg-comment
deleted file mode 100644
index 0579421224e7..000000000000
--- a/games/44bsd-hunt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Rogue-like multiplayer game
diff --git a/games/54321/Makefile b/games/54321/Makefile
index fa2d04e6628e..1595726d2bfd 100644
--- a/games/54321/Makefile
+++ b/games/54321/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	llwang@infor.org
+COMMENT=	54321 is five games in four-, three-, or two-dimensions for one player
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
diff --git a/games/54321/pkg-comment b/games/54321/pkg-comment
deleted file mode 100644
index bbd8ce626dec..000000000000
--- a/games/54321/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-54321 is five games in four-, three-, or two-dimensions for one player
diff --git a/games/HeroesOfMightAndMagic/Makefile b/games/HeroesOfMightAndMagic/Makefile
index e534213561ea..728d626bb628 100644
--- a/games/HeroesOfMightAndMagic/Makefile
+++ b/games/HeroesOfMightAndMagic/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=
 DISTFILES=
 
 MAINTAINER=	holger@e-gitt.net
+COMMENT=	BSD Installation of the Linux game "Heroes of Might and Magic III"
 
 RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
 		${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
diff --git a/games/HeroesOfMightAndMagic/pkg-comment b/games/HeroesOfMightAndMagic/pkg-comment
deleted file mode 100644
index ce7bb427b3dd..000000000000
--- a/games/HeroesOfMightAndMagic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-BSD Installation of the Linux game "Heroes of Might and Magic III"
diff --git a/games/actx/Makefile b/games/actx/Makefile
index ec2d0d78251f..afd076ba4cf2 100644
--- a/games/actx/Makefile
+++ b/games/actx/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://kurumi.sakura.ne.jp/~chimari/ActX/
 
 MAINTAINER=	esu@yk.rim.or.jp
+COMMENT=	Window sitter for X11
 
 NO_CDROM=	'contains commercial character data'
 
diff --git a/games/actx/pkg-comment b/games/actx/pkg-comment
deleted file mode 100644
index 51a1fb7c0018..000000000000
--- a/games/actx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Window sitter for X11
diff --git a/games/adom/Makefile b/games/adom/Makefile
index a26f7fde0d65..617486834755 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.adom.de/adom/download/linux/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-elf
 
 MAINTAINER=	rover@lglobus.ru
+COMMENT=	An rogue-like advanced rpg with color support (binary port)
 
 NO_CDROM=	Copy of CD must be sent to author
 
diff --git a/games/adom/pkg-comment b/games/adom/pkg-comment
deleted file mode 100644
index 507b40eeb0b5..000000000000
--- a/games/adom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An rogue-like advanced rpg with color support (binary port)
diff --git a/games/alephone-data/Makefile b/games/alephone-data/Makefile
index c5f27765a689..f70c8420b83c 100644
--- a/games/alephone-data/Makefile
+++ b/games/alephone-data/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	marathon
 DISTNAME=	AlephOne-minf-demo
 
 MAINTAINER=	malyn@strangeGizmo.com
+COMMENT=	Data files for the alephone port
 
 RUN_DEPENDS=	alephone:${PORTSDIR}/games/alephone
 
diff --git a/games/alephone-data/pkg-comment b/games/alephone-data/pkg-comment
deleted file mode 100644
index dd29be210f31..000000000000
--- a/games/alephone-data/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Data files for the alephone port
diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 7e7ae259770d..bbf575941789 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	marathon
 DISTNAME=	AlephOne-${PORTVERSION}
 
 MAINTAINER=	malyn@strangeGizmo.com
+COMMENT=	The open source version of Bungie's Marathon game
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12:install \
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image:install
diff --git a/games/alephone/pkg-comment b/games/alephone/pkg-comment
deleted file mode 100644
index 468ea12debba..000000000000
--- a/games/alephone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The open source version of Bungie's Marathon game
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 70e6b442d169..5be10186fd13 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://autoinst.acs.uci.edu/pub/go/baduki/
 
 MAINTAINER=	spcoltri@omcl.org
+COMMENT=	The game of Go
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/games/baduki/pkg-comment b/games/baduki/pkg-comment
deleted file mode 100644
index 3ba03af046d4..000000000000
--- a/games/baduki/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The game of Go
diff --git a/games/biorythm/Makefile b/games/biorythm/Makefile
index 5811b4e7fc45..e8f7a2677d46 100644
--- a/games/biorythm/Makefile
+++ b/games/biorythm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 
 MAINTAINER=	martin@raq.cx
+COMMENT=	Simple biorythm calculation program
 
 LIB_DEPENDS=	shhmsg.1:${PORTSDIR}/devel/libshhmsg \
 		shhopt.1:${PORTSDIR}/devel/libshhopt
diff --git a/games/biorythm/pkg-comment b/games/biorythm/pkg-comment
deleted file mode 100644
index e61f4bc6b5bc..000000000000
--- a/games/biorythm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple biorythm calculation program
diff --git a/games/braincurses/Makefile b/games/braincurses/Makefile
index 18cf583c140b..cd8adc231500 100644
--- a/games/braincurses/Makefile
+++ b/games/braincurses/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://uhaweb.hartford.edu/hyland/derr/
 
 MAINTAINER=	mich@freebsdcluster.org
+COMMENT=	A clone of the Mastermind game
 
 LDFLAGS+=	-lncurses
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/games/braincurses/pkg-comment b/games/braincurses/pkg-comment
deleted file mode 100644
index c81673f64347..000000000000
--- a/games/braincurses/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of the Mastermind game
diff --git a/games/bsp/Makefile b/games/bsp/Makefile
index 56abb86e50f4..33998ed3bdb7 100644
--- a/games/bsp/Makefile
+++ b/games/bsp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	doombsp
 
 MAINTAINER=	chris@unixpages.org
+COMMENT=	Node builder for Doom
 
 GNU_CONFIGURE=	yes
 
diff --git a/games/bsp/pkg-comment b/games/bsp/pkg-comment
deleted file mode 100644
index 576ef827f741..000000000000
--- a/games/bsp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Node builder for Doom
diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile
index 8a8cbc3d3a14..81c077e12efa 100644
--- a/games/bugsx/Makefile
+++ b/games/bugsx/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	bugsx108
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	croyle@gelemna.org
+COMMENT=	Breed bugs using genetic algorithims
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/bugsx
diff --git a/games/bugsx/pkg-comment b/games/bugsx/pkg-comment
deleted file mode 100644
index 2a293c39afb3..000000000000
--- a/games/bugsx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Breed bugs using genetic algorithims
diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile
index a279df80f876..6b5ebe184fab 100644
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.inetarena.com/~wms/comp/cgoban/ \
 		http://www.igoweb.org/~wms/comp/cgoban/
 
 MAINTAINER=	simonm@dcs.gla.ac.uk
+COMMENT=	Internet Go Server client and game editor
 
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
diff --git a/games/cgoban/pkg-comment b/games/cgoban/pkg-comment
deleted file mode 100644
index 51e44cb6d884..000000000000
--- a/games/cgoban/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Internet Go Server client and game editor
diff --git a/games/civ2demo/Makefile b/games/civ2demo/Makefile
index fe7ba110d6de..9edf8f7b62f8 100644
--- a/games/civ2demo/Makefile
+++ b/games/civ2demo/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	civctp-demo-10251999
 EXTRACT_ONLY=
 
 MAINTAINER=	jameso@elwood.net
+COMMENT=	The free demo of Civilization: Call to Power
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/games/civ2demo/pkg-comment b/games/civ2demo/pkg-comment
deleted file mode 100644
index 7c745b50a7c9..000000000000
--- a/games/civ2demo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The free demo of Civilization: Call to Power
diff --git a/games/crafty-open-large/Makefile b/games/crafty-open-large/Makefile
index bffc7b8b4add..386a839a0d4e 100644
--- a/games/crafty-open-large/Makefile
+++ b/games/crafty-open-large/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/common/large/
 DISTFILES=	large1.zip large2.zip large3.zip large4.zip
 
 MAINTAINER=	seggers@semyam.dinoco.de
+COMMENT=	The large opening book for crafty
 
 BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
diff --git a/games/crafty-open-large/pkg-comment b/games/crafty-open-large/pkg-comment
deleted file mode 100644
index 456fe63bfb93..000000000000
--- a/games/crafty-open-large/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The large opening book for crafty
diff --git a/games/crafty-open-medium/Makefile b/games/crafty-open-medium/Makefile
index 511514a446a1..703182719af5 100644
--- a/games/crafty-open-medium/Makefile
+++ b/games/crafty-open-medium/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/common/medium/
 DISTNAME=	medium
 
 MAINTAINER=	seggers@semyam.dinoco.de
+COMMENT=	The medium opening book (about 1.9 MByte) for crafty
 
 BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
diff --git a/games/crafty-open-medium/pkg-comment b/games/crafty-open-medium/pkg-comment
deleted file mode 100644
index 240ab649439a..000000000000
--- a/games/crafty-open-medium/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The medium opening book (about 1.9 MByte) for crafty
diff --git a/games/crafty-open-small/Makefile b/games/crafty-open-small/Makefile
index e3dc1b67c06b..89cb761665d5 100644
--- a/games/crafty-open-small/Makefile
+++ b/games/crafty-open-small/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/common/small/
 DISTNAME=	small
 
 MAINTAINER=	seggers@semyam.dinoco.de
+COMMENT=	The small opening book (about 600 KByte) for crafty
 
 BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
diff --git a/games/crafty-open-small/pkg-comment b/games/crafty-open-small/pkg-comment
deleted file mode 100644
index 66024be6a820..000000000000
--- a/games/crafty-open-small/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The small opening book (about 600 KByte) for crafty
diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index 90e010b9fc06..2cd07e921b51 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -15,6 +15,7 @@ DISTFILES=	crafty-${PORTVERSION}.tar.gz:src \
 		start.pgn.gz:data
 
 MAINTAINER=	seggers@semyam.dinoco.de
+COMMENT=	A chess programm for playing and analyzing games
 
 .if !defined(NOPORTDOCS)
 DOCFILES=	crafty.doc.ascii crafty.doc.ps
diff --git a/games/crafty/pkg-comment b/games/crafty/pkg-comment
deleted file mode 100644
index bf5397d1ca95..000000000000
--- a/games/crafty/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A chess programm for playing and analyzing games
diff --git a/games/crimson/Makefile b/games/crimson/Makefile
index 102a5558b907..763878707143 100644
--- a/games/crimson/Makefile
+++ b/games/crimson/Makefile
@@ -12,6 +12,7 @@ PKGNAMESUFFIX=	-fields
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	Jan.Stocker@t-online.de
+COMMENT=	Tactical war game in the tradition of Battle Isle
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/crimson/pkg-comment b/games/crimson/pkg-comment
deleted file mode 100644
index 32fc05a723d5..000000000000
--- a/games/crimson/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tactical war game in the tradition of Battle Isle
diff --git a/games/cube/Makefile b/games/cube/Makefile
index 5b6d69550990..a8d907793754 100644
--- a/games/cube/Makefile
+++ b/games/cube/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://ludo.uib.no/cube/ \
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/:S/./_/}
 
 MAINTAINER=	avleeuwen@piwebs.com
+COMMENT=	An OpenGL 3D First Person Shooter game
 
 LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
 		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/cube/pkg-comment b/games/cube/pkg-comment
deleted file mode 100644
index c411f6f29356..000000000000
--- a/games/cube/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An OpenGL 3D First Person Shooter game
diff --git a/games/cursive/Makefile b/games/cursive/Makefile
index 057c1b24e7a7..5696a26463ab 100644
--- a/games/cursive/Makefile
+++ b/games/cursive/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=   .tgz
 
 MAINTAINER=	howardjp@wam.umd.edu
+COMMENT=	Create ASCII character cursive handwriting
 
 MAN6=		cursive.6
 
diff --git a/games/cursive/pkg-comment b/games/cursive/pkg-comment
deleted file mode 100644
index bc564df80bab..000000000000
--- a/games/cursive/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create ASCII character cursive handwriting
diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile
index c600f5d16d27..14d27bb4af9d 100644
--- a/games/dmjava/Makefile
+++ b/games/dmjava/Makefile
@@ -19,6 +19,7 @@ DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	DMJ.ZIP
 
 MAINTAINER=	lehmann@ans-netz.de
+COMMENT=	Dungeon Master Java is a remake of the classic Dungeon Master by FTL
 
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
diff --git a/games/dmjava/pkg-comment b/games/dmjava/pkg-comment
deleted file mode 100644
index 691f3130126c..000000000000
--- a/games/dmjava/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dungeon Master Java is a remake of the classic Dungeon Master by FTL
diff --git a/games/dontspace/Makefile b/games/dontspace/Makefile
index 1f33ef1159d5..5b90accae03d 100644
--- a/games/dontspace/Makefile
+++ b/games/dontspace/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games tk82
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/JACOBY/
 
 MAINTAINER=	johnh@isi.edu
+COMMENT=	A solitaire game for X11 modeled after Free Space
 
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
diff --git a/games/dontspace/pkg-comment b/games/dontspace/pkg-comment
deleted file mode 100644
index 45647ddaea9a..000000000000
--- a/games/dontspace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A solitaire game for X11 modeled after Free Space
diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile
index f0399938a03b..f2ba49a7fd84 100644
--- a/games/doomlegacy/Makefile
+++ b/games/doomlegacy/Makefile
@@ -14,6 +14,7 @@ DISTFILES=	${DIST} ${WADFILE}
 EXTRACT_ONLY=	${DIST}
 
 MAINTAINER=	bock@bock.nnov.ru
+COMMENT=	DooM Legacy: popular DooM clone!
 
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip \
 		nasm:${PORTSDIR}/devel/nasm
diff --git a/games/doomlegacy/pkg-comment b/games/doomlegacy/pkg-comment
deleted file mode 100644
index faea4f361d0d..000000000000
--- a/games/doomlegacy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DooM Legacy: popular DooM clone!
diff --git a/games/dungeon/Makefile b/games/dungeon/Makefile
index 1ee82a55de69..f3bfdd4102f7 100644
--- a/games/dungeon/Makefile
+++ b/games/dungeon/Makefile
@@ -21,6 +21,7 @@ MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/games/source/ \
 DISTFILES=	dungn27s.zip dungn32b.zip
 
 MAINTAINER=	rmiya@cc.hirosaki-u.ac.jp
+COMMENT=	Text adventure game of ZORK
 
 EXTRACT_ONLY=	dungn27s.zip
 
diff --git a/games/dungeon/pkg-comment b/games/dungeon/pkg-comment
deleted file mode 100644
index 7930be54a5a4..000000000000
--- a/games/dungeon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text adventure game of ZORK
diff --git a/games/editss/Makefile b/games/editss/Makefile
index 5b84cc5d6f94..5ed096ead591 100644
--- a/games/editss/Makefile
+++ b/games/editss/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.xpilot.org/pub/contrib/
 
 MAINTAINER=	jylefort@brutele.be
+COMMENT=	An editor for XPilot shipshapes
 
 USE_IMAKE=	yes
 ALL_TARGET=	editss
diff --git a/games/editss/pkg-comment b/games/editss/pkg-comment
deleted file mode 100644
index 889ff53f1ac6..000000000000
--- a/games/editss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An editor for XPilot shipshapes
diff --git a/games/eights/Makefile b/games/eights/Makefile
index b35bc7d6b7df..294729379444 100644
--- a/games/eights/Makefile
+++ b/games/eights/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://dxkelly.freeshell.org/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	bob@fly.homeunix.org
+COMMENT=	Text based card game, the objective is to get rid of all your cards
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/eights/pkg-comment b/games/eights/pkg-comment
deleted file mode 100644
index 06ae2fdf83f0..000000000000
--- a/games/eights/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text based card game, the objective is to get rid of all your cards
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index c550bd0af017..6a0f6c35b6c5 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://savannah.nongnu.org/download/enigma/
 
 MAINTAINER=	edwin@mavetju.org
+COMMENT=	Enigma is a reimplementation of Oxyd, a puzzle game
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/sdl11-config:${PORTSDIR}/devel/sdl12 \
 		lua:${PORTSDIR}/lang/lua
diff --git a/games/enigma/pkg-comment b/games/enigma/pkg-comment
deleted file mode 100644
index 21c56874c3f1..000000000000
--- a/games/enigma/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Enigma is a reimplementation of Oxyd, a puzzle game
diff --git a/games/euchre/Makefile b/games/euchre/Makefile
index 0d34455e47b0..b4f063549b80 100644
--- a/games/euchre/Makefile
+++ b/games/euchre/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	laszlof@freebsdmatrix.net
+COMMENT=	Very popular card game with variable skill levels
 
 USE_AUTOMAKE=	yes
 USE_GTK=	yes
diff --git a/games/euchre/pkg-comment b/games/euchre/pkg-comment
deleted file mode 100644
index 2fcc1d37a914..000000000000
--- a/games/euchre/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Very popular card game with variable skill levels
diff --git a/games/exult/Makefile b/games/exult/Makefile
index 81c911efc19c..a35b4c3a0d03 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	tiamat@telegraph.spb.ru
+COMMENT=	Ultima VII engine
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
diff --git a/games/exult/pkg-comment b/games/exult/pkg-comment
deleted file mode 100644
index a3883a763da5..000000000000
--- a/games/exult/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ultima VII engine
diff --git a/games/flying/Makefile b/games/flying/Makefile
index fb3b3296b2d8..f8d4edd27c07 100644
--- a/games/flying/Makefile
+++ b/games/flying/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	games/arcade
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	searle@longacre.demon.co.uk
+COMMENT=	Pool/snooker/billiards/carrom/etc game
 
 USE_IMAKE=	yes
 MAN1=		flying.1
diff --git a/games/flying/pkg-comment b/games/flying/pkg-comment
deleted file mode 100644
index 9e7b2ccc559f..000000000000
--- a/games/flying/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Pool/snooker/billiards/carrom/etc game
diff --git a/games/freeciv-gtk/Makefile b/games/freeciv-gtk/Makefile
index 73c4bfe50026..6db477bdfcf9 100644
--- a/games/freeciv-gtk/Makefile
+++ b/games/freeciv-gtk/Makefile
@@ -8,6 +8,9 @@
 PKGNAMESUFFIX=	-gtk
 MASTERDIR=	${.CURDIR}/../freeciv
 
+MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	A civilisation clone for X11 using GNOME; multiplayer
+
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
 
diff --git a/games/freeciv-gtk/pkg-comment b/games/freeciv-gtk/pkg-comment
deleted file mode 100644
index cff18b5193bd..000000000000
--- a/games/freeciv-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A civilisation clone for X11 using GNOME; multiplayer
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index 4c628676885d..ab8ee3b7c524 100644
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@@ -12,7 +12,8 @@ MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		ftp://ftp.netc.pt/pub/freeciv/stable/ \
 		ftp://ftp.pvv.ntnu.no/pub/freeciv/stable/
 
-MAINTAINER=	adam-ports@blacktabby.org
+MAINTAINER?=	adam-ports@blacktabby.org
+COMMENT?=	A civilisation clone for X11; multiplayer
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
diff --git a/games/freeciv-gtk2/pkg-comment b/games/freeciv-gtk2/pkg-comment
deleted file mode 100644
index 8bcb4e643072..000000000000
--- a/games/freeciv-gtk2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A civilisation clone for X11; multiplayer
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 4c628676885d..ab8ee3b7c524 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -12,7 +12,8 @@ MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		ftp://ftp.netc.pt/pub/freeciv/stable/ \
 		ftp://ftp.pvv.ntnu.no/pub/freeciv/stable/
 
-MAINTAINER=	adam-ports@blacktabby.org
+MAINTAINER?=	adam-ports@blacktabby.org
+COMMENT?=	A civilisation clone for X11; multiplayer
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
diff --git a/games/freeciv/pkg-comment b/games/freeciv/pkg-comment
deleted file mode 100644
index 8bcb4e643072..000000000000
--- a/games/freeciv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A civilisation clone for X11; multiplayer
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index e127df4dda2e..cfef6bf3f1bc 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/infocom/interpreters/frotz/ \
 		http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/
 
 MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	Infocom games interpreter
 
 MAKE_ARGS=	CC="${CC}" OPTS="${CFLAGS}" PREFIX="${PREFIX}" \
 		CONFIG_DIR="${PREFIX}/etc" INCL="" LIB=""
diff --git a/games/frotz/pkg-comment b/games/frotz/pkg-comment
deleted file mode 100644
index 0f20401ea370..000000000000
--- a/games/frotz/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Infocom games interpreter
diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile
index 63dc693cc10d..2abafce2d743 100644
--- a/games/frozenbubble/Makefile
+++ b/games/frozenbubble/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	frozen-bubble-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	klaus.goger@reflex.at
+COMMENT=	Throw colourful bubbles to build groups and destroy the groups
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/games/frozenbubble/pkg-comment b/games/frozenbubble/pkg-comment
deleted file mode 100644
index 6984be5c1e99..000000000000
--- a/games/frozenbubble/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Throw colourful bubbles to build groups and destroy the groups
diff --git a/games/gleyes/Makefile b/games/gleyes/Makefile
index 337d1fda5963..0db9b3d1239b 100644
--- a/games/gleyes/Makefile
+++ b/games/gleyes/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES=	ftp://ftp.riken.go.jp/pub/X11/acontrib/gleyes/ \
 # which is unresponsive since about 21.12.1998
 
 MAINTAINER=	malte.lance@gmx.net
+COMMENT=	GLUT version of Xeyes
 
 USE_X_PREFIX=	yes
 USE_MESA=	yes
diff --git a/games/gleyes/pkg-comment b/games/gleyes/pkg-comment
deleted file mode 100644
index 8cddbbdf1339..000000000000
--- a/games/gleyes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GLUT version of Xeyes
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index d6a30afb9588..cca243306bd5 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	An Internet playable version of the Settlers of Catan for GNOME/GTK
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/games/gnocatan/pkg-comment b/games/gnocatan/pkg-comment
deleted file mode 100644
index 5f09020f5302..000000000000
--- a/games/gnocatan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Internet playable version of the Settlers of Catan for GNOME/GTK
diff --git a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile
index a08df7a6d914..c64a3d0c4e9f 100644
--- a/games/gnomekiss/Makefile
+++ b/games/gnomekiss/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games gnome
 MASTER_SITES=	http://www.ecs.soton.ac.uk/~njl98r/code/kiss/
 
 MAINTAINER=	umeno@rr.iij4u.or.jp
+COMMENT=	GNOME version of Kisekae Set System
 
 RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
diff --git a/games/gnomekiss/pkg-comment b/games/gnomekiss/pkg-comment
deleted file mode 100644
index f29a75d92d37..000000000000
--- a/games/gnomekiss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME version of Kisekae Set System
diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile
index 3968935c420b..6a3572f0b57b 100644
--- a/games/gnugo/Makefile
+++ b/games/gnugo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gnugo
 
 MAINTAINER=	spcoltri@omcl.org
+COMMENT=	The game of Go
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/games/gnugo/pkg-comment b/games/gnugo/pkg-comment
deleted file mode 100644
index 3ba03af046d4..000000000000
--- a/games/gnugo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The game of Go
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 9078f0e75899..a76249206b80 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nox@jelal.kn-bremen.de
+COMMENT=	A 3D motor sport simulator
 
 BUILD_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
diff --git a/games/gracer/pkg-comment b/games/gracer/pkg-comment
deleted file mode 100644
index 77ccfba98c3e..000000000000
--- a/games/gracer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 3D motor sport simulator
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index ed4016dd3306..57ecfab5d36c 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rhino
 
 MAINTAINER=	umeno@rr.iij4u.or.jp
+COMMENT=	GRhino Othello/Reversi Program
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
diff --git a/games/grhino/pkg-comment b/games/grhino/pkg-comment
deleted file mode 100644
index c355b1085db6..000000000000
--- a/games/grhino/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GRhino Othello/Reversi Program
diff --git a/games/groundhog/Makefile b/games/groundhog/Makefile
index 42c856ea651c..5709a0dfc0ec 100644
--- a/games/groundhog/Makefile
+++ b/games/groundhog/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://home-2.tiscali.nl/~cb007736/
 
 MAINTAINER=	edwin@mavetju.org
+COMMENT=	Groundhog, a simple logic game
 
 LIB_DEPENDS=	gtk-x11-2.200:${PORTSDIR}/x11-toolkits/gtk20		\
 		glib-2.0.200:${PORTSDIR}/devel/glib20
diff --git a/games/groundhog/pkg-comment b/games/groundhog/pkg-comment
deleted file mode 100644
index 7fbc8e22e021..000000000000
--- a/games/groundhog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Groundhog, a simple logic game
diff --git a/games/gru/Makefile b/games/gru/Makefile
index a7d2c891a751..89e5cdbf9e4c 100644
--- a/games/gru/Makefile
+++ b/games/gru/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA004959/gru/
 
 MAINTAINER=	hym@cocoa.freemail.ne.jp
+COMMENT=	Gru makes your eyes happy
 
 USE_IMAKE=	yes
 
diff --git a/games/gru/pkg-comment b/games/gru/pkg-comment
deleted file mode 100644
index e42e7c98e499..000000000000
--- a/games/gru/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gru makes your eyes happy
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index ede52c31922f..82eace306238 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	flynn@energyhq.homeip.net
+COMMENT=	A version of the popular TetriNET multiplayer tetris clone
 
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
diff --git a/games/gtetrinet/pkg-comment b/games/gtetrinet/pkg-comment
deleted file mode 100644
index 28c8b950a3fb..000000000000
--- a/games/gtetrinet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A version of the popular TetriNET multiplayer tetris clone
diff --git a/games/heretic/Makefile b/games/heretic/Makefile
index e71b7595db2f..8d2172713044 100644
--- a/games/heretic/Makefile
+++ b/games/heretic/Makefile
@@ -18,6 +18,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
 MAINTAINER=	lehmann@ans-netz.de
+COMMENT=	Unix source-port of the famous Heretic game by id Software
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/games/heretic/pkg-comment b/games/heretic/pkg-comment
deleted file mode 100644
index 74636f2c1e84..000000000000
--- a/games/heretic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Unix source-port of the famous Heretic game by id Software
diff --git a/games/hlserver-psychostats/Makefile b/games/hlserver-psychostats/Makefile
index ab6ac27b235a..76e712c23f34 100644
--- a/games/hlserver-psychostats/Makefile
+++ b/games/hlserver-psychostats/Makefile
@@ -17,6 +17,7 @@ MASTER_SITES=	ftp://ftp.psychostats.com/psychostats/ \
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	martin@tradex.sk
+COMMENT=	Popular player statistics generator for Half-Life (cs/dod)
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/games/hlserver-psychostats/pkg-comment b/games/hlserver-psychostats/pkg-comment
deleted file mode 100644
index ae4f20ea514f..000000000000
--- a/games/hlserver-psychostats/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Popular player statistics generator for Half-Life (cs/dod)
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index 1ce436e70b8b..552e9482d1ed 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -17,6 +17,7 @@ MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/mapping-tools/ \
 DISTFILES=	ifm41.tgz
 
 MAINTAINER=	bsdport@ddm.wox.org
+COMMENT=	Interactive Fiction mapper and walkthrough generator
 
 RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 
diff --git a/games/ifm/pkg-comment b/games/ifm/pkg-comment
deleted file mode 100644
index 06ed414c653c..000000000000
--- a/games/ifm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Interactive Fiction mapper and walkthrough generator
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index fc5794dfae28..a3cf217c7c22 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://home.tu-clausthal.de/student/iMaze/files/
 PKGNAMESUFFIX=	-${TOOLKIT}
 
 MAINTAINER=	rk@ronald.org
+COMMENT=	A multi-player network action game for TCP/IP with 3D graphics
 
 .if defined(WITH_MOTIF) && defined(HAVE_MOTIF)
 USE_MOTIF=	yes
diff --git a/games/imaze/pkg-comment b/games/imaze/pkg-comment
deleted file mode 100644
index b3686d3eb23e..000000000000
--- a/games/imaze/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multi-player network action game for TCP/IP with 3D graphics
diff --git a/games/ishido/Makefile b/games/ishido/Makefile
index a2d59ae0ae65..1f78319915b6 100644
--- a/games/ishido/Makefile
+++ b/games/ishido/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/misc/ \
 		ftp://ftp.nuxi.com/pub/misc/
 
 MAINTAINER=	samorodi@NUXI.com
+COMMENT=	Tile placement game
 
 USE_XLIB=	yes
 MAN6=		ishido.6
diff --git a/games/ishido/pkg-comment b/games/ishido/pkg-comment
deleted file mode 100644
index 79cd16ca49ca..000000000000
--- a/games/ishido/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tile placement game
diff --git a/games/jfk/Makefile b/games/jfk/Makefile
index fc86d5f3d59e..a36731465c77 100644
--- a/games/jfk/Makefile
+++ b/games/jfk/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://relax.ath.cx/jfk/
 
 MAINTAINER=	e0026813@stud3.tuwien.ac.at
+COMMENT=	A multiplayer 2D shoot'em up game
 
 LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image
 
diff --git a/games/jfk/pkg-comment b/games/jfk/pkg-comment
deleted file mode 100644
index 05650794d863..000000000000
--- a/games/jfk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multiplayer 2D shoot'em up game
diff --git a/games/jumpnbump/Makefile b/games/jumpnbump/Makefile
index 8119fd06cdb8..fd99ab616652 100644
--- a/games/jumpnbump/Makefile
+++ b/games/jumpnbump/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.jumpbump.mine.nu/port/ \
 	http://jumpnbump.linuxsys.de/
 
 MAINTAINER=	gurkan@linuks.mine.nu
+COMMENT=	A fun multiplayer game with cute fluffy bunnies and bloody explosions
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/jumpnbump/pkg-comment b/games/jumpnbump/pkg-comment
deleted file mode 100644
index 5107a73ee2ef..000000000000
--- a/games/jumpnbump/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fun multiplayer game with cute fluffy bunnies and bloody explosions
diff --git a/games/klondike/Makefile b/games/klondike/Makefile
index b260e8d4ecb9..71083af6a50e 100644
--- a/games/klondike/Makefile
+++ b/games/klondike/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games tk82
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/JACOBY/
 
 MAINTAINER=	faber@isi.edu
+COMMENT=	A solitaire game for X11
 
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
diff --git a/games/klondike/pkg-comment b/games/klondike/pkg-comment
deleted file mode 100644
index 0cb2938e0b0b..000000000000
--- a/games/klondike/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A solitaire game for X11
diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile
index 515ad3eae9c4..9633256d349e 100644
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	knights
 
 MAINTAINER=	stefan.jahn@nemesis-sektor.de
+COMMENT=	A KDE chess interface (gnuchess/crafty)
 
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 
diff --git a/games/knights-kde4/pkg-comment b/games/knights-kde4/pkg-comment
deleted file mode 100644
index 3067650decc3..000000000000
--- a/games/knights-kde4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A KDE chess interface (gnuchess/crafty)
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 515ad3eae9c4..9633256d349e 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	knights
 
 MAINTAINER=	stefan.jahn@nemesis-sektor.de
+COMMENT=	A KDE chess interface (gnuchess/crafty)
 
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 
diff --git a/games/knights/pkg-comment b/games/knights/pkg-comment
deleted file mode 100644
index 3067650decc3..000000000000
--- a/games/knights/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A KDE chess interface (gnuchess/crafty)
diff --git a/games/kobodeluxe/Makefile b/games/kobodeluxe/Makefile
index fd7eff127f05..66a1434a18e9 100644
--- a/games/kobodeluxe/Makefile
+++ b/games/kobodeluxe/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://olofson.net/skobo/download/ \
 DISTNAME=	KoboDeluxe-${PORTVERSION:S/.p/pre/}
 
 MAINTAINER=	verm@drunkmonk.net
+COMMENT=	Kobo Deluxe (formerly SKobo) is an SDL port of Akira Higuchi's XKobo
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image
diff --git a/games/kobodeluxe/pkg-comment b/games/kobodeluxe/pkg-comment
deleted file mode 100644
index b197e6011be6..000000000000
--- a/games/kobodeluxe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Kobo Deluxe (formerly SKobo) is an SDL port of Akira Higuchi's XKobo
diff --git a/games/ladder/Makefile b/games/ladder/Makefile
index f945045ccdb9..8766d005da60 100644
--- a/games/ladder/Makefile
+++ b/games/ladder/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.srv.net/~kth/ \
 DISTFILES=	ladder.tar
 
 MAINTAINER=	sec@42.org
+COMMENT=	The old "ladder" game
 
 RESTRICTED=	"possible copyright problems ?"
 
diff --git a/games/ladder/pkg-comment b/games/ladder/pkg-comment
deleted file mode 100644
index ca7600356bbf..000000000000
--- a/games/ladder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The old "ladder" game
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index d298ce5beb77..7f4607a76e9e 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgames
 
 MAINTAINER=	verm@drunkmonk.net
+COMMENT=	The polished successor to LBreakout
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
diff --git a/games/lbreakout2/pkg-comment b/games/lbreakout2/pkg-comment
deleted file mode 100644
index 94aa1a95b5cf..000000000000
--- a/games/lbreakout2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The polished successor to LBreakout
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index 64c621e358f7..bb6628793b67 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgeneral
 
 MAINTAINER=	filippo@widestore.net
+COMMENT=	A turn-based strategy engine inspired by Panzer General
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 
diff --git a/games/lgeneral/pkg-comment b/games/lgeneral/pkg-comment
deleted file mode 100644
index df5275a3fda8..000000000000
--- a/games/lgeneral/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A turn-based strategy engine inspired by Panzer General
diff --git a/games/linux-nwserver/Makefile b/games/linux-nwserver/Makefile
index 55da7216f592..1f385b1413ff 100644
--- a/games/linux-nwserver/Makefile
+++ b/games/linux-nwserver/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://nwdownloads.bioware.com/neverwinternights/linux/127/
 DISTNAME=	linuxserver127
 
 MAINTAINER=	tiamat@telegraph.spb.ru
+COMMENT=	Neverwinter Nights Linux (x86) Dedicated Server
 
 USE_LINUX=	yes
 NO_BUILD=	yes
diff --git a/games/linux-nwserver/pkg-comment b/games/linux-nwserver/pkg-comment
deleted file mode 100644
index 200635ff5211..000000000000
--- a/games/linux-nwserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Neverwinter Nights Linux (x86) Dedicated Server
diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile
index e4a7f73772ef..e92c09af671a 100644
--- a/games/lmarbles/Makefile
+++ b/games/lmarbles/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgames
 
 MAINTAINER=	verm@drunkmonk.net
+COMMENT=	A challenging puzzle game similar to Atomix
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 
diff --git a/games/lmarbles/pkg-comment b/games/lmarbles/pkg-comment
deleted file mode 100644
index d4ef04a3e152..000000000000
--- a/games/lmarbles/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A challenging puzzle game similar to Atomix
diff --git a/games/magiccube4d/Makefile b/games/magiccube4d/Makefile
index 6868fc41d5e3..98e2386feca2 100644
--- a/games/magiccube4d/Makefile
+++ b/games/magiccube4d/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	mc4d-src-${PORTVERSION:S/./_/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	karlj000@unbc.ca
+COMMENT=	MagicCube4D is a fully functional four-dimensional analog of Rubik's cube
 
 USE_X_PREFIX=	yes
 
diff --git a/games/magiccube4d/pkg-comment b/games/magiccube4d/pkg-comment
deleted file mode 100644
index 8b54d9d8879e..000000000000
--- a/games/magiccube4d/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MagicCube4D is a fully functional four-dimensional analog of Rubik's cube
diff --git a/games/mangband/Makefile b/games/mangband/Makefile
index 005925caaf4e..f6320b388f1c 100644
--- a/games/mangband/Makefile
+++ b/games/mangband/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://mangband.org/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 
 MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	Multiplayer rogue-like game with color, X11 support
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
diff --git a/games/mangband/pkg-comment b/games/mangband/pkg-comment
deleted file mode 100644
index 5193f8836809..000000000000
--- a/games/mangband/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multiplayer rogue-like game with color, X11 support
diff --git a/games/marbles/Makefile b/games/marbles/Makefile
index e4a7f73772ef..e92c09af671a 100644
--- a/games/marbles/Makefile
+++ b/games/marbles/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgames
 
 MAINTAINER=	verm@drunkmonk.net
+COMMENT=	A challenging puzzle game similar to Atomix
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 
diff --git a/games/marbles/pkg-comment b/games/marbles/pkg-comment
deleted file mode 100644
index d4ef04a3e152..000000000000
--- a/games/marbles/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A challenging puzzle game similar to Atomix
diff --git a/games/mindfocus/Makefile b/games/mindfocus/Makefile
index 66ddd2daf9b7..f695db6f6c8d 100644
--- a/games/mindfocus/Makefile
+++ b/games/mindfocus/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.toyoshima-house.net/classic/mf/files/
 DISTFILES=	mindfocus-0.88.tar.gz mindfocus-data1.tar.gz
 
 MAINTAINER=	ixtl@utmc.or.jp
+COMMENT=	Lovely characters stay on top of active window
 
 USE_IMAKE=	yes
 USE_XPM=	yes
diff --git a/games/mindfocus/pkg-comment b/games/mindfocus/pkg-comment
deleted file mode 100644
index 078b80eda02b..000000000000
--- a/games/mindfocus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lovely characters stay on top of active window
diff --git a/games/nInvaders/Makefile b/games/nInvaders/Makefile
index 26bb5b386e38..f58c293a82de 100644
--- a/games/nInvaders/Makefile
+++ b/games/nInvaders/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://dettus.dyndns.org/ninvaders/
 
 MAINTAINER=	mich@freebsdcluster.org
+COMMENT=	The nIvaders game is a Space Invaders clone for ncurses
 
 USE_REINPLACE=	yes
 
diff --git a/games/nInvaders/pkg-comment b/games/nInvaders/pkg-comment
deleted file mode 100644
index c9e75a168099..000000000000
--- a/games/nInvaders/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The nIvaders game is a Space Invaders clone for ncurses
diff --git a/games/nadar/Makefile b/games/nadar/Makefile
index ce647dbbd46e..a002bd13e6f0 100644
--- a/games/nadar/Makefile
+++ b/games/nadar/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://web.ffn.ne.jp/~hsakai/myfreesoft/
 
 MAINTAINER=	hsakai@m8.ffn.ne.jp
+COMMENT=	A network tank battle game
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/games/nadar/pkg-comment b/games/nadar/pkg-comment
deleted file mode 100644
index aed920268aef..000000000000
--- a/games/nadar/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A network tank battle game
diff --git a/games/netris/Makefile b/games/netris/Makefile
index 42e115325a8b..d61c65211b61 100644
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@@ -16,6 +16,7 @@ PATCHFILES=		netris-0.5-v6-19991206a.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		desmo@bandwidth.org
+COMMENT=	A network head to head version of T*tris
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
diff --git a/games/netris/pkg-comment b/games/netris/pkg-comment
deleted file mode 100644
index 14f1525e76b6..000000000000
--- a/games/netris/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A network head to head version of T*tris
diff --git a/games/netspades/Makefile b/games/netspades/Makefile
index 84e36f1d3961..ebcfc9fac507 100644
--- a/games/netspades/Makefile
+++ b/games/netspades/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.ece.rice.edu/~brentmh/spades/
 
 MAINTAINER=	laszlof@freebsdmatrix.net
+COMMENT=	Very popular card game for 1-4 players over a network
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 
diff --git a/games/netspades/pkg-comment b/games/netspades/pkg-comment
deleted file mode 100644
index 6b9367aa9be2..000000000000
--- a/games/netspades/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Very popular card game for 1-4 players over a network
diff --git a/games/nettoe/Makefile b/games/nettoe/Makefile
index b9894c3d47bb..a82376abcbe9 100644
--- a/games/nettoe/Makefile
+++ b/games/nettoe/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	rbg@gayteenresource.org
+COMMENT=	A tic-tac-toe game playable over the network
 
 MAN6=		nettoe.6
 
diff --git a/games/nettoe/pkg-comment b/games/nettoe/pkg-comment
deleted file mode 100644
index 4dd7d84fc3b5..000000000000
--- a/games/nettoe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tic-tac-toe game playable over the network
diff --git a/games/nibbles/Makefile b/games/nibbles/Makefile
index e5c913f42863..edda743747cd 100644
--- a/games/nibbles/Makefile
+++ b/games/nibbles/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://freebsdcluster.org/~mich/software/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mich@freebsdcluster.org
+COMMENT=	Nibbles is a simple ncurses-based console game
 
 LDFLAGS+=	-L${LOCALBASE}/lib -lncurses
 CFLAGS+=	-Wall
diff --git a/games/nibbles/pkg-comment b/games/nibbles/pkg-comment
deleted file mode 100644
index 9cb5a96f9106..000000000000
--- a/games/nibbles/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Nibbles is a simple ncurses-based console game
diff --git a/games/oneko-sakura/Makefile b/games/oneko-sakura/Makefile
index b0d4308c0320..9a690df178fe 100644
--- a/games/oneko-sakura/Makefile
+++ b/games/oneko-sakura/Makefile
@@ -17,6 +17,7 @@ PATCHFILES=	oneko-1.2.sakura.5.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	hotaru@tail.net
+COMMENT=	A cat, Sakura or Tomoyo chasing a mouse all over the screen
 
 USE_IMAKE=	yes
 MAN6=		oneko.6
diff --git a/games/oneko-sakura/pkg-comment b/games/oneko-sakura/pkg-comment
deleted file mode 100644
index 03608d885a88..000000000000
--- a/games/oneko-sakura/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A cat, Sakura or Tomoyo chasing a mouse all over the screen
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index 04f1320929da..d45b630ddd14 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -20,6 +20,7 @@ DISTFILES=	oneko-2.0b.tar.gz \
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	candy@kgc.co.jp
+COMMENT=	A cat chasing a mouse all over the screen
 
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
diff --git a/games/oneko/pkg-comment b/games/oneko/pkg-comment
deleted file mode 100644
index 013c718a3f4f..000000000000
--- a/games/oneko/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A cat chasing a mouse all over the screen
diff --git a/games/pentix/Makefile b/games/pentix/Makefile
index 47a7c2c6564d..cee97140c613 100644
--- a/games/pentix/Makefile
+++ b/games/pentix/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.sympad.net/~andy/pentix/
 
 MAINTAINER=	andy@sympad.net
+COMMENT=	This is a game of pentix for terminals
 
 ALL_TARGET=	pentix
 
diff --git a/games/pentix/pkg-comment b/games/pentix/pkg-comment
deleted file mode 100644
index 754b9e505512..000000000000
--- a/games/pentix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This is a game of pentix for terminals
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index af54d84a444d..16f1e780f2cf 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	thierry@pompo.net
+COMMENT=	Emilia Pinball is a free pinball game
 
 .if !defined(WITH_ALLEGRO)
 BUILD_DEPENDS=	${SDL_CONFIG}:${PORTSDIR}/devel/sdl12
diff --git a/games/pinball/pkg-comment b/games/pinball/pkg-comment
deleted file mode 100644
index 71a94c16d93d..000000000000
--- a/games/pinball/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Emilia Pinball is a free pinball game
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index d6a30afb9588..cca243306bd5 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	An Internet playable version of the Settlers of Catan for GNOME/GTK
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/games/pioneers/pkg-comment b/games/pioneers/pkg-comment
deleted file mode 100644
index 5f09020f5302..000000000000
--- a/games/pioneers/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Internet playable version of the Settlers of Catan for GNOME/GTK
diff --git a/games/pmars/Makefile b/games/pmars/Makefile
index 64a786d64c71..dfa0d3ae9055 100644
--- a/games/pmars/Makefile
+++ b/games/pmars/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.koth.org/pmars/ \
 DISTFILES=	pmars08s.tar.Z
 
 MAINTAINER=	gmarco@giovannelli.it
+COMMENT=	A portable corewar system with ICWS'94 extensions
 
 USE_XLIB=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/pmars/pkg-comment b/games/pmars/pkg-comment
deleted file mode 100644
index 2682481654dd..000000000000
--- a/games/pmars/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A portable corewar system with ICWS'94 extensions
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 54ce3f4ad51a..3e7fc3c7fbf6 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	fracture@allusion.net
+COMMENT=	A multiplayer-capable and modified version of ID's classic doom game
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		smpeg.1:${PORTSDIR}/graphics/smpeg \
diff --git a/games/prboom/pkg-comment b/games/prboom/pkg-comment
deleted file mode 100644
index 8a4c88f08dd4..000000000000
--- a/games/prboom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multiplayer-capable and modified version of ID's classic doom game
diff --git a/games/ptkei/Makefile b/games/ptkei/Makefile
index c532ef0e941e..363d19e33a9b 100644
--- a/games/ptkei/Makefile
+++ b/games/ptkei/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.lfmm.org/ptkei/
 
 MAINTAINER=	pgfb@imp.ch
+COMMENT=	A Python/Tk graphical client for Wolfpack Empire servers
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/pmw
diff --git a/games/ptkei/pkg-comment b/games/ptkei/pkg-comment
deleted file mode 100644
index 9feae2345906..000000000000
--- a/games/ptkei/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python/Tk graphical client for Wolfpack Empire servers
diff --git a/games/pysol-cardsets/Makefile b/games/pysol-cardsets/Makefile
index 6361609ccf10..4959e5fe41ef 100644
--- a/games/pysol-cardsets/Makefile
+++ b/games/pysol-cardsets/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://pysol2.sourceforge.net/download/
 
 MAINTAINER=	serg@tmn.ru
+COMMENT=	Collection of free cardsets adapted for use with PySol
 
 RUN_DEPENDS=	pysol:${PORTSDIR}/games/pysol
 
diff --git a/games/pysol-cardsets/pkg-comment b/games/pysol-cardsets/pkg-comment
deleted file mode 100644
index 51ce9c910f59..000000000000
--- a/games/pysol-cardsets/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collection of free cardsets adapted for use with PySol
diff --git a/games/pysol-music/Makefile b/games/pysol-music/Makefile
index 088461a5627e..07fab27abb81 100644
--- a/games/pysol-music/Makefile
+++ b/games/pysol-music/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://pysol2.sourceforge.net/download/
 
 MAINTAINER=	serg@tmn.ru
+COMMENT=	Collection of background music for use with PySol
 
 RUN_DEPENDS=	pysol:${PORTSDIR}/games/pysol
 
diff --git a/games/pysol-music/pkg-comment b/games/pysol-music/pkg-comment
deleted file mode 100644
index df722df40ce7..000000000000
--- a/games/pysol-music/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collection of background music for use with PySol
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index ffe1b9302188..1b7093261513 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	quake
 DISTNAME=	quake2-${PORTVERSION}
 
 MAINTAINER=	q@uni.de
+COMMENT=	Quakeforge version of Quake 2 (First Person Shooter)
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/games/quake2forge/pkg-comment b/games/quake2forge/pkg-comment
deleted file mode 100644
index 768222c2b154..000000000000
--- a/games/quake2forge/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quakeforge version of Quake 2 (First Person Shooter)
diff --git a/games/quakeserver/Makefile b/games/quakeserver/Makefile
index 25f1c68ffba0..3722a750565f 100644
--- a/games/quakeserver/Makefile
+++ b/games/quakeserver/Makefile
@@ -14,6 +14,7 @@ DISTFILES=	unixded-${PORTVERSION}-i386-unknown-bsdi3.0.tar.gz \
 		quake106.zip
 
 MAINTAINER=	martin@raq.cx
+COMMENT=	A server to host Quake network games under FreeBSD
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
 		lha:${PORTSDIR}/archivers/lha
diff --git a/games/quakeserver/pkg-comment b/games/quakeserver/pkg-comment
deleted file mode 100644
index 6deeaa89ac87..000000000000
--- a/games/quakeserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A server to host Quake network games under FreeBSD
diff --git a/games/rfksay/Makefile b/games/rfksay/Makefile
index c47596acf000..c7793e761c5e 100644
--- a/games/rfksay/Makefile
+++ b/games/rfksay/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.redhotlunix.com/
 DISTNAME=	rfksay
 
 MAINTAINER=	mich@freebsdcluster.org
+COMMENT=	Generates a kitten finding robot with a text bubble
 
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/games/rfksay/pkg-comment b/games/rfksay/pkg-comment
deleted file mode 100644
index 7975bba3de5c..000000000000
--- a/games/rfksay/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generates a kitten finding robot with a text bubble
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 1a41070fd7c9..f08ebaae8648 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \
 		http://homepages.compuserve.de/rocksndiamonds/
 
 MAINTAINER=	mwest@uct.ac.za
+COMMENT=	Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
 
 .if defined(WITH_SDL)
 LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
diff --git a/games/rocksndiamonds/pkg-comment b/games/rocksndiamonds/pkg-comment
deleted file mode 100644
index f0d32961e01f..000000000000
--- a/games/rocksndiamonds/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index e7d463bb9312..8fd5bb4a1059 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.lysator.liu.se/realtimebattle/Download/
 
 MAINTAINER=	draj@oceanfree.net
+COMMENT=	Robot programming game for UNIX
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/games/rtb/pkg-comment b/games/rtb/pkg-comment
deleted file mode 100644
index ff4c7aa0925f..000000000000
--- a/games/rtb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Robot programming game for UNIX
diff --git a/games/scid/Makefile b/games/scid/Makefile
index 3664423bcf57..31866bc871a2 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://scid.sourceforge.net/download/ \
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	volkmann@inode.at
+COMMENT=	A free chess database application
 
 LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
 		tk84:${PORTSDIR}/x11-toolkits/tk84
diff --git a/games/scid/pkg-comment b/games/scid/pkg-comment
deleted file mode 100644
index 3c4be87a2ecb..000000000000
--- a/games/scid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free chess database application
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index af5c4c7bf408..3322175ccbea 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}-src
 
 MAINTAINER=	flynn@energyhq.homeip.net
+COMMENT=	Free implementation of LucasArts S.C.U.M.M. interpreter
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 
diff --git a/games/scummvm/pkg-comment b/games/scummvm/pkg-comment
deleted file mode 100644
index 312a3b1465c9..000000000000
--- a/games/scummvm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free implementation of LucasArts S.C.U.M.M. interpreter
diff --git a/games/sex/Makefile b/games/sex/Makefile
index 881457d810ef..c15f75b57aff 100644
--- a/games/sex/Makefile
+++ b/games/sex/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://spatula.net/software/sex/
 
 MAINTAINER=	freebsd@spatula.net
+COMMENT=	Spouts silly mad-lib-style porn-like text
 
 MAN6=		sex.6
 MANCOMPRESSED=	yes
diff --git a/games/sex/pkg-comment b/games/sex/pkg-comment
deleted file mode 100644
index 26ee67927537..000000000000
--- a/games/sex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Spouts silly mad-lib-style porn-like text
diff --git a/games/sl/Makefile b/games/sl/Makefile
index 6e9a52cd706c..ad989bf2cfef 100644
--- a/games/sl/Makefile
+++ b/games/sl/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	hym@cocoa.freemail.ne.jp
+COMMENT=	A steam locomotive runs across the screen if you type "sl" instead of "ls"
 
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
diff --git a/games/sl/pkg-comment b/games/sl/pkg-comment
deleted file mode 100644
index 628e0b25500f..000000000000
--- a/games/sl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A steam locomotive runs across the screen if you type "sl" instead of "ls"
diff --git a/games/slashem-tty/Makefile b/games/slashem-tty/Makefile
index f5debfea5bf4..2fb7c3aa78f6 100644
--- a/games/slashem-tty/Makefile
+++ b/games/slashem-tty/Makefile
@@ -14,6 +14,7 @@ PKGNAMESUFFIX=	-tty
 DISTNAME=	se${PORTVERSION:S/.//g:L}
 
 MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	A dungeon explorin', slashin', hackin' game
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/games/slashem-tty/pkg-comment b/games/slashem-tty/pkg-comment
deleted file mode 100644
index 70ca7a893988..000000000000
--- a/games/slashem-tty/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dungeon explorin', slashin', hackin' game
diff --git a/games/smiley/Makefile b/games/smiley/Makefile
index 6c31bd322b50..bceb18fb9232 100644
--- a/games/smiley/Makefile
+++ b/games/smiley/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.fu-berlin.de/pub/unix/misc/smiley/
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
+COMMENT=	A "server" to print out a smiley with it's explanation
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/smiley/pkg-comment b/games/smiley/pkg-comment
deleted file mode 100644
index c57acd7d6c27..000000000000
--- a/games/smiley/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A "server" to print out a smiley with it's explanation
diff --git a/games/sol/Makefile b/games/sol/Makefile
index cfbd07266674..7be257751bb0 100644
--- a/games/sol/Makefile
+++ b/games/sol/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 
 MAINTAINER=	edwin@mavetju.org
+COMMENT=	Solitaire card game for X Window System
 
 LIB_DEPENDS=	shhopt.1:${PORTSDIR}/devel/libshhopt \
 		shhmsg.1:${PORTSDIR}/devel/libshhmsg \
diff --git a/games/sol/pkg-comment b/games/sol/pkg-comment
deleted file mode 100644
index aae761502f10..000000000000
--- a/games/sol/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Solitaire card game for X Window System
diff --git a/games/sopwith/Makefile b/games/sopwith/Makefile
index 48beb34ad0c8..158483f12a25 100644
--- a/games/sopwith/Makefile
+++ b/games/sopwith/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	sdl-sopwith
 DISTNAME=	sdl_${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	edwin@mavetju.org
+COMMENT=	A classic WW1 biplane game
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/sdl11-config:${PORTSDIR}/devel/sdl12
 
diff --git a/games/sopwith/pkg-comment b/games/sopwith/pkg-comment
deleted file mode 100644
index b2a587dc8995..000000000000
--- a/games/sopwith/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A classic WW1 biplane game
diff --git a/games/speak/Makefile b/games/speak/Makefile
index 7d08aed94d41..09feaa7b24b9 100644
--- a/games/speak/Makefile
+++ b/games/speak/Makefile
@@ -11,5 +11,6 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.spatula.net/software/speak/
 
 MAINTAINER=	freebsd@spatula.net
+COMMENT=	Generates random middle-management synergy speak
 
 .include <bsd.port.mk>
diff --git a/games/speak/pkg-comment b/games/speak/pkg-comment
deleted file mode 100644
index 20bd0479da0b..000000000000
--- a/games/speak/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generates random middle-management synergy speak
diff --git a/games/tetrinet-x/Makefile b/games/tetrinet-x/Makefile
index e9532c6c57f8..fb5be5821ee1 100644
--- a/games/tetrinet-x/Makefile
+++ b/games/tetrinet-x/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.giovannelli.it/~gmarco/files/ \
 DISTFILES=	${PORTNAME}.${PORTVERSION}.tgz
 
 MAINTAINER=	gmarco@giovannelli.it
+COMMENT=	An addictive 6 player tetr*s game
 
 WRKSRC=		${WRKDIR}/tetrinetx-${PORTVERSION}
 
diff --git a/games/tetrinet-x/pkg-comment b/games/tetrinet-x/pkg-comment
deleted file mode 100644
index 922939d2045d..000000000000
--- a/games/tetrinet-x/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An addictive 6 player tetr*s game
diff --git a/games/tetrinet/Makefile b/games/tetrinet/Makefile
index 8e144270ad1c..ab6d8f6c501f 100644
--- a/games/tetrinet/Makefile
+++ b/games/tetrinet/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://achurch.org/tetrinet/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	fredrik@wasadata.com
+COMMENT=	A console tetrinet client
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tetrinet ${PREFIX}/bin
diff --git a/games/tetrinet/pkg-comment b/games/tetrinet/pkg-comment
deleted file mode 100644
index 2b11ba69bb0a..000000000000
--- a/games/tetrinet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A console tetrinet client
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index eac587ea5fd9..9d3a35c38dbd 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.muppetlabs.com/~breadbox/pub/software/tworld/
 DISTNAME=	tworld-${PORTVERSION}
 
 MAINTAINER=	sec@42.org
+COMMENT=	An emulation of the game "Chip's Challenge"
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 
diff --git a/games/tileworld/pkg-comment b/games/tileworld/pkg-comment
deleted file mode 100644
index 19bbfec5de07..000000000000
--- a/games/tileworld/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An emulation of the game "Chip's Challenge"
diff --git a/games/tkmoo/Makefile b/games/tkmoo/Makefile
index 39e095bae98f..a26650c113d8 100644
--- a/games/tkmoo/Makefile
+++ b/games/tkmoo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.awns.com/tkMOO-light/Source/
 DISTNAME=	tkMOO-light-${PORTVERSION}
 
 MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	Tk-based M** client with scripting support
 
 RUN_DEPENDS=	${WISH83}:${PORTSDIR}/x11-toolkits/tk83
 
diff --git a/games/tkmoo/pkg-comment b/games/tkmoo/pkg-comment
deleted file mode 100644
index 8651dad6cc80..000000000000
--- a/games/tkmoo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tk-based M** client with scripting support
diff --git a/games/toppler/Makefile b/games/toppler/Makefile
index df2716dd31f1..e88566744c6e 100644
--- a/games/toppler/Makefile
+++ b/games/toppler/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	toppler
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	A game where you have to climb the tower and avoid the monsters
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 LIB_DEPENDS+=	SDL_mixer:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/toppler/pkg-comment b/games/toppler/pkg-comment
deleted file mode 100644
index 613d7288fbc3..000000000000
--- a/games/toppler/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A game where you have to climb the tower and avoid the monsters
diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index f7737084d13b..e80313ed07b8 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.lionking.org/~kiza/linux/tornado/
 
 MAINTAINER=	minter@lunenburg.org
+COMMENT=	A curses-based game of weather destruction
 
 MAN6=		tornado.6
 
diff --git a/games/tornado/pkg-comment b/games/tornado/pkg-comment
deleted file mode 100644
index d9a14f44cd70..000000000000
--- a/games/tornado/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A curses-based game of weather destruction
diff --git a/games/trojka/Makefile b/games/trojka/Makefile
index d8946b9b41b3..e381ad59c2c5 100644
--- a/games/trojka/Makefile
+++ b/games/trojka/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/games/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	e@ik.nu
+COMMENT=	A game of skill
 
 MAN6=		trojka.6
 
diff --git a/games/trojka/pkg-comment b/games/trojka/pkg-comment
deleted file mode 100644
index b0da04a501c2..000000000000
--- a/games/trojka/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A game of skill
diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile
index 7838e254be28..fba7dbbe8e07 100644
--- a/games/tuxpuck/Makefile
+++ b/games/tuxpuck/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.efd.lth.se/~d00jkr/tuxpuck/
 
 MAINTAINER=	Jan.Stocker@t-online.de
+COMMENT=	Shufflepuck Cafe Clone
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/games/tuxpuck/pkg-comment b/games/tuxpuck/pkg-comment
deleted file mode 100644
index d5ee69ba6a97..000000000000
--- a/games/tuxpuck/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Shufflepuck Cafe Clone
diff --git a/games/unnethack/Makefile b/games/unnethack/Makefile
index f5debfea5bf4..2fb7c3aa78f6 100644
--- a/games/unnethack/Makefile
+++ b/games/unnethack/Makefile
@@ -14,6 +14,7 @@ PKGNAMESUFFIX=	-tty
 DISTNAME=	se${PORTVERSION:S/.//g:L}
 
 MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	A dungeon explorin', slashin', hackin' game
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/games/unnethack/pkg-comment b/games/unnethack/pkg-comment
deleted file mode 100644
index 70ca7a893988..000000000000
--- a/games/unnethack/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dungeon explorin', slashin', hackin' game
diff --git a/games/utserver-asu/Makefile b/games/utserver-asu/Makefile
index 50179a9a5b7c..8ed7679071d4 100644
--- a/games/utserver-asu/Makefile
+++ b/games/utserver-asu/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	ftp://ftp.abfackeln.com/pub/linux/ut/asu/
 DISTNAME=	asu-${PORTVERSION}
 
 MAINTAINER=	martin@tradex.sk
+COMMENT=	Abfackelns Server Utilities (ASU) for Unreal Tournament Server (Linux)
 
 RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
diff --git a/games/utserver-asu/pkg-comment b/games/utserver-asu/pkg-comment
deleted file mode 100644
index 74275cec0bed..000000000000
--- a/games/utserver-asu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Abfackelns Server Utilities (ASU) for Unreal Tournament Server (Linux)
diff --git a/games/utserver/Makefile b/games/utserver/Makefile
index afd0793808db..74dd4f89cbba 100644
--- a/games/utserver/Makefile
+++ b/games/utserver/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://files.sobservers.com/UnrealTournament/UTServerOnly/
 DISTNAME=	ut-server-${PORTVERSION}
 
 MAINTAINER=	martin@tradex.sk
+COMMENT=	Unreal Tournament Dedicated Server for Linux
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/games/utserver/pkg-comment b/games/utserver/pkg-comment
deleted file mode 100644
index 03c9d77c0b0b..000000000000
--- a/games/utserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Unreal Tournament Dedicated Server for Linux
diff --git a/games/virt/Makefile b/games/virt/Makefile
index 5a98731bdabc..7864e232edd3 100644
--- a/games/virt/Makefile
+++ b/games/virt/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	ftp://vampiro.rshb.com.ru/pub/warez/virt/ \
 		ftp://ftp.treasury.ru/pub/unix/virt/
 
 MAINTAINER=	lg@rrf.ru
+COMMENT=	Game and keyboard teacher in one. Enjoy it!
 
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
diff --git a/games/virt/pkg-comment b/games/virt/pkg-comment
deleted file mode 100644
index 48dce1de309a..000000000000
--- a/games/virt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Game and keyboard teacher in one. Enjoy it!
diff --git a/games/wmeyes/Makefile b/games/wmeyes/Makefile
index a132b65f8a9b..3eec705acc37 100644
--- a/games/wmeyes/Makefile
+++ b/games/wmeyes/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://thrush.omix.com/pub/misc/
 
 MAINTAINER=	zenin@archive.rhps.org
+COMMENT=	The world's most useless WindowMaker dock app
 
 USE_IMAKE=	yes
 USE_XPM=	yes
diff --git a/games/wmeyes/pkg-comment b/games/wmeyes/pkg-comment
deleted file mode 100644
index c3bb46731a7f..000000000000
--- a/games/wmeyes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The world's most useless WindowMaker dock app
diff --git a/games/wolfpack/Makefile b/games/wolfpack/Makefile
index 4d298408fba7..4a9b4b5e3a39 100644
--- a/games/wolfpack/Makefile
+++ b/games/wolfpack/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.empire.cx/Downloads/server/
 DISTNAME=	empire${PORTVERSION}
 
 MAINTAINER=	darius@dons.net.au
+COMMENT=	Long term multiplayer strategy game
 
 .if !defined(BATCH)
 IS_INTERACTIVE=	yes     # configure script asks questions
diff --git a/games/wolfpack/pkg-comment b/games/wolfpack/pkg-comment
deleted file mode 100644
index c9a5c2e85eb4..000000000000
--- a/games/wolfpack/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Long term multiplayer strategy game
diff --git a/games/xbaby/Makefile b/games/xbaby/Makefile
index 8caf295cf317..df0edc07ab78 100644
--- a/games/xbaby/Makefile
+++ b/games/xbaby/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.inria.fr/X/contrib-R5/games/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	hym@cocoa.freemail.ne.jp
+COMMENT=	Babies hide under your windows
 
 USE_IMAKE=	yes
 
diff --git a/games/xbaby/pkg-comment b/games/xbaby/pkg-comment
deleted file mode 100644
index 44e7b54cd98c..000000000000
--- a/games/xbaby/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Babies hide under your windows
diff --git a/games/xblood/Makefile b/games/xblood/Makefile
index 24af3719ebfc..8a6a166535cc 100644
--- a/games/xblood/Makefile
+++ b/games/xblood/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.seki.ee.kagu.tus.ac.jp/~sakai/myfreesoft/ \
 		http://www.people.or.jp/~hsakai/myfreesoft/
 
 MAINTAINER=	sakai@seki.ee.kagu.tus.ac.jp
+COMMENT=	Makes the root window bloody
 
 USE_X_PREFIX=	yes
 
diff --git a/games/xblood/pkg-comment b/games/xblood/pkg-comment
deleted file mode 100644
index 56373f2763e8..000000000000
--- a/games/xblood/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Makes the root window bloody
diff --git a/games/xbloody/Makefile b/games/xbloody/Makefile
index 418a182e2f05..4fdd282c3d88 100644
--- a/games/xbloody/Makefile
+++ b/games/xbloody/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1994/oct/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	kazu@jp.freebsd.org
+COMMENT=	Knife on X
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
diff --git a/games/xbloody/pkg-comment b/games/xbloody/pkg-comment
deleted file mode 100644
index bf0733677568..000000000000
--- a/games/xbloody/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Knife on X
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 1ba5978e3c97..f6a22f58163e 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.tim-mann.org/xboard/ \
 MASTER_SITE_SUBDIR=	xboard
 
 MAINTAINER=	xaa+ports@timewasters.nl
+COMMENT=	X frontend for Crafty, GNUChess, Internet Chess Servers, or e-mail chess
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/xboard/pkg-comment b/games/xboard/pkg-comment
deleted file mode 100644
index 95dd1eba08dc..000000000000
--- a/games/xboard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X frontend for Crafty, GNUChess, Internet Chess Servers, or e-mail chess
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index ad6c31d88b95..8305f7bbde3f 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -10,6 +10,7 @@ CATEGORIES=		games
 MASTER_SITES=		http://savannah.nongnu.org/download/xbubble/
 
 MAINTAINER=		klaus.goger@reflex.at
+COMMENT=	Bust-A-Move/Puzzle Bubble clone
 
 LIB_DEPENDS=		png.5:${PORTSDIR}/graphics/png
 
diff --git a/games/xbubble/pkg-comment b/games/xbubble/pkg-comment
deleted file mode 100644
index 4cc1dd79c404..000000000000
--- a/games/xbubble/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bust-A-Move/Puzzle Bubble clone
diff --git a/games/xeji/Makefile b/games/xeji/Makefile
index 2ea3cea073b6..9fe2448d1c34 100644
--- a/games/xeji/Makefile
+++ b/games/xeji/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	hym@cocoa.freemail.ne.jp
+COMMENT=	An old man watching your mouse cursor
 
 USE_IMAKE=	yes
 USE_XPM=	yes
diff --git a/games/xeji/pkg-comment b/games/xeji/pkg-comment
deleted file mode 100644
index 3e10e490892d..000000000000
--- a/games/xeji/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An old man watching your mouse cursor
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index a186109109d7..a4556e8574f7 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.xevil.com/download/stable/
 DISTNAME=	xevilsrc${PORTVERSION}
 
 MAINTAINER=	goranrunfeldt@home.se
+COMMENT=	A fast-action, networked, anti-social, kill-everything game
 
 USE_X_PREFIX=	yes
 USE_ZIP=	yes
diff --git a/games/xevil/pkg-comment b/games/xevil/pkg-comment
deleted file mode 100644
index 9f5a1d9ceab6..000000000000
--- a/games/xevil/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast-action, networked, anti-social, kill-everything game
diff --git a/games/xfireworks/Makefile b/games/xfireworks/Makefile
index 144ef3da8bd3..f5cf23412830 100644
--- a/games/xfireworks/Makefile
+++ b/games/xfireworks/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.seki.ee.kagu.tus.ac.jp/~sakai/myfreesoft/ \
 		http://www.people.or.jp/~hsakai/myfreesoft/
 
 MAINTAINER=	sakai@seki.ee.kagu.tus.ac.jp
+COMMENT=	Fireworks on X
 
 USE_X_PREFIX=	yes
 
diff --git a/games/xfireworks/pkg-comment b/games/xfireworks/pkg-comment
deleted file mode 100644
index f2a26b58cb66..000000000000
--- a/games/xfireworks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fireworks on X
diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile
index 0be9c6bedf37..26876c29bb9f 100644
--- a/games/xgospel/Makefile
+++ b/games/xgospel/Makefile
@@ -10,6 +10,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.teaser.fr/~jlgailly/
 
 MAINTAINER=	shaoz@asia.com
+COMMENT=	An X11 Go (weiqi, baduk) client for the Internet Go Server
 
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
diff --git a/games/xgospel/pkg-comment b/games/xgospel/pkg-comment
deleted file mode 100644
index f686884728da..000000000000
--- a/games/xgospel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 Go (weiqi, baduk) client for the Internet Go Server
diff --git a/games/xjumpx/Makefile b/games/xjumpx/Makefile
index 8396c10f4bd2..e501dc9a7801 100644
--- a/games/xjumpx/Makefile
+++ b/games/xjumpx/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www19.xdsl.ne.jp/~cdr/soft/dl/
 
 MAINTAINER=	cdr@ga.xdsl.ne.jp
+COMMENT=	Improved version of xjump
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/games/xjumpx/pkg-comment b/games/xjumpx/pkg-comment
deleted file mode 100644
index 7c935bc00224..000000000000
--- a/games/xjumpx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Improved version of xjump
diff --git a/games/xlifegame/Makefile b/games/xlifegame/Makefile
index cacb0f670612..0fecb7377867 100644
--- a/games/xlifegame/Makefile
+++ b/games/xlifegame/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://puma.cis.ibaraki.ac.jp/pub/X11/
 
 MAINTAINER=	hym@cocoa.freemail.ne.jp
+COMMENT=	A life game for X
 
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/games/xlifegame/pkg-comment b/games/xlifegame/pkg-comment
deleted file mode 100644
index 63886ee5ef2a..000000000000
--- a/games/xlifegame/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A life game for X
diff --git a/games/xmemory/Makefile b/games/xmemory/Makefile
index 1dbf1cf5b769..787036071fb8 100644
--- a/games/xmemory/Makefile
+++ b/games/xmemory/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	games/multiplayer
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	bsdport@ddm.wox.org
+COMMENT=	Multi-player memory game
 
 USE_IMAKE=	yes
 MAN1=		xmemory.1
diff --git a/games/xmemory/pkg-comment b/games/xmemory/pkg-comment
deleted file mode 100644
index f1a8ff994d06..000000000000
--- a/games/xmemory/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-player memory game
diff --git a/games/xmulti/Makefile b/games/xmulti/Makefile
index 229282a43067..8f159331acf8 100644
--- a/games/xmulti/Makefile
+++ b/games/xmulti/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.denpa.org/~go/xmulti/
 DISTFILES=	xmul200b4.tgz
 
 MAINTAINER=	toru@tenchi.ne.jp
+COMMENT=	A X11 mascot based on gal-game "To Heart"
 
 WRKSRC=		${WRKDIR}/xmulti200beta4
 
diff --git a/games/xmulti/pkg-comment b/games/xmulti/pkg-comment
deleted file mode 100644
index 91c8e298c9cc..000000000000
--- a/games/xmulti/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X11 mascot based on gal-game "To Heart"
diff --git a/games/xpenguins/Makefile b/games/xpenguins/Makefile
index b05a5895585e..528c5f0aa012 100644
--- a/games/xpenguins/Makefile
+++ b/games/xpenguins/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://xpenguins.seul.org/
 
 MAINTAINER=	lyngbol@wheel.dk
+COMMENT=	Cute little penguins that walk along the tops of your windows
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/games/xpenguins/pkg-comment b/games/xpenguins/pkg-comment
deleted file mode 100644
index bd8a04eedeca..000000000000
--- a/games/xpenguins/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cute little penguins that walk along the tops of your windows
diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile
index 0f4a67b3f0c8..b98caeef2cd3 100644
--- a/games/xpilot/Makefile
+++ b/games/xpilot/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.xpilot.org/pub/xpilot/ \
 MASTER_SITE_SUBDIR=	games/multiplayer
 
 MAINTAINER=	goranrunfeldt@home.se
+COMMENT=	Xpilot(client) and xpilots(server)
 
 USE_IMAKE=	yes
 MAN6=		xpilot.6 xpilots.6 xp-replay.6
diff --git a/games/xpilot/pkg-comment b/games/xpilot/pkg-comment
deleted file mode 100644
index 81a5031550a3..000000000000
--- a/games/xpilot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xpilot(client) and xpilots(server)
diff --git a/games/xpilotmon/Makefile b/games/xpilotmon/Makefile
index 3c0f27ff182c..396f862fe982 100644
--- a/games/xpilotmon/Makefile
+++ b/games/xpilotmon/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.xpilot.org/pub/contrib/
 
 MAINTAINER=		jylefort@brutele.be
+COMMENT=	A Tcl/Tk interface to the XPilot meta server(s)
 
 RUN_DEPENDS=		wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
diff --git a/games/xpilotmon/pkg-comment b/games/xpilotmon/pkg-comment
deleted file mode 100644
index a8b881448439..000000000000
--- a/games/xpilotmon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Tcl/Tk interface to the XPilot meta server(s)
diff --git a/games/xpired/Makefile b/games/xpired/Makefile
index d3459ff7bbea..73f33114adc0 100644
--- a/games/xpired/Makefile
+++ b/games/xpired/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	xpired
 DISTNAME=	${PORTNAME}-${PORTVERSION}-linux_source
 
 MAINTAINER=	edwin@mavetju.org
+COMMENT=	An action-puzzle maze escape game (SDL)
 
 LIB_DEPENDS=	SDL_gfx.0:${PORTSDIR}/graphics/sdl_gfx \
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
diff --git a/games/xpired/pkg-comment b/games/xpired/pkg-comment
deleted file mode 100644
index eb31c7b772c3..000000000000
--- a/games/xpired/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An action-puzzle maze escape game (SDL)
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 2bd94827ad06..f5f2cb043322 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://chaos2.org/xpuyopuyo/ \
 		http://lenin.dabney.caltech.edu/~justins/xpuyopuyo/
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
+COMMENT=	A puzzle game, somewhat like Tetris
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/games/xpuyopuyo/pkg-comment b/games/xpuyopuyo/pkg-comment
deleted file mode 100644
index 3b3951ab8910..000000000000
--- a/games/xpuyopuyo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A puzzle game, somewhat like Tetris
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index dc989095b31d..f283b363f3cf 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://xracer.annexia.org/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xracer-data.tar.gz
 
 MAINTAINER=	troll@digitalspark.net
+COMMENT=	Awesome WipeOut clone for OpenGL and X11!
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
diff --git a/games/xracer/pkg-comment b/games/xracer/pkg-comment
deleted file mode 100644
index 91bbf5304272..000000000000
--- a/games/xracer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Awesome WipeOut clone for OpenGL and X11!
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index fc121644822a..53072bf6e35b 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.bigorno.net/xrick/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	drs@rucus.ru.ac.za
+COMMENT=	A clone of Rick Dangerous
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 
diff --git a/games/xrick/pkg-comment b/games/xrick/pkg-comment
deleted file mode 100644
index 7f089d8901eb..000000000000
--- a/games/xrick/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of Rick Dangerous
diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index 2b103daa2048..0c98c0dd9543 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://my.pages.de/pub/comp/games/xrisk/ \
 		http://www.mikro.biologie.tu-muenchen.de/pub/rec/games/xrisk/
 
 MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	A game for X11, much like the popular board game
 
 USE_IMAKE=	yes
 MAN6=		xrisk.6
diff --git a/games/xrisk/pkg-comment b/games/xrisk/pkg-comment
deleted file mode 100644
index 76f650a50176..000000000000
--- a/games/xrisk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A game for X11, much like the popular board game
diff --git a/games/xrobots/Makefile b/games/xrobots/Makefile
index e7b976d9a70a..353889c0bcc1 100644
--- a/games/xrobots/Makefile
+++ b/games/xrobots/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.mavetju.org/download/adopted/
 DISTNAME=	${PKGNAME}-ss-10.20
 
 MAINTAINER=	edwin@mavetju.org
+COMMENT=	Fight off villainous robots (X version)
 
 USE_REINPLACE=	yes
 USE_IMAKE=	yes
diff --git a/games/xrobots/pkg-comment b/games/xrobots/pkg-comment
deleted file mode 100644
index f82393460b62..000000000000
--- a/games/xrobots/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fight off villainous robots (X version)
diff --git a/games/xshipwars-client/Makefile b/games/xshipwars-client/Makefile
index 48edb8a89a92..73215f5aca8f 100644
--- a/games/xshipwars-client/Makefile
+++ b/games/xshipwars-client/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://fox.mit.edu/pub/xsw/
 DISTFILES=	xsw1.23.tgz stimages1.3.tgz
 
 MAINTAINER=	troll@digitalspark.net
+COMMENT=	Hardcore Internet space combat/economy game resembling EV on crack!
 
 WRKSRC=		${WRKDIR}/xsw1.23/client
 USE_XLIB=	YES
diff --git a/games/xshipwars-client/pkg-comment b/games/xshipwars-client/pkg-comment
deleted file mode 100644
index d042eb1fc033..000000000000
--- a/games/xshipwars-client/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hardcore Internet space combat/economy game resembling EV on crack!
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 29c0746c7656..df38fc1f5d60 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/usenet/comp.sources.x/xteddy/
 
 MAINTAINER=	Isegrim@Wunder-Nett.org
+COMMENT=	A cuddlesome teddy for the X desktop
 
 NO_CDROM=	"Can only be distributed for free"
 
diff --git a/games/xteddy/pkg-comment b/games/xteddy/pkg-comment
deleted file mode 100644
index 222c57b5048c..000000000000
--- a/games/xteddy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A cuddlesome teddy for the X desktop
diff --git a/games/xtet42/Makefile b/games/xtet42/Makefile
index 9da461a00e13..bfa8901ebc7c 100644
--- a/games/xtet42/Makefile
+++ b/games/xtet42/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.gufi.org/~gmarco/files/distfiles/ \
 		http://www.giovannelli.it/~gmarco/files/
 
 MAINTAINER=	gmarco@giovannelli.it
+COMMENT=	A one or two player t*tris game
 
 USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
diff --git a/games/xtet42/pkg-comment b/games/xtet42/pkg-comment
deleted file mode 100644
index 1906195f56da..000000000000
--- a/games/xtet42/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A one or two player t*tris game
diff --git a/games/xtris/Makefile b/games/xtris/Makefile
index 37255fe44789..16def43d39ed 100644
--- a/games/xtris/Makefile
+++ b/games/xtris/Makefile
@@ -15,6 +15,7 @@ PATCHFILES=	xtris-1.15-v6-19991218.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	sec@42.org
+COMMENT=	A multi-player version of a popular game for the X Window system
 
 RESTRICTED=	"Possible trademark infringement"
 WRKSRC=		${WRKDIR}/xtris
diff --git a/games/xtris/pkg-comment b/games/xtris/pkg-comment
deleted file mode 100644
index b411e48c2f2a..000000000000
--- a/games/xtris/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multi-player version of a popular game for the X Window system
diff --git a/games/xtrojka/Makefile b/games/xtrojka/Makefile
index 387d13e0670d..1283f4213f97 100644
--- a/games/xtrojka/Makefile
+++ b/games/xtrojka/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/games/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	e@ik.nu
+COMMENT=	Game of skill similar to T*tris
 
 WRKSRC=		${WRKDIR}
 MAN6=		xtrojka.6
diff --git a/games/xtrojka/pkg-comment b/games/xtrojka/pkg-comment
deleted file mode 100644
index 8222b690c6f4..000000000000
--- a/games/xtrojka/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Game of skill similar to T*tris
diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index 1145af3d7538..8ad8c03d704e 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION:S/.//g}
 
 MAINTAINER=	goranrunfeldt@home.se
+COMMENT=	Humorous Arcade game for X
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/games/xtux/pkg-comment b/games/xtux/pkg-comment
deleted file mode 100644
index 9273e84e69ae..000000000000
--- a/games/xtux/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Humorous Arcade game for X
diff --git a/games/yadex/Makefile b/games/yadex/Makefile
index b4ad510b745b..5353fdc12812 100644
--- a/games/yadex/Makefile
+++ b/games/yadex/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.teaser.fr/~amajorel/yadex/
 
 MAINTAINER=	fracture@allusion.net
+COMMENT=	A WAD-file editor, for games like Doom and Hexen
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
diff --git a/games/yadex/pkg-comment b/games/yadex/pkg-comment
deleted file mode 100644
index 70db835ac5c2..000000000000
--- a/games/yadex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A WAD-file editor, for games like Doom and Hexen
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index e9175c3ca632..f4c5c604b480 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://clockwork.dementia.org/angband/Variant/ZAngband/ \
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	makoto@pinpott.spnet.ne.jp
+COMMENT=	Zangband (Zelazny Angband) with color, X11 support
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
diff --git a/games/zangband/pkg-comment b/games/zangband/pkg-comment
deleted file mode 100644
index e405daeb657f..000000000000
--- a/games/zangband/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Zangband (Zelazny Angband) with color, X11 support
diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile
index c9de604c7b31..1bfdc8d05540 100644
--- a/games/znibbles/Makefile
+++ b/games/znibbles/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://koala.ilog.fr/ftp/pub/games/znibbles/
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
+COMMENT=	A multi-player networked nibbles game
 
 USE_MOTIF=	yes
 USE_GNOMENG=	yes
diff --git a/games/znibbles/pkg-comment b/games/znibbles/pkg-comment
deleted file mode 100644
index d6b8ebe83cde..000000000000
--- a/games/znibbles/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multi-player networked nibbles game
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index 2ef021f703e6..a897f0f41765 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=     bbbike
 
 MAINTAINER=	slaven@rezic.de
+COMMENT=	A route-finder for cyclists in Berlin and Brandenburg
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 
diff --git a/german/BBBike/pkg-comment b/german/BBBike/pkg-comment
deleted file mode 100644
index 03810cd4a360..000000000000
--- a/german/BBBike/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A route-finder for cyclists in Berlin and Brandenburg
diff --git a/german/cheapcall/Makefile b/german/cheapcall/Makefile
index ccd086e23a14..077464677523 100644
--- a/german/cheapcall/Makefile
+++ b/german/cheapcall/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	cheap-call-${LONGVER}.tcl
 EXTRACT_SUFX=	.bz2
 
 MAINTAINER=	pcc@gmx.net
+COMMENT=	Shows cheapest German call-by-call telephone provider (German only)
 
 RUN_DEPENDS=	wishx:${PORTSDIR}/lang/tclX80
 
diff --git a/german/cheapcall/pkg-comment b/german/cheapcall/pkg-comment
deleted file mode 100644
index adb44f7a73e2..000000000000
--- a/german/cheapcall/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Shows cheapest German call-by-call telephone provider (German only)
diff --git a/german/netscape7/Makefile b/german/netscape7/Makefile
index ab30b0ac3fe6..47c27e9b54a6 100644
--- a/german/netscape7/Makefile
+++ b/german/netscape7/Makefile
@@ -24,6 +24,7 @@ DISTFILES=	AIM.xpi \
 		xpcom.xpi
 
 MAINTAINER=	riggs@rrr.de
+COMMENT=	Linux Netscape 6 suite (German)
 
 NETSCAPE_LANG=	german
 
diff --git a/german/netscape7/pkg-comment b/german/netscape7/pkg-comment
deleted file mode 100644
index 803a2366d6ef..000000000000
--- a/german/netscape7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linux Netscape 6 suite (German)
diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile
index af260bf12a09..bc59eef1acc2 100644
--- a/german/staroffice5/Makefile
+++ b/german/staroffice5/Makefile
@@ -17,6 +17,7 @@ EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
 MAINTAINER=	mb@imp.ch
+COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
diff --git a/german/staroffice5/pkg-comment b/german/staroffice5/pkg-comment
deleted file mode 100644
index 7c6d1b73d17a..000000000000
--- a/german/staroffice5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index 48d2f497a34f..4d85f49950c3 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	http://home.in.tum.de/~atterer/jigdo/
 
 MAINTAINER=	bra@fsn.hu
+COMMENT=	An utility used to retrieve very large files over the Internet
 
 #BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww
 RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
diff --git a/net-p2p/jigdo/pkg-comment b/net-p2p/jigdo/pkg-comment
deleted file mode 100644
index deb859df317e..000000000000
--- a/net-p2p/jigdo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An utility used to retrieve very large files over the Internet
diff --git a/portuguese/netscape7/Makefile b/portuguese/netscape7/Makefile
index ab30b0ac3fe6..47c27e9b54a6 100644
--- a/portuguese/netscape7/Makefile
+++ b/portuguese/netscape7/Makefile
@@ -24,6 +24,7 @@ DISTFILES=	AIM.xpi \
 		xpcom.xpi
 
 MAINTAINER=	riggs@rrr.de
+COMMENT=	Linux Netscape 6 suite (German)
 
 NETSCAPE_LANG=	german
 
diff --git a/portuguese/netscape7/pkg-comment b/portuguese/netscape7/pkg-comment
deleted file mode 100644
index 803a2366d6ef..000000000000
--- a/portuguese/netscape7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linux Netscape 6 suite (German)
diff --git a/science/qcl/Makefile b/science/qcl/Makefile
index 251e5de939e4..bb04b66cfbce 100644
--- a/science/qcl/Makefile
+++ b/science/qcl/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://tph.tuwien.ac.at/~oemer/tgz/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	huntting@glarp.com
+COMMENT=	A quantum computer simulator
 
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
diff --git a/science/qcl/pkg-comment b/science/qcl/pkg-comment
deleted file mode 100644
index 4b54f54940b8..000000000000
--- a/science/qcl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A quantum computer simulator
author	knu <knu@FreeBSD.org>	2003-02-21 20:06:51 +0800
committer	knu <knu@FreeBSD.org>	2003-02-21 20:06:51 +0800
commit	cd63ab299ecbacc6d43a31ee82d010072422d9dd (patch)
tree	0d9edac06427083a7190306179227388433844bb
parent	65e31f0898c7896c7c141d199f912a2bc5d7a3c2 (diff)
download	freebsd-ports-gnome-cd63ab299ecbacc6d43a31ee82d010072422d9dd.tar.gz freebsd-ports-gnome-cd63ab299ecbacc6d43a31ee82d010072422d9dd.tar.zst freebsd-ports-gnome-cd63ab299ecbacc6d43a31ee82d010072422d9dd.zip