Index: head/games/simutrans/Makefile =================================================================== --- head/games/simutrans/Makefile (revision 475509) +++ head/games/simutrans/Makefile (revision 475510) @@ -1,78 +1,81 @@ # $FreeBSD$ PORTNAME= simutrans DISTVERSION= 120-2-2 CATEGORIES= games MASTER_SITES= SF/simutrans/simutrans/${DISTVERSION} \ SF/simutrans/pak64/${PAK64_SUBDIR}:pak64 \ SF/simutrans/pak128/pak128%20for%20${PAK128_SUBDIR}:pak128 DISTFILES= simutrans-src-${DISTVERSION}.zip \ simulinux-${DISTVERSION}.zip MAINTAINER= ports@FreeBSD.org COMMENT= Transport Simulator LICENSE= ART10 LICENSE_FILE= ${WRKSRC}/simutrans/license.txt PAK64_DISTVERSION= 120-2 PAK64_SUBDIR= 120-2 PAK128_DISTVERSION= 2.6--ST120 PAK128_SUBDIR= ST%20120%20%282.6%2C%20completed%20elevated%20tracks%29 SIMUTRANS_REVISION= 8163 OPTIONS_DEFINE= DOCS OPTIONS_MULTI= PAK OPTIONS_MULTI_PAK= PAK64 PAK128 OPTIONS_DEFAULT= PAK64 PAK64_DESC= Default graphics PAK128_DESC= High resolution graphics # Threading disabled because FreeBSD does not have a static initializer # for recursive mutexes. MAKE_ARGS= BACKEND=mixer_sdl \ COLOUR_DEPTH=16 \ MULTI_THREAD=0 \ OSTYPE=freebsd \ FLAGS="-DUSE_C -DREVISION=${SIMUTRANS_REVISION}" \ VERBOSE=1 NO_WRKSUBDIR= yes -USES= gmake zip +USES= compiler dos2unix gmake zip USE_SDL= sdl mixer +CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} +CXXFLAGS_clang= -Wno-c++11-narrowing +DOS2UNIX_GLOB= * DESKTOP_ENTRIES=Simutrans "" "" simutrans "Game;Simulation;" false PLIST_FILES= bin/simutrans bin/simutrans-bin PORTDATA= * .include .if ${PORT_OPTIONS:MPAK64} DISTFILES+= simupak64-${PAK64_DISTVERSION}.zip:pak64 .endif .if ${PORT_OPTIONS:MPAK128} DISTFILES+= pak128-${PAK128_DISTVERSION}.zip:pak128 .endif post-patch: @${REINPLACE_CMD} 's/-O[^ ]*//' ${WRKSRC}/Makefile @${REINPLACE_CMD} 's/simutrans/.simutrans/' ${WRKSRC}/simsys.cc do-install: (cd ${WRKSRC}/simutrans && ${COPYTREE_SHARE} \ "ai config font music script text themes" ${STAGEDIR}${DATADIR}) .if ${PORT_OPTIONS:MPAK64} (cd ${WRKSRC}/simutrans && ${COPYTREE_SHARE} \ pak ${STAGEDIR}${DATADIR}) .endif .if ${PORT_OPTIONS:MPAK128} (cd ${WRKSRC} && ${COPYTREE_SHARE} pak128 ${STAGEDIR}${DATADIR}) .endif .if ${PORT_OPTIONS:MDOCS} ${INSTALL_DATA} ${WRKSRC}/simutrans/readme.txt ${STAGEDIR}${DATADIR} .endif ${INSTALL_PROGRAM} ${WRKSRC}/build/default/sim \ ${STAGEDIR}${PREFIX}/bin/simutrans-bin ${INSTALL_SCRIPT} ${FILESDIR}/simutrans ${STAGEDIR}${PREFIX}/bin .include Index: head/games/simutrans/files/patch-gui_loadsave__frame.h =================================================================== --- head/games/simutrans/files/patch-gui_loadsave__frame.h (revision 475509) +++ head/games/simutrans/files/patch-gui_loadsave__frame.h (revision 475510) @@ -1,10 +1,10 @@ ---- gui/loadsave_frame.h.orig 2017-02-17 12:53:58 UTC -+++ gui/loadsave_frame.h -@@ -11,6 +11,7 @@ - - #include "savegame_frame.h" - #include "../tpl/stringhashtable_tpl.h" -+#include - #include - - class loadsave_t; +--- gui/loadsave_frame.h.orig 2017-02-17 12:53:58 UTC ++++ gui/loadsave_frame.h +@@ -11,6 +11,7 @@ + + #include "savegame_frame.h" + #include "../tpl/stringhashtable_tpl.h" ++#include + #include + + class loadsave_t; Property changes on: head/games/simutrans/files/patch-gui_loadsave__frame.h ___________________________________________________________________ Modified: svn:eol-style ## -1 +1 ## -CRLF \ No newline at end of property +native \ No newline at end of property Index: head/games/simutrans/files/patch-squirrel_sq__extensions.cc =================================================================== --- head/games/simutrans/files/patch-squirrel_sq__extensions.cc (nonexistent) +++ head/games/simutrans/files/patch-squirrel_sq__extensions.cc (revision 475510) @@ -0,0 +1,27 @@ +In file included from squirrel/sq_extensions.cc:6: +In file included from squirrel/../tpl/ptrhashtable_tpl.h:8: +In file included from squirrel/../tpl/hashtable_tpl.h:4: +In file included from squirrel/../tpl/slist_tpl.h:11: +In file included from /usr/include/c++/v1/iterator:417: +In file included from /usr/include/c++/v1/__functional_base:19: +/usr/include/c++/v1/utility:488:67: error: expected an identifier or template-id + after '::' + typename __make_tuple_indices::type(), + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ +squirrel/squirrel/sqobject.h:131:19: note: expanded from macro 'type' +#define type(obj) ((obj)._type) + ^ + +--- squirrel/sq_extensions.cc.orig 2018-07-28 07:52:43 UTC ++++ squirrel/sq_extensions.cc +@@ -1,9 +1,9 @@ + #include "sq_extensions.h" + ++#include "../tpl/ptrhashtable_tpl.h" + #include "squirrel/sqpcheader.h" // for declarations... + #include "squirrel/sqvm.h" // for Raise_Error_vl + #include +-#include "../tpl/ptrhashtable_tpl.h" + + // store data associate to vm's here + struct my_vm_info_t { Property changes on: head/games/simutrans/files/patch-squirrel_sq__extensions.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cc =================================================================== --- head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cc (revision 475509) +++ head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cc (revision 475510) @@ -1,12 +1,12 @@ ---- squirrel/squirrel/sqvm.cc.orig 2017-02-17 12:54:05 UTC -+++ squirrel/squirrel/sqvm.cc -@@ -1,8 +1,8 @@ - /* - see copyright notice in squirrel.h - */ --#include "sqpcheader.h" - #include -+#include "sqpcheader.h" - #include - #include - #include "sqopcodes.h" +--- squirrel/squirrel/sqvm.cc.orig 2017-02-17 12:54:05 UTC ++++ squirrel/squirrel/sqvm.cc +@@ -1,8 +1,8 @@ + /* + see copyright notice in squirrel.h + */ +-#include "sqpcheader.h" + #include ++#include "sqpcheader.h" + #include + #include + #include "sqopcodes.h" Property changes on: head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cc ___________________________________________________________________ Modified: svn:eol-style ## -1 +1 ## -CRLF \ No newline at end of property +native \ No newline at end of property