<!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>[133173] trunk/dports/mail/alpine/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 { 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/133173">133173</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-02-22 17:40:47 -0800 (Sun, 22 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>alpine: Swap negative variants for positive ones</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmailalpinePortfile">trunk/dports/mail/alpine/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmailalpinePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/alpine/Portfile (133172 => 133173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/alpine/Portfile 2015-02-23 01:40:44 UTC (rev 133172)
+++ trunk/dports/mail/alpine/Portfile 2015-02-23 01:40:47 UTC (rev 133173)
</span><span class="lines">@@ -34,14 +34,9 @@
</span><span class="cx"> reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/imap/Makefile
</span><span class="cx"> }
</span><span class="cx">
</span><del>-default_variants +without_tcl
-
-depends_lib port:openssl \
</del><ins>+depends_lib port:gettext \
</ins><span class="cx"> port:libiconv \
</span><del>- port:gettext \
- port:openldap \
- port:ncurses \
- port:cyrus-sasl2
</del><ins>+ port:ncurses
</ins><span class="cx">
</span><span class="cx"> configure.env SSLDIR=${prefix}
</span><span class="cx"> configure.args -with-lib-dir=${prefix}/lib \
</span><span class="lines">@@ -53,37 +48,69 @@
</span><span class="cx"> --with-ssl-include-dir=${prefix}/include/openssl \
</span><span class="cx"> --with-ssl-lib-dir=${prefix}/lib \
</span><span class="cx"> --with-local-password-cache-method \
</span><del>- --with-debug-level=0
</del><ins>+ --with-debug-level=0 \
+ --without-krb5 \
+ --without-ldap \
+ --without-ssl \
+ --without-tcl
</ins><span class="cx">
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><span class="cx"> use_parallel_build no
</span><ins>+build.env SSLTYPE=none
</ins><span class="cx"> build.args CC=${configure.cc} \
</span><span class="cx"> EXTRACFLAGS="[get_canonical_archflags cc]" \
</span><span class="cx"> EXTRALDFLAGS="[get_canonical_archflags ld]" \
</span><span class="cx"> SPECIALS="GSSDIR=${prefix} SSLDIR=${prefix}"
</span><span class="cx">
</span><del>-variant without_krb5 description {Disable Kerberos5 support} {
- depends_lib-delete port:cyrus-sasl2
- configure.args-append --without-krb5
-}
</del><ins>+# TODO: Remove legacy variants after 2016-02-20.
</ins><span class="cx">
</span><del>-variant without_ldap description {Disable LDAP support} {
- depends_lib-delete port:openldap
- configure.args-append --without-ldap
-}
</del><ins>+variant without_krb5 conflicts kerberos description {Legacy variant} {}
+variant without_ldap conflicts ldap description {Legacy variant} {}
+variant without_ssl conflicts ssl description {Legacy variant} {}
+variant without_tcl conflicts tcl description {Legacy variant} {}
</ins><span class="cx">
</span><del>-variant without_ssl description {Disable SSL support} {
- depends_lib-delete port:openssl
- configure.args-append --without-ssl
- build.env-append SSLTYPE=none
-}
</del><ins>+# TODO: Replace this morass after 2016-02-20.
+#default_variants +kerberos +ldap +ssl
</ins><span class="cx">
</span><del>-variant without_tcl description {Disable TCL support (disables Alpine Web)} {
- configure.args-append --without-tcl
</del><ins>+if {![variant_isset without_krb5]} {
+ default_variants +kerberos
</ins><span class="cx"> }
</span><ins>+if {![variant_isset without_ldap]} {
+ default_variants +ldap
+}
+if {![variant_isset without_ssl]} {
+ default_variants +ssl
+}
+if {![variant_isset tcl]} {
+ default_variants +without_tcl
+}
+if {![variant_isset without_tcl]} {
+ default_variants +tcl
+}
</ins><span class="cx">
</span><span class="cx"> variant passfile description {Enable password files support} {
</span><span class="cx"> configure.args-delete --with-local-password-cache-method
</span><span class="cx"> configure.args-append --with-passfile=".pine.pwd"
</span><span class="cx"> }
</span><ins>+
+variant kerberos description {Kerberos support} {
+ depends_lib-append port:cyrus-sasl2
+ configure.args-delete --without-krb5
+}
+
+variant ldap description {LDAP support} {
+ depends_lib-append port:openldap
+ configure.args-delete --without-ldap
+}
+
+variant ssl description {OpenSSL support} {
+ depends_lib-append port:openssl
+ configure.args-delete --without-ssl
+ build.env-delete SSLTYPE=none
+}
+
+variant tcl description {Tcl support (required by Alpine Web} {
+ # Should we force MacPorts' Tcl?
+ configure.args-delete --without-tcl
+}
</ins></span></pre>
</div>
</div>
</body>
</html>