--- w/benchmarks/wrk/Makefile +++ w/benchmarks/wrk/Makefile @@ -3,6 +3,7 @@ PORTNAME= wrk PORTVERSION= 4.1.0 +PORTREVISION= 1 CATEGORIES= benchmarks www MAINTAINER= osa@FreeBSD.org @@ -17,7 +18,7 @@ GH_ACCOUNT= wg USES= gmake ssl LLD_UNSAFE= yes -CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH -I/${LOCALBASE}/include/luajit-2.0 +CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH -I/${LOCALBASE}/include/luajit-2.1 MAKE_ENV+= WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION} PLIST_FILES= bin/wrk --- w/databases/redis-devel/Makefile +++ w/databases/redis-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= redis DISTVERSION= 5.0-rc4 +PORTREVISION= 1 CATEGORIES= databases PKGNAMESUFFIX= -devel --- w/databases/redis-devel/files/extra-patch-src-Makefile.luajit +++ w/databases/redis-devel/files/extra-patch-src-Makefile.luajit @@ -33,7 +33,7 @@ FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a endif -+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0 ++FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1 -DWITH_LUAJIT +FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) --- w/databases/redis-devel/files/patch-src-lua_cjson.c +++ w/databases/redis-devel/files/patch-src-lua_cjson.c @@ -1,5 +1,10 @@ ---- deps/lua/src/lua_cjson.c.orig 2016-12-04 20:49:41.925218000 -0500 -+++ deps/lua/src/lua_cjson.c 2016-12-04 20:49:59.728885000 -0500 +LuaJIT implements a function from 5.2: https://github.com/LuaJIT/LuaJIT/issues/325 + +lua_cjson does not include luajit.h, so we can't check for luajit without a custom define. +WITH_LUAJIT is defined in the Makefile.luajit extra patch. + +--- deps/lua/src/lua_cjson.c.orig 2018-08-07 16:21:12 UTC ++++ deps/lua/src/lua_cjson.c @@ -46,7 +46,9 @@ #include "strbuf.h" #include "fpconv.h" @@ -10,3 +15,12 @@ #ifndef CJSON_MODNAME #define CJSON_MODNAME "cjson" +@@ -1292,7 +1294,7 @@ static int json_decode(lua_State *l) + + /* ===== INITIALISATION ===== */ + +-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502 ++#if !defined(WITH_LUAJIT) && (!defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502) + /* Compatibility for Lua 5.1. + * + * luaL_setfuncs() is used to create a module table where the functions have --- w/databases/redis/Makefile +++ w/databases/redis/Makefile @@ -3,6 +3,7 @@ PORTNAME= redis DISTVERSION= 4.0.11 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ --- w/databases/redis/files/extra-patch-src-Makefile.luajit +++ w/databases/redis/files/extra-patch-src-Makefile.luajit @@ -33,7 +33,7 @@ FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a endif -+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0 ++FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1 -DWITH_LUAJIT +FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) --- w/databases/redis/files/patch-src-lua_cjson.c +++ w/databases/redis/files/patch-src-lua_cjson.c @@ -1,5 +1,10 @@ ---- deps/lua/src/lua_cjson.c.orig 2016-12-04 20:49:41.925218000 -0500 -+++ deps/lua/src/lua_cjson.c 2016-12-04 20:49:59.728885000 -0500 +LuaJIT implements a function from 5.2: https://github.com/LuaJIT/LuaJIT/issues/325 + +lua_cjson does not include luajit.h, so we can't check for luajit without a custom define. +WITH_LUAJIT is defined in the Makefile.luajit extra patch. + +--- deps/lua/src/lua_cjson.c.orig 2018-08-07 16:21:12 UTC ++++ deps/lua/src/lua_cjson.c @@ -46,7 +46,9 @@ #include "strbuf.h" #include "fpconv.h" @@ -10,3 +15,12 @@ #ifndef CJSON_MODNAME #define CJSON_MODNAME "cjson" +@@ -1292,7 +1294,7 @@ static int json_decode(lua_State *l) + + /* ===== INITIALISATION ===== */ + +-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502 ++#if !defined(WITH_LUAJIT) && (!defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502) + /* Compatibility for Lua 5.1. + * + * luaL_setfuncs() is used to create a module table where the functions have --- w/devel/love/Makefile +++ w/devel/love/Makefile @@ -3,7 +3,7 @@ PORTNAME= love PORTVERSION= 0.10.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel games MASTER_SITES= https://bitbucket.org/rude/love/downloads/ \ http://mirror.amdmi3.ru/distfiles/ @@ -45,6 +45,10 @@ LUAJIT_CONFIGURE_OFF= --with-lua=lua \ --with-luaversion="${LUA_VER}" LUAJIT_CONFIGURE_ENV_OFF=LUA_EXECUTABLE="${LUA_CMD}" +post-patch-LUAJIT-on: + @${REINPLACE_CMD} -e 's|luaL_reg|luaL_Reg|' \ + ${WRKSRC}/src/libraries/luasocket/libluasocket/* + post-patch-LUAJIT-off: @${REINPLACE_CMD} -e 's|$${with_lua}$${with_luaversion}|$${with_lua}-$${with_luaversion}|g' \ ${WRKSRC}/configure --- w/devel/lua-luarocks/Makefile +++ w/devel/lua-luarocks/Makefile @@ -3,6 +3,7 @@ PORTNAME= luarocks PORTVERSION= 2.4.4 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -34,7 +35,7 @@ LUAJIT_RUN_DEPENDS= luajit:lang/luajit LUAJIT_CONFIGURE_ON= --lua-suffix=jit LUAJIT_PLIST_SUB= LUA_VER=${LUA_VER} \ LUA_MODSHAREDIR=share/lua/${LUA_VER} -LUAJIT_VARS= LUA_INCDIR=${LOCALBASE}/include/luajit-2.0 \ +LUAJIT_VARS= LUA_INCDIR=${LOCALBASE}/include/luajit-2.1 \ LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51- LUAJIT_USES_OFF= lua --- w/games/naev/Makefile +++ w/games/naev/Makefile @@ -3,7 +3,7 @@ PORTNAME= naev PORTVERSION= 0.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ @@ -58,6 +58,10 @@ SDL2_CONFIGURE_WITH= sdl2 SDL2_USE= SDL=sdl2 SDL2_USE_OFF= SDL=sdl +post-patch: + @${REINPLACE_CMD} -e 's| luaL_reg| luaL_Reg|' -e 's|luaL_Register|luaL_register|' \ + ${WRKSRC}/src/*.c + .include .if ${COMPILER_TYPE} == "gcc" --- w/lang/luajit/Makefile +++ w/lang/luajit/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= luajit -DISTVERSION= 2.0.5 -PORTREVISION= 2 +DISTVERSION= 2.1.0-beta3 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://luajit.org/download/ DISTNAME= LuaJIT-${DISTVERSION} @@ -11,15 +11,14 @@ DISTNAME= LuaJIT-${DISTVERSION} MAINTAINER= osa@FreeBSD.org COMMENT= Just-In-Time Compiler for Lua -BROKEN_aarch64= fails to compile: lj_arch.h:55:2: No support for this architecture (yet) -BROKEN_powerpc64= not ported to powerpc64 upstream - WRKSRC= ${WRKDIR}/LuaJIT-${DISTVERSION} USES= gmake USE_LDCONFIG= yes MAKE_ARGS= CC=${CC} -PLIST_SUB+= VERSION=${DISTVERSION} +PLIST_SUB+= VERSION=${DISTVERSION} LIBVERSION=${DISTVERSION:C/-.*//} + +BROKEN_powerpc64= Not ported to powerpc64 upstream .include --- w/lang/luajit/distinfo +++ w/lang/luajit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1493823315 -SHA256 (LuaJIT-2.0.5.tar.gz) = 874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979 -SIZE (LuaJIT-2.0.5.tar.gz) = 849845 +TIMESTAMP = 1516470480 +SHA256 (LuaJIT-2.1.0-beta3.tar.gz) = 1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3 +SIZE (LuaJIT-2.1.0-beta3.tar.gz) = 1025180 --- w/lang/luajit/files/patch-src_Makefile +++ w/lang/luajit/files/patch-src_Makefile @@ -22,8 +22,8 @@ # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute # the binaries to a different machine you could also use: -march=native # --CCOPT_x86= -march=i686 -+#CCOPT_x86= -march=i686 +-CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse ++#CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse CCOPT_x64= CCOPT_arm= CCOPT_ppc= --- w/lang/luajit/pkg-plist +++ w/lang/luajit/pkg-plist @@ -1,25 +1,31 @@ bin/luajit bin/luajit-%%VERSION%% -include/luajit-2.0/lauxlib.h -include/luajit-2.0/lua.h -include/luajit-2.0/lua.hpp -include/luajit-2.0/luaconf.h -include/luajit-2.0/luajit.h -include/luajit-2.0/lualib.h +include/luajit-2.1/lauxlib.h +include/luajit-2.1/lua.h +include/luajit-2.1/lua.hpp +include/luajit-2.1/luaconf.h +include/luajit-2.1/luajit.h +include/luajit-2.1/lualib.h lib/libluajit-5.1.a lib/libluajit-5.1.so lib/libluajit-5.1.so.2 -lib/libluajit-5.1.so.%%VERSION%% +lib/libluajit-5.1.so.%%LIBVERSION%% libdata/pkgconfig/luajit.pc share/luajit-%%VERSION%%/jit/bc.lua share/luajit-%%VERSION%%/jit/bcsave.lua share/luajit-%%VERSION%%/jit/dis_arm.lua +share/luajit-%%VERSION%%/jit/dis_arm64.lua +share/luajit-%%VERSION%%/jit/dis_arm64be.lua share/luajit-%%VERSION%%/jit/dis_mips.lua +share/luajit-%%VERSION%%/jit/dis_mips64.lua +share/luajit-%%VERSION%%/jit/dis_mips64el.lua share/luajit-%%VERSION%%/jit/dis_mipsel.lua share/luajit-%%VERSION%%/jit/dis_ppc.lua share/luajit-%%VERSION%%/jit/dis_x64.lua share/luajit-%%VERSION%%/jit/dis_x86.lua share/luajit-%%VERSION%%/jit/dump.lua +share/luajit-%%VERSION%%/jit/p.lua share/luajit-%%VERSION%%/jit/v.lua share/luajit-%%VERSION%%/jit/vmdef.lua +share/luajit-%%VERSION%%/jit/zone.lua man/man1/luajit.1.gz --- w/multimedia/obs-studio/Makefile +++ w/multimedia/obs-studio/Makefile @@ -2,7 +2,7 @@ PORTNAME= obs-studio DISTVERSION= 21.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org --- /dev/null +++ w/multimedia/obs-studio/files/patch-cmake_Modules_FindLuajit.cmake @@ -0,0 +1,10 @@ +--- cmake/Modules/FindLuajit.cmake.orig 2018-08-07 15:53:09 UTC ++++ cmake/Modules/FindLuajit.cmake +@@ -44,6 +44,7 @@ FIND_PATH(LUAJIT_INCLUDE_DIR + include/luajit-2.0 + luajit2.0 + include/luajit2.0 ++ include/luajit-2.1 + ) + + find_library(LUAJIT_LIB --- w/net-mgmt/fastnetmon/Makefile +++ w/net-mgmt/fastnetmon/Makefile @@ -4,7 +4,7 @@ PORTNAME= fastnetmon PORTVERSION= 1.1.3 DISTVERSIONPREFIX= v -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net-mgmt security MAINTAINER= farrokhi@FreeBSD.org --- /dev/null +++ w/net-mgmt/fastnetmon/files/patch-luajit-2.1 @@ -0,0 +1,22 @@ +--- src/fast_library.h.orig 2018-08-07 15:43:24 UTC ++++ src/fast_library.h +@@ -25,7 +25,7 @@ + #include "libpatricia/patricia.h" + + #ifdef ENABLE_LUA_HOOKS +-#include ++#include + #endif + + #define TCP_FIN_FLAG_SHIFT 1 +--- src/netflow_plugin/netflow_collector.cpp.orig 2018-08-07 15:43:50 UTC ++++ src/netflow_plugin/netflow_collector.cpp +@@ -28,7 +28,7 @@ + #include "log4cpp/Priority.hh" + + #ifdef ENABLE_LUA_HOOKS +-#include ++#include + #endif + + #ifdef ENABLE_LUA_HOOKS --- w/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure +++ w/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure @@ -14,7 +14,7 @@ test_paths= ;; #( yes) : - test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #( -+ test_paths="%%PREFIX%%/include/luajit-2.0" ;; #( ++ test_paths="%%PREFIX%%/include/luajit-2.1" ;; #( *) : test_paths="${with_lua}" ;; esac --- w/www/nginx/Makefile +++ w/www/nginx/Makefile @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.14.0 -PORTREVISION?= 11 +PORTREVISION?= 12 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ --- w/www/nginx/Makefile.extmod +++ w/www/nginx/Makefile.extmod @@ -195,7 +195,7 @@ LET_CONFIGURE_ON= --add-module=${WRKSRC_let} LUA_IMPLIES= DEVEL_KIT LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit -LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \ +LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUAJIT_LIB=${LOCALBASE}/lib LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.13:lua LUA_VARS= DSO_EXTMODS+=lua