Attachment #195982 for bug #225342

Lines 3-8 Link Here

(-)w/benchmarks/wrk/Makefile (-1 / +2 lines)
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 17-23 GH_ACCOUNT= wg Link Here
17		18
18	USES= gmake ssl	19	USES= gmake ssl
19	LLD_UNSAFE= yes	20	LLD_UNSAFE= yes
20	CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH -I/${LOCALBASE}/include/luajit-2.0	21	CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH -I/${LOCALBASE}/include/luajit-2.1
21	MAKE_ENV+= WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}	22	MAKE_ENV+= WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}
22		23
23	PLIST_FILES= bin/wrk	24	PLIST_FILES= bin/wrk

Lines 3-8 Link Here

(-)w/databases/redis-devel/Makefile (+1 lines)
3		3
4	PORTNAME= redis	4	PORTNAME= redis
5	DISTVERSION= 5.0-rc4	5	DISTVERSION= 5.0-rc4
		6	PORTREVISION= 1
6	CATEGORIES= databases	7	CATEGORIES= databases
7	PKGNAMESUFFIX= -devel	8	PKGNAMESUFFIX= -devel
8		9

Lines 33-39 Link Here

(-)w/databases/redis-devel/files/extra-patch-src-Makefile.luajit (-1 / +1 lines)
33	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a	33	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
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)

Lines 1-5 Link Here

(-)w/databases/redis-devel/files/patch-src-lua_cjson.c (-2 / +16 lines)
1	--- deps/lua/src/lua_cjson.c.orig 2016-12-04 20:49:41.925218000 -0500	1	LuaJIT implements a function from 5.2: https://github.com/LuaJIT/LuaJIT/issues/325
2	+++ deps/lua/src/lua_cjson.c 2016-12-04 20:49:59.728885000 -0500	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
		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"
5	#include "fpconv.h"	10	#include "fpconv.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

Lines 3-8 Link Here

(-)w/databases/redis/Makefile (+1 lines)
3		3
4	PORTNAME= redis	4	PORTNAME= redis
5	DISTVERSION= 4.0.11	5	DISTVERSION= 4.0.11
		6	PORTREVISION= 1
6	CATEGORIES= databases	7	CATEGORIES= databases
7	MASTER_SITES= http://download.redis.io/releases/	8	MASTER_SITES= http://download.redis.io/releases/
8		9

Lines 33-39 Link Here

(-)w/databases/redis/files/extra-patch-src-Makefile.luajit (-1 / +1 lines)
33	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a	33	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
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)

Lines 1-5 Link Here

(-)w/databases/redis/files/patch-src-lua_cjson.c (-2 / +16 lines)
1	--- deps/lua/src/lua_cjson.c.orig 2016-12-04 20:49:41.925218000 -0500	1	LuaJIT implements a function from 5.2: https://github.com/LuaJIT/LuaJIT/issues/325
2	+++ deps/lua/src/lua_cjson.c 2016-12-04 20:49:59.728885000 -0500	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
		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"
5	#include "fpconv.h"	10	#include "fpconv.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

Lines 3-9 Link Here

