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

[cal at macports.org]

Revision: 110739
          https://trac.macports.org/changeset/110739
Author:   cal at macports.org
Date:     2013-09-04 16:29:16 -0700 (Wed, 04 Sep 2013)
Log Message:
-----------
openssh: fix no_x11 legacy variant

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

Modified: trunk/dports/net/openssh/Portfile
===================================================================
--- trunk/dports/net/openssh/Portfile	2013-09-04 23:25:55 UTC (rev 110738)
+++ trunk/dports/net/openssh/Portfile	2013-09-04 23:29:16 UTC (rev 110739)
@@ -93,15 +93,13 @@
     }
 }
 
-default_variants +xauth
-
 variant xauth description {Build with support for xauth} {
     configure.args-delete   --without-xauth
     configure.args-append   --with-xauth=${prefix}/bin/xauth
     depends_run-append      port:xauth
 }
 
-variant no_x11 requires xauth description {Legacy compatibility variant} {}
+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
@@ -138,6 +136,10 @@
     depends_lib-append	port:ldns
 }
 
+if {[variant_isset no_x11]} {
+    default_variants +xauth
+}
+
 platform darwin {
     # create link to /usr/include/pam because 'security' was renamed to 'pam'
     # in OS X.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130904/268c5954/attachment.html>