<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[154173] trunk/dports/net/curl/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/154173">154173</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-10-23 16:02:23 +0200 (Sun, 23 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>curl: add variant support for +wolfssl +darwinssl after maintainer's review (#52615).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetcurlPortfile">trunk/dports/net/curl/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetcurlPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/curl/Portfile (154172 => 154173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/curl/Portfile 2016-10-23 13:38:02 UTC (rev 154172)
+++ trunk/dports/net/curl/Portfile 2016-10-23 14:02:23 UTC (rev 154173)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx">
</span><span class="cx"> configure.args --disable-silent-rules \
</span><span class="cx"> --enable-ipv6 \
</span><ins>+ --without-cyassl \
</ins><span class="cx"> --without-gnutls \
</span><span class="cx"> --without-gssapi \
</span><span class="cx"> --without-libidn \
</span><span class="lines">@@ -55,6 +56,7 @@
</span><span class="cx"> --without-polarssl \
</span><span class="cx"> --without-spnego \
</span><span class="cx"> --without-ssl \
</span><ins>+ --without-darwinssl \
</ins><span class="cx"> --disable-ares \
</span><span class="cx"> --disable-ldap \
</span><span class="cx"> --disable-ldaps \
</span><span class="lines">@@ -135,11 +137,20 @@
</span><span class="cx"> configure.args-replace --disable-ares --enable-ares
</span><span class="cx"> }
</span><span class="cx">
</span><del>- variant gnutls conflicts ssl description {Allow secure connections using GNU TLS} {
</del><ins>+ variant darwinssl conflicts ssl gnutls wolfssl description {Allow secure connections using GNU TLS} {
+ configure.args-replace --without-darwinssl --with-darwinssl
+ }
+
+ variant gnutls conflicts ssl wolfssl darwinssl description {Allow secure connections using GNU TLS} {
</ins><span class="cx"> depends_lib-append port:gnutls
</span><span class="cx"> configure.args-replace --without-gnutls --with-gnutls
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ variant wolfssl conflicts ssl gnutls darwinssl description {Allow secure connections using wolfSSL, formerly CyaSSL} {
+ depends_lib-append port:wolfssl
+ configure.args-replace --without-cyassl --with-cyassl
+ }
+
</ins><span class="cx"> variant gss description {Support the Generic Security Service API} {
</span><span class="cx"> # This needs to use the system's Kerberos, not MacPorts' gss or kerberos5.
</span><span class="cx"> conflicts-append gss kerberos5
</span><span class="lines">@@ -182,7 +193,7 @@
</span><span class="cx"> configure.args-replace --without-spnego --with-spnego=${prefix}
</span><span class="cx"> }
</span><span class="cx">
</span><del>- variant ssl conflicts gnutls description {Allow secure connections using OpenSSL} {
</del><ins>+ variant ssl conflicts gnutls wolfssl darwinssl description {Allow secure connections using OpenSSL} {
</ins><span class="cx"> depends_lib-append path:lib/libssl.dylib:openssl \
</span><span class="cx"> path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
</span><span class="cx"> configure.args-replace --without-ssl --with-ssl=${prefix}
</span><span class="lines">@@ -189,7 +200,7 @@
</span><span class="cx"> configure.args-append --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {![variant_isset gnutls]} {
</del><ins>+ if {![variant_isset gnutls] && ![variant_isset darwinssl] && ![variant_isset wolfssl]} {
</ins><span class="cx"> default_variants +ssl
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>