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

[ionic at macports.org]

Revision: 128378
          https://trac.macports.org/changeset/128378
Author:   ionic at macports.org
Date:     2014-11-19 23:11:09 -0800 (Wed, 19 Nov 2014)
Log Message:
-----------
gpg-agent: respect no_pinentry and the other pinentry flags.

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

Modified: trunk/dports/security/gpg-agent/Portfile
===================================================================
--- trunk/dports/security/gpg-agent/Portfile	2014-11-20 07:11:03 UTC (rev 128377)
+++ trunk/dports/security/gpg-agent/Portfile	2014-11-20 07:11:09 UTC (rev 128378)
@@ -55,16 +55,19 @@
 #configure.cflags-append -g3 -ggdb3 -gdwarf-2 -O0
 
 platform darwin {
-    # 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.
-    if {${os.subplatform} ne "macosx" ||
-        ${os.major} < 12 || ([catch "registry_active pinentry"] &&
-                             ![catch "registry_active pinentry-mac"])} {
-        default_variants-append +pinentry
-    } else {
-        default_variants-append +pinentry_mac
+    if {![variant_isset no_pinentry] &&
+        ![variant_isset pinentry] && ![variant_isset pinentry_mac]} {
+        # 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.
+        if {${os.subplatform} ne "macosx" ||
+            ${os.major} < 12 || ([catch {registry_active pinentry}] &&
+                                 ![catch {registry_active pinentry-mac}])} {
+            default_variants-append +pinentry
+        } else {
+            default_variants-append +pinentry_mac
+        }
     }
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141119/ae21059c/attachment.html>