<!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>[152965] trunk/dports/mail/neomutt/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/152965">152965</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2016-09-21 05:43:11 -0700 (Wed, 21 Sep 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>neomutt: update +db4, add +lmdb

Add a variant for the LMDB headercache backend and make it the default if no
backend was selected, since it's faster than the previous default gdbm.

Improve the variant handling for the headercache backends and remove the
incorrect conflict between +headercache and +db4.

Update the +db4 variant to use db48 instead of db44.

Remove unnecessary -L/usr/lib linker flag from +headercache.

Closes: #52293</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmailneomuttPortfile">trunk/dports/mail/neomutt/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmailneomuttPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/neomutt/Portfile (152964 => 152965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/neomutt/Portfile        2016-09-21 11:57:16 UTC (rev 152964)
+++ trunk/dports/mail/neomutt/Portfile        2016-09-21 12:43:11 UTC (rev 152965)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup           github 1.0
</span><span class="cx"> 
</span><span class="cx"> github.setup        neomutt neomutt 20160916 neomutt-
</span><del>-revision            1
</del><ins>+revision            2
</ins><span class="cx"> categories          mail
</span><span class="cx"> platforms           darwin
</span><span class="cx"> license             GPL-2
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx">                     --without-gnutls \
</span><span class="cx">                     --without-gss \
</span><span class="cx">                     --without-idn \
</span><ins>+                    --without-lmdb \
</ins><span class="cx">                     --without-qdbm \
</span><span class="cx">                     --without-regex \
</span><span class="cx">                     --without-sasl \
</span><span class="lines">@@ -60,8 +61,18 @@
</span><span class="cx"> 
</span><span class="cx"> default_variants    +idn +imap +pop +ssl
</span><span class="cx"> 
</span><del>-if {![variant_isset db4] &amp;&amp; ![variant_isset qdbm] &amp;&amp; ![variant_isset tokyocabinet]} {
-    variant_set     gdbm
</del><ins>+set hcache_variants {db4 qdbm tokyocabinet gdbm lmdb}
+if {[variant_isset headercache]} {
+    set found no
+    foreach hcache_impl {db4 qdbm tokyocabinet gdbm lmdb} {
+        if {[variant_isset $hcache_impl]} {
+            set found yes
+        }
+    }
+    if {!$found} {
+        # If no variant was chosen, choose one for the user
+        variant_set lmdb
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> post-destroot {
</span><span class="lines">@@ -73,16 +84,16 @@
</span><span class="cx"> variant compress description {Compressed folders} {
</span><span class="cx">     configure.args-replace      --disable-compressed --enable-compressed
</span><span class="cx"> }
</span><del>-variant db4 conflicts qdbm gdbm tokyocabinet description {Use Berkeley DB database} {
</del><ins>+variant db4 conflicts {*}[lsearch -all -inline -not $hcache_variants db4] description {Use Berkeley DB database} {
</ins><span class="cx">     configure.args-replace      --without-bdb --with-bdb=${prefix}
</span><del>-    configure.cppflags-append   &quot;-I${prefix}/include/db44&quot;
-    configure.ldflags-append    &quot;-L${prefix}/lib/db44&quot;
-    depends_lib-append          port:db44
</del><ins>+    configure.cppflags-append   &quot;-I${prefix}/include/db48&quot;
+    configure.ldflags-append    &quot;-L${prefix}/lib/db48&quot;
+    depends_lib-append          port:db48
</ins><span class="cx"> }
</span><span class="cx"> variant debug description {Debugging support} {
</span><span class="cx">     configure.args-append       --enable-debug
</span><span class="cx"> }
</span><del>-variant gdbm conflicts db4 qdbm tokyocabinet description {Use GNU dbm database} {
</del><ins>+variant gdbm conflicts {*}[lsearch -all -inline -not $hcache_variants gdbm] description {Use GNU dbm database} {
</ins><span class="cx">     configure.args-replace      --without-gdbm --with-gdbm=${prefix}
</span><span class="cx">     depends_lib-append          port:gdbm
</span><span class="cx"> }
</span><span class="lines">@@ -95,9 +106,8 @@
</span><span class="cx">     configure.args-append       --with-gpgme-prefix=${prefix}
</span><span class="cx">     depends_lib-append          port:gpgme
</span><span class="cx"> }
</span><del>-variant headercache conflicts db4 description {Enable header caching (requires gdbm, qdbm, or tokyocabinet)} {
</del><ins>+variant headercache description {Enable header caching (requires db4, gdbm, qdbm, lmdb or tokyocabinet)} {
</ins><span class="cx">     configure.args-replace      --disable-hcache --enable-hcache
</span><del>-    configure.ldflags-append    &quot;-L/usr/lib&quot;
</del><span class="cx"> }
</span><span class="cx"> variant idn description {Internationalized Domain Name support} {
</span><span class="cx">     configure.args-replace      --without-idn --with-idn=${prefix}
</span><span class="lines">@@ -106,13 +116,17 @@
</span><span class="cx"> variant imap description {IMAP support} {
</span><span class="cx">     configure.args-replace      --disable-imap --enable-imap
</span><span class="cx"> }
</span><ins>+variant lmdb conflicts {*}[lsearch -all -inline -not $hcache_variants lmdb] description {Use LMDB database} {
+    configure.args-replace      --without-lmdb --with-lmdb=${prefix}
+    depends_lib-append          port:lmdb
+}
</ins><span class="cx"> variant nntp description {NNTP support} {
</span><span class="cx">     configure.args-replace      --disable-nntp --enable-nntp
</span><span class="cx"> }
</span><span class="cx"> variant pop description {POP support} {
</span><span class="cx">     configure.args-replace      --disable-pop --enable-pop
</span><span class="cx"> }
</span><del>-variant qdbm conflicts db4 gdbm tokyocabinet description {Use QDBM database} {
</del><ins>+variant qdbm conflicts {*}[lsearch -all -inline -not $hcache_variants qdbm] description {Use QDBM database} {
</ins><span class="cx">     configure.args-replace      --without-qdbm --with-qdbm=${prefix}
</span><span class="cx">     depends_lib-append          port:qdbm
</span><span class="cx"> }
</span><span class="lines">@@ -130,7 +144,7 @@
</span><span class="cx">     configure.args-replace      --without-ssl --with-ssl=${prefix}
</span><span class="cx">     depends_lib-append          path:lib/libssl.dylib:openssl
</span><span class="cx"> }
</span><del>-variant tokyocabinet conflicts db4 gdbm qdbm description {Use Tokyo Cabinet database} {
</del><ins>+variant tokyocabinet conflicts {*}[lsearch -all -inline -not $hcache_variants tokyocabinet] description {Use Tokyo Cabinet database} {
</ins><span class="cx">     configure.args-replace      --without-tokyocabinet --with-tokyocabinet=${prefix}
</span><span class="cx">     depends_lib-append          port:tokyocabinet
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>