Index: head/mail/mutt/Makefile =================================================================== --- head/mail/mutt/Makefile (revision 554672) +++ head/mail/mutt/Makefile (revision 554673) @@ -1,225 +1,209 @@ # Created by: Udo Schweigert # $FreeBSD$ PORTNAME= mutt -DISTVERSION= 1.14.7 +DISTVERSION= 2.0.0 CATEGORIES+= mail MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ https://bitbucket.org/mutt/mutt/downloads/ \ http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv DIST_SUBDIR= mutt EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://vc.org.ua/mutt/:vc PATCH_DIST_STRIP= -p1 MAINTAINER= dereks@lifeofadishwasher.com COMMENT= Small but powerful text based program for read/writing e-mail LICENSE= GPLv2+ RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support USES= cpe perl5 shebangfix ssl USE_PERL5= build CONFLICTS= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \ --with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \ --enable-external-dotlock --enable-pop --enable-imap \ --enable-compressed --enable-sidebar INFO= ${PORTNAME} SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl .if defined(MUTT_CONFIGURE_ARGS) CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} .endif GNU_CONFIGURE= yes OPTIONS_SUB= yes -OPTIONS_DEFINE= AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \ +OPTIONS_DEFINE= AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK GPGME \ GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \ MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \ REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW OPTIONS_SINGLE= GSSAPI HCACHE SCREEN -OPTIONS_RADIO= SPELL -OPTIONS_RADIO_SPELL= ASPELL ISPELL OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE OPTIONS_SINGLE_SCREEN= NCURSES SLANG AUTOCRYPT_DESC= Convenient End-to-End Encryption DEBUG_LOGS_DESC= Debugging capabilities FLOCK_DESC= flock() usage -FORCEBASE64_DESC= Option to force base64 encoding for compose GPGME_DESC= Gpgme interface GREETING_PATCH_DESC= Greeting support HCACHE_BDB_DESC= Use Berkeley DB (BDB) HCACHE_DESC= Header Cache support HCACHE_KYOTOCABINET_DESC= Use Kyoto Cabinet HCACHE_NONE_DESC= Disable Header Cache HCACHE_TOKYOCABINET_DESC= Use Tokyo Cabinet HTML_DESC= HTML documentation IDN_DESC= International Domain Names (implies ICONV) IFDEF_PATCH_DESC= ifdef feature LOCALES_FIX_DESC= Locales fix MAILBOX_MANPAGES_DESC= Install mbox.5/mmdf.5 manpages MAILDIR_MTIME_PATCH_DESC= Maildir mtime patch NCURSES_DESC= Ncurses support NLS_DESC= Native language support (implies ICONV) QUOTE_PATCH_DESC= Extended quoting REVERSE_REPLY_PATCH_DESC= Reverse_reply SASL_DESC= SASL authentication SMIME_DESC= SMIME email check option patch SLANG_DESC= SLANG support SMART_DATE_DESC= Dynamic date formatting with "%@" SMTP_DESC= SMTP relay support URLVIEW_DESC= Use urlview for the URL selector menu OPTIONS_DEFAULT= AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \ IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \ NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW .ifmake makesum # for optional distfiles patchfiles OPTIONS_OVERRIDE= ${OPTIONS_DEFINE} ${OPTIONS_DEFAULT} .MAKEOVERRIDES+= OPTIONS_OVERRIDE .endif AUTOCRYPT_CONFIGURE_ENABLE= autocrypt AUTOCRYPT_IMPLIES= GPGME IDN AUTOCRYPT_USES= sqlite:3 AUTOCRYPT_CONFIGURE_WITH= sqlite3=${LOCALBASE} AUTOCRYPT_DEPENDS= gnupg>=2.1:security/gnupg \ gpgme>=1.8:security/gpgme AUTOCRYPT_BUILD_DEPENDS= ${AUTOCRYPT_DEPENDS} AUTOCRYPT_RUN_DEPENDS= ${AUTOCRYPT_DEPENDS} -ASPELL_BUILD_DEPENDS= aspell:textproc/aspell -ASPELL_RUN_DEPENDS= aspell:textproc/aspell -ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell -ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell URLVIEW_RUN_DEPENDS= urlview:textproc/urlview DEBUG_LOGS_CONFIGURE_ON= --enable-debug DOCS_BUILD_DEPENDS= lynx:www/lynx # Handle ncurses/ncurses-port/slang SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE} SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang NCURSES_USES= ncurses NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_IMPLIES= ICONV # Handle GSSAPI from various places GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_NONE_CONFIGURE_ON= --without-gss HCACHE_NONE_CONFIGURE_ON= --disable-hcache HCACHE_NONE_CONFIGURE_OFF= --enable-hcache --without-qdbm --without-gdbm HCACHE_BDB_CONFIGURE_WITH= bdb=${LOCALBASE} HCACHE_BDB_USES= bdb:42+ HCACHE_TOKYOCABINET_CONFIGURE_WITH= tokyocabinet=${LOCALBASE} HCACHE_TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet HCACHE_KYOTOCABINET_CONFIGURE_WITH= kyotocabinet=${LOCALBASE} HCACHE_KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet ICONV_USES= iconv:translit ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --disable-iconv REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} SMIME_EXTRA_PATCHES= ${PATCHDIR}/extra-smime-sender SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate FLOCK_CONFIGURE_ENABLE= flock LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \ libunistring.so:devel/libunistring IDN_CONFIGURE_WITH= idn2=${LOCALBASE} IDN_IMPLIES= ICONV IFDEF_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ifdef GPGME_LIB_DEPENDS+= libgpgme.so:security/gpgme GPGME_LIB_DEPENDS+= libgpg-error.so:security/libgpg-error GPGME_LIB_DEPENDS+= libassuan.so:security/libassuan GPGME_CONFIGURE_ENABLE= gpgme SMTP_CONFIGURE_ENABLE= smtp -FORCEBASE64_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-forcebase64 - MAILDIR_MTIME_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-maildir-mtime GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \ patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv .include -# un/comment as each VERSION is created for PORTVERSION VVV_PATCH_VERSION= 1.13.0 -GREETING_PATCH_VERSION= 1.14.3 +GREETING_PATCH_VERSION= 2.0.0 post-install: ${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5 pre-configure:: # Stop make from setgid mutt_dotlock @${REINPLACE_CMD} \ -e '/if test.*mutt_dotlock.*DOTLOCK_GROUP/s/if/if ${FALSE} \&\&/' \ ${WRKSRC}/Makefile.in # Base FreeBSD krb5-config --version returns "FreeBSD heimdal" @${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # Install contrib samples to ${EXAMPLESDIR} @${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \ ${WRKSRC}/contrib/Makefile.in pre-configure-HCACHE_BDB-on: @${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # Undo some dist. installed files post-stage:: @${MV} ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.dist \ ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.sample @${RM} ${STAGEDIR}/${LOCALBASE}/etc/mime.types* - -# Change default ispell -post-build-ASPELL-on: - @${REINPLACE_CMD} -e '/^# append-hook/p' \ - -e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \ - ${WRKSRC}/doc/Muttrc .include Index: head/mail/mutt/distinfo =================================================================== --- head/mail/mutt/distinfo (revision 554672) +++ head/mail/mutt/distinfo (revision 554673) @@ -1,9 +1,9 @@ -TIMESTAMP = 1598742511 -SHA256 (mutt/mutt-1.14.7.tar.gz) = e4f507b133253cb5eef27996b8668956cdf9caac622cf8adad13f0f9a4eda864 -SIZE (mutt/mutt-1.14.7.tar.gz) = 5009968 -SHA256 (mutt/mutt-1.14.3.vc.greeting) = c6067f19e51e99e3c981c0c45a29fb442626d8bb3f0df56736ce4ee0eb0bfa83 -SIZE (mutt/mutt-1.14.3.vc.greeting) = 4472 +TIMESTAMP = 1604877444 +SHA256 (mutt/mutt-2.0.0.tar.gz) = 93a4138ca795d2668e25c8e95c9ef2082447431423163decda83e66a4e42aeaf +SIZE (mutt/mutt-2.0.0.tar.gz) = 5287742 +SHA256 (mutt/mutt-2.0.0.vc.greeting) = 28d157df0ca36f2448dcc3d1cd19e34ec0eefe88251ebf1951e080d7178cccd2 +SIZE (mutt/mutt-2.0.0.vc.greeting) = 4452 SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02 SIZE (mutt/patch-1.13.0.vvv.initials.xz) = 720 SHA256 (mutt/patch-1.13.0.vvv.quote.xz) = 788d25d1439d86d6c5007d141d1c219496e77940b5ce37819471c941f78f03e4 SIZE (mutt/patch-1.13.0.vvv.quote.xz) = 1340 Index: head/mail/mutt/files/extra-patch-forcebase64 =================================================================== --- head/mail/mutt/files/extra-patch-forcebase64 (revision 554672) +++ head/mail/mutt/files/extra-patch-forcebase64 (nonexistent) @@ -1,37 +0,0 @@ ---- init.h.orig 2019-12-08 02:41:29 UTC -+++ init.h -@@ -1079,6 +1079,11 @@ struct option_t MuttVars[] = { - ** sent to both the list and your address, resulting in two copies - ** of the same email for you. - */ -+ { "force_base64", DT_BOOL, R_NONE, {.l=OPTFORCEBASE64}, {.l=0} }, -+ /* -+ ** .pp -+ ** If you need to encode all text parts to base64, set this option. -+ */ - { "force_name", DT_BOOL, R_NONE, {.l=OPTFORCENAME}, {.l=0} }, - /* - ** .pp ---- mutt.h.orig 2019-12-08 02:41:29 UTC -+++ mutt.h -@@ -423,6 +423,7 @@ enum - OPTFCCCLEAR, - OPTFLAGSAFE, - OPTFOLLOWUPTO, -+ OPTFORCEBASE64, - OPTFORCENAME, - OPTFORWDECODE, - OPTFORWQUOTE, ---- sendlib.c.orig 2019-12-08 02:41:29 UTC -+++ sendlib.c -@@ -1218,7 +1218,9 @@ static void mutt_set_encoding (BODY *b, CONTENT *info) - if (b->type == TYPETEXT) - { - char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b); -- if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM))) -+ if (option (OPTFORCEBASE64)) -+ b->encoding = ENCBASE64; -+ else if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM))) - b->encoding = ENCQUOTEDPRINTABLE; - else if (info->hibin) - b->encoding = option (OPTALLOW8BIT) ? ENC8BIT : ENCQUOTEDPRINTABLE; Property changes on: head/mail/mutt/files/extra-patch-forcebase64 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/mutt/files/patch-muttlib.c =================================================================== --- head/mail/mutt/files/patch-muttlib.c (revision 554672) +++ head/mail/mutt/files/patch-muttlib.c (nonexistent) @@ -1,25 +0,0 @@ ---- muttlib.c.orig 2020-05-05 02:09:34 UTC -+++ muttlib.c -@@ -930,16 +930,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre - void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix, - const char *src, int line) - { -- size_t n = snprintf (s, slen, "%s/%s-%s-%d-%d-%ld%ld%s%s", -- NONULL (Tempdir), NONULL (prefix), NONULL (Hostname), -- (int) getuid (), (int) getpid (), random (), random (), -- suffix ? "." : "", NONULL (suffix)); -+ size_t n = snprintf (s, slen, "%s/mutt-%s-XXXXXXXX", NONULL (Tempdir), NONULL (Hostname)); - if (n >= slen) - dprint (1, (debugfile, "%s:%d: ERROR: insufficient buffer space to hold temporary filename! slen=%zu but need %zu\n", - src, line, slen, n)); -- dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s)); -- if (unlink (s) && errno != ENOENT) -- dprint (1, (debugfile, "%s:%d: ERROR: unlink(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno)); -+ if (mktemp (s)) { -+ dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s)); -+ } else { -+ dprint (1, (debugfile, "%s:%d: ERROR: mktemp(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno)); -+ } - } - - /* these characters must be escaped in regular expressions */ Property changes on: head/mail/mutt/files/patch-muttlib.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/mutt/files/patch-threadcomplete =================================================================== --- head/mail/mutt/files/patch-threadcomplete (revision 554672) +++ head/mail/mutt/files/patch-threadcomplete (nonexistent) @@ -1,37 +0,0 @@ ---- mutt.h.orig 2020-05-25 22:13:51 UTC -+++ mutt.h -@@ -242,6 +242,7 @@ enum - MUTT_EXPIRED, - MUTT_SUPERSEDED, - MUTT_TRASH, -+ MUTT_THREADCOMPLETE, - - /* actions for mutt_pattern_comp/mutt_pattern_exec */ - MUTT_AND, ---- pattern.c.orig 2020-05-25 20:41:30 UTC -+++ pattern.c -@@ -57,6 +57,7 @@ static const struct pattern_flags - } - Flags[] = - { -+ { 'a', MUTT_THREADCOMPLETE, 0, NULL }, - { 'A', MUTT_ALL, 0, NULL }, - { 'b', MUTT_BODY, MUTT_FULL_MSG|MUTT_SEND_MODE_SEARCH, eat_regexp }, - { 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG|MUTT_SEND_MODE_SEARCH, eat_regexp }, -@@ -1499,6 +1500,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec - else - result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc); - return (pat->not ^ result); -+ case MUTT_THREADCOMPLETE: -+ { static pattern_t tmp; -+ static short pattern_set = 0; -+ if(! pattern_set) { -+ memset (&tmp, 0, sizeof (tmp)); -+ tmp.op = MUTT_TAG; -+ pattern_set = 1; -+ } -+ return (pat->not ^ (h->env && match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1))); -+ } - case MUTT_SUBSCRIBED_LIST: - if (cache) - { Property changes on: head/mail/mutt/files/patch-threadcomplete ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/mutt/files/extra-patch-ifdef =================================================================== --- head/mail/mutt/files/extra-patch-ifdef (revision 554672) +++ head/mail/mutt/files/extra-patch-ifdef (revision 554673) @@ -1,77 +1,77 @@ ---- PATCHES.orig 2020-08-29 22:13:50 UTC +--- PATCHES.orig 2020-11-08 20:52:48 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.4.cd.ifdef.1 ---- init.c.orig 2020-08-29 19:37:53 UTC +--- init.c.orig 2020-11-03 17:50:37 UTC +++ init.c -@@ -648,6 +648,52 @@ static mbchar_table *parse_mbchar_table (const char *s +@@ -672,6 +672,52 @@ static mbchar_table *parse_mbchar_table (const char *s return t; } +static int parse_ifdef (BUFFER *tmp, BUFFER *s, union pointer_long_t data, BUFFER *err) +{ + int i, j, res = 0; + BUFFER token; + + memset (&token, 0, sizeof (token)); + mutt_extract_token (tmp, s, 0); + + /* is the item defined as a variable or a function? */ + if (!(res = (mutt_option_index (tmp->data) != -1))) + for (i = 0; !res && i < MENU_MAX; i++) + { + const struct binding_t *b = km_get_table (Menus[i].value); + + if (!b) + continue; + + for (j = 0; b[j].name; j++) + if (!ascii_strncasecmp (tmp->data, b[j].name, mutt_strlen (tmp->data)) + && (mutt_strlen (b[j].name) == mutt_strlen (tmp->data))) + { + res = 1; + break; + } + } + + if (!MoreArgs (s)) + { + snprintf (err->data, err->dsize, _("ifdef: too few arguments")); + return (-1); + } + mutt_extract_token (tmp, s, MUTT_TOKEN_SPACE); + + if (res) + { + if (mutt_parse_rc_buffer (tmp, &token, err) == -1) + { + mutt_error ("Erreur: %s", err->data); + FREE (&token.data); + return (-1); + } + FREE (&token.data); + } + return 0; +} + static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err) { do ---- init.h.orig 2020-08-29 22:13:50 UTC +--- init.h.orig 2020-11-08 20:52:48 UTC +++ init.h -@@ -4594,6 +4594,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin +@@ -4705,6 +4705,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin static int parse_unlists (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *); static int parse_alias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *); static int parse_unalias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *); +static int parse_ifdef (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *); static int parse_echo (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *); static int parse_ignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *); static int parse_unignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *); -@@ -4658,6 +4659,7 @@ const struct command_t Commands[] = { +@@ -4772,6 +4773,7 @@ const struct command_t Commands[] = { { "hdr_order", parse_list, {.p=&HeaderOrderList} }, #ifdef HAVE_ICONV { "iconv-hook", mutt_parse_hook, {.l=MUTT_ICONVHOOK} }, + { "ifdef", parse_ifdef, {.l=0} }, #endif { "ignore", parse_ignore, {.l=0} }, { "index-format-hook",mutt_parse_idxfmt_hook, {.l=MUTT_IDXFMTHOOK} }, Index: head/mail/mutt/files/extra-patch-maildir-mtime =================================================================== --- head/mail/mutt/files/extra-patch-maildir-mtime (revision 554672) +++ head/mail/mutt/files/extra-patch-maildir-mtime (revision 554673) @@ -1,52 +1,52 @@ ---- PATCHES.orig 2020-05-05 02:09:32 UTC +--- PATCHES.orig 2020-11-08 20:52:49 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.7.ust.maildir-mtime.2 ---- browser.c.orig 2020-05-02 21:08:56 UTC +--- browser.c.orig 2020-11-03 17:50:37 UTC +++ browser.c @@ -32,6 +32,7 @@ #ifdef USE_IMAP #include "imap.h" #endif +#include "mx.h" #include #include @@ -430,6 +431,21 @@ static void init_state (struct browser_state *state, M menu->data = state->entry; } +static void check_maildir_times (BUFFY *buf, struct stat *st) +{ + char buffer[_POSIX_PATH_MAX + SHORT_STRING]; + struct stat s; + + if(!buf || buf->magic != MUTT_MAILDIR) + return; + + snprintf (buffer, sizeof (buffer), "%s/tmp", mutt_b2s(buf->pathbuf)); + if (lstat (buffer, &s) != 0) + return; + + st->st_mtime = s.st_mtime; +} + static int examine_directory (MUTTMENU *menu, struct browser_state *state, const char *d, const char *prefix) { @@ -496,6 +512,7 @@ static int examine_directory (MUTTMENU *menu, struct b tmp = Incoming; while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf))) tmp = tmp->next; + check_maildir_times (tmp, &s); if (tmp && Context && !tmp->nopoll && !mutt_strcmp (tmp->realpath, Context->realpath)) { @@ -579,6 +596,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b s.st_mtime = st2.st_mtime; } + check_maildir_times (tmp, &s); add_folder (menu, state, mutt_b2s (mailbox), mutt_b2s (tmp->pathbuf), &s, tmp); } while ((tmp = tmp->next)); Index: head/mail/mutt/files/extra-patch-reverse_reply =================================================================== --- head/mail/mutt/files/extra-patch-reverse_reply (revision 554672) +++ head/mail/mutt/files/extra-patch-reverse_reply (revision 554673) @@ -1,91 +1,91 @@ ---- PATCHES.orig 2020-05-05 02:09:33 UTC +--- PATCHES.orig 2020-11-08 20:52:49 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.6.cb.reverse_reply.2 ---- init.h.orig 2020-05-05 02:09:32 UTC +--- init.h.orig 2020-11-08 20:52:48 UTC +++ init.h -@@ -3111,6 +3111,13 @@ struct option_t MuttVars[] = { +@@ -3191,6 +3191,13 @@ struct option_t MuttVars[] = { ** In either case, a missing real name will be filled in afterwards ** using the value of $$realname. */ + { "reverse_reply", DT_BOOL, R_NONE, {.l=OPTREVREPLY}, {.l=0} }, + /* + ** .pp + ** When set, this variable uses the name from your aliases in the To and Cc + ** headers of reply mails you send, like $reverse_alias does in the index. + ** When unset, the headers taken from the original mail are left unchanged. + */ { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} }, /* ** .pp ---- mutt.h.orig 2020-05-05 02:09:32 UTC +--- mutt.h.orig 2020-11-08 20:52:48 UTC +++ mutt.h -@@ -513,6 +513,7 @@ enum +@@ -522,6 +522,7 @@ enum OPTREVALIAS, OPTREVNAME, OPTREVREAL, + OPTREVREPLY, OPTRFC2047PARAMS, OPTSAVEADDRESS, OPTSAVEEMPTY, ---- protos.h.orig 2020-05-02 21:08:56 UTC +--- protos.h.orig 2020-11-06 22:06:35 UTC +++ protos.h @@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha ADDRESS *mutt_get_address (ENVELOPE *, char **); ADDRESS *mutt_lookup_alias (const char *s); ADDRESS *mutt_remove_duplicates (ADDRESS *); +ADDRESS *mutt_reverse_address (ADDRESS *); ADDRESS *mutt_expand_aliases (ADDRESS *); ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *); ---- send.c.orig 2020-05-02 21:08:56 UTC +--- send.c.orig 2020-11-03 17:50:37 UTC +++ send.c -@@ -725,6 +725,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env) +@@ -739,6 +739,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env) /* the CC field can get cluttered, especially with lists */ env->to = mutt_remove_duplicates (env->to); env->cc = mutt_remove_duplicates (env->cc); + if (option (OPTREVREPLY)){ + env->to = mutt_reverse_address (env->to); + env->cc = mutt_reverse_address (env->cc); + } env->cc = mutt_remove_xrefs (env->to, env->cc); if (env->cc && !env->to) ---- sendlib.c.orig 2020-05-02 21:08:56 UTC +--- sendlib.c.orig 2020-11-03 17:50:37 UTC +++ sendlib.c -@@ -2981,6 +2981,35 @@ static void set_noconv_flags (BODY *b, short flag) +@@ -3007,6 +3007,35 @@ static void set_noconv_flags (BODY *b, short flag) } } +/* given a list of addresses, return a list of reverse_alias'ed addresses */ +ADDRESS *mutt_reverse_address (ADDRESS *addr) +{ + ADDRESS *top,*tmp,*alias; + + if (addr == NULL) + return NULL; + + if ((alias = alias_reverse_lookup (addr)) && alias->personal) { + tmp = rfc822_cpy_adr_real(alias); + tmp->next = addr->next; + addr->next = NULL; + rfc822_free_address(&addr); + addr = tmp; + } + + for (top = addr; top->next != NULL; top = tmp) { + tmp = top->next; + if ((alias = alias_reverse_lookup (tmp)) && alias->personal) { + top->next = rfc822_cpy_adr_real(alias); + top->next->next = tmp->next; + tmp->next = NULL; + rfc822_free_address(&tmp); + tmp = top->next; + } + } + return addr; +} + int mutt_write_fcc (const char *path, SEND_CONTEXT *sctx, const char *msgid, int post, const char *fcc) { HEADER *hdr; Index: head/mail/mutt/files/extra-patch-smartdate =================================================================== --- head/mail/mutt/files/extra-patch-smartdate (revision 554672) +++ head/mail/mutt/files/extra-patch-smartdate (revision 554673) @@ -1,126 +1,126 @@ ---- hdrline.c.orig 2020-05-05 02:09:32 UTC +--- hdrline.c.orig 2020-11-08 20:52:48 UTC +++ hdrline.c @@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOPE *env) * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label) * %Z = status flags */ +static void +format_smartdate( char *buf, size_t max, struct tm *tm, smartdate_type type ) +{ + char *strftime_fmt = NULL; + + switch( type ) { + case FUTURE: /* Date in the future */ + strftime_fmt = "%d%h%y!"; + break; + case SMARTTIME: /* Today */ + strftime_fmt = "%I:%M %p"; + break; + case YESTERDAY: /* Yesterday */ + strncpy( buf, "Yesterday", max ); + break; + case WEEKDAY: /* Within the last 7 days */ + strftime_fmt = "%A"; + break; + case STANDARD: /* Within the last six months */ + strftime_fmt = "%h %d"; + break; + case ANCIENT: /* Older than 6 months */ + strftime_fmt = "%h %Y"; + break; + } + + if( strftime_fmt != NULL ) { + strftime( buf, max, strftime_fmt, tm ); + } +} + +static void +smartdate( char *buf, size_t max, struct tm *tm ) +{ + smartdate_type type = 0; + + struct tm now; + + time_t sse = mktime( tm ); /* Seconds since epoch */ + time_t sse_now = time(NULL); /* Seconds since epoch until now */ + + int dse = 0; /* Days since epoch */ + int dse_now = 0; /* Days since epoch until today */ + + /* Calculate the number of days since epoch */ + dse = sse / (60*60*24); + dse_now = sse_now / (60*60*24); + + /* Default display type */ + type = STANDARD; + + /* Check if the date is in the future */ + if( dse > dse_now ) { + type = FUTURE; + } + else { + int diff = dse_now - dse; + if( diff == 0 ) type = SMARTTIME; + else if( diff == 1 ) type = YESTERDAY; + else if( diff < 7 ) type = WEEKDAY; + else if( diff > 215 ) type = ANCIENT; /* Surely older than six + months */ + else if( diff > 180 ) { + /* + * Slightly heavy calculation to check if the date is more + * than six months in the past. This calculation uses + * calendar months and not the exact number of days. So, + * January 31, 2003 would be considered more than six months + * old whether today's date is August 1 or August 31, 2003 + */ + int monthdiff; + localtime_r( &sse_now, &now ); + monthdiff = ( now.tm_mon - tm->tm_mon ) + + ( ( now.tm_year - tm->tm_year ) * 12 ); + if( monthdiff > 6 ) { + type = ANCIENT; + } + } + } + + format_smartdate( buf, max, tm, type ); +} + static const char * hdr_format_str (char *dest, size_t destlen, @@ -422,7 +505,13 @@ hdr_format_str (char *dest, if (!do_locales) setlocale (LC_TIME, "C"); - strftime (buf2, sizeof (buf2), dest, tm); + /* Identify the non-strftime smartdate pattern (%@) */ + if( strncmp( dest, "%@", 2 ) == 0 ) { + smartdate( buf2, sizeof( buf2 ), tm ); + } + else { + strftime (buf2, sizeof (buf2), dest, tm); + } if (!do_locales) setlocale (LC_TIME, ""); ---- mutt.h.orig 2020-05-05 02:09:33 UTC +--- mutt.h.orig 2020-11-08 20:52:49 UTC +++ mutt.h -@@ -165,6 +165,16 @@ typedef enum +@@ -169,6 +169,16 @@ typedef enum MUTT_WRITE_HEADER_MIME } mutt_write_header_mode; +/* flags for SmartDate */ +typedef enum { + FUTURE = 1, + SMARTTIME = 2, + YESTERDAY = 3, + WEEKDAY = 4, + STANDARD = 5, + ANCIENT = 6 +} smartdate_type; + /* types for mutt_add_hook() */ #define MUTT_FOLDERHOOK 1 #define MUTT_MBOXHOOK (1<<1) Index: head/mail/mutt/files/extra-smime-sender =================================================================== --- head/mail/mutt/files/extra-smime-sender (revision 554672) +++ head/mail/mutt/files/extra-smime-sender (revision 554673) @@ -1,39 +1,39 @@ ---- commands.c.orig 2020-05-02 21:08:56 UTC +--- commands.c.orig 2020-11-06 20:53:46 UTC +++ commands.c @@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur) { if (cur->security & GOODSIGN) { - if (!crypt_smime_verify_sender(cur)) + if (option(OPTSMIMENOSENDER) || !crypt_smime_verify_sender(cur)) mutt_message ( _("S/MIME signature successfully verified.")); else mutt_error ( _("S/MIME certificate owner does not match sender.")); ---- init.h.orig 2020-05-05 02:09:33 UTC +--- init.h.orig 2020-11-08 20:52:49 UTC +++ init.h -@@ -3608,6 +3608,15 @@ struct option_t MuttVars[] = { +@@ -3688,6 +3688,15 @@ struct option_t MuttVars[] = { ** to determine the key to use. It will ask you to supply a key, if it can't find one. ** (S/MIME only) */ + { "smime_dont_check_sender", DT_BOOL, R_NONE, {.l=OPTSMIMENOSENDER}, {.l=0} }, + /* + ** .pp + ** This flag controls wether you want the skip the check for the sender's + ** email address against the email address stored in the certificate. + ** This can be useful if most of your email senders use SMIMEv3 which no + ** longer needs email-addresses as part of the certificates. + ** It is not set by default. + */ { "smime_self_encrypt_as", DT_SYN, R_NONE, {.p="smime_default_key"}, {.p=0} }, { "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} }, /* ---- mutt.h.orig 2020-05-05 02:09:33 UTC +--- mutt.h.orig 2020-11-08 20:52:49 UTC +++ mutt.h -@@ -596,6 +596,7 @@ enum +@@ -606,6 +606,7 @@ enum OPTSMIMEISDEFAULT, OPTSMIMESELFENCRYPT, OPTASKCERTLABEL, + OPTSMIMENOSENDER, OPTSDEFAULTDECRYPTKEY, OPTPGPIGNORESUB, OPTPGPCHECKEXIT, Index: head/mail/mutt/files/patch-browser.c =================================================================== --- head/mail/mutt/files/patch-browser.c (revision 554672) +++ head/mail/mutt/files/patch-browser.c (revision 554673) @@ -1,41 +1,67 @@ ---- browser.c.orig 2020-05-05 02:09:32 UTC +--- browser.c.orig 2020-11-08 20:52:49 UTC +++ browser.c @@ -87,6 +87,12 @@ static int browser_compare_subject (const void *a, con struct folder_file *pa = (struct folder_file *) a; struct folder_file *pb = (struct folder_file *) b; + /* Always keep '..' in first menu position */ + if (!strncmp(pa->display_name, "..", 2)) + return(-1); + if (!strncmp(pb->display_name, "..", 2)) + return(1); + int r = mutt_strcoll (pa->display_name, pb->display_name); return ((BrowserSort & SORT_REVERSE) ? -r : r); @@ -97,6 +103,12 @@ static int browser_compare_date (const void *a, const struct folder_file *pa = (struct folder_file *) a; struct folder_file *pb = (struct folder_file *) b; + /* Always keep '..' in first menu position */ + if (!strncmp(pa->display_name, "..", 2)) + return(-1); + if (!strncmp(pb->display_name, "..", 2)) + return(1); + int r = pa->mtime - pb->mtime; return ((BrowserSort & SORT_REVERSE) ? -r : r); -@@ -106,6 +118,12 @@ static int browser_compare_size (const void *a, const +@@ -107,6 +119,12 @@ static int browser_compare_size (const void *a, const + struct folder_file *pa = (struct folder_file *) a; + struct folder_file *pb = (struct folder_file *) b; + ++ /* Always keep '..' in first menu position */ ++ if (!strncmp(pa->display_name, "..", 2)) ++ return(-1); ++ if (!strncmp(pb->display_name, "..", 2)) ++ return(1); ++ + int r = pa->size - pb->size; + + return ((BrowserSort & SORT_REVERSE) ? -r : r); +@@ -117,6 +135,12 @@ static int browser_compare_count (const void *a, const + struct folder_file *pa = (struct folder_file *) a; + struct folder_file *pb = (struct folder_file *) b; + ++ /* Always keep '..' in first menu position */ ++ if (!strncmp(pa->display_name, "..", 2)) ++ return(-1); ++ if (!strncmp(pb->display_name, "..", 2)) ++ return(1); ++ + int r = pa->msg_count - pb->msg_count; + + return ((BrowserSort & SORT_REVERSE) ? -r : r); +@@ -126,6 +150,12 @@ static int browser_compare_unread (const void *a, cons { struct folder_file *pa = (struct folder_file *) a; struct folder_file *pb = (struct folder_file *) b; + + /* Always keep '..' in first menu position */ + if (!strncmp(pa->display_name, "..", 2)) + return(-1); + if (!strncmp(pb->display_name, "..", 2)) + return(1); - int r = pa->size - pb->size; + int r = pa->msg_unread - pb->msg_unread; Index: head/mail/mutt/files/patch-date-conditional =================================================================== --- head/mail/mutt/files/patch-date-conditional (revision 554672) +++ head/mail/mutt/files/patch-date-conditional (revision 554673) @@ -1,97 +1,97 @@ ---- PATCHES.orig 2020-05-05 02:09:34 UTC +--- PATCHES.orig 2020-11-08 20:52:50 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.0.ats.date_conditional.1 ---- hdrline.c.orig 2020-05-05 02:09:33 UTC +--- hdrline.c.orig 2020-11-08 20:52:49 UTC +++ hdrline.c @@ -428,6 +428,53 @@ hdr_format_str (char *dest, const char *cp; struct tm *tm; time_t T; + int i = 0, invert = 0; + + if (optional && (op == '[' || op == '(')) { + char *is; + T = time(NULL); + T -= (op == '(') ? hdr->received : hdr->date_sent; + + is = (char *)prefix; + if( *is == '>' ) { + invert = 1; + ++is; + } + + while( *is && *is != '?' ) { + int t = strtol (is, &is, 10); + switch (*(is++)) { + case '?': + break; + case 'y': + t *= 365 * 24 * 60 * 60; + break; + case 'M': + t *= 30 * 24 * 60 * 60; + break; + case 'w': + t *= 7 * 24 * 60 * 60; + break; + case 'd': + t *= 24 * 60 * 60; + break; + case 'h': + t *= 60 * 60; + break; + case 'm': + t *= 60; + break; + } + i += t; + } + + if (i < 0) + i *= -1; + + if( (T > i || T < -1*i) ^ invert ) + optional = 0; + break; + } p = dest; ---- muttlib.c.orig 2020-05-02 21:08:56 UTC +--- muttlib.c.orig 2020-11-06 22:10:26 UTC +++ muttlib.c -@@ -1667,7 +1667,16 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1764,7 +1764,16 @@ void mutt_FormatString (char *dest, /* output buffer if (*src == '?') { flags |= MUTT_FORMAT_OPTIONAL; - src++; + ch = *(++src); /* save the character to switch on */ + cp = prefix; + ++src; + count = 0; + while (count < sizeof (prefix) && *src != '?') + { + *cp++ = *src++; + count++; + } + *cp = 0; } else { -@@ -1683,12 +1692,12 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1780,12 +1789,12 @@ void mutt_FormatString (char *dest, /* output buffer count++; } *cp = 0; - } - if (!*src) - break; /* bad format */ + if (!*src) + break; /* bad format */ - ch = *src++; /* save the character to switch on */ + ch = *src++; /* save the character to switch on */ + } if (flags & MUTT_FORMAT_OPTIONAL) { Index: head/mail/mutt/files/patch-dgc-deepif =================================================================== --- head/mail/mutt/files/patch-dgc-deepif (revision 554672) +++ head/mail/mutt/files/patch-dgc-deepif (revision 554673) @@ -1,30 +1,30 @@ ---- muttlib.c.orig 2020-05-05 02:09:34 UTC +--- muttlib.c.orig 2020-11-08 20:52:50 UTC +++ muttlib.c -@@ -1710,6 +1710,12 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1807,6 +1807,12 @@ void mutt_FormatString (char *dest, /* output buffer count = 0; while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&') { + if (*src == '\\') + { + src++; + if (!*src) + break; + } *cp++ = *src++; count++; } -@@ -1722,7 +1728,13 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1819,7 +1825,13 @@ void mutt_FormatString (char *dest, /* output buffer count = 0; while (count < sizeof (elsestring) && *src && *src != '?') { - *cp++ = *src++; + if (*src == '\\') + { + src++; + if (!*src) + break; + } + *cp++ = *src++; count++; } *cp = 0; Index: head/mail/mutt/pkg-plist =================================================================== --- head/mail/mutt/pkg-plist (revision 554672) +++ head/mail/mutt/pkg-plist (revision 554673) @@ -1,115 +1,117 @@ bin/flea bin/mutt bin/muttbug @(,mail,2755) bin/mutt_dotlock bin/mutt_pgpring bin/pgpewrap bin/smime_keys @sample etc/Muttrc.sample man/man1/mutt.1.gz man/man1/mutt_dotlock.1.gz man/man1/mutt_pgpring.1.gz man/man1/pgpewrap.1.gz man/man1/smime_keys.1.gz man/man5/mailcap.5.gz %%MAILBOX_MANPAGES%%man/man5/mbox.5.gz %%MAILBOX_MANPAGES%%man/man5/mmdf.5.gz man/man5/muttrc.5.gz %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/GPL %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.SECURITY %%PORTDOCS%%%%DOCSDIR%%/README.SSL %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt %%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/configuration.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/index.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/intro.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/manual.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/miscellany.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/reference.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/security.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tuning.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-detectgui.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-screen-tmux.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/markdown2html +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_oauth2.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_oauth2.py.README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp5.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-compress %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-starter %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime_keys_test.pl %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo %%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo %%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo %%NLS%%share/locale/da/LC_MESSAGES/mutt.mo %%NLS%%share/locale/de/LC_MESSAGES/mutt.mo %%NLS%%share/locale/el/LC_MESSAGES/mutt.mo %%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo %%NLS%%share/locale/es/LC_MESSAGES/mutt.mo %%NLS%%share/locale/et/LC_MESSAGES/mutt.mo %%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo %%NLS%%share/locale/fi/LC_MESSAGES/mutt.mo %%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo %%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo %%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo %%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo %%NLS%%share/locale/id/LC_MESSAGES/mutt.mo %%NLS%%share/locale/it/LC_MESSAGES/mutt.mo %%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo %%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo %%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo %%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo %%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo %%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo %%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo %%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo %%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo %%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo