devel/efl: Update to 1.24.3

multimedia/rage: Update to 0.3.1 x11-wm/enlightenment: Update to 0.24.1 x11/terminology: Update to 1.7.0 PR: 245594 Submitted by: Peter TKATCHENKO <peter@flytrace.com> Approved by: enlightenment (maintainer timeout)
svn path=/head/; revision=548076
2024-10-19 19:59:43 +00:00 · 2020-09-09 09:54:05 +00:00 · 2020-09-09 09:54:05 +00:00 · ce23e82aac · 2021-03-31 03:12:20 +00:00
commit ce23e82aac
parent ea04d48185
26 changed files with 370 additions and 3878 deletions
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@ -2,21 +2,18 @@
 # $FreeBSD$

 PORTNAME=	efl
-DISTVERSION=	1.20.7
-PORTREVISION=	27
+DISTVERSION=	1.24.3
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
 DIST_SUBDIR=	enlightenment

-PATCH_SITES=	https://github.com/Enlightenment/efl/commit/
-PATCHFILES=	fa97d86d0fa7301399f7b2b783c5de9b0c8d5ebe.patch:-p1
-
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment Foundation Libraries

 LICENSE=	BSD2CLAUSE LGPL21
 LICENSE_COMB=	multi

+BUILD_DEPENDS=	checkmk:devel/check
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
@ -24,179 +21,302 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdbus-1.so:devel/dbus \
 		libsndfile.so:audio/libsndfile
+RUN_DEPENDS=	update-mime-database:misc/shared-mime-info

 # lib/libeio.so.1
 CONFLICTS_INSTALL=	libeio

-GNU_CONFIGURE=	yes
-USES=		autoreconf compiler:c++14-lang gettext-tools gmake gnome iconv \
-		jpeg libtool pathfix pkgconfig python:2.7,run shared-mime-info \
+USES=		compiler:c++14-lang gettext-tools iconv \
+		jpeg libtool meson ninja ssl pathfix pkgconfig python:3.5+ shared-mime-info \
 		shebangfix tar:xz xorg
-SHEBANG_FILES=	src/scripts/eina/eina-bench-cmp
+SHEBANG_FILES=  src/tests/elementary/spec/generator.py \
+		src/bin/exactness/exactness_play.in \
+		src/bin/exactness/exactness_record.in
 USE_XORG=	x11 xcb xcursor xcomposite xdamage xext xfixes xi xinerama \
 		xrandr xrender xtst xscrnsaver
 USE_LDCONFIG=	yes

-CONFIGURE_ARGS=	--with-profile=release \
-		--enable-multisense \
-		--disable-systemd \
-		--disable-elput \
-		--disable-cserve \
-		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
+MESON_ARGS=	-Dsystemd=false -Deeze=false
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALLS_ICONS=	yes

 PLIST_SUB=	BRANCHVERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION}

-OPTIONS_DEFINE=		AVAHI FRIBIDI HARFBUZZ NLS PHYSICS PULSEAUDIO SSL WAYLAND WAYLAND_EGL
-OPTIONS_GROUP=		EMOTION INPUT LOADER
-OPTIONS_GROUP_EMOTION=	GSTREAMER LIBXINE V4L VLC
-OPTIONS_GROUP_INPUT=	IBUS SCIM
+OPTIONS_DEFINE=		AVAHI FRIBIDI HARFBUZZ NLS PHYSICS PULSEAUDIO SDL VNC EFLONE EXAMPLES DOXYGEN WAYLAND
+OPTIONS_GROUP=		EMOTION INPUT LOADER BINDINGS
+OPTIONS_GROUP_EMOTION=	GSTREAMER V4L
+OPTIONS_GROUP_INPUT=	IBUS SCIM XIM
 OPTIONS_GROUP_LOADER=	OPENJPEG PDF PS RAW SVG WEBP XCF
-OPTIONS_RADIO=		ENGINE
-OPTIONS_RADIO_ENGINE=	OPENGL OPENGLES SDL
-OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PHYSICS PULSEAUDIO SSL GSTREAMER PDF SVG OPENGL
+OPTIONS_GROUP_BINDINGS=	LUA CXX
+OPTIONS_GROUP_WAYLAND=	WAYLAND
+OPTIONS_SINGLE=		ENGINE LUAL
+OPTIONS_SINGLE_ENGINE=	OPENGL OPENGLES NONE
+OPTIONS_SINGLE_LUAL=	LUAJIT LUALANG
+OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PHYSICS PULSEAUDIO EFLONE EXAMPLES GSTREAMER V4L SCIM XIM \
+			OPENJPEG PDF PS RAW SVG WEBP XCF OPENGL LUAJIT CXX
+OPTIONS_DEFAULT_powerpc64=	FRIBIDI HARFBUZZ PHYSICS PULSEAUDIO EFLONE EXAMPLES GSTREAMER V4L SCIM XIM \
+				OPENJPEG PDF PS RAW SVG WEBP XCF OPENGL LUALANG CXX
+OPTIONS_DEFAULT_sparc64=	FRIBIDI HARFBUZZ PHYSICS PULSEAUDIO EFLONE EXAMPLES GSTREAMER V4L SCIM XIM \
+				OPENJPEG PDF PS RAW SVG WEBP XCF OPENGL LUALANG CXX
+OPTIONS_DEFAULT_aarch64=	FRIBIDI HARFBUZZ PHYSICS PULSEAUDIO EFLONE EXAMPLES GSTREAMER V4L SCIM XIM \
+				OPENJPEG PDF PS RAW SVG WEBP XCF OPENGL LUALANG CXX
+OPTIONS_EXCLUDE_powerpc64=	LUAJIT
+OPTIONS_EXCLUDE_sparc64=	LUAJIT
+OPTIONS_EXCLUDE_aarch64=	LUAJIT
+OPTIONS_EXCLUDE_powerpc64=	LUA
+OPTIONS_EXCLUDE_sparc64=	LUA
+OPTIONS_EXCLUDE_aarch64=	LUA
 OPTIONS_SUB=		yes

 HARFBUZZ_DESC=		OpenType text shaping engine
-PHYSICS_DESC=		Physics effects
-WAYLAND_DESC=		Wayland backend support
-WAYLAND_EGL_DESC=	Wayland-EGL backend support
-VLC_DESC=		Multimedia support by VLC
+PHYSICS_DESC=		Physics engine (bullet)
+EFLONE_DESC=		Create EFL-One library (single file library)
+VNC_DESC=		VNC Server support
 IBUS_DESC=		Intelligent Input Bus
 SCIM_DESC=		Smart Common Input Method
+XIM_DESC=		X Input Method
+SVG_DESC=		Vector graphics support
 XCF_DESC=		Gimp image format support
+LUAL_DESC=		LUA
+LUALANG_DESC=		Use Lua
+LUAJIT_DESC=		Use Luajit
 OPENGLES_DESC=		2D/3D rendering support via OpenGL ES
+NONE_DESC=		No acceleration, software only
+LUA_DESC=		Lua Bindings
+CXX_DESC=		C++ Bindings
+EXAMPLES_DESC=		Build examples of using EFL

-AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app
-AVAHI_CONFIGURE_ENABLE=		avahi
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
+AVAHI_MESON_TRUE=	avahi

