15 files changed, 32 insertions, 83 deletions

diff --git a/games/alephone-data/Makefile b/games/alephone-data/Makefile
index e8eba9191f10..d59f84153e77 100644
--- a/games/alephone-data/Makefile
+++ b/games/alephone-data/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	alephone-data
-# Date created:		08 March 2001
-# Whom:			Michael Alyn Miller <malyn@strangeGizmo.com>
-#
+# Created by: Michael Alyn Miller <malyn@strangeGizmo.com>
 # $FreeBSD$
-#
 
 PORTNAME=	data
 PORTVERSION=	1.0
diff --git a/games/alephone-scenarios/Makefile b/games/alephone-scenarios/Makefile
index 2c48c3524f62..6afc452c5a7c 100644
--- a/games/alephone-scenarios/Makefile
+++ b/games/alephone-scenarios/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	alephone-scenarios
-# Date created:				2007-03-06
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME=	scenarios
 PORTVERSION=	1.0
diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile
index c172dc35d7b4..96e024872700 100644
--- a/games/battletanks/Makefile
+++ b/games/battletanks/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Battle Tanks
-# Date created:				24 Mar 2008
-# Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	btanks
 PORTVERSION=	0.9.8083
@@ -39,7 +35,7 @@ PORTDOCS=	LICENSE LICENSE.EXCEPTION README-en.txt README-linux.txt \
 		donate.url homepage.url project_page.url video.txt
 
 DESKTOP_ENTRIES="Battle Tanks" "${COMMENT}" "" "${PORTNAME}" \
-		"Application;Game;" false
+		"Game;ArcadeGame;" false
 
 pre-build:
 # Regenerate `sl08.h' after we patch `sl08.py' (as patching the header itself
diff --git a/games/cheech/Makefile b/games/cheech/Makefile
index 5d53cf83058b..58e7ae7f09cc 100644
--- a/games/cheech/Makefile
+++ b/games/cheech/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   cheech
-# Date created:			18 Jul 2007
-# Whom:				Yinghong.Liu <relaxbsd@gmail.com>
-#
+# Created by: Yinghong.Liu <relaxbsd@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	cheech
 PORTVERSION=	0.8
@@ -13,7 +9,7 @@ MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A multi-platform, networked Chinese Checkers game
+COMMENT=	Multiplayer Chinese Checkers game
 
 LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		gnet-2.0.0:${PORTSDIR}/net/gnet2
@@ -23,10 +19,10 @@ GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake:env
 
 DESKTOP_ENTRIES=	"cheech" \
-			"A networked Chinese Checkers Game" \
+			"${COMMENT}" \
+			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
 			"cheech" \
-			"cheech" \
-			"Application;Game;" \
+			"Game;BoardGame;" \
 			"false"
 
 .if !defined(NOPORTDOCS)
diff --git a/games/colorcode/Makefile b/games/colorcode/Makefile
index bcd6688f792b..cbece1047dea 100644
--- a/games/colorcode/Makefile
+++ b/games/colorcode/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	colorcode
-# Date created:		2010-10-16
-# Whom:			Max Brazhnikov <makc@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	colorcode
 PORTVERSION=	0.7.2
