efl, enlightenment-current, terminology: meson fixes

[kikadf <kikadf.01%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Wed Nov 11 10:02:00 2020 +0100
Changeset:	b70a58951e55ffce0a830a738daf4ed75b3a9533

Modified Files:
	efl/Makefile
	enlightenment-current/Makefile
	terminology/Makefile

Log Message:
efl, enlightenment-current, terminology: meson fixes

https://wiki.netbsd.org/pkgsrc/how_to_convert_autotools_to_meson/

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b70a58951e55ffce0a830a738daf4ed75b3a9533

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 efl/Makefile                   | 12 ++++--------
 enlightenment-current/Makefile |  1 -
 terminology/Makefile           |  3 +--
 3 files changed, 5 insertions(+), 11 deletions(-)

diffs:
diff --git a/efl/Makefile b/efl/Makefile
index 78561d80d8..4bda5df386 100644
--- a/efl/Makefile
+++ b/efl/Makefile
@@ -32,7 +32,6 @@ MESON_ARGS+=	-Dbuild-examples=false
 #MESON_ARGS+=	-Dv4l2=false
 MESON_ARGS+=	-Dphysics=true
 
-USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS=		pkg-config
 ICON_THEMES=		yes
@@ -57,8 +56,10 @@ REPLACE_PYTHON+=	src/bin/exactness/exactness_record.in
 BUILD_DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 .if ${X11_TYPE} != "modular"
+
 SUBST_CLASSES+=			fix-options
 SUBST_MESSAGE.fix-options=	Fixing meson opengl options
 SUBST_STAGE.fix-options=	pre-configure
@@ -66,15 +67,14 @@ SUBST_FILES.fix-options=	meson_options.txt
 SUBST_SED.fix-options=		-e "s|'es-egl', 'none'|'es-egl', 'base', 'none'|g"
 
 MESON_ARGS+=	-Dopengl=base
-.endif
 
-.include "options.mk"
+.else
 
-.if ${X11_TYPE} == "modular"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
+
 .endif
 
 .include "../../audio/pulseaudio/buildlink3.mk"
@@ -86,7 +86,6 @@ MESON_ARGS+=	-Dopengl=base
 .include "../../graphics/libraw/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
-#.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../inputmethod/scim/buildlink3.mk"
 .include "../../lang/LuaJIT2/buildlink3.mk"
@@ -97,10 +96,7 @@ MESON_ARGS+=	-Dopengl=base
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
-#.include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
-#.include "../../x11/libXinerama/buildlink3.mk"
-#.include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/enlightenment-current/Makefile b/enlightenment-current/Makefile
index 6c1aa770ba..b1d84fa86c 100644
--- a/enlightenment-current/Makefile
+++ b/enlightenment-current/Makefile
@@ -14,7 +14,6 @@ LICENSE=	2-clause-bsd
 
 CONFLICTS=	enlightenment-[0-9]*
 
-USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
 PKGCONFIG_OVERRIDE+=	src/modules/everything/everything.pc.in
diff --git a/terminology/Makefile b/terminology/Makefile
index 586f696d28..a9e81c0548 100644
--- a/terminology/Makefile
+++ b/terminology/Makefile
@@ -11,8 +11,7 @@ HOMEPAGE=	https://www.enlightenment.org/about-terminology
 COMMENT=	Enlightenment terminal
 LICENSE=	2-clause-bsd
 
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config intltool
+USE_TOOLS+=	pkg-config
 
 .include "../../devel/meson/build.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"