Date: Wed, 5 Oct 2016 22:55:29 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423394 - in head/mail/mutt: . files Message-ID: <201610052255.u95MtT2U058135@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Wed Oct 5 22:55:29 2016 New Revision: 423394 URL: https://svnweb.freebsd.org/changeset/ports/423394 Log: Update to 1.7.0. The sidebar patch is now an official part of mutt, and is now controlled by a SIDEBAR option. The trash patch is now a non-optional part of mutt so its knob has disappeared completely. Also, pass maintainership to submitter. Udo has looked after this port for a long time; many thanks to him for all his work! Changes for 1.7.0: ! Improved alignment when using multi-column characters with soft-fill (%*X) and right-justified (%>X) format strings. + The COLUMNS environment variable will be set to the width of the pager when invoking display filters. This can be used in copiousoutput mailcap entries to allow their output to match the pager width. + The sidebar patch has been merged. Please watch for airborne bovine. See the documentation for all the options, or simply enable it with 'set sidebar_visible'. + $mail_check_stats and $mail_check_stats_interval control whether, and how often, to scan for unread, flagged, and total message counts when checking for new mail in mailboxes. These statistics can be displayed in the sidebar and browser. + $trash, when set, specifies the path of the folder where mails marked for deletion will be moved, instead of being irremediably purged. + The <purge-message> function can be used to delete an entry and bypass the trash folder. + $folder_format has new format strings %m and %n, to display total and unread message counts for mailboxes. Note that $mail_check_stats should be enabled to use these. ! When browsing IMAP, %N will now display 'N', instead of the unread message count. Please use %n to display unread messages. PR: 213180 Submitted by: dereks lifeofadishwasher com Approved by: outgoing maintainer (Udo Schweigert) Deleted: head/mail/mutt/files/extra-patch-sidebar head/mail/mutt/files/extra-patch-sidebar-nntp head/mail/mutt/files/extra-patch-sidebar-refresh head/mail/mutt/files/extra-patch-trash-purge Modified: head/mail/mutt/Makefile head/mail/mutt/distinfo head/mail/mutt/files/extra-patch-greeting head/mail/mutt/files/extra-patch-ifdef head/mail/mutt/files/extra-patch-maildir-mtime head/mail/mutt/files/extra-patch-maildir-mtime-nntp head/mail/mutt/files/extra-patch-pgp-dw head/mail/mutt/files/patch-date-conditional head/mail/mutt/files/patch-smime-self head/mail/mutt/files/patch-threadcomplete Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Wed Oct 5 22:50:25 2016 (r423393) +++ head/mail/mutt/Makefile Wed Oct 5 22:55:29 2016 (r423394) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mutt -PORTVERSION= 1.6.1 +PORTVERSION= 1.7.0 PORTREVISION?= 0 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ @@ -18,8 +18,10 @@ PATCH_SITES+= http://www.mutt.org.ua/dow http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://home.woolridge.ca/mutt/patches/:dw -MAINTAINER?= udo.schweigert@siemens.com -COMMENT?= The Mongrel of Mail User Agents (development version) +MAINTAINER?= dereks@lifeofadishwasher.com +COMMENT?= The Mongrel of Mail User Agents + +LICENSE= GPLv2+ 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]* @@ -33,7 +35,7 @@ CONFIGURE_ARGS= --disable-fcntl --with-s --enable-external-dotlock --enable-pop --enable-imap \ --disable-warnings -USES+= cpe shebangfix +USES+= cpe shebangfix ssl SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl .if defined(MUTT_CONFIGURE_ARGS) @@ -43,7 +45,6 @@ CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} USES+= autoreconf GNU_CONFIGURE= yes AUTOMAKE_ARGS= --add-missing --foreign -USE_OPENSSL= yes OPTIONS_SUB= yes @@ -60,9 +61,9 @@ OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \ MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \ MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \ - QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR_PATCH \ + QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR \ SMART_DATE SMIME_OUTLOOK_COMPAT SMTP TOKYOCABINET \ - TRASH_PATCH URLVIEW XML + URLVIEW XML OPTIONS_SINGLE= GSSAPI SCREEN OPTIONS_RADIO= SPELL @@ -91,13 +92,12 @@ NLS_DESC= Native language support (impli PARENT_CHILD_MATCH_PATCH_DESC= Parent/child match QUOTE_PATCH_DESC= Extended quoting REVERSE_REPLY_PATCH_DESC= Reverse_reply -SIDEBAR_PATCH_DESC= Sidebar support +SIDEBAR_DESC= Sidebar support SLANG_DESC= SLANG support SMART_DATE_DESC= Dynamic date formatting with "%@" SMIME_OUTLOOK_COMPAT_DESC= SMIME outlook compatibility SMTP_DESC= SMTP relay support TOKYOCABINET_DESC= Use tokyocabinet instead of Berkley DB -TRASH_PATCH_DESC= Trash folder support URLVIEW_DESC= Use urlview for the URL selector menu XML_DESC= Use XML tools for rebuilding documentation @@ -106,16 +106,16 @@ OPTIONS_DEFAULT= COMPRESSED_FOLDERS HTML MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH NLS \ NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \ REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT \ - SASL SMTP TRASH_PATCH URLVIEW XML GSSAPI_NONE + SASL SMTP URLVIEW XML GSSAPI_NONE .endif RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support .if !defined (LITE) ASPELL_BUILD_DEPENDS= aspell:textproc/aspell -ASPELL_RUN_DEPENDS= aspell:textproc/aspell +ASPELL_RUN_DEPENDS= aspell:textproc/aspell ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell -ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell +ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell URLVIEW_RUN_DEPENDS= urlview:textproc/urlview .endif @@ -141,7 +141,8 @@ SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-m NCURSES_USES= ncurses NLS_USES= gettext -NLS_CONFIGURE_OFF= --disable-nls +NLS_CONFIGURE_ENABLE= nls +#NLS_CONFIGURE_OFF= --disable-nls NLS_IMPLIES= ICONV # Handle GSSAPI from various places @@ -171,22 +172,18 @@ MIXMASTER_CONFIGURE_ON= --with-mixmaster SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smime-outlook SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate -FLOCK_CONFIGURE_ON= --enable-flock -FLOCK_CONFIGURE_OFF= --disable-flock +FLOCK_CONFIGURE_ENABLE= flock LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix IDN_LIB_DEPENDS= libidn.so:dns/libidn -IDN_CONFIGURE_ON= --with-idn -IDN_CONFIGURE_OFF= --without-idn +IDN_CONFIGURE_WITH= idn IDN_IMPLIES= ICONV GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme -GPGME_CONFIGURE_ON= --enable-gpgme -GPGME_CONFIGURE_OFF= --disable-gpgme +GPGME_CONFIGURE_ENABLE= gpgme -SMTP_CONFIGURE_ON= --enable-smtp -SMTP_CONFIGURE_OFF= --disable-smtp +SMTP_CONFIGURE_ENABLE= smtp MAILDIR_HEADER_CACHE_CONFIGURE_OFF= --without-qdbm @@ -195,7 +192,7 @@ COMPRESSED_FOLDERS_CONFIGURE_ON= --enabl COMPRESSED_FOLDERS_VARS= XML_NEEDED=yes QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \ - patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv + patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv QUOTE_PATCH_VARS= XML_NEEDED=yes NNTP_DISTFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv \ @@ -204,15 +201,15 @@ NNTP_CONFIGURE_ON= --enable-nntp NNTP_VARS= XML_NEEDED=yes NNTP_CATEGORIES= news -SIDEBAR_PATCH_VARS= XML_NEEDED=yes +SIDEBAR_CONFIGURE_ENABLE= sidebar +SIDEBAR_CONFIGURE_ON= --enable-sidebar +SIDEBAR_VARS= XML_NEEDED=yes DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref .include <bsd.port.options.mk> DW_PATCH_VERSION= 1.5.6 -VVV_PATCH_VERSION:= 1.6.0 -RR_PATCH_VERSION:= 1.6.0 .if !defined(VVV_PATCH_VERSION) VVV_PATCH_VERSION= ${PORTVERSION} .endif @@ -255,10 +252,6 @@ pre-patch-NNTP-on: @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp post-patch-NNTP-on: -.if ${PORT_OPTIONS:MSIDEBAR_PATCH} - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh -.endif .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp .endif @@ -267,10 +260,6 @@ post-patch-NNTP-on: .endif post-patch-NNTP-off: -.if ${PORT_OPTIONS:MSIDEBAR_PATCH} - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh -.endif .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime .endif @@ -290,9 +279,6 @@ post-patch-GREETING_PATCH-on: post-patch-IFDEF_PATCH-on: @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef -post-patch-TRASH_PATCH-on: - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-trash-purge - WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} post-patch:: Modified: head/mail/mutt/distinfo ============================================================================== --- head/mail/mutt/distinfo Wed Oct 5 22:50:25 2016 (r423393) +++ head/mail/mutt/distinfo Wed Oct 5 22:55:29 2016 (r423394) @@ -1,12 +1,13 @@ -SHA256 (mutt/mutt-1.6.1.tar.gz) = 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 -SIZE (mutt/mutt-1.6.1.tar.gz) = 3956840 -SHA256 (mutt/patch-1.6.0.rr.compressed.gz) = c57ad6b19b2dbd812c27a098273b68b2d3b45ce2d36c3a4bff3493ad2cb75b85 -SIZE (mutt/patch-1.6.0.rr.compressed.gz) = 9977 -SHA256 (mutt/patch-1.6.0.vvv.nntp.gz) = 6a69429c2942f438d5c22cfc3f97564bbbf689b2ea482d440692048bd92f5355 -SIZE (mutt/patch-1.6.0.vvv.nntp.gz) = 61343 -SHA256 (mutt/patch-1.6.0.vvv.nntp_ru.gz) = 06f1932626a88a824f514356edf97c031a28f5d0b756353244d483285ab29c4e -SIZE (mutt/patch-1.6.0.vvv.nntp_ru.gz) = 5729 -SHA256 (mutt/patch-1.6.0.vvv.initials.gz) = f1923f35cd5a400930d6aa6a60f213bf7b8b0f65e6a0d856e7ef23914e822f4d -SIZE (mutt/patch-1.6.0.vvv.initials.gz) = 668 -SHA256 (mutt/patch-1.6.0.vvv.quote.gz) = 362b9462b2e45de36c962450e9b6715e7f4c00fb5dce4c041fd6c675fbb73814 -SIZE (mutt/patch-1.6.0.vvv.quote.gz) = 1252 +TIMESTAMP = 1475708081 +SHA256 (mutt/mutt-1.7.0.tar.gz) = 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 +SIZE (mutt/mutt-1.7.0.tar.gz) = 4019567 +SHA256 (mutt/patch-1.7.0.rr.compressed.gz) = 663987cf588e1b55cae37efa55d078ed805f5c1eaca892d2077408855d47f561 +SIZE (mutt/patch-1.7.0.rr.compressed.gz) = 9994 +SHA256 (mutt/patch-1.7.0.vvv.nntp.gz) = c22c42f0635246532a8d806e479d963dac419b913c6fbd0a1af41c2444175aa9 +SIZE (mutt/patch-1.7.0.vvv.nntp.gz) = 61078 +SHA256 (mutt/patch-1.7.0.vvv.nntp_ru.gz) = f238786497f56925a7d230143622b9ff5c5f9baaf5643e2b0322b9cfb7013ce8 +SIZE (mutt/patch-1.7.0.vvv.nntp_ru.gz) = 5495 +SHA256 (mutt/patch-1.7.0.vvv.initials.gz) = f27a94a16233de695a004e2e720ac2b531e26956577c08ab576f79e288268420 +SIZE (mutt/patch-1.7.0.vvv.initials.gz) = 669 +SHA256 (mutt/patch-1.7.0.vvv.quote.gz) = 9f22fd73fe918520750174be6285ba9a7d95054e616db717b638ad5e3073d5dc +SIZE (mutt/patch-1.7.0.vvv.quote.gz) = 1252 Modified: head/mail/mutt/files/extra-patch-greeting ============================================================================== --- head/mail/mutt/files/extra-patch-greeting Wed Oct 5 22:50:25 2016 (r423393) +++ head/mail/mutt/files/extra-patch-greeting Wed Oct 5 22:55:29 2016 (r423394) @@ -12,9 +12,9 @@ diff -urN mutt-1.5.19/globals.h mutt-1.5 diff -urN mutt-1.5.19/hdrline.c mutt-1.5.19-vc/hdrline.c --- mutt-1.5.19/hdrline.c 2009-01-05 21:20:53.000000000 +0200 +++ mutt-1.5.19-vc/hdrline.c 2009-02-09 19:30:31.000000000 +0200 -@@ -741,3 +741,62 @@ +@@ -741,3 +741,63 @@ { - mutt_FormatString (dst, dstlen, 0, s, hdr_format_str, (unsigned long) hfi, flags); + mutt_FormatString (dst, dstlen, 0, cols, s, hdr_format_str, (unsigned long) hfi, flags); } + +/* %n = recipient name @@ -24,6 +24,7 @@ diff -urN mutt-1.5.19/hdrline.c mutt-1.5 +greeting_string (char *dest, + size_t destlen, + size_t col, ++ int cols, + char op, + const char *src, + const char *prefix, @@ -70,8 +71,8 @@ diff -urN mutt-1.5.19/hdrline.c mutt-1.5 + snprintf (dest, destlen, "%%%s%c", prefix, op); + break; + } -+ if (flags & M_FORMAT_OPTIONAL) -+ mutt_FormatString (dest, destlen, col, elsestring, greeting_string, data, flags); ++ if (flags & MUTT_FORMAT_OPTIONAL) ++ mutt_FormatString (dest, destlen, col, cols, elsestring, greeting_string, data, flags); + + return(src); +} @@ -113,7 +114,7 @@ diff -urN mutt-1.5.19/protos.h mutt-1.5. void ci_bounce_message (HEADER *, int *); int ci_send_message (int, HEADER *, char *, CONTEXT *, HEADER *); -+const char *greeting_string (char *, size_t, size_t, char, const char *, const char *, ++const char *greeting_string (char *, size_t, size_t, int, char, const char *, const char *, + const char *, const char *, unsigned long, format_flag); + /* prototypes for compatibility functions */ @@ -131,7 +132,7 @@ diff -urN mutt-1.5.19/send.c mutt-1.5.19 + char buffer[STRING]; + if (Greeting) + { -+ mutt_FormatString(buffer, sizeof(buffer), 0, Greeting, greeting_string, ++ mutt_FormatString(buffer, sizeof(buffer), 0, MuttIndexWindow->cols, Greeting, greeting_string, + (unsigned long) hdr, flags); + fputs(buffer, out); + fputc ('\n', out); Modified: head/mail/mutt/files/extra-patch-ifdef ============================================================================== --- head/mail/mutt/files/extra-patch-ifdef Wed Oct 5 22:50:25 2016 (r423393) +++ head/mail/mutt/files/extra-patch-ifdef Wed Oct 5 22:55:29 2016 (r423394) @@ -35,7 +35,7 @@ + snprintf (err->data, err->dsize, _("ifdef: too few arguments")); + return (-1); + } -+ mutt_extract_token (tmp, s, M_TOKEN_SPACE); ++ mutt_extract_token (tmp, s, MUTT_TOKEN_SPACE); + + if (res) + { @@ -67,7 +67,7 @@ diff -pruN mutt-1.5.4.orig/init.h mutt-1 @@ -3715,6 +3716,7 @@ { "hdr_order", parse_list, UL &HeaderOrderList }, #ifdef HAVE_ICONV - { "iconv-hook", mutt_parse_hook, M_ICONVHOOK }, + { "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK }, + { "ifdef", parse_ifdef, 0 }, #endif { "ignore", parse_ignore, 0 }, Modified: head/mail/mutt/files/extra-patch-maildir-mtime ============================================================================== --- head/mail/mutt/files/extra-patch-maildir-mtime Wed Oct 5 22:50:25 2016 (r423393) +++ head/mail/mutt/files/extra-patch-maildir-mtime Wed Oct 5 22:55:29 2016 (r423394) @@ -21,7 +21,7 @@ + char buffer[_POSIX_PATH_MAX + SHORT_STRING]; + struct stat s; + -+ if(!buf || buf->magic != M_MAILDIR) ++ if(!buf || buf->magic != MUTT_MAILDIR) + return; + + snprintf (buffer, sizeof (buffer), "%s/tmp", buf->path); @@ -39,14 +39,14 @@ while (tmp && mutt_strcmp (buffer, tmp->path)) tmp = tmp->next; + check_maildir_times (tmp, &s); - add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0); - } - closedir (dp); + if (tmp && Context && + !mutt_strcmp (tmp->realpath, Context->realpath)) + { @@ -454,6 +471,7 @@ strfcpy (buffer, NONULL(tmp->path), sizeof (buffer)); - mutt_pretty_mailbox (buffer); + mutt_pretty_mailbox (buffer, sizeof (buffer)); + check_maildir_times (tmp, &s); - add_folder (menu, state, buffer, &s, tmp->new); + add_folder (menu, state, buffer, &s, tmp); } while ((tmp = tmp->next)); Modified: head/mail/mutt/files/extra-patch-maildir-mtime-nntp ============================================================================== --- head/mail/mutt/files/extra-patch-maildir-mtime-nntp Wed Oct 5 22:50:25 2016 (r423393) +++ head/mail/mutt/files/extra-patch-maildir-mtime-nntp Wed Oct 5 22:55:29 2016 (r423394) @@ -18,7 +18,7 @@ + char buffer[_POSIX_PATH_MAX + SHORT_STRING]; + struct stat s; + -+ if(!buf || buf->magic != M_MAILDIR) ++ if(!buf || buf->magic != MUTT_MAILDIR) + return; + + snprintf (buffer, sizeof (buffer), "%s/tmp", buf->path); Modified: head/mail/mutt/files/extra-patch-pgp-dw ============================================================================== --- head/mail/mutt/files/extra-patch-pgp-dw Wed Oct 5 22:50:25 2016 (r423393) +++ head/mail/mutt/files/extra-patch-pgp-dw Wed Oct 5 22:55:29 2016 (r423394) @@ -130,7 +130,7 @@ } + + /* otherwise inline won't work...ask for revert */ -+ if ((i = query_quadoption (OPT_PGPMIMEASK, _("Message can't be sent inline. Revert to using PGP/MIME?"))) != M_YES) ++ if ((i = query_quadoption (OPT_PGPMIMEASK, _("Message can't be sent inline. Revert to using PGP/MIME?"))) != MUTT_YES) + return -1; + + /* go ahead with PGP/MIME */ @@ -145,8 +145,8 @@ +++ hook.c Feb 2004 06:07:13 -0000 @@ -119,3 +119,7 @@ int mutt_parse_hook (BUFFER *buf, BUFFER { -+#ifdef M_CRYPTHOOK -+ if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK | M_CRYPTHOOK)) ++#ifdef MUTT_CRYPTHOOK ++ if (data & (MUTT_FOLDERHOOK | MUTT_SENDHOOK | MUTT_MESSAGEHOOK | MUTT_ACCOUNTHOOK | MUTT_REPLYHOOK | MUTT_CRYPTHOOK)) +#else if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK)) +#endif @@ -167,7 +167,7 @@ + { + if (!hook->command) + continue; -+ if (!(hook->type & M_CRYPTHOOK)) ++ if (!(hook->type & MUTT_CRYPTHOOK)) + continue; + + if ((regexec (hook->rx.rx, adr->mailbox, 0, NULL, 0) == 0) ^ hook->rx.not) @@ -250,7 +250,7 @@ @@ -1423,11 +1484,8 @@ struct option_t MuttVars[] = { */ - { "pgp_create_traditional", DT_QUAD, R_NONE, OPT_PGPTRADITIONAL, M_NO }, -+ { "pgp_mime_ask", DT_QUAD, R_NONE, OPT_PGPMIMEASK, M_NO }, ++ { "pgp_mime_ask", DT_QUAD, R_NONE, OPT_PGPMIMEASK, MUTT_NO }, /* ** .pp - ** This option controls whether Mutt generates old-style inline PGP @@ -373,7 +373,7 @@ - if (is_numerical_keyid (keyID)) + keyID = (char *)hook->data; + snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox); -+ if (!option(OPTCRYPTCONFIRMHOOK) || (r = mutt_yesorno (buf, M_YES)) == M_YES) ++ if (!option(OPTCRYPTCONFIRMHOOK) || (r = mutt_yesorno (buf, MUTT_YES)) == MUTT_YES) { - if (strncmp (keyID, "0x", 2) == 0) - keyID += 2; Modified: head/mail/mutt/files/patch-date-conditional ============================================================================== --- head/mail/mutt/files/patch-date-conditional Wed Oct 5 22:50:25 2016 (r423393) +++ head/mail/mutt/files/patch-date-conditional Wed Oct 5 22:55:29 2016 (r423394) @@ -46,7 +46,7 @@ Index: muttlib.c @@ -944,7 +944,16 @@ if (*src == '?') { - flags |= M_FORMAT_OPTIONAL; + flags |= MUTT_FORMAT_OPTIONAL; - src++; + ch = *(++src); /* save the character to switch on */ + cp = prefix; Modified: head/mail/mutt/files/patch-smime-self ============================================================================== --- head/mail/mutt/files/patch-smime-self Wed Oct 5 22:50:25 2016 (r423393) +++ head/mail/mutt/files/patch-smime-self Wed Oct 5 22:55:29 2016 (r423394) @@ -9,7 +9,7 @@ Base: http://descolada.dartmouth.edu/mut - keylist))) + char *new_keylist = keylist; + -+ if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == M_YES) ++ if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == MUTT_YES) + { + int size = mutt_strlen(keylist) + mutt_strlen (SmimeDefaultKey) + 2; /* +1 for NULL, +1 for \n */ + new_keylist = safe_malloc(size); Modified: head/mail/mutt/files/patch-threadcomplete ============================================================================== --- head/mail/mutt/files/patch-threadcomplete Wed Oct 5 22:50:25 2016 (r423393) +++ head/mail/mutt/files/patch-threadcomplete Wed Oct 5 22:55:29 2016 (r423394) @@ -1,10 +1,11 @@ --- mutt.h.orig2 Mon Sep 6 09:24:17 2004 +++ mutt.h Mon Sep 6 09:27:04 2004 @@ -212,6 +212,7 @@ - M_LIMIT, - M_EXPIRED, - M_SUPERSEDED, -+ M_THREADCOMPLETE, + MUTT_LIMIT, + MUTT_EXPIRED, + MUTT_SUPERSEDED, + MUTT_TRASH, ++ MUTT_THREADCOMPLETE, /* actions for mutt_pattern_comp/mutt_pattern_exec */ M_AND, @@ -14,24 +15,24 @@ } Flags[] = { -+ { 'a', M_THREADCOMPLETE, 0, NULL }, - { 'A', M_ALL, 0, NULL }, - { 'b', M_BODY, M_FULL_MSG, eat_regexp }, - { 'B', M_WHOLE_MSG, M_FULL_MSG, eat_regexp }, ++ { 'a', MUTT_THREADCOMPLETE, 0, NULL }, + { 'A', MUTT_ALL, 0, NULL }, + { 'b', MUTT_BODY, M_FULL_MSG, eat_regexp }, + { 'B', MUTT_WHOLE_MSG, M_FULL_MSG, eat_regexp }, @@ -1139,6 +1140,16 @@ 2, h->env->to, h->env->cc)); - case M_LIST: /* known list, subscribed or not */ + case MUTT_LIST: /* known list, subscribed or not */ return (pat->not ^ mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc)); -+ case M_THREADCOMPLETE: ++ case MUTT_THREADCOMPLETE: + { static pattern_t tmp; + static short pattern_set = 0; + if(! pattern_set) { + memset (&tmp, 0, sizeof (tmp)); -+ tmp.op = M_TAG; ++ tmp.op = MUTT_TAG; + pattern_set = 1; + } + return (pat->not ^ (h->env && match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1))); + } - case M_SUBSCRIBED_LIST: + case MUTT_SUBSCRIBED_LIST: return (pat->not ^ mutt_is_list_recipient (pat->alladdr, h->env->to, h->env->cc)); - case M_PERSONAL_RECIP: + case MUTT_PERSONAL_RECIP:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610052255.u95MtT2U058135>