View | Details | Raw Unified | Return to bug 225342 | Differences between
and this patch

Collapse All | Expand All

(-)benchmarks/wrk/Makefile (-2 / +4 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	wrk
4
PORTNAME=	wrk
5
PORTVERSION=	4.1.0
5
PORTVERSION=	4.1.0
6
PORTREVISION=	1
6
CATEGORIES=	benchmarks www
7
CATEGORIES=	benchmarks www
7
8
8
MAINTAINER=	osa@FreeBSD.org
9
MAINTAINER=	osa@FreeBSD.org
Lines 12-24 LICENSE= APACHE20 Link Here
12
13
13
LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
14
LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
14
15
16
USES=		gmake ssl
17
15
USE_GITHUB=	yes
18
USE_GITHUB=	yes
16
GH_ACCOUNT=	wg
19
GH_ACCOUNT=	wg
17
20
18
USES=		gmake ssl
19
USE_CSTD=	c99
21
USE_CSTD=	c99
20
LLD_UNSAFE=	yes
22
LLD_UNSAFE=	yes
21
CFLAGS+=	-I${LOCALBASE}/include/luajit-2.0
23
CFLAGS+=	-I${LOCALBASE}/include/luajit-2.1
22
MAKE_ENV+=	WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}
24
MAKE_ENV+=	WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}
23
25
24
PLIST_FILES=	bin/wrk
26
PLIST_FILES=	bin/wrk
(-)databases/redis-devel/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	redis
4
PORTNAME=	redis
5
PORTVERSION=	6.0.0.20200228
5
PORTVERSION=	6.0.0.20200228
6
PORTREVISION=	1
6
CATEGORIES=	databases
7
CATEGORIES=	databases
7
PKGNAMESUFFIX=	-devel
8
PKGNAMESUFFIX=	-devel
8
9
(-)databases/redis-devel/files/extra-patch-src-Makefile.luajit (-1 / +1 lines)
Lines 33-39 Link Here
33
     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
33
     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
34
 endif
34
 endif
35
 
35
 
36
+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
36
+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
37
+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
37
+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
38
+
38
+
39
 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
39
 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
(-)databases/redis-devel/files/patch-deps_lua_src_lua__cjson.c (-1 / +15 lines)
Lines 1-4 Link Here
1
--- deps/lua/src/lua_cjson.c.orig	2019-09-25 10:40:18 UTC
1
LuaJIT implements a function from 5.2: https://github.com/LuaJIT/LuaJIT/issues/325
2
3
lua_cjson does not include luajit.h, so we can't check for luajit without a custom define.
4
WITH_LUAJIT is defined in the Makefile.luajit extra patch.
5
6
--- deps/lua/src/lua_cjson.c.orig	2018-08-07 16:21:12 UTC
2
+++ deps/lua/src/lua_cjson.c
7
+++ deps/lua/src/lua_cjson.c
3
@@ -46,7 +46,9 @@
8
@@ -46,7 +46,9 @@
4
 #include "strbuf.h"
9
 #include "strbuf.h"
Lines 10-12 Link Here
10
 
15
 
11
 #ifndef CJSON_MODNAME
16
 #ifndef CJSON_MODNAME
12
 #define CJSON_MODNAME   "cjson"
17
 #define CJSON_MODNAME   "cjson"
18
@@ -1292,7 +1294,7 @@ static int json_decode(lua_State *l)
19
 
20
 /* ===== INITIALISATION ===== */
21
 
