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

[ionic at macports.org]

Revision: 128214
          https://trac.macports.org/changeset/128214
Author:   ionic at macports.org
Date:     2014-11-16 09:54:16 -0800 (Sun, 16 Nov 2014)
Log 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!

Modified Paths:
--------------
    trunk/dports/security/gpg-agent/Portfile

Modified: trunk/dports/security/gpg-agent/Portfile
===================================================================
--- trunk/dports/security/gpg-agent/Portfile	2014-11-16 17:54:11 UTC (rev 128213)
+++ trunk/dports/security/gpg-agent/Portfile	2014-11-16 17:54:16 UTC (rev 128214)
@@ -6,7 +6,7 @@
 # When updating gpg-agent, update gnupg2 also if applicable.
 name                gpg-agent
 version             2.0.26
-revision            2
+revision            3
 categories          security mail
 maintainers         ionic openmaintainer
 license             GPL-3+
@@ -55,29 +55,31 @@
 #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
-    }
+    if {![variant_isset no_pinentry]} {
+      # Automatically switch between pinentry and pinentry-mac, with pinentry-mac being
+      # preferred.
+      # 10.7 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} < 12 || ([catch "registry_active pinentry"] &&
+                               ![catch "registry_active pinentry-mac"])} {
+          set pinentry        pinentry
+      }
 
-    set pinentry_binary     ""
+      set pinentry_binary     ""
 
-    if {${pinentry} eq "pinentry"} {
-        set pinentry_binary "${prefix}/bin/${pinentry}"
-    } else {
-        set pinentry_binary "${applications_dir}/${pinentry}.app/Contents/MacOS/${pinentry}"
+      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}
     }
 
-    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__
@@ -160,9 +162,8 @@
     }
 }
 
+# FIXME: switch to (default on) pinentry variant.
 variant no_pinentry description {Do not use pinentry to handle user input} {
-    depends_lib-delete      port:pinentry
-    configure.args-delete   --with-pinentry-pgm=${prefix}/bin/pinentry
 }
 
 livecheck.type      regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141116/94b4e2b5/attachment.html>