From nobody Mon Aug 22 17:33:27 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 4MBKFz2cCGz4ZDBG; Mon, 22 Aug 2022 17:33:27 +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 4MBKFz27Tvz3VBr; Mon, 22 Aug 2022 17:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661189607; 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=AFR+X/fU45Ag/REktpECRmWUjroMcc4dzEex6aR1Rv0=; b=ksMH6iv9Z3TsMTXu+uIJcq3vrlnKH0a31LoiqiJPZGBIGRB+jZ3Yb7QiMhi5CziqkBFImg pIw4PSotmpMEYWv+/88dW7g4r3qs+R17uzMdKOSPGn0LZzzPWlRPdECABMt6EmnSlAu7fR ZMua6aJYLlwrriRPMxbeGevEUUG7AbXV0dkqvkmtCxjZnoGQvlUvqw/HUeTLNuHwSHD+pT VMmyRJLdtTIGrePPTI7Y09bMH8K8lwei+QNH4u94G7NgZcERlsNnl4Igk/Pf2bmg75zmFI OvqRJW4dGUlz42PRjXdj/skxANcMY3ZJyjdZPXdxLdFFlxW9l8iAk0+rJNvGPA== 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 4MBKFz194tzyNX; Mon, 22 Aug 2022 17:33:27 +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 27MHXRQP053358; Mon, 22 Aug 2022 17:33:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MHXRHj053357; Mon, 22 Aug 2022 17:33:27 GMT (envelope-from git) Date: Mon, 22 Aug 2022 17:33:27 GMT Message-Id: <202208221733.27MHXRHj053357@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: 027335b321a9 - main - qt.mk: cleanup available Qt 5/6 components lists 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 027335b321a92ce64cc968104aa1801fef9b6762 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661189607; 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=AFR+X/fU45Ag/REktpECRmWUjroMcc4dzEex6aR1Rv0=; b=v25Jn6GLWueSeE4LfmdvnUIDlfx5irVzNGzceSXb/qyUGI0u7mx7iTHOKUpUbxf6Btrht9 LkK/cn2+iOmGChUoTlAEsOGRlFclnHBBmmxbmv6o8d5Bcuv8Sa5k7uWmuElb58Gk8cLVgK 2lGdTDqXOJiBGfYCq582dzZ6SKpt77/TCbcNcFdPcuFTEQDtJm1QyrYK/7jDbcnX/Qv3ub 4B1nn5VJtEV5vDrkpM/SCL9WFshL5AIfFA4iPENNvB9/MGbdzlXdnER13tf1UScp0h1qHg XUqRhmZhSqQRtnGrYBuG/tbGbVtFDDHM9aRAEJCSXnwNmCy9Kc6HSL9Ft6R7RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661189607; a=rsa-sha256; cv=none; b=H+8YBGws4nxLdqFZJ82F4Rq1lQee8ebebKn3Cn8CKIqeehA0OoyFAaQEI4IwwZHUNBm1J5 jM+ozC0OE8IZgvRPRniHDG1fUnhEsbUccb6zyyqtKD446Hp/R3zjovXaEUy8PQaYZnMZO/ OzGtxrAL72bj0XQjZg4NOp9pxnwXfVSeRAeDcvmjo60M0w9DO6hZeohsE5gLaLEOzz0L/l xDYQB+u4eVsd59edeK4yJ4PgpyBbfRMMMFMZii8m8H2SI6Q+x6MvRx2bHePi3f9plRjmZ9 9xWsWMzuAZvi+QvtjWgw1wVJPKKR1EGQ8rz3O0aloWtpx/G+Yp7z3x4bDxBdlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=027335b321a92ce64cc968104aa1801fef9b6762 commit 027335b321a92ce64cc968104aa1801fef9b6762 Author: Tobias C. Berner AuthorDate: 2022-08-22 17:22:49 +0000 Commit: Tobias C. Berner CommitDate: 2022-08-22 17:22:49 +0000 qt.mk: cleanup available Qt 5/6 components lists --- Mk/Uses/qt.mk | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 948a7a4dae45..81e779ebf509 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -127,33 +127,25 @@ _USES_POST+= qt _QT_MK_POST_INCLUDED= qt.mk # The Qt components supported by qt.mk: list of shared, and version specific ones -_USE_QT_ALL= assistant dbus declarative declarative-test designer doc gui help \ - imageformats l10n linguist linguisttools multimedia \ - network opengl pixeltool qdbusviewer qmake script \ - scripttools sql sql-mysql sql-odbc sql-pgsql \ - sql-sqlite2 sql-sqlite3 svg testlib webkit \ - xml xmlpatterns +_USE_QT_COMMON= 3d charts datavis3d declarative doc imageformats multimedia \ + networkauth quick3d quicktimeline remoteobjects scxml \ + sensors serialbus serialport svg virtualkeyboard wayland \ + webchannel websockets + +_USE_QT5_ONLY= assistant buildtools concurrent connectivity core dbus \ + declarative-test designer diag examples gamepad \ + graphicaleffects gui help l10n linguist linguisttools location \ + network opengl paths phonon4 pixeltool plugininfo printsupport \ + qdbus qdbusviewer qdoc qdoc-data qev qmake quickcontrols \ + quickcontrols2 script scripttools speech sql sql-mysql sql-odbc \ + sql-pgsql sql-sqlite2 sql-sqlite3 sql-tds testlib uiplugin \ + uitools webengine webglplugin webkit websockets-qml webview \ + widgets x11extras xml xmlpatterns . if ${ARCH} == amd64 || ${ARCH} == i386 -_USE_QT_ALL+= sql-ibase +_USE_QT5_ONLY+= sql-ibase . endif -_USE_QT5_ONLY= 3d buildtools charts concurrent connectivity \ - core datavis3d diag examples gamepad graphicaleffects \ - location networkauth paths phonon4 plugininfo printsupport \ - qdbus qdoc qdoc-data qev quick3d quickcontrols quickcontrols2 \ - quicktimeline remoteobjects scxml sensors serialbus serialport \ - speech sql-tds uiplugin uitools virtualkeyboard wayland \ - webchannel webglplugin webengine websockets websockets-qml \ - webview widgets x11extras assistant dbus declarative designer \ - doc gui help imageformats l10n linguist linguisttools \ - multimedia network opengl pixeltool qdbusviewer qmake script \ - scripttools sql sql-mysql sql-odbc sql-pgsql sql-sqlite2 \ - sql-sqlite3 svg testlib webkit xml xmlpatterns - -_USE_QT6_ONLY= 3d 5compat base charts datavis3d declarative doc languageserver lottie imageformats quick3d \ - quickcontrols2 quicktimeline networkauth remoteobjects scxml sensors \ - serialbus serialport shadertools \ - svg tools translations wayland webchannel websockets +_USE_QT6_ONLY= 5compat base languageserver lottie shadertools tools translations # Dependency tuples: _LIB should be preferred if possible. qt-3d_PORT= graphics/${_QT_RELNAME}-3d @@ -390,7 +382,8 @@ qt-xmlpatterns_PORT= textproc/${_QT_RELNAME}-xmlpatterns qt-xmlpatterns_LIB= libQt${_QT_LIBVER}XmlPatterns.so # Actually add the dependencies to the proper lists. -_USE_QT_ALL+= ${_USE_QT${_QT_VER}_ONLY} +_USE_QT_ALL= ${_USE_QT_COMMON} \ + ${_USE_QT${_QT_VER}_ONLY} _USE_QT= ${USE_QT} # Iterate through components deprived of suffix. . for component in ${_USE_QT:O:u:C/_(build|run)$//}