From nobody Wed Apr 5 17:33:47 2023 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 4PsBZ36SHXz43pKr; Wed, 5 Apr 2023 17:33:47 +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 4PsBZ35v9fz49wv; Wed, 5 Apr 2023 17:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680716027; 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=jbNcrpgHKFrOOkHHCxCqMZ/idxvNR+fjPTp9YZlv4Ls=; b=iU4K2/9o1lP0Bhaii/thOkJa+lNPBLHUVvdquN5TLRNGp4+s0VQ2e3iUUJ80CWVpTbVqMJ X3dWFQqkp92C3y0ml+84Bk+V5pZeMsuBtm8m2Xz5a2DCJFwhJQIRA8o7pMf+ZJK0epBvwp AbOp4qFdvEVcmT0PHMe8/JdaE5shHpZQvEp+sPi1rMyytQAJAGkoMLwK408EjcGvR3tYTD JrDvBogwOkOejNQZvYHi7tTV03ATIk2xcByzyK7n1kZucYFicvv2pkVxKns/RMgJy4ucWx aX3N8INL0n+x/KI7ryC8ET3y0PW5BTAsiBSOQUU3N5Q4Le7Dq65eZW1slBvOzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680716027; 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=jbNcrpgHKFrOOkHHCxCqMZ/idxvNR+fjPTp9YZlv4Ls=; b=Fkuj42PYrgGggEYtZJWdU7Fmwq4sY+NTqvjqyRW4zptEoCaQ7Pnt5u61HPkMIPeWiQ2klj HbK8kKP4g0Vd2hi0w4oRCINDjWQRyC695Oxyh6zKZEQeeuEhAm2bAo3hGxBwhUFjMVwdPr qpJO/vy9KBCgtYoSw4PVNQGoPnMHemTP+v8zcWVvcOAwv3eMDZkj1CgZkDjzB6v5N0NnYZ 3ZVkgRmjsgXCApZka3R+AZpwfWQqc8kqlvhnUKraSLK+oKqOIOE9lMq+IkfhtNWpfZXGsN 4tcfogEx1OlMk5daW0cbAYpTydOzcb9iKMK7qegLBIn02aEAeKoGy2TqOJSf2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680716027; a=rsa-sha256; cv=none; b=XFr+/N9Y+3mO+Sl3fasKSJO9UKe/foiK4wVzod7N32wzB9Q+tJ8sjWMrGId/plGFeEGNRS ufo1ofMRR8T42cpYo/CkQkbnhh55GXUS1hDIwPvUZcGEi881LH/wRuaDt1vEmtz+3igwO0 qngo1HQcIY/MfphDPQs2PKd3OCkuz9AOjtSlcmsn7j87L3QNsqKdxXSCfKDkZiaqT3nOrs U5+Qh2pQgSg6gPenSPbqSW316j++ctbCwxdeiq3efa1HYEOpesu1iGBPb8UmEL0Nc2fvLP NbkT+yIpvTaadCmdIrCrtMPODXeJgizf3bHySJ605bd/Cy58TL0ZMCmW8Ym5nQ== 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 4PsBZ34yPNzWq4; Wed, 5 Apr 2023 17:33:47 +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 335HXlrM083850; Wed, 5 Apr 2023 17:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335HXlMx083849; Wed, 5 Apr 2023 17:33:47 GMT (envelope-from git) Date: Wed, 5 Apr 2023 17:33:47 GMT Message-Id: <202304051733.335HXlMx083849@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: 254002b9034d - main - devel/grpc: Skip openssl.pc conditionally since both 13-STABLE and 14-CURRENT have it now 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 254002b9034d0672aba4abdbf6ac2775c24d16ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=254002b9034d0672aba4abdbf6ac2775c24d16ad commit 254002b9034d0672aba4abdbf6ac2775c24d16ad Author: Po-Chuan Hsieh AuthorDate: 2023-04-05 17:12:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-04-05 17:29:45 +0000 devel/grpc: Skip openssl.pc conditionally since both 13-STABLE and 14-CURRENT have it now --- devel/grpc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index ee0ea6df712f..d6e2567473c7 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -46,8 +46,8 @@ CONFLICTS_INSTALL= grpc[0-9][0-9][0-9] .include -# Remove openssl from grpc.pc because we do not ship openssl.pc in base system -.if ${SSL_DEFAULT} == base +# Skip openssl.pc while using OpenSSL from base system on older FreeBSD versions which does not skip this file +.if ${SSL_DEFAULT} == base && !exists(/usr/libdata/pkgconfig/openssl.pc) EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl .endif