From nobody Fri Jul 29 08:20:37 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 4LvL7946B0z4XMxR; Fri, 29 Jul 2022 08:20:37 +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 4LvL793jYVz3jsC; Fri, 29 Jul 2022 08:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659082837; 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=8wyd5ZoaTISs8NXWHflg5dbbaZftzuYKi0UZMeKGEDM=; b=noexlx2F3GczVzewI0m8wd32uApBG5tnirzQSKo6jPmhLkrhwfVgyMW1uc7VeS5FtCIWXs Y6Kc7khJhDqeBrTs4/DHF/9iHHsK/2pXH/HzeeQzuJomfO/5dOBp0byLC2yTiTbhewil97 xgtN0OugKU5k0rR0Mqdy2UDTSTzSR6pU3GlIbCfbdx2ZMIVqAa39yMkJu9R9odibX8SQZS ALdAOliHLJrjI52da4mcb1pyqodTOLxuT+FhJDBsWiGzReLmHFS6akrosxDPARKsvmDt0c VkjHs5sg2xEhU+8nUhtTmXfcRkLbQ9ikMScKPoQoj+OePkYQa/BnsI6aU2+Gaw== 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 4LvL792mgVzT1V; Fri, 29 Jul 2022 08:20:37 +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 26T8KbM4078923; Fri, 29 Jul 2022 08:20:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26T8KbR8078922; Fri, 29 Jul 2022 08:20:37 GMT (envelope-from git) Date: Fri, 29 Jul 2022 08:20:37 GMT Message-Id: <202207290820.26T8KbR8078922@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: de99fa005af6 - main - Mk/bsd.port.mk: add ${LOCALBASE}/share/pkgconfig support 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: de99fa005af6a2f9e47976b7272fb987be2d6fbf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659082837; 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=8wyd5ZoaTISs8NXWHflg5dbbaZftzuYKi0UZMeKGEDM=; b=amVmX18Xb8AREf1CP0mDla8NWmcr+5uBCGNjyqeX0UpVcRLs3AOrwiC99s+fDIu+4IxD4B QMrH5KK+aI3BRtytYw8BAJe2gXYU42LUcQUEslKSO4fYvKYIILMLNuSC3wCy2TMQSet4xZ kuBxBDTF0QjpxlRkmVgKs8etG5Jj/FXFA8+Bf5chA0aJvjse/GEnmrz7Z8/HUew82KzSvH 2ik2bdmRlWPmAR6RzJuE2UtGMrkQ72qmPOf48vtQ91/KJgOmO+UdfJqARCgHCzhYKAV4Ss dxLyLPKA1UFnLwwqks33f+HluvTUafNn2q1SIqjKrdzLC+mYhetjNTP5aq/Ssw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659082837; a=rsa-sha256; cv=none; b=enJGE2t+apIGGEW/oxO1afQltn0xtP/j7oZFXjSAGVNGGBcmJhnYRtbjmWD3btX1THGr2a 5GRDyDDHmTPZG2AEWcdYODY15xrhpRwIglI/5kuRygTcoGwHepOHSt9YRY15ojkLjzUIti 4sIe9C3VFRa66JeqPO2e/xxfHoccZCXqziqCBxpee2lHHFqlGwnNJ3imrQBNRFmAE+hIpx odzdtBRPb1k+bgLc/gTYwF6fGke8+RML+wNJ3nehoBoYmuDy9IeLZRJ/SVNoqGJhIYcC1u QHzPFL9giEMsJ3YtUqADpowI0BEihPicf40Qy5I07Nf1NlJ45kCLSRm00D5LXQ== 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=de99fa005af6a2f9e47976b7272fb987be2d6fbf commit de99fa005af6a2f9e47976b7272fb987be2d6fbf Author: Tobias C. Berner AuthorDate: 2022-07-29 08:16:23 +0000 Commit: Tobias C. Berner CommitDate: 2022-07-29 08:17:31 +0000 Mk/bsd.port.mk: add ${LOCALBASE}/share/pkgconfig support In d48fab59daa56e0b3b6ffecef57a69c32ae9c0a7 ${LOCALBASE}/share/pkgconfig was added as a valid location for pc files. Chase this change when using base-pkgconfig files. --- Mk/bsd.port.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index d0bafd9a7242..0ded60991a2f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1681,8 +1681,8 @@ CONFIGURE_ENV+= PATH=${PATH} PKGCONFIG_LINKDIR= ${WRKDIR}/.pkgconfig PKGCONFIG_BASEDIR= /usr/libdata/pkgconfig . if !${MAKE_ENV:MPKG_CONFIG_LIBDIR=*} && !${CONFIGURE_ENV:MPKG_CONFIG_LIBDIR=*} -MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKGCONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig:${PKGCONFIG_BASEDIR} -CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKGCONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig:${PKGCONFIG_BASEDIR} +MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKGCONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig:${LOCALBASE}/share/pkgconfig:${PKGCONFIG_BASEDIR} +CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKGCONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig:${LOCALBASE}/share/pkgconfig:${PKGCONFIG_BASEDIR} . endif . if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault)