summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--games/3dpong/Makefile1
-rw-r--r--games/3dpong/pkg-comment1
-rw-r--r--games/CaribbeanStud/Makefile1
-rw-r--r--games/CaribbeanStud/pkg-comment1
-rw-r--r--games/KnightCap/Makefile1
-rw-r--r--games/KnightCap/pkg-comment1
-rw-r--r--games/adgali/Makefile1
-rw-r--r--games/adgali/pkg-comment1
-rw-r--r--games/affenspiel/Makefile1
-rw-r--r--games/affenspiel/pkg-comment1
-rw-r--r--games/antipolix/Makefile1
-rw-r--r--games/antipolix/pkg-comment1
-rw-r--r--games/battalion/Makefile1
-rw-r--r--games/battalion/pkg-comment1
-rw-r--r--games/battleball/Makefile1
-rw-r--r--games/battleball/pkg-comment1
-rw-r--r--games/blackjack/Makefile1
-rw-r--r--games/blackjack/pkg-comment1
-rw-r--r--games/block/Makefile1
-rw-r--r--games/block/pkg-comment1
-rw-r--r--games/blockade/Makefile1
-rw-r--r--games/blockade/pkg-comment1
-rw-r--r--games/blue/Makefile1
-rw-r--r--games/blue/pkg-comment1
-rw-r--r--games/bnetd/Makefile1
-rw-r--r--games/bnetd/pkg-comment1
-rw-r--r--games/bogged/Makefile1
-rw-r--r--games/bogged/pkg-comment1
-rw-r--r--games/bs/Makefile1
-rw-r--r--games/bs/pkg-comment1
-rw-r--r--games/bsdgames/Makefile1
-rw-r--r--games/bsdgames/pkg-comment1
-rw-r--r--games/bzflag/Makefile1
-rw-r--r--games/bzflag/pkg-comment1
-rw-r--r--games/columns/Makefile1
-rw-r--r--games/columns/pkg-comment1
-rw-r--r--games/connect4/Makefile1
-rw-r--r--games/connect4/pkg-comment1
-rw-r--r--games/crossfire-client/Makefile1
-rw-r--r--games/crossfire-client/pkg-comment1
-rw-r--r--games/crossfire-server/Makefile1
-rw-r--r--games/crossfire-server/pkg-comment1
-rw-r--r--games/crossword/Makefile1
-rw-r--r--games/crossword/pkg-comment1
-rw-r--r--games/cryptoslam/Makefile1
-rw-r--r--games/cryptoslam/pkg-comment1
-rw-r--r--games/defendguin/Makefile1
-rw-r--r--games/defendguin/pkg-comment1
-rw-r--r--games/drm/Makefile1
-rw-r--r--games/drm/pkg-comment1
-rw-r--r--games/empire/Makefile1
-rw-r--r--games/empire/pkg-comment1
-rw-r--r--games/freebsd-games/Makefile1
-rw-r--r--games/freebsd-games/pkg-comment1
-rw-r--r--games/freecell-solver/Makefile1
-rw-r--r--games/freecell-solver/pkg-comment1
-rw-r--r--games/freesweep/Makefile1
-rw-r--r--games/freesweep/pkg-comment1
-rw-r--r--games/galaxis/Makefile1
-rw-r--r--games/galaxis/pkg-comment1
-rw-r--r--games/garith/Makefile1
-rw-r--r--games/garith/pkg-comment1
-rw-r--r--games/gemdropx/Makefile1
-rw-r--r--games/gemdropx/pkg-comment1
-rw-r--r--games/gl-117/Makefile1
-rw-r--r--games/gl-117/pkg-comment1
-rw-r--r--games/glasteroids/Makefile1
-rw-r--r--games/glasteroids/pkg-comment1
-rw-r--r--games/glife/Makefile1
-rw-r--r--games/glife/pkg-comment1
-rw-r--r--games/gltron/Makefile1
-rw-r--r--games/gltron/pkg-comment1
-rw-r--r--games/gno3dtet/Makefile1
-rw-r--r--games/gno3dtet/pkg-comment1
-rw-r--r--games/gnomebreakout/Makefile1
-rw-r--r--games/gnomebreakout/pkg-comment1
-rw-r--r--games/gnomememoryblocks/Makefile1
-rw-r--r--games/gnomememoryblocks/pkg-comment1
-rw-r--r--games/gnuchess/Makefile1
-rw-r--r--games/gnuchess/pkg-comment1
-rw-r--r--games/gnurobots/Makefile1
-rw-r--r--games/gnurobots/pkg-comment1
-rw-r--r--games/gtkballs/Makefile1
-rw-r--r--games/gtkballs/pkg-comment1
-rw-r--r--games/hex/Makefile1
-rw-r--r--games/hex/pkg-comment1
-rw-r--r--games/icbm3d/Makefile1
-rw-r--r--games/icbm3d/pkg-comment1
-rw-r--r--games/libshhcards/Makefile1
-rw-r--r--games/libshhcards/pkg-comment1
-rw-r--r--games/lincity/Makefile1
-rw-r--r--games/lincity/pkg-comment1
-rw-r--r--games/lm-solve/Makefile1
-rw-r--r--games/lm-solve/pkg-comment1
-rw-r--r--games/madbomber/Makefile1
-rw-r--r--games/madbomber/pkg-comment1
-rw-r--r--games/mahjong/Makefile1
-rw-r--r--games/mahjong/pkg-comment1
-rw-r--r--games/merlin/Makefile1
-rw-r--r--games/merlin/pkg-comment1
-rw-r--r--games/mirrormagic/Makefile1
-rw-r--r--games/mirrormagic/pkg-comment1
-rw-r--r--games/miscom/Makefile1
-rw-r--r--games/miscom/pkg-comment1
-rw-r--r--games/nethack33-gnome/Makefile1
-rw-r--r--games/nethack33-nox11/Makefile1
-rw-r--r--games/nethack33-qt/Makefile1
-rw-r--r--games/nethack33/Makefile1
-rw-r--r--games/nethack33/pkg-comment1
-rw-r--r--games/newkind/Makefile1
-rw-r--r--games/newkind/pkg-comment1
-rw-r--r--games/omega/Makefile1
-rw-r--r--games/omega/pkg-comment1
-rw-r--r--games/oonsoo/Makefile1
-rw-r--r--games/oonsoo/pkg-comment1
-rw-r--r--games/phalanx/Makefile1
-rw-r--r--games/phalanx/pkg-comment1
-rw-r--r--games/powerpak/Makefile1
-rw-r--r--games/powerpak/pkg-comment1
-rw-r--r--games/pp/Makefile1
-rw-r--r--games/pp/pkg-comment1
-rw-r--r--games/qcc/Makefile1
-rw-r--r--games/qcc/pkg-comment1
-rw-r--r--games/quakeforge/Makefile1
-rw-r--r--games/quakeforge/pkg-comment1
-rw-r--r--games/race/Makefile1
-rw-r--r--games/race/pkg-comment1
-rw-r--r--games/rockdodger/Makefile1
-rw-r--r--games/rockdodger/pkg-comment1
-rw-r--r--games/rubix/Makefile1
-rw-r--r--games/rubix/pkg-comment1
-rw-r--r--games/seabattle/Makefile1
-rw-r--r--games/seabattle/pkg-comment1
-rw-r--r--games/smacx/Makefile1
-rw-r--r--games/smacx/pkg-comment1
-rw-r--r--games/sokoban/Makefile1
-rw-r--r--games/sokoban/pkg-comment1
-rw-r--r--games/spellcast/Makefile1
-rw-r--r--games/spellcast/pkg-comment1
-rw-r--r--games/spider/Makefile1
-rw-r--r--games/spider/pkg-comment1
-rw-r--r--games/starlanes/Makefile1
-rw-r--r--games/starlanes/pkg-comment1
-rw-r--r--games/sxsame/Makefile1
-rw-r--r--games/sxsame/pkg-comment1
-rw-r--r--games/taipan/Makefile1
-rw-r--r--games/taipan/pkg-comment1
-rw-r--r--games/tank/Makefile1
-rw-r--r--games/tank/pkg-comment1
-rw-r--r--games/textmaze/Makefile1
-rw-r--r--games/textmaze/pkg-comment1
-rw-r--r--games/tinymux/Makefile1
-rw-r--r--games/tinymux/pkg-comment1
-rw-r--r--games/tux-aqfh/Makefile1
-rw-r--r--games/tux-aqfh/pkg-comment1
-rw-r--r--games/tuxkart/Makefile1
-rw-r--r--games/tuxkart/pkg-comment1
-rw-r--r--games/twitch/Makefile1
-rw-r--r--games/twitch/pkg-comment1
-rw-r--r--games/uhexen/Makefile1
-rw-r--r--games/uhexen/pkg-comment1
-rw-r--r--games/vamos/Makefile1
-rw-r--r--games/vamos/pkg-comment1
-rw-r--r--games/wmfortune/Makefile1
-rw-r--r--games/wmfortune/pkg-comment1
-rw-r--r--games/wmminichess/Makefile1
-rw-r--r--games/wmminichess/pkg-comment1
-rw-r--r--games/wmpuzzle/Makefile1
-rw-r--r--games/wmpuzzle/pkg-comment1
-rw-r--r--games/wmshuffle/Makefile1
-rw-r--r--games/wmshuffle/pkg-comment1
-rw-r--r--games/wmtimebomb/Makefile1
-rw-r--r--games/wmtimebomb/pkg-comment1
-rw-r--r--games/wordplay/Makefile1
-rw-r--r--games/wordplay/pkg-comment1
-rw-r--r--games/x3eyes/Makefile1
-rw-r--r--games/x3eyes/pkg-comment1
-rw-r--r--games/xabacus/Makefile1
-rw-r--r--games/xabacus/pkg-comment1
-rw-r--r--games/xasteroids/Makefile1
-rw-r--r--games/xasteroids/pkg-comment1
-rw-r--r--games/xataxx/Makefile1
-rw-r--r--games/xataxx/pkg-comment1
-rw-r--r--games/xbattle/Makefile1
-rw-r--r--games/xbattle/pkg-comment1
-rw-r--r--games/xbill/Makefile1
-rw-r--r--games/xbill/pkg-comment1
-rw-r--r--games/xbl/Makefile1
-rw-r--r--games/xbl/pkg-comment1
-rw-r--r--games/xblackjack/Makefile1
-rw-r--r--games/xblackjack/pkg-comment1
-rw-r--r--games/xbomb/Makefile1
-rw-r--r--games/xbomb/pkg-comment1
-rw-r--r--games/xchadance/Makefile1
-rw-r--r--games/xchadance/pkg-comment1
-rw-r--r--games/xchain/Makefile1
-rw-r--r--games/xchain/pkg-comment1
-rw-r--r--games/xchomp/Makefile1
-rw-r--r--games/xchomp/pkg-comment1
-rw-r--r--games/xcogitate/Makefile1
-rw-r--r--games/xcogitate/pkg-comment1
-rw-r--r--games/xconq/Makefile1
-rw-r--r--games/xconq/pkg-comment1
-rw-r--r--games/xdemineur/Makefile1
-rw-r--r--games/xdemineur/pkg-comment1
-rw-r--r--games/xdigger/Makefile1
-rw-r--r--games/xdigger/pkg-comment1
-rw-r--r--games/xemeraldia/Makefile1
-rw-r--r--games/xemeraldia/pkg-comment1
-rw-r--r--games/xgalaga/Makefile1
-rw-r--r--games/xgalaga/pkg-comment1
-rw-r--r--games/xhexagons/Makefile1
-rw-r--r--games/xhexagons/pkg-comment1
-rw-r--r--games/xinvaders/Makefile1
-rw-r--r--games/xinvaders/pkg-comment1
-rw-r--r--games/xisola/Makefile1
-rw-r--r--games/xisola/pkg-comment1
-rw-r--r--games/xjump/Makefile1
-rw-r--r--games/xjump/pkg-comment1
-rw-r--r--games/xjumpjump/Makefile1
-rw-r--r--games/xjumpjump/pkg-comment1
-rw-r--r--games/xkoules/Makefile1
-rw-r--r--games/xkoules/pkg-comment1
-rw-r--r--games/xlaby/Makefile1
-rw-r--r--games/xlaby/pkg-comment1
-rw-r--r--games/xlife/Makefile1
-rw-r--r--games/xlife/pkg-comment1
-rw-r--r--games/xlines/Makefile1
-rw-r--r--games/xlines/pkg-comment1
-rw-r--r--games/xmastermind/Makefile1
-rw-r--r--games/xmastermind/pkg-comment1
-rw-r--r--games/xmball/Makefile1
-rw-r--r--games/xmball/pkg-comment1
-rw-r--r--games/xmille/Makefile1
-rw-r--r--games/xmille/pkg-comment1
-rw-r--r--games/xmines/Makefile1
-rw-r--r--games/xmines/pkg-comment1
-rw-r--r--games/xminesweep/Makefile1
-rw-r--r--games/xminesweep/pkg-comment1
-rw-r--r--games/xmj/Makefile1
-rw-r--r--games/xmj/pkg-comment1
-rw-r--r--games/xmlink/Makefile1
-rw-r--r--games/xmlink/pkg-comment1
-rw-r--r--games/xneko/Makefile1
-rw-r--r--games/xneko/pkg-comment1
-rw-r--r--games/xnibbles/Makefile1
-rw-r--r--games/xnibbles/pkg-comment1
-rw-r--r--games/xoct/Makefile1
-rw-r--r--games/xoct/pkg-comment1
-rw-r--r--games/xoids/Makefile1
-rw-r--r--games/xoids/pkg-comment1
-rw-r--r--games/xoj/Makefile1
-rw-r--r--games/xoj/pkg-comment1
-rw-r--r--games/xothello/Makefile1
-rw-r--r--games/xothello/pkg-comment1
-rw-r--r--games/xpanex/Makefile1
-rw-r--r--games/xpanex/pkg-comment1
-rw-r--r--games/xpipeman/Makefile1
-rw-r--r--games/xpipeman/pkg-comment1
-rw-r--r--games/xpyraminx/Makefile1
-rw-r--r--games/xpyraminx/pkg-comment1
-rw-r--r--games/xqf/Makefile1
-rw-r--r--games/xqf/pkg-comment1
-rw-r--r--games/xquarto/Makefile1
-rw-r--r--games/xquarto/pkg-comment1
-rw-r--r--games/xripple/Makefile1
-rw-r--r--games/xripple/pkg-comment1
-rw-r--r--games/xroads/Makefile1
-rw-r--r--games/xroads/pkg-comment1
-rw-r--r--games/xscrabble/Makefile1
-rw-r--r--games/xscrabble/pkg-comment1
-rw-r--r--games/xskewb/Makefile1
-rw-r--r--games/xskewb/pkg-comment1
-rw-r--r--games/xsok/Makefile1
-rw-r--r--games/xsok/pkg-comment1
-rw-r--r--games/xsol/Makefile1
-rw-r--r--games/xsol/pkg-comment1
-rw-r--r--games/xspacewarp/Makefile1
-rw-r--r--games/xspacewarp/pkg-comment1
-rw-r--r--games/xtic/Makefile1
-rw-r--r--games/xtic/pkg-comment1
-rw-r--r--games/xtron/Makefile1
-rw-r--r--games/xtron/pkg-comment1
-rw-r--r--games/xtruco/Makefile1
-rw-r--r--games/xtruco/pkg-comment1
-rw-r--r--games/xvier/Makefile1
-rw-r--r--games/xvier/pkg-comment1
-rw-r--r--games/xvmahjongg/Makefile1
-rw-r--r--games/xvmahjongg/pkg-comment1
-rw-r--r--games/xvmines/Makefile1
-rw-r--r--games/xvmines/pkg-comment1
-rw-r--r--games/xword/Makefile1
-rw-r--r--games/xword/pkg-comment1
-rw-r--r--games/xworm/Makefile1
-rw-r--r--games/xworm/pkg-comment1
-rw-r--r--games/yahtzee/Makefile1
-rw-r--r--games/yahtzee/pkg-comment1
-rw-r--r--games/yamsweeper/Makefile1
-rw-r--r--games/yamsweeper/pkg-comment1
-rw-r--r--games/ztrack/Makefile1
-rw-r--r--games/ztrack/pkg-comment1
301 files changed, 152 insertions, 149 deletions
diff --git a/games/3dpong/Makefile b/games/3dpong/Makefile
index 9def65cb7e01..d545717163da 100644
--- a/games/3dpong/Makefile
+++ b/games/3dpong/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.sonic.net/pub/users/nbs/unix/x/3dpong/
MAINTAINER= ports@FreeBSD.org
+COMMENT= X Window 3D Pong game for 1 or 2 players with a ball and paddles
MAKEFILE= makefile
USE_REINPLACE= yes
diff --git a/games/3dpong/pkg-comment b/games/3dpong/pkg-comment
deleted file mode 100644
index 7af10cddc5e4..000000000000
--- a/games/3dpong/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X Window 3D Pong game for 1 or 2 players with a ball and paddles
diff --git a/games/CaribbeanStud/Makefile b/games/CaribbeanStud/Makefile
index 6a35fa97d1fd..e6ad35ab7e24 100644
--- a/games/CaribbeanStud/Makefile
+++ b/games/CaribbeanStud/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games
DISTNAME= CS
MAINTAINER= ports@FreeBSD.org
+COMMENT= Caribbean Stud gambling game for X Window System
MAKEFILE= Xmakefile
USE_MOTIF= yes
diff --git a/games/CaribbeanStud/pkg-comment b/games/CaribbeanStud/pkg-comment
deleted file mode 100644
index 62fe5a9f8d73..000000000000
--- a/games/CaribbeanStud/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Caribbean Stud gambling game for X Window System
diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile
index 0bca9c217f51..1aec49cbcdaa 100644
--- a/games/KnightCap/Makefile
+++ b/games/KnightCap/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://samba.anu.edu.au/pub/KnightCap/ \
DISTNAME= KnightCap-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Chess program with 3D interface for X Window System
WRKSRC= ${WRKDIR}/Export
USE_MESA= yes
diff --git a/games/KnightCap/pkg-comment b/games/KnightCap/pkg-comment
deleted file mode 100644
index 449882484ea1..000000000000
--- a/games/KnightCap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Chess program with 3D interface for X Window System
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index da9ba785b61d..a9c2d6b314bc 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An open source game library useful for 2D games programmation
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
jpeg:${PORTSDIR}/graphics/jpeg \
diff --git a/games/adgali/pkg-comment b/games/adgali/pkg-comment
deleted file mode 100644
index 73a0d86d0df6..000000000000
--- a/games/adgali/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An open source game library useful for 2D games programmation
diff --git a/games/affenspiel/Makefile b/games/affenspiel/Makefile
index 9a7c3e3ae29c..0c48b50b9742 100644
--- a/games/affenspiel/Makefile
+++ b/games/affenspiel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/strategy
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Little puzzle game with monkey for X Window System
WRKSRC= ${WRKDIR}/affenspiel
USE_X_PREFIX= yes
diff --git a/games/affenspiel/pkg-comment b/games/affenspiel/pkg-comment
deleted file mode 100644
index 2f1ef028bba1..000000000000
--- a/games/affenspiel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Little puzzle game with monkey for X Window System
diff --git a/games/antipolix/Makefile b/games/antipolix/Makefile
index 559ce0d9f1a8..e8672bcfc5ec 100644
--- a/games/antipolix/Makefile
+++ b/games/antipolix/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/multiplayer
DISTNAME= AntipoliX_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Simple multiplayer game for X Window System
NO_WRKSUBDIR= yes
USE_IMAKE= yes
diff --git a/games/antipolix/pkg-comment b/games/antipolix/pkg-comment
deleted file mode 100644
index b8cff8e99908..000000000000
--- a/games/antipolix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple multiplayer game for X Window System
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index 9f7f79a0401c..07676ee2d374 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.evl.uic.edu/aej/BATTALION/
DISTFILES= battalionSource1.4.tar.Z battalionSUN4.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Monsters, explosions, destruction game for X Window System
WRKSRC= ${WRKDIR}/battalionSource
diff --git a/games/battalion/pkg-comment b/games/battalion/pkg-comment
deleted file mode 100644
index 7a63b6c9cdc1..000000000000
--- a/games/battalion/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Monsters, explosions, destruction game for X Window System
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index d6df74f6ece6..2466333d360c 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= http://tzo.linux.tucows.com/files/x11/entertain/ \
DISTNAME= ${PORTNAME}.${PORTVERSION:S/.//}.src
MAINTAINER= ports@FreeBSD.org
+COMMENT= 3D single/multiplayer military soccer game for X Window System
USE_X_PREFIX= yes
USE_MESA= yes
diff --git a/games/battleball/pkg-comment b/games/battleball/pkg-comment
deleted file mode 100644
index fd62bb9c05c9..000000000000
--- a/games/battleball/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3D single/multiplayer military soccer game for X Window System
diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile
index 4f75c28793c7..fc2091ada270 100644
--- a/games/blackjack/Makefile
+++ b/games/blackjack/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/strategy
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= One of the better implementations of blackjack, based on QT
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_QT_VER= 3
diff --git a/games/blackjack/pkg-comment b/games/blackjack/pkg-comment
deleted file mode 100644
index ed22b52897ab..000000000000
--- a/games/blackjack/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-One of the better implementations of blackjack, based on QT
diff --git a/games/block/Makefile b/games/block/Makefile
index bd58ba9e365c..1aafbc6bd2ad 100644
--- a/games/block/Makefile
+++ b/games/block/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/strategy
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Small text based maze game
WRKSRC= ${WRKDIR}/blocks
MAKEFILE= makefile
diff --git a/games/block/pkg-comment b/games/block/pkg-comment
deleted file mode 100644
index 909cd2ec13db..000000000000
--- a/games/block/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small text based maze game
diff --git a/games/blockade/Makefile b/games/blockade/Makefile
index 91dd9caec202..991ff7f9f6f1 100644
--- a/games/blockade/Makefile
+++ b/games/blockade/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.geocities.com/TimesSquare/Zone/5267/
DISTFILES= blockade-1_00-linux.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= An X version of the `blockade' Macintosh game
USE_XLIB= yes
diff --git a/games/blockade/pkg-comment b/games/blockade/pkg-comment
deleted file mode 100644
index 91d2e30cc70f..000000000000
--- a/games/blockade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X version of the `blockade' Macintosh game
diff --git a/games/blue/Makefile b/games/blue/Makefile
index 15e256a3dc03..cb34fe871f7e 100644
--- a/games/blue/Makefile
+++ b/games/blue/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.catb.org/~esr/blue/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Blue Moon card solitaire
ALL_TARGET= # empty
MAN6= blue.6
diff --git a/games/blue/pkg-comment b/games/blue/pkg-comment
deleted file mode 100644
index 47d2a0990664..000000000000
--- a/games/blue/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Blue Moon card solitaire
diff --git a/games/bnetd/Makefile b/games/bnetd/Makefile
index f1fca0a8ae30..e7e07b1d8882 100644
--- a/games/bnetd/Makefile
+++ b/games/bnetd/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/pre/}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A program that attempts to emulate Blizzard's Battle.net service
IGNORE= "has been disabled for legal issue"
GNU_CONFIGURE= yes
diff --git a/games/bnetd/pkg-comment b/games/bnetd/pkg-comment
deleted file mode 100644
index 6e65f5a962ee..000000000000
--- a/games/bnetd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program that attempts to emulate Blizzard's Battle.net service
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index 8120ce854c29..89ef68b651e3 100644
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/strategy
EXTRACT_SUFX= .gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Word game for X Window System
RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/games/bogged/pkg-comment b/games/bogged/pkg-comment
deleted file mode 100644
index b475f538cc2c..000000000000
--- a/games/bogged/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Word game for X Window System
diff --git a/games/bs/Makefile b/games/bs/Makefile
index 8518e4fe1fbb..383d37351397 100644
--- a/games/bs/Makefile
+++ b/games/bs/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.catb.org/~esr/bs/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Battleships solitaire game with a color interface
ALL_TARGET= # empty
MAN6= bs.6
diff --git a/games/bs/pkg-comment b/games/bs/pkg-comment
deleted file mode 100644
index b66b0d3453a8..000000000000
--- a/games/bs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Battleships solitaire game with a color interface
diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile
index 8486f918e879..7b77d9fa217e 100644
--- a/games/bsdgames/Makefile
+++ b/games/bsdgames/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=markm
MAINTAINER= ports@FreeBSD.org
+COMMENT= FreeBSD-modified "Standard" BSD games
USE_BZIP2= yes
diff --git a/games/bsdgames/pkg-comment b/games/bsdgames/pkg-comment
deleted file mode 100644
index c00f8780ac85..000000000000
--- a/games/bsdgames/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FreeBSD-modified "Standard" BSD games
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 87b38dfbb3a0..2ef9d4c610b3 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= A multiplayer 3D tank battle game
USE_XLIB= yes
USE_MESA= yes
diff --git a/games/bzflag/pkg-comment b/games/bzflag/pkg-comment
deleted file mode 100644
index 3817d7d9ed6d..000000000000
--- a/games/bzflag/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multiplayer 3D tank battle game
diff --git a/games/columns/Makefile b/games/columns/Makefile
index eadbc42d4d3f..1817631f1179 100644
--- a/games/columns/Makefile
+++ b/games/columns/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.rzuser.uni-heidelberg.de/~dheck/columns/
DISTNAME= Columns-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Nice little implementation of columns game for X Window System
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/games/columns/pkg-comment b/games/columns/pkg-comment
deleted file mode 100644
index aca0ecd58f47..000000000000
--- a/games/columns/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Nice little implementation of columns game for X Window System
diff --git a/games/connect4/Makefile b/games/connect4/Makefile
index 8fd0a30315a6..8293f143e696 100644
--- a/games/connect4/Makefile
+++ b/games/connect4/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= A curses version of the classic game
BUILD_DEPENDS= gunshar:${PORTSDIR}/archivers/gshar+gunshar
diff --git a/games/connect4/pkg-comment b/games/connect4/pkg-comment
deleted file mode 100644
index 4ef590e8c7d3..000000000000
--- a/games/connect4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A curses version of the classic game
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index fd6e46ee0e38..a73184e618fc 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${PORTNAME}-client-${PORTVERSION}.tar.gz \
${PORTNAME}-client-sounds-${PORTVERSION}.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Multiplayer graphical arcade and adventure game made for X11
LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image
diff --git a/games/crossfire-client/pkg-comment b/games/crossfire-client/pkg-comment
deleted file mode 100644
index 2783f34b6ca1..000000000000
--- a/games/crossfire-client/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multiplayer graphical arcade and adventure game made for X11
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 68a9843e7ece..8b5cf820b4bc 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
${PORTNAME}-${PORTVERSION}-maps.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Server for multiplayer graphical arcade and adventure game
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
diff --git a/games/crossfire-server/pkg-comment b/games/crossfire-server/pkg-comment
deleted file mode 100644
index fc31b291c669..000000000000
--- a/games/crossfire-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Server for multiplayer graphical arcade and adventure game
diff --git a/games/crossword/Makefile b/games/crossword/Makefile
index f5565bb21695..2cb237146049 100644
--- a/games/crossword/Makefile
+++ b/games/crossword/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= games
MASTER_SITES= http://www.ldc.usb.ve/~96-28234/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Crossword Generator
WRKSRC= ${WRKDIR}/Crossword
USE_REINPLACE= yes
diff --git a/games/crossword/pkg-comment b/games/crossword/pkg-comment
deleted file mode 100644
index 6e0ba4ebdc1d..000000000000
--- a/games/crossword/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Crossword Generator
diff --git a/games/cryptoslam/Makefile b/games/cryptoslam/Makefile
index 3c28e99d33f1..d5c1ed534d83 100644
--- a/games/cryptoslam/Makefile
+++ b/games/cryptoslam/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A curses-based tool for creating and solving the cryptograms
USE_REINPLACE= yes
diff --git a/games/cryptoslam/pkg-comment b/games/cryptoslam/pkg-comment
deleted file mode 100644
index 70cec8196bd5..000000000000
--- a/games/cryptoslam/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A curses-based tool for creating and solving the cryptograms
diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile
index 6db68346ab6b..4217401d14f8 100644
--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.nbswebfx.com/downloads/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Another shoot-the-Bill game
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/defendguin/pkg-comment b/games/defendguin/pkg-comment
deleted file mode 100644
index 46febe455ed1..000000000000
--- a/games/defendguin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Another shoot-the-Bill game
diff --git a/games/drm/Makefile b/games/drm/Makefile
index fce11ec58119..5027a9bc8b15 100644
--- a/games/drm/Makefile
+++ b/games/drm/Makefile
@@ -14,6 +14,7 @@ DISTNAME= dr_mario
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Very simple tetris-style game
ALL_TARGET=
diff --git a/games/drm/pkg-comment b/games/drm/pkg-comment
deleted file mode 100644
index c29e3774a760..000000000000
--- a/games/drm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Very simple tetris-style game
diff --git a/games/empire/Makefile b/games/empire/Makefile
index 163acdb6c66e..a97ce0845d03 100644
--- a/games/empire/Makefile
+++ b/games/empire/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.catb.org/~esr/vms-empire/
DISTNAME= vms-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Solitaire empire game "VMS Empire"
MAN6= empire.6
diff --git a/games/empire/pkg-comment b/games/empire/pkg-comment
deleted file mode 100644
index 02a62121b07b..000000000000
--- a/games/empire/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Solitaire empire game "VMS Empire"
diff --git a/games/freebsd-games/Makefile b/games/freebsd-games/Makefile
index 8486f918e879..7b77d9fa217e 100644
--- a/games/freebsd-games/Makefile
+++ b/games/freebsd-games/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=markm
MAINTAINER= ports@FreeBSD.org
+COMMENT= FreeBSD-modified "Standard" BSD games
USE_BZIP2= yes
diff --git a/games/freebsd-games/pkg-comment b/games/freebsd-games/pkg-comment
deleted file mode 100644
index c00f8780ac85..000000000000
--- a/games/freebsd-games/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FreeBSD-modified "Standard" BSD games
diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index b624e15a3470..4b5fe8d0ffc2 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://vipe.technion.ac.il/~shlomif/freecell-solver/ \
http://fc-solve.berlios.de/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A program that automatically solves games of Freecell
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/games/freecell-solver/pkg-comment b/games/freecell-solver/pkg-comment
deleted file mode 100644
index 1604f719e7b0..000000000000
--- a/games/freecell-solver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program that automatically solves games of Freecell
diff --git a/games/freesweep/Makefile b/games/freesweep/Makefile
index b0727dfa5552..f6370c58c26f 100644
--- a/games/freesweep/Makefile
+++ b/games/freesweep/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.upl.cs.wisc.edu/~hartmann/sweep/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Minesweeper-style game for text-mode terminals
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/freesweep/pkg-comment b/games/freesweep/pkg-comment
deleted file mode 100644
index 92a55641a966..000000000000
--- a/games/freesweep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Minesweeper-style game for text-mode terminals
diff --git a/games/galaxis/Makefile b/games/galaxis/Makefile
index df2c9ba22bdc..d9dc824b3a84 100644
--- a/games/galaxis/Makefile
+++ b/games/galaxis/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.catb.org/~esr/galaxis/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Clone of the nifty little Macintosh game
ALL_TARGET= # empty
MAN6= galaxis.6
diff --git a/games/galaxis/pkg-comment b/games/galaxis/pkg-comment
deleted file mode 100644
index b7d4dd2f2d80..000000000000
--- a/games/galaxis/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clone of the nifty little Macintosh game
diff --git a/games/garith/Makefile b/games/garith/Makefile
index 057ef40a0c6e..c67a67a335a1 100644
--- a/games/garith/Makefile
+++ b/games/garith/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.cnm-vra.com/micah/garith/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Arithmetic quiz program for X Window System
ALL_TARGET= # empty
USE_X_PREFIX= yes
diff --git a/games/garith/pkg-comment b/games/garith/pkg-comment
deleted file mode 100644
index 75c4e926fe67..000000000000
--- a/games/garith/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Arithmetic quiz program for X Window System
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 2bdf4f2c9a76..d14e056a23d7 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.nbswebfx.com/downloads/ \
ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx
MAINTAINER= ports@FreeBSD.org
+COMMENT= An interesting one-player puzzle game for X
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/gemdropx/pkg-comment b/games/gemdropx/pkg-comment
deleted file mode 100644
index 65d1819c62f6..000000000000
--- a/games/gemdropx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interesting one-player puzzle game for X
diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index a09fcc51605b..b33cce3d56ae 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An OpenGL & SDL action flight simulator
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/gl-117/pkg-comment b/games/gl-117/pkg-comment
deleted file mode 100644
index ed2240ed432b..000000000000
--- a/games/gl-117/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An OpenGL & SDL action flight simulator
diff --git a/games/glasteroids/Makefile b/games/glasteroids/Makefile
index d4bb63e662da..45ba6207f943 100644
--- a/games/glasteroids/Makefile
+++ b/games/glasteroids/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.honors.montana.edu/~jjc/Glasteroids/
DISTNAME= Glasteriods
MAINTAINER= ports@FreeBSD.org
+COMMENT= 3D Asteroids game for X Window System
MAKEFILE= Makefile.FreeBSD
diff --git a/games/glasteroids/pkg-comment b/games/glasteroids/pkg-comment
deleted file mode 100644
index bc394c5d3a94..000000000000
--- a/games/glasteroids/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3D Asteroids game for X Window System
diff --git a/games/glife/Makefile b/games/glife/Makefile
index 179df1952c89..07ed80c75c32 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= gLife-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Conway's Game of Life for GNOME
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/games/glife/pkg-comment b/games/glife/pkg-comment
deleted file mode 100644
index 02c01f6649d2..000000000000
--- a/games/glife/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Conway's Game of Life for GNOME
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 10b91c1b8109..d00caae873ff 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= -source.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= A 3D worm game for two players for X Window System
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
SDL_net.0:${PORTSDIR}/net/sdl_net \
diff --git a/games/gltron/pkg-comment b/games/gltron/pkg-comment
deleted file mode 100644
index 786a26a3334e..000000000000
--- a/games/gltron/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 3D worm game for two players for X Window System
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index e81df221751e..f46e76dc598f 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://12.252.48.14/ftp/gno3dtet/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= GNOME version of the classic 3D-ified T*tris
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/games/gno3dtet/pkg-comment b/games/gno3dtet/pkg-comment
deleted file mode 100644
index af410682812a..000000000000
--- a/games/gno3dtet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME version of the classic 3D-ified T*tris
diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index 3b347d306ad1..39034e857c31 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.senet.com.au/~alcaron/
DISTNAME= gnome-breakout-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= GNOME version of the classic breakout game
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/games/gnomebreakout/pkg-comment b/games/gnomebreakout/pkg-comment
deleted file mode 100644
index c1677bfb8cf3..000000000000
--- a/games/gnomebreakout/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME version of the classic breakout game
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index 7d067204d828..16d0197e2abb 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= gnome-memblocks
DISTNAME= gnome-memblocks-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Memory Blocks game for GNOME
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/games/gnomememoryblocks/pkg-comment b/games/gnomememoryblocks/pkg-comment
deleted file mode 100644
index 5164cf8033b8..000000000000
--- a/games/gnomememoryblocks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Memory Blocks game for GNOME
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index c19bd37eea25..e845be3a7fac 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= chess
MAINTAINER= ports@FreeBSD.org
+COMMENT= "Classic" Gnu Chess
WRKSRC= ${WRKDIR}/chess
GNU_CONFIGURE= yes
diff --git a/games/gnuchess/pkg-comment b/games/gnuchess/pkg-comment
deleted file mode 100644
index 43c1141ccfa5..000000000000
--- a/games/gnuchess/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-"Classic" Gnu Chess
diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile
index cd0b5309e9e2..c4855cb92551 100644
--- a/games/gnurobots/Makefile
+++ b/games/gnurobots/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gnurobots
MAINTAINER= ports@FreeBSD.org
+COMMENT= GNU diversion wherein Scheme-coded robots explore a world
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile
diff --git a/games/gnurobots/pkg-comment b/games/gnurobots/pkg-comment
deleted file mode 100644
index 678e1a2817f0..000000000000
--- a/games/gnurobots/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU diversion wherein Scheme-coded robots explore a world
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index c2c58d26e2e6..08e58f6ede23 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= games
MASTER_SITES= http://gtkballs.antex.ru/dist/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Lines-like simple logic game for X Window System
LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/games/gtkballs/pkg-comment b/games/gtkballs/pkg-comment
deleted file mode 100644
index defec75dbb03..000000000000
--- a/games/gtkballs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lines-like simple logic game for X Window System
diff --git a/games/hex/Makefile b/games/hex/Makefile
index 5cef07b6738a..2fbd6534fefe 100644
--- a/games/hex/Makefile
+++ b/games/hex/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.earth.li/projectpurple/files/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Clone of "Puzzle Bobble" for X11 that uses GTK/Imlib
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/games/hex/pkg-comment b/games/hex/pkg-comment
deleted file mode 100644
index e6046548257f..000000000000
--- a/games/hex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clone of "Puzzle Bobble" for X11 that uses GTK/Imlib
diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile
index e66c06a151f9..e526dfeafc0e 100644
--- a/games/icbm3d/Makefile
+++ b/games/icbm3d/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.sonic.net/pub/users/nbs/unix/x/icbm3d/
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= "Inter-Continental Ballistic Missiles, 3D" - 3D game of defense
WRKSRC= ${WRKDIR}/icbm3d
USE_X_PREFIX= yes
diff --git a/games/icbm3d/pkg-comment b/games/icbm3d/pkg-comment
deleted file mode 100644
index 2968c1b00ba4..000000000000
--- a/games/icbm3d/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-"Inter-Continental Ballistic Missiles, 3D" - 3D game of defense
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index 063f58d440db..67a6b6573a69 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://shh.thathost.com/pub-unix/files/
DISTNAME= shhcards-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Library for displaying game cards on X Window System
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/games/libshhcards/pkg-comment b/games/libshhcards/pkg-comment
deleted file mode 100644
index 7e2685ba8935..000000000000
--- a/games/libshhcards/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library for displaying game cards on X Window System
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index ec2a4b85bb63..ad6591039dc2 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/linux/games/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Rich city simulation game for X
BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4
diff --git a/games/lincity/pkg-comment b/games/lincity/pkg-comment
deleted file mode 100644
index 927e6b3ae629..000000000000
--- a/games/lincity/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Rich city simulation game for X
diff --git a/games/lm-solve/Makefile b/games/lm-solve/Makefile
index 540efd8c879a..db9622745662 100644
--- a/games/lm-solve/Makefile
+++ b/games/lm-solve/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://vipe.technion.ac.il/~shlomif/lm-solve/
DISTNAME= LM-Solve-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Computerized Solver for Logic Mazes
PERL_CONFIGURE= yes
diff --git a/games/lm-solve/pkg-comment b/games/lm-solve/pkg-comment
deleted file mode 100644
index 667f60c71c15..000000000000
--- a/games/lm-solve/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Computerized Solver for Logic Mazes
diff --git a/games/madbomber/Makefile b/games/madbomber/Makefile
index ba888bb2c9ba..ad9a5d092656 100644
--- a/games/madbomber/Makefile
+++ b/games/madbomber/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.nbswebfx.com/downloads/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A clone of Activision's classic Atari 2600 console game "Kaboom!"
LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image \
SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/madbomber/pkg-comment b/games/madbomber/pkg-comment
deleted file mode 100644
index e4b04ce88d7d..000000000000
--- a/games/madbomber/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of Activision's classic Atari 2600 console game "Kaboom!"
diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index 39a150e3420a..a388251a3642 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.stevens-bradfield.com/MahJong/Source/ \
DISTNAME= mj-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
+COMMENT= A networked Mah Jong program, together with a computer player
USE_PERL5= yes
USE_GNOMENG= yes
diff --git a/games/mahjong/pkg-comment b/games/mahjong/pkg-comment
deleted file mode 100644
index 35410c43aca0..000000000000
--- a/games/mahjong/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A networked Mah Jong program, together with a computer player
diff --git a/games/merlin/Makefile b/games/merlin/Makefile
index 5492c427495d..e69718a251f0 100644
--- a/games/merlin/Makefile
+++ b/games/merlin/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.doc.ic.ac.uk/~np2/software/download/
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A pointless puzzle game for Tcl/Tk
RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/games/merlin/pkg-comment b/games/merlin/pkg-comment
deleted file mode 100644
index 002090f7b6e3..000000000000
--- a/games/merlin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pointless puzzle game for Tcl/Tk
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 7f8f7c99b66c..1aa61666939e 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
+COMMENT= An arcade style game with stereo sound for X Window System
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/games/mirrormagic/pkg-comment b/games/mirrormagic/pkg-comment
deleted file mode 100644
index cabd89dbf485..000000000000
--- a/games/mirrormagic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An arcade style game with stereo sound for X Window System
diff --git a/games/miscom/Makefile b/games/miscom/Makefile
index 2946fa9d6d35..647bbd551aa7 100644
--- a/games/miscom/Makefile
+++ b/games/miscom/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/arcade
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Atari "Missile Command" clone
ALL_TARGET=
WRKSRC= ${WRKDIR}/miscom
diff --git a/games/miscom/pkg-comment b/games/miscom/pkg-comment
deleted file mode 100644
index cc3f64aaf718..000000000000
--- a/games/miscom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Atari "Missile Command" clone
diff --git a/games/nethack33-gnome/Makefile b/games/nethack33-gnome/Makefile
index d3503e346f32..2380ee24bde4 100644
--- a/games/nethack33-gnome/Makefile
+++ b/games/nethack33-gnome/Makefile
@@ -8,6 +8,7 @@
MASTERDIR= ${.CURDIR}/../nethack33
MAINTAINER= Jan.Stocker@t-online.de
+COMMENT= A dungeon explorin', slashin', hackin' game (w/ GNOME graphics)
WITH_GNOME_GRAPHICS= yes
diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile
index e1d5a34976a8..b3cf5ef5d0db 100644
--- a/games/nethack33-nox11/Makefile
+++ b/games/nethack33-nox11/Makefile
@@ -8,6 +8,7 @@
MASTERDIR= ${.CURDIR}/../nethack33
MAINTAINER= yoshi@parodius.com
+COMMENT= A dungeon explorin', slashin', hackin' game (w/o X11 graphics)
WITH_TTY_GRAPHICS= yes
diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index b760e8c22335..87502b875333 100644
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@@ -8,6 +8,7 @@
MASTERDIR= ${.CURDIR}/../nethack33
MAINTAINER= ports@FreeBSD.org
+COMMENT= A dungeon explorin', slashin', hackin' game (w/ Qt graphics)
WITH_QT_GRAPHICS= yes
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index de0a9370a383..b4c50933b7fe 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
MAINTAINER?= dscheidt@enteract.com
+COMMENT?= A dungeon explorin', slashin', hackin' game
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/nethack33/pkg-comment b/games/nethack33/pkg-comment
deleted file mode 100644
index 70ca7a893988..000000000000
--- a/games/nethack33/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dungeon explorin', slashin', hackin' game
diff --git a/games/newkind/Makefile b/games/newkind/Makefile
index 5a35827f8ac0..bf5bdd3cafa8 100644
--- a/games/newkind/Makefile
+++ b/games/newkind/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PORTNAME}${EXTRACT_SUFX} ${PORTNAME}b${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Elite: The New Kind - a remake of the 8-bit classic
LIB_DEPENDS= alleg.4:${PORTSDIR}/devel/allegro
diff --git a/games/newkind/pkg-comment b/games/newkind/pkg-comment
deleted file mode 100644
index 5c56eea0c24c..000000000000
--- a/games/newkind/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Elite: The New Kind - a remake of the 8-bit classic
diff --git a/games/omega/Makefile b/games/omega/Makefile
index efae6b991377..bb51a109554b 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.alcyone.com/binaries/omega/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
+COMMENT= A complex rogue-style game of dungeon exploration
WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= # empty
diff --git a/games/omega/pkg-comment b/games/omega/pkg-comment
deleted file mode 100644
index c6e7a9b81225..000000000000
--- a/games/omega/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A complex rogue-style game of dungeon exploration
diff --git a/games/oonsoo/Makefile b/games/oonsoo/Makefile
index 6d7b3f29de3d..f1db5ef14149 100644
--- a/games/oonsoo/Makefile
+++ b/games/oonsoo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.redlinelabs.com/pub/oonsoo/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@freebsd.org
+COMMENT= A solitaire card game for X
USE_XLIB= yes
diff --git a/games/oonsoo/pkg-comment b/games/oonsoo/pkg-comment
deleted file mode 100644
index 506795ec835c..000000000000
--- a/games/oonsoo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A solitaire card game for X
diff --git a/games/phalanx/Makefile b/games/phalanx/Makefile
index 99c27b056e58..06f84c879e5a 100644
--- a/games/phalanx/Makefile
+++ b/games/phalanx/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.math.muni.cz/pub/math/people/Dobes/ \
http://dusan.freeshell.org/phalanx/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Xboard-compatible chess playing program
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/games/phalanx/pkg-comment b/games/phalanx/pkg-comment
deleted file mode 100644
index d32a516d231c..000000000000
--- a/games/phalanx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xboard-compatible chess playing program
diff --git a/games/powerpak/Makefile b/games/powerpak/Makefile
index 028718e40bb8..d0049ce0872c 100644
--- a/games/powerpak/Makefile
+++ b/games/powerpak/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.angelfire.com/va/powerpakgsdk/images/
DISTNAME= PowerPak
MAINTAINER= ports@FreeBSD.org
+COMMENT= SDL-based Game Software Development Kit
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
png.5:${PORTSDIR}/graphics/png \
diff --git a/games/powerpak/pkg-comment b/games/powerpak/pkg-comment
deleted file mode 100644
index 1657694e6a05..000000000000
--- a/games/powerpak/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SDL-based Game Software Development Kit
diff --git a/games/pp/Makefile b/games/pp/Makefile
index e7a48d6860d9..ce518a1b7630 100644
--- a/games/pp/Makefile
+++ b/games/pp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://www.mps.de/pub/unix/
DISTFILES= ppinst-0.01.tar.gz ppsrc-0.01.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Prometeus Project - real time strategy game for X Window System
WRKSRC= ${WRKDIR}/ppsrc
USE_QT_VER= 1
diff --git a/games/pp/pkg-comment b/games/pp/pkg-comment
deleted file mode 100644
index d7ab2789d9a3..000000000000
--- a/games/pp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Prometeus Project - real time strategy game for X Window System
diff --git a/games/qcc/Makefile b/games/qcc/Makefile
index d0ca19ef547b..b31e90a31923 100644
--- a/games/qcc/Makefile
+++ b/games/qcc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/source/
DISTNAME= ${PORTNAME}
MAINTAINER= ports@freebsd.org
+COMMENT= The QuakeC compiler, for building custom games of Quake
WRKSRC= ${WRKDIR}/send
MAKEFILE= makefile
diff --git a/games/qcc/pkg-comment b/games/qcc/pkg-comment
deleted file mode 100644
index 150498095da5..000000000000
--- a/games/qcc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The QuakeC compiler, for building custom games of Quake
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 0777c99ca58d..781d0f8971a0 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -24,6 +24,7 @@ DISTFILES+= ${SKINFILES}
.endif
MAINTAINER= ports@FreeBSD.org
+COMMENT= Cleaned up copy of the GPL'd Quake 1 source code
WADFILE= quakesw-1.0.6.tar.gz
PROGFILE= qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz
diff --git a/games/quakeforge/pkg-comment b/games/quakeforge/pkg-comment
deleted file mode 100644
index 014ab1ff62ca..000000000000
--- a/games/quakeforge/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cleaned up copy of the GPL'd Quake 1 source code
diff --git a/games/race/Makefile b/games/race/Makefile
index f1fca185ad13..6e44b81f4af8 100644
--- a/games/race/Makefile
+++ b/games/race/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= games
MASTER_SITES= ftp://users.freebsd.org.uk/pub/foobar2k/
MAINTAINER= ports@FreeBSD.org
+COMMENT= OpenGL Racing Game
LIB_DEPENDS= SDL_mixer:${PORTSDIR}/audio/sdl_mixer \
SDL_image:${PORTSDIR}/graphics/sdl_image
diff --git a/games/race/pkg-comment b/games/race/pkg-comment
deleted file mode 100644
index ecf8353a6d8f..000000000000
--- a/games/race/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OpenGL Racing Game
diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index c72888722622..d0e88c20240c 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= spacerocks
MAINTAINER= ports@freebsd.org
+COMMENT= Addictive rock-dodging greeblie-killing platform game
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
diff --git a/games/rockdodger/pkg-comment b/games/rockdodger/pkg-comment
deleted file mode 100644
index 2cf11f25b948..000000000000
--- a/games/rockdodger/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Addictive rock-dodging greeblie-killing platform game
diff --git a/games/rubix/Makefile b/games/rubix/Makefile
index e829d3acd767..73922741c987 100644
--- a/games/rubix/Makefile
+++ b/games/rubix/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://sed.free.fr/rubix/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Another Rubik's cube game with a rather interesting interface
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/games/rubix/pkg-comment b/games/rubix/pkg-comment
deleted file mode 100644
index 51e8c22388c5..000000000000
--- a/games/rubix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Another Rubik's cube game with a rather interesting interface
diff --git a/games/seabattle/Makefile b/games/seabattle/Makefile
index e9b30b183075..3373f9d000cd 100644
--- a/games/seabattle/Makefile
+++ b/games/seabattle/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE} \
MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= ports@FreeBSD.org
+COMMENT= A curses based battleship type game
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/seabattle ${PREFIX}/bin
diff --git a/games/seabattle/pkg-comment b/games/seabattle/pkg-comment
deleted file mode 100644
index 42de8abc650d..000000000000
--- a/games/seabattle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A curses based battleship type game
diff --git a/games/smacx/Makefile b/games/smacx/Makefile
index 76d5e3eb3d93..e5608ad3ca6d 100644
--- a/games/smacx/Makefile
+++ b/games/smacx/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}-demo-x86
EXTRACT_SUFX= .run
MAINTAINER= ports@FreeBSD.org
+COMMENT= Free demo of Sid Meier's Alpha Centauri
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/games/smacx/pkg-comment b/games/smacx/pkg-comment
deleted file mode 100644
index de0146a9a748..000000000000
--- a/games/smacx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free demo of Sid Meier's Alpha Centauri
diff --git a/games/sokoban/Makefile b/games/sokoban/Makefile
index e55efeed6aa0..e675892b28f4 100644
--- a/games/sokoban/Makefile
+++ b/games/sokoban/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/strategy
DISTFILES= ${PORTNAME}-src${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Logical game: problems with packets in cave
WRKSRC= ${WRKDIR}/sokoban
ALL_TARGET=
diff --git a/games/sokoban/pkg-comment b/games/sokoban/pkg-comment
deleted file mode 100644
index 6350d5d54e58..000000000000
--- a/games/sokoban/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Logical game: problems with packets in cave
diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile
index a20a8d474847..e8ad6a3a5391 100644
--- a/games/spellcast/Makefile
+++ b/games/spellcast/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Multiplayer fight with spells turn based game for X Window System
USE_X_PREFIX= yes
MAN6= spellcast.6
diff --git a/games/spellcast/pkg-comment b/games/spellcast/pkg-comment
deleted file mode 100644
index 7c0ec7be8e28..000000000000
--- a/games/spellcast/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multiplayer fight with spells turn based game for X Window System
diff --git a/games/spider/Makefile b/games/spider/Makefile
index 7863490fc95c..b13a1f82cb1b 100644
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= A challenging double decked solitaire game
USE_IMAKE= yes
INSTALL_TARGET= install install.doc
diff --git a/games/spider/pkg-comment b/games/spider/pkg-comment
deleted file mode 100644
index 1f66ed8a4c2e..000000000000
--- a/games/spider/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A challenging double decked solitaire game
diff --git a/games/starlanes/Makefile b/games/starlanes/Makefile
index 6f3b3c8b86b7..95d9c0c7e85e 100644
--- a/games/starlanes/Makefile
+++ b/games/starlanes/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= ports@FreeBSD.org
+COMMENT= The classic space-age stock trading game
ALL_TARGET= # empty
MAN6= starlanes.6
diff --git a/games/starlanes/pkg-comment b/games/starlanes/pkg-comment
deleted file mode 100644
index a3b0377f6214..000000000000
--- a/games/starlanes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The classic space-age stock trading game
diff --git a/games/sxsame/Makefile b/games/sxsame/Makefile
index 0d92cf737b64..e59834231133 100644
--- a/games/sxsame/Makefile
+++ b/games/sxsame/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://stardust.sfc.wide.ad.jp/pub/JG/JG-0.9.1/sources/ \
ftp://mirror.nucba.ac.jp/mirror/JG/JG-0.9.1/sources/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A tile-removing puzzle game for the X Window system
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/sxsame/pkg-comment b/games/sxsame/pkg-comment
deleted file mode 100644
index 22f1e53ebe31..000000000000
--- a/games/sxsame/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tile-removing puzzle game for the X Window system
diff --git a/games/taipan/Makefile b/games/taipan/Makefile
index d05f315cddcc..c9bcfb9ea947 100644
--- a/games/taipan/Makefile
+++ b/games/taipan/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE} \
MASTER_SITE_SUBDIR= games/textrpg
MAINTAINER= ports@FreeBSD.org
+COMMENT= Taipan was (and is) a classic role-playing game from the 1980s
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/games/taipan/pkg-comment b/games/taipan/pkg-comment
deleted file mode 100644
index ec781b3b1793..000000000000
--- a/games/taipan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Taipan was (and is) a classic role-playing game from the 1980s
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 47135048637d..18366118a24a 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://step.polymtl.ca/~coyote/tank/
DISTFILES= ${DISTNAME}-src.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= A 3-D network tank game that uses OpenGL/Mesa
BUILD_DEPENDS= ${X11BASE}/lib/libaux.a:${PORTSDIR}/graphics/libaux
diff --git a/games/tank/pkg-comment b/games/tank/pkg-comment
deleted file mode 100644
index ca3eb3f9f95e..000000000000
--- a/games/tank/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 3-D network tank game that uses OpenGL/Mesa
diff --git a/games/textmaze/Makefile b/games/textmaze/Makefile
index 73b4bafc96f5..ed47a4ba116b 100644
--- a/games/textmaze/Makefile
+++ b/games/textmaze/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.robobunny.com/projects/textmaze/
DISTNAME= ${PORTNAME}_v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Generates mazes on a text terminal and lets you traverse them
USE_PERL5= yes
WRKSRC= ${WRKDIR}/TextMaze
diff --git a/games/textmaze/pkg-comment b/games/textmaze/pkg-comment
deleted file mode 100644
index 9e940f1542c6..000000000000
--- a/games/textmaze/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generates mazes on a text terminal and lets you traverse them
diff --git a/games/tinymux/Makefile b/games/tinymux/Makefile
index 47fecec49a71..821a9de334e8 100644
--- a/games/tinymux/Makefile
+++ b/games/tinymux/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= games
MASTER_SITES= http://www.moosh.net/pub/mush/servers/tinymux/TinyMUX-1.x/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Multi-Player FreeForm adventure Program
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
diff --git a/games/tinymux/pkg-comment b/games/tinymux/pkg-comment
deleted file mode 100644
index d08fa718426f..000000000000
--- a/games/tinymux/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Multi-Player FreeForm adventure Program
diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile
index dd90d13b25c0..36c068a230e8 100644
--- a/games/tux-aqfh/Makefile
+++ b/games/tux-aqfh/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://tuxaqfh.sourceforge.net/dist/
MAINTAINER= ports@FreeBSD.org
+COMMENT= An OpenGL adventure game
BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
diff --git a/games/tux-aqfh/pkg-comment b/games/tux-aqfh/pkg-comment
deleted file mode 100644
index 10f297e70cb4..000000000000
--- a/games/tux-aqfh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An OpenGL adventure game
diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile
index d035c940168e..c432ca246920 100644
--- a/games/tuxkart/Makefile
+++ b/games/tuxkart/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://tuxkart.sourceforge.net/dist/
MAINTAINER= ports@FreeBSD.org
+COMMENT= An OpenGL action kart racing game
BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
diff --git a/games/tuxkart/pkg-comment b/games/tuxkart/pkg-comment
deleted file mode 100644
index 7d0fa6da3801..000000000000
--- a/games/tuxkart/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An OpenGL action kart racing game
diff --git a/games/twitch/Makefile b/games/twitch/Makefile
index a35d1dfec9a9..494d3e92c9e0 100644
--- a/games/twitch/Makefile
+++ b/games/twitch/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An overhead 2-d shooter, reminiscent of games like Robotron
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
diff --git a/games/twitch/pkg-comment b/games/twitch/pkg-comment
deleted file mode 100644
index 0367d71af63a..000000000000
--- a/games/twitch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An overhead 2-d shooter, reminiscent of games like Robotron
diff --git a/games/uhexen/Makefile b/games/uhexen/Makefile
index 3269d4f76e26..7f9057a5fc6f 100644
--- a/games/uhexen/Makefile
+++ b/games/uhexen/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://uhexen.sourceforge.net/
DISTNAME= ${PORTNAME}-latest
MAINTAINER= ports@FreeBSD.org
+COMMENT= Yet another port of Hexen, popular game from Raven Softrware
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/uhexen/pkg-comment b/games/uhexen/pkg-comment
deleted file mode 100644
index 51bbc0b1b777..000000000000
--- a/games/uhexen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another port of Hexen, popular game from Raven Softrware
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index df64f517cf3d..291c05a00130 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An automotive simulation framework
BUILD_DEPENDS= ${X11BASE}/lib/libplibul.a:${PORTSDIR}/x11-toolkits/plib
LIB_DEPENDS= sigc:${PORTSDIR}/devel/libsigc++
diff --git a/games/vamos/pkg-comment b/games/vamos/pkg-comment
deleted file mode 100644
index d034783c66ab..000000000000
--- a/games/vamos/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An automotive simulation framework
diff --git a/games/wmfortune/Makefile b/games/wmfortune/Makefile
index 223e71051910..c6b69a7dbc2c 100644
--- a/games/wmfortune/Makefile
+++ b/games/wmfortune/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games windowmaker afterstep
MASTER_SITES= http://www.01.246.ne.jp/~m-sugano/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A dockapp that outputs fortune messages
USE_GMAKE= yes
USE_XPM= yes
diff --git a/games/wmfortune/pkg-comment b/games/wmfortune/pkg-comment
deleted file mode 100644
index 7675aff0816c..000000000000
--- a/games/wmfortune/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockapp that outputs fortune messages
diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile
index 9d8d8f764261..0f01c4013cee 100644
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.electricrain.com/edavis/miniCHESS/
DISTNAME= miniCHESS-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= WindowMaker chess dockapp game
RUN_DEPENDS= ${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess
diff --git a/games/wmminichess/pkg-comment b/games/wmminichess/pkg-comment
deleted file mode 100644
index 9798ebc127f2..000000000000
--- a/games/wmminichess/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WindowMaker chess dockapp game
diff --git a/games/wmpuzzle/Makefile b/games/wmpuzzle/Makefile
index 8fda195dee8e..b55bce17e557 100644
--- a/games/wmpuzzle/Makefile
+++ b/games/wmpuzzle/Makefile
@@ -17,6 +17,7 @@ DIST_SUBDIR= wmpuzzle
EXTRACT_ONLY= wmpuzzle_${PORTVERSION}.orig${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A dockable puzzle game for WindowMaker and AfterStep
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
diff --git a/games/wmpuzzle/pkg-comment b/games/wmpuzzle/pkg-comment
deleted file mode 100644
index fc59d8c1e8b8..000000000000
--- a/games/wmpuzzle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockable puzzle game for WindowMaker and AfterStep
diff --git a/games/wmshuffle/Makefile b/games/wmshuffle/Makefile
index d1747484d0e0..e0c70f59252f 100644
--- a/games/wmshuffle/Makefile
+++ b/games/wmshuffle/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.linuks.mine.nu/dockapp/ \
ftp://regency.nsu.ru/tmp/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A dockable Shuffle game for WindowMaker and AfterStep
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/games/wmshuffle/pkg-comment b/games/wmshuffle/pkg-comment
deleted file mode 100644
index 394bfe924f06..000000000000
--- a/games/wmshuffle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockable Shuffle game for WindowMaker and AfterStep
diff --git a/games/wmtimebomb/Makefile b/games/wmtimebomb/Makefile
index 7ec82ad57677..80b7a8d75a8f 100644
--- a/games/wmtimebomb/Makefile
+++ b/games/wmtimebomb/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
DISTNAME= wmtimebomb.20
MAINTAINER= ports@FreeBSD.org
+COMMENT= A minesweeper for WindowMaker
LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \
wraster.4:${PORTSDIR}/x11-wm/windowmaker
diff --git a/games/wmtimebomb/pkg-comment b/games/wmtimebomb/pkg-comment
deleted file mode 100644
index 7fad70b91dad..000000000000
--- a/games/wmtimebomb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A minesweeper for WindowMaker
diff --git a/games/wordplay/Makefile b/games/wordplay/Makefile
index 64f80f3a2185..2d245e1ba660 100644
--- a/games/wordplay/Makefile
+++ b/games/wordplay/Makefile
@@ -12,6 +12,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Simple program to generate anagrams
NO_WRKSUBDIR= yes
USE_REINPLACE= yes
diff --git a/games/wordplay/pkg-comment b/games/wordplay/pkg-comment
deleted file mode 100644
index f8b9e357c46a..000000000000
--- a/games/wordplay/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple program to generate anagrams
diff --git a/games/x3eyes/Makefile b/games/x3eyes/Makefile
index 3bdb1ba207d3..3853923a2603 100644
--- a/games/x3eyes/Makefile
+++ b/games/x3eyes/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://puma.cis.ibaraki.ac.jp/pub/X11/
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An xeyes-like game except with 3 eyes
USE_IMAKE= yes
MAN1= x3eyes.1
diff --git a/games/x3eyes/pkg-comment b/games/x3eyes/pkg-comment
deleted file mode 100644
index 3a9d8c43e059..000000000000
--- a/games/x3eyes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An xeyes-like game except with 3 eyes
diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile
index 146f85a857de..ce698370e464 100644
--- a/games/xabacus/Makefile
+++ b/games/xabacus/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
MASTER_SITE_SUBDIR= applications
MAINTAINER= ports@FreeBSD.org
+COMMENT= Abacus for X Window System
WRKSRC= ${WRKDIR}/xabacus
USE_MOTIF= yes
diff --git a/games/xabacus/pkg-comment b/games/xabacus/pkg-comment
deleted file mode 100644
index 877b4aff7f28..000000000000
--- a/games/xabacus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Abacus for X Window System
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index ba1ae6839829..67310abf3a90 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.x.org/pub/R5contrib/
DISTFILES= xasteroids.sh.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= X11 based asteroids style arcade game
USE_IMAKE= yes
NO_WRKSUBDIR= yes
diff --git a/games/xasteroids/pkg-comment b/games/xasteroids/pkg-comment
deleted file mode 100644
index 26158f325238..000000000000
--- a/games/xasteroids/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 based asteroids style arcade game
diff --git a/games/xataxx/Makefile b/games/xataxx/Makefile
index 68426fda5b18..6686a73a9207 100644
--- a/games/xataxx/Makefile
+++ b/games/xataxx/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Strategy game of position and movement for X Window System
USE_IMAKE= yes
MAN6= xataxx.6
diff --git a/games/xataxx/pkg-comment b/games/xataxx/pkg-comment
deleted file mode 100644
index 3cb6cb8da24e..000000000000
--- a/games/xataxx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Strategy game of position and movement for X Window System
diff --git a/games/xbattle/Makefile b/games/xbattle/Makefile
index 064ee76e201e..c5670dbe4e4f 100644
--- a/games/xbattle/Makefile
+++ b/games/xbattle/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= ftp://cns-ftp.bu.edu/pub/xbattle/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A concurrent multi-player battle strategy game
USE_IMAKE= yes
MAN1= xbattle.1
diff --git a/games/xbattle/pkg-comment b/games/xbattle/pkg-comment
deleted file mode 100644
index 91e8dc7f2262..000000000000
--- a/games/xbattle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A concurrent multi-player battle strategy game
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index e4f9c04d6bfa..ce3023c9e5c6 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= games
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Save your computers from the evil clutches of Bill
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/xbill/pkg-comment b/games/xbill/pkg-comment
deleted file mode 100644
index a42efb298a67..000000000000
--- a/games/xbill/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Save your computers from the evil clutches of Bill
diff --git a/games/xbl/Makefile b/games/xbl/Makefile
index 35ed5e528f8e..543042d8244e 100644
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp710.univ-lyon1.fr/pub/xbl/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A 3D block-dropping game
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/games/xbl/pkg-comment b/games/xbl/pkg-comment
deleted file mode 100644
index 1b931624164e..000000000000
--- a/games/xbl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 3D block-dropping game
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index ce9b2d1fcbb5..954c58cada37 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= An X11/Motif blackjack game
BROKEN= "Broken by open-motif upgrade"
diff --git a/games/xblackjack/pkg-comment b/games/xblackjack/pkg-comment
deleted file mode 100644
index 32a163fd6d6e..000000000000
--- a/games/xblackjack/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11/Motif blackjack game
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 58dc67899028..1b5b6b3b8ddf 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.gedanken.demon.co.uk/download-xbomb/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Minesweeper with a couple of grid types
USE_X_PREFIX= yes
MAN6= xbomb.6
diff --git a/games/xbomb/pkg-comment b/games/xbomb/pkg-comment
deleted file mode 100644
index 0491bbab1cf0..000000000000
--- a/games/xbomb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Minesweeper with a couple of grid types
diff --git a/games/xchadance/Makefile b/games/xchadance/Makefile
index c0b17cf13d12..f6e53fd0fe75 100644
--- a/games/xchadance/Makefile
+++ b/games/xchadance/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.mk.bsdclub.org/pub/FreeBSD/distfiles/
DISTFILES= xchada01.lzh
MAINTAINER= ports@FreeBSD.org
+COMMENT= Display a dancing girl "ChaCha."
BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha
diff --git a/games/xchadance/pkg-comment b/games/xchadance/pkg-comment
deleted file mode 100644
index 6f9f70162a32..000000000000
--- a/games/xchadance/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display a dancing girl "ChaCha."
diff --git a/games/xchain/Makefile b/games/xchain/Makefile
index 3fc6444fd48a..29b4a70e03b0 100644
--- a/games/xchain/Makefile
+++ b/games/xchain/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://linux.tucows.com/files/x11/entertain/
DISTNAME= ${PORTNAME}_1.0-2
MAINTAINER= ports@FreeBSD.org
+COMMENT= Chain Reaction, a strategy game for 2-4 players
RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/games/xchain/pkg-comment b/games/xchain/pkg-comment
deleted file mode 100644
index ba7ed6543f7c..000000000000
--- a/games/xchain/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Chain Reaction, a strategy game for 2-4 players
diff --git a/games/xchomp/Makefile b/games/xchomp/Makefile
index efe1b8e24d5d..8636ce4ccca1 100644
--- a/games/xchomp/Makefile
+++ b/games/xchomp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.x.org/R5contrib/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Pac-man-like game under X11
WRKSRC= ${WRKDIR}/xchomp
USE_IMAKE= yes
diff --git a/games/xchomp/pkg-comment b/games/xchomp/pkg-comment
deleted file mode 100644
index 6ead03957bbb..000000000000
--- a/games/xchomp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Pac-man-like game under X11
diff --git a/games/xcogitate/Makefile b/games/xcogitate/Makefile
index e07031648669..1282d4603d47 100644
--- a/games/xcogitate/Makefile
+++ b/games/xcogitate/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mph
MAINTAINER= ports@FreeBSD.org
+COMMENT= A logic game with board and stones
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/games/xcogitate/pkg-comment b/games/xcogitate/pkg-comment
deleted file mode 100644
index 84e9efe95ed4..000000000000
--- a/games/xcogitate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A logic game with board and stones
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 7ab2752fa00f..8878232fba4e 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://sources.redhat.com/pub/xconq/ \
ftp://unix.hensa.ac.uk/mirrors/sources.redhat.com/pub/xconq/
MAINTAINER= ports@freebsd.org
+COMMENT= A graphical multi-player strategy game and game design system
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
diff --git a/games/xconq/pkg-comment b/games/xconq/pkg-comment
deleted file mode 100644
index 5751292a441e..000000000000
--- a/games/xconq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical multi-player strategy game and game design system
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index 0c27629a2818..ab13dde65c07 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
+COMMENT= Another minesweeper game for the X Window System
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/xdemineur/pkg-comment b/games/xdemineur/pkg-comment
deleted file mode 100644
index cd9a4044df45..000000000000
--- a/games/xdemineur/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Another minesweeper game for the X Window System
diff --git a/games/xdigger/Makefile b/games/xdigger/Makefile
index 48bee96d92b2..02b3f0d9f6bf 100644
--- a/games/xdigger/Makefile
+++ b/games/xdigger/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/arcade
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Boulderdash-like KC85 Digger for X Window System
USE_REINPLACE= yes
USE_IMAKE= yes
diff --git a/games/xdigger/pkg-comment b/games/xdigger/pkg-comment
deleted file mode 100644
index 84866cf4b646..000000000000
--- a/games/xdigger/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Boulderdash-like KC85 Digger for X Window System
diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index 38eba0a2895b..e40a0b675dd5 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -16,6 +16,7 @@ PATCHFILES= xemeraldia-0.3to0.31.patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
+COMMENT= A game of breaking blocks
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
diff --git a/games/xemeraldia/pkg-comment b/games/xemeraldia/pkg-comment
deleted file mode 100644
index 7f3b67ef342d..000000000000
--- a/games/xemeraldia/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A game of breaking blocks
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index cdd9c46a940f..bea8bb66f5a6 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= http://www.cit.uws.edu.au/pub/unix/games/ \
MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
+COMMENT= Galaga resurrected on X
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/games/xgalaga/pkg-comment b/games/xgalaga/pkg-comment
deleted file mode 100644
index 3ca8cce190da..000000000000
--- a/games/xgalaga/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Galaga resurrected on X
diff --git a/games/xhexagons/Makefile b/games/xhexagons/Makefile
index 2ec90d165d38..480c6e8e8e8e 100644
--- a/games/xhexagons/Makefile
+++ b/games/xhexagons/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= ports@FreeBSD.org
+COMMENT= Hexagons puzzle (similar to Fifteen Puzzle) for X Window System
WRKSRC= ${WRKDIR}/xhexagons
USE_IMAKE= yes
diff --git a/games/xhexagons/pkg-comment b/games/xhexagons/pkg-comment
deleted file mode 100644
index fe9bf275f8ab..000000000000
--- a/games/xhexagons/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hexagons puzzle (similar to Fifteen Puzzle) for X Window System
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index f8916745366f..c90226eb0e55 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/arcade/invaders
MAINTAINER= ports@FreeBSD.org
+COMMENT= Shoot-em-up them nasty little bugs
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/games/xinvaders/pkg-comment b/games/xinvaders/pkg-comment
deleted file mode 100644
index 19253f271edb..000000000000
--- a/games/xinvaders/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Shoot-em-up them nasty little bugs
diff --git a/games/xisola/Makefile b/games/xisola/Makefile
index 90b9212adcc2..36cea847bddc 100644
--- a/games/xisola/Makefile
+++ b/games/xisola/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
+COMMENT= Simple board game for X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xisola/pkg-comment b/games/xisola/pkg-comment
deleted file mode 100644
index 518cc4bb7b05..000000000000
--- a/games/xisola/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple board game for X Window System
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index d108e4151fad..d03149679962 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= pool/main/x/xjump
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
+COMMENT= A simple X game where one tries to jump up as many levels as possible
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/g}
diff --git a/games/xjump/pkg-comment b/games/xjump/pkg-comment
deleted file mode 100644
index 59f56d03bf68..000000000000
--- a/games/xjump/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple X game where one tries to jump up as many levels as possible
diff --git a/games/xjumpjump/Makefile b/games/xjumpjump/Makefile
index 9fa6fa952f2e..92a97c68fcbc 100644
--- a/games/xjumpjump/Makefile
+++ b/games/xjumpjump/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Logical game for X Window System
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
diff --git a/games/xjumpjump/pkg-comment b/games/xjumpjump/pkg-comment
deleted file mode 100644
index 207338fd781b..000000000000
--- a/games/xjumpjump/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Logical game for X Window System
diff --git a/games/xkoules/Makefile b/games/xkoules/Makefile
index 42b2dfb811bc..8029488868e8 100644
--- a/games/xkoules/Makefile
+++ b/games/xkoules/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME:S/^x//}${PORTVERSION}
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Fast action arcade-style game for X Window
.if ${MACHINE_ARCH} == "i386"
PLIST_SUB= SNDSRV:=""
diff --git a/games/xkoules/pkg-comment b/games/xkoules/pkg-comment
deleted file mode 100644
index c5f9d5d3234c..000000000000
--- a/games/xkoules/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fast action arcade-style game for X Window
diff --git a/games/xlaby/Makefile b/games/xlaby/Makefile
index e60fe9d72d7c..0514b67a9950 100644
--- a/games/xlaby/Makefile
+++ b/games/xlaby/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= games/strategy
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Daemonic X Labyrinth played directly with the mouse pointer
NO_WRKSUBDIR= yes
USE_IMAKE= yes
diff --git a/games/xlaby/pkg-comment b/games/xlaby/pkg-comment
deleted file mode 100644
index 6cca5fa23d14..000000000000
--- a/games/xlaby/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Daemonic X Labyrinth played directly with the mouse pointer
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index 17e6869bd54e..7eaf830e3643 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -13,6 +13,7 @@ DISTNAME= xlife
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= John Horton Conway's Game of Life
USE_IMAKE= yes
INSTALL_TARGET= install install.patterns
diff --git a/games/xlife/pkg-comment b/games/xlife/pkg-comment
deleted file mode 100644
index 4f92f643574a..000000000000
--- a/games/xlife/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-John Horton Conway's Game of Life
diff --git a/games/xlines/Makefile b/games/xlines/Makefile
index 5052e1b70af8..3324f7f11c3a 100644
--- a/games/xlines/Makefile
+++ b/games/xlines/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.trolltech.com/contrib/
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Remove as many balls from board as you can
USE_QT_VER= 3
USE_X_PREFIX= yes
diff --git a/games/xlines/pkg-comment b/games/xlines/pkg-comment
deleted file mode 100644
index 54d571174bf5..000000000000
--- a/games/xlines/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Remove as many balls from board as you can
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index e90935d00015..3d5fd34bfef3 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= ports@FreeBSD.org
+COMMENT= Mastermind game for X Window System
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
diff --git a/games/xmastermind/pkg-comment b/games/xmastermind/pkg-comment
deleted file mode 100644
index f85451f130f2..000000000000
--- a/games/xmastermind/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mastermind game for X Window System
diff --git a/games/xmball/Makefile b/games/xmball/Makefile
index b9419d3d083e..4b425aed8383 100644
--- a/games/xmball/Makefile
+++ b/games/xmball/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= ports@FreeBSD.org
+COMMENT= Masterball puzzle for X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xmball/pkg-comment b/games/xmball/pkg-comment
deleted file mode 100644
index 48b73894b7d8..000000000000
--- a/games/xmball/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Masterball puzzle for X Window System
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index 842948233299..3ecb7cb1eab9 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= games
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= X window mille bourne game
WRKSRC= ${WRKDIR}/Mille
diff --git a/games/xmille/pkg-comment b/games/xmille/pkg-comment
deleted file mode 100644
index b9b0c69d719b..000000000000
--- a/games/xmille/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X window mille bourne game
diff --git a/games/xmines/Makefile b/games/xmines/Makefile
index 1677866721f9..f81f93da972c 100644
--- a/games/xmines/Makefile
+++ b/games/xmines/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/strategy
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Minesweeper game for the X Window System
USE_X_PREFIX= yes
diff --git a/games/xmines/pkg-comment b/games/xmines/pkg-comment
deleted file mode 100644
index ffd0aec77e3f..000000000000
--- a/games/xmines/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Minesweeper game for the X Window System
diff --git a/games/xminesweep/Makefile b/games/xminesweep/Makefile
index a881a5226091..ad5dc53f7709 100644
--- a/games/xminesweep/Makefile
+++ b/games/xminesweep/Makefile
@@ -16,6 +16,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.Org
+COMMENT= X11 minesweeper game
USE_IMAKE= yes
MAN1= xminesweep.1
diff --git a/games/xminesweep/pkg-comment b/games/xminesweep/pkg-comment
deleted file mode 100644
index ff73d8fde7dd..000000000000
--- a/games/xminesweep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 minesweeper game
diff --git a/games/xmj/Makefile b/games/xmj/Makefile
index 9d7d6158766b..1124eb34057e 100644
--- a/games/xmj/Makefile
+++ b/games/xmj/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://forte.mathematik.uni-bremen.de/pub/comp/X11/
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Mahjongg
USE_IMAKE= yes
diff --git a/games/xmj/pkg-comment b/games/xmj/pkg-comment
deleted file mode 100644
index 4b3469f7d0c4..000000000000
--- a/games/xmj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mahjongg
diff --git a/games/xmlink/Makefile b/games/xmlink/Makefile
index efa3adf9fb74..ffa95c7f9239 100644
--- a/games/xmlink/Makefile
+++ b/games/xmlink/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= ports@FreeBSD.org
+COMMENT= Missing Link puzzle for X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xmlink/pkg-comment b/games/xmlink/pkg-comment
deleted file mode 100644
index 64c1afeeb88f..000000000000
--- a/games/xmlink/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Missing Link puzzle for X Window System
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index 8d0b323fcf4f..f74b709091be 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ../R5contrib
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= The classic cat-and-mouse
NO_WRKSUBDIR= yes
USE_IMAKE= yes
diff --git a/games/xneko/pkg-comment b/games/xneko/pkg-comment
deleted file mode 100644
index d499d6a96d0b..000000000000
--- a/games/xneko/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The classic cat-and-mouse
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index e57d2b71886a..c8b0abc7d879 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.tjhsst.edu/xnibbles/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/BETA/}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A simple X11 snake game, like one seen in MS-DOS qbasic
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/games/xnibbles/pkg-comment b/games/xnibbles/pkg-comment
deleted file mode 100644
index 49c98a8a143e..000000000000
--- a/games/xnibbles/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple X11 snake game, like one seen in MS-DOS qbasic
diff --git a/games/xoct/Makefile b/games/xoct/Makefile
index 371d404195d4..fc97df425159 100644
--- a/games/xoct/Makefile
+++ b/games/xoct/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= ports@FreeBSD.org
+COMMENT= Oct puzzle for X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xoct/pkg-comment b/games/xoct/pkg-comment
deleted file mode 100644
index 48efc69b5d6a..000000000000
--- a/games/xoct/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Oct puzzle for X Window System
diff --git a/games/xoids/Makefile b/games/xoids/Makefile
index 1bf40d73ac7b..d4e0f6b9d312 100644
--- a/games/xoids/Makefile
+++ b/games/xoids/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
+COMMENT= X Window Asteroids style game with full color pixmaps
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/xoids/pkg-comment b/games/xoids/pkg-comment
deleted file mode 100644
index 218b4be99a3e..000000000000
--- a/games/xoids/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X Window Asteroids style game with full color pixmaps
diff --git a/games/xoj/Makefile b/games/xoj/Makefile
index 283cbbc32498..493f3df598fe 100644
--- a/games/xoj/Makefile
+++ b/games/xoj/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= X11/demos
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= O. J. Simpson Simulator root window demo
USE_XPM= yes
USE_IMAKE= yes
diff --git a/games/xoj/pkg-comment b/games/xoj/pkg-comment
deleted file mode 100644
index cd1b81165254..000000000000
--- a/games/xoj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-O. J. Simpson Simulator root window demo
diff --git a/games/xothello/Makefile b/games/xothello/Makefile
index c7a381842131..c2c2ec27af88 100644
--- a/games/xothello/Makefile
+++ b/games/xothello/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Othello aka Reversi game for X Window
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
diff --git a/games/xothello/pkg-comment b/games/xothello/pkg-comment
deleted file mode 100644
index 8a81dbaf9349..000000000000
--- a/games/xothello/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Othello aka Reversi game for X Window
diff --git a/games/xpanex/Makefile b/games/xpanex/Makefile
index 8f34c1f6dcd6..d5228c84ca8f 100644
--- a/games/xpanex/Makefile
+++ b/games/xpanex/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= ports@FreeBSD.org
+COMMENT= Panex puzzle for X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xpanex/pkg-comment b/games/xpanex/pkg-comment
deleted file mode 100644
index 045d48e55700..000000000000
--- a/games/xpanex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Panex puzzle for X Window System
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 30238d81ede8..75373f97be4c 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Connect the pipes to stop the leaks
# LP64 issues
ONLY_FOR_ARCHS= i386
diff --git a/games/xpipeman/pkg-comment b/games/xpipeman/pkg-comment
deleted file mode 100644
index 27f8c962aac0..000000000000
--- a/games/xpipeman/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Connect the pipes to stop the leaks
diff --git a/games/xpyraminx/Makefile b/games/xpyraminx/Makefile
index f8f0218fbcef..0794c87eb55b 100644
--- a/games/xpyraminx/Makefile
+++ b/games/xpyraminx/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= ports@FreeBSD.org
+COMMENT= Pyraminx puzzle for X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xpyraminx/pkg-comment b/games/xpyraminx/pkg-comment
deleted file mode 100644
index 4baf1156773b..000000000000
--- a/games/xpyraminx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Pyraminx puzzle for X Window System
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 59c0ce69fdab..af70a95e1511 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Find quake servers
RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat
diff --git a/games/xqf/pkg-comment b/games/xqf/pkg-comment
deleted file mode 100644
index 57864cb7574d..000000000000
--- a/games/xqf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Find quake servers
diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile
index 7968e45c5299..32197536ffbe 100644
--- a/games/xquarto/Makefile
+++ b/games/xquarto/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.math.lsa.umich.edu/~mattiasj/games/xquarto/
MAINTAINER= ports@FreeBSD.org
+COMMENT= X version of simple but tricky board game
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/xquarto/pkg-comment b/games/xquarto/pkg-comment
deleted file mode 100644
index c41bcb27f2bc..000000000000
--- a/games/xquarto/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X version of simple but tricky board game
diff --git a/games/xripple/Makefile b/games/xripple/Makefile
index c8e72d902148..692e65a17bb2 100644
--- a/games/xripple/Makefile
+++ b/games/xripple/Makefile
@@ -19,6 +19,7 @@ MASTER_SITES= ftp://crydee.sai.msu.ru/zeus/X11/contrib/ \
DISTNAME= ${PORTNAME}
MAINTAINER= ports@freebsd.org
+COMMENT= X program to make bottom of screen ripple like a pool of water
USE_IMAKE= yes
ALL_TARGET= xripple
diff --git a/games/xripple/pkg-comment b/games/xripple/pkg-comment
deleted file mode 100644
index 5b902ffa3684..000000000000
--- a/games/xripple/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X program to make bottom of screen ripple like a pool of water
diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index b0ce63745be9..d8d6604b77e6 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://linux.tucows.com/files/x11/entertain/
DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Commodore 64 "Crossroads"-like video game for X Window System
USE_X_PREFIX= yes
diff --git a/games/xroads/pkg-comment b/games/xroads/pkg-comment
deleted file mode 100644
index b5dcd5972ed8..000000000000
--- a/games/xroads/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Commodore 64 "Crossroads"-like video game for X Window System
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index c0f2305738f3..75e3568a5420 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= mph
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= X version of the popular board game
USE_REINPLACE= yes
USE_IMAKE= yes
diff --git a/games/xscrabble/pkg-comment b/games/xscrabble/pkg-comment
deleted file mode 100644
index 7dedd3ebaef7..000000000000
--- a/games/xscrabble/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X version of the popular board game
diff --git a/games/xskewb/Makefile b/games/xskewb/Makefile
index 185100a954cc..9a64922dc3d4 100644
--- a/games/xskewb/Makefile
+++ b/games/xskewb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= ports@FreeBSD.org
+COMMENT= Skewb puzzle (similar to Rubik's Cube) for X Window
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xskewb/pkg-comment b/games/xskewb/pkg-comment
deleted file mode 100644
index 99a0b4b9a5dd..000000000000
--- a/games/xskewb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Skewb puzzle (similar to Rubik's Cube) for X Window
diff --git a/games/xsok/Makefile b/games/xsok/Makefile
index a2923f4fd5b0..d2300a820c7b 100644
--- a/games/xsok/Makefile
+++ b/games/xsok/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin.X11/ \
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= A generic Sokoban game for X11
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/xsok/pkg-comment b/games/xsok/pkg-comment
deleted file mode 100644
index c04414fc921e..000000000000
--- a/games/xsok/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A generic Sokoban game for X11
diff --git a/games/xsol/Makefile b/games/xsol/Makefile
index 0717380fd622..eb0d449a94ed 100644
--- a/games/xsol/Makefile
+++ b/games/xsol/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.simcb.ru/pub/unix/src/
DISTNAME= ${PORTNAME}-new
MAINTAINER= ports@FreeBSD.org
+COMMENT= Solitaire
USE_IMAKE= yes
MAN6= xsol.6
diff --git a/games/xsol/pkg-comment b/games/xsol/pkg-comment
deleted file mode 100644
index c0f5d7854599..000000000000
--- a/games/xsol/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Solitaire
diff --git a/games/xspacewarp/Makefile b/games/xspacewarp/Makefile
index 957885827433..a9af0952a59a 100644
--- a/games/xspacewarp/Makefile
+++ b/games/xspacewarp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
+COMMENT= Time Trek - like game for X Window System
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
diff --git a/games/xspacewarp/pkg-comment b/games/xspacewarp/pkg-comment
deleted file mode 100644
index c41b791491b4..000000000000
--- a/games/xspacewarp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Time Trek - like game for X Window System
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index 433155931c33..b12cc7ae6cb9 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An X version of a simple but tricky board game
USE_REINPLACE= yes
USE_IMAKE= yes
diff --git a/games/xtic/pkg-comment b/games/xtic/pkg-comment
deleted file mode 100644
index d0f4e37de130..000000000000
--- a/games/xtic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X version of a simple but tricky board game
diff --git a/games/xtron/Makefile b/games/xtron/Makefile
index f1aa170a2d06..61a9fe2f3d4f 100644
--- a/games/xtron/Makefile
+++ b/games/xtron/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/arcade
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Avoid running into walls, your own tail, and that of your opponent
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/games/xtron/pkg-comment b/games/xtron/pkg-comment
deleted file mode 100644
index 5ff962795ad9..000000000000
--- a/games/xtron/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Avoid running into walls, your own tail, and that of your opponent
diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile
index 005de6ba8a74..e63547623f3e 100644
--- a/games/xtruco/Makefile
+++ b/games/xtruco/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Simple version for X Window of the famous card game Super Truco
USE_X_PREFIX= yes
diff --git a/games/xtruco/pkg-comment b/games/xtruco/pkg-comment
deleted file mode 100644
index 5bedabccdb17..000000000000
--- a/games/xtruco/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple version for X Window of the famous card game Super Truco
diff --git a/games/xvier/Makefile b/games/xvier/Makefile
index 99977dc25cd4..051f43b54776 100644
--- a/games/xvier/Makefile
+++ b/games/xvier/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Throw stones into free columns
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_IMAKE= yes
diff --git a/games/xvier/pkg-comment b/games/xvier/pkg-comment
deleted file mode 100644
index 57060b3d689a..000000000000
--- a/games/xvier/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Throw stones into free columns
diff --git a/games/xvmahjongg/Makefile b/games/xvmahjongg/Makefile
index aeedb393d7da..c7d79606d3f8 100644
--- a/games/xvmahjongg/Makefile
+++ b/games/xvmahjongg/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.x.org/R5contrib/
DISTFILES= ${PORTNAME}${PORTVERSION}.tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Mahjongg for XView with multicolored tiles
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
diff --git a/games/xvmahjongg/pkg-comment b/games/xvmahjongg/pkg-comment
deleted file mode 100644
index c9b07aa52abb..000000000000
--- a/games/xvmahjongg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mahjongg for XView with multicolored tiles
diff --git a/games/xvmines/Makefile b/games/xvmines/Makefile
index 137dbe2a9ab8..49f28c4f3bfb 100644
--- a/games/xvmines/Makefile
+++ b/games/xvmines/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.csd.uch.gr/pub/X11/games/ \
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Simple minesweeper game for X Window System
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
diff --git a/games/xvmines/pkg-comment b/games/xvmines/pkg-comment
deleted file mode 100644
index 6192581b4370..000000000000
--- a/games/xvmines/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple minesweeper game for X Window System
diff --git a/games/xword/Makefile b/games/xword/Makefile
index 77ebc0241c0d..c8ae9888f5c0 100644
--- a/games/xword/Makefile
+++ b/games/xword/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A crossword puzzle application
LIB_DEPENDS= gtkmm:${PORTSDIR}/x11-toolkits/gtk--
diff --git a/games/xword/pkg-comment b/games/xword/pkg-comment
deleted file mode 100644
index b28854acbc2f..000000000000
--- a/games/xword/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A crossword puzzle application
diff --git a/games/xworm/Makefile b/games/xworm/Makefile
index b4b018916e2c..edd173f05491 100644
--- a/games/xworm/Makefile
+++ b/games/xworm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.ekran.no/archive/x/
DISTNAME= ${PORTNAME}102
MAINTAINER= ports@FreeBSD.org
+COMMENT= Classic game with apples and hungry worm
WRKSRC= ${WRKDIR}/XWorm
USE_X_PREFIX= yes
diff --git a/games/xworm/pkg-comment b/games/xworm/pkg-comment
deleted file mode 100644
index 9c0a88651e51..000000000000
--- a/games/xworm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Classic game with apples and hungry worm
diff --git a/games/yahtzee/Makefile b/games/yahtzee/Makefile
index eea4a9cba85b..aa661bb03235 100644
--- a/games/yahtzee/Makefile
+++ b/games/yahtzee/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}-src
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= A curses version of the dice game for one or more players
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/games/yahtzee/pkg-comment b/games/yahtzee/pkg-comment
deleted file mode 100644
index b39e3f6364d8..000000000000
--- a/games/yahtzee/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A curses version of the dice game for one or more players
diff --git a/games/yamsweeper/Makefile b/games/yamsweeper/Makefile
index e79b80ab03e1..436b21d45124 100644
--- a/games/yamsweeper/Makefile
+++ b/games/yamsweeper/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://stardust.sfc.wide.ad.jp/pub/JG/JG-0.9.1/sources/ \
EXTRACT_SUFX= .taz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Yet Another Mine Sweeper
USE_IMAKE= yes
MAN1= yamsweeper.1
diff --git a/games/yamsweeper/pkg-comment b/games/yamsweeper/pkg-comment
deleted file mode 100644
index b3eb0e2317d9..000000000000
--- a/games/yamsweeper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another Mine Sweeper
diff --git a/games/ztrack/Makefile b/games/ztrack/Makefile
index b4ba022bffa5..72bc2218cc46 100644
--- a/games/ztrack/Makefile
+++ b/games/ztrack/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/arcade
MAINTAINER= ports@FreeBSD.org
+COMMENT= Simple ncurses based pseudo-3D driving game
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/games/ztrack/pkg-comment b/games/ztrack/pkg-comment
deleted file mode 100644
index e58b17a3865f..000000000000
--- a/games/ztrack/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple ncurses based pseudo-3D driving game