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

[cal at macports.org]

Revision: 108465
          https://trac.macports.org/changeset/108465
Author:   cal at macports.org
Date:     2013-07-23 14:06:09 -0700 (Tue, 23 Jul 2013)
Log Message:
-----------
openssh: replace +no_x11 with -xauth, #39383

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

Modified: trunk/dports/net/openssh/Portfile
===================================================================
--- trunk/dports/net/openssh/Portfile	2013-07-23 20:54:05 UTC (rev 108464)
+++ trunk/dports/net/openssh/Portfile	2013-07-23 21:06:09 UTC (rev 108465)
@@ -5,7 +5,7 @@
 
 name                openssh
 version             6.2p2
-revision            1
+revision            2
 conflicts           ssh-copy-id
 
 categories          net
@@ -46,8 +46,6 @@
                     port:zlib \
                     port:kerberos5
 
-depends_run         port:xauth
-
 patchfiles          launchd.patch
 
 # Specified -fno-builtin because GCC 3.3 has log() as a builtin
@@ -64,7 +62,6 @@
                     --mandir=${prefix}/share/man \
                     --with-zlib=${prefix} \
                     --with-kerberos5=${prefix} \
-                    --with-xauth=${prefix}/bin/xauth \
                     --with-libedit
 
 use_parallel_build  yes
@@ -82,11 +79,15 @@
     xinstall -m 644 ${worksrcpath}/contrib/ssh-copy-id.1 ${destroot}${prefix}/share/man/man1
 }
 
-variant no_x11 description "do not include xauth" {
-    configure.args-delete   --with-xauth=${prefix}/bin/xauth
-    depends_run-delete      port:xauth
+default_variants +xauth
+
+variant xauth description {Build with support for xauth} {
+    configure.args-append   --with-xauth=${prefix}/bin/xauth
+    depends_run-append      port:xauth
 }
 
+variant no_x11 requires xauth description {Legacy compatibility variant} {}
+
 # Disable HPN variant since it currently doesn't work with 6.2
 #variant hpn description "apply high performance patch" {
 #    # http://www.psc.edu/index.php/hpn-ssh
@@ -163,6 +164,5 @@
         kill `cat ${prefix}/var/run/sshd.pid`
         fi"
 
-
 livecheck.type      regex
 livecheck.regex     OpenSSH ((\[5-9\].\[0-9\])(p\[0-9\]))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130723/374a8474/attachment.html>