mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

USES=scons

Browse Source 
Fix build with lua changes
This commit is contained in:
Baptiste Daroussin 2014-05-27 14:03:21 +00:00
parent b855d7191e
commit 64a7ff51ed
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=355519
2 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
games/battletanks/Makefile
View File

@ -16,17 +16,13 @@ LIB_DEPENDS= libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
libsmpeg.so:${PORTSDIR}/multimedia/smpeg
USES= openal:al pkgconfig lua:51 tar:bzip2
USES= openal:al pkgconfig lua:51 scons tar:bzip2
USE_LDCONFIG= yes
USE_SDL= image sdl
USE_SCONS= yes
USE_PYTHON_BUILD= yes
SCONS_ARGS= prefix=${PREFIX} resources_dir=${DATADIR} \
MAKE_ARGS= prefix=${PREFIX} resources_dir=${DATADIR} \
--install-sandbox=${STAGEDIR}
SCONS_BUILDENV= CC="${CC}" CXX="${CXX}" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -fpermissive" \
LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
CPPPATH="${LOCALBASE}/include" LIBPATH="${LOCALBASE}/lib"
CXXFLAGS+= -fpermissive
PORTDOCS= LICENSE LICENSE.EXCEPTION README-en.txt README-linux.txt \
donate.url homepage.url project_page.url video.txt
@ -38,6 +34,9 @@ pre-build:
# would have resulted in a larger diff and gratuitous difference with Debian)
@cd ${WRKSRC} && ${PYTHON_CMD} engine/sl08/sl08.py > engine/sl08/sl08.h
post-patch:
@${REINPLACE_CMD} -e "s/lua5.1/lua-${LUA_VER}/g" ${WRKSRC}/engine/SConscript
post-install:
${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.6 \
${STAGEDIR}${MANPREFIX}/man/man6

23
games/battletanks/files/patch-engine-SConscript
View File

@ -1,23 +0,0 @@
--- engine/SConscript.orig 2009-12-30 14:50:33.000000000 +0100
+++ engine/SConscript 2010-01-13 23:58:23.000000000 +0100
@@ -79,17 +79,17 @@
if sys.platform != 'win32':
got_lua = False
- for lua in ['lua5.1', 'lua5.0', 'lua']:
+ for lua in ['lua-5.1', 'lua-5.0', 'lua']:
try:
env.ParseConfig("pkg-config --cflags --libs %s 2>/dev/null" %lua);
got_lua = True
env.Append(CPPDEFINES=['ENABLE_LUA'])
- bt_libs.append(lua)
+ bt_libs.append('lua')
break
except:
continue
if not got_lua:
- raise Exception("Cannot find lua5.1/lua5.0 or lua pkg-config information")
+ raise Exception("Cannot find lua-5.1/lua-5.0 or lua pkg-config information")
env.Append(CPPDEFINES=['ENABLE_LUA'])
bt_sources.append('luaxx/state.cpp')