--- benchmarks/wrk/Makefile +++ benchmarks/wrk/Makefile @@ -3,6 +3,7 @@ PORTNAME= wrk PORTVERSION= 4.1.0 +PORTREVISION= 1 CATEGORIES= benchmarks www MAINTAINER= osa@FreeBSD.org @@ -12,13 +13,14 @@ LICENSE= APACHE20 LIB_DEPENDS= libluajit-5.1.so:lang/luajit +USES= gmake ssl + USE_GITHUB= yes GH_ACCOUNT= wg -USES= gmake ssl USE_CSTD= c99 LLD_UNSAFE= yes -CFLAGS+= -I${LOCALBASE}/include/luajit-2.0 +CFLAGS+= -I${LOCALBASE}/include/luajit-2.1 MAKE_ENV+= WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION} PLIST_FILES= bin/wrk --- databases/redis-devel/Makefile +++ databases/redis-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= redis PORTVERSION= 6.0.0.20200228 +PORTREVISION= 1 CATEGORIES= databases PKGNAMESUFFIX= -devel --- databases/redis-devel/files/extra-patch-src-Makefile.luajit +++ databases/redis-devel/files/extra-patch-src-Makefile.luajit @@ -33,7 +33,7 @@ FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto endif -+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0 ++FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1 +FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) --- databases/redis-devel/files/patch-deps_lua_src_lua__cjson.c +++ databases/redis-devel/files/patch-deps_lua_src_lua__cjson.c @@ -1,4 +1,9 @@ ---- deps/lua/src/lua_cjson.c.orig 2019-09-25 10:40:18 UTC +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" @@ -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 --- databases/redis/Makefile +++ databases/redis/Makefile @@ -3,7 +3,7 @@ PORTNAME= redis PORTVERSION= 5.0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ --- databases/redis/files/extra-patch-src-Makefile.luajit +++ databases/redis/files/extra-patch-src-Makefile.luajit @@ -33,7 +33,7 @@ FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS) 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) --- databases/redis/files/patch-deps_lua_src_lua__cjson.c +++ databases/redis/files/patch-deps_lua_src_lua__cjson.c @@ -1,4 +1,9 @@ ---- deps/lua/src/lua_cjson.c.orig 2019-09-25 10:40:18 UTC +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" @@ -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 --- devel/lua-luarocks/Makefile +++ devel/lua-luarocks/Makefile @@ -2,6 +2,7 @@ PORTNAME= luarocks PORTVERSION= 3.3.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://luarocks.org/releases/ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -33,7 +34,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_PKGNAMEPREFIX=lua51- \ LUA_VER=5.1 LUAJIT_USES_OFF= lua --- games/naev/Makefile +++ games/naev/Makefile @@ -3,7 +3,7 @@ PORTNAME= naev PORTVERSION= 0.7.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ @@ -62,6 +62,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" --- lang/luajit/Makefile +++ lang/luajit/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= luajit -DISTVERSION= 2.0.5 -PORTREVISION= 4 +DISTVERSION= 2.1.0-beta3 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= https://luajit.org/download/ DISTNAME= LuaJIT-${DISTVERSION} @@ -15,7 +15,6 @@ LICENSE= MIT PD LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYRIGHT -IGNORE_aarch64= fails to compile: lj_arch.h:55:2: No support for this architecture (yet) IGNORE_powerpc64= fails to compile: lj_arch.h:346:2: No support for PowerPC 64 bit mode CONFLICTS_INSTALL= luajit-openresty @@ -25,7 +24,7 @@ USES= gmake USE_LDCONFIG= yes MAKE_ARGS= CC=${CC} -PLIST_SUB+= VERSION=${DISTVERSION} +PLIST_SUB+= VERSION=${DISTVERSION} LIBVERSION=${DISTVERSION:C/-.*//} .include --- lang/luajit/distinfo +++ 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 --- lang/luajit/files/patch-src_Makefile +++ 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= --- lang/luajit/pkg-plist +++ 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 --- multimedia/obs-studio/Makefile +++ multimedia/obs-studio/Makefile @@ -2,6 +2,7 @@ PORTNAME= obs-studio DISTVERSION= 24.0.6 +PORTREVISION= 1 CATEGORIES= multimedia PATCH_SITES= https://github.com/obsproject/${PORTNAME}/commit/ --- net-mgmt/fastnetmon/Makefile +++ net-mgmt/fastnetmon/Makefile @@ -4,7 +4,7 @@ PORTNAME= fastnetmon PORTVERSION= 1.1.4 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt security MAINTAINER= farrokhi@FreeBSD.org --- /dev/null +++ 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