From nobody Mon Aug 22 17:03:44 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 4MBJbj1rjBz4Z93v; Mon, 22 Aug 2022 17:03:45 +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 4MBJbj1NyVz3SHf; Mon, 22 Aug 2022 17:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661187825; 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=gBRUh0sMIYWijoWjRY1YZr32l74ZV5xfEGYzJ7K7G7Q=; b=QMEvyd+HTWGq/+DHarI5j1J/kbLGf/LEV9qF+XjhomdEXmzfwEFghfj/8wWXpHtzPQ8EUr gXIopnpYqZFqfDsYdEY+SJG0mv7MFk+alDpCZF2LpV2EE+eIoYtr+i6uffPXFrbbjNFBdA +LLfK8RWuuSJrBp3dHf/k5kW0PgLzqliGGOLlOwLGB4szQcLBJsw86SvPixMcbq+lPDnCG a/7T7cbEYZvqg9nir+6pYp8BCXAHeM3Mo/DxshUkUx3MEFJO++auUdV8UDTGhAu6cKblKN b0dUZzW7RAToQc5+SORGS4+4fJD//6Hfy6SfMU0qmD8RFl+HCH+bEYkvOxgIJw== 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 4MBJbj0RzFzxtP; Mon, 22 Aug 2022 17:03:45 +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 27MH3isw011547; Mon, 22 Aug 2022 17:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MH3iu7011546; Mon, 22 Aug 2022 17:03:44 GMT (envelope-from git) Date: Mon, 22 Aug 2022 17:03:44 GMT Message-Id: <202208221703.27MH3iu7011546@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: dcf948766186 - main - qt-dist.mk: expose QT_CMAKEDIR to plist for Qt5 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: dcf9487661860b4d04db70b1e06395bdf5b973dd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661187825; 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=gBRUh0sMIYWijoWjRY1YZr32l74ZV5xfEGYzJ7K7G7Q=; b=PtNq/gQ7eLuL6Rrq7+cVORMqMeMsIjuOexExBFw2S4ezw6V8K+XiQsZ1shVD5h1fy3jvzP /VKnpOhXsRG9bi/1kIK6nmoTvzvTsLwCXfWCnICDUi7B4Yyv7c5brg2LS71Chq0LyrJlGA 6ZDQFR5YeZ4A+G+HUqCsb25Tej+lpDUs7FF/QUDj5XalsDaMdop6lTNJkdMsSeqQUMaqlo 0ETmC3gBQA3abUJxXnY6l1eDtSI1VwVNzyUPjh5g+cVuLTof/8fMGOVxmhuQKU0o8azhdb XVh6jH0F5xr6lO/Qq4qH1WKPJG6R8zCDWu3aeRBDbM+TamUiF5FuiC8cKzcSCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661187825; a=rsa-sha256; cv=none; b=euTuBeZ7RSIZssTovyHX1FKX6yTluX/ORFUq3D+Y/tThk0joizvNitQzp9WSE4hiC8rJJp ujvtSp0IhCLhjt5io28IaH6OSUnJcrJF4/AHPvmUHiRD7t0fKemg9AUrWRExtpbzF+rvtJ +jSBBWABK/SoKe+PJdmiMMWreb0wYg/moBDUFTKGNPMqizDnqEsJIJ/DvpuruzWw6vJ7Zw Vv9VzK6uOae3NiNb5hN1enliNrfdtM63r3I4HBAgf4lRwUvkAc1f/+n73PtV+fmz6iI+1W SSZZY53U6ZjmKnmnpFveDGlPnLY4hXR7u/L21tPwXUEXhOcGpxr9P34gWuNYsw== 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=dcf9487661860b4d04db70b1e06395bdf5b973dd commit dcf9487661860b4d04db70b1e06395bdf5b973dd Author: Tobias C. Berner AuthorDate: 2022-08-22 16:59:39 +0000 Commit: Tobias C. Berner CommitDate: 2022-08-22 17:03:39 +0000 qt-dist.mk: expose QT_CMAKEDIR to plist for Qt5 This was removed for Qt 6, but was still required for Qt 5. --- Mk/Uses/qt-dist.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index bc9583eb77f8..9fd8dcce4d1f 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -292,6 +292,13 @@ PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \ PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" . endfor +. if ${_QT_VER:M5} +. for dir in CMAKE +# Export QT_CMAKEDIR. +PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" +. endfor +. endif + . if ${_QT_VER:M5} . if ${_QT_DIST} == "base" # qtbase requires some tools to be symlinked to the build directory.