Index: Makefile =================================================================== --- Makefile (revision 398160) +++ Makefile (working copy) @@ -58,7 +58,7 @@ IPV6_CONFIGURE_OFF= --disable-ipv6 LIBEV_CONFIGURE_WITH= libev=${LOCALBASE} LIBEV_LIB_DEPENDS= libev.so:${PORTSDIR}/devel/libev -LUA_USES= lua:51+ +LUA_USES= lua:51 LUA_CONFIGURE_WITH= lua LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" MEMCACHE_LIB_DEPENDS= libmemcache.so:${PORTSDIR}/databases/libmemcache Index: files/patch-src_mod__cml__lua.c =================================================================== --- files/patch-src_mod__cml__lua.c (revision 398160) +++ files/patch-src_mod__cml__lua.c (working copy) @@ -1,25 +0,0 @@ ---- src/mod_cml_lua.c.orig 2015-07-26 10:36:36 UTC -+++ src/mod_cml_lua.c -@@ -28,6 +28,10 @@ typedef char HASHHEX[HASHHEXLEN+1]; - #include - #include - -+#if LUA_VERSION_NUM >= 502 -+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX -+#endif -+ - typedef struct { - stream st; - int done; -@@ -291,7 +295,11 @@ int cache_parse_lua(server *srv, connect - lua_settable(L, LUA_GLOBALSINDEX); - - /* load lua program */ -+#if LUA_VERSION_NUM >= 502 -+ if (lua_load(L, load_file, &rm, fn->ptr, NULL) || lua_pcall(L,0,1,0)) { -+#else - if (lua_load(L, load_file, &rm, fn->ptr) || lua_pcall(L,0,1,0)) { -+#endif - log_error_write(srv, __FILE__, __LINE__, "s", - lua_tostring(L,-1)); - Index: files/patch-src_mod__magnet.c =================================================================== --- files/patch-src_mod__magnet.c (revision 398160) +++ files/patch-src_mod__magnet.c (working copy) @@ -1,13 +0,0 @@ ---- src/mod_magnet.c.orig 2015-07-26 10:36:36 UTC -+++ src/mod_magnet.c -@@ -24,6 +24,10 @@ - #define MAGNET_CONFIG_PHYSICAL_PATH "magnet.attract-physical-path-to" - #define MAGNET_RESTART_REQUEST 99 - -+#if LUA_VERSION_NUM >= 502 -+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX -+#endif -+ - /* plugin config for all request/connections */ - - static jmp_buf exceptionjmp;