Index: head/games/castlevox/Makefile
===================================================================
--- head/games/castlevox/Makefile	(revision 313625)
+++ head/games/castlevox/Makefile	(revision 313626)
@@ -1,32 +1,41 @@
-# Created by:			Martin Otto
-#
+# Created by: Martin Otto
 # $FreeBSD$
 
 PORTNAME=	CastleVox
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	http://sillysoft.net/download/
-DISTNAME=	CastleVox-linux
+DISTNAME=	${PORTNAME}-linux
 
 MAINTAINER=	gamato@users.sf.net
-COMMENT=	A fast world domination game
+COMMENT=	Fast world domination game
 
 FETCH_ARGS=	-Fpr
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
+NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/CastleVoxPC
+WRKSRC=		${WRKDIR}/${PORTNAME}PC
+PORTDOCS=	README_Vox.txt
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-NO_BUILD=	yes
 
-SUB_FILES=	CastleVox
+SUB_FILES=	${PORTNAME}
 
+DESKTOP_ENTRIES="Castle Vox" "${COMMENT}" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+		"${PORTNAME}" "Game;StrategyGame;" false
+
+.include <bsd.port.options.mk>
+
 do-install:
-	@${MKDIR} ${DATADIR}
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \*.jar ${DATADIR})
-	${INSTALL_DATA} ${WRKSRC}/VoxIcon.png ${DATADIR}
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} Support ${DATADIR})
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs ${DATADIR})
-	${INSTALL_SCRIPT} ${WRKDIR}/CastleVox ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "Support docs *.jar" ${DATADIR})
+	${INSTALL_DATA} ${WRKSRC}/VoxIcon.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
Index: head/games/castlevox/files/CastleVox.in
===================================================================
--- head/games/castlevox/files/CastleVox.in	(revision 313625)
+++ head/games/castlevox/files/CastleVox.in	(revision 313626)
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
 # $FreeBSD$
 
-echo "Castle Vox: Starting up..."
-cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" \
--Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/VoxCore.jar" "$@"
+export JAVA_VERSION="%%JAVA_VERSION%%"
+
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
+-Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/VoxCore.jar" "${@}"
Index: head/games/castlevox/pkg-plist
===================================================================
--- head/games/castlevox/pkg-plist	(revision 313625)
+++ head/games/castlevox/pkg-plist	(revision 313626)
@@ -1,75 +1,75 @@
 bin/CastleVox
