Ticket #38004: shibboleth.diff

Portfile

@@ -2 +2 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           active_variants 1.1
 
 name                shibboleth
 version             2.5.1
@@ -25 +26 @@
                     port:log4shib \
                     port:boost
 
-pre-fetch {
-    set status 0
-    if {[catch {exec ${prefix}/bin/curl --version | grep SSL} results]} {
-        if {[lindex $::errorCode 0] eq "CHILDSTATUS"} {
-            set status [lindex $::errorCode 2]
-        } else {
-            set status [lindex $::errorCode 3]
-        }
-    }
-    if {${status} != 0} {
-        return -code error "\n
-    ${name} requires curl to be installed with SSL support.
-    Please deactivate your current curl installation and
-    install the proper version of curl:
-        sudo port deactivate curl
-        sudo port install curl +ssl\n"
-    }
-}
 master_sites        http://shibboleth.net/downloads/service-provider/${version}/
 distname            ${name}-sp-${version}
 worksrcdir          ${name}-sp-${version}
 checksums           rmd160  115af4627ac13a8fa645632f4d1cf065239ca8e5 \
                     sha256  a697034fe56a170602a3907cde6faf822836b1ba23cdc11af315a81df6102f04
 
+require_active_variants curl ssl
+
 configure.args      --with-xmltooling=${prefix} \
                     --with-saml=${prefix} \
                     --with-boost=${prefix} \