Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Sep 2022 19:46:59 GMT
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1fdeae0aac64 - main - math/qalculate-qt: Update to 4.3.0
Message-ID:  <202209121946.28CJkxtx014181@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale:

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

commit 1fdeae0aac648947bb2a911745de4d7b35c6258f
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2022-09-11 23:18:13 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2022-09-12 19:45:58 +0000

    math/qalculate-qt: Update to 4.3.0
    
    Convert to FLAVORS adding a qt6 flavor with qt5 remaining as the default.
    
    https://github.com/Qalculate/qalculate-qt/releases/tag/v4.3.0
---
 math/qalculate-qt/Makefile | 18 +++++++++++-------
 math/qalculate-qt/distinfo | 10 +++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/math/qalculate-qt/Makefile b/math/qalculate-qt/Makefile
index d7ed60743a35..9321c2ac7144 100644
--- a/math/qalculate-qt/Makefile
+++ b/math/qalculate-qt/Makefile
@@ -1,11 +1,8 @@
 PORTNAME=	qalculate-qt
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/
-
-PATCH_SITES=	https://github.com/Qalculate/${PORTNAME}/commit/
-PATCHFILES+=	a8bb789828cf21ad0551dd4b1757984b57d8e76b.patch:-p1 #Add missing header
-PATCHFILES+=	fa69618d42b133e5942c4bb86efe2838b61af935.patch:-p1 #Fix version string
+PKGNAMESUFFIX=	${FLAVOR:S/qt//}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Multi-purpose desktop calculator (Qt frontend)
@@ -17,9 +14,16 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libqalculate.so:math/libqalculate
 RUN_DEPENDS=	gnuplot:math/gnuplot
 
-USES=		compiler:c++11-lib gl pkgconfig qmake qt:5
+FLAVORS=		qt5 qt6
+FLAVOR?=		${FLAVORS:[1]}
+qt5_CONFLICTS_INSTALL=	qalculate-qt qalculate-qt6
+qt6_CONFLICTS_INSTALL=	qalculate-qt qalculate-qt5
+
+USES=		compiler:c++11-lib gl pkgconfig qmake qt:${FLAVOR:S/qt//}
 USE_GL=		gl
-USE_QT=		buildtools:build linguisttools:build core gui network widgets
+_USE_QT5=	buildtools:build linguisttools:build core gui network widgets
+_USE_QT6=	base tools:build
+USE_QT=		${_USE_QT${FLAVOR:S/qt//}}
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/math/qalculate-qt/distinfo b/math/qalculate-qt/distinfo
index f3525f8027ef..4cfa8a57bb77 100644
--- a/math/qalculate-qt/distinfo
+++ b/math/qalculate-qt/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1653607991
-SHA256 (qalculate-qt-4.2.0.tar.gz) = 1c62e419bb1f4c16aa428f68281bee3c44a12dde865e0a0b22e53b09f79a0a36
-SIZE (qalculate-qt-4.2.0.tar.gz) = 1283316
-SHA256 (a8bb789828cf21ad0551dd4b1757984b57d8e76b.patch) = 4155abaf34b8a35a7ae48f4caa2a22d2a3e712f90d6ef215a4a77005c2fbb481
-SIZE (a8bb789828cf21ad0551dd4b1757984b57d8e76b.patch) = 691
-SHA256 (fa69618d42b133e5942c4bb86efe2838b61af935.patch) = 2adc056c5710feff68f802eddba25d9f8ec73a0bad8aacdaa16e7c619514d7bb
-SIZE (fa69618d42b133e5942c4bb86efe2838b61af935.patch) = 731
+TIMESTAMP = 1662920005
+SHA256 (qalculate-qt-4.3.0.tar.gz) = add2c06b7909b99de2db8853ba48af5556ac51358423faeb1c03931fb6c446bf
+SIZE (qalculate-qt-4.3.0.tar.gz) = 1275580



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209121946.28CJkxtx014181>