-FRIBIDI_LIB_DEPENDS=		libfribidi.so:converters/fribidi
-FRIBIDI_CONFIGURE_ENABLE=	fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
+FRIBIDI_MESON_TRUE=	fribidi

-HARFBUZZ_LIB_DEPENDS=		libharfbuzz.so:print/harfbuzz
-HARFBUZZ_CONFIGURE_ENABLE=	harfbuzz
+HARFBUZZ_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
+HARFBUZZ_MESON_TRUE=	harfbuzz

 NLS_USES=			gettext-runtime
-NLS_CONFIGURE_ENABLE=		nls
+NLS_MESON_TRUE=			nls

 PHYSICS_LIB_DEPENDS=		libBulletDynamics.so:devel/bullet
-PHYSICS_CONFIGURE_ENABLE=	physics
+PHYSICS_MESON_TRUE=		physics

 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
-PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
+PULSEAUDIO_MESON_TRUE=		pulseaudio
+
+EFLONE_MESON_TRUE=		efl-one
+
+EXAMPLES_MESON_TRUE=		build-examples
+
+DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
+# PR 247427
+DOXYGEN_PREVENTS=		OPENJPEG
+DOXYGEN_PREVENTS_MSG=		devel/doxygen installs graphics/openjpeg15 which breaks build of all ports that depend on graphics/openjpeg
+
+VNC_MESON_TRUE=			vnc-server
+VNC_LIB_DEPENDS=		libvncserver.so:net/libvncserver

-WAYLAND_BROKEN=			ERROR: epoll_create() is deprecated, use epoll_create1(EPOLL_CLOEXEC).
 WAYLAND_BUILD_DEPENDS=		wayland-protocols>=1.7:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=		libepoll-shim.so:devel/libepoll-shim \
-				libxkbcommon.so:x11/libxkbcommon \
-				libwayland-client.so:graphics/wayland \
-				libwayland-cursor.so:graphics/wayland
+		libxkbcommon.so:x11/libxkbcommon \
+		libwayland-client.so:graphics/wayland \
+		libwayland-cursor.so:graphics/wayland
 WAYLAND_CFLAGS=			-I${LOCALBASE}/include/libepoll-shim
 WAYLAND_LDFLAGS=		-lepoll-shim
-WAYLAND_CONFIGURE_ENABLE=	wayland
-
-WAYLAND_EGL_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
-WAYLAND_EGL_CONFIGURE_ENABLE=	egl
-WAYLAND_EGL_USE=		GL=egl
-WAYLAND_EGL_IMPLIES=		WAYLAND OPENGLES
+# WL BROKEN: ../src/lib/ecore_wl2/ecore_wl2_buffer.c:20:10:
+# fatal error: 'linux/dma-buf.h' file not found
+# UNTIL FIXED WL-DEPRECATED IS ONLY POSSIBLE
+WAYLAND_MESON_TRUE=		wl

 GSTREAMER_USE=			GSTREAMER1=core
-GSTREAMER_CONFIGURE_ENABLE=	gstreamer1
-
-LIBXINE_LIB_DEPENDS=		libxine.so:multimedia/libxine
-LIBXINE_CONFIGURE_ENABLE=	xine
+GSTREAMER_MESON_TRUE=		gstreamer

 V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
-V4L_CONFIGURE_ENABLE=		v4l2
-
-VLC_LIB_DEPENDS=		libvlc.so:multimedia/vlc
-VLC_CONFIGURE_WITH=		generic_vlc
+V4L_MESON_TRUE=			v4l2

 IBUS_LIB_DEPENDS=		libibus-1.0.so:textproc/ibus
+IBUS_USES=			gnome
+IBUS_USE=			GNOME=glib20
+IBUS_MESON_TRUE=		glib

 SCIM_LIB_DEPENDS=		libscim-1.0.so:textproc/scim
-SCIM_CONFIGURE_ENABLE=		scim

-OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:graphics/openjpeg15
-OPENJPEG_CONFIGURE_ENABLE=	image-loader-jp2k
+OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
+# PR 247427
+OPENJPEG_PREVENTS=		DOXYGEN
+OPENJPEG_PREVENTS_MSG=		devel/doxygen installs graphics/openjpeg15 which breaks build of all ports that depend on graphics/openjpeg

 PDF_LIB_DEPENDS=		libpoppler.so:graphics/poppler
-PDF_CONFIGURE_ENABLE=		poppler

 PS_LIB_DEPENDS=			libspectre.so:print/libspectre
-PS_CONFIGURE_ENABLE=		spectre

 RAW_LIB_DEPENDS=		libraw.so:graphics/libraw
-RAW_CONFIGURE_ENABLE=		libraw

+SVG_USES=			gnome
 SVG_USE=			GNOME=cairo GNOME=librsvg2
-SVG_CONFIGURE_ENABLE=		librsvg

 WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
-WEBP_CONFIGURE_ENABLE=		image-loader-webp

-XCF_CONFIGURE_ENABLE=		xcf
+LUAJIT_BUILD_DEPENDS=		luajit:lang/luajit
+LUAJIT_RUN_DEPENDS=		luajit:lang/luajit
+LUAJIT_MESON_ON=		-Dlua-interpreter=luajit
+LUAJIT_PREVENTS=		LUALANG
+
+LUALANG_USES=			lua:51,build,run
+LUALANG_MESON_ON=		-Dlua-interpreter=lua
+LUALANG_PREVENTS=		LUAJIT

 OPENGL_USES=			gl
 OPENGL_USE=			GL=gl
+OPENGL_MESON_ON=		-Dopengl=full
+OPENGL_PREVENTS=		OPENGLES NONE

 OPENGLES_USES=			gl
 OPENGLES_USE=			GL=glesv2
-OPENGLES_CONFIGURE_ON=		--with-opengl=es --enable-egl
+OPENGLES_MESON_ON=		-Dopengl=es-egl
+OPENGLES_PREVENTS=		OPENGL NONE
+
+NONE_MESON_ON=			-Dopengl=none
+NONE_PREVENTS=			OPENGL OPENGLES

 SDL_USES=			sdl
 SDL_USE=			SDL=sdl2
-SDL_CONFIGURE_ENABLE=		sdl
+SDL_MESON_TRUE=			sdl

 .include <bsd.port.options.mk>

-.if ${PORT_OPTIONS:MPULSEAUDIO}
-PLIST_SUB+=			AUDIO=""
+ECORE-IMF-LOADERS-DISABLER-BASE=	-Decore-imf-loaders-disabler=
+ECORE-IMF-LOADERS-DISABLER:=		${ECORE-IMF-LOADERS-DISABLER-BASE}
+
+.if empty(PORT_OPTIONS:MIBUS)
+ECORE-IMF-LOADERS-DISABLER:=	"${ECORE-IMF-LOADERS-DISABLER-BASE}ibus"
+.endif
+
+.if empty(PORT_OPTIONS:MSCIM)
+.if ${ECORE-IMF-LOADERS-DISABLER} != ${ECORE-IMF-LOADERS-DISABLER-BASE}
+ECORE-IMF-LOADERS-DISABLER-BASE:=${ECORE-IMF-LOADERS-DISABLER}
+ECORE-IMF-LOADERS-DISABLER:=	"${ECORE-IMF-LOADERS-DISABLER-BASE},scim"
 .else
