Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 May 2014 16:17:43 +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: r355410 - head/graphics/cegui
Message-ID:  <201405261617.s4QGHhIl025930@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon May 26 16:17:43 2014
New Revision: 355410
URL: http://svnweb.freebsd.org/changeset/ports/355410
QAT: https://qat.redports.org/buildarchive/r355410/

Log:
  Fix lua option

Modified:
  head/graphics/cegui/Makefile

Modified: head/graphics/cegui/Makefile
==============================================================================
--- head/graphics/cegui/Makefile	Mon May 26 16:17:26 2014	(r355409)
+++ head/graphics/cegui/Makefile	Mon May 26 16:17:43 2014	(r355410)
@@ -19,7 +19,6 @@ CMAKE_ENV+=	TOLUA_INC="${LUA_INCDIR}"
 CMAKE_ARGS=	-DCEGUI_SAMPLES_ENABLED:BOOL=OFF \
 		-DCEGUI_BUILD_TESTS=OFF
 USE_LDCONFIG=	yes
-LUA_COMPS=	toluaxx # lua support is conditional though
 USES=		cmake pathfix pkgconfig compiler:c++11-lib
 
 PORTDOCS=	*
@@ -43,7 +42,8 @@ FREETYPE_CMAKE_OFF=	-DCEGUI_HAS_FREETYPE
 PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 PCRE_CMAKE_ON=		-DCEGUI_HAS_PCRE_REGEX=ON
 PCRE_CMAKE_OFF=		-DCEGUI_HAS_PCRE_REGEX=OFF
-LUA_USE=		LUA=5.1 # LUA_COMPS set unconditionally above
+LUA_USES=		lua:51
+LUA_LIB_DEPENDS=	libtoluaxx-${LUA_VER}.so:${PORTSDIR}/lang/tolua++
 LUA_CMAKE_ON=		-DCEGUI_BUILD_LUA_MODULE=ON -DCEGUI_BUILD_LUA_GENERATOR=ON
 LUA_CMAKE_OFF=		-DCEGUI_BUILD_LUA_MODULE=OFF -DCEGUI_BUILD_LUA_GENERATOR=OFF
 # this option is not currently used as it doesn't compile (see also CMAKE_ARGS below)



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