@@ -13,15 +8,15 @@ MASTER_SITES=	http://colorcode.laebisch.com/download/
 DISTNAME=	ColorCode-${PORTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	A free advanced MasterMind game and solver
+COMMENT=	Advanced MasterMind game and solver
 
 USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/ColorCode-${PORTVERSION}
 
-DESKTOP_ENTRIES=	"ColorCode" "Advanced MasterMind game and solver" \
+DESKTOP_ENTRIES=	"ColorCode" "${COMMENT}" \
 			"${PREFIX}/share/pixmaps/colorcode.png" "colorcode" \
-			"Application;LogicGame;Game;" false
+			"LogicGame;Game;Qt;" false
 
 PLIST_FILES=	bin/colorcode \
 		share/pixmaps/colorcode.png
diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile
index 1a5b34a8e692..c978e464cffe 100644
--- a/games/darkplaces/Makefile
+++ b/games/darkplaces/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	darkplaces
-# Date created:				25 Aug 2005
-# Whom:					Alejandro Pulver <alejandro@varnet.biz>
-#
+# Created by: Alejandro Pulver <alejandro@varnet.biz>
 # $FreeBSD$
-#
 
 PORTNAME=	darkplaces
 PORTVERSION=	20110628
@@ -54,7 +50,7 @@ EXE_TARGETS+=	${PORTNAME}-glx
 PLIST_SUB+=	CLIENT=""
 PLIST_FILES+=	bin/${PORTNAME}-glx
 DESKTOP_ENTRIES+="Darkplaces GLX Client" "" "" "darkplaces-glx" \
-		"Game;ActionGame;" "false"
+		"" "false"
 .endif
 
 .if ${PORT_OPTIONS:MDEDICATED}
@@ -69,7 +65,7 @@ ALL_TARGET+=	sdl-release
 EXE_TARGETS+=	${PORTNAME}-sdl
 PLIST_FILES+=	bin/${PORTNAME}-sdl
 DESKTOP_ENTRIES+="Darkplaces SDL Client" "" "" "darkplaces-sdl" \
-		"Game;ActionGame;" "false"
+		"" "false"
 .endif
 
 post-extract:
diff --git a/games/ftjava/Makefile b/games/ftjava/Makefile
index 712da9ebfb01..e02b72b7fc94 100644
--- a/games/ftjava/Makefile
+++ b/games/ftjava/Makefile
@@ -37,7 +37,7 @@ SUB_FILES=	ftjava.sh
 
 DESKTOP_ENTRIES=	"FTJava" "A PBEM client for Full Thrust" \
 			"${DATADIR}/Images/FTJava.ico" \
-			"ftjava" "Application;Game;BoardGame;StrategyGame;" \
+			"ftjava" "Game;BoardGame;StrategyGame;" \
 			false
 
 do-install:
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index 9618b9dbe587..9e01eb5ec847 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	glaxium
-# Date created:		21 Jan 2006
-# Whom:			Igor Pokrovsky <ip@doom.homeunix.org>
-#
+# Created by: Igor Pokrovsky <ip@doom.homeunix.org>
 # $FreeBSD$
-#
 
 PORTNAME=	glaxium
 PORTVERSION=	0.5
@@ -13,7 +9,7 @@ MASTER_SITES=	http://xhosxe.free.fr/glaxium/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	An OpenGL based space-ship "shoot-em-up" game
+COMMENT=	OpenGL based space-ship "shoot-em-up" game
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
diff --git a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile
index b1fa5fc6caed..397cb49a4698 100644
--- a/games/hex-a-hop/Makefile
+++ b/games/hex-a-hop/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME:S/-//g}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A puzzle game based on hexagonal tiles
+COMMENT=	Puzzle game based on hexagonal tiles
 
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
@@ -22,9 +22,9 @@ OPTIONS_DEFAULT=	SOUND
 PANGO_DESC=	Use sdl_pango instead of sdl_ttf
 SOUND_DESC=	Sound support
 
-DESKTOP_ENTRIES="Hex-a-Hop" "A puzzle game based on hexagonal tiles" \
+DESKTOP_ENTRIES="Hex-a-Hop" "${COMMENT}" \
 		"${DATADIR}/icon.bmp" \
-		"hex-a-hop" "Application;LogicGame;Game;" false
+		"hex-a-hop" "LogicGame;Game;" false
 
 .include <bsd.port.options.mk>
 
diff --git a/games/hexglass/Makefile b/games/hexglass/Makefile
index 387781a3d9f5..ab7ef9bd2d80 100644
--- a/games/hexglass/Makefile
+++ b/games/hexglass/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	hexglass
-# Date created:		2010-12-17
-# Whom:			Max Brazhnikov <makc@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	hexglass
 PORTVERSION=	1.2.1
@@ -23,7 +18,7 @@ PLIST_FILES=	bin/${PORTNAME} \
 
 DESKTOP_ENTRIES=	"HexGlass" "${COMMENT}" \
 			"${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \
-			"${PORTNAME}" "Application;BlocksGame;Game;" false
+			"${PORTNAME}" "BlocksGame;Game;" false
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS}
diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile
index 213ebf25d06b..5720e154d9c1 100644
--- a/games/hexxagon/Makefile
+++ b/games/hexxagon/Makefile
@@ -1,9 +1,4 @@
-## New ports collection makefile for:   hexxagon
-# Date created:			08 April 2006
-# Whom:				Max Brazhnikov makc@issp.ac.ru
-#
 # $FreeBSD$
