From nobody Thu Aug 17 12:13:14 2023 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 4RRP6M1RbZz4qbly; Thu, 17 Aug 2023 12:13:15 +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 4RRP6M0mZHz4bb7; Thu, 17 Aug 2023 12:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692274395; 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=Ra7pnuucuvGLa17WVkH7348H0ZB3N/jvFjaMFekE/E0=; b=PwNhbeLnTEN8zNWqhQSrAhi50c2NdXKw7/kZ08xWSfBN8OBksv/zpFj2Sty646SLzcwFdJ 3FLNIUuruaBoSZGbtPZeapTKlleb+SBFPIAmq95Jwhw8NIYqrCM5EtIC4n/OF3hyrOdBrn jAcLpUukZU0QP3MfbgF/umoG5duYq76VYFmYQmV3aJI7fBcxqtry3QdOI8HRwdsK7b/fH7 tqlCFelRtJr0LfJwPo+/nASfgUWOLpYnigZWLg2QbO8jHGEGcXKcmF7aj3qqNTHL02sCku tgJEJgZKff+8MNvvhycd87YnZwMoGVe8ph+fNqBbOwyiElsE+ZhdTalFewcIQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692274395; 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=Ra7pnuucuvGLa17WVkH7348H0ZB3N/jvFjaMFekE/E0=; b=a6lyUWDoYtJo6Gb1XD61PInw6VFj281h3gdzgnNMH8IK963Gluzqnj+qi6KinwJH31gUTQ SRvETdszfR5aZ5iYYnXuBGP2jzhKgsKOWPAseoCW8fA2VUOF/JD34KnPH9nywXoSlCXHtO k8AIUtj5Q5z8Rs4iIeqygMCTSPOWB5ln0eETDQtWZjIcVmRUsnyDRPIZxJzZOx48jn+f8D eG63HBTuJNefj6TkfZ0d85iTPwOcNaWDNonEXCyhfkQyfuefeqkhHDiJYpcQ3rdX7WMFmj IQEhG8jcke0KBOM380EdM3Q2qLNPifxxRYIfWW3EO/k5VA3IHzFsEuSVGhQ50Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692274395; a=rsa-sha256; cv=none; b=fRcVYnPy29VSf49x+dufD0sKQeiUDZXd9rNLelPb+6ht+yGqPO81DMvWpILcz8i30sIETX hWjFjx8pL5EWdi6fNotcjMdc4C9d9Otxb/G7KEU/Euhy6kc3hRTf+KY1VWjPxohmtnMolR mZTJT9eUalGA2OJFkucUvSnWW5YRNxOL5PtCtX01XLQxyHB4IoouDtSOOi4U1hnQitltJ8 j4g6NxfkRvjSc0EyZqWWx0q2coB5/AzThZwU9fv6eD6IoExzNgTCvhoSnF1mF4Y+dLXdOp FGlOJvu7Zzelp9rrWqnyIN1/QZIXK09mJp1UAiHyRD0qwHrgYJSVmR6OrTx5Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRP6L6jM4zYkZ; Thu, 17 Aug 2023 12:13:14 +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 37HCDEk5013386; Thu, 17 Aug 2023 12:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HCDEgq013383; Thu, 17 Aug 2023 12:13:14 GMT (envelope-from git) Date: Thu, 17 Aug 2023 12:13:14 GMT Message-Id: <202308171213.37HCDEgq013383@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 056bcb215c50 - main - ports-mgmt/packagekit-qt: flavorize for Qt 5 and Qt 6 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: 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: 056bcb215c50d719b25bf30c8a7cfb2ceac4f141 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=056bcb215c50d719b25bf30c8a7cfb2ceac4f141 commit 056bcb215c50d719b25bf30c8a7cfb2ceac4f141 Author: Tobias C. Berner AuthorDate: 2023-08-17 12:10:00 +0000 Commit: Tobias C. Berner CommitDate: 2023-08-17 12:12:15 +0000 ports-mgmt/packagekit-qt: flavorize for Qt 5 and Qt 6 --- ports-mgmt/packagekit-qt/Makefile | 16 ++++++++++++++-- ports-mgmt/packagekit-qt/pkg-plist | 38 +++++++++++++++++++------------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/ports-mgmt/packagekit-qt/Makefile b/ports-mgmt/packagekit-qt/Makefile index a7b47958411b..30c132057089 100644 --- a/ports-mgmt/packagekit-qt/Makefile +++ b/ports-mgmt/packagekit-qt/Makefile @@ -1,7 +1,9 @@ PORTNAME= PackageKit-Qt PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= ports-mgmt sysutils MASTER_SITES= https://www.freedesktop.org/software/PackageKit/releases/ +PKGNAMESUFFIX= ${FLAVOR:S/qt//} MAINTAINER= kde@FreeBSD.org COMMENT= DBUS packaging abstraction layer (Qt bindings) @@ -12,11 +14,21 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/share/dbus-1/interfaces/org.freedesktop.PackageKit.xml:ports-mgmt/packagekit -USES= cmake cpe qt:5 tar:xz +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + +USES= cmake cpe qt:${FLAVOR:S/qt//} tar:xz +_CMAKE_ARGS_qt5= -DBUILD_WITH_QT6:BOOL=FALSE +_CMAKE_ARGS_qt6= -DBUILD_WITH_QT6:BOOL=TRUE +CMAKE_ARGS= ${_CMAKE_ARGS_${FLAVOR}} +_USE_QT_qt5= core dbus buildtools:build qmake:build +_USE_QT_qt6= base +USE_QT= ${_USE_QT_${FLAVOR}} -USE_QT= core dbus buildtools:build qmake:build USE_LDCONFIG= yes CPE_VENDOR= packagekit_project +PLIST_SUB= QT_VER=${FLAVOR:S/qt//} + .include diff --git a/ports-mgmt/packagekit-qt/pkg-plist b/ports-mgmt/packagekit-qt/pkg-plist index 6e713e71e48e..30d30df676cf 100644 --- a/ports-mgmt/packagekit-qt/pkg-plist +++ b/ports-mgmt/packagekit-qt/pkg-plist @@ -1,19 +1,19 @@ -include/packagekitqt5/PackageKit/Daemon -include/packagekitqt5/PackageKit/Details -include/packagekitqt5/PackageKit/Offline -include/packagekitqt5/PackageKit/Transaction -include/packagekitqt5/PackageKit/bitfield.h -include/packagekitqt5/PackageKit/common.h -include/packagekitqt5/PackageKit/daemon.h -include/packagekitqt5/PackageKit/details.h -include/packagekitqt5/PackageKit/offline.h -include/packagekitqt5/PackageKit/packagekitqt_global.h -include/packagekitqt5/PackageKit/transaction.h -lib/cmake/packagekitqt5/PackageKitQtTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/packagekitqt5/PackageKitQtTargets.cmake -lib/cmake/packagekitqt5/packagekitqt5-config-version.cmake -lib/cmake/packagekitqt5/packagekitqt5-config.cmake -lib/libpackagekitqt5.so -lib/libpackagekitqt5.so.1 -lib/libpackagekitqt5.so.1.1.1 -libdata/pkgconfig/packagekitqt5.pc +include/packagekitqt%%QT_VER%%/PackageKit/Daemon +include/packagekitqt%%QT_VER%%/PackageKit/Details +include/packagekitqt%%QT_VER%%/PackageKit/Offline +include/packagekitqt%%QT_VER%%/PackageKit/Transaction +include/packagekitqt%%QT_VER%%/PackageKit/bitfield.h +include/packagekitqt%%QT_VER%%/PackageKit/common.h +include/packagekitqt%%QT_VER%%/PackageKit/daemon.h +include/packagekitqt%%QT_VER%%/PackageKit/details.h +include/packagekitqt%%QT_VER%%/PackageKit/offline.h +include/packagekitqt%%QT_VER%%/PackageKit/packagekitqt_global.h +include/packagekitqt%%QT_VER%%/PackageKit/transaction.h +lib/cmake/packagekitqt%%QT_VER%%/PackageKitQtTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/packagekitqt%%QT_VER%%/PackageKitQtTargets.cmake +lib/cmake/packagekitqt%%QT_VER%%/packagekitqt%%QT_VER%%-config-version.cmake +lib/cmake/packagekitqt%%QT_VER%%/packagekitqt%%QT_VER%%-config.cmake +lib/libpackagekitqt%%QT_VER%%.so +lib/libpackagekitqt%%QT_VER%%.so.1 +lib/libpackagekitqt%%QT_VER%%.so.1.1.1 +libdata/pkgconfig/packagekitqt%%QT_VER%%.pc