Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Jan 2013 02:07:27 +0000 (UTC)
From:      Max Brazhnikov <makc@svn.freebsd.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r310020 - in head: audio/gnuitar audio/soundtracker audio/teamspeak_client biology/seaview cad/leocad cad/pdnmesh deskutils/nagaina deskutils/qlabels devel/argouml devel/drpython devel/...
Message-ID:  <50ea2ddf.16fc.2ad8294d@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Mon Jan  7 02:07:26 2013
New Revision: 310020
URL: http://svnweb.freebsd.org/changeset/ports/310020

Log:
  - Update DESKTOP_ENTRIES:
    * rephrase Comment field or use port ${COMMENT} if appropriate
    * adjust Icon field according to the Desktop Entry Specification
    * update Categories field: remove deprecated category Application;
      set main category, if missing
  - Remove indefinite article and/or rephrase COMMENT
  - Trim Makefile header
  - Other minor changes

Modified:
  head/audio/gnuitar/Makefile   (contents, props changed)
  head/audio/soundtracker/Makefile   (contents, props changed)
  head/audio/teamspeak_client/Makefile   (contents, props changed)
  head/biology/seaview/Makefile
  head/cad/leocad/Makefile   (contents, props changed)
  head/cad/pdnmesh/Makefile
  head/deskutils/nagaina/Makefile   (contents, props changed)
  head/deskutils/qlabels/Makefile   (contents, props changed)
  head/devel/argouml/Makefile
  head/devel/drpython/Makefile
  head/devel/qdevelop/Makefile
  head/devel/qsvn/Makefile   (contents, props changed)
  head/editors/texmacs/Makefile   (contents, props changed)
  head/emulators/qmc2/Makefile   (contents, props changed)
  head/emulators/qtemu/Makefile
  head/games/alephone-data/Makefile   (contents, props changed)
  head/games/alephone-scenarios/Makefile   (contents, props changed)
  head/games/battletanks/Makefile   (contents, props changed)
  head/games/cheech/Makefile   (contents, props changed)
  head/games/colorcode/Makefile   (contents, props changed)
  head/games/darkplaces/Makefile
  head/games/ftjava/Makefile   (contents, props changed)
  head/games/glaxium/Makefile   (contents, props changed)
  head/games/hex-a-hop/Makefile   (contents, props changed)
  head/games/hexglass/Makefile   (contents, props changed)
  head/games/hexxagon/Makefile   (contents, props changed)
  head/games/linux-enemyterritory-tce/Makefile   (contents, props changed)
  head/games/spellathon/Makefile
  head/games/trigger/Makefile
  head/games/xpilot-ng-server/Makefile   (contents, props changed)
  head/graphics/albumshaper/Makefile   (contents, props changed)
  head/graphics/autoq3d/Makefile
  head/graphics/darknock/Makefile   (contents, props changed)
  head/graphics/gsnapshot/Makefile   (contents, props changed)
  head/graphics/xaos/Makefile
  head/japanese/ochusha/Makefile   (contents, props changed)
  head/math/convertall/Makefile   (contents, props changed)
  head/math/qtiplot/Makefile
  head/misc/nut/Makefile   (contents, props changed)
  head/multimedia/2mandvd/Makefile
  head/multimedia/gdvrecv/Makefile   (contents, props changed)
  head/multimedia/mandvd/Makefile
  head/multimedia/smile/Makefile
  head/print/kpdftool/Makefile
  head/sysutils/gtk-send-pr/Makefile   (contents, props changed)
  head/sysutils/nitrogen/Makefile
  head/textproc/beediff/Makefile   (contents, props changed)
  head/x11-wm/compiz/Makefile

Modified: head/audio/gnuitar/Makefile
==============================================================================
--- head/audio/gnuitar/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/audio/gnuitar/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,6 +1,4 @@
-# Ports collection Makefile for:	gnuitar
-# Date created:				3 Dec 2005
-# Whom:					Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=		gnuitar
@@ -29,7 +27,7 @@ SUID_DESC=	Use suid to allow highest pri
 
 DESKTOP_ENTRIES="GNUitar" \
 		"Apply guitar effects in real-time" \
