[152965] trunk/dports/mail/neomutt/Portfile

[cal at macports.org]

Revision: 152965
          https://trac.macports.org/changeset/152965
Author:   cal at macports.org
Date:     2016-09-21 05:43:11 -0700 (Wed, 21 Sep 2016)
Log Message:
-----------
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

Modified Paths:
--------------
    trunk/dports/mail/neomutt/Portfile

Modified: trunk/dports/mail/neomutt/Portfile
===================================================================
--- 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)
@@ -5,7 +5,7 @@
 PortGroup           github 1.0
 
 github.setup        neomutt neomutt 20160916 neomutt-
-revision            1
+revision            2
 categories          mail
 platforms           darwin
 license             GPL-2
@@ -52,6 +52,7 @@
                     --without-gnutls \
                     --without-gss \
                     --without-idn \
+                    --without-lmdb \
                     --without-qdbm \
                     --without-regex \
                     --without-sasl \
@@ -60,8 +61,18 @@
 
 default_variants    +idn +imap +pop +ssl
 
-if {![variant_isset db4] && ![variant_isset qdbm] && ![variant_isset tokyocabinet]} {
-    variant_set     gdbm
+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
+    }
 }
 
 post-destroot {
@@ -73,16 +84,16 @@
 variant compress description {Compressed folders} {
     configure.args-replace      --disable-compressed --enable-compressed
 }
-variant db4 conflicts qdbm gdbm tokyocabinet description {Use Berkeley DB database} {
+variant db4 conflicts {*}[lsearch -all -inline -not $hcache_variants db4] description {Use Berkeley DB database} {
     configure.args-replace      --without-bdb --with-bdb=${prefix}
-    configure.cppflags-append   "-I${prefix}/include/db44"
-    configure.ldflags-append    "-L${prefix}/lib/db44"
-    depends_lib-append          port:db44
+    configure.cppflags-append   "-I${prefix}/include/db48"
+    configure.ldflags-append    "-L${prefix}/lib/db48"
+    depends_lib-append          port:db48
 }
 variant debug description {Debugging support} {
     configure.args-append       --enable-debug
 }
-variant gdbm conflicts db4 qdbm tokyocabinet description {Use GNU dbm database} {
+variant gdbm conflicts {*}[lsearch -all -inline -not $hcache_variants gdbm] description {Use GNU dbm database} {
     configure.args-replace      --without-gdbm --with-gdbm=${prefix}
     depends_lib-append          port:gdbm
 }
@@ -95,9 +106,8 @@
     configure.args-append       --with-gpgme-prefix=${prefix}
     depends_lib-append          port:gpgme
 }
-variant headercache conflicts db4 description {Enable header caching (requires gdbm, qdbm, or tokyocabinet)} {
+variant headercache description {Enable header caching (requires db4, gdbm, qdbm, lmdb or tokyocabinet)} {
     configure.args-replace      --disable-hcache --enable-hcache
-    configure.ldflags-append    "-L/usr/lib"
 }
 variant idn description {Internationalized Domain Name support} {
     configure.args-replace      --without-idn --with-idn=${prefix}
@@ -106,13 +116,17 @@
 variant imap description {IMAP support} {
     configure.args-replace      --disable-imap --enable-imap
 }
+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
+}
 variant nntp description {NNTP support} {
     configure.args-replace      --disable-nntp --enable-nntp
 }
 variant pop description {POP support} {
     configure.args-replace      --disable-pop --enable-pop
 }
-variant qdbm conflicts db4 gdbm tokyocabinet description {Use QDBM database} {
+variant qdbm conflicts {*}[lsearch -all -inline -not $hcache_variants qdbm] description {Use QDBM database} {
     configure.args-replace      --without-qdbm --with-qdbm=${prefix}
     depends_lib-append          port:qdbm
 }
@@ -130,7 +144,7 @@
     configure.args-replace      --without-ssl --with-ssl=${prefix}
     depends_lib-append          path:lib/libssl.dylib:openssl
 }
-variant tokyocabinet conflicts db4 gdbm qdbm description {Use Tokyo Cabinet database} {
+variant tokyocabinet conflicts {*}[lsearch -all -inline -not $hcache_variants tokyocabinet] description {Use Tokyo Cabinet database} {
     configure.args-replace      --without-tokyocabinet --with-tokyocabinet=${prefix}
     depends_lib-append          port:tokyocabinet
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160921/6d23f933/attachment.html>