svn commit: r313626 - in head/games/castlevox: . files

[Rene Ladan]

Author: rene
Date: Fri Mar  8 08:34:49 2013
New Revision: 313626
URL: http://svnweb.freebsd.org/changeset/ports/313626

Log:
  - Add desktop entry
  - Convert to optionsNG
  - Trim leading article from COMMENT
  - Cleanups, overhaul installation
  - Sort pkg-plist
  - Bump PORTREVISION
  
  PR:		ports/172331
  Submitted by:	nemysis <nemysis at gmx.ch>
  Approved by:	maintainer timeout (months)

Modified:
  head/games/castlevox/Makefile
  head/games/castlevox/files/CastleVox.in
  head/games/castlevox/pkg-plist

Modified: head/games/castlevox/Makefile
==============================================================================
--- head/games/castlevox/Makefile	Fri Mar  8 08:33:07 2013	(r313625)
+++ head/games/castlevox/Makefile	Fri Mar  8 08:34:49 2013	(r313626)
@@ -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 at 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>

Modified: head/games/castlevox/files/CastleVox.in
==============================================================================
--- head/games/castlevox/files/CastleVox.in	Fri Mar  8 08:33:07 2013	(r313625)
+++ head/games/castlevox/files/CastleVox.in	Fri Mar  8 08:34:49 2013	(r313626)
@@ -2,7 +2,7 @@
 #
 # $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" "${@}"

Modified: head/games/castlevox/pkg-plist
==============================================================================
--- head/games/castlevox/pkg-plist	Fri Mar  8 08:33:07 2013	(r313625)
+++ head/games/castlevox/pkg-plist	Fri Mar  8 08:34:49 2013	(r313626)
@@ -1,12 +1,4 @@
 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
@@ -43,6 +35,7 @@ bin/CastleVox
 %%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
@@ -63,6 +56,13 @@ bin/CastleVox
 %%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