diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile index 76c29885973a..4efffebc9f31 100644 --- a/games/battletanks/Makefile +++ b/games/battletanks/Makefile @@ -1,58 +1,57 @@ PORTNAME= btanks PORTVERSION= 0.9.8083 PORTREVISION= 11 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/ MAINTAINER= danfe@FreeBSD.org COMMENT= Fast 2D tank arcade game with multiplayer and split-screen modes WWW= https://btanks.sourceforge.net/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= zip:archivers/zip LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \ libexpat.so:textproc/expat2 \ libvorbisfile.so:audio/libvorbis \ libsmpeg.so:multimedia/smpeg -USES= lua:51 openal:al pkgconfig python:build scons sdl tar:bzip2 +USES= lua openal:al pkgconfig python:build scons sdl tar:bzip2 USE_CXXSTD= gnu++98 USE_LDCONFIG= yes USE_SDL= image sdl MAKE_ARGS= prefix=${PREFIX} resources_dir=${DATADIR} \ --install-sandbox=${STAGEDIR} -CXXFLAGS+= -fpermissive PORTDOCS= LICENSE LICENSE.EXCEPTION README-en.txt README-linux.txt \ donate.url homepage.url project_page.url video.txt DESKTOP_ENTRIES="Battle Tanks" "" "" "${PORTNAME}" "Game;ArcadeGame;" "" OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '/for lua in/s/lua5\.1/lua-${LUA_VER}/ ; \ /^env.*ENABLE_LUA/d' ${WRKSRC}/engine/SConscript @${REINPLACE_CMD} -e "s/env\.has_key('prefix')/'prefix' in env/" \ ${WRKSRC}/mrt/SConscript # Prevent the clash with /usr/include/semaphore.h @${MV} ${WRKSRC}/sdlx/semaphore.h ${WRKSRC}/sdlx/sdlx_semaphore.h @${REINPLACE_CMD} -e 's/semaphore\.h"/sdlx_&/' \ ${WRKSRC}/sdlx/semaphore.cpp ${WRKSRC}/sdlx/thread.h pre-build: # Regenerate `sl08.h' after we patch `sl08.py' (patching the header itself # would've resulted in a larger diff and gratuitous difference with Debian) cd ${WRKSRC}/engine/sl08 && ${PYTHON_CMD} sl08.py > sl08.h post-install: ${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.6 \ ${STAGEDIR}${PREFIX}/share/man/man6 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/btanks/*.so .include diff --git a/games/battletanks/files/patch-engine_luaxx_state.cpp b/games/battletanks/files/patch-engine_luaxx_state.cpp new file mode 100644 index 000000000000..61fbb875aa15 --- /dev/null +++ b/games/battletanks/files/patch-engine_luaxx_state.cpp @@ -0,0 +1,24 @@ +--- engine/luaxx/state.cpp.orig 2008-06-08 09:02:39 UTC ++++ engine/luaxx/state.cpp +@@ -59,7 +59,11 @@ static const char * chunk_reader(lua_State *L, void *d + void State::load(const std::string &fname, const mrt::Chunk &data) { + //throw_ex(("implement me[%s]", fname.c_str())); + reader_state x(data); +- int err = lua_load(state, chunk_reader, &x, fname.c_str()); ++ int err = lua_load(state, chunk_reader, &x, fname.c_str() ++#if LUA_VERSION_NUM > 501 ++ , NULL ++#endif ++ ); + check_error(state, err); + } + +@@ -81,7 +85,7 @@ void State::init() { + assert(state == NULL); + + //state = lua_newstate(l_alloc, this); +- state = lua_open(); ++ state = luaL_newstate(); + if (state == NULL) + throw_ex(("cannot create lua interpreter")); + diff --git a/games/battletanks/pkg-plist b/games/battletanks/pkg-plist index a55a283266ee..ac607a3d55ba 100644 --- a/games/battletanks/pkg-plist +++ b/games/battletanks/pkg-plist @@ -1,9 +1,9 @@ bin/btanks bin/bted -share/man/man6/btanks.6.gz lib/btanks/libbt_objects.so lib/libbtanks_engine.so lib/libclunk.so lib/libmrt.so lib/libsdlx.so %%DATADIR%%/resources.dat +share/man/man6/btanks.6.gz