[128212] trunk/dports/security/gpg-agent/Portfile

[Lawrence Velázquez]

So this port has different contents depending on whether pinentry-mac or pinentry is installed?

vq

> On Nov 16, 2014, at 12:14 PM, ionic at macports.org wrote:
> 
> Revision
> 128212 <https://trac.macports.org/changeset/128212>Author
> ionic at macports.org <mailto:ionic at macports.org>Date
> 2014-11-16 09:14:29 -0800 (Sun, 16 Nov 2014)
> Log Message
> 
> gpg-agent: automatically decide whether to use pinentry-mac or pinentry.
> Modified Paths
> 
> trunk/dports/security/gpg-agent/Portfile <x-msg://12/#trunkdportssecuritygpgagentPortfile>
> Diff
> 
>  <>Modified: trunk/dports/security/gpg-agent/Portfile (128211 => 128212)
> 
> --- trunk/dports/security/gpg-agent/Portfile	2014-11-16 17:14:25 UTC (rev 128211)
> +++ trunk/dports/security/gpg-agent/Portfile	2014-11-16 17:14:29 UTC (rev 128212)
> @@ -6,7 +6,7 @@
>  # When updating gpg-agent, update gnupg2 also if applicable.
>  name                gpg-agent
>  version             2.0.26
> -revision            1
> +revision            2
>  categories          security mail
>  maintainers         ionic openmaintainer
>  license             GPL-3+
> @@ -31,8 +31,7 @@
>  
>  set launchd_dir     ${prefix}/etc/${startupitem.location}/${startupitem.uniquename}/
>  
> -configure.args      --enable-agent-only \
> -                    --with-pinentry-pgm=${prefix}/bin/pinentry
> +configure.args      --enable-agent-only
>  
>  # glib fails to find the right stdint.h  It picks clang's internal one rather
>  # than the system header
> @@ -47,15 +46,38 @@
>                      port:libksba        \
>                      port:libgcrypt      \
>                      port:libgpg-error   \
> -                    port:pth            \
> -                    port:pinentry
> +                    port:pth
>  
> +
>  patchfiles          patch-po_Makevars.diff
>  
>  # DO NOT USE. Maintainer-only helper for debugging purposes. DO NOT USE.
>  #configure.cflags-append -g3 -ggdb3 -gdwarf-2 -O0
>  
>  platform darwin {
> +    # Automatically switch between pinentry and pinentry-mac, with pinentry-mac being
> +    # preferred.
> +    # 10.6 and below are not supported by pinentry-mac, though, and will default to
> +    # pinentry. Just like pure darwin without OS X will.
> +    set pinentry            pinentry-mac
> +    if {${os.subplatform} ne "macosx" ||
> +        ${os.major} < 11 || ([catch "registry_active pinentry"] &&
> +                             ![catch "registry_active pinentry-mac"])} {
> +        set pinentry        pinentry
> +    }
> +
> +    set pinentry_binary     ""
> +
> +    if {${pinentry} eq "pinentry"} {
> +        set pinentry_binary "${prefix}/bin/${pinentry}"
> +    } else {
> +        set pinentry_binary "${applications_dir}/${pinentry}.app/Contents/MacOS/${pinentry}"
> +    }
> +
> +    depends_lib-append      port:${pinentry}
> +    configure.args-append   --with-pinentry-pgm=${pinentry_binary}
> +
> +
>      patchfiles-append       patch-agent_gpg-agent.c-launchd.diff
>      configure.cflags-append -F/System/Library/Frameworks/CoreFoundation.framework \
>                              -D__APPLE_LAUNCHD__
> _______________________________________________
> macports-changes mailing list
> macports-changes at lists.macosforge.org <mailto:macports-changes at lists.macosforge.org>
> https://lists.macosforge.org/mailman/listinfo/macports-changes <https://lists.macosforge.org/mailman/listinfo/macports-changes>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-dev/attachments/20141116/8cef0794/attachment.html>