(-)w/devel/love/Makefile (-1 / +5 lines)
3		3
4	PORTNAME= love	4	PORTNAME= love
5	PORTVERSION= 0.10.2	5	PORTVERSION= 0.10.2
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= devel games	7	CATEGORIES= devel games
8	MASTER_SITES= https://bitbucket.org/rude/love/downloads/ \	8	MASTER_SITES= https://bitbucket.org/rude/love/downloads/ \
9	http://mirror.amdmi3.ru/distfiles/	9	http://mirror.amdmi3.ru/distfiles/
Lines 45-50 LUAJIT_CONFIGURE_OFF= --with-lua=lua \ Link Here
45	--with-luaversion="${LUA_VER}"	45	--with-luaversion="${LUA_VER}"
46	LUAJIT_CONFIGURE_ENV_OFF=LUA_EXECUTABLE="${LUA_CMD}"	46	LUAJIT_CONFIGURE_ENV_OFF=LUA_EXECUTABLE="${LUA_CMD}"
47		47
		48	post-patch-LUAJIT-on:
		49	@${REINPLACE_CMD} -e 's\|luaL_reg\|luaL_Reg\|' \
		50	${WRKSRC}/src/libraries/luasocket/libluasocket/*
		51
48	post-patch-LUAJIT-off:	52	post-patch-LUAJIT-off:
49	@${REINPLACE_CMD} -e 's\|$${with_lua}$${with_luaversion}\|$${with_lua}-$${with_luaversion}\|g' \	53	@${REINPLACE_CMD} -e 's\|$${with_lua}$${with_luaversion}\|$${with_lua}-$${with_luaversion}\|g' \
50	${WRKSRC}/configure	54	${WRKSRC}/configure

Lines 3-8 Link Here

(-)w/devel/lua-luarocks/Makefile (-1 / +2 lines)
3	PORTNAME= luarocks	3	PORTNAME= luarocks
4	PORTVERSION= 2.4.4	4	PORTVERSION= 2.4.4
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
		6	PORTREVISION= 1
6	CATEGORIES= devel	7	CATEGORIES= devel
7	PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
8		9
Lines 34-40 LUAJIT_RUN_DEPENDS= luajit:lang/luajit Link Here
34	LUAJIT_CONFIGURE_ON= --lua-suffix=jit	35	LUAJIT_CONFIGURE_ON= --lua-suffix=jit
35	LUAJIT_PLIST_SUB= LUA_VER=${LUA_VER} \	36	LUAJIT_PLIST_SUB= LUA_VER=${LUA_VER} \
36	LUA_MODSHAREDIR=share/lua/${LUA_VER}	37	LUA_MODSHAREDIR=share/lua/${LUA_VER}
37	LUAJIT_VARS= LUA_INCDIR=${LOCALBASE}/include/luajit-2.0 \	38	LUAJIT_VARS= LUA_INCDIR=${LOCALBASE}/include/luajit-2.1 \
38	LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51-	39	LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51-
39	LUAJIT_USES_OFF= lua	40	LUAJIT_USES_OFF= lua
40		41

Lines 3-9 Link Here

(-)w/games/naev/Makefile (-1 / +5 lines)
3		3
4	PORTNAME= naev	4	PORTNAME= naev
5	PORTVERSION= 0.7.0	5	PORTVERSION= 0.7.0
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
9		9
Lines 58-63 SDL2_CONFIGURE_WITH= sdl2 Link Here
58	SDL2_USE= SDL=sdl2	58	SDL2_USE= SDL=sdl2
59	SDL2_USE_OFF= SDL=sdl	59	SDL2_USE_OFF= SDL=sdl
60		60
		61	post-patch:
		62	@${REINPLACE_CMD} -e 's\| luaL_reg\| luaL_Reg\|' -e 's\|luaL_Register\|luaL_register\|' \
		63	${WRKSRC}/src/*.c
		64
61	.include <bsd.port.pre.mk>	65	.include <bsd.port.pre.mk>
62		66
63	.if ${COMPILER_TYPE} == "gcc"	67	.if ${COMPILER_TYPE} == "gcc"




# $FreeBSD$

PORTNAME=	luajit
DISTVERSION=	2.1.0-beta3
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://luajit.org/download/
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} LIBVERSION=${DISTVERSION:C/-.*//}

BROKEN_powerpc64=	Not ported to powerpc64 upstream

.include <bsd.port.options.mk>


Lines 1-3 Link Here

(-)w/lang/luajit/distinfo (-3 / +3 lines)
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

Lines 22-29 Link Here

(-)w/lang/luajit/files/patch-src_Makefile (-2 / +2 lines)
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=

Lines 1-25 Link Here

(-)w/lang/luajit/pkg-plist (-7 / +13 lines)
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

Lines 2-8 Link Here

(-)w/multimedia/obs-studio/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= obs-studio	3	PORTNAME= obs-studio
4	DISTVERSION= 21.1.2	4	DISTVERSION= 21.1.2
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= multimedia	6	CATEGORIES= multimedia
7		7
8	MAINTAINER= yuri@FreeBSD.org	8	MAINTAINER= yuri@FreeBSD.org

Added Link Here