-		"gnuitar" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \
 		"gnuitar" \
 		"" \
 		true

Modified: head/audio/soundtracker/Makefile
==============================================================================
--- head/audio/soundtracker/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/audio/soundtracker/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -26,8 +26,9 @@ OPTIONS_DEFINE_i386=	ASM
 GNOME1_DESC=	Use GNOME 1.x (enables envelope editing)
 ASM_DESC=	Use optimized assembly (potentially unstable)
 
-DESKTOP_ENTRIES="SoundTracker" "Compose music" "soundtracker.xpm" \
-		"soundtracker" "Audio;Player;Recorder;" false
+DESKTOP_ENTRIES="SoundTracker" "Pattern-oriented music editor" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \
+		"soundtracker" "AudioVideo;Audio;AudioVideoEditing;" false
 
 .include <bsd.port.pre.mk>
 

Modified: head/audio/teamspeak_client/Makefile
==============================================================================
--- head/audio/teamspeak_client/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/audio/teamspeak_client/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	teamspeak
-# Date created:				22 January 2003
-# Whom:					Daniel O'Connor
-#
+# Created by: Daniel O'Connor
 # $FreeBSD$
-#
 
 PORTNAME=	teamspeak_client
 PORTVERSION=	2.0.32
@@ -36,7 +32,7 @@ DESKTOP_ENTRIES="TeamSpeak" \
 		"Voice-chat with people" \
 		"${TSHOME}/icon.xpm" \
 		"TeamSpeak" \
-		"Application;Audio;Network;" \
+		"Network;Telephony;" \
 		false
 
 post-extract:

Modified: head/biology/seaview/Makefile
==============================================================================
--- head/biology/seaview/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/biology/seaview/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -37,8 +37,8 @@ MAKE_ENV=	HELPFILE='-DDEFAULT_HELPFILE=\
 ALL_TARGET=	${PORTNAME}
 MAKE_JOBS_SAFE=	yes
 
-DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "" "${PORTNAME}" \
-		"Application;Science;Biology;" "true"
+DESKTOP_ENTRIES="SeaView" "${COMMENT}" "" \
+		"${PORTNAME}" "Biology;Science;" "true"
 
 PLIST_FILES=	bin/seaview %%DATADIR%%/seaview.html
 PLIST_DIRS=	%%DATADIR%%

