[123375] trunk/dports/net/openssh/Portfile

[mojca at macports.org]

Revision: 123375
          https://trac.macports.org/changeset/123375
Author:   mojca at macports.org
Date:     2014-08-08 14:57:21 -0700 (Fri, 08 Aug 2014)
Log Message:
-----------
openssh: remove no_x11 (#39383)

Modified Paths:
--------------
    trunk/dports/net/openssh/Portfile

Modified: trunk/dports/net/openssh/Portfile
===================================================================
--- trunk/dports/net/openssh/Portfile	2014-08-08 21:53:07 UTC (rev 123374)
+++ trunk/dports/net/openssh/Portfile	2014-08-08 21:57:21 UTC (rev 123375)
@@ -129,8 +129,6 @@
     depends_run-append      port:xauth
 }
 
-variant no_x11 conflicts xauth description {Legacy compatibility variant} {}
-
 variant hpn conflicts gsskex description {Apply high performance patch} {
     # http://www.psc.edu/index.php/hpn-ssh
     # http://www.freshports.org/security/openssh-portable/ is usually quick in
@@ -178,10 +176,7 @@
     depends_lib-append      port:ldns
 }
 
-if {![variant_isset no_x11]} {
-    default_variants        +xauth
-}
-default_variants-append     +kerberos5
+default_variants            +kerberos5 +xauth
 
 platform darwin {
     # create link to /usr/include/pam because 'security' was renamed to 'pam'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140808/5b9eb410/attachment.html>