-CONFIGURE_ARGS+=		--disable-pulseaudio
-PLIST_SUB+=			AUDIO="@comment "
+ECORE-IMF-LOADERS-DISABLER:=	"${ECORE-IMF-LOADERS-DISABLER-BASE}scim"
+.endif
 .endif

-.if ${PORT_OPTIONS:MSSL}
-USES+=				ssl
+.if empty(PORT_OPTIONS:MXIM)
+.if ${ECORE-IMF-LOADERS-DISABLER} != ${ECORE-IMF-LOADERS-DISABLER-BASE}
+ECORE-IMF-LOADERS-DISABLER-BASE:=${ECORE-IMF-LOADERS-DISABLER}
+ECORE-IMF-LOADERS-DISABLER:=	"${ECORE-IMF-LOADERS-DISABLER-BASE},xim"
 .else
-CONFIGURE_ARGS+=		--with-crypto=none
+ECORE-IMF-LOADERS-DISABLER:=	"${ECORE-IMF-LOADERS-DISABLER-BASE}xim"
+.endif
 .endif

-.if ${PORT_OPTIONS:MIBUS}
-CONFIGURE_ARGS+=		--with-glib=yes
+MESON_ARGS+=			${ECORE-IMF-LOADERS-DISABLER}
+
+EVAS-LOADERS-DISABLER-BASE=	-Devas-loaders-disabler=
+EVAS-LOADERS-DISABLER:=		${EVAS-LOADERS-DISABLER-BASE}
+
+EVAS-LOADERS-DISABLER-BASE:=	${EVAS-LOADERS-DISABLER}
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE}json"
+
+.if empty(PORT_OPTIONS:MOPENJPEG)
+.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE}
+EVAS-LOADERS-DISABLER-BASE:=	${EVAS-LOADERS-DISABLER}
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE},jp2k"
 .else
-CONFIGURE_ARGS+=		--disable-ibus --with-glib=no
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE}jp2k"
+.endif
 .endif

-.if empty(PORT_OPTIONS:MOPENGL) && empty(PORT_OPTIONS:MOPENGLES)
-CONFIGURE_ARGS+=		--with-opengl=none
+.if empty(PORT_OPTIONS:MPDF)
+.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE}
+EVAS-LOADERS-DISABLER-BASE:=	${EVAS-LOADERS-DISABLER}
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE},pdf"
+.else
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE}pdf"
+.endif
 .endif

