From nobody Fri Jun 30 07:22:58 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 4Qsmxb3k73z4ks1f; Fri, 30 Jun 2023 07:22:59 +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 4Qsmxb0KjVz43wK; Fri, 30 Jun 2023 07:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109779; 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=1jdIfXBMBuHhFUaIrF1DVO+mrRzLrhMVss7dmfFYJqk=; b=Mc1R59Yf/aydXcFT8JDh4jvv3FW9dGNV4sV+4tQ0mHDzVbynBeOB35h5V9XDDiA4iSgZpx I9Pb34+ZvHn/DdCX4BSju8sIZUoNhg53F/u0/dE1ev+HG2jYYkQhKJvflWq1QvY3JamjLN ADeLWHEGHuGWl5uooZQd7kuS5S5RHYPJc6/rs8sR+hkHS2jekbpzweTm6VX70yJnN2BZyB UQMQyfDzn1zs/VCVU8rLe2CkLDjQuXA9URo3rN5mu7XfnShjQ/s1BfqaIKpB9BgJdyWUyW 0Qwbkf6ebyIwPPtPdeXuwMeH+nyqaJDTkyTnFs8THKaoSpp0VZjxKVCGX9I5tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109779; 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=1jdIfXBMBuHhFUaIrF1DVO+mrRzLrhMVss7dmfFYJqk=; b=oaCGalCUxtfjM95X+lAP/kq8nA1aWA1wpnM01ZHoXwP2qNljqodvNgXlh0esjVjOp+lGoa y6mc2Dnl1cySwvsuOK0zgVMCW6fjclxWuh9aSC0R+iGW6WQ09etRA171TvhAhqw6XySQ4Y BB45SgY/rKD6v8SyaYRVBOXo7aWbevVBjnyLNkwkDlSdGLCq1plrQ1jkkThy3frYPSNoAZ riQi3RcjIEz4mV/CnzpLY0VE5IoWbQunKET5lnya+SAkctTjxzs3D4x/XhmY+RQr6MWxzu mnhqRmjY+HwiOlfgOkIAmQlnGVhbYSajalIpxFab06nVY3yz5Bya48NmCQY4ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109779; a=rsa-sha256; cv=none; b=x3aR7NN6Qf30B1D7tUkh/iq9h/tJRDK2hUSso/ZTxTPRMJnSdza4dIP+EA171KxG39jDvQ ltbc8jwvr7ARLeVrdO2VqM7PZEK8pvOna0YveaBhbYbPXdA7kfpdpuNENOeNUFOlnT5EbN RSXdNP7hfUFa0wSNIDqhHI095eJq9aqe94TB1/Yo4FVrQmD/KYng2Pq4yziYsMTbVHi/VA 1ecdsqg5yePDZmT40l1n0ziPy/bWJitB35OBzmV2nRMEigb62mBpchbq7m3B78Ie2eOUV8 fJbfwEDawSRPQ0y77EqcbN6PIIxEt5Kw1C7+aN4ss8scdpnMP5YGRwAcgQlCyQ== 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 4QsmxZ60FwzqPW; Fri, 30 Jun 2023 07:22:58 +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 35U7MwDF084759; Fri, 30 Jun 2023 07:22:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7MwcH084758; Fri, 30 Jun 2023 07:22:58 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:22:58 GMT Message-Id: <202306300722.35U7MwcH084758@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 2416ef0c6af0 - main - Mk/Uses/pathfix.mk: Add CMAKE_INSTALL_FULL_LIBDIR/pkgconfig pattern 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2416ef0c6af0196e04d058587c09604eaf0df721 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=2416ef0c6af0196e04d058587c09604eaf0df721 commit 2416ef0c6af0196e04d058587c09604eaf0df721 Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:08:23 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:08:23 +0000 Mk/Uses/pathfix.mk: Add CMAKE_INSTALL_FULL_LIBDIR/pkgconfig pattern It is used by devel/level-zero. --- Mk/Uses/pathfix.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk index 59629f915d8c..049224a15621 100644 --- a/Mk/Uses/pathfix.mk +++ b/Mk/Uses/pathfix.mk @@ -27,7 +27,8 @@ pathfix: . if ${USES:Mcmake*} . for file in ${PATHFIX_CMAKELISTSTXT} @${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} -e \ - 's|[{]CMAKE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ + 's|[{]CMAKE_INSTALL_FULL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ + s|[{]CMAKE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]CMAKE_INSTALL_DATAROOTDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]INSTALL_LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \