Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 May 2014 14:03:22 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r355519 - in head/games/battletanks: . files
Message-ID:  <201405271403.s4RE3MIB028100@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue May 27 14:03:21 2014
New Revision: 355519
URL: http://svnweb.freebsd.org/changeset/ports/355519
QAT: https://qat.redports.org/buildarchive/r355519/

Log:
  USES=scons
  Fix build with lua changes

Deleted:
  head/games/battletanks/files/patch-engine-SConscript
Modified:
  head/games/battletanks/Makefile

Modified: head/games/battletanks/Makefile
==============================================================================
--- head/games/battletanks/Makefile	Tue May 27 13:47:59 2014	(r355518)
+++ head/games/battletanks/Makefile	Tue May 27 14:03:21 2014	(r355519)
@@ -16,17 +16,13 @@ LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/
 		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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405271403.s4RE3MIB028100>