Updated mutt to 1.8.0. 1.8.0 (2017-02-24): - $locale has been removed. Mutt now respects the LC_TIME setting instead. See also $attribution_locale. + $attribution_locale can be used to override the date formatting in attribution strings. When unset, Mutt will use the locale environment, but note the default value of $date_format has a leading '!' which says to use the C-locale. ! Message-id and mail-followup-to headers are now preserved for recalled messages. + <unsidebar_whitelist> added to complement <sidebar_whitelist>. ! The pager position is reset to the top when toggling header-weed. ! IMAP messages moved to $trash via server-side copy are marked as read. + <root-message> jumps to the root message of a thread. ! Piped text attachments are charset converted. + Added %F to $attach_format, to show the content-disposition filename. %d will fall back to %F which will fall back to %f. + <rename-attachment> allows an attachment name to be changed, without modifying the underlying file's name. ! Mutt will look for the user's muttrc additionally in $XDG_CONFIG_HOME/mutt/. + Compressed mbox and mmdf files are now supported via open-hook, close-hook, and append-hook. See contrib/sample.muttrc-compress for suggested settings. Note this is a compile-time option: --enable-compressed. + When $flag_safe is set, flagged messages cannot be deleted. + The '@' pattern modifier can be used to limit matches to known aliases. + <mark-message> creates a hotkey binding to a specific message. The hotkey prefix is specified via $mark_macro_prefix. + <setenv> and <unsetenv> can be used to add/remove environment variables passed to children. ! Mutt will now use the built-in OpenSSL SSL_set_verify() callback to verify certificates. This allows better support for verifying chains, including alternative chain support. + $uncollapse_new controls whether a thread will be uncollapsed when a new message arrives. ! $to_chars and $status_chars now accept multibyte characters. + <subjectrx> allows replacing matching subjects with something else. This can be used to declutter subject lines in the index. + <edit-label> can be used to add, change, or delete a message's X-Label. ! Pattern expressions with ~y support label tab completion. + The header cache now also supports Kyoto Cabinet and LMDB as backend databases. [not yet supported in pkgsrc]diff -r1.185 -r1.186 pkgsrc/mail/mutt/Makefile
(wiz)
@@ -1,15 +1,14 @@ | @@ -1,15 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.185 2017/01/04 16:13:20 roy Exp $ | 1 | # $NetBSD: Makefile,v 1.186 2017/02/24 23:31:24 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= mutt-1.7.2 | 3 | DISTNAME= mutt-1.8.0 | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= mail | 4 | CATEGORIES= mail | |
6 | MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ | 5 | MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ | |
7 | 6 | |||
8 | MAINTAINER= tonio@NetBSD.org | 7 | MAINTAINER= tonio@NetBSD.org | |
9 | HOMEPAGE= http://www.mutt.org/ | 8 | HOMEPAGE= http://www.mutt.org/ | |
10 | COMMENT= Text-based MIME mail client with PGP & S/MIME support | 9 | COMMENT= Text-based MIME mail client with PGP & S/MIME support | |
11 | LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer | 10 | LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer | |
12 | 11 | |||
13 | .include "Makefile.common" | 12 | .include "Makefile.common" | |
14 | 13 | |||
15 | .include "../../mk/bsd.pkg.mk" | 14 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.19 2016/10/13 17:53:36 tron Exp $ | 1 | @comment $NetBSD: PLIST,v 1.20 2017/02/24 23:31:24 wiz Exp $ | |
2 | bin/flea | 2 | bin/flea | |
3 | bin/mutt | 3 | bin/mutt | |
4 | bin/mutt_dotlock | 4 | bin/mutt_dotlock | |
5 | bin/muttbug | 5 | bin/muttbug | |
6 | bin/pgpewrap | 6 | bin/pgpewrap | |
7 | bin/pgpring | 7 | bin/pgpring | |
8 | ${PLIST.smime}bin/smime_keys | 8 | ${PLIST.smime}bin/smime_keys | |
9 | man/man1/flea.1 | 9 | man/man1/flea.1 | |
10 | man/man1/mutt.1 | 10 | man/man1/mutt.1 | |
11 | man/man1/mutt_dotlock.1 | 11 | man/man1/mutt_dotlock.1 | |
12 | man/man1/muttbug.1 | 12 | man/man1/muttbug.1 | |
13 | man/man1/pgpewrap.1 | 13 | man/man1/pgpewrap.1 | |
14 | man/man1/pgpring.1 | 14 | man/man1/pgpring.1 | |
@@ -69,26 +69,27 @@ share/examples/mutt/iconv/iconv.osf1-4.0 | @@ -69,26 +69,27 @@ share/examples/mutt/iconv/iconv.osf1-4.0 | |||
69 | share/examples/mutt/iconv/iconv.solaris-2.4.rc | 69 | share/examples/mutt/iconv/iconv.solaris-2.4.rc | |
70 | share/examples/mutt/iconv/iconv.solaris-2.5.1.rc | 70 | share/examples/mutt/iconv/iconv.solaris-2.5.1.rc | |
71 | share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc | 71 | share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc | |
72 | share/examples/mutt/iconv/iconv.solaris-2.6.rc | 72 | share/examples/mutt/iconv/iconv.solaris-2.6.rc | |
73 | share/examples/mutt/iconv/iconv.solaris-2.7.rc | 73 | share/examples/mutt/iconv/iconv.solaris-2.7.rc | |
74 | share/examples/mutt/mime.types | 74 | share/examples/mutt/mime.types | |
75 | share/examples/mutt/mime.types.dist | 75 | share/examples/mutt/mime.types.dist | |
76 | share/examples/mutt/mutt_xtitle | 76 | share/examples/mutt/mutt_xtitle | |
77 | share/examples/mutt/pgp2.rc | 77 | share/examples/mutt/pgp2.rc | |
78 | share/examples/mutt/pgp5.rc | 78 | share/examples/mutt/pgp5.rc | |
79 | share/examples/mutt/pgp6.rc | 79 | share/examples/mutt/pgp6.rc | |
80 | share/examples/mutt/sample.mailcap | 80 | share/examples/mutt/sample.mailcap | |
81 | share/examples/mutt/sample.muttrc | 81 | share/examples/mutt/sample.muttrc | |
82 | share/examples/mutt/sample.muttrc-compress | |||
82 | share/examples/mutt/sample.muttrc-sidebar | 83 | share/examples/mutt/sample.muttrc-sidebar | |
83 | share/examples/mutt/sample.muttrc-tlr | 84 | share/examples/mutt/sample.muttrc-tlr | |
84 | share/examples/mutt/sample.vimrc-sidebar | 85 | share/examples/mutt/sample.vimrc-sidebar | |
85 | share/examples/mutt/smime.rc | 86 | share/examples/mutt/smime.rc | |
86 | share/examples/mutt/smime_keys_test.pl | 87 | share/examples/mutt/smime_keys_test.pl | |
87 | share/locale/bg/LC_MESSAGES/mutt.mo | 88 | share/locale/bg/LC_MESSAGES/mutt.mo | |
88 | share/locale/ca/LC_MESSAGES/mutt.mo | 89 | share/locale/ca/LC_MESSAGES/mutt.mo | |
89 | share/locale/cs/LC_MESSAGES/mutt.mo | 90 | share/locale/cs/LC_MESSAGES/mutt.mo | |
90 | share/locale/da/LC_MESSAGES/mutt.mo | 91 | share/locale/da/LC_MESSAGES/mutt.mo | |
91 | share/locale/de/LC_MESSAGES/mutt.mo | 92 | share/locale/de/LC_MESSAGES/mutt.mo | |
92 | share/locale/el/LC_MESSAGES/mutt.mo | 93 | share/locale/el/LC_MESSAGES/mutt.mo | |
93 | share/locale/eo/LC_MESSAGES/mutt.mo | 94 | share/locale/eo/LC_MESSAGES/mutt.mo | |
94 | share/locale/es/LC_MESSAGES/mutt.mo | 95 | share/locale/es/LC_MESSAGES/mutt.mo |
@@ -1,23 +1,19 @@ | @@ -1,23 +1,19 @@ | |||
1 | $NetBSD: distinfo,v 1.53 2016/12/05 18:19:47 tron Exp $ | 1 | $NetBSD: distinfo,v 1.54 2017/02/24 23:31:24 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (mutt-1.7.2.tar.gz) = 39be2b552b99ed16f263487017c68cdbc1c7b384 | 3 | SHA1 (mutt-1.8.0.tar.gz) = faddcf7b8044eb7f1887d61f5ffcc086fb2122ef | |
4 | RMD160 (mutt-1.7.2.tar.gz) = 85ce9a9dde6daefbfdc70b61f243433b0e304c14 | 4 | RMD160 (mutt-1.8.0.tar.gz) = c3c4f716d100aff840c96c734208b24766430d24 | |
5 | SHA512 (mutt-1.7.2.tar.gz) = 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e | 5 | SHA512 (mutt-1.8.0.tar.gz) = 20120baa1d6c528281ba02faf8f19a3cbe3fce5bb5907a3513d3ec98592cd63db2b5f02884002c45dc18a4947d5cf2ac30e2ca4e059ad7a37ca0b22734e3bf1d | |
6 | Size (mutt-1.7.2.tar.gz) = 4025880 bytes | 6 | Size (mutt-1.8.0.tar.gz) = 4116223 bytes | |
7 | SHA1 (patch-1.7.1.rr.compressed.gz) = 76c494867b9cde2b51331a2a8c908fbc5dd8865d | |||
8 | RMD160 (patch-1.7.1.rr.compressed.gz) = f55e742717b74485ca6601c7f89aea4d8327bbfc | |||
9 | SHA512 (patch-1.7.1.rr.compressed.gz) = 6cf6b8e48f25aabe4c9f895143afd972e42ea7cfd995dfd247510ef4673928bf27c20a9a312735a79f98200638e746865ab9559c1b81901d025ed657b29ef19a | |||
10 | Size (patch-1.7.1.rr.compressed.gz) = 9985 bytes | |||
11 | SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 | 7 | SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 | |
12 | SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681 | 8 | SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681 | |
13 | SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044 | 9 | SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044 | |
14 | SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344 | 10 | SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344 | |
15 | SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6 | 11 | SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6 | |
16 | SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61 | 12 | SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61 | |
17 | SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12 | 13 | SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12 | |
18 | SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a | 14 | SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a | |
19 | SHA1 (patch-al) = fb7e089c9703d13821165659f88fe78204d38a47 | 15 | SHA1 (patch-al) = fb7e089c9703d13821165659f88fe78204d38a47 | |
20 | SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f | 16 | SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f | |
21 | SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1 | 17 | SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1 | |
22 | SHA1 (patch-ao) = 7c8f18ccb3dc6a6f40daf55b53e52b4722f60efd | 18 | SHA1 (patch-ao) = 7c8f18ccb3dc6a6f40daf55b53e52b4722f60efd | |
23 | SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62 | 19 | SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62 |
@@ -1,26 +1,24 @@ | @@ -1,26 +1,24 @@ | |||
1 | # $NetBSD: options.mk,v 1.26 2017/01/04 16:13:20 roy Exp $ | 1 | # $NetBSD: options.mk,v 1.27 2017/02/24 23:31:24 wiz Exp $ | |
2 | 2 | |||
3 | # Global and legacy options | 3 | # Global and legacy options | |
4 | 4 | |||
5 | PKG_OPTIONS_VAR= PKG_OPTIONS.mutt | 5 | PKG_OPTIONS_VAR= PKG_OPTIONS.mutt | |
6 | PKG_OPTIONS_REQUIRED_GROUPS= display | 6 | PKG_OPTIONS_REQUIRED_GROUPS= display | |
7 | PKG_OPTIONS_GROUP.display= curses wide-curses slang | 7 | PKG_OPTIONS_GROUP.display= curses wide-curses slang | |
8 | PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl | 8 | PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl | |
9 | # TODO: add kyoto cabinet and lmdb backend options for header cache | |||
9 | PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp | 10 | PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp | |
10 | PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox | |||
11 | PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl | 11 | PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl | |
12 | # patch does not apply | |||
13 | #PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox | |||
14 | PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses | 12 | PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses | |
15 | 13 | |||
16 | .include "../../mk/bsd.options.mk" | 14 | .include "../../mk/bsd.options.mk" | |
17 | 15 | |||
18 | ### curses | 16 | ### curses | |
19 | ### | 17 | ### | |
20 | .if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses) | 18 | .if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses) | |
21 | . include "../../mk/curses.buildlink3.mk" | 19 | . include "../../mk/curses.buildlink3.mk" | |
22 | CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.curses} | 20 | CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.curses} | |
23 | . if !empty(CURSES_TYPE:Mcurses) | 21 | . if !empty(CURSES_TYPE:Mcurses) | |
24 | OPSYSVARS+= BUILDLINK_PASSTHRU_DIRS | 22 | OPSYSVARS+= BUILDLINK_PASSTHRU_DIRS | |
25 | BUILDLINK_PASSTHRU_DIRS.SunOS+= /usr/xpg4 | 23 | BUILDLINK_PASSTHRU_DIRS.SunOS+= /usr/xpg4 | |
26 | CONFIGURE_ARGS.SunOS+= --with-curses=/usr/xpg4 | 24 | CONFIGURE_ARGS.SunOS+= --with-curses=/usr/xpg4 | |
@@ -86,49 +84,26 @@ BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} | @@ -86,49 +84,26 @@ BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} | |||
86 | CONFIGURE_ARGS+= --enable-hcache | 84 | CONFIGURE_ARGS+= --enable-hcache | |
87 | CONFIGURE_ARGS+= --without-gdbm | 85 | CONFIGURE_ARGS+= --without-gdbm | |
88 | # BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate | 86 | # BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate | |
89 | # since the real -I and -L flags are added by buildlink already. | 87 | # since the real -I and -L flags are added by buildlink already. | |
90 | CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include | 88 | CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include | |
91 | CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib | 89 | CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib | |
92 | CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q} | 90 | CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q} | |
93 | . endif | 91 | . endif | |
94 | .else | 92 | .else | |
95 | CONFIGURE_ARGS+= --disable-hcache | 93 | CONFIGURE_ARGS+= --disable-hcache | |
96 | .endif | 94 | .endif | |
97 | 95 | |||
98 | ### | 96 | ### | |
99 | ### Compressed mail boxes | |||
100 | ### | |||
101 | PLIST_VARS+= compressed_mbox | |||
102 | .if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) \ | |||
103 | || make(distinfo) || make(mps) || make(makepatchsum) | |||
104 | PLIST.compressed_mbox= yes | |||
105 | PATCH_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/ | |||
106 | PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz | |||
107 | PATCH_DIST_STRIP= -p1 | |||
108 | CONFIGURE_ARGS+= --enable-compressed | |||
109 | SUBST_CLASSES+= compress | |||
110 | SUBST_MESSAGE.compress= Patch Makefile.in to avoid autoreconf for compress | |||
111 | SUBST_STAGE.compress= post-patch | |||
112 | SUBST_FILES.compress= Makefile.in | |||
113 | SUBST_SED.compress= -e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,' | |||
114 | SUBST_SED.compress+= -e 's,^EXTRA_DIST = ,EXTRA_DIST = compress.h ,' | |||
115 | SUBST_SED.compress+= -e 's,^mutt_OBJECTS = ,mutt_OBJECTS = compress.o ,' | |||
116 | # add xsltproc to be able to regenerate the documentation | |||
117 | BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt | |||
118 | BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl | |||
119 | .endif | |||
120 | ||||
121 | ### | |||
122 | ### Internal SMTP relay support | 97 | ### Internal SMTP relay support | |
123 | ### | 98 | ### | |
124 | .if !empty(PKG_OPTIONS:Mmutt-smtp) | 99 | .if !empty(PKG_OPTIONS:Mmutt-smtp) | |
125 | CONFIGURE_ARGS+= --enable-smtp | 100 | CONFIGURE_ARGS+= --enable-smtp | |
126 | .else | 101 | .else | |
127 | CONFIGURE_ARGS+= --disable-smtp | 102 | CONFIGURE_ARGS+= --disable-smtp | |
128 | .endif | 103 | .endif | |
129 | 104 | |||
130 | ### | 105 | ### | |
131 | ### Internationalized Domain Names | 106 | ### Internationalized Domain Names | |
132 | ### | 107 | ### | |
133 | .if !empty(PKG_OPTIONS:Midn) | 108 | .if !empty(PKG_OPTIONS:Midn) | |
134 | . include "../../devel/libidn/buildlink3.mk" | 109 | . include "../../devel/libidn/buildlink3.mk" |