From nobody Thu Apr 28 11:36:03 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9A0A01AA83D0; Thu, 28 Apr 2022 11:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kptq73X69z3QhX; Thu, 28 Apr 2022 11:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651145763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHCqqtZInBDMMdyTjUvfIyKdDHhxBeNuydFZpg9YSt8=; b=Ymuntjdapgc4LmE6oPCMXSNRw+/kJ/fITwBAYMlsT+YScncmRfyjC9gG2Ax1r12WVsTfSO RYKllUFf9u+wVefSQzyAkXT6VH2HUSMnd/38KuWxB4hU1Wu+0ixh5IlAN8PEDGe6EXlyZs 8Tg5uduf95URpHpK5uhxrl72bsKozErUeKuP78LdzzL2ohcGXEM0xZDfDXTLIie6kX46hg YEY8CzrWf/cwnAHAPyHtTME3nabMFkiF612MVT0NYiRLwCHX8sCcXYD2iV/rF7sccfbqLj fREQ4YktuiMQYYcNx1u8aqpUXz+XmuV3bA8B/BqPvQJ21zeBhqq0SIx6/fVuZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4EE8017CF8; Thu, 28 Apr 2022 11:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23SBa3d1058731; Thu, 28 Apr 2022 11:36:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23SBa3Op058730; Thu, 28 Apr 2022 11:36:03 GMT (envelope-from git) Date: Thu, 28 Apr 2022 11:36:03 GMT Message-Id: <202204281136.23SBa3Op058730@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: db175a4b4710 - main - misc/lxi-tools: Update to 2.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db175a4b4710070ef3171eb66a2084cc8e727b5a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651145763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHCqqtZInBDMMdyTjUvfIyKdDHhxBeNuydFZpg9YSt8=; b=vvCGZt7BOkazZlpRE3U/F8xemeiegs7PYBZzC6QwEjrHuafN0QNrNnQVcJYC9jStbyYMDU 5OtpTuPSIo+Qu6b90yxRKvEpgYjMrXG36Ykt5DUZo3i8RmBbnmJa5pQjpLZOR5epJBBBdH BccAaupE0HKcY+DordX6+vetFI4BtX9efzk3R87BsXWFGl+qaS2owH0pC83ZliBoNmjX8M qFnHuyILCLIw/re7GAsOhpwM0Aoh/u3VJHNuuFdQWqcHVMOYU2D7jad0pbcScnRsQT5tJk zhzgTQYx4LEC5x0gstd+eSVlflSBj+GUJwMShTvYkFgNb1WwK1X3SuYX0NGBzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651145763; a=rsa-sha256; cv=none; b=dl4s5M6735e4p+9RHWla9F8RnpGDU1pAUGRSFtWP0/PL/iSWuXK2QXsy5XCdjwxJooLaRE JgGJRFjLpVmUlOqN42/g6kCaKjGlLUb1o4Ocbr2AxNv7keRUCtKxnJosrTGKR6x5tv0y/R uIFw0VBs83v61Rnq0/zQdA4Kb7l63DdUq6DU4x77/vBsUVvfBuEmkQrUX8Bp4FZ4UPAIEM EYu7beht+sXMyDue/LHu83KP6WETNOYqmu3K0Vr2jAgVeb55ftr08hdC5In9Fk4mU9tIu4 pfIB+JFJXkqaZwM76tFd7TWwP/DUzO/6Vs8vtoi+P+QmETNf1syksBiDiO4Bhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=db175a4b4710070ef3171eb66a2084cc8e727b5a commit db175a4b4710070ef3171eb66a2084cc8e727b5a Author: Dmitri Goutnik AuthorDate: 2022-04-27 22:23:21 +0000 Commit: Dmitri Goutnik 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