Modified: head/cad/leocad/Makefile
==============================================================================
--- head/cad/leocad/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/cad/leocad/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -9,7 +9,7 @@ DISTFILES=	${LEOCAD_DISTNAME} ${LEOCAD_P
 EXTRACT_ONLY=	${LEOCAD_DISTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A CAD program that uses bricks similar to those found in many toys
+COMMENT=	CAD modeling with LEGO-like bricks
 
 EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20
 MAKE_JOBS_UNSAFE=	yes
 
-DESKTOP_ENTRIES="Leocad" "${COMMENT}" "" "${PORTNAME}" "Engineering;" "true"
+DESKTOP_ENTRIES="Leocad" "${COMMENT}" "" "${PORTNAME}" "" "true"
 
 PLIST_FILES=	bin/leocad \
 		${DATADIR_REL}/pieces.bin \

Modified: head/cad/pdnmesh/Makefile
==============================================================================
--- head/cad/pdnmesh/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/cad/pdnmesh/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -8,7 +8,7 @@ CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Finite element program
+COMMENT=	Mesh generator and solver for Finite Element problems
 
 LICENSE=	GPLv2 # (or later)
 
@@ -43,7 +43,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAN1=		pdnmesh.1
 MAN5=		pdnmesh_input.5
 
-DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "" "${PORTNAME}" "" "true"
+DESKTOP_ENTRIES="pdnMesh" "${COMMENT}" "" "${PORTNAME}" "" "true"
 
 .include <bsd.port.options.mk>
 

Modified: head/deskutils/nagaina/Makefile
==============================================================================
--- head/deskutils/nagaina/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/deskutils/nagaina/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -37,9 +37,9 @@ PLIST_FILES=	bin/${PORTNAME} share/pixma
 
 DESKTOP_ENTRIES=	"Nagaina" \
 			"${COMMENT}" \
+			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
 			"${PORTNAME}" \
-			"${PORTNAME}" \
-			"Qt;KDE;Office;Utility;" \
+			"Qt;Office;Utility;" \
 			"false"
 
 .include <bsd.port.options.mk>

Modified: head/deskutils/qlabels/Makefile
==============================================================================
--- head/deskutils/qlabels/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/deskutils/qlabels/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	qlabels
-# Date created:		12 Jul 2007
-# Whom:			Yinghong.Liu <relaxbsd@gmail.com>
-#
+# Created by: Yinghong.Liu <relaxbsd@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	qlabels
 PORTVERSION=	0.2
@@ -14,17 +10,17 @@ MASTER_SITES=	http://qlabels.p34.net/fil
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A labels and business cards creating and printing software
+COMMENT=	Labels and business cards creating
 
 USE_BZIP2=	yes
 USE_QT4=	xml gui corelib qmake_build uic_build moc_build rcc_build
 WRKSRC=		${WRKDIR}/${DISTNAME:C/_/-/}
 
-DESKTOP_ENTRIES=	"qlabels" \
-			"A labels and business cards creating and printing software" \
+DESKTOP_ENTRIES=	"qLabels" \
+			"${COMMENT}" \
 			"" \
 			"qlabels" \
-			"Application;Office;" \
+			"Office;Qt;" \
 			"false"
 
 post-patch:
@@ -34,7 +30,7 @@ post-patch:
 		${WRKSRC}/lib/papers.cpp
 
 pre-build:
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} -unix qlabels.pro
+	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} qlabels.pro
 
 post-install:
 .if !defined(NOPORTDOCS)

Modified: head/devel/argouml/Makefile
==============================================================================
--- head/devel/argouml/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/devel/argouml/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,4 +1,4 @@
-# Created by:	ijliao
+# Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	argouml
@@ -39,7 +39,7 @@ DESKTOP_ENTRIES=	"ArgoUML" \
 			"Create advanced UML diagrams" \
 			"${DATADIR}/icon/ArgoIcon128x128.png" \
 			"argouml" \
-			"Application;Development;Building;Java;" \
+			"Development;Building;Java;" \
 			false
 
 do-install:

Modified: head/devel/drpython/Makefile
==============================================================================
--- head/devel/drpython/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/devel/drpython/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	drpython
-# Date created:		2005-07-22
-# Whom:			vsevolod
-#
+# Created by: vsevolod
 # $FreeBSD$
-#
 
 PORTNAME=	drpython
 PORTVERSION=	3.11.3

Modified: head/devel/qdevelop/Makefile
==============================================================================
--- head/devel/qdevelop/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/devel/qdevelop/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	qdevelop
-# Date created:				4 Jul 2007
-# Whom:					Yinghong.Liu <liu_yinghong@yahoo.com.cn>
-#
+# Created by: Yinghong.Liu <liu_yinghong@yahoo.com.cn>
 # $FreeBSD$
-#
 
 PORTNAME=	qdevelop
 PORTVERSION=	0.28
@@ -13,7 +9,7 @@ MASTER_SITES=	http://biord-software.org/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	A development environment entirely dedicated to Qt4
+COMMENT=	Development environment entirely dedicated to Qt4
 
 RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 
@@ -31,7 +27,7 @@ DESKTOP_ENTRIES=	"QDevelop" \
 			"Qt4 development environment" \
 			"${PREFIX}/share/pixmaps/qdevelop.png" \
 			"qdevelop" \
