Ticket #52615: patch-curl-add-wolfssl-darwinssl-variants.diff

File patch-curl-add-wolfssl-darwinssl-variants.diff, 2.6 KB (added by dbevans (David B. Evans), 8 years ago)

Revised patch adds +darwinssl +wolfssl, corrects variant logic.

  • Portfile

     
    4444
    4545    configure.args              --disable-silent-rules \
    4646                                --enable-ipv6 \
     47                                --without-cyassl \
    4748                                --without-gnutls \
    4849                                --without-gssapi \
    4950                                --without-libidn \
     
    5556                                --without-polarssl \
    5657                                --without-spnego \
    5758                                --without-ssl \
     59                                --without-darwinssl \
    5860                                --disable-ares \
    5961                                --disable-ldap \
    6062                                --disable-ldaps \
     
    135137        configure.args-replace  --disable-ares --enable-ares
    136138    }
    137139
    138     variant gnutls conflicts ssl description {Allow secure connections using GNU TLS} {
     140    variant darwinssl conflicts ssl gnutls wolfssl description {Allow secure connections using GNU TLS} {
     141        configure.args-replace  --without-darwinssl --with-darwinssl
     142    }
     143
     144    variant gnutls conflicts ssl wolfssl darwinssl description {Allow secure connections using GNU TLS} {
    139145        depends_lib-append      port:gnutls
    140146        configure.args-replace  --without-gnutls --with-gnutls
    141147    }
    142148
     149    variant wolfssl conflicts ssl gnutls darwinssl description {Allow secure connections using wolfSSL, formerly CyaSSL} {
     150        depends_lib-append      port:wolfssl
     151        configure.args-replace  --without-cyassl --with-cyassl
     152    }
     153
    143154    variant gss description {Support the Generic Security Service API} {
    144155        # This needs to use the system's Kerberos, not MacPorts' gss or kerberos5.
    145156        conflicts-append        gss kerberos5
     
    182193        configure.args-replace  --without-spnego --with-spnego=${prefix}
    183194    }
    184195
    185     variant ssl conflicts gnutls description {Allow secure connections using OpenSSL} {
     196    variant ssl conflicts gnutls wolfssl darwinssl description {Allow secure connections using OpenSSL} {
    186197        depends_lib-append      path:lib/libssl.dylib:openssl \
    187198                                path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
    188199        configure.args-replace  --without-ssl --with-ssl=${prefix}
     
    189200        configure.args-append   --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt
    190201    }
    191202
    192     if {![variant_isset gnutls]} {
     203    if {![variant_isset gnutls] && ![variant_isset darwinssl] && ![variant_isset wolfssl]} {
    193204        default_variants +ssl
    194205    }
    195206