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

[cal at macports.org]

Revision: 110740
          https://trac.macports.org/changeset/110740
Author:   cal at macports.org
Date:     2013-09-04 17:11:17 -0700 (Wed, 04 Sep 2013)
Log Message:
-----------
openssh: make kerberos support optional, but default to enabled, fix xauth default variant, closes #40381

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

Modified: trunk/dports/net/openssh/Portfile
===================================================================
--- trunk/dports/net/openssh/Portfile	2013-09-04 23:29:16 UTC (rev 110739)
+++ trunk/dports/net/openssh/Portfile	2013-09-05 00:11:17 UTC (rev 110740)
@@ -43,8 +43,7 @@
                     ftp://openbsd.secsup.org/pub/openbsd/OpenSSH/portable/
 
 depends_lib         port:openssl \
-                    port:zlib \
-                    port:kerberos5
+                    port:zlib
 
 # the HPN patch needs this, so rewrite all other patches to support it, too
 patch.args          -p1
@@ -63,7 +62,7 @@
                     --with-pam \
                     --mandir=${prefix}/share/man \
                     --with-zlib=${prefix} \
-                    --with-kerberos5=${prefix} \
+                    --without-kerberos5 \
                     --with-libedit \
                     --without-xauth
 
@@ -111,7 +110,7 @@
                             sha256  5243c76ceecb2fd0934d87fd9c33604ff0241c00156e456bf5b7e40e407d8c90
 }
 
-variant gsskex conflicts hpn description "Add OpenSSH GSSAPI key exchange patch" {
+variant gsskex conflicts hpn requires kerberos5 description "Add OpenSSH GSSAPI key exchange patch" {
     set extra_cppflags [concat \
                             "-F/System/Library/Frameworks/DirectoryService.framework" \
                             "-F/System/Library/Frameworks/CoreFoundation.framework" \
@@ -131,14 +130,21 @@
                             LDFLAGS="-Wl,-pie -framework CoreFoundation -framework DirectoryService"
 }
 
+variant kerberos5 description "Add Kerberos5 support" {
+    depends_lib-append port:kerberos5
+    configure.args-delete --without-kerberos5
+    configure.args-append --with-kerberos5=${prefix}
+}
+
 variant ldns description "Use ldns for DNSSEC support" {
     configure.args-append	--with-ldns
     depends_lib-append	port:ldns
 }
 
-if {[variant_isset no_x11]} {
+if {![variant_isset no_x11]} {
     default_variants +xauth
 }
+default_variants-append +kerberos5
 
 platform darwin {
     # create link to /usr/include/pam because 'security' was renamed to 'pam'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130904/3e8a7cd9/attachment.html>