git: 470f0bf1c335 - main - devel/efl: Use USES=luajit (defaults to luajit-devel)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 15 Oct 2022 18:05:44 UTC
The branch main has been updated by adamw:
URL: https://cgit.FreeBSD.org/ports/commit/?id=470f0bf1c3353bca73e516f4053a29886f48d0fb
commit 470f0bf1c3353bca73e516f4053a29886f48d0fb
Author: Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2022-10-15 18:05:39 +0000
Commit: Adam Weinberger <adamw@FreeBSD.org>
CommitDate: 2022-10-15 18:05:39 +0000
devel/efl: Use USES=luajit (defaults to luajit-devel)
---
devel/efl/Makefile | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index a6e0d69f920a..1a9fc564d02f 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= efl
DISTVERSION= 1.26.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel enlightenment
MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/
DIST_SUBDIR= enlightenment
@@ -52,15 +52,9 @@ OPTIONS_GROUP_WAYLAND= WAYLAND
OPTIONS_SINGLE= CRYPTO ENGINE LUAL
OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS
OPTIONS_SINGLE_ENGINE= OPENGL OPENGLES NONE
-OPTIONS_SINGLE_LUAL= LUAJIT LUAJIT_OR LUALANG
+OPTIONS_SINGLE_LUAL= LUAJIT 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
@@ -76,7 +70,6 @@ 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
@@ -167,19 +160,13 @@ HEIF_LIB_DEPENDS= libheif.so:graphics/libheif
WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
-LUAJIT_BUILD_DEPENDS= luajit:lang/luajit
-LUAJIT_RUN_DEPENDS= luajit:lang/luajit
+LUAJIT_USES= luajit
LUAJIT_MESON_ON= -Dlua-interpreter=luajit
-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
+LUAJIT_PREVENTS= LUALANG
LUALANG_USES= lua:51,build,run
LUALANG_MESON_ON= -Dlua-interpreter=lua
-LUALANG_PREVENTS= LUAJIT LUAJIT_OR
+LUALANG_PREVENTS= LUAJIT
OPENGL_USES= gl
OPENGL_USE= GL=gl