Index: head/games/xmoto/Makefile =================================================================== --- head/games/xmoto/Makefile (revision 515340) +++ head/games/xmoto/Makefile (revision 515341) @@ -1,77 +1,79 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= xmoto PORTVERSION= 0.5.11 PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://download.tuxfamily.org/xmoto/xmoto/${PORTVERSION}/ \ http://mirror.amdmi3.ru/distfiles/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= amdmi3@FreeBSD.org COMMENT= Challenging 2D motocross platform game LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libode.so:devel/ode \ libpng.so:graphics/png \ libcurl.so:ftp/curl \ libxdg-basedir.so:x11/libxdg-basedir BROKEN_powerpc64= fails to compile: hashtable.h: no match for call to __gnu_cxx::hash GNU_CONFIGURE= yes -USES= compiler:features dos2unix gmake jpeg localbase lua:51 sqlite +USES= compiler:features dos2unix gl gmake gnome jpeg localbase lua:51 sdl sqlite xorg USE_GNOME= libxml2 USE_SDL= sdl mixer ttf net USE_GL= gl glu +USE_CXXSTD= c++11 +USE_XORG= x11 DOS2UNIX_GLOB= *.cpp *.h CPPFLAGS+= -isystem${LUA_INCDIR} LDFLAGS+= -L${LUA_LIBDIR} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTDOCS= README ChangeLog PORTDATA= * DESKTOP_ENTRIES="XMoto" \ "Motorcross game" \ "${DATADIR}/xmoto_icone_x.ico" \ "xmoto" \ "Game;SportsGame;ArcadeGame;" \ false OPTIONS_DEFINE= ASIAN_TTF DOCS NLS OPTIONS_SUB= yes ASIAN_TTF_DESC= Use asian TTF font ASIAN_TTF_RUN_DEPENDS= ${LOCALBASE}/share/fonts/TrueType/bkai00mp.ttf:chinese/arphicttf ASIAN_TTF_CONFIGURE_ON= --with-asian-ttf-file=${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf ASIAN_TTF_CONFIGURE_OFF=--without-asian-ttf-file NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls .include .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 BROKEN= does not build with gcc 4.2 .endif post-extract: @${RM} -r ${WRKSRC}/src/ode post-patch: @${REINPLACE_CMD} -e "s/lua5.1/lua-${LUA_VER}/g" ${WRKSRC}/configure post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor .include Index: head/games/xmoto/files/patch-src-include-xm__hashmap.h =================================================================== --- head/games/xmoto/files/patch-src-include-xm__hashmap.h (revision 515340) +++ head/games/xmoto/files/patch-src-include-xm__hashmap.h (revision 515341) @@ -1,28 +1,33 @@ ---- src/include/xm_hashmap.h.orig 2011-10-11 20:18:17 UTC +--- src/include/xm_hashmap.h.orig 2019-10-23 11:51:33 UTC +++ src/include/xm_hashmap.h -@@ -13,13 +13,18 @@ - #include - namespace HashNamespace=std; - #endif +@@ -1,25 +1,11 @@ + #ifndef __XMHASHMAP_H__ + #define __XMHASHMAP_H__ + +-#ifdef __GNUC__ +-#if (__GNUC__ >= 3) +-#include +- namespace HashNamespace=__gnu_cxx; +-#else +-#include +-#define HashNamespace std +-#endif +-#else // #ifdef __GNUC__ +-#include +-namespace HashNamespace=std; +-#endif -struct hashcmp_str { - bool operator()(const char* s1, const char* s2) { - if(s1 == NULL || s2 == NULL) { - return false; -+ -+#ifdef _LIBCPP_VERSION -+namespace __gnu_cxx { -+ template<> struct hash -+ : public unary_function -+ { -+ size_t operator()(const std::string& s) const -+ { -+ return hash()(s.c_str()); - } +- } - return strcmp(s1, s2) == 0; - } --}; -+ }; -+} -+#endif // _LIBCPP_VERSION ++#include ++ ++namespace HashNamespace { ++ template , class Pred = std::equal_to, class Allocator = std::allocator< std::pair >> ++ using hash_map = std::unordered_map; + }; #endif