Opened 8 years ago

Closed 8 years ago

#52293 closed defect (fixed)

neomutt: update db4, add lmdb, simplify header cache implementation handling

Reported by: neverpanic (Clemens Lang) Owned by: lbschenkel (Leonardo Brondani Schenkel)
Priority: Normal Milestone:
Component: ports Version: 2.3.4
Keywords: haspatch Cc:
Port: neomutt

Description (last modified by neverpanic (Clemens Lang))

Here's a patch that adds a variant for LMDB, updates the DB4 version used to the latest compatible version and removes an unneeded -L/usr/lib for the header cache variant.

OK to commit?

  • Portfile

     
    55PortGroup           github 1.0
    66
    77github.setup        neomutt neomutt 20160916 neomutt-
    8 revision            1
     8revision            2
    99categories          mail
    1010platforms           darwin
    1111license             GPL-2
     
    5252                    --without-gnutls \
    5353                    --without-gss \
    5454                    --without-idn \
     55                    --without-lmdb \
    5556                    --without-qdbm \
    5657                    --without-regex \
    5758                    --without-sasl \
     
    6061
    6162default_variants    +idn +imap +pop +ssl
    6263
    63 if {![variant_isset db4] && ![variant_isset qdbm] && ![variant_isset tokyocabinet]} {
    64     variant_set     gdbm
     64set hcache_variants {db4 qdbm tokyocabinet gdbm lmdb}
     65if {[variant_isset headercache]} {
     66    set found no
     67    foreach hcache_impl {db4 qdbm tokyocabinet gdbm lmdb} {
     68        if {[variant_isset $hcache_impl]} {
     69            set found yes
     70        }
     71    }
     72    if {!$found} {
     73        # If no variant was chosen, choose one for the user
     74        variant_set lmdb
     75    }
    6576}
    6677
    6778post-destroot {
     
    7384variant compress description {Compressed folders} {
    7485    configure.args-replace      --disable-compressed --enable-compressed
    7586}
    76 variant db4 conflicts qdbm gdbm tokyocabinet description {Use Berkeley DB database} {
     87variant db4 conflicts {*}[lsearch -all -inline -not $hcache_variants db4] description {Use Berkeley DB database} {
    7788    configure.args-replace      --without-bdb --with-bdb=${prefix}
    78     configure.cppflags-append   "-I${prefix}/include/db44"
    79     configure.ldflags-append    "-L${prefix}/lib/db44"
    80     depends_lib-append          port:db44
     89    configure.cppflags-append   "-I${prefix}/include/db48"
     90    configure.ldflags-append    "-L${prefix}/lib/db48"
     91    depends_lib-append          port:db48
    8192}
    8293variant debug description {Debugging support} {
    8394    configure.args-append       --enable-debug
    8495}
    85 variant gdbm conflicts db4 qdbm tokyocabinet description {Use GNU dbm database} {
     96variant gdbm conflicts {*}[lsearch -all -inline -not $hcache_variants gdbm] description {Use GNU dbm database} {
    8697    configure.args-replace      --without-gdbm --with-gdbm=${prefix}
    8798    depends_lib-append          port:gdbm
    8899}
     
    95106    configure.args-append       --with-gpgme-prefix=${prefix}
    96107    depends_lib-append          port:gpgme
    97108}
    98 variant headercache conflicts db4 description {Enable header caching (requires gdbm, qdbm, or tokyocabinet)} {
     109variant headercache description {Enable header caching (requires db4, gdbm, qdbm, lmdb or tokyocabinet)} {
    99110    configure.args-replace      --disable-hcache --enable-hcache
    100     configure.ldflags-append    "-L/usr/lib"
    101111}
    102112variant idn description {Internationalized Domain Name support} {
    103113    configure.args-replace      --without-idn --with-idn=${prefix}
     
    106116variant imap description {IMAP support} {
    107117    configure.args-replace      --disable-imap --enable-imap
    108118}
     119variant lmdb conflicts {*}[lsearch -all -inline -not $hcache_variants lmdb] description {Use LMDB database} {
     120    configure.args-replace      --without-lmdb --with-lmdb=${prefix}
     121    depends_lib-append          port:lmdb
     122}
    109123variant nntp description {NNTP support} {
    110124    configure.args-replace      --disable-nntp --enable-nntp
    111125}
    112126variant pop description {POP support} {
    113127    configure.args-replace      --disable-pop --enable-pop
    114128}
    115 variant qdbm conflicts db4 gdbm tokyocabinet description {Use QDBM database} {
     129variant qdbm conflicts {*}[lsearch -all -inline -not $hcache_variants qdbm] description {Use QDBM database} {
    116130    configure.args-replace      --without-qdbm --with-qdbm=${prefix}
    117131    depends_lib-append          port:qdbm
    118132}
     
    130144    configure.args-replace      --without-ssl --with-ssl=${prefix}
    131145    depends_lib-append          path:lib/libssl.dylib:openssl
    132146}
    133 variant tokyocabinet conflicts db4 gdbm qdbm description {Use Tokyo Cabinet database} {
     147variant tokyocabinet conflicts {*}[lsearch -all -inline -not $hcache_variants tokyocabinet] description {Use Tokyo Cabinet database} {
    134148    configure.args-replace      --without-tokyocabinet --with-tokyocabinet=${prefix}
    135149    depends_lib-append          port:tokyocabinet
    136150}

Change History (3)

comment:1 Changed 8 years ago by neverpanic (Clemens Lang)

Description: modified (diff)

comment:2 Changed 8 years ago by lbschenkel (Leonardo Brondani Schenkel)

Yes, please, and thanks.

comment:3 Changed 8 years ago by neverpanic (Clemens Lang)

Resolution: fixed
Status: newclosed

Committed in r152965.

Note: See TracTickets for help on using tickets.