Ignore:
Timestamp:
Nov 20, 2014, 7:11:09 AM (5 years ago)
Author:
ionic@…
Message:

gpg-agent: respect no_pinentry and the other pinentry flags.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/security/gpg-agent/Portfile

    r128275 r128378  
    5656
    5757platform darwin {
    58     # Automatically switch between pinentry and pinentry-mac, with pinentry-mac being
    59     # preferred.
    60     # 10.7 and below are not supported by pinentry-mac, though, and will default to
    61     # pinentry. Just like pure darwin without OS X will.
    62     if {${os.subplatform} ne "macosx" ||
    63         ${os.major} < 12 || ([catch "registry_active pinentry"] &&
    64                              ![catch "registry_active pinentry-mac"])} {
    65         default_variants-append +pinentry
    66     } else {
    67         default_variants-append +pinentry_mac
     58    if {![variant_isset no_pinentry] &&
     59        ![variant_isset pinentry] && ![variant_isset pinentry_mac]} {
     60        # Automatically switch between pinentry and pinentry-mac, with pinentry-mac being
     61        # preferred.
     62        # 10.7 and below are not supported by pinentry-mac, though, and will default to
     63        # pinentry. Just like pure darwin without OS X will.
     64        if {${os.subplatform} ne "macosx" ||
     65            ${os.major} < 12 || ([catch {registry_active pinentry}] &&
     66                                 ![catch {registry_active pinentry-mac}])} {
     67            default_variants-append +pinentry
     68        } else {
     69            default_variants-append +pinentry_mac
     70        }
    6871    }
    6972
Note: See TracChangeset for help on using the changeset viewer.