Changeset 147581


Ignore:
Timestamp:
Apr 8, 2016, 6:50:22 PM (3 years ago)
Author:
cal@…
Message:

mutt: 1.6.0, replaces mutt-devel

Update mutt to 1.6.0, refresh the sidebar patch (fixing the few conflicts it
had) and replace mutt-devel with the now 1.6.0 mutt port. The 1.5.x series had
become a de-facto stable distribution that was packaged by other distributions
as stable for a while.

Location:
trunk/dports/mail
Files:
1 added
1 deleted
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/dports/mail/mutt-devel/Portfile

    r143459 r147581  
    55
    66name                mutt-devel
    7 conflicts           mutt
    87version             1.5.24
    9 revision            1
     8revision            2
    109categories          mail
    11 platforms           darwin
    12 license             GPL-2
    13 maintainers         nomaintainer
    1410
    1511description         The Mutt E-Mail Client
    16 long_description    Mutt is a small but very powerful text-based MIME \
    17                     mail client. Mutt is highly configurable, and is \
    18                     well suited to the mail power user with advanced \
    19                     features like key bindings, keyboard macros, mail \
    20                     threading, regular expression searches and \
    21                     a powerful pattern matching language for selecting \
    22                     groups of messages.
    23 homepage            http://www.mutt.org/
    2412
    25 depends_lib         port:gettext \
    26                     port:libiconv \
    27                     port:ncurses
    28 
    29 depends_run         path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
    30 
    31 master_sites        https://bitbucket.org/mutt/mutt/downloads/
    32 distname            mutt-${version}
    33 checksums           ${distfiles} \
    34                     rmd160  7fe7e653c27c9b580f958493638c1248d0ad5591 \
    35                     sha256  a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200
    36 
    37 patch.pre_args      -p1
    38 # Fix for handling emails from bad clients w.r.t smime
    39 # See https://trac.macports.org/ticket/39362 and http://dev.mutt.org/trac/ticket/3285
    40 patchfiles-append   patch-thunderbird-fix.diff
    41 
    42 
    43 configure.args      --disable-warnings \
    44                     --mandir=${prefix}/share/man \
    45                     --with-docdir=${prefix}/share/doc/mutt \
    46                     --with-libiconv-prefix=${prefix} \
    47                     --with-curses=${prefix} \
    48                     --disable-silent-rules
    49 
    50 default_variants    +pop +imap
    51 
    52 if {![variant_isset db4] && ![variant_isset qdbm] && ![variant_isset tokyocabinet]} {
    53     variant_set     gdbm
    54 }
    55 
    56 # These variants' patches modify Makefile.am
    57 if {[variant_isset compress] || [variant_isset sidebar]} {
    58     use_autoreconf  yes
    59 }
    60 
    61 post-destroot {
    62     # delete pgpring to avoid a conflict with signing-party
    63     delete ${destroot}${prefix}/bin/pgpring ${destroot}${prefix}/share/man/man1/pgpring.1
    64     # delete horribly outdated ca bundle, I hope people weren't using that!
    65     delete ${destroot}${prefix}/share/doc/mutt/samples/ca-bundle.crt
    66 }
    67 
    68 variant idn description {Internationalized Domain Name support} {
    69     configure.args-append   --with-idn=${prefix}
    70     depends_lib-append      port:libidn port:zlib
    71 }
    72 
    73 variant pop description {POP support} {
    74     configure.args-append   --enable-pop
    75 }
    76 variant imap description {IMAP support} {
    77     configure.args-append   --enable-imap
    78 }
    79 variant ssl description {Secure Sockets Layer support} {
    80     configure.args-append   --with-ssl=${prefix}
    81     depends_lib-append      path:lib/libssl.dylib:openssl
    82 }
    83 variant sasl description {Simple Authentication and Security Layer support} {
    84     configure.args-append   --with-sasl=${prefix}
    85     depends_lib-append      port:cyrus-sasl2
    86 }
    87 
    88 variant debug description {Debugging support} {
    89     configure.args-append   --enable-debug
    90 }
    91 
    92 variant gnuregex description {Use the GNU regular expression library} {
    93     configure.args-append   --with-regex
    94 }
    95 
    96 variant compress description {Compressed folders} {
    97     configure.args-append   --enable-compressed
    98     patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.24/
    99     patchfiles-append       patch-1.5.24.rr.compressed.gz
    100     checksums-append        patch-1.5.24.rr.compressed.gz \
    101                             rmd160  2bf71a26de195ce11ed4ffa25403363cab7c9b72 \
    102                             sha256  c5eb9b53f7bd3feaa5ee03722575f64e43512b756c099ffe20db6fe5c958e3dc
    103 }
    104 
    105 variant headercache conflicts db4 description {Enable header caching (requires gdbm, qdbm, or tokyocabinet)} {
    106     configure.args-append       --enable-hcache
    107     configure.ldflags-append    "-L/usr/lib"
    108 }
    109 
    110 variant qdbm conflicts db4 gdbm tokyocabinet description {Use QDBM database} {
    111     depends_lib-append      port:qdbm
    112     configure.args-append   --with-qdbm \
    113                             --without-bdb \
    114                             --without-gdbm \
    115                             --without-tokyocabinet
    116 }
    117 
    118 variant gdbm conflicts db4 qdbm tokyocabinet description {Use GNU dbm database} {
    119     depends_lib-append      port:gdbm
    120     configure.args-append   --with-gdbm \
    121                             --without-bdb \
    122                             --without-qdbm \
    123                             --without-tokyocabinet
    124 }
    125 
    126 variant db4 conflicts qdbm gdbm tokyocabinet description {Use Berkeley DB database} {
    127     depends_lib-append          port:db44
    128     configure.args-append       --with-bdb=${prefix} \
    129                                 --without-qdbm \
    130                                 --without-gdbm \
    131                                 --without-tokyocabinet
    132     configure.cppflags-append   "-I${prefix}/include/db44"
    133     configure.ldflags-append    "-L${prefix}/lib/db44"
    134 }
    135 
    136 variant tokyocabinet conflicts db4 gdbm qdbm description {Use Tokyo Cabinet database} {
    137     depends_lib-append      port:tokyocabinet
    138     configure.args-append   --with-tokyocabinet \
    139                             --without-bdb \
    140                             --without-gdbm \
    141                             --without-qdbm
    142 }
    143 
    144 # The patches for nntp and sidebar conflict, see ticket #15135
    145 variant nntp conflicts sidebar description {NNTP support} {
    146     configure.args-append   --enable-nntp
    147     patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.24/
    148     patchfiles-append       patch-1.5.24.vvv.nntp.gz
    149     checksums-append        patch-1.5.24.vvv.nntp.gz \
    150                             rmd160  028b86c3864ec2b8a485b998ce42d55fbb98e205 \
    151                             sha256  d34be4542d549aab6de9f7038c88b3eeefe826db643c92b27e1e65ab5f7d573e
    152 }
    153 
    154 variant deepif description {Allow nested if-else sequences in strings} {
    155     patch_sites-append      http://home.uchicago.edu/~dgc/sw/mutt/
    156     patchfiles-append       patch-1.5.8.dgc.deepif.1
    157     checksums-append        patch-1.5.8.dgc.deepif.1 \
    158                             rmd160  9372934147e8b832390c45833d0b8ce6c704dd24 \
    159                             sha256  570c343a440f5957e8e4639bda598c861cfaeae065a380a2c01ccb17d373ce6b
    160 }
    161 
    162 variant date_conditional requires deepif description \
    163     {Allow the format of dates in the index to vary based on how recent the message is} {
    164     # original, but now dgc hosts it with -p1
    165     #patch_sites-append http://www.schrab.com/aaron/mutt/
    166     patch_sites-append      http://home.uchicago.edu/~dgc/sw/mutt/
    167     patchfiles-append       patch-1.5.8.ats.date_conditional.1
    168     checksums-append        patch-1.5.8.ats.date_conditional.1 \
    169                             rmd160  fc3703edc66b5043227a7abcfed10a9c44873fd0 \
    170                             sha256  9e81f9f52577eb572e29651402ded3690e470d1628a890af9f3ad25b665d600f
    171 }
    172 
    173 variant xlabel description {Custom message-tagging - X-Label:} {
    174     patchfiles-append       patch-1.5.21.mp.xlabel_ext.9
    175 }
    176 
    177 variant smtp description {Include internal SMTP relay support} {
    178     configure.args-append   --enable-smtp
    179 }
    180 
    181 variant sidebar conflicts nntp trash description {Add a sidebar with a list of folders} {
    182     # http://www.lunar-linux.org/mutt-sidebar/
    183     patch_sites-append      http://lunar-linux.org/~tchan/mutt:sidebar-patch
    184     patchfiles-append       patch-1.5.24.sidebar.20151111.txt:sidebar-patch \
    185                             1-Make_hierarchy_separator_for_folder_indentation_configurable.patch \
    186                             2-Support_long_er__folder_names_in_sidebar.patch
    187     checksums-append        patch-1.5.24.sidebar.20151111.txt \
    188                             rmd160  521938ab47440e93f73bc5ae358e867ab3d3212c \
    189                             sha256  66441edf056032119f854fc5ee86c73eece8b95dc998c0cfae5ed05b0b035070
    190 }
    191 
    192 # Trash patch from https://trac.macports.org/ticket/20412 conflicts with sidebar patch on global.h
    193 variant trash conflicts sidebar description {Add a Trash folder} {
    194     patchfiles-append       patch-1.5.24-trash_folder-purge_message.diff
    195 }
    196 
    197 variant gpgme description {Enable GPGME crypto support} {
    198     configure.args-append   --enable-gpgme \
    199                             --with-gpgme-prefix=${prefix}
    200     depends_lib-append      port:gpgme
    201 }
    202 
    203 notes "This port no longer installs the pgpring binary. Please install the signing-party port if you need it."
    204 
    205 livecheck.type      regex
    206 livecheck.regex     {Mutt (\d+(?:\.\d+)*) was released}
     13replaced_by         mutt
     14PortGroup           obsolete 1.0
  • trunk/dports/mail/mutt/Portfile

    r143459 r147581  
    44PortSystem          1.0
    55
    6 name                mutt-devel
    7 conflicts           mutt
    8 version             1.5.24
    9 revision            1
     6name                mutt
     7version             1.6.0
    108categories          mail
    119platforms           darwin
     
    2119                    a powerful pattern matching language for selecting \
    2220                    groups of messages.
    23 homepage            http://www.mutt.org/
     21homepage            http://www.mutt.org
    2422
    2523depends_lib         port:gettext \
     
    3028
    3129master_sites        https://bitbucket.org/mutt/mutt/downloads/
    32 distname            mutt-${version}
    3330checksums           ${distfiles} \
    34                     rmd160  7fe7e653c27c9b580f958493638c1248d0ad5591 \
    35                     sha256  a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200
     31                    rmd160  1ea7153ef05413d0068b5478acad87927e5cecdb \
     32                    sha256  29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19
    3633
    3734patch.pre_args      -p1
     
    3936# See https://trac.macports.org/ticket/39362 and http://dev.mutt.org/trac/ticket/3285
    4037patchfiles-append   patch-thunderbird-fix.diff
    41 
    4238
    4339configure.args      --disable-warnings \
     
    4844                    --disable-silent-rules
    4945
    50 default_variants    +pop +imap
     46default_variants    +pop +imap +idn
    5147
    5248if {![variant_isset db4] && ![variant_isset qdbm] && ![variant_isset tokyocabinet]} {
     
    181177variant sidebar conflicts nntp trash description {Add a sidebar with a list of folders} {
    182178    # http://www.lunar-linux.org/mutt-sidebar/
    183     patch_sites-append      http://lunar-linux.org/~tchan/mutt:sidebar-patch
    184     patchfiles-append       patch-1.5.24.sidebar.20151111.txt:sidebar-patch \
     179    #patch_sites-append      http://lunar-linux.org/~tchan/mutt:sidebar-patch
     180    patchfiles-append       patch-1.6.0.sidebar.20160408.macports.diff \
    185181                            1-Make_hierarchy_separator_for_folder_indentation_configurable.patch \
    186182                            2-Support_long_er__folder_names_in_sidebar.patch
    187     checksums-append        patch-1.5.24.sidebar.20151111.txt \
    188                             rmd160  521938ab47440e93f73bc5ae358e867ab3d3212c \
    189                             sha256  66441edf056032119f854fc5ee86c73eece8b95dc998c0cfae5ed05b0b035070
     183    #checksums-append        patch-1.5.24.sidebar.20151111.txt \
     184    #                        rmd160  521938ab47440e93f73bc5ae358e867ab3d3212c \
     185    #                        sha256  66441edf056032119f854fc5ee86c73eece8b95dc998c0cfae5ed05b0b035070
    190186}
    191187
     
    203199notes "This port no longer installs the pgpring binary. Please install the signing-party port if you need it."
    204200
     201livecheck.url       ${homepage}/download.html
    205202livecheck.type      regex
    206 livecheck.regex     {Mutt (\d+(?:\.\d+)*) was released}
     203livecheck.regex     {The current stable public release version is (\d+(?:\.\d+)*)}
Note: See TracChangeset for help on using the changeset viewer.