-%%DATADIR%%/VoxCore.jar
-%%DATADIR%%/VoxIcon.png
-%%DATADIR%%/jide-charts.jar
-%%DATADIR%%/jide-common.jar
-%%DATADIR%%/jogg-0.0.7.jar
-%%DATADIR%%/jorbis-0.0.15.jar
-%%DATADIR%%/tritonus_share.jar
-%%DATADIR%%/vorbisspi1.0.3.jar
 %%DATADIR%%/Support/Maps/Hex Barons.voxb
 %%DATADIR%%/Support/Maps/Tutorial Map.voxb
 %%DATADIR%%/Support/Maps/World War II.voxb
 %%DATADIR%%/Support/Music/CV_Civil War.ogg
 %%DATADIR%%/Support/Music/CV_Main Theme.ogg
 %%DATADIR%%/Support/Music/CV_Medieval.ogg
 %%DATADIR%%/Support/Music/CV_Modern Military.ogg
 %%DATADIR%%/Support/Music/CV_Roman.ogg
 %%DATADIR%%/Support/Music/CV_Victory.ogg
 %%DATADIR%%/Support/Themes/MB Hex Barons/overground.png
 %%DATADIR%%/Support/Themes/MB Hex Barons/updater1.txt
 %%DATADIR%%/Support/Themes/MB Hex Barons/updater2.txt
 %%DATADIR%%/Support/Themes/MB Hex Barons/updater3.txt
 %%DATADIR%%/Support/Themes/MB Hex Barons/updater4.txt
 %%DATADIR%%/Support/Themes/MB Hex Barons/updater5.txt
 %%DATADIR%%/Support/Themes/MB WW2 World/foreground.jpg
 %%DATADIR%%/Support/Themes/MB WW2 World/overground.png
 %%DATADIR%%/Support/Themes/MB WW2 World/unit_castle.png
 %%DATADIR%%/Support/Themes/MB WW2 World/unit_knight.png
 %%DATADIR%%/Support/Themes/MB WW2 World/unit_pawn.png
 %%DATADIR%%/Support/Themes/MB WW2 World/updater1.txt
 %%DATADIR%%/Support/Themes/MB WW2 World/updater2.txt
 %%DATADIR%%/Support/Themes/MB WW2 World/updater3.txt
 %%DATADIR%%/Support/Themes/MB WW2 World/updater4.txt
 %%DATADIR%%/Support/Themes/MB WW2 World/updater5.txt
 %%DATADIR%%/Support/Themes/MB WW2 World/updater6.txt
 %%DATADIR%%/Support/Themes/MB WW2 World/updater7.txt
 %%DATADIR%%/Support/Themes/MB WW2 World/updater8.txt
 %%DATADIR%%/Support/Themes/MB WW2 World/updater9.txt
 %%DATADIR%%/Support/Themes/Tutorial Map/foreground.jpg
 %%DATADIR%%/Support/Themes/Tutorial Map/overground.png
 %%DATADIR%%/Support/Themes/Tutorial Map/updater1.txt
 %%DATADIR%%/Support/Themes/Tutorial Map/updater2.txt
 %%DATADIR%%/Support/Themes/Tutorial Map/updater3.txt
 %%DATADIR%%/Support/Themes/Tutorial Map/updater4.txt
 %%DATADIR%%/Support/Themes/Tutorial Map/updater5.txt
+%%DATADIR%%/VoxCore.jar
 %%DATADIR%%/docs/Castle_Vox_Instructions.html
 %%DATADIR%%/docs/Castle_Vox_Shortcuts.html
 %%DATADIR%%/docs/Castle_Vox_Version_History.html
 %%DATADIR%%/docs/docs_files/Bonus.png
 %%DATADIR%%/docs/docs_files/Chat.png
 %%DATADIR%%/docs/docs_files/Conflict.png
 %%DATADIR%%/docs/docs_files/Main_Interface.png
 %%DATADIR%%/docs/docs_files/Network.png
 %%DATADIR%%/docs/docs_files/PIwindow.png
 %%DATADIR%%/docs/docs_files/Plugins.png
 %%DATADIR%%/docs/docs_files/Units_castle.png
 %%DATADIR%%/docs/docs_files/Units_knight.png
 %%DATADIR%%/docs/docs_files/Units_pawn.png
 %%DATADIR%%/docs/docs_files/bg.jpg
 %%DATADIR%%/docs/docs_files/footer.jpg
 %%DATADIR%%/docs/docs_files/header.jpg
 %%DATADIR%%/docs/docs_files/moving.png
 %%DATADIR%%/docs/docs_files/prefs.png
 %%DATADIR%%/docs/docs_files/recruit.png
 %%DATADIR%%/docs/docs_files/teammate.png
+%%DATADIR%%/jide-charts.jar
+%%DATADIR%%/jide-common.jar
+%%DATADIR%%/jogg-0.0.7.jar
+%%DATADIR%%/jorbis-0.0.15.jar
+%%DATADIR%%/tritonus_share.jar
+%%DATADIR%%/vorbisspi1.0.3.jar
+share/pixmaps/CastleVox.png
 @dirrm %%DATADIR%%/docs/docs_files
 @dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/Support/Themes/Tutorial Map
 @dirrm %%DATADIR%%/Support/Themes/MB WW2 World
 @dirrm %%DATADIR%%/Support/Themes/MB Hex Barons
 @dirrm %%DATADIR%%/Support/Themes
 @dirrm %%DATADIR%%/Support/Music
 @dirrm %%DATADIR%%/Support/Maps
 @dirrm %%DATADIR%%/Support
 @dirrm %%DATADIR%%