Ignore:
Timestamp:
Nov 16, 2014, 5:54:16 PM (5 years ago)
Author:
ionic@…
Message:

gpg-agent:

  • try to pull pinentry-mac on 10.8+ only
  • respect no_pinentry variant
  • ADD REMINDER TO ACTUALLY REPLACE THAT NEGATIVE VARIABLE LATER!
File:
1 edited

Legend:

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

    r128212 r128214  
    77name                gpg-agent
    88version             2.0.26
    9 revision            2
     9revision            3
    1010categories          security mail
    1111maintainers         ionic openmaintainer
     
    5656
    5757platform darwin {
    58     # Automatically switch between pinentry and pinentry-mac, with pinentry-mac being
    59     # preferred.
    60     # 10.6 and below are not supported by pinentry-mac, though, and will default to
    61     # pinentry. Just like pure darwin without OS X will.
    62     set pinentry            pinentry-mac
    63     if {${os.subplatform} ne "macosx" ||
    64         ${os.major} < 11 || ([catch "registry_active pinentry"] &&
    65                              ![catch "registry_active pinentry-mac"])} {
    66         set pinentry        pinentry
     58    if {![variant_isset no_pinentry]} {
     59      # Automatically switch between pinentry and pinentry-mac, with pinentry-mac being
     60      # preferred.
     61      # 10.7 and below are not supported by pinentry-mac, though, and will default to
     62      # pinentry. Just like pure darwin without OS X will.
     63      set pinentry            pinentry-mac
     64      if {${os.subplatform} ne "macosx" ||
     65          ${os.major} < 12 || ([catch "registry_active pinentry"] &&
     66                               ![catch "registry_active pinentry-mac"])} {
     67          set pinentry        pinentry
     68      }
     69
     70      set pinentry_binary     ""
     71
     72      if {${pinentry} eq "pinentry"} {
     73          set pinentry_binary "${prefix}/bin/${pinentry}"
     74      } else {
     75          set pinentry_binary "${applications_dir}/${pinentry}.app/Contents/MacOS/${pinentry}"
     76      }
     77
     78      depends_lib-append      port:${pinentry}
     79      configure.args-append   --with-pinentry-pgm=${pinentry_binary}
    6780    }
    68 
    69     set pinentry_binary     ""
    70 
    71     if {${pinentry} eq "pinentry"} {
    72         set pinentry_binary "${prefix}/bin/${pinentry}"
    73     } else {
    74         set pinentry_binary "${applications_dir}/${pinentry}.app/Contents/MacOS/${pinentry}"
    75     }
    76 
    77     depends_lib-append      port:${pinentry}
    78     configure.args-append   --with-pinentry-pgm=${pinentry_binary}
    7981
    8082
     
    161163}
    162164
     165# FIXME: switch to (default on) pinentry variant.
    163166variant no_pinentry description {Do not use pinentry to handle user input} {
    164     depends_lib-delete      port:pinentry
    165     configure.args-delete   --with-pinentry-pgm=${prefix}/bin/pinentry
    166167}
    167168
Note: See TracChangeset for help on using the changeset viewer.