Index: Makefile =================================================================== --- Makefile +++ Makefile @@ -1,19 +1,19 @@ # Created by: GreenDog +# Updated by: Russell Haley , Andrew Gierth # $FreeBSD$ PORTNAME= lua -PORTVERSION= 5.3.4 -PORTREVISION= 2 +PORTVERSION= 5.3.5 +PORTREVISION= 3 CATEGORIES= lang -MASTER_SITES= http://www.lua.org/ftp/ +MASTER_SITES= https://www.lua.org/ftp/ PKGNAMESUFFIX= 53 MAINTAINER= russ.haley@gmail.com -COMMENT= Small, compilable scripting language providing easy access to C code +COMMENT= Small, embeddable scripting language providing easy access to C code LICENSE= MIT -USES= libedit LUA_VER= 5.3 USE_LDCONFIG= yes @@ -24,57 +24,62 @@ # have its settings when we get here. # See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt MAKE_ARGS= __MAKE_CONF=${NONEXISTENT} + +BUILD_WRKSRC= ${WRKSRC}/src + +LUA_PREFIX?= ${PREFIX} + +#~ # 2018-03-17: AG - These should come from lua.mk eventually? if not they should match it +LUA_CMD?= ${PORTNAME}${PKGNAMESUFFIX} +LUAC_CMD?= ${PORTNAME}c${PKGNAMESUFFIX} +LUA_INCDIR?= ${LUA_PREFIX}/include/${PORTNAME}${PKGNAMESUFFIX} +LUA_LIBDIR?= ${LUA_PREFIX}/lib + +LUA_LIB_STATIC=liblua-${LUA_VER}.a +LUA_LIB_SHARED=liblua-${LUA_VER}.so +LUA_PC_FILE=${PORTNAME}-${LUA_VER}.pc +ALL_TARGET=freebsd + +CFLAGS+= -fPIC # liblua.so requires libm, so make sure it has an explicit dependency # so that applications need not second-guess lua's dependencies. -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lm -pthread -BUILD_WRKSRC= ${WRKSRC}/src -MAKE_ARGS+= MYCFLAGS="${CFLAGS} ${CPPFLAGS} -DLUA_USE_LINUX" \ +# pthread is required for threaded libraries that are used in modules. A an example +# is luaossl (openssl bindings) requires pthread when using openssl < 1.1.0 or libressl. +LDFLAGS+= -lm -pthread +WITHOUT_NO_STRICT_ALIASING=yes + +MAKE_ARGS += CC="${CC}" \ + MYCFLAGS="${CPPFLAGS} ${CFLAGS}" \ MYLDFLAGS="${LDFLAGS}" \ - MYLIBS="-Wl,-E -L${LOCALBASE}/lib -ledit" \ - CC="${CC}" \ - LUA_T=lua53 \ - LUAC_T=luac53 \ - LUA_A=liblua-${LUA_VER}.a \ - LUA_SO=liblua-${LUA_VER}.so \ - LUA_SONAME=liblua-${LUA_VER}.so \ - TO_BIN="lua53 luac53" \ - TO_LIB="liblua-${LUA_VER}.a liblua-${LUA_VER}.so" \ + MYLIBS="${LIBS}" \ + LUA_T=${LUA_CMD} \ + LUAC_T=${LUAC_CMD} \ + LUA_A=${LUA_LIB_STATIC} \ + LUA_SO=${LUA_LIB_SHARED} \ + LUA_SONAME=${LUA_LIB_SHARED} \ + TO_BIN="${LUA_CMD} ${LUAC_CMD}" \ + TO_LIB="${LUA_LIB_SHARED} ${LUA_LIB_STATIC}" \ INSTALL_TOP=${STAGEDIR}${PREFIX} \ - INSTALL_INC=${STAGEDIR}${PREFIX}/include/lua53 \ + INSTALL_INC=${STAGEDIR}${LUA_INCDIR} \ INSTALL_EXEC="${INSTALL_PROGRAM}" -# Cope with the lack of support for Lua 5.2 in bsd.lua.mk. These -# overrides, which are required below, should be removed once bsd.lua.mk -# understands this lua version. -LUA_PREFIX?= ${PREFIX} -LUA_SUBDIR?= lua${PKGNAMESUFFIX} -LUA_INCDIR?= ${LUA_PREFIX}/include/${LUA_SUBDIR} -LUA_LIBDIR?= ${LUA_PREFIX}/lib - -SUB_FILES= lua-${LUA_VER}.pc +SUB_FILES= ${LUA_PC_FILE} SUB_LIST= version=${PORTVERSION} \ includedir=${LUA_INCDIR} \ libdir=${LUA_LIBDIR} \ - soname=lua-${LUA_VER} + soname=${PORTNAME}-${LUA_VER} -CFLAGS+= -fPIC - post-patch: - @${REINPLACE_CMD} -e 's,rand *(,random(,g' \ - ${WRKSRC}/src/lmathlib.c - @${REINPLACE_CMD} -e "/LUA_ROOT/s|/usr/local|${LUA_PREFIX}| ; \ - s,readline/,editline/,g ; \ - /history\.h/d" \ - ${WRKSRC}/src/luaconf.h ${WRKSRC}/src/lua.c + @${REINPLACE_CMD} -e "/LUA_ROOT/s,/usr/local,${LUA_PREFIX}," \ + ${WRKSRC}/src/luaconf.h post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblua-${LUA_VER}.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${LUA_LIB_SHARED} @${MV} ${STAGEDIR}${PREFIX}/man/man1/lua.1 \ - ${STAGEDIR}${PREFIX}/man/man1/lua53.1 + ${STAGEDIR}${PREFIX}/man/man1/${LUA_CMD}.1 @${MV} ${STAGEDIR}${PREFIX}/man/man1/luac.1 \ - ${STAGEDIR}${PREFIX}/man/man1/luac53.1 - ${INSTALL_DATA} ${WRKDIR}/lua-${LUA_VER}.pc \ + ${STAGEDIR}${PREFIX}/man/man1/${LUAC_CMD}.1 + ${INSTALL_DATA} ${WRKDIR}/${LUA_PC_FILE} \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include Index: distinfo =================================================================== --- distinfo +++ distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489025786 -SHA256 (lua-5.3.4.tar.gz) = f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c -SIZE (lua-5.3.4.tar.gz) = 303586 +TIMESTAMP = 1531450797 +SHA256 (lua-5.3.5.tar.gz) = 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac +SIZE (lua-5.3.5.tar.gz) = 303543 Index: files/lua-5.3.pc.in =================================================================== --- files/lua-5.3.pc.in +++ files/lua-5.3.pc.in @@ -4,7 +4,7 @@ soname=%%soname%% Name: Lua -Description: An Extensible Extension Language +Description: Lua is a powerful, efficient, lightweight, embeddable scripting language. Version: ${version} Libs: -L${libdir} -l${soname} -lm Cflags: -I${includedir} Index: files/patch-src__Makefile =================================================================== --- files/patch-src__Makefile +++ files/patch-src__Makefile @@ -1,4 +1,4 @@ ---- src/Makefile.orig 2015-01-05 16:04:52 UTC +--- src/Makefile.orig 2018-06-25 17:46:36 UTC +++ src/Makefile @@ -6,12 +6,12 @@ # Your platform. See PLATS for possible values. @@ -55,3 +55,12 @@ $(RANLIB) $@ $(LUA_T): $(LUA_O) $(LUA_A) +@@ -102,7 +106,7 @@ c89: + + + freebsd: +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE -I/usr/include/edit" SYSLIBS="-Wl,-E -ledit" CC="cc" ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -I/usr/include/edit" SYSLIBS="-Wl,-E -ledit" + + generic: $(ALL) + Index: files/patch-src__ldebug.c =================================================================== --- files/patch-src__ldebug.c +++ files/patch-src__ldebug.c @@ -1,10 +0,0 @@ ---- src/ldebug.c.orig 2016-10-19 12:32:10 UTC -+++ src/ldebug.c -@@ -653,6 +653,7 @@ l_noret luaG_runerror (lua_State *L, const char *fmt, - CallInfo *ci = L->ci; - const char *msg; - va_list argp; -+ luaC_checkGC(L); /* error message uses memory */ - va_start(argp, fmt); - msg = luaO_pushvfstring(L, fmt, argp); /* format message */ - va_end(argp); Index: files/patch-src__lgc.c =================================================================== --- files/patch-src__lgc.c +++ files/patch-src__lgc.c @@ -1,13 +0,0 @@ ---- src/lgc.c.orig 2016-12-22 13:08:50 UTC -+++ src/lgc.c -@@ -643,8 +643,9 @@ static void clearkeys (global_State *g, GCObject *l, G - for (n = gnode(h, 0); n < limit; n++) { - if (!ttisnil(gval(n)) && (iscleared(g, gkey(n)))) { - setnilvalue(gval(n)); /* remove value ... */ -- removeentry(n); /* and remove entry from table */ - } -+ if (ttisnil(gval(n))) /* is entry empty? */ -+ removeentry(n); /* remove entry from table */ - } - } - } Index: files/patch-src__liolib.c =================================================================== --- files/patch-src__liolib.c +++ files/patch-src__liolib.c @@ -1,10 +0,0 @@ ---- src/liolib.c.orig 2015-04-03 18:41:57 UTC -+++ src/liolib.c -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #include "lua.h" - Index: files/patch-src__lparser.c =================================================================== --- files/patch-src__lparser.c +++ files/patch-src__lparser.c @@ -1,11 +0,0 @@ ---- src/lparser.c.orig 2016-08-01 19:51:24 UTC -+++ src/lparser.c -@@ -1392,7 +1392,7 @@ static void test_then_block (LexState *ls, int *escape - luaK_goiffalse(ls->fs, &v); /* will jump to label if condition is true */ - enterblock(fs, &bl, 0); /* must enter block before 'goto' */ - gotostat(ls, v.t); /* handle goto/break */ -- skipnoopstat(ls); /* skip other no-op statements */ -+ while (testnext(ls, ';')) {} /* skip semicolons */ - if (block_follow(ls, 0)) { /* 'goto' is the entire block? */ - leaveblock(fs); - return; /* and that is it */