(-)w/multimedia/obs-studio/files/patch-cmake_Modules_FindLuajit.cmake (+10 lines)
1	--- cmake/Modules/FindLuajit.cmake.orig 2018-08-07 15:53:09 UTC
2	+++ cmake/Modules/FindLuajit.cmake
3	@@ -44,6 +44,7 @@ FIND_PATH(LUAJIT_INCLUDE_DIR
4	include/luajit-2.0
5	luajit2.0
6	include/luajit2.0
7	+ include/luajit-2.1
8	)
9
10	find_library(LUAJIT_LIB

Lines 4-10 Link Here

(-)w/net-mgmt/fastnetmon/Makefile (-1 / +1 lines)
4	PORTNAME= fastnetmon	4	PORTNAME= fastnetmon
5	PORTVERSION= 1.1.3	5	PORTVERSION= 1.1.3
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 9	7	PORTREVISION= 10
8	CATEGORIES= net-mgmt security	8	CATEGORIES= net-mgmt security
9		9
10	MAINTAINER= farrokhi@FreeBSD.org	10	MAINTAINER= farrokhi@FreeBSD.org




--- 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 <luajit-2.0/lua.hpp>
+#include <luajit-2.1/lua.hpp>
 #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 <luajit-2.0/lua.hpp>
+#include <luajit-2.1/lua.hpp>
 #endif
 
 #ifdef ENABLE_LUA_HOOKS

Lines 14-20 Link Here

(-)w/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure (-1 / +1 lines)
14	test_paths= ;; #(	14	test_paths= ;; #(
15	yes) :	15	yes) :
16	- test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #(	16	- test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #(
17	+ test_paths="%%PREFIX%%/include/luajit-2.0" ;; #(	17	+ test_paths="%%PREFIX%%/include/luajit-2.1" ;; #(
18	*) :	18	*) :
19	test_paths="${with_lua}" ;;	19	test_paths="${with_lua}" ;;
20	esac	20	esac

Lines 3-9 Link Here

(-)w/www/nginx/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= nginx	4	PORTNAME= nginx
5	PORTVERSION= 1.14.0	5	PORTVERSION= 1.14.0
6	PORTREVISION?= 11	6	PORTREVISION?= 12
7	PORTEPOCH= 2	7	PORTEPOCH= 2
8	CATEGORIES= www	8	CATEGORIES= www
9	MASTER_SITES= http://nginx.org/download/ \	9	MASTER_SITES= http://nginx.org/download/ \

Lines 195-201 LET_CONFIGURE_ON= --add-module=${WRKSRC_let} Link Here

(-)w/www/nginx/Makefile.extmod (-1 / +1 lines)
195		195
196	LUA_IMPLIES= DEVEL_KIT	196	LUA_IMPLIES= DEVEL_KIT
197	LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit	197	LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
198	LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \	198	LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
199	LUAJIT_LIB=${LOCALBASE}/lib	199	LUAJIT_LIB=${LOCALBASE}/lib
200	LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.13:lua	200	LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.13:lua
201	LUA_VARS= DSO_EXTMODS+=lua	201	LUA_VARS= DSO_EXTMODS+=lua

Return to bug 225342

Lines 2-9 Link Here

(-)w/lang/luajit/Makefile (-6 / +5 lines)
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= 2	6	PORTREVISION= 1
7	CATEGORIES= lang	7	CATEGORIES= lang
8	MASTER_SITES= http://luajit.org/download/	8	MASTER_SITES= http://luajit.org/download/
9	DISTNAME= LuaJIT-${DISTVERSION}	9	DISTNAME= LuaJIT-${DISTVERSION}
Lines 11-25 DISTNAME= LuaJIT-${DISTVERSION} Link Here
11	MAINTAINER= osa@FreeBSD.org	11	MAINTAINER= osa@FreeBSD.org
12	COMMENT= Just-In-Time Compiler for Lua	12	COMMENT= Just-In-Time Compiler for Lua
13		13
14	BROKEN_aarch64= fails to compile: lj_arch.h:55:2: No support for this architecture (yet)
15	BROKEN_powerpc64= not ported to powerpc64 upstream
16
17	WRKSRC= ${WRKDIR}/LuaJIT-${DISTVERSION}	14	WRKSRC= ${WRKDIR}/LuaJIT-${DISTVERSION}
18	USES= gmake	15	USES= gmake
19	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
20	MAKE_ARGS= CC=${CC}	17	MAKE_ARGS= CC=${CC}
21		18
22	PLIST_SUB+= VERSION=${DISTVERSION}	19	PLIST_SUB+= VERSION=${DISTVERSION} LIBVERSION=${DISTVERSION:C/-.*//}
		20
		21	BROKEN_powerpc64= Not ported to powerpc64 upstream
23		22
24	.include <bsd.port.options.mk>	23	.include <bsd.port.options.mk>
25		24

Added Link Here

(-)w/net-mgmt/fastnetmon/files/patch-luajit-2.1 (+22 lines)
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