Index: head/games/pioneer/Makefile =================================================================== --- head/games/pioneer/Makefile (revision 425935) +++ head/games/pioneer/Makefile (revision 425936) @@ -1,121 +1,118 @@ # Created by: lightside # $FreeBSD$ PORTNAME= pioneer PORTVERSION= 0.0.${GH_TAGNAME} CATEGORIES= games MAINTAINER= lightside@gmx.com COMMENT= Space adventure game set in the Milky Way galaxy LICENSE= APACHE20 GPLv3 MIT ZLIB CC-BY-SA-3.0 DejaVu GLEW IUP SIL LICENSE_COMB= multi LICENSE_NAME_DejaVu= Bitstream Vera and Arev fonts license LICENSE_NAME_GLEW= The OpenGL Extension Wrangler Library license LICENSE_NAME_IUP= Galaxy colour image use policy LICENSE_NAME_SIL= SIL open font license version 1.1 LICENSE_FILE_APACHE20= ${WRKSRC}/licenses/Apache-2.0.txt LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/licenses/CC-BY-SA-3.0.txt LICENSE_FILE_DejaVu= ${WRKSRC}/licenses/DejaVu-license.txt LICENSE_FILE_GLEW= ${WRKSRC}/licenses/GLEW.txt LICENSE_FILE_GPLv3= ${WRKSRC}/licenses/GPL-3.txt LICENSE_FILE_IUP= ${WRKSRC}/licenses/Image\ Use\ Policy\ -\ NASA\ Spitzer\ Space\ Telescope.html LICENSE_FILE_SIL= ${WRKSRC}/licenses/SIL-1.1.txt LICENSE_PERMS_DejaVu= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_GLEW= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_IUP= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_SIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${LOCALBASE}/include/GL/glu.h:graphics/libGLU LIB_DEPENDS= libcurl.so:ftp/curl \ libsigc-2.0.so:devel/libsigc++20 \ libfreetype.so:print/freetype2 \ libvorbisfile.so:audio/libvorbis \ libpng.so:graphics/png \ libassimp.so:multimedia/assimp USE_GITHUB= yes GH_ACCOUNT= pioneerspacesim -GH_TAGNAME= 20161028 +GH_TAGNAME= 20161110 -USES= autoreconf gmake pkgconfig +USES= autoreconf compiler:c++11-lib gmake localbase pkgconfig USE_GL= gl USE_SDL= image2 sdl2 GNU_CONFIGURE= yes CONFIGURE_ENV= PIONEER_DATA_DIR="${DATADIR}/data" CONFIGURE_ARGS= --with-version="${GH_TAGNAME}" EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions --exclude .gitignore PORTDATA= data PORTDOCS= AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt README.md PLIST_FILES= bin/${PORTNAME} \ share/pixmaps/${PORTNAME}.png DESKTOP_ENTRIES="Pioneer" "${COMMENT}" \ "${PORTNAME}" "${PORTNAME}" \ "Game;Simulation;" false SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS MODELCOMPILER NOGPUJOBS PROFILER OPTIONS_DEFAULT= MODELCOMPILER DOCS_SUB_LIST= QUICKSTART_PATH="${DOCSDIR}" DOCS_SUB_LIST_OFF= \ QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}" MODELCOMPILER_DESC= Build/install modelcompiler tool MODELCOMPILER_PLIST_FILES= bin/${PORTNAME}-modelcompiler NOGPUJOBS_DESC= Disable EnableGPUJobs for config.ini by default PROFILER_DESC= Build with internal profiler PROFILER_CONFIGURE_ON= --enable-profiler .include -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054 -USE_GCC= yes -.else -USES+= compiler:c++11-lang -CPPFLAGS+= -I${LOCALBASE}/include +.if ${COMPILER_TYPE} == gcc +# Unhide std::to_string() for GCC (ports/193528) +CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch: .SILENT ${REINPLACE_CMD} -e '/^OPTIMISE=/d' \ ${WRKSRC}/configure.ac - ${REINPLACE_CMD} -e 's/std:://g' \ +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054 + ${REINPLACE_CMD} -e 's/std::acosh/acosh/g ; s/std::copysign/copysign/g' \ ${WRKSRC}/src/Orbit.cpp - ${REINPLACE_CMD} -e 's/std::to_string/to_string/g' \ - ${WRKSRC}/src/graphics/opengl/GenGasGiantColourMaterial.cpp \ - ${WRKSRC}/src/graphics/opengl/RendererGL.cpp +.endif post-patch-MODELCOMPILER-off: .SILENT ${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \ ${WRKSRC}/src/Makefile.am post-patch-NOGPUJOBS-on: .SILENT # Revert 41272a856d9072404efbfdb10f0e3c9e4f96bb4d commit, in case of # GL_OUT_OF_MEMORY OpenGL error, when turning to gas giant planet ${REINPLACE_CMD} -e '/EnableGPUJobs/s|1|0|' \ ${WRKSRC}/src/GameConfig.cpp post-patch-PROFILER-off: .SILENT ${REINPLACE_CMD} -e '/^SUBDIRS/s/ profiler//' \ ${WRKSRC}/contrib/Makefile.am ${REINPLACE_CMD} -i '.p.bak' -e \ '/libprofiler.a/d; $$!N; /libprofiler.a$$/s| \\||; P; D' \ ${WRKSRC}/src/Makefile.am ${REINPLACE_CMD} -i '.p.bak' -e '/contrib\/profiler/d' \ ${WRKSRC}/configure.ac post-install: ${INSTALL_DATA} ${WRKSRC}/application-icon/pngs/pioneer-256x256.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) post-install-MODELCOMPILER-on: ${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler .include Index: head/games/pioneer/distinfo =================================================================== --- head/games/pioneer/distinfo (revision 425935) +++ head/games/pioneer/distinfo (revision 425936) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477647657 -SHA256 (pioneerspacesim-pioneer-0.0.20161028-20161028_GH0.tar.gz) = d8ceefc7ec22ecdbaf2408a13c80d0368675feebff558457bef2ffc7258f4b77 -SIZE (pioneerspacesim-pioneer-0.0.20161028-20161028_GH0.tar.gz) = 194439211 +TIMESTAMP = 1478769845 +SHA256 (pioneerspacesim-pioneer-0.0.20161110-20161110_GH0.tar.gz) = 24d86095e2080fdbc6ae849dc543dcbdf214d09d34208697d915167c80775b50 +SIZE (pioneerspacesim-pioneer-0.0.20161110-20161110_GH0.tar.gz) = 194432857 Index: head/games/pioneer/files/patch-src_GameConfig.h =================================================================== --- head/games/pioneer/files/patch-src_GameConfig.h (revision 425935) +++ head/games/pioneer/files/patch-src_GameConfig.h (nonexistent) @@ -1,12 +0,0 @@ ---- src/GameConfig.h.orig 2015-06-07 21:44:10 UTC -+++ src/GameConfig.h -@@ -8,7 +8,8 @@ - - class GameConfig : public IniConfig { - public: -- GameConfig(const std::map &override_ = std::map()); -+ typedef std::map map_string; -+ GameConfig(const map_string &override_ = map_string()); - - void Load(); - bool Save(); Property changes on: head/games/pioneer/files/patch-src_GameConfig.h ___________________________________________________________________ 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/pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp =================================================================== --- head/games/pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp (revision 425935) +++ head/games/pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- contrib/PicoDDS/PicoDDS.cpp.orig 2015-06-07 21:44:10 UTC -+++ contrib/PicoDDS/PicoDDS.cpp -@@ -48,6 +48,7 @@ - */ - - #include "PicoDDS.h" -+#include - #include - #include - #include Property changes on: head/games/pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp ___________________________________________________________________ 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