-# keep in sync with all platforms where libunwind is available
-.if (${ARCH} == amd64 || ${ARCH} == i386)
+.if empty(PORT_OPTIONS:MPS)
+.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE}
+EVAS-LOADERS-DISABLER-BASE:=	${EVAS-LOADERS-DISABLER}
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE},ps"
+.else
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE}ps"
+.endif
+.endif
+
+.if empty(PORT_OPTIONS:MRAW)
+.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE}
+EVAS-LOADERS-DISABLER-BASE:=	${EVAS-LOADERS-DISABLER}
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE},raw"
+.else
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE}raw"
+.endif
+.endif
+
+.if empty(PORT_OPTIONS:MSVG)
+.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE}
+EVAS-LOADERS-DISABLER-BASE:=	${EVAS-LOADERS-DISABLER}
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE},rsvg"
+.else
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE}rsvg"
+.endif
+.endif
+
+.if empty(PORT_OPTIONS:MWEBP)
+.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE}
+EVAS-LOADERS-DISABLER-BASE:=	${EVAS-LOADERS-DISABLER}
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE},webp"
+.else
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE}webp"
+.endif
+.endif
+
+.if empty(PORT_OPTIONS:MXCF)
+.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE}
+EVAS-LOADERS-DISABLER-BASE:=	${EVAS-LOADERS-DISABLER}
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE},xcf"
+.else
+EVAS-LOADERS-DISABLER:=		"${EVAS-LOADERS-DISABLER-BASE}xcf"
+.endif
+.endif
+
+MESON_ARGS+=			${EVAS-LOADERS-DISABLER}
+
+.if ${PORT_OPTIONS:MLUA} && ${PORT_OPTIONS:MCXX}
+EFL_BINDINGS=	-Dbindings=luajit,cxx
+.else
+.if ${PORT_OPTIONS:MLUA}
+EFL_BINDINGS=	-Dbindings=luajit
+.else
+.if ${PORT_OPTIONS:MCXX}
+EFL_BINDINGS=	-Dbindings=cxx
+.endif
+.endif
+.endif
+
+MESON_ARGS+=			${EFL_BINDINGS}
+
+.if ${PORT_OPTIONS:MOPENGLES} && ${PORT_OPTIONS:MWAYLAND}
+LIB_DEPENDS+=		libwayland-egl.so:graphics/wayland
+MESON_ARGS+=		-Degl=true
+USE_GL=			egl
+.endif
+
+.if (${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == aarch64)
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif

-.if ${ARCH:Mpowerpc*} || ${ARCH} == "sparc64"
-USES+=				lua
-CONFIGURE_ARGS+=		--enable-lua-old
-PLIST_SUB+=			ELUA="@comment "
-.else
-LIB_DEPENDS+=			libluajit-5.1.so:lang/luajit
-PLIST_SUB+=			ELUA=""
-.endif
-
 post-install:
-	@${RM} -r ${STAGEDIR}${PREFIX}/share/gdb
+	#@${RM} -r ${STAGEDIR}${PREFIX}/share/gdb
 	@for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \
-	    if ${FILE} $$i | ${GREP} -q "not stripped"; then ${STRIP_CMD} $$i; fi; \
+		if ${FILE} $$i | ${GREP} -q "not stripped"; then ${STRIP_CMD} $$i; fi; \
 	done
-	# workaround for https://phab.enlightenment.org/T6783 : it leaves an empty directory
-	@if [ -d ${STAGEDIR}${PREFIX}/lib/evas/utils -a -z "$$(ls -A ${STAGEDIR}${PREFIX}/lib/evas/utils)" ]; then \
-	    ${RMDIR} ${STAGEDIR}${PREFIX}/lib/evas/utils; \
-	fi
+
+post-stage:
+	@${ECHO_CMD} "autogenerating plist";
+	@cd ${STAGEDIR}${PREFIX} && ${FIND} * -type f -or -type l >> ${TMPPLIST}

 .include <bsd.port.mk>
--- a/devel/efl/distinfo
+++ b/devel/efl/distinfo
@ -1,7 +1,3 @@
-TIMESTAMP = 1598379985
-SHA256 (enlightenment/efl-1.20.7.tar.xz) = b0a9b765bcd7b012f1072da1d491fc8671aa089473f746901d93f5807a2c76fe
-SIZE (enlightenment/efl-1.20.7.tar.xz) = 65509444
-SHA256 (enlightenment/fa97d86d0fa7301399f7b2b783c5de9b0c8d5ebe.patch) = f19a221ed81936f69ae1c56f3495d6ffb7ce5453ceefe58ea8e4099a2741d3e9
-SIZE (enlightenment/fa97d86d0fa7301399f7b2b783c5de9b0c8d5ebe.patch) = 1359
-SHA256 (enlightenment/c245b576aad09ac5faeb800de7f7c4fef87c6363.patch) = c7aed047151a34a5afdc178f0d07fa9b262d17f7b7542e759d62556ee31321a9
-SIZE (enlightenment/c245b576aad09ac5faeb800de7f7c4fef87c6363.patch) = 10485
+TIMESTAMP = 1592479254
+SHA256 (enlightenment/efl-1.24.3.tar.xz) = de95c6e673c170c1e21382918b122417c091c643e7dcaced89aa785529625c2a
+SIZE (enlightenment/efl-1.24.3.tar.xz) = 72278592
--- a/devel/efl/files/patch-configure.ac
+++ b/devel/efl/files/patch-configure.ac
@ -1,28 +0,0 @@
--- configure.ac.orig	2017-08-16 09:52:10 UTC
-+++ configure.ac
-@@ -397,7 +397,8 @@ case "$build_crypto" in
-       ;;
- 
-    openssl)
-      EFL_DEPEND_PKG([crypto], [OPENSSL], [openssl])
-+      AC_DEFINE([HAVE_OPENSSL], [1], [Have OpenSSL])
-+      requirements_libs_crypto="-lssl -lcrypto ${requirements_libs_crypto}"
-       ;;
- esac
- AM_CONDITIONAL([HAVE_CRYPTO_GNUTLS], [test "${build_crypto}" = "gnutls"])
-@@ -466,7 +467,6 @@ AC_HEADER_TIME
- AC_CHECK_HEADERS([ \
- execinfo.h \
- mcheck.h \
-sys/inotify.h \
- sys/signalfd.h \
- sys/types.h \
- sys/param.h \
-@@ -4605,6 +4605,7 @@ EFL_ADD_LIBS([EIO], [-lm])
- ### Checks for linker characteristics
- 
- ### Checks for library functions
-+ac_cv_header_sys_inotify_h="no"
- have_inotify="${ac_cv_header_sys_inotify_h}"
- AM_CONDITIONAL([HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])
- 
--- a/devel/efl/files/patch-m4_efl.m4
+++ b/devel/efl/files/patch-m4_efl.m4
@ -1,11 +0,0 @@
--- m4/efl.m4.orig	2016-09-13 07:23:52 UTC
-+++ m4/efl.m4
-@@ -219,7 +219,7 @@ AC_DEFUN([EFL_CRYPTO_DEPEND],
- [dnl
- m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
- requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_crypto} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
-requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_crypto} ${requirements_pc_deps_[][]m4_defn([DOWNEFL])}"
-+requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_crypto}${requirements_pc_deps_crypto:+ }${requirements_pc_deps_[][]m4_defn([DOWNEFL])}"
- requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_crypto} ${requirements_libs_[][]m4_defn([DOWNEFL])}"
- requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_crypto} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
- m4_popdef([DOWNEFL])dnl
--- a/devel/efl/files/patch-src_Makefile.am
+++ b/devel/efl/files/patch-src_Makefile.am
@ -1,11 +0,0 @@
--- src/Makefile.am.orig	2018-03-11 23:21:21 UTC
-+++ src/Makefile.am
-@@ -207,7 +207,7 @@ $(if $(findstring unstable,$1),unstable,stable)
- endef
- 
- define protoname
-$(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
-+$(shell echo $1 | sed -E 's/([a-z\-]+)-[a-z]+-v[0-9]+/\1/')
- endef
- 
- #rules for generating protocol from wayland_protocols
--- a/devel/efl/files/patch-src_bin_elementary_testuiclock.c
+++ b/devel/efl/files/patch-src_bin_elementary_testuiclock.c
@ -1,141 +0,0 @@
-Partial backport of:
-	https://github.com/Enlightenment/efl/commit/c245b576aad09ac5faeb800de7f7c4fef87c6363
-
-EFL failed to build from source in Fedora Rawhide as a result of the update to GCC 10. GCC 10 enables -fno-common by default, and this found three issues in EFL:
-
-  # The eina benchmark code defined int key_size in a header that was included in multiple places.
-  # The elementary test code defines the "dt1", "dt2", "dt3" vars in two code files which are compiled together (but these variables do not appear to be used globally)
-  # The eio test code defines the "ee" var in two code files which are compiled together (but this variable does not appear to be used globally)
-
-I've fixed these issues and confirmed locally that the code builds again in Fedora.
-
-Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
-Differential Revision: https://phab.enlightenment.org/D11259
-
--- src/bin/elementary/test_ui_clock.c.orig	2020-08-25 18:28:31 UTC
-+++ src/bin/elementary/test_ui_clock.c
-@@ -5,7 +5,7 @@
- 
- /* A simple test, just displaying clock in its default format */
- 
-Evas_Object *dt1, *dt2, *dt3, *dt4;
-+Evas_Object *uicdt1, *uicdt2, *uicdt3, *uicdt4;
- 
- static void
- _changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
-@@ -27,19 +27,19 @@ _bt_clicked(void *data EINA_UNUSED, Evas_Object *obj, 
-    new_time.tm_mday = 26;
-    new_time.tm_hour = 9;
-    new_time.tm_min = 0;
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_TRUE);
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_TRUE);
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE);
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE);
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_TRUE);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_TRUE);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE);
- 
-   efl_ui_clock_value_set(dt1, &new_time);
-   elm_object_disabled_set(dt1, EINA_TRUE);
-+   efl_ui_clock_value_set(uicdt1, &new_time);
-+   elm_object_disabled_set(uicdt1, EINA_TRUE);
- 
-    elm_object_disabled_set(obj, EINA_TRUE);
-   evas_object_del(dt2);
-   evas_object_del(dt3);
-   dt2 = dt3 = NULL;
-+   evas_object_del(uicdt2);
-+   evas_object_del(uicdt3);
-+   uicdt2 = uicdt3 = NULL;
- }
- 
- void
-@@ -57,36 +57,36 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj
-    evas_object_show(bx);
-    evas_object_size_hint_min_set(bx, 360, 240);
- 
-   dt1 = efl_add(EFL_UI_CLOCK_CLASS, bx);
-   evas_object_size_hint_weight_set(dt1, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(dt1, EVAS_HINT_FILL, 0.5);
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE);
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE);
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE);
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE);
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_DAY, EINA_FALSE);
-   efl_ui_clock_pause_set(dt1, EINA_TRUE);
-   elm_box_pack_end(bx, dt1);
-   evas_object_smart_callback_add(dt1, "changed", _changed_cb, NULL);
-   evas_object_show(dt1);
-+   uicdt1 = efl_add(EFL_UI_CLOCK_CLASS, bx);
-+   evas_object_size_hint_weight_set(uicdt1, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-+   evas_object_size_hint_align_set(uicdt1, EVAS_HINT_FILL, 0.5);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_DAY, EINA_FALSE);
-+   efl_ui_clock_pause_set(uicdt1, EINA_TRUE);
-+   elm_box_pack_end(bx, uicdt1);
-+   evas_object_smart_callback_add(uicdt1, "changed", _changed_cb, NULL);
-+   evas_object_show(uicdt1);
- 
-   dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx);
-   evas_object_size_hint_weight_set(dt2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(dt2, EVAS_HINT_FILL, 0.5);
-   efl_ui_clock_field_visible_set(dt2, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE);
-   efl_ui_clock_field_visible_set(dt2, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE);
-   efl_ui_clock_field_visible_set(dt2, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE);
-   efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE);
-   elm_box_pack_end(bx, dt2);
-   efl_ui_clock_pause_set(dt2, EINA_TRUE);
-   elm_object_disabled_set(dt2, EINA_TRUE);
-   evas_object_show(dt2);
-+   uicdt2 = efl_add(EFL_UI_CLOCK_CLASS, bx);
-+   evas_object_size_hint_weight_set(uicdt2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-+   evas_object_size_hint_align_set(uicdt2, EVAS_HINT_FILL, 0.5);
-+   efl_ui_clock_field_visible_set(uicdt2, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE);
-+   efl_ui_clock_field_visible_set(uicdt2, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE);
-+   efl_ui_clock_field_visible_set(uicdt2, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE);
-+   efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE);
-+   elm_box_pack_end(bx, uicdt2);
-+   efl_ui_clock_pause_set(uicdt2, EINA_TRUE);
-+   elm_object_disabled_set(uicdt2, EINA_TRUE);
-+   evas_object_show(uicdt2);
- 
-   dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx);
-   evas_object_size_hint_weight_set(dt3, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(dt3, EVAS_HINT_FILL, 0.5);
-   elm_box_pack_end(bx, dt3);
-   evas_object_show(dt3);
-+   uicdt3 = efl_add(EFL_UI_CLOCK_CLASS, bx);
-+   evas_object_size_hint_weight_set(uicdt3, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-+   evas_object_size_hint_align_set(uicdt3, EVAS_HINT_FILL, 0.5);
-+   elm_box_pack_end(bx, uicdt3);
-+   evas_object_show(uicdt3);
- 
-    //editable
-    lb = efl_add(ELM_LABEL_CLASS, bx);
-@@ -99,13 +99,13 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj
-    elm_box_pack_end(bx, lb);
-    evas_object_show(lb);
- 
-   dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx);
-   evas_object_size_hint_weight_set(dt4, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(dt4, EVAS_HINT_FILL, 0.5);
-   efl_ui_clock_edit_mode_set(dt4, EINA_TRUE);
-   efl_ui_clock_pause_set(dt4, EINA_TRUE);
-   elm_box_pack_end(bx, dt4);
-   evas_object_show(dt4);
-+   uicdt4 = efl_add(EFL_UI_CLOCK_CLASS, bx);
-+   evas_object_size_hint_weight_set(uicdt4, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-+   evas_object_size_hint_align_set(uicdt4, EVAS_HINT_FILL, 0.5);
-+   efl_ui_clock_edit_mode_set(uicdt4, EINA_TRUE);
-+   efl_ui_clock_pause_set(uicdt4, EINA_TRUE);
-+   elm_box_pack_end(bx, uicdt4);
-+   evas_object_show(uicdt4);
- 
-    bt = elm_button_add(win);
-    elm_object_text_set(bt, "Back to the future...");
--- a/devel/efl/files/patch-src_lib_evas_Evas__GL.h
+++ b/devel/efl/files/patch-src_lib_evas_Evas__GL.h
@ -1,14 +0,0 @@
--- src/lib/evas/Evas_GL.h.orig	2019-03-28 16:30:04 UTC
-+++ src/lib/evas/Evas_GL.h
-@@ -4272,9 +4272,11 @@ typedef signed int       GLfixed;      // Changed khro
- 
- #ifndef GL_ES_VERSION_2_0
- /* GL types for handling large vertex buffer objects */
-+#ifndef GL_VERSION_1_5
- #include <stddef.h>
- typedef ptrdiff_t GLintptr;     // Changed khronos_intptr_t
- typedef ptrdiff_t GLsizeiptr;   // Changed khronos_ssize_t
-+#endif
- #endif
- 
- /* Some definitions from GLES 3.0.
--- a/devel/efl/pkg-plist
+++ b/devel/efl/pkg-plist
--- a/multimedia/rage/Makefile
+++ b/multimedia/rage/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	rage
-PORTVERSION=	0.3.0
-PORTREVISION=	4
+PORTVERSION=	0.3.1
 CATEGORIES=	multimedia enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/apps/${PORTNAME}/

--- a/multimedia/rage/distinfo
+++ b/multimedia/rage/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1531153713
-SHA256 (enlightenment/rage-0.3.0.tar.xz) = 1e772370c2199f89f4c34f1968432df4eabf0e4fe4f960649d0b9d27496bdf3d
-SIZE (enlightenment/rage-0.3.0.tar.xz) = 252852
+TIMESTAMP = 1594393604
+SHA256 (enlightenment/rage-0.3.1.tar.xz) = e5c434ef415ec1dd268399c527f582baeef39a25dee52f828876bfb58698cd11
+SIZE (enlightenment/rage-0.3.1.tar.xz) = 253360
--- a/multimedia/rage/pkg-plist
+++ b/multimedia/rage/pkg-plist
@ -1,5 +1,5 @@
 bin/rage
 lib/rage/utils/rage_thumb
 share/applications/rage.desktop
-share/icons/rage.png
+share/icons/hicolor/128x128/apps/rage.png
 %%DATADIR%%/themes/default.edj
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@ -311,6 +311,7 @@
    SUBDIR += etcmerge
    SUBDIR += etcupdate
    SUBDIR += evhz
+    SUBDIR += evisum
    SUBDIR += evtviewer
    SUBDIR += exa
    SUBDIR += exfat-utils
--- a/sysutils/evisum/Makefile
+++ b/sysutils/evisum/Makefile
@ -0,0 +1,21 @@
+# Created by: Peter TKATHENKO <peter@flytrace.com>
+# $FreeBSD$
+
+PORTNAME=	evisum
+PORTVERSION=	0.5.4
+CATEGORIES=	sysutils enlightenment
+MASTER_SITES=	http://download.enlightenment.org/rel/apps/${PORTNAME}/
+
+MAINTAINER=	enlightenment@FreeBSD.org
+COMMENT=	EFL process monitor and system monitor
+
+LICENSE=	BSD2CLAUSE
+
+LIB_DEPENDS=	libefl.so:devel/efl
+
+DIST_SUBDIR=	enlightenment
+USES=		compiler:c11 desktop-file-utils meson pkgconfig tar:xz
+
+PLIST_FILES=	"@(root,kmem,2755) bin/evisum"
+
+.include <bsd.port.mk>
--- a/sysutils/evisum/distinfo
+++ b/sysutils/evisum/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1598297193
+SHA256 (enlightenment/evisum-0.5.4.tar.xz) = ea86a49f4c058d323bc629458153b4b362ef9aaaa16ebca32ee499439ae0e3c6
+SIZE (enlightenment/evisum-0.5.4.tar.xz) = 919744
--- a/sysutils/evisum/files/patch-src_bin_meson.build
+++ b/sysutils/evisum/files/patch-src_bin_meson.build
@ -0,0 +1,8 @@
+--- src/bin/meson.build.orig	2020-08-23 16:03:57 UTC
+++ src/bin/meson.build
+@@ -18,5 +18,4 @@ executable('evisum', src,
+    install              : true)
+ 
+ if host_os == 'freebsd' or host_os == 'dragonfly'
+-   meson.add_install_script('perms.sh')
+ endif
--- a/sysutils/evisum/pkg-descr
+++ b/sysutils/evisum/pkg-descr
@ -0,0 +1,3 @@
+Evisum is a process monitor and system monitor written with Enlightenment Foundation Libraries.
+
+WWW: https://www.enlightenment.org/
--- a/sysutils/evisum/pkg-plist
+++ b/sysutils/evisum/pkg-plist
@ -0,0 +1,19 @@
+share/applications/evisum.desktop
+%%DATADIR%%/images/battery.png
+%%DATADIR%%/images/bug.png
+%%DATADIR%%/images/cancel.png
+%%DATADIR%%/images/decrease.png
+%%DATADIR%%/images/exit.png
+%%DATADIR%%/images/find.png
+%%DATADIR%%/images/go-down.png
+%%DATADIR%%/images/go-up.png
+%%DATADIR%%/images/increase.png
+%%DATADIR%%/images/kill.png
+%%DATADIR%%/images/ladyhand.png
+%%DATADIR%%/images/mount.png
+%%DATADIR%%/images/network.png
+%%DATADIR%%/images/sensor.png
+%%DATADIR%%/images/start.png
+%%DATADIR%%/images/stop.png
+%%DATADIR%%/images/window.png
+share/icons/hicolor/256x256/apps/evisum.png
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@ -2,53 +2,57 @@
 # $FreeBSD$

 PORTNAME=	enlightenment
-PORTVERSION=	0.22.4
-PORTREVISION=	1
+PORTVERSION=	0.24.1
 PORTEPOCH=	2
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/apps/${PORTNAME}/
 DIST_SUBDIR=	enlightenment

 MAINTAINER=	enlightenment@FreeBSD.org
-COMMENT=	Artistic X window manager
+COMMENT=	Artistic and fast X window manager

 LICENSE=	BSD2CLAUSE

 LIB_DEPENDS=	libefl.so:devel/efl \
-		libxcb-keysyms.so:x11/xcb-util-keysyms
+		libpulse.so:audio/pulseaudio

-BROKEN_sparc64=		Does not install on sparc64: signal 10
-
-GNU_CONFIGURE=	yes
-USES=		alias autoreconf compiler:c11 desktop-file-utils gettext-tools \
-		gmake iconv libtool pathfix pkgconfig tar:xz xorg
+USES=		compiler:c11 desktop-file-utils gettext-tools gnome \
+		meson ninja iconv libtool pathfix pkgconfig tar:xz xorg
 USE_XORG=	xcb
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
-SUB_FILES=	pkg-message

-CONFIGURE_ARGS=	--with-profile=MEDIUM_PC \
-		--disable-connman --disable-bluez4 \
-		--disable-device-udev --disable-mount-udisks
+MESON_ARGS=	-Dsystemd=false -Ddevice-udev=false \
+		-Dmount-udisks=false -Dmount-eeze=false -Dbluez5=false \
+		-Dconnman=false --sysconfdir=/usr/local/etc

-.include "Makefile.plist"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALLS_ICONS=	yes

 OPTIONS_DEFINE=		NLS
-OPTIONS_GROUP=		MIXER
-OPTIONS_GROUP_MIXER=	ALSA PULSEAUDIO
-OPTIONS_DEFAULT=	ALSA
 OPTIONS_SUB=		yes

 NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
+NLS_MESON_TRUE=		nls
+
+# MESON normalizes ${ARCH} so we cannot use it 'AS IS' without conversion
+CURRENT_ARCH=	${ARCH}
+.if ${CURRENT_ARCH} == amd64
+ENLIGHTENMENT_ARCH=     ${OPSYS:tl}-x86_64
+.else
+.if ${CURRENT_ARCH} == 'i386'
+ENLIGHTENMENT_ARCH=     ${OPSYS:tl}-x86
+.else
+.if ${CURRENT_ARCH} == 'aarch64'
+ENLIGHTENMENT_ARCH=     ${OPSYS:tl}-arm
+.else
+ENLIGHTENMENT_ARCH=     ${OPSYS:tl}-${CURRENT_ARCH}
+.endif
+.endif
+.endif
+
+ENLIGHTENMENT_VERSION=	0.24.1
+PLIST_SUB=              ENLIGHTENMENT_ARCH=${ENLIGHTENMENT_ARCH}-${ENLIGHTENMENT_VERSION}

-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-# why is setuid deactivated? "enlightenment_ckpasswd" i.e. does not work without setuid
-#post-patch:
-#	@${REINPLACE_CMD} -e \
-#		's/\(setuid_root_mode = a=rx,u+x\)s/\1/g' \
-#		${WRKSRC}/src/bin/Makefile.mk \
-#		${WRKSRC}/src/modules/Makefile_cpufreq.mk
-#
 .include <bsd.port.mk>
--- a/x11-wm/enlightenment/distinfo
+++ b/x11-wm/enlightenment/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1535472845
-SHA256 (enlightenment/enlightenment-0.22.4.tar.xz) = 59f4997c8b59457142870e40f137bc08c9735c84368d32213dacf09c4342fe79
-SIZE (enlightenment/enlightenment-0.22.4.tar.xz) = 25656972
+TIMESTAMP = 1593931006
+SHA256 (enlightenment/enlightenment-0.24.1.tar.xz) = aee2b6178c918d71ebe661129f4008d773e70e5784651dadbcf56eec0a6d4a09
+SIZE (enlightenment/enlightenment-0.24.1.tar.xz) = 28713452
--- a/x11-wm/enlightenment/files/patch-8392fc47.c
+++ b/x11-wm/enlightenment/files/patch-8392fc47.c
@ -1,35 +0,0 @@
-From 8392fc4769466700fc9644c734ad5b010be28655 Mon Sep 17 00:00:00 2001
-From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
-Date: Sun, 10 May 2020 18:11:43 +0100
-Subject: emix - fix symbols to point to correct extern sym
-
---
- src/modules/mixer/lib/emix.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-(limited to 'src/modules/mixer/lib/emix.c')
-
-diff --git a/src/modules/mixer/lib/emix.c b/src/modules/mixer/lib/emix.c
-index 65f9cb33f..cb8ea128b 100644
--- src/modules/mixer/lib/emix.c
-+++ src/modules/mixer/lib/emix.c
-@@ -5,12 +5,12 @@
- #include "emix.h"
- 
- #ifdef HAVE_PULSE
-E_API Emix_Backend *emix_backend_pulse_get(void);
-E_API const char    *emix_backend_pulse_name;
-+E_API Emix_Backend      *emix_backend_pulse_get(void);
-+E_API extern const char *emix_backend_pulse_name;
- #endif
- #ifdef HAVE_ALSA
-E_API Emix_Backend *emix_backend_alsa_get(void);
-E_API const char    *emix_backend_alsa_name;
-+E_API Emix_Backend      *emix_backend_alsa_get(void);
-+E_API extern const char *emix_backend_alsa_name;
- #endif
- 
- static int _log_domain;
-- 
-cgit v1.2.1
-
--- a/x11-wm/enlightenment/files/patch-src_modules_sysinfo_cpuclock_cpuclock__sysctl.c
+++ b/x11-wm/enlightenment/files/patch-src_modules_sysinfo_cpuclock_cpuclock__sysctl.c
@ -1,10 +0,0 @@
--- src/modules/sysinfo/cpuclock/cpuclock_sysctl.c.orig	2019-07-23 16:46:44 UTC
-+++ src/modules/sysinfo/cpuclock/cpuclock_sysctl.c
-@@ -2,6 +2,7 @@
- #include <stdlib.h>
- 
- #if defined(__FreeBSD__) || defined(__DragonFly__)
-+# include <sys/types.h>
- # include <sys/sysctl.h>
- #endif
- 
--- a/x11-wm/enlightenment/pkg-descr
+++ b/x11-wm/enlightenment/pkg-descr
@ -1,4 +1,3 @@
-A very artistic X window manager.  Among other attributes,
-Enlightenment makes for quite impressive screen shots.
+A very artistic and fast X window manager.

 WWW: https://www.enlightenment.org/
--- a/x11-wm/enlightenment/pkg-plist
+++ b/x11-wm/enlightenment/pkg-plist
@ -7,7 +7,9 @@ bin/enlightenment_open
 bin/enlightenment_remote
 bin/enlightenment_start
 %%ETCDIR%%/sysactions.conf
+%%ETCDIR%%/system.conf
 etc/xdg/menus/e-applications.menu
+include/enlightenment/config.h
 include/enlightenment/e.h
 include/enlightenment/e_Efx.h
 include/enlightenment/e_about.h
@ -129,6 +131,7 @@ include/enlightenment/e_slidesel.h
 include/enlightenment/e_spectrum.h
 include/enlightenment/e_startup.h
 include/enlightenment/e_sys.h
+include/enlightenment/e_system.h
 include/enlightenment/e_test.h
 include/enlightenment/e_theme.h
 include/enlightenment/e_theme_about.h
@ -173,6 +176,8 @@ include/enlightenment/e_zone.h
 include/enlightenment/e_zoomap.h
 include/enlightenment/evry_api.h
 include/enlightenment/evry_types.h
+lib/data/pkgconfig/enlightenment.pc
+lib/data/pkgconfig/everything.pc
 lib/enlightenment/modules/appmenu/e-module-appmenu.edj
 lib/enlightenment/modules/appmenu/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/appmenu/module.desktop
@ -221,13 +226,13 @@ lib/enlightenment/modules/conf_shelves/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/conf_shelves/module.desktop
 lib/enlightenment/modules/conf_theme/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/conf_theme/module.desktop
+lib/enlightenment/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj
 lib/enlightenment/modules/conf_window_manipulation/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/conf_window_manipulation/module.desktop
 lib/enlightenment/modules/conf_window_remembers/e-module-conf_window_remembers.edj
 lib/enlightenment/modules/conf_window_remembers/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/conf_window_remembers/module.desktop
 lib/enlightenment/modules/cpufreq/e-module-cpufreq.edj
-lib/enlightenment/modules/cpufreq/%%ENLIGHTENMENT_ARCH%%/freqset
 lib/enlightenment/modules/cpufreq/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/cpufreq/module.desktop
 lib/enlightenment/modules/everything/e-module-everything-start.edj
@ -274,15 +279,22 @@ lib/enlightenment/modules/packagekit/module.desktop
 lib/enlightenment/modules/pager/e-module-pager.edj
 lib/enlightenment/modules/pager/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/pager/module.desktop
-lib/enlightenment/modules/pager_plain/e-module-pager_plain.edj
-lib/enlightenment/modules/pager_plain/%%ENLIGHTENMENT_ARCH%%/module.so
-lib/enlightenment/modules/pager_plain/module.desktop
+lib/enlightenment/modules/polkit/e-module-polkit.edj
+lib/enlightenment/modules/polkit/%%ENLIGHTENMENT_ARCH%%/module.so
+lib/enlightenment/modules/polkit/module.desktop
 lib/enlightenment/modules/quickaccess/e-module-quickaccess.edj
 lib/enlightenment/modules/quickaccess/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/quickaccess/module.desktop
+lib/enlightenment/modules/shot/IndieFlower.ttf
+lib/enlightenment/modules/shot/Puk-Regular.ttf
+lib/enlightenment/modules/shot/Yantiq.ttf
 lib/enlightenment/modules/shot/e-module-shot.edj
 lib/enlightenment/modules/shot/%%ENLIGHTENMENT_ARCH%%/module.so
+lib/enlightenment/modules/shot/%%ENLIGHTENMENT_ARCH%%/upload
+lib/enlightenment/modules/shot/intuitive.ttf
 lib/enlightenment/modules/shot/module.desktop
+lib/enlightenment/modules/shot/shotedit.edj
+lib/enlightenment/modules/shot/shots.desktop
 lib/enlightenment/modules/start/e-module-start.edj
 lib/enlightenment/modules/start/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/start/module.desktop
@ -290,7 +302,6 @@ lib/enlightenment/modules/syscon/e-module-syscon.edj
 lib/enlightenment/modules/syscon/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/syscon/module.desktop
 lib/enlightenment/modules/sysinfo/e-module-sysinfo.edj
-lib/enlightenment/modules/sysinfo/%%ENLIGHTENMENT_ARCH%%/cpuclock_sysfs
 lib/enlightenment/modules/sysinfo/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/sysinfo/module.desktop
 lib/enlightenment/modules/systray/e-module-systray.edj
@ -311,6 +322,27 @@ lib/enlightenment/modules/tiling/module.desktop
 lib/enlightenment/modules/time/e-module-time.edj
 lib/enlightenment/modules/time/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/time/module.desktop
+lib/enlightenment/modules/vkbd/dicts/English_US.dic
+lib/enlightenment/modules/vkbd/dicts/English_US_Small.dic
+lib/enlightenment/modules/vkbd/e-module-vkbd.edj
+lib/enlightenment/modules/vkbd/%%ENLIGHTENMENT_ARCH%%/module.so
+lib/enlightenment/modules/vkbd/keyboards/Default.kbd
+lib/enlightenment/modules/vkbd/keyboards/Numbers.kbd
+lib/enlightenment/modules/vkbd/keyboards/Terminal.kbd
+lib/enlightenment/modules/vkbd/keyboards/alpha.png
+lib/enlightenment/modules/vkbd/keyboards/backspace.png
+lib/enlightenment/modules/vkbd/keyboards/down.png
+lib/enlightenment/modules/vkbd/keyboards/enter.png
+lib/enlightenment/modules/vkbd/keyboards/left.png
+lib/enlightenment/modules/vkbd/keyboards/numeric.png
+lib/enlightenment/modules/vkbd/keyboards/qwerty.png
+lib/enlightenment/modules/vkbd/keyboards/right.png
+lib/enlightenment/modules/vkbd/keyboards/shift.png
+lib/enlightenment/modules/vkbd/keyboards/spanner.png
+lib/enlightenment/modules/vkbd/keyboards/tab.png
+lib/enlightenment/modules/vkbd/keyboards/up.png
+lib/enlightenment/modules/vkbd/module.desktop
+lib/enlightenment/modules/vkbd/theme.edj
 lib/enlightenment/modules/winlist/e-module-winlist.edj
 lib/enlightenment/modules/winlist/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/winlist/module.desktop
@ -330,12 +362,12 @@ lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_030.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_040.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_050.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_060.so
-lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_065.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_070.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_080.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_090.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_100.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_110.so
+lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_115.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_120.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_130.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_150.so
@ -347,16 +379,14 @@ lib/enlightenment/modules/xkbswitch/e-module-xkbswitch.edj
 lib/enlightenment/modules/xkbswitch/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/xkbswitch/module.desktop
 lib/enlightenment/utils/enlightenment_alert
-lib/enlightenment/utils/enlightenment_backlight
 lib/enlightenment/utils/enlightenment_ckpasswd
 lib/enlightenment/utils/enlightenment_elm_cfgtool
 lib/enlightenment/utils/enlightenment_fm
 lib/enlightenment/utils/enlightenment_fm_op
-lib/enlightenment/utils/enlightenment_static_grabber
 lib/enlightenment/utils/enlightenment_sys
+lib/enlightenment/utils/enlightenment_system
 lib/enlightenment/utils/enlightenment_thumb
-libdata/pkgconfig/enlightenment.pc
-libdata/pkgconfig/everything.pc
+lib/enlightenment/utils/enlightenment_wallpaper_gen
 share/applications/emixer.desktop
 share/applications/enlightenment_askpass.desktop
 share/applications/enlightenment_filemanager.desktop
@ -381,6 +411,7 @@ share/applications/enlightenment_filemanager.desktop
 %%DATADIR%%/data/backgrounds/Mossstring.edj
 %%DATADIR%%/data/backgrounds/Motleyrock.edj
 %%DATADIR%%/data/backgrounds/Newgrowth.edj
+%%DATADIR%%/data/backgrounds/Ocean_Beach.edj
 %%DATADIR%%/data/backgrounds/Orange_Roses.edj
 %%DATADIR%%/data/backgrounds/Pattern_Radial.edj
 %%DATADIR%%/data/backgrounds/Pattern_Vertical.edj
@ -400,14 +431,6 @@ share/applications/enlightenment_filemanager.desktop
 %%DATADIR%%/data/backgrounds/Windy_Palm.edj
 %%DATADIR%%/data/config/default/e.cfg
 %%DATADIR%%/data/config/default/e_bindings.cfg
-%%DATADIR%%/data/config/default/enlightenment-default.png
-%%DATADIR%%/data/config/default/profile.desktop
-%%DATADIR%%/data/config/mobile/e.cfg
-%%DATADIR%%/data/config/mobile/e_bindings.cfg
-%%DATADIR%%/data/config/mobile/enlightenment-mobile.png
-%%DATADIR%%/data/config/mobile/module.battery.cfg
-%%DATADIR%%/data/config/mobile/module.conf.cfg
-%%DATADIR%%/data/config/mobile/profile.desktop
 %%DATADIR%%/data/config/profile.cfg
 %%DATADIR%%/data/config/standard/e.cfg
 %%DATADIR%%/data/config/standard/e_bindings.cfg
@ -538,6 +561,7 @@ share/applications/enlightenment_filemanager.desktop
 %%DATADIR%%/data/flags/uz_flag.png
 %%DATADIR%%/data/flags/vn_flag.png
 %%DATADIR%%/data/flags/za_flag.png
+%%DATADIR%%/data/fonts/Topaz_a500_v1.0.ttf
 %%DATADIR%%/data/icons/audio_player.png
 %%DATADIR%%/data/icons/audio_player2.png
 %%DATADIR%%/data/icons/image_viewer.png
@ -564,6 +588,15 @@ share/applications/enlightenment_filemanager.desktop
 %%DATADIR%%/doc/enlightenment.png
 %%DATADIR%%/doc/illume2.html
 %%DATADIR%%/doc/illume2.png
+share/icons/hicolor/128x128/apps/emixer.png
+share/icons/hicolor/512x512/apps/enlightenment.png
+share/icons/hicolor/512x512/apps/enlightenment_badge-symbolic.png
+share/icons/hicolor/512x512/places/enlightenment.png
+share/icons/hicolor/512x512/places/enlightenment_badge-symbolic.png
+share/icons/hicolor/scalable/apps/enlightenment.svg
+share/icons/hicolor/scalable/apps/enlightenment_badge-symbolic.svg
+share/icons/hicolor/scalable/places/enlightenment.svg
+share/icons/hicolor/scalable/places/enlightenment_badge-symbolic.svg
 %%NLS%%share/locale/ar/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/enlightenment.mo
@ -604,6 +637,5 @@ share/applications/enlightenment_filemanager.desktop
 %%NLS%%share/locale/vi/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/enlightenment.mo
-share/pixmaps/emixer.png
 share/pixmaps/enlightenment-askpass.png
 share/xsessions/enlightenment.desktop
--- a/x11/terminology/Makefile
+++ b/x11/terminology/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	terminology
-DISTVERSION=	1.6.0
+DISTVERSION=	1.7.0
 CATEGORIES=	x11 enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/apps/${PORTNAME}/
 DIST_SUBDIR=	enlightenment
--- a/x11/terminology/distinfo
+++ b/x11/terminology/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1586643390
-SHA256 (enlightenment/terminology-1.6.0.tar.xz) = b95cb05653afe0dad77fc038a8d5276c02a9c08d64ac97ddf0cee8087d27bd77
-SIZE (enlightenment/terminology-1.6.0.tar.xz) = 4893348
+TIMESTAMP = 1594392886
+SHA256 (enlightenment/terminology-1.7.0.tar.xz) = 88f5bc6e5d10cce1e38447a4984be88943b3d7ecbe24a83d7d8c246ea6b00a87
+SIZE (enlightenment/terminology-1.7.0.tar.xz) = 4922616
--- a/x11/terminology/pkg-plist
+++ b/x11/terminology/pkg-plist
@ -18,6 +18,7 @@ man/man1/tysend.1.gz
 share/applications/terminology.desktop
 share/icons/hicolor/128x128/apps/terminology.png
 share/locale/ca/LC_MESSAGES/terminology.mo
+share/locale/da/LC_MESSAGES/terminology.mo
 share/locale/de/LC_MESSAGES/terminology.mo
 share/locale/el/LC_MESSAGES/terminology.mo
 share/locale/eo/LC_MESSAGES/terminology.mo
@ -25,9 +26,12 @@ share/locale/es/LC_MESSAGES/terminology.mo
 share/locale/fi/LC_MESSAGES/terminology.mo
 share/locale/fr/LC_MESSAGES/terminology.mo
 share/locale/hi/LC_MESSAGES/terminology.mo
+share/locale/hr/LC_MESSAGES/terminology.mo
 share/locale/it/LC_MESSAGES/terminology.mo
 share/locale/ko/LC_MESSAGES/terminology.mo
 share/locale/ms/LC_MESSAGES/terminology.mo
+share/locale/nl/LC_MESSAGES/terminology.mo
+share/locale/pl/LC_MESSAGES/terminology.mo
 share/locale/sl/LC_MESSAGES/terminology.mo
 share/locale/sr/LC_MESSAGES/terminology.mo
 share/locale/tr/LC_MESSAGES/terminology.mo