Date: Mon, 21 Apr 2014 21:41:24 +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: r351723 - in head/databases/tokyotyrant: . files Message-ID: <201404212141.s3LLfOU0046151@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Apr 21 21:41:24 2014 New Revision: 351723 URL: http://svnweb.freebsd.org/changeset/ports/351723 QAT: https://qat.redports.org/buildarchive/r351723/ Log: Switch to lua 5.2 Obtained from: pkgsrc Added: head/databases/tokyotyrant/files/patch-scrext.c (contents, props changed) Modified: head/databases/tokyotyrant/Makefile Modified: head/databases/tokyotyrant/Makefile ============================================================================== --- head/databases/tokyotyrant/Makefile Mon Apr 21 21:33:22 2014 (r351722) +++ head/databases/tokyotyrant/Makefile Mon Apr 21 21:41:24 2014 (r351723) @@ -3,6 +3,7 @@ PORTNAME= tokyotyrant PORTVERSION= 1.1.41 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://fallabs.com/${PORTNAME}/ @@ -22,21 +23,17 @@ OPTIONS_DEFINE= LUA LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MLUA} -CONFIGURE_ARGS+= --enable-lua -LDFLAGS+= -L${LUA_LIBDIR} -CFLAGS+= -I${LUA_INCDIR} -USE_LUA= yes -.else -CONFIGURE_ARGS+= --disable-lua -.endif +LUA_CONFIGURE_ENABLE= lua +LUA_LDFLAGS+= -L${LUA_LIBDIR} +LUA_CFLAGS+= -I${LUA_INCDIR} +LUA_CPPFLAGS+= -I${LUA_INCDIR} +LUA_USES= lua # Since gnomehack only works for "(libdir)" case, we need to patch it # manually. post-patch: ${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|g' ${WRKSRC}/configure .include <bsd.port.mk> Added: head/databases/tokyotyrant/files/patch-scrext.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tokyotyrant/files/patch-scrext.c Mon Apr 21 21:41:24 2014 (r351723) @@ -0,0 +1,16 @@ +--- ./scrext.c.orig 2010-08-05 08:24:33.000000000 +0200 ++++ ./scrext.c 2014-04-21 21:45:57.464501296 +0200 +@@ -153,6 +153,13 @@ + #include "lualib.h" + #include "lauxlib.h" + ++#ifdef LUA_VERSION_NUM ++# if (LUA_VERSION_NUM >= 502) ++#undef lua_objlen ++#define lua_objlen lua_rawlen ++# endif ++#endif ++ + #define SERVVAR "_serv_" // global variable name for server resources + #define ITERVAR "_iter_" // global variable name for iterator + #define MRMAPVAR "_mrmap_" // global variable name for mapreduce mapper
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404212141.s3LLfOU0046151>