Modified: trunk/dports/security/gpg-agent/Portfile (144106 => 144107)

--- trunk/dports/security/gpg-agent/Portfile	2016-01-01 21:52:51 UTC (rev 144106)
+++ trunk/dports/security/gpg-agent/Portfile	2016-01-01 22:00:18 UTC (rev 144107)
@@ -57,8 +57,7 @@
 #configure.cflags-append -g3 -ggdb3 -gdwarf-2 -O0
 
 platform darwin {
-    if {![variant_isset no_pinentry] &&
-        ![variant_isset pinentry] && ![variant_isset pinentry_mac]} {
+    if {![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
@@ -164,16 +163,12 @@
     }
 }
 
-# Remove after 11-17-2015.
-variant no_pinentry conflicts pinentry pinentry_mac description {Legacy compatibility variant for disabling pinentry. Will be removed soon.} {
-}
-
-variant pinentry conflicts pinentry_mac no_pinentry description {Handle user input via pinentry.} {
+variant pinentry conflicts pinentry_mac description {Handle user input via pinentry.} {
     depends_lib-append      port:pinentry
     configure.args-append   --with-pinentry-pgm=${prefix}/bin/pinentry
 }
 
-variant pinentry_mac conflicts pinentry no_pinentry description {Handle user input via pinentry-mac. Only compatible with OS X 10.8+.} {
+variant pinentry_mac conflicts pinentry description {Handle user input via pinentry-mac. Only compatible with OS X 10.8+.} {
     depends_lib-append      port:pinentry-mac
     configure.args-append   --with-pinentry-pgm=${applications_dir}/pinentry-mac.app/Contents/MacOS/pinentry-mac
 }