-			"Qt;KDE;Development;" \
+			"Development;IDE;Qt;" \
 			"false"
 
 OPTIONS_DEFINE=	TOOLS

Modified: head/devel/qsvn/Makefile
==============================================================================
--- head/devel/qsvn/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/devel/qsvn/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	qsvn
-# Date created:		2007-11-17
-# Whom:			Max Brazhnikov <makc@issp.ac.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	qsvn
 DISTVERSION=	0.8.1
@@ -24,7 +19,8 @@ MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-DESKTOP_ENTRIES="QSvn" "SVN client" "qsvn.png" "qsvn" "" false
+DESKTOP_ENTRIES="QSvn" "SVN client" "${PREFIX}/share/pixmaps/qsvn.png" \
+		"qsvn" "Development;RevisionControl;Qt;" false
 
 SVNQT_INCLUDE_DIR=	include/svnqt4
 PLIST_SUB=	SVNQT_INCLUDE_DIR="${SVNQT_INCLUDE_DIR}"

Modified: head/editors/texmacs/Makefile
==============================================================================
--- head/editors/texmacs/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/editors/texmacs/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.texmacs.org/TeXm
 DISTNAME=	TeXmacs-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A free WYSIWYG scientific text editor
+COMMENT=	WYSIWYG scientific text editor
 
 BUILD_DEPENDS=	tex:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
@@ -39,7 +39,7 @@ PDF_DESC=	Experimental PDF renderer
 
 DESKTOP_ENTRIES=	"TeXmacs" "${COMMENT}" \
 			"${DATADIR}/misc/pixmaps/TeXmacs.xpm" "texmacs" \
-			"Application;Education;Science;" false
+			"Education;Science;" false
 
 .include <bsd.port.options.mk>
 

Modified: head/emulators/qmc2/Makefile
==============================================================================
--- head/emulators/qmc2/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/emulators/qmc2/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -45,10 +45,10 @@ MAKE_ARGS=	QTDIR="${QT_PREFIX}" QMAKE="$
 		CC="${CC}" CXX="${CXX}" LINK="${CXX}"
 MAKE_JOBS_UNSAFE=yes
 
-DESKTOP_ENTRIES="QMC2 (MAME)" "MAME frontend" "${DATADIR}/img/mame.ico" \
-		"${PORTNAME}-sdlmame" "Game;Emulator;" "true" \
-		"QMC2 (MESS)" "MESS frontend" "${DATADIR}/img/mess.ico" \
-		"${PORTNAME}-sdlmess" "Game;Emulator;" "true"
+DESKTOP_ENTRIES="QMC2 (MAME)" "MAME frontend" "${DATADIR}/img/mame.png" \
+		"${PORTNAME}-sdlmame" "Game;Emulator;Qt;" "true" \
+		"QMC2 (MESS)" "MESS frontend" "${DATADIR}/img/mess.png" \
+		"${PORTNAME}-sdlmess" "Game;Emulator;Qt;" "true"
 
 .include <bsd.port.options.mk>
 

Modified: head/emulators/qtemu/Makefile
==============================================================================
--- head/emulators/qtemu/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/emulators/qtemu/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	qtemu
-# Date created:		2007-03-20
-# Whom:			Max Brazhnikov <makc@issp.ac.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	qtemu
 PORTVERSION=	1.0.5
@@ -12,7 +7,7 @@ CATEGORIES=	emulators
 MASTER_SITES=	SF
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	A Qt4 front-end to Qemu
+COMMENT=	Qt4-based frontend for QEMU
 
 USE_BZIP2=	yes
 USE_QT4=	gui xml uic_build moc_build qmake_build rcc_build
@@ -25,8 +20,7 @@ DESKTOP_ENTRIES="QtEmu" "QEMU frontend" 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-#USE_QT4+=	linguist
-BUILD_DEPENDS+=	${LOCALBASE}/bin/lupdate-qt4:${PORTSDIR}/devel/qt4-linguist
+USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
@@ -34,14 +28,7 @@ PLIST_SUB+=	NLS="@comment "
 
 do-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/lrelease-qt4 -verbose qtemu.pro \
