git: db175a4b4710 - main - misc/lxi-tools: Update to 2.1

The branch main has been updated by dmgk:

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

commit db175a4b4710070ef3171eb66a2084cc8e727b5a
Author:     Dmitri Goutnik <dmgk@FreeBSD.org>
AuthorDate: 2022-04-27 22:23:21 +0000
Commit:     Dmitri Goutnik <dmgk@FreeBSD.org>
CommitDate: 2022-04-28 11:30:23 +0000

    misc/lxi-tools: Update to 2.1
    
    Changes:        https://github.com/lxi-tools/lxi-tools/releases/tag/v2.1
---
 misc/lxi-tools/Makefile                 | 34 +++++++++++----------------------
 misc/lxi-tools/distinfo                 |  6 +++---
 misc/lxi-tools/files/patch-configure.ac | 15 ---------------
 misc/lxi-tools/pkg-plist                |  9 +++++++++
 4 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/misc/lxi-tools/Makefile b/misc/lxi-tools/Makefile
index 02be7a061157..8601e9456c4a 100644
--- a/misc/lxi-tools/Makefile
+++ b/misc/lxi-tools/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	lxi-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.21
-PORTREVISION=	1
+DISTVERSION=	2.1
 CATEGORIES=	misc
 
 MAINTAINER=	dmgk@FreeBSD.org
@@ -12,34 +11,23 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblxi.so:misc/liblxi
 
-USES=		autoreconf libtool localbase lua:52 pkgconfig readline
+USES=		meson lua:53 pkgconfig readline
 USE_GITHUB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-static \
-		--with-bash-completion-dir=${PREFIX}/etc/bash_completion.d
 
-PORTDOCS=	README
+PORTDOCS=	README.md
 
-PLIST_FILES=	bin/lxi \
-		etc/bash_completion.d/lxi \
-		etc/bash_completion.d/lxi.snap \
-		man/man1/lxi.1.gz
+OPTIONS_DEFINE=	BASH DOCS GUI
+OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	DOCS GUI
+BASH_MESON_ON=	-Dbashcompletiondir=${PREFIX}/etc/bash_completion.d
+BASH_MESON_OFF=	-Dbashcompletiondir=no
 
-GUI_USES=		gl qmake:no_env qt:5
-GUI_USE=		qt=core,gui,charts,widgets,buildtools_build,qmake_build gl=gl
-GUI_CONFIGURE_ENABLE=	lxi-gui
-GUI_CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${QT_LIBDIR}"
+GUI_USES=	gettext-tools gnome python:3.6+,build
+GUI_USE=	gnome=cairo,gdkpixbuf2,glib20,gtk40,gtksourceview5,libadwaita
+GUI_MESON_ON=	-Dgui=true
+GUI_BINARY_ALIAS=	python3=${PYTHON_CMD}
 GUI_PLIST_FILES=	bin/lxi-gui
 
-post-patch:
-	${REINPLACE_CMD} -e '/\$$(QTCHOOSER)/s/-qt=5//' \
-		${WRKSRC}/src/gui/lxi-gui/Makefile.am
-
-post-install-GUI-on:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lxi-gui
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/misc/lxi-tools/distinfo b/misc/lxi-tools/distinfo
index b4156ea6bf92..d21adc32d15b 100644
--- a/misc/lxi-tools/distinfo
+++ b/misc/lxi-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531400379
-SHA256 (lxi-tools-lxi-tools-v1.21_GH0.tar.gz) = 262a63812abad1dad2043bf515bd2e1d3b6beea4262bbf070547328fd6dc4848
-SIZE (lxi-tools-lxi-tools-v1.21_GH0.tar.gz) = 148819
+TIMESTAMP = 1651089052
+SHA256 (lxi-tools-lxi-tools-v2.1_GH0.tar.gz) = 3bad88f5b098bdbb8947e34b79eeb3b22c6f58380b348be0db8ae57c68b5d1da
+SIZE (lxi-tools-lxi-tools-v2.1_GH0.tar.gz) = 937946
diff --git a/misc/lxi-tools/files/patch-configure.ac b/misc/lxi-tools/files/patch-configure.ac
deleted file mode 100644
index 560f0abd2c47..000000000000
--- a/misc/lxi-tools/files/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.ac.orig	2018-05-06 16:07:56 UTC
-+++ configure.ac
-@@ -16,9 +16,9 @@ AC_CHECK_LIB([lxi], [lxi_connect], [], [
- 
- # Check for Lua 5.1 or newer
- lua_found=0
--PKG_CHECK_MODULES([lua], [lua5.3],[lua_found=1],[x=0])
--PKG_CHECK_MODULES([lua], [lua5.2],[lua_found=1],[x=0])
--PKG_CHECK_MODULES([lua], [lua5.1],[lua_found=1],[x=0])
-+PKG_CHECK_MODULES([lua], [lua-5.3],[lua_found=1],[x=0])
-+PKG_CHECK_MODULES([lua], [lua-5.2],[lua_found=1],[x=0])
-+PKG_CHECK_MODULES([lua], [lua-5.1],[lua_found=1],[x=0])
- PKG_CHECK_MODULES([lua], [lua >= 5.1],[lua_found=1],[x=0])
- if test $lua_found == 0
- then
diff --git a/misc/lxi-tools/pkg-plist b/misc/lxi-tools/pkg-plist
new file mode 100644
index 000000000000..eee89e6de7a4
--- /dev/null
+++ b/misc/lxi-tools/pkg-plist
@@ -0,0 +1,9 @@
+bin/lxi
+%%BASH%%etc/bash_completion.d/lxi
+%%BASH%%etc/bash_completion.d/lxi.snap
+man/man1/lxi.1.gz
+%%GUI%%share/applications/io.github.lxi-tools.lxi-gui.desktop
+%%GUI%%share/glib-2.0/schemas/io.github.lxi-tools.lxi-gui.gschema.xml
+%%GUI%%share/icons/hicolor/scalable/apps/io.github.lxi-tools.lxi-gui.svg
+%%GUI%%share/icons/hicolor/symbolic/apps/io.github.lxi-tools.lxi-gui-symbolic.svg
+%%GUI%%share/metainfo/io.github.lxi-tools.lxi-gui.appdata.xml