git: df559c24e85b - 2022Q4 - devel/efl: Revert "Use USES=luajit (defaults to luajit-devel)"

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Tue, 08 Nov 2022 16:49:57 UTC
The branch 2022Q4 has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=df559c24e85b5ca62f695bc314f4a40c1047e813

commit df559c24e85b5ca62f695bc314f4a40c1047e813
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2022-11-08 11:14:33 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-11-08 16:49:32 +0000

    devel/efl: Revert "Use USES=luajit (defaults to luajit-devel)"
    
    This reverts commit 470f0bf1c3353bca73e516f4053a29886f48d0fb from main, which
    slipped into 2022Q4 when I cherry-picked an update for this port.
    
    Reported by:    pkg-fallout
---
 devel/efl/Makefile | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 729b187c0f80..0949c711799d 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -48,9 +48,15 @@ OPTIONS_GROUP_WAYLAND=	WAYLAND
 OPTIONS_SINGLE=		CRYPTO ENGINE LUAL
 OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
 OPTIONS_SINGLE_ENGINE=	OPENGL OPENGLES NONE
-OPTIONS_SINGLE_LUAL=	LUAJIT LUALANG
+OPTIONS_SINGLE_LUAL=	LUAJIT LUAJIT_OR LUALANG
 OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PULSEAUDIO EXAMPLES GSTREAMER V4L SCIM XIM \
 			OPENSSL OPENJPEG PDF PS RAW SVG WEBP XCF OPENGLES LUAJIT CXX
+OPTIONS_DEFAULT_aarch64=	LUALANG
+OPTIONS_DEFAULT_powerpc64=	LUAJIT_OR
+OPTIONS_DEFAULT_powerpc64le=	LUAJIT_OR
+OPTIONS_EXCLUDE_aarch64=	LUAJIT LUAJIT_OR
+OPTIONS_EXCLUDE_powerpc64=	LUAJIT
+OPTIONS_EXCLUDE_powerpc64le=	LUAJIT
 OPTIONS_SUB=		yes
 
 HARFBUZZ_DESC=		OpenType text shaping engine
@@ -66,6 +72,7 @@ XCF_DESC=		Gimp image format support
 LUAL_DESC=		LUA
 LUALANG_DESC=		Use Lua
 LUAJIT_DESC=		Use Luajit
+LUAJIT_OR_DESC=		Use Luajit from OpenResty fork (experimental)
 OPENGLES_DESC=		2D/3D rendering support via OpenGL ES
 NONE_DESC=		No acceleration, software only
 LUA_DESC=		Lua Bindings
@@ -168,13 +175,19 @@ WEBP_VARS_OFF=		webp_disabler=webp
 
 XCF_VARS_OFF=		xcf_disabler=xcf
 
-LUAJIT_USES=		luajit
+LUAJIT_BUILD_DEPENDS=		luajit:lang/luajit
+LUAJIT_RUN_DEPENDS=		luajit:lang/luajit
 LUAJIT_MESON_ON=	-Dlua-interpreter=luajit
-LUAJIT_PREVENTS=	LUALANG
+LUAJIT_PREVENTS=		LUALANG LUAJIT_OR
+
+LUAJIT_OR_BUILD_DEPENDS=		luajit:lang/luajit-openresty
+LUAJIT_OR_RUN_DEPENDS=		luajit:lang/luajit-openresty
+LUAJIT_OR_MESON_ON=		-Dlua-interpreter=luajit
+LUAJIT_OR_PREVENTS=		LUALANG LUAJIT
 
 LUALANG_USES=		lua:51,build,run
 LUALANG_MESON_ON=	-Dlua-interpreter=lua
-LUALANG_PREVENTS=	LUAJIT
+LUALANG_PREVENTS=		LUAJIT LUAJIT_OR
 
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl