From nobody Wed Apr 24 05:53:20 2024 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 4VPSp90xdyz5Js99; Wed, 24 Apr 2024 05:53:21 +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 4VPSp86Xwgz4ZDq; Wed, 24 Apr 2024 05:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713938000; 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=qz10y4K00Pszx56CMoas+fN5r1hn2kzCPSnG/AofVac=; b=lEz16EUowdUiTAKSlGSsurGOEyUnPMrdrs2tGy2ZEbZhUMdFiAwlcfVgY/WaZJ3a887Ocj 5fE20QmYKRsMLBsHuLY0K6ZdeVBOpunlKiuQnqZMj88xRopafipCfr5jDpe53qtSMs0gD6 49pP5VzVdzlUlUTH/ZUmM2kF8iVuM0B169NsW7kMUAdCROPvTWCggOpPnoZQL2Cos7Vclw hZCozeHG8P9OX9lqOawPPyb0FW2DTZiXIi9mS0fDi2J1C7QjJnUCgs6OK71JDYGS4Xq0J2 Sb+VpA9DRiPK/1A6hMKh/3mLpA4YTELU2+l67CJLi9dYJ4IGb9HroSWkUx7Mhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713938000; a=rsa-sha256; cv=none; b=ezI1kMgF2bXGdzVK9AYOO6IRjHkVvGeOt7BIEuzyjp3i/+60WnjfNNVpaf6GpX1CrKT9FI EyT/h7Aq2NaVZLRC6neLTvMfPqofPJOSSpukSVMJ009CiMfcSatij2XDRcg36LFt5iz/lI vYYZfwdzN7XKJayi3yt9iTsUzHON9eN41zEqQu9VYerbaP/MiSRtGV+7XibBiFxXXtAcLT 6Kg/LxaQqsqoiGOBA0T0In/6TEUjKr+RIkS5sC6MSpniS8dOKBeWsVNBJpGba+IgyVXgrc 0k6y6GNbjGJMXhI8CR2jPNi+eX1cBY+XCtQkilERqX0mM1FWDimaGU5tOmKZFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713938000; 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=qz10y4K00Pszx56CMoas+fN5r1hn2kzCPSnG/AofVac=; b=Yo2Dff5DQZgWJTT1MpS27bfcxzfcGw2avMF/X1vp9MWaFrgS1sYxtVHi6WXJ66F8R3ONQR yY9zro1Av4Y5abKCu7kWqu6QVcmL6IT5yxH5QHH/wamygfWyf9OjVG09kSbWqhIxWL19ki JQuoJ5PgSFz1Hj+/VSLTfFy/x1/w4heGQxLSRTgQU0QVSPxuqM64sc3s3rLr53iMMsCiY3 pwb4wColkxu7Vf7iem06/tBo7+GRhRXInui1Q4TSnO1bSab62L6xbT/4O6VIcp3/LaWVUC 1fI8FZuHb7Syh0b+6iPxn9hgMivthznShZsxYQkUX4tqafLQKHRzKl4uDSATZw== 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 4VPSp866vdz13fF; Wed, 24 Apr 2024 05:53:20 +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 43O5rKwC008107; Wed, 24 Apr 2024 05:53:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O5rKjW008104; Wed, 24 Apr 2024 05:53:20 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:53:20 GMT Message-Id: <202404240553.43O5rKjW008104@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 08015d126ec3 - main - security/gpgme: Use gpgrt-config for configure 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08015d126ec3355915e59dd14322e11df1db03de Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=08015d126ec3355915e59dd14322e11df1db03de commit 08015d126ec3355915e59dd14322e11df1db03de Author: Jason E. Hale AuthorDate: 2024-04-24 02:19:41 +0000 Commit: Jason E. Hale CommitDate: 2024-04-24 05:52:54 +0000 security/gpgme: Use gpgrt-config for configure Prefer gpgrt-config in the configure stage over the old individual *-config scripts from the various gnupg-related libraries. --- security/gpgme/files/patch-configure | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure index c459227ace77..9884bbddbdc4 100644 --- a/security/gpgme/files/patch-configure +++ b/security/gpgme/files/patch-configure @@ -1,12 +1,16 @@ +Hunk 1: The configure script automatically detects all versions of Python and builds the bindings for each found version. This is a problem when building outside of a clean environment since the ports system can only build a package for one Python flavor at a time. The found versions of Python are overridden by environment variables set in the port Makefile. ---- configure.orig 2023-08-21 07:46:33 UTC +Hunk 2: +Fix path of pkgconfig files passed to gpgrt-config. + +--- configure.orig 2023-11-28 15:45:04 UTC +++ configure -@@ -31342,6 +31342,10 @@ printf "%s\n" "$as_me: WARNING: +@@ -31428,6 +31428,10 @@ printf "%s\n" "$as_me: WARNING: fi @@ -17,3 +21,12 @@ environment variables set in the port Makefile. # Recover some values lost in the second attempt to find Python. PYTHON="$(echo $PYTHONS | cut -d ' ' -f 1)" PYTHON_VERSION="$(echo $PYTHON_VERSIONS | cut -d ' ' -f 1)" +@@ -32691,7 +32695,7 @@ fi + # Get the prefix of gpgrt-config assuming it's something like: + # /bin/gpgrt-config + gpgrt_prefix=${GPGRT_CONFIG%/*/*} +- possible_libdir1=${gpgrt_prefix}/lib ++ possible_libdir1=${gpgrt_prefix}/libdata + # Determine by using system libdir-format with CC, it's like: + # Normal style: /usr/lib + # GNU cross style: /usr//lib