-	&& ${SETENV} ${CONFIGURE_ENV} ${QMAKE})
-
-post-configure:
-	@${REINPLACE_CMD} -e \
-		's|^CC .*|CC=${CC}|; \
-		 s|^CXX .*|CXX=${CXX}|; \
-		 s|^LINK .*|LINK=${CXX}|' \
-		${WRKSRC}/Makefile
+	&& ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS})
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qtemu ${PREFIX}/bin/qtemu

Modified: head/games/alephone-data/Makefile
==============================================================================
--- head/games/alephone-data/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/alephone-data/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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

Modified: head/games/alephone-scenarios/Makefile
==============================================================================
--- head/games/alephone-scenarios/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/alephone-scenarios/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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

Modified: head/games/battletanks/Makefile
==============================================================================
--- head/games/battletanks/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/battletanks/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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 READ
 		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

Modified: head/games/cheech/Makefile
==============================================================================
--- head/games/cheech/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/cheech/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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)

Modified: head/games/colorcode/Makefile
==============================================================================
--- head/games/colorcode/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/colorcode/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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.
 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

Modified: head/games/darkplaces/Makefile
==============================================================================
--- head/games/darkplaces/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/darkplaces/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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:

Modified: head/games/ftjava/Makefile
==============================================================================
--- head/games/ftjava/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/ftjava/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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:

Modified: head/games/glaxium/Makefile
==============================================================================
--- head/games/glaxium/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/glaxium/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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/glax
 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
 

Modified: head/games/hex-a-hop/Makefile
==============================================================================
--- head/games/hex-a-hop/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/hex-a-hop/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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>
 

Modified: head/games/hexglass/Makefile
==============================================================================
--- head/games/hexglass/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/hexglass/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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}

Modified: head/games/hexxagon/Makefile
==============================================================================
--- head/games/hexxagon/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/hexxagon/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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>

Modified: head/games/linux-enemyterritory-tce/Makefile
==============================================================================
--- head/games/linux-enemyterritory-tce/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/linux-enemyterritory-tce/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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
 

Modified: head/games/spellathon/Makefile
==============================================================================
--- head/games/spellathon/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/spellathon/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -29,7 +29,7 @@ USE_XORG=	ice sm x11 xau xdmcp xext xren
 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 \