-#
 
 PORTNAME=	hexxagon
 PORTVERSION=	1.0.1
@@ -12,7 +7,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.nesqi.se/hexxagon/hexxagon/download/
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	A strategy hexagon game
+COMMENT=	Strategy hexagon game
 
 LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
@@ -21,6 +16,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 DESKTOP_ENTRIES="Hexxagon" "Strategy Game" "" \
-		"hexxagon" "Application;Game;" false
+		"hexxagon" "Game;StrategyGame;" false
 
 .include <bsd.port.mk>
diff --git a/games/linux-enemyterritory-tce/Makefile b/games/linux-enemyterritory-tce/Makefile
index 53d29f042683..e32af0de0e0d 100644
--- a/games/linux-enemyterritory-tce/Makefile
+++ b/games/linux-enemyterritory-tce/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Enemy Territory TrueCombat:Elite
-# Date created:			25 Mar 2005
-# Whom:				Jean-Yves Lefort <jylefort@FreeBSD.org>
-#
+# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	enemyterritory-tce
 PORTVERSION=	0.49
@@ -14,7 +10,7 @@ DISTNAME=	tcetest
 DISTFILES=	tcetest049.zip
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A modern tactical Enemy Territory modification
+COMMENT=	Modern tactical Enemy Territory modification
 
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile
index 057d3ce75cb4..ec8b1246d9eb 100644
--- a/games/spellathon/Makefile
+++ b/games/spellathon/Makefile
@@ -29,7 +29,7 @@ USE_XORG=	ice sm x11 xau xdmcp xext xrender
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-DESKTOP_ENTRIES="Spellathon" "${COMMENT}" "" "${PORTNAME}" "" "true"
+DESKTOP_ENTRIES="Spellathon" "${COMMENT}" "" "${PORTNAME}" "Education;Languages;" "true"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/games/trigger/Makefile b/games/trigger/Makefile
index 7baa75526478..3304bc208230 100644
--- a/games/trigger/Makefile
+++ b/games/trigger/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	trigger
-# Date created:			31 Mar 2005
-# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
-#
 
 PORTNAME=	trigger
 PORTVERSION=	0.6.0
@@ -13,7 +9,7 @@ DISTFILES=	trigger-rally-${PORTVERSION}-src${EXTRACT_SUFX} \
 		trigger-rally-${DATAVERSION}-data${EXTRACT_SUFX}
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	A rally car racing game
+COMMENT=	Rally car racing game
 
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 LIB_DEPENDS=	physfs.1:${PORTSDIR}/devel/physfs
@@ -31,7 +27,7 @@ DATASRC=	${WRKDIR}/trigger-rally-${DATAVERSION}-data
 
 DATAVERSION=	0.6.0
 
-DESKTOP_ENTRIES="Trigger" "Car racing game" "" \
+DESKTOP_ENTRIES="Trigger" "${COMMENT}" "" \
 		"trigger" "" false
 
 PORTDOCS=	README-stereo.txt README.txt
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index 60c8cadc96c0..2cecb68d9f8e 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xpilot-ng
-# Date created:			11 Sep 2003
-# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
-#
 
 PORTNAME=	xpilot-ng
 PORTVERSION=	4.7.3
@@ -13,7 +9,7 @@ MASTER_SITES=	SF/xpilot/xpilot_ng/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT?=	An enhanced version of XPilot (server program)
+COMMENT?=	Enhanced version of XPilot (server program)
 
 LICENSE=	GPLv2