Date: Wed, 1 Mar 2017 15:29:09 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435166 - in head/games/allacrost: . files Message-ID: <201703011529.v21FT9s5079103@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Mar 1 15:29:09 2017 New Revision: 435166 URL: https://svnweb.freebsd.org/changeset/ports/435166 Log: - Fix runtime and build with newer compilers, get rid of gcc dependency PR: 217002 Reported by: jbeich Added: head/games/allacrost/files/patch-src-luabind-luabind-detail-format__signature.hpp (contents, props changed) head/games/allacrost/files/patch-src_luabind_luabind_detail_object__rep.hpp (contents, props changed) head/games/allacrost/files/patch-src_main.cpp (contents, props changed) Modified: head/games/allacrost/Makefile Modified: head/games/allacrost/Makefile ============================================================================== --- head/games/allacrost/Makefile Wed Mar 1 15:20:14 2017 (r435165) +++ head/games/allacrost/Makefile Wed Mar 1 15:29:09 2017 (r435166) @@ -3,7 +3,7 @@ PORTNAME= allacrost PORTVERSION= 1.0.2 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION} DISTNAME= ${PORTNAME}_demo_source_${PORTVERSION} @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes USES= gettext gmake iconv jpeg lua:51 openal:al USE_SDL= sdl ttf net USE_GL= yes -USE_GCC= any # problems in luabind QT_NONSTANDARD= yes # used when EDITOR enabled CONFIGURE_ARGS= --datadir=${DATADIR} @@ -63,7 +62,7 @@ post-patch-EDITOR-on: ${WRKSRC}/Makefile.in post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/MANUAL ${STAGEDIR}${DOCSDIR}/ .include <bsd.port.mk> Added: head/games/allacrost/files/patch-src-luabind-luabind-detail-format__signature.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/allacrost/files/patch-src-luabind-luabind-detail-format__signature.hpp Wed Mar 1 15:29:09 2017 (r435166) @@ -0,0 +1,35 @@ +commit 3044a9053ac50977684a75c4af42b2bddb853fad +Author: Daniel Wallin <daniel@boostpro.com> +Date: Mon Oct 11 14:33:23 2010 +0200 + + Proper forward declarations for object wrappers. Now builds on clang! + +diff --git luabind/detail/format_signature.hpp luabind/detail/format_signature.hpp +index 56e7963..b447bc9 100644 +--- src/luabind/luabind/detail/format_signature.hpp ++++ src/luabind/luabind/detail/format_signature.hpp +@@ -13,12 +13,19 @@ + # include <boost/mpl/next.hpp> + # include <boost/mpl/size.hpp> + +-namespace luabind { ++namespace luabind { namespace adl ++{ + +-class object; +-class argument; +-template <class Base> +-struct table; ++ class object; ++ class argument; ++ template <class Base> ++ struct table; ++ ++} // namespace adl ++ ++using adl::object; ++using adl::argument; ++using adl::table; + + } // namespace luabind + Added: head/games/allacrost/files/patch-src_luabind_luabind_detail_object__rep.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/allacrost/files/patch-src_luabind_luabind_detail_object__rep.hpp Wed Mar 1 15:29:09 2017 (r435166) @@ -0,0 +1,11 @@ +--- src/luabind/luabind/detail/object_rep.hpp.orig 2010-01-03 23:08:15 UTC ++++ src/luabind/luabind/detail/object_rep.hpp +@@ -29,6 +29,8 @@ + #include <luabind/detail/instance_holder.hpp> + #include <luabind/detail/ref.hpp> + ++#include <cstdlib> ++ + namespace luabind { namespace detail + { + class class_rep; Added: head/games/allacrost/files/patch-src_main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/allacrost/files/patch-src_main.cpp Wed Mar 1 15:29:09 2017 (r435166) @@ -0,0 +1,17 @@ +--- src/main.cpp.orig 2010-05-17 22:52:57 UTC ++++ src/main.cpp +@@ -364,11 +364,9 @@ int main(int argc, char *argv[]) { + // Now the program should be in app/Contents + path.append ("/Resources/"); + chdir(path.c_str()); +- #elif (defined(__linux__) || defined(__FreeBSD__)) && !defined(RELEASE_BUILD) +- // Look for data files in DATADIR only if they are not available in the +- // current directory. +- if (ifstream("dat/config/settings.lua") == NULL) +- chdir(DATADIR); ++ #elif (defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)) && !defined(RELEASE_BUILD) ++ // Always look into datadir ++ chdir(DATADIR); + #endif + + // Initialize the random number generator (note: 'unsigned int' is a required usage in this case)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703011529.v21FT9s5079103>