From nobody Sun Aug 11 12:31:42 2024 X-Original-To: dev-commits-ports-main@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 4WhcTV4B05z5ShRq; Sun, 11 Aug 2024 12:31:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WhcTV29S0z4wkl; Sun, 11 Aug 2024 12:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723379502; 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=+fffqpg6dx7Qqrl6vYt7KcuO9hApl7Qux3ukCXzRM3E=; b=fE7D90NPdD4DAkHw5yZPxLEsFxi+2WT4iXk3ceVlwEw7M6+2RYC14Y478G7v0Etnzn8iVQ 4AnoS76R6nuEeOvzPtY089je01RjlGkCMNN8bc6XeKRzDW+vIGUebOjUlnGE+mVxKhJ1CX jv/pPu2px95FPTgEYt9cPjRH30nSutIY7rwdqMXGRpVHaeu7JNn1g3ddY6IhFJtiphbhNJ c2Zs2HEmA+OS5KwNy9lhzcGLrbLicesqfxxOhkYHlSL2l9fiRSqyUqCoRAfDc+O2WFhqwd ImlpkUxye+tUcXXassD1TluELfFv+4ZDN5z3LMm/DCbvmUJsccL5CFuc2/Jdpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723379502; a=rsa-sha256; cv=none; b=H+EPx5i15pUKhtvklptV13aMQVIIbYTcnuQwKgLDaq0n2YBcUrPOBUk6k6G2nnaaNF6oZF w80uQG2VFHnSphBURaUdnJsFfs4J7kdM/GQVh9JKpHfgqhYr8B23Bmm+ISpD7MoOYJeJ+7 ZVmMGOSTX75+AjySSPWwdLnd5mIGtgrt1ESVKBbp1s9sGk1yYtFhX0D1GlAPGqwzzf7R7R dnJ90ctlzlXRc13ABHttl/nHBCc00u97MQpVnKR0kRQV/ke/dR9MtaCOW3Tdhye1Z3EBPP hkr2YU54yCti9KIAQjyZSQ9SiCa/EuVjTfs3Vh6Y1moQw3tADzKpvceOwYtlag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723379502; 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=+fffqpg6dx7Qqrl6vYt7KcuO9hApl7Qux3ukCXzRM3E=; b=lx7nXzNhRhkFnw9Lun/3C2HnNDRYWRcX/P+jdmWtkax7DaxjYP2/GZ4A/+5T7Il4fYwqr1 ZkmOz5cByCbs0VmySowaam9e2qQa4IhmNxjLFFpB1rvkRYn5Fd76J7Qz7I6+UWLctMBI4n RlGFXyyrT8O99ClVf1ihCZsPEau4idtJmYvCLFgBzyPnFEZiKsVtZ+zCeRvqOJr1MLg0Ga 2XttR7CGAt3LbzbNmFw/X6hzk5un1dCn6EnSzctIJ9tCFQ7XfW3X2JUIZFIfOWyxLIM7pH S6Epq3sButfJaf7fj1q1iTQAUck4U1BBozW0qL/h8X1ecOJdhk4wrTBFb+uS1g== 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 4WhcTV1kNqzk22; Sun, 11 Aug 2024 12:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47BCVglI067410; Sun, 11 Aug 2024 12:31:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47BCVgoQ067407; Sun, 11 Aug 2024 12:31:42 GMT (envelope-from git) Date: Sun, 11 Aug 2024 12:31:42 GMT Message-Id: <202408111231.47BCVgoQ067407@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 5195f55b0806 - main - devel/iaito: add flavors qt5 and qt6, default qt6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5195f55b0806ef5d0775e3ff93a6782a6c0b469c Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=5195f55b0806ef5d0775e3ff93a6782a6c0b469c commit 5195f55b0806ef5d0775e3ff93a6782a6c0b469c Author: Vladimir Druzenko AuthorDate: 2024-08-11 12:27:12 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-11 12:27:12 +0000 devel/iaito: add flavors qt5 and qt6, default qt6 Add patch build flavor qt6 if qt5 is installed too. Upstream issue: https://github.com/radareorg/iaito/issues/173 PR: 278339 Approved by: Martin Filla (maintainer) --- devel/iaito/Makefile | 23 ++++++++++++++++++++--- devel/iaito/files/patch-configure | 11 +++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/devel/iaito/Makefile b/devel/iaito/Makefile index eef31254152c..2ef3c90f5acd 100644 --- a/devel/iaito/Makefile +++ b/devel/iaito/Makefile @@ -11,12 +11,29 @@ LICENSE= GPLv3 LIB_DEPENDS= libcapstone.so:devel/capstone \ libr_core.so:devel/radare2 -USES= desktop-file-utils gl gmake pkgconfig qmake:no_configure qt:5 +FLAVORS= qt5 qt6 +FLAVOR?= ${FLAVORS:[2]} +qt5_PKGNAMESUFFIX= -qt5 +qt6_PKGNAMESUFFIX= -qt6 + +USES= compiler:c++17-lang desktop-file-utils gl gmake pkgconfig \ + qmake:no_configure USE_GITHUB= yes GH_ACCOUNT= radareorg -USE_GL= gl -USE_QT= buildtools core gui linguisttools:build network svg widgets GNU_CONFIGURE= yes + +.if ${FLAVOR} == qt5 +USES+= qt:5 +USE_GL= gl +USE_QT= core gui network svg widgets \ + buildtools:build linguisttools:build qmake:build +.else +USES+= qt:6 +USE_GL= opengl +USE_QT= base svg +CONFIGURE_ARGS= --with-qmake6 +.endif + MAKE_ENV= DESTDIR=${STAGEDIR}${PREFIX} \ QMAKE_FLAGS="PREFIX=${STAGEDIR}${PREFIX}" diff --git a/devel/iaito/files/patch-configure b/devel/iaito/files/patch-configure new file mode 100644 index 000000000000..8b0ba0dce3f1 --- /dev/null +++ b/devel/iaito/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2024-05-24 00:09:14 UTC ++++ configure +@@ -470,7 +470,7 @@ QMAKE=""; fi + fi ; fi + if [ "$WANT_QMAKE6" = "1" ]; then + QMAKE=""; fi +-if [ "$HAVE_QMAKE" = "1" ]; then ++if [ "$HAVE_QMAKE" = "1" -a "$WANT_QMAKE6" != "1" ]; then + QMAKE_BIN="${QMAKE}" + else + if [ "$HAVE_QMAKE6" = "1" ]; then