Modified: head/games/trigger/Makefile
==============================================================================
--- head/games/trigger/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/trigger/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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}-
 		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-${DATAV
 
 DATAVERSION=	0.6.0
 
-DESKTOP_ENTRIES="Trigger" "Car racing game" "" \
+DESKTOP_ENTRIES="Trigger" "${COMMENT}" "" \
 		"trigger" "" false
 
 PORTDOCS=	README-stereo.txt README.txt

Modified: head/games/xpilot-ng-server/Makefile
==============================================================================
--- head/games/xpilot-ng-server/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/games/xpilot-ng-server/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -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/${PORT
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT?=	An enhanced version of XPilot (server program)
+COMMENT?=	Enhanced version of XPilot (server program)
 
 LICENSE=	GPLv2
 

Modified: head/graphics/albumshaper/Makefile
==============================================================================
--- head/graphics/albumshaper/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/graphics/albumshaper/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	albumshaper
-# Date created:				17 Jul 2007
-# Whom:					Yinghong.Liu <relaxbsd@gmail.com>
-#
+# Created by: Yinghong.Liu <relaxbsd@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	albumshaper
 PORTVERSION=	2.1
@@ -13,7 +9,7 @@ MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A drag-n-drop hierarchal photo album creation
+COMMENT=	Drag-n-drop hierarchal photo album creation
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
@@ -33,10 +29,10 @@ MAKE_ENV+=	QTDIR=${QT_PREFIX} \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
 DESKTOP_ENTRIES=	"AlbumShaper" \
-			"A drag-n-drop hierarchal photo album creation" \
+			"Photo album creation" \
 			"${DATADIR}/images/miscImages/as32.png" \
 			"AlbumShaper" \
-			"Qt;KDE;Graphics;" \
+			"Qt;Graphics;" \
 			"false"
 
 .if !defined(WITHOUT_NLS)

Modified: head/graphics/autoq3d/Makefile
==============================================================================
--- head/graphics/autoq3d/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/graphics/autoq3d/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -27,7 +27,7 @@ DESKTOP_ENTRIES="AutoQ3D" \
 		"${COMMENT}" \
 		"AutoQ3D" \
 		"AutoQ3D" \
-		"Qt;KDE;Graphics;" \
+		"Graphics;3DGraphics;Qt;" \
 		false
 
 .include <bsd.port.options.mk>

Modified: head/graphics/darknock/Makefile
==============================================================================
--- head/graphics/darknock/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/graphics/darknock/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,18 +1,14 @@
-# New ports collection makefile for:	darknock
-# Date created:		5 August 2007
-# Whom:                	Yinghong.Liu <relaxbsd@gmail.com>
-#
+# Created by: Yinghong.Liu <relaxbsd@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	darknock
 DISTVERSION=	0.3.0
 PORTREVISION=	3
-CATEGORIES=	graphics kde
+CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A program that can detect edges in images
+COMMENT=	Program that can detect edges in images
 
 USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build gui
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -29,9 +25,9 @@ PLIST_SUB+=	NLS="@comment "
 
 DESKTOP_ENTRIES=	"${PORTNAME}" \
 			"${COMMENT}" \
+			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
 			"${PORTNAME}" \
-			"${PORTNAME}" \
-			"Qt;KDE;Graphics;" \
+			"Graphics;Qt;" \
 			"false"
 
 post-patch:

Modified: head/graphics/gsnapshot/Makefile
==============================================================================
--- head/graphics/gsnapshot/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/graphics/gsnapshot/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gsnapshot
-# Date created:		23 July 2007
-# Whom:			Yinghong.Liu <relaxbsd@gmail.com>
-#
+# Created by: Yinghong.Liu <relaxbsd@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	gsnapshot
 PORTVERSION=	1.1
@@ -12,7 +8,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	SF/gould/${PORTNAME}/release%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A gtk+ based screen capture
+COMMENT=	GTK+ based screen capture
 
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 USE_GNOME=	gtk20 libwnck libxml2
@@ -24,10 +20,10 @@ CFLAGS+=	-fPIC -I${LOCALBASE}/include/li
 PORTDOCS=	AUTHORS COPYING INSTALL README TODO
 
 DESKTOP_ENTRIES=	"gsnapshot" \
-			"A gtk+ based screen capture" \
+			"Screen capture" \
 			"" \
 			"gsnapshot" \
-			"Application;Graphics;" \
+			"Graphics;GTK;" \
 			"false"
 
 pre-configure:

Modified: head/graphics/xaos/Makefile
==============================================================================
--- head/graphics/xaos/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/graphics/xaos/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	XaoS
-# Date created:				24 February 1996
-# Whom:					Joseph Koshy <koshy@india.hp.com>
-#
+# Created by: Joseph Koshy <koshy@india.hp.com>
 # $FreeBSD$
-#
 
 PORTNAME=	xaos
 PORTVERSION=	3.5
@@ -12,7 +8,7 @@ CATEGORIES=	graphics math
 MASTER_SITES=	SF/${PORTNAME}/XaoS/${PORTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	A real-time fractal browser for X11 and ASCII terminals
+COMMENT=	Real-time fractal browser
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
@@ -35,7 +31,7 @@ INFO=		xaos
 
 PLIST_SUB+=	XAOSDIR="share/XaoS"
 
-DESKTOP_ENTRIES=	"XaoS" "Fractal zoomer" "" "xaos" "" false
+DESKTOP_ENTRIES=	"XaoS" "${COMMENT}" "" "xaos" "" false
 
 .include <bsd.port.options.mk>
 

Modified: head/japanese/ochusha/Makefile
==============================================================================
--- head/japanese/ochusha/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/japanese/ochusha/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   ochusha
-# Date created:     15 April 2006
-# Whom:             sgr
-#
+# Created by: sgr
 # $FreeBSD$
-#
 
 PORTNAME=	ochusha
 PORTVERSION=	0.5.8.2
@@ -13,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_
 MASTER_SITE_SUBDIR=		ochusha/16560
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A GUI BBS browser for 2ch.net
+COMMENT=	GUI BBS browser for 2ch.net
 
 MAN1=		ochusha.1
 MANCOMPRESSED=	no
@@ -25,9 +21,9 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_PKGCONFIG=	yes
 
-DESKTOP_ENTRIES="Ochusha" "A GUI BBS browser for 2ch.net" \
-		"${LOCALBASE}/share/ochusha/ochusha32.xpm" \
-		"ochusha" "Application;Network;" \
+DESKTOP_ENTRIES="Ochusha" "${COMMENT}" \
+		"${PREFIX}/share/ochusha/ochusha32.xpm" \
+		"ochusha" "Network;" \
 		false
 
 post-patch:

Modified: head/math/convertall/Makefile
==============================================================================
--- head/math/convertall/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/math/convertall/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/ConvertAll
 
 USE_PYTHON=	2.4+
 
-DESKTOP_ENTRIES="ConvertAll" "${COMMENT}" "${DATADIR}/icons/${PORTNAME}.svg" \
+DESKTOP_ENTRIES="ConvertAll" "Unit converter" "${DATADIR}/icons/${PORTNAME}.svg" \
 		"${PORTNAME}" "Utility;Calculator;" true
 
 .include <bsd.port.options.mk>

Modified: head/math/qtiplot/Makefile
==============================================================================
--- head/math/qtiplot/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/math/qtiplot/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	qtiplot
-# Date created:				2005-05-09
-# Whom:					Jie Gao <gaoj@cpsc.ucalgary.ca>
-#
+# Created by: Jie Gao <gaoj@cpsc.ucalgary.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	qtiplot
 DISTVERSION=	0.9.8.9
@@ -12,7 +8,7 @@ CATEGORIES=	math science
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	An Origin clone for data analysis and scientific plotting
+COMMENT=	Data analysis and scientific plotting
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser
 LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl \

Modified: head/misc/nut/Makefile
==============================================================================
--- head/misc/nut/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/misc/nut/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -40,7 +40,7 @@ USE_XORG+=	x11 xau xdmcp xext xft xinera
 MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
 PLIST_FILES+=	bin/Nut
 DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
-		"Application;Science;Biology;MedicalSoftware;" "false"
+		"Science;Biology;MedicalSoftware;" "false"
 .else
 MAKE_ENV+=	HAVE_FLTK=0 FLTK_NUT=""
 .endif

Modified: head/multimedia/2mandvd/Makefile
==============================================================================
--- head/multimedia/2mandvd/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/multimedia/2mandvd/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -33,8 +33,8 @@ MAKE_ENV=	QTDIR=${QT_PREFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_JOBS_SAFE=	yes
 
-DESKTOP_ENTRIES="2ManDVD" "DVD Maker" "mandvdico.png" "2ManDVD" \
-		"Application;AudioVideo;" false
+DESKTOP_ENTRIES="2ManDVD" "DVD Maker" "${PREFIX}/share/pixmaps/mandvdico.png" \
+		"2ManDVD" "AudioVideo;DiscBurning;Qt;" false
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/mainfrm.cpp \

Modified: head/multimedia/gdvrecv/Makefile
==============================================================================
--- head/multimedia/gdvrecv/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/multimedia/gdvrecv/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   gdvrecv
-# Date created:                        01 Nov 2004
-# Whom:                                Henri Michelon <hmichelon at e-cml.org>
-#
+# Created by: Henri Michelon <hmichelon at e-cml.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gdvrecv
 PORTVERSION=	1.2
@@ -22,7 +18,7 @@ DESKTOP_ENTRIES="Capture Video" \
 		"Capture from FireWire Camera" \
 		"${PREFIX}/share/pixmaps/gdvrecv/camcorder.png" \
 		"gdvrecv" \
-		"Application;AudioVideo;" \
+		"AudioVideo;Video;" \
 		true
 
 CONFLICTS=	dvts-[0-9]*

Modified: head/multimedia/mandvd/Makefile
==============================================================================
--- head/multimedia/mandvd/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/multimedia/mandvd/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -42,7 +42,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}-${DISTVER
 
 DESKTOP_ENTRIES=	"ManDVD" "Create your DVD" \
 			"${PREFIX}/share/pixmaps/mandvdico.png" \
-			"${PORTNAME}" "Application;AudioVideo;" false
+			"${PORTNAME}" "AudioVideo;DiscBurning;Qt;" false
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -spec ${QMAKESPEC}

Modified: head/multimedia/smile/Makefile
==============================================================================
--- head/multimedia/smile/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/multimedia/smile/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -8,7 +8,7 @@ CATEGORIES=	multimedia kde
 MASTER_SITES=	http://download.tuxfamily.org/smiletool/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Slideshow Maker in Linux Environment
+COMMENT=	Slideshow Maker
 
 RUN_DEPENDS=	sox>=14.0:${PORTSDIR}/audio/sox \
 		mencoder:${PORTSDIR}/multimedia/mencoder \
@@ -22,8 +22,8 @@ MAKE_ENV=	QTDIR=${QT_PREFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_JOBS_SAFE=	yes
 
-DESKTOP_ENTRIES="Smile" "${COMMENT}" "smile.png" "${PORTNAME}" \
-		"Application;AudioVideo;" false
+DESKTOP_ENTRIES="Smile" "${COMMENT}" "${PREFIX}/share/pixmaps/smile.png" \
+		"${PORTNAME}" "AudioVideo;Qt;" false
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/mainfrm.cpp \

Modified: head/print/kpdftool/Makefile
==============================================================================
--- head/print/kpdftool/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/print/kpdftool/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -19,7 +19,7 @@ USE_GHOSTSCRIPT_RUN=	yes
 MAKE_JOBS_SAFE=	yes
 
 DESKTOP_ENTRIES=	"KPDFTool" "${COMMENT}" "kpdftool" \
-			"kpdftool" "Application;Qt;Utility;" false
+			"kpdftool" "Qt;Utility;" false
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \

Modified: head/sysutils/gtk-send-pr/Makefile
==============================================================================
--- head/sysutils/gtk-send-pr/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/sysutils/gtk-send-pr/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -19,9 +19,9 @@ MAN1=		gtk-send-pr.1
 PLIST_FILES=	bin/gtk-send-pr share/pixmaps/ladybird64.xpm
 DESKTOP_ENTRIES="Send Problem Report" \
 		"Send a FreeBSD PR" \
-		"ladybird64.xpm" \
+		"${PREFIX}/share/pixmaps/ladybird64.xpm" \
 		"gtk-send-pr" \
-		"Application;System;" \
+		"System;" \
 		true
 
 do-install:

Modified: head/sysutils/nitrogen/Makefile
==============================================================================
--- head/sysutils/nitrogen/Makefile	Sun Jan  6 23:55:15 2013	(r310019)
+++ head/sysutils/nitrogen/Makefile	Mon Jan  7 02:07:26 2013	(r310020)
@@ -48,7 +48,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		nitrogen.1
 
-DESKTOP_ENTRIES="Nitrogen" "${COMMENT}" "${PORTNAME}.png" "${PORTNAME}" \
+DESKTOP_ENTRIES="Nitrogen" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \
 		"Graphics;Viewer;" true

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50ea2ddf.16fc.2ad8294d>