Date: Sun, 11 Sep 2022 14:39:09 GMT From: Felix Palmen <zirias@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1b674b6287a2 - main - Mk/Uses/qt.mk: Fix metaports after USE_QT change Message-ID: <202209111439.28BEd96Z040781@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b674b6287a245d620ee4d80e48b2f2ae47ff2cb commit 1b674b6287a245d620ee4d80e48b2f2ae47ff2cb Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2022-09-11 12:00:11 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> 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 <bsd.port.mk> 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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209111439.28BEd96Z040781>