From owner-svn-ports-head@FreeBSD.ORG  Tue May 27 14:03:22 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9064790;
 Tue, 27 May 2014 14:03:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7B3512D3F;
 Tue, 27 May 2014 14:03:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RE3MuH028101;
 Tue, 27 May 2014 14:03:22 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4RE3MIB028100;
 Tue, 27 May 2014 14:03:22 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201405271403.s4RE3MIB028100@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 27 May 2014 14:03:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355519 - in head/games/battletanks: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 May 2014 14:03:22 -0000

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