From nobody Mon Jan 1 14:43:38 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 4T3dyf5PyPz56sBn;
Mon, 1 Jan 2024 14:43:38 +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 4T3dyf4bSvz4mQh;
Mon, 1 Jan 2024 14:43:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1704120218;
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=hffsujrIo77muGc07xrgV9H2Tn5uCzmTJbUtwrPhSoc=;
b=XRMrzDVAp1kLBk3eOscne2zlgzPXWbqYnRUOj3lUxfKYpKToQoN3o8Lqo1Z4qzaoJ2oGUO
/qu2VMJs7Dk4VptGUtccL9WSti9rbfMl/krGJnvrUob2xnmXrqJ7y7H0VP7GTx3xF1V3rb
zR/9X94pkQoyGSvXxeEDZvhO/ZtB1Gf6N/TUkLNvgP2xV15Etb9AJX/WgDnCumj9jDXqg5
t/REMI8r5JovS5kVpHr3BnSHM6y3VfVmp4+xyFm0L+a8xtxI/tbu5VqzbLKvg5xjeDeYFb
ddsqjlQVtxfahdJ3gQwPMksIw+/ktNVajKHjVkvG6opk/89bf8R49wUiUVD7GA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704120218; a=rsa-sha256; cv=none;
b=TkEHXSk9chkGlD12noGtJ03NS974INDNspcTEwAiv9aZ0LbwSCAfNXSntqrJjk4QV5H3ay
rog1d0/KjPxU5vifd/b/aQtpBOW5grrzlkzrjPHyOmbHRXyuUimFOQg/UfAWkRu6ntLTKk
lvSTPz7lYorRxe9Gmzt6tpU1WQ/qXWfcTwEakcAVmx5u4xpmT9sDCTKW3ClsFf8L+JUc3T
vXqPR87kwid/WiICrPyx+g59uMOitGlbKz/rP7btsvirzctBE56ZzVEDvehHdUOxqFIygD
eoRdZmBKQy2aV9GsBqkwyBt+Xu2a7IVbrUZ65yTYFNwVcL+JSRMS4jN7D4U7Ew==
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=1704120218;
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=hffsujrIo77muGc07xrgV9H2Tn5uCzmTJbUtwrPhSoc=;
b=wj0CCwLPDn60lrkq59sxXjpgG2yBGtztYg3TkrqwjIVC+gNh1M6xpa8bhAejAcak1IXcfy
6TVlffJ6r+2XeL2OiLox+XGEbebGwp1N27vivGotjYjJW/ofxkfUH2UFfSJ5DWDCtUyVAn
b9i5CrclkJoB/7cvcgBjwQDIDsK2IvUU7QA0Vl2L5/pJOb2R/lC7G2pe6tqjra+5YtevTV
jEbmtWBd8k9qApOV3CVilZV3nIWYTBmdzVxPidVrGYVciSoqzTG3Fl+Rvc2K7IwqW1qVlu
5Z/USKgnv3AAFco8rJBhvA4FFKTtfZFUZSpXK3RSWcnVVzh0qfHO2G/aBUhF0Q==
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 4T3dyf3fCZz6hd;
Mon, 1 Jan 2024 14:43:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 401Ehckp089421;
Mon, 1 Jan 2024 14:43:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 401EhcH1089418;
Mon, 1 Jan 2024 14:43:38 GMT
(envelope-from git)
Date: Mon, 1 Jan 2024 14:43:38 GMT
Message-Id: <202401011443.401EhcH1089418@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Subject: git: 52b7582fa6f9 - main - devel/appstream-qt: flavorize
for Qt5 and Qt6
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tcberner
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 52b7582fa6f987cb9a4edb22c9821e0c64b61665
Auto-Submitted: auto-generated
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=52b7582fa6f987cb9a4edb22c9821e0c64b61665
commit 52b7582fa6f987cb9a4edb22c9821e0c64b61665
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2024-01-01 09:06:58 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2024-01-01 14:43:11 +0000
devel/appstream-qt: flavorize for Qt5 and Qt6
Approved by: arrowd (maintainer)
---
devel/appstream-qt/Makefile | 21 +++++++++----
devel/appstream-qt/pkg-plist | 60 +++++++++++++++++++-------------------
sysutils/plasma5-discover/Makefile | 2 +-
3 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/devel/appstream-qt/Makefile b/devel/appstream-qt/Makefile
index 427cbbff9653..c1b13a1a9902 100644
--- a/devel/appstream-qt/Makefile
+++ b/devel/appstream-qt/Makefile
@@ -1,15 +1,26 @@
-PORTREVISION= 1
-PKGNAMESUFFIX= Qt
+PORTREVISION= 2
+PKGNAMESUFFIX= Qt${FLAVOR:S/qt//}
COMMENT?= Qt bindings to AppStream
LIB_DEPENDS= libappstream.so:devel/appstream
-USES= qt:5
+FLAVORS= qt5 qt6
+FLAVOR?= qt5
-USE_QT= core buildtools:build qmake:build testlib:build
+USES= qt:${FLAVOR:S/qt//}
-MESON_ARGS= -Dqt5=true
+_USE_QT_qt5= core buildtools:build qmake:build testlib:build
+_USE_QT_qt6= base
+USE_QT= ${_USE_QT_${FLAVOR}}
+
+_MESON_ARGS_qt5= -Dqt5=true
+_MESON_ARGS_qt6= -Dqt=true
+MESON_ARGS= ${_MESON_ARGS_${FLAVOR}}
+
+_QT_VER_SUFFIX_qt5= 5
+_QT_VER_SUFFIX_qt6= #
+PLIST_SUB= QT_VER_SUFFIX=${_QT_VER_SUFFIX_${FLAVOR}}
MASTERDIR= ${.CURDIR}/../appstream
PLIST= ${.CURDIR}/pkg-plist
diff --git a/devel/appstream-qt/pkg-plist b/devel/appstream-qt/pkg-plist
index 351a20882ac7..aebf9b977979 100644
--- a/devel/appstream-qt/pkg-plist
+++ b/devel/appstream-qt/pkg-plist
@@ -1,30 +1,30 @@
-include/AppStreamQt5/appstreamqt_export.h
-include/AppStreamQt5/bundle.h
-include/AppStreamQt5/category.h
-include/AppStreamQt5/component-box.h
-include/AppStreamQt5/component.h
-include/AppStreamQt5/contentrating.h
-include/AppStreamQt5/developer.h
-include/AppStreamQt5/icon.h
-include/AppStreamQt5/image.h
-include/AppStreamQt5/launchable.h
-include/AppStreamQt5/metadata.h
-include/AppStreamQt5/pool.h
-include/AppStreamQt5/provided.h
-include/AppStreamQt5/relation-check-result.h
-include/AppStreamQt5/relation.h
-include/AppStreamQt5/release-list.h
-include/AppStreamQt5/release.h
-include/AppStreamQt5/screenshot.h
-include/AppStreamQt5/spdx.h
-include/AppStreamQt5/suggested.h
-include/AppStreamQt5/systeminfo.h
-include/AppStreamQt5/translation.h
-include/AppStreamQt5/utils.h
-include/AppStreamQt5/version.h
-include/AppStreamQt5/video.h
-lib/cmake/AppStreamQt5/AppStreamQt5Config.cmake
-lib/cmake/AppStreamQt5/AppStreamQt5ConfigVersion.cmake
-lib/libAppStreamQt5.so
-lib/libAppStreamQt5.so.1.0.0
-lib/libAppStreamQt5.so.3
+include/AppStreamQt%%QT_VER_SUFFIX%%/appstreamqt_export.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/bundle.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/category.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/component-box.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/component.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/contentrating.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/developer.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/icon.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/image.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/launchable.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/metadata.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/pool.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/provided.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/relation-check-result.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/relation.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/release-list.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/release.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/screenshot.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/spdx.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/suggested.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/systeminfo.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/translation.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/utils.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/version.h
+include/AppStreamQt%%QT_VER_SUFFIX%%/video.h
+lib/cmake/AppStreamQt%%QT_VER_SUFFIX%%/AppStreamQt%%QT_VER_SUFFIX%%Config.cmake
+lib/cmake/AppStreamQt%%QT_VER_SUFFIX%%/AppStreamQt%%QT_VER_SUFFIX%%ConfigVersion.cmake
+lib/libAppStreamQt%%QT_VER_SUFFIX%%.so
+lib/libAppStreamQt%%QT_VER_SUFFIX%%.so.1.0.0
+lib/libAppStreamQt%%QT_VER_SUFFIX%%.so.3
diff --git a/sysutils/plasma5-discover/Makefile b/sysutils/plasma5-discover/Makefile
index 6adf984da5b8..28141a51073a 100644
--- a/sysutils/plasma5-discover/Makefile
+++ b/sysutils/plasma5-discover/Makefile
@@ -9,7 +9,7 @@ WWW= https://www.kde.org/plasma-desktop
# TODO: update packagekit-qt5
#LIB_DEPENDS= libpackagekit-qt.so:ports-mgmt/packagekit-qt5
-LIB_DEPENDS= libAppStreamQt5.so:devel/appstream-qt
+LIB_DEPENDS= libAppStreamQt5.so:devel/appstream-qt@qt5
USES= cmake compiler:c++11-lib cpe desktop-file-utils gettext kde:5 \
pkgconfig qt:5 tar:xz xorg