Index: head/games/traingame/Makefile =================================================================== --- head/games/traingame/Makefile (revision 389594) +++ head/games/traingame/Makefile (revision 389595) @@ -1,74 +1,71 @@ # Created by: Rusmir Dusko # $FreeBSD$ 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 LICENSE= GPLv3 # or later LICENSE_FILE= ${WRKSRC}/COPYING.txt LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \ libboost_filesystem.so:${PORTSDIR}/devel/boost-libs 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 USE_CXXSTD= c++11 USE_SDL= sdl image USE_GL= glew LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -Wno-return-type 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 \ ${STAGEDIR}${PREFIX}/share/pixmaps/ @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} @${ECHO_CMD} @${ECHO_CMD} =============================================================================== @${ECHO_CMD} @${ECHO_CMD} "These Maps you can use:" @${ECHO_CMD} @${LS} ${STAGEDIR}${DATADIR}/maps @${ECHO_CMD} @${ECHO_CMD} =============================================================================== .include Index: head/games/traingame/distinfo =================================================================== --- head/games/traingame/distinfo (revision 389594) +++ head/games/traingame/distinfo (revision 389595) @@ -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 Index: head/games/traingame/files/traingame-map.in =================================================================== --- head/games/traingame/files/traingame-map.in (revision 389594) +++ head/games/traingame/files/traingame-map.in (nonexistent) @@ -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 Property changes on: head/games/traingame/files/traingame-map.in ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/traingame/files/traingame.desktop =================================================================== --- head/games/traingame/files/traingame.desktop (revision 389594) +++ head/games/traingame/files/traingame.desktop (nonexistent) @@ -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 Property changes on: head/games/traingame/files/traingame.desktop ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/traingame/pkg-plist =================================================================== --- head/games/traingame/pkg-plist (revision 389594) +++ head/games/traingame/pkg-plist (revision 389595) @@ -1,114 +1,117 @@ 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 %%DATADIR%%/buildings/coal_mine/coal_mine.wings %%DATADIR%%/buildings/coal_mine/coal_mine.xml %%DATADIR%%/buildings/house2/house2.mtl %%DATADIR%%/buildings/house2/house2.obj %%DATADIR%%/buildings/house2/house2.wings %%DATADIR%%/buildings/house2/house2.xml %%DATADIR%%/buildings/platform_end/platform_end.mtl %%DATADIR%%/buildings/platform_end/platform_end.obj %%DATADIR%%/buildings/platform_end/platform_end.wings %%DATADIR%%/buildings/platform_end/platform_end.xml %%DATADIR%%/buildings/platform_middle/platform_middle.mtl %%DATADIR%%/buildings/platform_middle/platform_middle.obj %%DATADIR%%/buildings/platform_middle/platform_middle.wings %%DATADIR%%/buildings/platform_middle/platform_middle.xml %%DATADIR%%/buildings/power_plant/power_plant.mtl %%DATADIR%%/buildings/power_plant/power_plant.obj %%DATADIR%%/buildings/power_plant/power_plant.wings %%DATADIR%%/buildings/power_plant/power_plant.xml %%DATADIR%%/buildings/white_house/cube2_auv.png %%DATADIR%%/buildings/white_house/house.mtl %%DATADIR%%/buildings/white_house/house.obj %%DATADIR%%/buildings/white_house/house.wings %%DATADIR%%/buildings/white_house/white_house.xml %%DATADIR%%/engines/base.wings %%DATADIR%%/engines/red/red.xml %%DATADIR%%/engines/red/train.mtl %%DATADIR%%/engines/red/train.obj %%DATADIR%%/engines/red/train.wings %%DATADIR%%/engines/saddle/saddle.mtl %%DATADIR%%/engines/saddle/saddle.obj %%DATADIR%%/engines/saddle/saddle.wings %%DATADIR%%/engines/saddle/saddle.xml %%DATADIR%%/engines/tank/tank.mtl %%DATADIR%%/engines/tank/tank.obj %%DATADIR%%/engines/tank/tank.wings %%DATADIR%%/engines/tank/tank.xml %%DATADIR%%/fonts/DejaVuSans.ttf %%DATADIR%%/fonts/DejaVuSansMono.ttf %%DATADIR%%/fonts/Vera.ttf %%DATADIR%%/images/buildings_icon.png %%DATADIR%%/images/button_active.png %%DATADIR%%/images/button_base.png %%DATADIR%%/images/delete_icon.png %%DATADIR%%/images/icons/next.png %%DATADIR%%/images/icons/prev.png %%DATADIR%%/images/icons/rotate.png %%DATADIR%%/images/icons/save.png %%DATADIR%%/images/icons/smooth.png %%DATADIR%%/images/icons/tree.png %%DATADIR%%/images/level_icon.png %%DATADIR%%/images/lower_icon.png %%DATADIR%%/images/raise_icon.png %%DATADIR%%/images/smoke_particle.png %%DATADIR%%/images/start_icon.png %%DATADIR%%/images/start_icon2.png %%DATADIR%%/images/station_icon.png %%DATADIR%%/images/track_icon.png %%DATADIR%%/layouts/demo.xml %%DATADIR%%/layouts/editor.xml %%DATADIR%%/layouts/game.xml %%DATADIR%%/maps/coal_mine/coal_mine.bin %%DATADIR%%/maps/coal_mine/coal_mine.xml %%DATADIR%%/maps/demo/demo.bin %%DATADIR%%/maps/demo/demo.xml %%DATADIR%%/maps/figure8/figure8.bin %%DATADIR%%/maps/figure8/figure8.xml %%DATADIR%%/maps/gen_track/gen_track.bin %%DATADIR%%/maps/gen_track/gen_track.xml %%DATADIR%%/maps/goods_demo/goods_demo.bin %%DATADIR%%/maps/goods_demo/goods_demo.xml %%DATADIR%%/maps/long_map/long_map.bin %%DATADIR%%/maps/long_map/long_map.xml %%DATADIR%%/maps/points/points.bin %%DATADIR%%/maps/points/points.xml %%DATADIR%%/maps/power_plant/power_plant.bin %%DATADIR%%/maps/power_plant/power_plant.xml %%DATADIR%%/maps/sbends/sbends.bin %%DATADIR%%/maps/sbends/sbends.xml %%DATADIR%%/maps/uphill/uphill.bin %%DATADIR%%/maps/uphill/uphill.xml %%DATADIR%%/maps/villages/villages.bin %%DATADIR%%/maps/villages/villages.xml %%DATADIR%%/schemas/building.xsd %%DATADIR%%/schemas/config.xsd %%DATADIR%%/schemas/engine.xsd %%DATADIR%%/schemas/layout.xsd %%DATADIR%%/schemas/map.xsd %%DATADIR%%/schemas/tree.xsd %%DATADIR%%/schemas/waggon.xsd %%DATADIR%%/traingame %%DATADIR%%/trees/apple/apple.mtl %%DATADIR%%/trees/apple/apple.obj %%DATADIR%%/trees/apple/apple.wings %%DATADIR%%/trees/apple/apple.xml %%DATADIR%%/trees/pine/pine.mtl %%DATADIR%%/trees/pine/pine.obj %%DATADIR%%/trees/pine/pine.wings %%DATADIR%%/trees/pine/pine.xml %%DATADIR%%/waggons/coal_truck/coal_truck.mtl %%DATADIR%%/waggons/coal_truck/coal_truck.obj %%DATADIR%%/waggons/coal_truck/coal_truck.wings %%DATADIR%%/waggons/coal_truck/coal_truck.xml %%DATADIR%%/waggons/waggon_base.wings