Index: head/games/supertux2/Makefile =================================================================== --- head/games/supertux2/Makefile (revision 465106) +++ head/games/supertux2/Makefile (revision 465107) @@ -1,37 +1,38 @@ # $FreeBSD$ PORTNAME= supertux PORTVERSION= 0.4.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= https://github.com/SuperTux/supertux/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= 2 MAINTAINER= ports@FreeBSD.org COMMENT= Side-scroller game similar to Super Mario Brothers BUILD_DEPENDS= ${LOCALBASE}/include/boost/smart_ptr.hpp:devel/boost-libs LIB_DEPENDS= libphysfs.so:devel/physfs \ libcurl.so:ftp/curl \ libvorbis.so:audio/libvorbis BROKEN_FreeBSD_10= does not build on 10.x USE_SDL= sdl2 image2 USE_GL= glew USES= cmake:outsource compiler:c++11-lib dos2unix iconv \ openal:al pkgconfig tar:bzip2 # Unhide std::to_string() to fix build with GCC (see ports/193528 for details) CFLAGS+= -D_GLIBCXX_USE_C99 CMAKE_ARGS= -DINSTALL_SUBDIR_BIN=bin \ -DBUILD_SHARED_LIBS=off -DOS2UNIX_FILES= external/squirrel/CMakeLists.txt +DOS2UNIX_FILES= external/squirrel/CMakeLists.txt \ + external/squirrel/squirrel/sqvm.cpp DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE= DOCS post-patch: ${REINPLACE_CMD} -e '/^Icon=/s,supertux.png,supertux2,' \ ${WRKSRC}/supertux2.desktop .include Index: head/games/supertux2/files/patch-external_squirrel_squirrel_sqvm.cpp =================================================================== --- head/games/supertux2/files/patch-external_squirrel_squirrel_sqvm.cpp (nonexistent) +++ head/games/supertux2/files/patch-external_squirrel_squirrel_sqvm.cpp (revision 465107) @@ -0,0 +1,24 @@ +The squirrel headers #define type , which plays havoc with +other headers that use type as a variable name or structure member. +Move other headers before the offending squirrel header. + +In file included from /usr/include/c++/v1/math.h:310: +/usr/include/c++/v1/limits:232:90: error: member reference base type 'int' is not a structure or union + _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return type(0);} + ^~~~~~~ +/wrkdirs/usr/ports/games/supertux2/work/supertux-0.4.0/external/squirrel/squirrel/sqobject.h:131:25: note: expanded from macro 'type' +#define type(obj) ((obj)._type) + + +--- external/squirrel/squirrel/sqvm.cpp.orig 2018-03-20 18:48:11.028369000 +0000 ++++ external/squirrel/squirrel/sqvm.cpp 2018-03-20 18:48:32.059836000 +0000 +@@ -1,8 +1,8 @@ + /* + see copyright notice in squirrel.h + */ +-#include "sqpcheader.h" + #include ++#include "sqpcheader.h" + #include + #include "sqopcodes.h" + #include "sqvm.h" Property changes on: head/games/supertux2/files/patch-external_squirrel_squirrel_sqvm.cpp ___________________________________________________________________ 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