22
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502
23
+#if !defined(WITH_LUAJIT) && (!defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502)
24
 /* Compatibility for Lua 5.1.
25
  *
26
  * luaL_setfuncs() is used to create a module table where the functions have
(-)databases/redis/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	redis
4
PORTNAME=	redis
5
PORTVERSION=	5.0.7
5
PORTVERSION=	5.0.7
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	databases
7
CATEGORIES=	databases
8
MASTER_SITES=	http://download.redis.io/releases/
8
MASTER_SITES=	http://download.redis.io/releases/
9
9
(-)databases/redis/files/extra-patch-src-Makefile.luajit (-1 / +1 lines)
Lines 33-39 Link Here
33
 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
33
 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
34
 endif
34
 endif
35
 
35
 
36
+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
36
+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1 -DWITH_LUAJIT
37
+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
37
+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
38
+
38
+
39
 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
39
 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
(-)databases/redis/files/patch-deps_lua_src_lua__cjson.c (-1 / +15 lines)
Lines 1-4 Link Here
1
--- deps/lua/src/lua_cjson.c.orig	2019-09-25 10:40:18 UTC
1
LuaJIT implements a function from 5.2: https://github.com/LuaJIT/LuaJIT/issues/325
2
3
lua_cjson does not include luajit.h, so we can't check for luajit without a custom define.
4
WITH_LUAJIT is defined in the Makefile.luajit extra patch.
5
6
--- deps/lua/src/lua_cjson.c.orig	2018-08-07 16:21:12 UTC
2
+++ deps/lua/src/lua_cjson.c
7
+++ deps/lua/src/lua_cjson.c
3
@@ -46,7 +46,9 @@
8
@@ -46,7 +46,9 @@
4
 #include "strbuf.h"
9
 #include "strbuf.h"
Lines 10-12 Link Here
10
 
15
 
11
 #ifndef CJSON_MODNAME
16
 #ifndef CJSON_MODNAME
12
 #define CJSON_MODNAME   "cjson"
17
 #define CJSON_MODNAME   "cjson"
18
@@ -1292,7 +1294,7 @@ static int json_decode(lua_State *l)
19
 
20
 /* ===== INITIALISATION ===== */
21
 
22
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502
23
+#if !defined(WITH_LUAJIT) && (!defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502)
24
 /* Compatibility for Lua 5.1.
25
  *
26
  * luaL_setfuncs() is used to create a module table where the functions have
(-)devel/lua-luarocks/Makefile (-1 / +2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	luarocks
3
PORTNAME=	luarocks
4
PORTVERSION=	3.3.1
4
PORTVERSION=	3.3.1
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
MASTER_SITES=	https://luarocks.org/releases/
7
MASTER_SITES=	https://luarocks.org/releases/
7
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
Lines 33-39 LUAJIT_RUN_DEPENDS= luajit:lang/luajit Link Here
33
LUAJIT_CONFIGURE_ON=	--lua-suffix=jit
34
LUAJIT_CONFIGURE_ON=	--lua-suffix=jit
34
LUAJIT_PLIST_SUB=	LUA_VER=${LUA_VER} \
35
LUAJIT_PLIST_SUB=	LUA_VER=${LUA_VER} \
35
			LUA_MODSHAREDIR=share/lua/${LUA_VER}
36
			LUA_MODSHAREDIR=share/lua/${LUA_VER}
36
LUAJIT_VARS=		LUA_INCDIR=${LOCALBASE}/include/luajit-2.0 \
37
LUAJIT_VARS=		LUA_INCDIR=${LOCALBASE}/include/luajit-2.1 \
37
			LUA_PKGNAMEPREFIX=lua51- \
38
			LUA_PKGNAMEPREFIX=lua51- \
38
			LUA_VER=5.1
39
			LUA_VER=5.1
39
LUAJIT_USES_OFF=	lua
40
LUAJIT_USES_OFF=	lua
(-)games/naev/Makefile (-1 / +5 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	naev
4
PORTNAME=	naev
5
PORTVERSION=	0.7.0
5
PORTVERSION=	0.7.0
6
PORTREVISION=	8
6
PORTREVISION=	9
7
CATEGORIES=	games
7
CATEGORIES=	games
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
9
9
Lines 62-67 SDL2_CONFIGURE_WITH= sdl2 Link Here
62
SDL2_USE=	SDL=sdl2
62
SDL2_USE=	SDL=sdl2
63
SDL2_USE_OFF=	SDL=sdl
63
SDL2_USE_OFF=	SDL=sdl
64
64
65
post-patch:
66
	@${REINPLACE_CMD} -e 's| luaL_reg| luaL_Reg|' -e 's|luaL_Register|luaL_register|' \
67
		${WRKSRC}/src/*.c
68
65
.include <bsd.port.pre.mk>
69
.include <bsd.port.pre.mk>
66
70
67
.if ${COMPILER_TYPE} == "gcc"
71
.if ${COMPILER_TYPE} == "gcc"
(-)lang/luajit/Makefile (-4 / +3 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	luajit
4
PORTNAME=	luajit
5
DISTVERSION=	2.0.5
5
DISTVERSION=	2.1.0-beta3
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	lang
7
CATEGORIES=	lang
8
MASTER_SITES=	https://luajit.org/download/
8
MASTER_SITES=	https://luajit.org/download/
9
DISTNAME=	LuaJIT-${DISTVERSION}
9
DISTNAME=	LuaJIT-${DISTVERSION}
Lines 15-21 LICENSE= MIT PD Link Here
15
LICENSE_COMB=	multi
15
LICENSE_COMB=	multi
16
LICENSE_FILE=	${WRKSRC}/COPYRIGHT
16
LICENSE_FILE=	${WRKSRC}/COPYRIGHT
17
17
18
IGNORE_aarch64=		fails to compile: lj_arch.h:55:2: No support for this architecture (yet)
19
IGNORE_powerpc64=	fails to compile: lj_arch.h:346:2: No support for PowerPC 64 bit mode
18
IGNORE_powerpc64=	fails to compile: lj_arch.h:346:2: No support for PowerPC 64 bit mode
20
19
21
CONFLICTS_INSTALL=	luajit-openresty
20
CONFLICTS_INSTALL=	luajit-openresty
Lines 25-31 USES= gmake Link Here
25
USE_LDCONFIG=	yes
24
USE_LDCONFIG=	yes
26
MAKE_ARGS=	CC=${CC}
25
MAKE_ARGS=	CC=${CC}
27
26
28
PLIST_SUB+=	VERSION=${DISTVERSION}
27
PLIST_SUB+=	VERSION=${DISTVERSION} LIBVERSION=${DISTVERSION:C/-.*//}
29
28
30
.include <bsd.port.options.mk>
29
.include <bsd.port.options.mk>
31
30
(-)lang/luajit/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1493823315
1
TIMESTAMP = 1516470480
2
SHA256 (LuaJIT-2.0.5.tar.gz) = 874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979
2
SHA256 (LuaJIT-2.1.0-beta3.tar.gz) = 1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3
3
SIZE (LuaJIT-2.0.5.tar.gz) = 849845
3
SIZE (LuaJIT-2.1.0-beta3.tar.gz) = 1025180
(-)lang/luajit/files/patch-src_Makefile (-2 / +2 lines)
Lines 22-29 Link Here
22
 # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute
