From nobody Sun Sep 11 14:39:09 2022 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 4MQXRd6qR3z4byJJ; Sun, 11 Sep 2022 14:39:09 +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 4MQXRd67FSz3tBx; Sun, 11 Sep 2022 14:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662907149; 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=rncL63ae6rW93rcp1Cbgp+9I2VSor7n17Z8rPNeIiAU=; b=NPycntW5Dxw3eaDqloeSwI6slI8R9JeRUmlep4SeQKFQEa1jLhgL2E1LnXzU6uX+NCEmiv PG0r+m4GAeVaS1pDBYxSLgKiW0mJZmxwlUVQkIC/Xw2Xpbph4DdUu2R95aY3/0jU8BqKGw 5zVcDKdbPRBjw5ZVEumhqu2DM6DvraXdroM7Q89Xv0ooG2QnK9E1sMLjKFH4B2aFEudcw9 QW8QOLfUsXkuo11GEt5QfZJJtKFOQL/kzK/uvR708BznA9VDBHo/tTyiN/4V6WBPOqkvml EmYnay7yb1FUpFT9yp8NLGkAuGc2ba0eqyzBK4qLLa/QfbI+4L4Lhmkz3Fsh6Q== 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 4MQXRd4yWSzgP5; Sun, 11 Sep 2022 14:39:09 +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 28BEd90A040782; Sun, 11 Sep 2022 14:39:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28BEd96Z040781; Sun, 11 Sep 2022 14:39:09 GMT (envelope-from git) Date: Sun, 11 Sep 2022 14:39:09 GMT Message-Id: <202209111439.28BEd96Z040781@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 1b674b6287a2 - main - Mk/Uses/qt.mk: Fix metaports after USE_QT change 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: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b674b6287a245d620ee4d80e48b2f2ae47ff2cb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662907149; 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=rncL63ae6rW93rcp1Cbgp+9I2VSor7n17Z8rPNeIiAU=; b=cBCVshGJo5DQxMiaZeEXlJEtBWWaFY+KF7IKxpts1FUPQKOwcyF70kvwmmZmd7xPKNMqLK Oiv7HtexcHwT2Y5wHYmMW88bm9V0mlarrSYLa3rMZyqk2zYBHKRtY40vbbS0DkxpFqrond 7yPG9Hjr9lfUnm/JAnoPDRKUHB60dG6WUW2mcEY22uz9ePhn8AcxzcJvXV/A+4CfAtiLDw ecjrq+/K8ZruX2+NxtO8CsvxPYh0gSme4hM9IHbkg9FjOuMP4cscRiDUoo8L0M8DOUtVzG yNurPVTyauknp3jdIq7oRnDGEDpM8A1Ss1X0CDgnU/csXQAyFCNqvCNqUz77WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662907149; a=rsa-sha256; cv=none; b=Vyl8tjG8xwEZG1YyeBhgX0p1oGHnO9VJIaGmMIc/YkLfurMlQfweNeB4fPN2yayEddoGo9 glFTLE3LpfU9JNylk/7FPaZ7nykLAOL8ncl996Doh2zh2AaJ2cy4eU2GyboNpFt11RdslG R56t111Aodbg/HdyatvPenGoZuKPJizwYl6M3TYiUWkF57A2acj+t60xbSIHjqiy7L57Wn TkkWeBxvOajfISruK/EU4oT/oiiBjalqCjce4pvlAVArMCgiEQ0yO1CJhFlRHjKV0KwyYP wPm+qmotc/IBoJQto3qilpDIz0m9ISNh+N3y9YO4irOAw4DUjiPgp8w/pQF6Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b674b6287a245d620ee4d80e48b2f2ae47ff2cb commit 1b674b6287a245d620ee4d80e48b2f2ae47ff2cb Author: Felix Palmen AuthorDate: 2022-09-11 12:00:11 +0000 Commit: Felix Palmen CommitDate: 2022-09-11 14:38:12 +0000 Mk/Uses/qt.mk: Fix metaports after USE_QT change devel/qt5 and devel/qt6 use a generated USE_QT that wasn't caught by commit ddae4e92d8313a1461145e3b4f0232fe463feaee: Mk/Uses: always use colon for build/run suffix Fix it manually. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D36524 --- devel/qt5/Makefile | 2 +- devel/qt6/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile index e970fb458457..b3f005def417 100644 --- a/devel/qt5/Makefile +++ b/devel/qt5/Makefile @@ -10,7 +10,7 @@ WWW= https://www.qt.io/ # * phonon4 is not part of Qt itself. # * we don't want to pull in wayland just yet. # XXX(rene) exclude webengine -USE_QT= ${_USE_QT_ALL:Nphonon4:Ndeclarative:Nwayland:Nwebengine:S/$/_run/} +USE_QT= ${_USE_QT_ALL:Nphonon4:Ndeclarative:Nwayland:Nwebengine:S/$/:run/} USES= metaport qt:5 .include diff --git a/devel/qt6/Makefile b/devel/qt6/Makefile index e37618e2bf64..c4e795320e42 100644 --- a/devel/qt6/Makefile +++ b/devel/qt6/Makefile @@ -7,6 +7,6 @@ COMMENT= Cross-platform application and UI framework (metaport) WWW= https://www.qt.io/ USES= metaport qt:6 -USE_QT= ${_USE_QT_ALL:S/$/_run/} +USE_QT= ${_USE_QT_ALL:S/$/:run/} .include