- Bump PORTREVISION for pkg-plist change

- Remove master sites, use supplied icons, traingame.desktop and
  traingame-map.sh, changes accepted by upstream
- Remove files/traingame.desktop and files/traingame-map.in
- Recreate tarball, new cb6513e commit

5 files changed, 14 insertions, 39 deletions

diff --git a/games/traingame/Makefile b/games/traingame/Makefile
index 9280f0ff43a2..9db32d6b2c43 100644
--- a/games/traingame/Makefile
+++ b/games/traingame/Makefile
@@ -3,11 +3,8 @@
 
 PORTNAME=	traingame
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	SF/nemysisfreebsdp/${CATEGORIES}/:icons
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${PORTNAME}_icons${EXTRACT_SUFX}:icons
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Game about Trains
@@ -22,7 +19,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 USE_GITHUB=	yes
 GH_ACCOUNT=	nickg
 GH_PROJECT=	traingame
-GH_TAGNAME=	eacfbc3
+GH_TAGNAME=	cb6513e
 
 USES=		cmake compiler:c++11-lib dos2unix pkgconfig
 DOS2UNIX_GLOB=	*.mtl *.obj
@@ -37,23 +34,23 @@ PORTDOCS=	model_notes.txt models.gnuplot
 OPTIONS_DEFINE=	DOCS
 
 INSTALLS_ICONS=	yes
-ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
+ICON_SIZES=	22x22 32x32 48x48 64x64 72x72 96x96 128x128 192x192
 
-SUB_FILES=	${PORTNAME} ${PORTNAME}-map pkg-message
+SUB_FILES=	${PORTNAME} pkg-message
 
 do-install:
-.for f in ${PORTNAME} ${PORTNAME}-map
-	${INSTALL_SCRIPT} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/bin/
-.endfor
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-map.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-map
+
 .for d in buildings engines fonts images layouts maps schemas trees waggons
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/TrainGame ${STAGEDIR}${DATADIR}/${PORTNAME}
-	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .for s in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
+	${INSTALL_DATA} ${WRKSRC}/icons/${PORTNAME}_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
diff --git a/games/traingame/distinfo b/games/traingame/distinfo
index 0aea5dba0bde..099fe1d3a240 100644
--- a/games/traingame/distinfo
+++ b/games/traingame/distinfo
@@ -1,4 +1,2 @@
-SHA256 (nickg-traingame-0.3-eacfbc3_GH0.tar.gz) = ac2b9c07415ca3614b6149f8e30f8c62ed5fd318f8ac531438a0b733a4758c6d
-SIZE (nickg-traingame-0.3-eacfbc3_GH0.tar.gz) = 1057385
-SHA256 (traingame_icons.tar.gz) = f35937ac4893a4d803888fc2d8d3890a769bda77548a1dc45c09b95738f3dbb7
-SIZE (traingame_icons.tar.gz) = 25088
+SHA256 (nickg-traingame-0.3-cb6513e_GH0.tar.gz) = 04e8e7c47cee99056dc38556c8d25c4ea410133f351d5049fdad805f7c0cdd13
+SIZE (nickg-traingame-0.3-cb6513e_GH0.tar.gz) = 1151100
diff --git a/games/traingame/files/traingame-map.in b/games/traingame/files/traingame-map.in
deleted file mode 100644
index 833b65f4f1a3..000000000000
--- a/games/traingame/files/traingame-map.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-echo ""
-echo -n  "Which Train Game Map would You use?"
-echo ""
-ls %%DATADIR%%/maps
-echo ""
-read MAP
-
-traingame play $MAP
diff --git a/games/traingame/files/traingame.desktop b/games/traingame/files/traingame.desktop
deleted file mode 100644
index a191749ce677..000000000000
--- a/games/traingame/files/traingame.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Train Game
-GenericName=Train Game
-Comment=Game about Trains
-Icon=traingame
-Exec=traingame-map
-Categories=Game;ArcadeGame;
-Terminal=true
diff --git a/games/traingame/pkg-plist b/games/traingame/pkg-plist
index ea5fd6666f4f..e2ee6a9dcf3e 100644
--- a/games/traingame/pkg-plist
+++ b/games/traingame/pkg-plist
@@ -1,11 +1,14 @@
 bin/traingame
 bin/traingame-map
 share/applications/traingame.desktop
+share/icons/hicolor/22x22/apps/traingame.png
 share/icons/hicolor/32x32/apps/traingame.png
 share/icons/hicolor/48x48/apps/traingame.png
 share/icons/hicolor/64x64/apps/traingame.png
 share/icons/hicolor/72x72/apps/traingame.png
 share/icons/hicolor/96x96/apps/traingame.png
+share/icons/hicolor/128x128/apps/traingame.png
+share/icons/hicolor/192x192/apps/traingame.png
 share/pixmaps/traingame.png
 %%DATADIR%%/buildings/coal_mine/coal_mine.mtl
 %%DATADIR%%/buildings/coal_mine/coal_mine.obj