22
 # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute
23
 # the binaries to a different machine you could also use: -march=native
23
 # the binaries to a different machine you could also use: -march=native
24
 #
24
 #
25
-CCOPT_x86= -march=i686
25
-CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
26
+#CCOPT_x86= -march=i686
26
+#CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
27
 CCOPT_x64=
27
 CCOPT_x64=
28
 CCOPT_arm=
28
 CCOPT_arm=
29
 CCOPT_ppc=
29
 CCOPT_ppc=
(-)lang/luajit/pkg-plist (-7 / +13 lines)
Lines 1-25 Link Here
1
bin/luajit
1
bin/luajit
2
bin/luajit-%%VERSION%%
2
bin/luajit-%%VERSION%%
3
include/luajit-2.0/lauxlib.h
3
include/luajit-2.1/lauxlib.h
4
include/luajit-2.0/lua.h
4
include/luajit-2.1/lua.h
5
include/luajit-2.0/lua.hpp
5
include/luajit-2.1/lua.hpp
6
include/luajit-2.0/luaconf.h
6
include/luajit-2.1/luaconf.h
7
include/luajit-2.0/luajit.h
7
include/luajit-2.1/luajit.h
8
include/luajit-2.0/lualib.h
8
include/luajit-2.1/lualib.h
9
lib/libluajit-5.1.a
9
lib/libluajit-5.1.a
10
lib/libluajit-5.1.so
10
lib/libluajit-5.1.so
11
lib/libluajit-5.1.so.2
11
lib/libluajit-5.1.so.2
12
lib/libluajit-5.1.so.%%VERSION%%
12
lib/libluajit-5.1.so.%%LIBVERSION%%
13
libdata/pkgconfig/luajit.pc
13
libdata/pkgconfig/luajit.pc
14
share/luajit-%%VERSION%%/jit/bc.lua
14
share/luajit-%%VERSION%%/jit/bc.lua
15
share/luajit-%%VERSION%%/jit/bcsave.lua
15
share/luajit-%%VERSION%%/jit/bcsave.lua
16
share/luajit-%%VERSION%%/jit/dis_arm.lua
16
share/luajit-%%VERSION%%/jit/dis_arm.lua
17
share/luajit-%%VERSION%%/jit/dis_arm64.lua
18
share/luajit-%%VERSION%%/jit/dis_arm64be.lua
17
share/luajit-%%VERSION%%/jit/dis_mips.lua
19
share/luajit-%%VERSION%%/jit/dis_mips.lua
20
share/luajit-%%VERSION%%/jit/dis_mips64.lua
21
share/luajit-%%VERSION%%/jit/dis_mips64el.lua
18
share/luajit-%%VERSION%%/jit/dis_mipsel.lua
22
share/luajit-%%VERSION%%/jit/dis_mipsel.lua
19
share/luajit-%%VERSION%%/jit/dis_ppc.lua
23
share/luajit-%%VERSION%%/jit/dis_ppc.lua
20
share/luajit-%%VERSION%%/jit/dis_x64.lua
24
share/luajit-%%VERSION%%/jit/dis_x64.lua
21
share/luajit-%%VERSION%%/jit/dis_x86.lua
25
share/luajit-%%VERSION%%/jit/dis_x86.lua
22
share/luajit-%%VERSION%%/jit/dump.lua
26
share/luajit-%%VERSION%%/jit/dump.lua
27
share/luajit-%%VERSION%%/jit/p.lua
23
share/luajit-%%VERSION%%/jit/v.lua
28
share/luajit-%%VERSION%%/jit/v.lua
24
share/luajit-%%VERSION%%/jit/vmdef.lua
29
share/luajit-%%VERSION%%/jit/vmdef.lua
30
share/luajit-%%VERSION%%/jit/zone.lua
25
man/man1/luajit.1.gz
31
man/man1/luajit.1.gz
(-)multimedia/obs-studio/Makefile (+1 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	obs-studio
3
PORTNAME=	obs-studio
4
DISTVERSION=	24.0.6
4
DISTVERSION=	24.0.6
5
PORTREVISION=	1
5
CATEGORIES=	multimedia
6
CATEGORIES=	multimedia
6
7
7
PATCH_SITES=	https://github.com/obsproject/${PORTNAME}/commit/
8
PATCH_SITES=	https://github.com/obsproject/${PORTNAME}/commit/
(-)net-mgmt/fastnetmon/Makefile (-1 / +1 lines)
Lines 4-10 Link Here
4
PORTNAME=	fastnetmon
4
PORTNAME=	fastnetmon
5
PORTVERSION=	1.1.4
5
PORTVERSION=	1.1.4
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
PORTREVISION=	2
7
PORTREVISION=	3
8
CATEGORIES=	net-mgmt security
8
CATEGORIES=	net-mgmt security
9
9
10
MAINTAINER=	farrokhi@FreeBSD.org
10
MAINTAINER=	farrokhi@FreeBSD.org
(-)net-mgmt/fastnetmon/files/patch-luajit-2.1 (+22 lines)
Added Link Here
1
--- src/fast_library.h.orig	2018-08-07 15:43:24 UTC
2
+++ src/fast_library.h
3
@@ -25,7 +25,7 @@
4
 #include "libpatricia/patricia.h"
5
 
6
 #ifdef ENABLE_LUA_HOOKS
7
-#include <luajit-2.0/lua.hpp>
8
+#include <luajit-2.1/lua.hpp>
9
 #endif
10
 
11
 #define TCP_FIN_FLAG_SHIFT 1
12
--- src/netflow_plugin/netflow_collector.cpp.orig	2018-08-07 15:43:50 UTC
13
+++ src/netflow_plugin/netflow_collector.cpp
14
@@ -28,7 +28,7 @@
15
 #include "log4cpp/Priority.hh"
16
 
17
 #ifdef ENABLE_LUA_HOOKS
18
-#include <luajit-2.0/lua.hpp>
19
+#include <luajit-2.1/lua.hpp>
20
 #endif
21
 
22
 #ifdef ENABLE_LUA_HOOKS

Return to bug 225342