[147581] trunk/dports/mail
cal at macports.org
cal at macports.org
Fri Apr 8 11:50:23 PDT 2016
Revision: 147581
https://trac.macports.org/changeset/147581
Author: cal at macports.org
Date: 2016-04-08 11:50:22 -0700 (Fri, 08 Apr 2016)
Log 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.
Modified Paths:
--------------
trunk/dports/mail/mutt/Portfile
trunk/dports/mail/mutt-devel/Portfile
Added Paths:
-----------
trunk/dports/mail/mutt/
trunk/dports/mail/mutt/files/patch-1.6.0.sidebar.20160408.macports.diff
Removed Paths:
-------------
trunk/dports/mail/mutt/
trunk/dports/mail/mutt-devel/files/
Modified: trunk/dports/mail/mutt/Portfile
===================================================================
--- trunk/dports/mail/mutt-devel/Portfile 2016-04-05 16:34:16 UTC (rev 147491)
+++ trunk/dports/mail/mutt/Portfile 2016-04-08 18:50:22 UTC (rev 147581)
@@ -3,10 +3,8 @@
PortSystem 1.0
-name mutt-devel
-conflicts mutt
-version 1.5.24
-revision 1
+name mutt
+version 1.6.0
categories mail
platforms darwin
license GPL-2
@@ -20,7 +18,7 @@
threading, regular expression searches and \
a powerful pattern matching language for selecting \
groups of messages.
-homepage http://www.mutt.org/
+homepage http://www.mutt.org
depends_lib port:gettext \
port:libiconv \
@@ -29,17 +27,15 @@
depends_run path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
master_sites https://bitbucket.org/mutt/mutt/downloads/
-distname mutt-${version}
checksums ${distfiles} \
- rmd160 7fe7e653c27c9b580f958493638c1248d0ad5591 \
- sha256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200
+ rmd160 1ea7153ef05413d0068b5478acad87927e5cecdb \
+ sha256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19
patch.pre_args -p1
# Fix for handling emails from bad clients w.r.t smime
# See https://trac.macports.org/ticket/39362 and http://dev.mutt.org/trac/ticket/3285
patchfiles-append patch-thunderbird-fix.diff
-
configure.args --disable-warnings \
--mandir=${prefix}/share/man \
--with-docdir=${prefix}/share/doc/mutt \
@@ -47,7 +43,7 @@
--with-curses=${prefix} \
--disable-silent-rules
-default_variants +pop +imap
+default_variants +pop +imap +idn
if {![variant_isset db4] && ![variant_isset qdbm] && ![variant_isset tokyocabinet]} {
variant_set gdbm
@@ -180,13 +176,13 @@
variant sidebar conflicts nntp trash description {Add a sidebar with a list of folders} {
# http://www.lunar-linux.org/mutt-sidebar/
- patch_sites-append http://lunar-linux.org/~tchan/mutt:sidebar-patch
- patchfiles-append patch-1.5.24.sidebar.20151111.txt:sidebar-patch \
+ #patch_sites-append http://lunar-linux.org/~tchan/mutt:sidebar-patch
+ patchfiles-append patch-1.6.0.sidebar.20160408.macports.diff \
1-Make_hierarchy_separator_for_folder_indentation_configurable.patch \
2-Support_long_er__folder_names_in_sidebar.patch
- checksums-append patch-1.5.24.sidebar.20151111.txt \
- rmd160 521938ab47440e93f73bc5ae358e867ab3d3212c \
- sha256 66441edf056032119f854fc5ee86c73eece8b95dc998c0cfae5ed05b0b035070
+ #checksums-append patch-1.5.24.sidebar.20151111.txt \
+ # rmd160 521938ab47440e93f73bc5ae358e867ab3d3212c \
+ # sha256 66441edf056032119f854fc5ee86c73eece8b95dc998c0cfae5ed05b0b035070
}
# Trash patch from https://trac.macports.org/ticket/20412 conflicts with sidebar patch on global.h
@@ -202,5 +198,6 @@
notes "This port no longer installs the pgpring binary. Please install the signing-party port if you need it."
+livecheck.url ${homepage}/download.html
livecheck.type regex
-livecheck.regex {Mutt (\d+(?:\.\d+)*) was released}
+livecheck.regex {The current stable public release version is (\d+(?:\.\d+)*)}
Added: trunk/dports/mail/mutt/files/patch-1.6.0.sidebar.20160408.macports.diff
===================================================================
--- trunk/dports/mail/mutt/files/patch-1.6.0.sidebar.20160408.macports.diff (rev 0)
+++ trunk/dports/mail/mutt/files/patch-1.6.0.sidebar.20160408.macports.diff 2016-04-08 18:50:22 UTC (rev 147581)
@@ -0,0 +1,1934 @@
+diff -ruN mutt-1.6.0.orig/Makefile.am mutt-1.6.0/Makefile.am
+--- mutt-1.6.0.orig/Makefile.am 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/Makefile.am 2016-04-08 20:21:12.000000000 +0200
+@@ -36,6 +36,8 @@
+ muttlib.c editmsg.c mbyte.c mutt_idna.c \
+ url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
+
++mutt_SOURCES += sidebar.c
++
+ nodist_mutt_SOURCES = $(BUILT_SOURCES)
+
+ mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAP) $(MUTTLIBS) \
+diff -ruN mutt-1.6.0.orig/Makefile.in mutt-1.6.0/Makefile.in
+--- mutt-1.6.0.orig/Makefile.in 2016-04-02 20:14:47.000000000 +0200
++++ mutt-1.6.0/Makefile.in 2016-04-08 20:26:33.000000000 +0200
+@@ -136,6 +136,7 @@
+ editmsg.$(OBJEXT) mbyte.$(OBJEXT) mutt_idna.$(OBJEXT) \
+ url.$(OBJEXT) ascii.$(OBJEXT) crypt-mod.$(OBJEXT) \
+ safe_asprintf.$(OBJEXT)
++am_mutt_OBJECTS += sidebar.$(OBJEXT)
+ am__objects_1 =
+ am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
+ $(am__objects_1)
+@@ -490,6 +491,8 @@
+ muttlib.c editmsg.c mbyte.c mutt_idna.c \
+ url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
+
++mutt_SOURCES += sidebar.c
++
+ nodist_mutt_SOURCES = $(BUILT_SOURCES)
+ mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAP) $(MUTTLIBS) \
+ $(INTLLIBS) $(LIBICONV) $(GPGME_LIBS)
+@@ -816,6 +819,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/send.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sendlib.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sha1.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sidebar.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/signal.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smime.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smtp.Po at am__quote@
+diff -ruN mutt-1.6.0.orig/OPS mutt-1.6.0/OPS
+--- mutt-1.6.0.orig/OPS 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/OPS 2016-04-08 20:19:20.000000000 +0200
+@@ -179,3 +179,8 @@
+ OP_MAIN_SHOW_LIMIT "show currently active limit pattern"
+ OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread"
+ OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads"
++OP_SIDEBAR_SCROLL_UP "scroll the mailbox pane up 1 page"
++OP_SIDEBAR_SCROLL_DOWN "scroll the mailbox pane down 1 page"
++OP_SIDEBAR_NEXT "go down to next mailbox"
++OP_SIDEBAR_PREV "go to previous mailbox"
++OP_SIDEBAR_OPEN "open hilighted mailbox"
+diff -ruN mutt-1.6.0.orig/PATCHES mutt-1.6.0/PATCHES
+--- mutt-1.6.0.orig/PATCHES 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/PATCHES 2016-04-08 20:19:20.000000000 +0200
+@@ -0,0 +1 @@
++patch-1.6.0.sidebar.20160408.macports.diff
+diff -ruN mutt-1.6.0.orig/buffy.c mutt-1.6.0/buffy.c
+--- mutt-1.6.0.orig/buffy.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/buffy.c 2016-04-08 20:19:20.000000000 +0200
+@@ -161,6 +161,49 @@
+ }
+ }
+
++static int buffy_compare_name(const void *a, const void *b) {
++ const BUFFY *b1 = * (BUFFY * const *) a;
++ const BUFFY *b2 = * (BUFFY * const *) b;
++
++ return mutt_strcoll(b1->path, b2->path);
++}
++
++static BUFFY *buffy_sort(BUFFY *b)
++{
++ BUFFY *tmp = b;
++ int buffycount = 0;
++ BUFFY **ary;
++ int i;
++
++ if (!option(OPTSIDEBARSORT))
++ return b;
++
++ for (; tmp != NULL; tmp = tmp->next)
++ buffycount++;
++
++ ary = (BUFFY **) safe_calloc(buffycount, sizeof (*ary));
++
++ tmp = b;
++ for (i = 0; tmp != NULL; tmp = tmp->next, i++) {
++ ary[i] = tmp;
++ }
++
++ qsort(ary, buffycount, sizeof(*ary), buffy_compare_name);
++
++ for (i = 0; i < buffycount - 1; i++) {
++ ary[i]->next = ary[i+1];
++ }
++ ary[buffycount - 1]->next = NULL;
++ for (i = 1; i < buffycount; i++) {
++ ary[i]->prev = ary[i-1];
++ }
++ ary[0]->prev = NULL;
++
++ tmp = ary[0];
++ free(ary);
++ return tmp;
++}
++
+ BUFFY *mutt_find_mailbox (const char *path)
+ {
+ BUFFY *tmp = NULL;
+@@ -196,9 +239,13 @@
+ static BUFFY *buffy_new (const char *path)
+ {
+ BUFFY* buffy;
++ char rp[PATH_MAX];
++ char *r;
+
+ buffy = (BUFFY *) safe_calloc (1, sizeof (BUFFY));
+ strfcpy (buffy->path, path, sizeof (buffy->path));
++ r = realpath(path, rp);
++ strfcpy (buffy->realpath, r ? rp : path, sizeof (buffy->realpath));
+ buffy->next = NULL;
+ buffy->magic = 0;
+
+@@ -243,8 +290,8 @@
+ p = realpath (buf, f1);
+ for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
+ {
+- q = realpath ((*tmp)->path, f2);
+- if (mutt_strcmp (p ? p : buf, q ? q : (*tmp)->path) == 0)
++ q = (*tmp)->realpath;
++ if (mutt_strcmp (p ? p : buf, q) == 0)
+ {
+ dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path));
+ break;
+@@ -282,6 +329,7 @@
+ else
+ (*tmp)->size = 0;
+ }
++ Incoming = buffy_sort(Incoming);
+ return 0;
+ }
+
+@@ -306,6 +354,11 @@
+ return 0;
+ }
+
++ if (option(OPTSIDEBAR) && mailbox->msg_unread > 0) {
++ mailbox->new = 1;
++ return 1;
++ }
++
+ if ((dirp = opendir (path)) == NULL)
+ {
+ mailbox->magic = 0;
+@@ -357,6 +410,73 @@
+
+ return 0;
+ }
++
++ /* update message counts for the sidebar */
++void buffy_maildir_update (BUFFY* mailbox)
++{
++ char path[_POSIX_PATH_MAX];
++ DIR *dirp;
++ struct dirent *de;
++ char *p;
++
++ if(!option(OPTSIDEBAR))
++ return;
++
++ mailbox->msgcount = 0;
++ mailbox->msg_unread = 0;
++ mailbox->msg_flagged = 0;
++
++ snprintf (path, sizeof (path), "%s/new", mailbox->path);
++
++ if ((dirp = opendir (path)) == NULL)
++ {
++ mailbox->magic = 0;
++ return;
++ }
++
++ while ((de = readdir (dirp)) != NULL)
++ {
++ if (*de->d_name == '.')
++ continue;
++
++ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) {
++ mailbox->new = 1;
++ mailbox->msgcount++;
++ mailbox->msg_unread++;
++ }
++ }
++
++ closedir (dirp);
++ snprintf (path, sizeof (path), "%s/cur", mailbox->path);
++
++ if ((dirp = opendir (path)) == NULL)
++ {
++ mailbox->magic = 0;
++ return;
++ }
++
++ while ((de = readdir (dirp)) != NULL)
++ {
++ if (*de->d_name == '.')
++ continue;
++
++ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) {
++ mailbox->msgcount++;
++ if ((p = strstr (de->d_name, ":2,"))) {
++ if (!strchr (p + 3, 'T')) {
++ if (!strchr (p + 3, 'S'))
++ mailbox->msg_unread++;
++ if (strchr(p + 3, 'F'))
++ mailbox->msg_flagged++;
++ }
++ }
++ }
++ }
++
++ mailbox->sb_last_checked = time(NULL);
++ closedir (dirp);
++}
++
+ /* returns 1 if mailbox has new mail */
+ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
+ {
+@@ -368,7 +488,7 @@
+ else
+ statcheck = sb->st_mtime > sb->st_atime
+ || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);
+- if (statcheck)
++ if ((!option(OPTSIDEBAR) && statcheck) || (option(OPTSIDEBAR) && mailbox->msg_unread > 0))
+ {
+ if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
+ {
+@@ -388,6 +508,27 @@
+ return rc;
+ }
+
++/* update message counts for the sidebar */
++void buffy_mbox_update (BUFFY* mailbox, struct stat *sb)
++{
++ CONTEXT *ctx = NULL;
++
++ if(!option(OPTSIDEBAR))
++ return;
++ if(mailbox->sb_last_checked > sb->st_mtime && mailbox->msgcount != 0)
++ return; /* no check necessary */
++
++ ctx = mx_open_mailbox(mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL);
++ if(ctx)
++ {
++ mailbox->msgcount = ctx->msgcount;
++ mailbox->msg_unread = ctx->unread;
++ mailbox->msg_flagged = ctx->flagged;
++ mailbox->sb_last_checked = time(NULL);
++ mx_close_mailbox(ctx, 0);
++ }
++}
++
+ int mutt_buffy_check (int force)
+ {
+ BUFFY *tmp;
+@@ -461,17 +602,20 @@
+ {
+ case M_MBOX:
+ case M_MMDF:
++ buffy_mbox_update (tmp, &sb);
+ if (buffy_mbox_hasnew (tmp, &sb) > 0)
+ BuffyCount++;
+ break;
+
+ case M_MAILDIR:
++ buffy_maildir_update (tmp);
+ if (buffy_maildir_hasnew (tmp) > 0)
+ BuffyCount++;
+ break;
+
+ case M_MH:
+- mh_buffy(tmp);
++ mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged, &tmp->sb_last_checked);
++ mh_buffy(tmp);
+ if (tmp->new)
+ BuffyCount++;
+ break;
+diff -ruN mutt-1.6.0.orig/buffy.h mutt-1.6.0/buffy.h
+--- mutt-1.6.0.orig/buffy.h 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/buffy.h 2016-04-08 20:19:20.000000000 +0200
+@@ -23,13 +23,19 @@
+ typedef struct buffy_t
+ {
+ char path[_POSIX_PATH_MAX];
++ char realpath[_POSIX_PATH_MAX];
+ off_t size;
+ struct buffy_t *next;
++ struct buffy_t *prev;
+ short new; /* mailbox has new mail */
++ int msgcount; /* total number of messages */
++ int msg_unread; /* number of unread messages */
++ int msg_flagged; /* number of flagged messages */
+ short notified; /* user has been notified */
+ short magic; /* mailbox type */
+ short newly_created; /* mbox or mmdf just popped into existence */
+ time_t last_visited; /* time of last exit from this mailbox */
++ time_t sb_last_checked; /* time of last buffy check from sidebar */
+ }
+ BUFFY;
+
+diff -ruN mutt-1.6.0.orig/color.c mutt-1.6.0/color.c
+--- mutt-1.6.0.orig/color.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/color.c 2016-04-08 20:19:20.000000000 +0200
+@@ -94,6 +94,8 @@
+ { "underline", MT_COLOR_UNDERLINE },
+ { "index", MT_COLOR_INDEX },
+ { "prompt", MT_COLOR_PROMPT },
++ { "sidebar_new", MT_COLOR_NEW },
++ { "sidebar_flagged", MT_COLOR_FLAGGED },
+ { NULL, 0 }
+ };
+
+diff -ruN mutt-1.6.0.orig/compose.c mutt-1.6.0/compose.c
+--- mutt-1.6.0.orig/compose.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/compose.c 2016-04-08 20:19:20.000000000 +0200
+@@ -72,7 +72,7 @@
+
+ #define HDR_XOFFSET 10
+ #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
+-#define W (COLS - HDR_XOFFSET)
++#define W (COLS - HDR_XOFFSET - SidebarWidth)
+
+ static const char * const Prompts[] =
+ {
+@@ -110,7 +110,7 @@
+
+ static void redraw_crypt_lines (HEADER *msg)
+ {
+- mvaddstr (HDR_CRYPT, 0, "Security: ");
++ mvaddstr (HDR_CRYPT, SidebarWidth, "Security: ");
+
+ if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
+ {
+@@ -145,7 +145,7 @@
+ addstr (_(" (OppEnc mode)"));
+
+ clrtoeol ();
+- move (HDR_CRYPTINFO, 0);
++ move (HDR_CRYPTINFO, SidebarWidth);
+ clrtoeol ();
+
+ if ((WithCrypto & APPLICATION_PGP)
+@@ -162,7 +162,7 @@
+ && (msg->security & ENCRYPT)
+ && SmimeCryptAlg
+ && *SmimeCryptAlg) {
+- mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
++ mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),
+ NONULL(SmimeCryptAlg));
+ }
+ }
+@@ -175,7 +175,7 @@
+ int c;
+ char *t;
+
+- mvaddstr (HDR_MIX, 0, " Mix: ");
++ mvaddstr (HDR_MIX, SidebarWidth, " Mix: ");
+
+ if (!chain)
+ {
+@@ -190,7 +190,7 @@
+ if (t && t[0] == '0' && t[1] == '\0')
+ t = "<random>";
+
+- if (c + mutt_strlen (t) + 2 >= COLS)
++ if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth)
+ break;
+
+ addstr (NONULL(t));
+@@ -242,7 +242,7 @@
+
+ buf[0] = 0;
+ rfc822_write_address (buf, sizeof (buf), addr, 1);
+- mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);
++ mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]);
+ mutt_paddstr (W, buf);
+ }
+
+@@ -252,10 +252,10 @@
+ draw_envelope_addr (HDR_TO, msg->env->to);
+ draw_envelope_addr (HDR_CC, msg->env->cc);
+ draw_envelope_addr (HDR_BCC, msg->env->bcc);
+- mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
++ mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
+ mutt_paddstr (W, NONULL (msg->env->subject));
+ draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
+- mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]);
++ mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]);
+ mutt_paddstr (W, fcc);
+
+ if (WithCrypto)
+@@ -266,7 +266,7 @@
+ #endif
+
+ SETCOLOR (MT_COLOR_STATUS);
+- mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));
++ mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));
+ clrtoeol ();
+
+ NORMAL_COLOR;
+@@ -302,7 +302,7 @@
+ /* redraw the expanded list so the user can see the result */
+ buf[0] = 0;
+ rfc822_write_address (buf, sizeof (buf), *addr, 1);
+- move (line, HDR_XOFFSET);
++ move (line, HDR_XOFFSET+SidebarWidth);
+ mutt_paddstr (W, buf);
+
+ return 0;
+@@ -564,7 +564,7 @@
+ if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
+ {
+ mutt_str_replace (&msg->env->subject, buf);
+- move (HDR_SUBJECT, HDR_XOFFSET);
++ move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth);
+ if (msg->env->subject)
+ mutt_paddstr (W, msg->env->subject);
+ else
+@@ -582,7 +582,7 @@
+ {
+ strfcpy (fcc, buf, fcclen);
+ mutt_pretty_mailbox (fcc, fcclen);
+- move (HDR_FCC, HDR_XOFFSET);
++ move (HDR_FCC, HDR_XOFFSET + SidebarWidth);
+ mutt_paddstr (W, fcc);
+ fccSet = 1;
+ }
+diff -ruN mutt-1.6.0.orig/configure.ac mutt-1.6.0/configure.ac
+--- mutt-1.6.0.orig/configure.ac 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/configure.ac 2016-04-08 20:19:20.000000000 +0200
+@@ -1301,6 +1301,8 @@
+ AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ])
+ fi
+
++AC_CHECK_FUNCS(fmemopen open_memstream)
++
+ dnl Documentation tools
+ have_openjade="no"
+ AC_PATH_PROG([OSPCAT], [ospcat], [none])
+diff -ruN mutt-1.6.0.orig/curs_main.c mutt-1.6.0/curs_main.c
+--- mutt-1.6.0.orig/curs_main.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/curs_main.c 2016-04-08 20:19:20.000000000 +0200
+@@ -26,7 +26,9 @@
+ #include "mailbox.h"
+ #include "mapping.h"
+ #include "sort.h"
++#include "buffy.h"
+ #include "mx.h"
++#include "sidebar.h"
+
+ #ifdef USE_POP
+ #include "pop.h"
+@@ -595,20 +597,31 @@
+ menu->redraw |= REDRAW_STATUS;
+ if (do_buffy_notify)
+ {
+- if (mutt_buffy_notify () && option (OPTBEEPNEW))
+- beep ();
++ if (mutt_buffy_notify ())
++ {
++ menu->redraw |= REDRAW_STATUS;
++ if (option (OPTBEEPNEW))
++ beep ();
++ }
+ }
+ else
+ do_buffy_notify = 1;
+ }
+
++ if(option(OPTSIDEBAR))
++ menu->redraw |= REDRAW_SIDEBAR;
++
+ if (op != -1)
+ mutt_curs_set (0);
+
+ if (menu->redraw & REDRAW_FULL)
+ {
+ menu_redraw_full (menu);
++ draw_sidebar(menu->menu);
+ mutt_show_error ();
++ } else if(menu->redraw & REDRAW_SIDEBAR) {
++ draw_sidebar(menu->menu);
++ menu->redraw &= ~REDRAW_SIDEBAR;
+ }
+
+ if (menu->menu == MENU_MAIN)
+@@ -630,9 +643,12 @@
+
+ if (menu->redraw & REDRAW_STATUS)
+ {
++ DrawFullLine = 1;
+ menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
++ DrawFullLine = 0;
+ move (option (OPTSTATUSONTOP) ? 0 : LINES-2, 0);
+ SETCOLOR (MT_COLOR_STATUS);
++ set_buffystats(Context);
+ mutt_paddstr (COLS, buf);
+ NORMAL_COLOR;
+ menu->redraw &= ~REDRAW_STATUS;
+@@ -652,7 +668,7 @@
+ menu->oldcurrent = -1;
+
+ if (option (OPTARROWCURSOR))
+- move (menu->current - menu->top + menu->offset, 2);
++ move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
+ else if (option (OPTBRAILLEFRIENDLY))
+ move (menu->current - menu->top + menu->offset, 0);
+ else
+@@ -1091,6 +1107,7 @@
+ break;
+
+ CHECK_MSGCOUNT;
++ CHECK_VISIBLE;
+ CHECK_READONLY;
+ {
+ int oldvcount = Context->vcount;
+@@ -1150,6 +1167,7 @@
+ menu->redraw = REDRAW_FULL;
+ break;
+
++ case OP_SIDEBAR_OPEN:
+ case OP_MAIN_CHANGE_FOLDER:
+ case OP_MAIN_NEXT_UNREAD_MAILBOX:
+
+@@ -1181,7 +1199,11 @@
+ {
+ mutt_buffy (buf, sizeof (buf));
+
+- if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
++ if ( op == OP_SIDEBAR_OPEN ) {
++ if(!CurBuffy)
++ break;
++ strncpy( buf, CurBuffy->path, sizeof(buf) );
++ } else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
+ {
+ if (menu->menu == MENU_PAGER)
+ {
+@@ -1199,6 +1221,7 @@
+ }
+
+ mutt_expand_path (buf, sizeof (buf));
++ set_curbuffy(buf);
+ if (mx_get_magic (buf) <= 0)
+ {
+ mutt_error (_("%s is not a mailbox."), buf);
+@@ -2310,6 +2333,12 @@
+ mutt_what_key();
+ break;
+
++ case OP_SIDEBAR_SCROLL_UP:
++ case OP_SIDEBAR_SCROLL_DOWN:
++ case OP_SIDEBAR_NEXT:
++ case OP_SIDEBAR_PREV:
++ scroll_sidebar(op, menu->menu);
++ break;
+ default:
+ if (menu->menu == MENU_MAIN)
+ km_error_key (MENU_MAIN);
+diff -ruN mutt-1.6.0.orig/doc/Muttrc mutt-1.6.0/doc/Muttrc
+--- mutt-1.6.0.orig/doc/Muttrc 2016-04-02 20:15:01.000000000 +0200
++++ mutt-1.6.0/doc/Muttrc 2016-04-08 20:19:20.000000000 +0200
+@@ -657,6 +657,26 @@
+ # $crypt_autosign, $crypt_replysign and $smime_is_default.
+ #
+ #
++# set sidebar_visible=no
++#
++# Name: sidebar_visible
++# Type: boolean
++# Default: no
++#
++#
++# This specifies whether or not to show sidebar (left-side list of folders).
++#
++#
++# set sidebar_width=0
++#
++# Name: sidebar_width
++# Type: number
++# Default: 0
++#
++#
++# The width of the sidebar.
++#
++#
+ # set crypt_autosign=no
+ #
+ # Name: crypt_autosign
+diff -ruN mutt-1.6.0.orig/flags.c mutt-1.6.0/flags.c
+--- mutt-1.6.0.orig/flags.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/flags.c 2016-04-08 20:19:20.000000000 +0200
+@@ -22,8 +22,10 @@
+
+ #include "mutt.h"
+ #include "mutt_curses.h"
++#include "mutt_menu.h"
+ #include "sort.h"
+ #include "mx.h"
++#include "sidebar.h"
+
+ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
+ {
+@@ -263,6 +265,7 @@
+ */
+ if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged))
+ h->searched = 0;
++ draw_sidebar(0);
+ }
+
+ void mutt_tag_set_flag (int flag, int bf)
+diff -ruN mutt-1.6.0.orig/functions.h mutt-1.6.0/functions.h
+--- mutt-1.6.0.orig/functions.h 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/functions.h 2016-04-08 20:19:20.000000000 +0200
+@@ -169,6 +169,11 @@
+ { "decrypt-save", OP_DECRYPT_SAVE, NULL },
+
+
++ { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL },
++ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL },
++ { "sidebar-next", OP_SIDEBAR_NEXT, NULL },
++ { "sidebar-prev", OP_SIDEBAR_PREV, NULL },
++ { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
+ { NULL, 0, NULL }
+ };
+
+@@ -272,6 +277,11 @@
+
+ { "what-key", OP_WHAT_KEY, NULL },
+
++ { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL },
++ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL },
++ { "sidebar-next", OP_SIDEBAR_NEXT, NULL },
++ { "sidebar-prev", OP_SIDEBAR_PREV, NULL },
++ { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
+ { NULL, 0, NULL }
+ };
+
+diff -ruN mutt-1.6.0.orig/globals.h mutt-1.6.0/globals.h
+--- mutt-1.6.0.orig/globals.h 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/globals.h 2016-04-08 20:19:20.000000000 +0200
+@@ -118,6 +118,9 @@
+ WHERE char *SendCharset;
+ WHERE char *Sendmail;
+ WHERE char *Shell;
++WHERE char *SidebarDelim;
++WHERE char *SidebarFormat;
++WHERE char *SidebarIndentStr;
+ WHERE char *Signature;
+ WHERE char *SimpleSearch;
+ #if USE_SMTP
+@@ -214,6 +217,9 @@
+ WHERE short ScoreThresholdRead;
+ WHERE short ScoreThresholdFlag;
+
++WHERE struct buffy_t *CurBuffy INITVAL(0);
++WHERE short DrawFullLine INITVAL(0);
++WHERE short SidebarWidth;
+ #ifdef USE_IMAP
+ WHERE short ImapKeepalive;
+ WHERE short ImapPipelineDepth;
+diff -ruN mutt-1.6.0.orig/handler.c mutt-1.6.0/handler.c
+--- mutt-1.6.0.orig/handler.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/handler.c 2016-04-08 20:19:20.000000000 +0200
+@@ -1603,6 +1603,11 @@
+
+ fseeko (s->fpin, b->offset, 0);
+
++#ifdef HAVE_FMEMOPEN
++ char *temp;
++ size_t tempsize;
++#endif
++
+ /* see if we need to decode this part before processing it */
+ if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE ||
+ b->encoding == ENCUUENCODED || plaintext ||
+@@ -1618,6 +1623,14 @@
+ {
+ /* decode to a tempfile, saving the original destination */
+ fp = s->fpout;
++#ifdef HAVE_FMEMOPEN
++ if ((s->fpout = open_memstream(&temp, &tempsize)) == NULL)
++ {
++ mutt_error _("Unable to open memory stream!");
++ dprint (1, (debugfile, "Can't open memory stream.\n"));
++ return -1;
++ }
++#else
+ mutt_mktemp (tempfile, sizeof (tempfile));
+ if ((s->fpout = safe_fopen (tempfile, "w")) == NULL)
+ {
+@@ -1625,6 +1638,7 @@
+ dprint (1, (debugfile, "Can't open %s.\n", tempfile));
+ return -1;
+ }
++#endif
+ /* decoding the attachment changes the size and offset, so save a copy
+ * of the "real" values now, and restore them after processing
+ */
+@@ -1653,9 +1667,19 @@
+ /* restore final destination and substitute the tempfile for input */
+ s->fpout = fp;
+ fp = s->fpin;
++#ifdef HAVE_FMEMOPEN
++ if(tempsize)
++ s->fpin = fmemopen(temp, tempsize, "r");
++ else /* fmemopen cannot handle zero-length buffers */
++ s->fpin = safe_fopen ("/dev/null", "r");
++ if(s->fpin == NULL) {
++ mutt_perror("failed to re-open memstream!");
++ return (-1);
++ }
++#else
+ s->fpin = fopen (tempfile, "r");
+ unlink (tempfile);
+-
++#endif
+ /* restore the prefix */
+ s->prefix = savePrefix;
+ }
+@@ -1680,6 +1704,10 @@
+
+ /* restore the original source stream */
+ safe_fclose (&s->fpin);
++#ifdef HAVE_FMEMOPEN
++ if(tempsize)
++ FREE(&temp);
++#endif
+ s->fpin = fp;
+ }
+ }
+diff -ruN mutt-1.6.0.orig/imap/command.c mutt-1.6.0/imap/command.c
+--- mutt-1.6.0.orig/imap/command.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/imap/command.c 2016-04-08 20:19:20.000000000 +0200
+@@ -1016,6 +1016,13 @@
+ opened */
+ status->uidnext = oldun;
+
++ /* Added to make the sidebar show the correct numbers */
++ if (status->messages)
++ {
++ inc->msgcount = status->messages;
++ inc->msg_unread = status->unseen;
++ }
++
+ FREE (&value);
+ return;
+ }
+diff -ruN mutt-1.6.0.orig/imap/imap.c mutt-1.6.0/imap/imap.c
+--- mutt-1.6.0.orig/imap/imap.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/imap/imap.c 2016-04-08 20:19:20.000000000 +0200
+@@ -1535,7 +1535,7 @@
+
+ imap_munge_mbox_name (idata, munged, sizeof (munged), name);
+ snprintf (command, sizeof (command),
+- "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT)", munged);
++ "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT MESSAGES)", munged);
+
+ if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
+ {
+diff -ruN mutt-1.6.0.orig/init.h mutt-1.6.0/init.h
+--- mutt-1.6.0.orig/init.h 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/init.h 2016-04-08 20:19:20.000000000 +0200
+@@ -2049,6 +2049,54 @@
+ ** not used.
+ ** (PGP only)
+ */
++ {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, UL "|"},
++ /*
++ ** .pp
++ ** This specifies the delimiter between the sidebar (if visible) and
++ ** other screens.
++ */
++ {"sidebar_indentstr", DT_STR, R_BOTH, UL &SidebarIndentStr, UL " "},
++ /*
++ ** .pp
++ ** This specifies the string that is used to indent items
++ ** with sidebar_folderindent= yes
++ */
++ { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 },
++ /*
++ ** .pp
++ ** This specifies whether or not to show sidebar (left-side list of folders).
++ */
++ { "sidebar_sort", DT_BOOL, R_BOTH, OPTSIDEBARSORT, 0 },
++ /*
++ ** .pp
++ ** This specifies whether or not to sort the sidebar alphabetically.
++ */
++ { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 },
++ /*
++ ** .pp
++ ** The width of the sidebar.
++ */
++ { "sidebar_shortpath", DT_BOOL, R_BOTH, OPTSIDEBARSHORTPATH, 0 },
++ /*
++ ** .pp
++ ** Should the sidebar shorten the path showed.
++ */
++ {"sidebar_format", DT_STR, R_NONE, UL &SidebarFormat, UL "%B%?F? [%F]?%* %?N?%N/?%4S"},
++ /*
++ ** .pp
++ ** Format string for the sidebar. The sequences `%N', `%F' and `%S'
++ ** will be replaced by the number of new or flagged messages or the total
++ ** size of them mailbox. `%B' will be replaced with the name of the mailbox.
++ ** The `%!' sequence will be expanded to `!' if there is one flagged message;
++ ** to `!!' if there are two flagged messages; and to `n!' for n flagged
++ ** messages, n>2.
++ */
++ { "sidebar_folderindent", DT_BOOL, R_BOTH, OPTSIDEBARFOLDERINDENT, 0 },
++ /*
++ ** .pp
++ ** Should folders be indented in the sidebar.
++ */
++
+ { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
+ /*
+ ** .pp
+diff -ruN mutt-1.6.0.orig/mailbox.h mutt-1.6.0/mailbox.h
+--- mutt-1.6.0.orig/mailbox.h 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/mailbox.h 2016-04-08 20:19:20.000000000 +0200
+@@ -27,6 +27,7 @@
+ #define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses
+ * safe_fopen() for mbox-style folders.
+ */
++#define M_PEEK (1<<5) /* revert atime back after taking a look (if applicable) */
+
+ /* mx_open_new_message() */
+ #define M_ADD_FROM (1<<0) /* add a From_ line */
+diff -ruN mutt-1.6.0.orig/main.c mutt-1.6.0/main.c
+--- mutt-1.6.0.orig/main.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/main.c 2016-04-08 20:19:20.000000000 +0200
+@@ -50,6 +50,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/stat.h>
++#include <limits.h>
+ #include <sys/utsname.h>
+
+ #ifdef HAVE_GETOPT_H
+@@ -557,7 +558,7 @@
+
+ int main (int argc, char **argv)
+ {
+- char folder[_POSIX_PATH_MAX] = "";
++ char folder[PATH_MAX] = "";
+ char *subject = NULL;
+ char *includeFile = NULL;
+ char *draftFile = NULL;
+@@ -1184,6 +1185,13 @@
+ strfcpy (folder, NONULL(Spoolfile), sizeof (folder));
+ mutt_expand_path (folder, sizeof (folder));
+
++ {
++ char tmpfolder[PATH_MAX];
++ strfcpy (tmpfolder, folder, sizeof (tmpfolder));
++ if(!realpath(tmpfolder, folder))
++ strfcpy (folder, tmpfolder, sizeof (tmpfolder));
++ }
++
+ mutt_str_replace (&CurrentFolder, folder);
+ mutt_str_replace (&LastFolder, folder);
+
+@@ -1206,6 +1214,7 @@
+ if((Context = mx_open_mailbox (folder, ((flags & M_RO) || option (OPTREADONLY)) ? M_READONLY : 0, NULL))
+ || !explicit_folder)
+ {
++ set_curbuffy(folder);
+ mutt_index_menu ();
+ if (Context)
+ FREE (&Context);
+diff -ruN mutt-1.6.0.orig/mbox.c mutt-1.6.0/mbox.c
+--- mutt-1.6.0.orig/mbox.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/mbox.c 2016-04-08 20:19:20.000000000 +0200
+@@ -100,6 +100,7 @@
+ mutt_perror (ctx->path);
+ return (-1);
+ }
++ ctx->atime = sb.st_atime;
+ ctx->mtime = sb.st_mtime;
+ ctx->size = sb.st_size;
+
+@@ -251,6 +252,7 @@
+
+ ctx->size = sb.st_size;
+ ctx->mtime = sb.st_mtime;
++ ctx->atime = sb.st_atime;
+
+ #ifdef NFS_ATTRIBUTE_HACK
+ if (sb.st_mtime > sb.st_atime)
+diff -ruN mutt-1.6.0.orig/menu.c mutt-1.6.0/menu.c
+--- mutt-1.6.0.orig/menu.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/menu.c 2016-04-08 20:19:20.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include "mutt_curses.h"
+ #include "mutt_menu.h"
+ #include "mbyte.h"
++#include "sidebar.h"
+
+ char* SearchBuffers[MENU_MAX];
+
+@@ -184,7 +185,7 @@
+ {
+ char *scratch = safe_strdup (s);
+ int shift = option (OPTARROWCURSOR) ? 3 : 0;
+- int cols = COLS - shift;
++ int cols = COLS - shift - SidebarWidth;
+
+ mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
+ s[n - 1] = 0;
+@@ -237,6 +238,7 @@
+ int do_color;
+ int attr;
+
++ draw_sidebar(1);
+ for (i = menu->top; i < menu->top + menu->pagelen; i++)
+ {
+ if (i < menu->max)
+@@ -247,7 +249,7 @@
+ menu_pad_string (buf, sizeof (buf));
+
+ ATTRSET(attr);
+- move(i - menu->top + menu->offset, 0);
++ move(i - menu->top + menu->offset, SidebarWidth);
+ do_color = 1;
+
+ if (i == menu->current)
+@@ -270,7 +272,7 @@
+ else
+ {
+ NORMAL_COLOR;
+- CLEARLINE(i - menu->top + menu->offset);
++ CLEARLINE_WIN (i - menu->top + menu->offset);
+ }
+ }
+ NORMAL_COLOR;
+@@ -287,7 +289,7 @@
+ return;
+ }
+
+- move (menu->oldcurrent + menu->offset - menu->top, 0);
++ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
+ ATTRSET(menu->color (menu->oldcurrent));
+
+ if (option (OPTARROWCURSOR))
+@@ -299,13 +301,13 @@
+ {
+ menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
+ menu_pad_string (buf, sizeof (buf));
+- move (menu->oldcurrent + menu->offset - menu->top, 3);
++ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3);
+ print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
+ }
+
+ /* now draw it in the new location */
+ SETCOLOR(MT_COLOR_INDICATOR);
+- mvaddstr(menu->current + menu->offset - menu->top, 0, "->");
++ mvaddstr(menu->current + menu->offset - menu->top, SidebarWidth, "->");
+ }
+ else
+ {
+@@ -318,7 +320,7 @@
+ menu_make_entry (buf, sizeof (buf), menu, menu->current);
+ menu_pad_string (buf, sizeof (buf));
+ SETCOLOR(MT_COLOR_INDICATOR);
+- move(menu->current - menu->top + menu->offset, 0);
++ move(menu->current - menu->top + menu->offset, SidebarWidth);
+ print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
+ }
+ menu->redraw &= REDRAW_STATUS;
+@@ -330,7 +332,7 @@
+ char buf[LONG_STRING];
+ int attr = menu->color (menu->current);
+
+- move (menu->current + menu->offset - menu->top, 0);
++ move (menu->current + menu->offset - menu->top, SidebarWidth);
+ menu_make_entry (buf, sizeof (buf), menu, menu->current);
+ menu_pad_string (buf, sizeof (buf));
+
+@@ -873,7 +875,7 @@
+
+
+ if (option (OPTARROWCURSOR))
+- move (menu->current - menu->top + menu->offset, 2);
++ move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
+ else if (option (OPTBRAILLEFRIENDLY))
+ move (menu->current - menu->top + menu->offset, 0);
+ else
+diff -ruN mutt-1.6.0.orig/mh.c mutt-1.6.0/mh.c
+--- mutt-1.6.0.orig/mh.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/mh.c 2016-04-08 20:19:20.000000000 +0200
+@@ -295,6 +295,32 @@
+ mhs_free_sequences (&mhs);
+ }
+
++void mh_buffy_update (const char *path, int *msgcount, int *msg_unread, int *msg_flagged, time_t *sb_last_checked)
++{
++ int i;
++ struct mh_sequences mhs;
++ memset (&mhs, 0, sizeof (mhs));
++
++ if(!option(OPTSIDEBAR))
++ return;
++
++ if (mh_read_sequences (&mhs, path) < 0)
++ return;
++
++ msgcount = 0;
++ msg_unread = 0;
++ msg_flagged = 0;
++ for (i = 0; i <= mhs.max; i++)
++ msgcount++;
++ if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN) {
++ msg_unread++;
++ }
++ if (mhs_check (&mhs, i) & MH_SEQ_FLAGGED)
++ msg_flagged++;
++ mhs_free_sequences (&mhs);
++ *sb_last_checked = time(NULL);
++}
++
+ static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
+ {
+ int fd;
+diff -ruN mutt-1.6.0.orig/mutt.h mutt-1.6.0/mutt.h
+--- mutt-1.6.0.orig/mutt.h 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/mutt.h 2016-04-08 20:19:20.000000000 +0200
+@@ -428,6 +428,10 @@
+ OPTSAVEEMPTY,
+ OPTSAVENAME,
+ OPTSCORE,
++ OPTSIDEBAR,
++ OPTSIDEBARSHORTPATH,
++ OPTSIDEBARSORT,
++ OPTSIDEBARFOLDERINDENT,
+ OPTSIGDASHES,
+ OPTSIGONTOP,
+ OPTSORTRE,
+@@ -872,6 +876,7 @@
+ {
+ char *path;
+ FILE *fp;
++ time_t atime;
+ time_t mtime;
+ off_t size;
+ off_t vsize;
+@@ -906,6 +911,7 @@
+ unsigned int quiet : 1; /* inhibit status messages? */
+ unsigned int collapsed : 1; /* are all threads collapsed? */
+ unsigned int closing : 1; /* mailbox is being closed */
++ unsigned int peekonly : 1; /* just taking a glance, revert atime */
+
+ /* driver hooks */
+ void *data; /* driver specific data */
+diff -ruN mutt-1.6.0.orig/mutt_curses.h mutt-1.6.0/mutt_curses.h
+--- mutt-1.6.0.orig/mutt_curses.h 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/mutt_curses.h 2016-04-08 20:19:20.000000000 +0200
+@@ -64,6 +64,7 @@
+ #undef lines
+ #endif /* lines */
+
++#define CLEARLINE_WIN(x) move(x,SidebarWidth), clrtoeol()
+ #define CLEARLINE(x) move(x,0), clrtoeol()
+ #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x)
+ #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0)
+@@ -124,6 +125,8 @@
+ MT_COLOR_UNDERLINE,
+ MT_COLOR_INDEX,
+ MT_COLOR_PROMPT,
++ MT_COLOR_NEW,
++ MT_COLOR_FLAGGED,
+ MT_COLOR_MAX
+ };
+
+diff -ruN mutt-1.6.0.orig/mutt_menu.h mutt-1.6.0/mutt_menu.h
+--- mutt-1.6.0.orig/mutt_menu.h 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/mutt_menu.h 2016-04-08 20:19:20.000000000 +0200
+@@ -34,6 +34,7 @@
+ #define REDRAW_FULL (1<<5)
+ #define REDRAW_BODY (1<<6)
+ #define REDRAW_SIGWINCH (1<<7)
++#define REDRAW_SIDEBAR (1<<8)
+
+ #define M_MODEFMT "-- Mutt: %s"
+
+diff -ruN mutt-1.6.0.orig/muttlib.c mutt-1.6.0/muttlib.c
+--- mutt-1.6.0.orig/muttlib.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/muttlib.c 2016-04-08 20:19:20.000000000 +0200
+@@ -1282,6 +1282,8 @@
+ pl = pw = 1;
+
+ /* see if there's room to add content, else ignore */
++ if ( DrawFullLine )
++ {
+ if ((col < COLS && wlen < destlen) || soft)
+ {
+ int pad;
+@@ -1325,6 +1327,52 @@
+ col += wid;
+ src += pl;
+ }
++ }
++ else
++ {
++ if ((col < COLS-SidebarWidth && wlen < destlen) || soft)
++ {
++ int pad;
++
++ /* get contents after padding */
++ mutt_FormatString (buf, sizeof (buf), 0, src + pl, callback, data, flags);
++ len = mutt_strlen (buf);
++ wid = mutt_strwidth (buf);
++
++ /* try to consume as many columns as we can, if we don't have
++ * memory for that, use as much memory as possible */
++ pad = (COLS - SidebarWidth - col - wid) / pw;
++ if (pad > 0 && wlen + (pad * pl) + len > destlen)
++ pad = ((signed)(destlen - wlen - len)) / pl;
++ if (pad > 0)
++ {
++ while (pad--)
++ {
++ memcpy (wptr, src, pl);
++ wptr += pl;
++ wlen += pl;
++ col += pw;
++ }
++ }
++ else if (soft && pad < 0)
++ {
++ /* \0-terminate dest for length computation in mutt_wstr_trunc() */
++ *wptr = 0;
++ /* make sure right part is at most as wide as display */
++ len = mutt_wstr_trunc (buf, destlen, COLS, &wid);
++ /* truncate left so that right part fits completely in */
++ wlen = mutt_wstr_trunc (dest, destlen - len, col + pad, &col);
++ wptr = dest + wlen;
++ }
++ if (len + wlen > destlen)
++ len = mutt_wstr_trunc (buf, destlen - wlen, COLS - SidebarWidth - col, NULL);
++ memcpy (wptr, buf, len);
++ wptr += len;
++ wlen += len;
++ col += wid;
++ src += pl;
++ }
++ }
+ break; /* skip rest of input */
+ }
+ else if (ch == '|')
+diff -ruN mutt-1.6.0.orig/mx.c mutt-1.6.0/mx.c
+--- mutt-1.6.0.orig/mx.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/mx.c 2016-04-08 20:19:20.000000000 +0200
+@@ -580,6 +580,7 @@
+ * M_APPEND open mailbox for appending
+ * M_READONLY open mailbox in read-only mode
+ * M_QUIET only print error messages
++ * M_PEEK revert atime where applicable
+ * ctx if non-null, context struct to use
+ */
+ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
+@@ -602,6 +603,8 @@
+ ctx->quiet = 1;
+ if (flags & M_READONLY)
+ ctx->readonly = 1;
++ if (flags & M_PEEK)
++ ctx->peekonly = 1;
+
+ if (flags & (M_APPEND|M_NEWFOLDER))
+ {
+@@ -701,13 +704,26 @@
+ void mx_fastclose_mailbox (CONTEXT *ctx)
+ {
+ int i;
++#ifndef BUFFY_SIZE
++ struct utimbuf ut;
++#endif
+
+ if(!ctx)
+ return;
++#ifndef BUFFY_SIZE
++ /* fix up the times so buffy won't get confused */
++ if (ctx->peekonly && ctx->path && ctx->mtime > ctx->atime)
++ {
++ ut.actime = ctx->atime;
++ ut.modtime = ctx->mtime;
++ utime (ctx->path, &ut);
++ }
++#endif
+
+ /* never announce that a mailbox we've just left has new mail. #3290
+ * XXX: really belongs in mx_close_mailbox, but this is a nice hook point */
+- mutt_buffy_setnotified(ctx->path);
++ if(!ctx->peekonly)
++ mutt_buffy_setnotified(ctx->path);
+
+ if (ctx->mx_close)
+ ctx->mx_close (ctx);
+@@ -719,6 +735,8 @@
+ mutt_clear_threads (ctx);
+ for (i = 0; i < ctx->msgcount; i++)
+ mutt_free_header (&ctx->hdrs[i]);
++ ctx->msgcount -= ctx->deleted;
++ set_buffystats(ctx);
+ FREE (&ctx->hdrs);
+ FREE (&ctx->v2r);
+ FREE (&ctx->path);
+@@ -812,6 +830,10 @@
+ if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->read
+ && !(ctx->hdrs[i]->flagged && option (OPTKEEPFLAGGED)))
+ read_msgs++;
++ if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->read)
++ ctx->unread--;
++ if (ctx->hdrs[i]->deleted && ctx->hdrs[i]->flagged)
++ ctx->flagged--;
+ }
+
+ if (read_msgs && quadoption (OPT_MOVE) != M_NO)
+diff -ruN mutt-1.6.0.orig/mx.h mutt-1.6.0/mx.h
+--- mutt-1.6.0.orig/mx.h 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/mx.h 2016-04-08 20:19:20.000000000 +0200
+@@ -57,6 +57,7 @@
+ int mh_read_dir (CONTEXT *, const char *);
+ int mh_sync_mailbox (CONTEXT *, int *);
+ int mh_check_mailbox (CONTEXT *, int *);
++void mh_buffy_update (const char *, int *, int *, int *, time_t *);
+ int mh_check_empty (const char *);
+
+ int maildir_read_dir (CONTEXT *);
+diff -ruN mutt-1.6.0.orig/pager.c mutt-1.6.0/pager.c
+--- mutt-1.6.0.orig/pager.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/pager.c 2016-04-08 20:19:20.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include "pager.h"
+ #include "attach.h"
+ #include "mbyte.h"
++#include "sidebar.h"
+
+ #include "mutt_crypt.h"
+
+@@ -1096,6 +1097,7 @@
+ wchar_t wc;
+ mbstate_t mbstate;
+ int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
++ wrap_cols -= SidebarWidth;
+
+ if (check_attachment_marker ((char *)buf) == 0)
+ wrap_cols = COLS;
+@@ -1573,6 +1575,7 @@
+
+ int bodyoffset = 1; /* offset of first line of real text */
+ int statusoffset = 0; /* offset for the status bar */
++ int statuswidth;
+ int helpoffset = LINES - 2; /* offset for the help bar. */
+ int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
+
+@@ -1747,7 +1750,7 @@
+ if ((redraw & REDRAW_BODY) || topline != oldtopline)
+ {
+ do {
+- move (bodyoffset, 0);
++ move (bodyoffset, SidebarWidth);
+ curline = oldtopline = topline;
+ lines = 0;
+ force_redraw = 0;
+@@ -1760,6 +1763,7 @@
+ &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
+ lines++;
+ curline++;
++ move(lines + bodyoffset, SidebarWidth);
+ }
+ last_offset = lineInfo[curline].offset;
+ } while (force_redraw);
+@@ -1772,6 +1776,7 @@
+ addch ('~');
+ addch ('\n');
+ lines++;
++ move(lines + bodyoffset, SidebarWidth);
+ }
+ NORMAL_COLOR;
+
+@@ -1789,29 +1794,39 @@
+ hfi.ctx = Context;
+ hfi.pager_progress = pager_progress_str;
+
++ statuswidth = COLS - (option(OPTSTATUSONTOP) && PagerIndexLines > 0 ? SidebarWidth : 0);
++
+ if (last_pos < sb.st_size - 1)
+ snprintf(pager_progress_str, sizeof(pager_progress_str), OFF_T_FMT "%%", (100 * last_offset / sb.st_size));
+ else
+ strfcpy(pager_progress_str, (topline == 0) ? "all" : "end", sizeof(pager_progress_str));
+
+ /* print out the pager status bar */
+- move (statusoffset, 0);
++ move (statusoffset, SidebarWidth);
+ SETCOLOR (MT_COLOR_STATUS);
++ if(option(OPTSTATUSONTOP) && PagerIndexLines > 0) {
++ CLEARLINE_WIN (statusoffset);
++ } else {
++ CLEARLINE (statusoffset);
++ DrawFullLine = 1; /* for mutt_make_string_info */
++ }
+
+ if (IsHeader (extra) || IsMsgAttach (extra))
+ {
+- size_t l1 = COLS * MB_LEN_MAX;
++ size_t l1 = statuswidth * MB_LEN_MAX;
+ size_t l2 = sizeof (buffer);
+ hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
+ mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
+- mutt_paddstr (COLS, buffer);
++ mutt_paddstr (statuswidth, buffer);
+ }
+ else
+ {
+ char bn[STRING];
+ snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);
+- mutt_paddstr (COLS, bn);
++ mutt_paddstr (statuswidth, bn);
+ }
++ if(!option(OPTSTATUSONTOP) || PagerIndexLines == 0)
++ DrawFullLine = 0; /* reset */
+ NORMAL_COLOR;
+ if (option(OPTTSENABLED) && TSSupported)
+ {
+@@ -1827,16 +1842,22 @@
+ /* redraw the pager_index indicator, because the
+ * flags for this message might have changed. */
+ menu_redraw_current (index);
++ draw_sidebar(MENU_PAGER);
+
+ /* print out the index status bar */
+ menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
+
+- move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);
++ move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
++ (option(OPTSTATUSONTOP) ? 0: SidebarWidth));
+ SETCOLOR (MT_COLOR_STATUS);
+- mutt_paddstr (COLS, buffer);
++ mutt_paddstr (COLS - (option(OPTSTATUSONTOP) ? 0 : SidebarWidth), buffer);
+ NORMAL_COLOR;
+ }
+
++ /* if we're not using the index, update every time */
++ if ( index == 0 )
++ draw_sidebar(MENU_PAGER);
++
+ redraw = 0;
+
+ if (option(OPTBRAILLEFRIENDLY)) {
+@@ -2777,6 +2798,13 @@
+ mutt_what_key ();
+ break;
+
++ case OP_SIDEBAR_SCROLL_UP:
++ case OP_SIDEBAR_SCROLL_DOWN:
++ case OP_SIDEBAR_NEXT:
++ case OP_SIDEBAR_PREV:
++ scroll_sidebar(ch, MENU_PAGER);
++ break;
++
+ default:
+ ch = -1;
+ break;
+diff -ruN mutt-1.6.0.orig/pattern.c mutt-1.6.0/pattern.c
+--- mutt-1.6.0.orig/pattern.c 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/pattern.c 2016-04-08 20:19:20.000000000 +0200
+@@ -154,6 +154,10 @@
+ HEADER *h = ctx->hdrs[msgno];
+ char *buf;
+ size_t blen;
++#ifdef HAVE_FMEMOPEN
++ char *temp;
++ size_t tempsize;
++#endif
+
+ if ((msg = mx_open_message (ctx, msgno)) != NULL)
+ {
+@@ -163,12 +167,20 @@
+ memset (&s, 0, sizeof (s));
+ s.fpin = msg->fp;
+ s.flags = M_CHARCONV;
++#ifdef HAVE_FMEMOPEN
++ if((s.fpout = open_memstream(&temp, &tempsize)) == NULL)
++ {
++ mutt_perror ("Error opening memstream");
++ return (0);
++ }
++#else
+ mutt_mktemp (tempfile, sizeof (tempfile));
+ if ((s.fpout = safe_fopen (tempfile, "w+")) == NULL)
+ {
+ mutt_perror (tempfile);
+ return (0);
+ }
++#endif
+
+ if (pat->op != M_BODY)
+ mutt_copy_header (msg->fp, h, s.fpout, CH_FROM | CH_DECODE, NULL);
+@@ -184,7 +196,11 @@
+ if (s.fpout)
+ {
+ safe_fclose (&s.fpout);
++#ifdef HAVE_FMEMOPEN
++ FREE(&temp);
++#else
+ unlink (tempfile);
++#endif
+ }
+ return (0);
+ }
+@@ -193,11 +209,28 @@
+ mutt_body_handler (h->content, &s);
+ }
+
++#ifdef HAVE_FMEMOPEN
++ fclose(s.fpout);
++ lng = tempsize;
++
++ if(tempsize) {
++ if ((fp = fmemopen(temp, tempsize, "r")) == NULL) {
++ mutt_perror ("Error re-opening memstream");
++ return (0);
++ }
++ } else { /* fmemopen cannot handle empty buffers */
++ if ((fp = safe_fopen ("/dev/null", "r")) == NULL) {
++ mutt_perror ("Error opening /dev/null");
++ return (0);
++ }
++ }
++#else
+ fp = s.fpout;
+ fflush (fp);
+ fseek (fp, 0, 0);
+ fstat (fileno (fp), &st);
+ lng = (long) st.st_size;
++#endif
+ }
+ else
+ {
+@@ -244,7 +277,12 @@
+ if (option (OPTTHOROUGHSRC))
+ {
+ safe_fclose (&fp);
++#ifdef HAVE_FMEMOPEN
++ if(tempsize)
++ FREE (&temp);
++#else
+ unlink (tempfile);
++#endif
+ }
+ }
+
+diff -ruN mutt-1.6.0.orig/protos.h mutt-1.6.0/protos.h
+--- mutt-1.6.0.orig/protos.h 2016-04-02 20:12:22.000000000 +0200
++++ mutt-1.6.0/protos.h 2016-04-08 20:19:20.000000000 +0200
+@@ -36,6 +36,13 @@
+ const char *pager_progress;
+ };
+
++struct sidebar_entry {
++ char box[SHORT_STRING];
++ unsigned int size;
++ unsigned int new;
++ unsigned int flagged;
++};
++
+ void mutt_make_string_info (char *, size_t, const char *, struct hdr_format_info *, format_flag);
+
+ int mutt_extract_token (BUFFER *, BUFFER *, int);
+diff -ruN mutt-1.6.0.orig/sidebar.c mutt-1.6.0/sidebar.c
+--- mutt-1.6.0.orig/sidebar.c 1970-01-01 01:00:00.000000000 +0100
++++ mutt-1.6.0/sidebar.c 2016-04-08 20:19:20.000000000 +0200
+@@ -0,0 +1,410 @@
++/*
++ * Copyright (C) ????-2004 Justin Hibbits <jrh29 at po.cwru.edu>
++ * Copyright (C) 2004 Thomer M. Gil <mutt at thomer.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
++ */
++
++
++#if HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#include "mutt.h"
++#include "mutt_menu.h"
++#include "mutt_curses.h"
++#include "sidebar.h"
++#include "buffy.h"
++#include <libgen.h>
++#include "keymap.h"
++#include <stdbool.h>
++
++/*BUFFY *CurBuffy = 0;*/
++static BUFFY *TopBuffy = 0;
++static BUFFY *BottomBuffy = 0;
++static int known_lines = 0;
++
++void calc_boundaries() {
++
++ BUFFY *tmp = Incoming;
++
++ int count = LINES - 2 - (option(OPTHELP) ? 1 : 0);
++
++ if ( known_lines != LINES ) {
++ TopBuffy = BottomBuffy = 0;
++ known_lines = LINES;
++ }
++ for ( ; tmp->next != 0; tmp = tmp->next )
++ tmp->next->prev = tmp;
++
++ if ( TopBuffy == 0 && BottomBuffy == 0 )
++ TopBuffy = Incoming;
++ if ( BottomBuffy == 0 ) {
++ BottomBuffy = TopBuffy;
++ while ( --count && BottomBuffy->next )
++ BottomBuffy = BottomBuffy->next;
++ }
++ else if ( TopBuffy == CurBuffy->next ) {
++ BottomBuffy = CurBuffy;
++ tmp = BottomBuffy;
++ while ( --count && tmp->prev)
++ tmp = tmp->prev;
++ TopBuffy = tmp;
++ }
++ else if ( BottomBuffy == CurBuffy->prev ) {
++ TopBuffy = CurBuffy;
++ tmp = TopBuffy;
++ while ( --count && tmp->next )
++ tmp = tmp->next;
++ BottomBuffy = tmp;
++ }
++}
++
++static const char *
++sidebar_format_str (char *dest,
++ size_t destlen,
++ size_t col,
++ char op,
++ const char *src,
++ const char *prefix,
++ const char *ifstring,
++ const char *elsestring,
++ unsigned long data,
++ format_flag flags)
++{
++/* casting from unsigned long - srsly?! */
++struct sidebar_entry *sbe = (struct sidebar_entry *) data;
++unsigned int optional;
++char fmt[SHORT_STRING], buf[SHORT_STRING];
++
++optional = flags & M_FORMAT_OPTIONAL;
++
++switch(op) {
++ case 'F':
++ if(!optional) {
++ snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
++ snprintf (dest, destlen, fmt, sbe->flagged);
++ } else if(sbe->flagged == 0) {
++ optional = 0;
++ }
++ break;
++
++ case '!':
++ if(sbe->flagged == 0)
++ mutt_format_s(dest, destlen, prefix, "");
++ if(sbe->flagged == 1)
++ mutt_format_s(dest, destlen, prefix, "!");
++ if(sbe->flagged == 2)
++ mutt_format_s(dest, destlen, prefix, "!!");
++ if(sbe->flagged > 2) {
++ snprintf (buf, sizeof (buf), "%d!", sbe->flagged);
++ mutt_format_s(dest, destlen, prefix, buf);
++ }
++ break;
++
++ case 'S':
++ if(!optional) {
++ snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
++ snprintf (dest, destlen, fmt, sbe->size);
++ } else if (sbe->size == 0) {
++ optional = 0;
++ }
++ break;
++
++ case 'N':
++ if(!optional) {
++ snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
++ snprintf (dest, destlen, fmt, sbe->new);
++ } else if(sbe->new == 0) {
++ optional = 0;
++ }
++ break;
++
++ case 'B':
++ mutt_format_s(dest, destlen, prefix, sbe->box);
++ break;
++ }
++
++ if(optional)
++ mutt_FormatString (dest, destlen, col, ifstring, sidebar_format_str, (unsigned long) sbe, flags);
++ else if (flags & M_FORMAT_OPTIONAL)
++ mutt_FormatString (dest, destlen, col, elsestring, sidebar_format_str, (unsigned long) sbe, flags);
++
++ return (src);
++}
++
++char *make_sidebar_entry(char *box, unsigned int size, unsigned int new, unsigned int flagged) {
++ static char *entry = 0;
++ struct sidebar_entry sbe;
++ int SBvisual;
++
++ SBvisual = SidebarWidth - strlen(SidebarDelim);
++ if (SBvisual < 1)
++ return NULL;
++
++ sbe.new = new;
++ sbe.flagged = flagged;
++ sbe.size = size;
++ strncpy(sbe.box, box, 31);
++
++ safe_realloc(&entry, SBvisual + 2);
++ entry[SBvisual + 1] = '\0';
++
++ mutt_FormatString (entry, SBvisual+1, 0, SidebarFormat, sidebar_format_str, (unsigned long) &sbe, 0);
++
++ return entry;
++}
++
++void set_curbuffy(char buf[LONG_STRING])
++{
++ BUFFY* tmp = CurBuffy = Incoming;
++
++ if (!Incoming)
++ return;
++
++ while(1) {
++ if(!strcmp(tmp->path, buf) || !strcmp(tmp->realpath, buf)) {
++ CurBuffy = tmp;
++ break;
++ }
++
++ if(tmp->next)
++ tmp = tmp->next;
++ else
++ break;
++ }
++}
++
++int draw_sidebar(int menu) {
++
++ BUFFY *tmp;
++#ifndef USE_SLANG_CURSES
++ attr_t attrs;
++#endif
++ short delim_len = strlen(SidebarDelim);
++ short color_pair;
++
++ static bool initialized = false;
++ static int prev_show_value;
++ static short saveSidebarWidth;
++ int lines = 0;
++ int SidebarHeight;
++
++ if(option(OPTSTATUSONTOP) || option(OPTHELP))
++ lines++; /* either one will occupy the first line */
++
++ /* initialize first time */
++ if(!initialized) {
++ prev_show_value = option(OPTSIDEBAR);
++ saveSidebarWidth = SidebarWidth;
++ if(!option(OPTSIDEBAR)) SidebarWidth = 0;
++ initialized = true;
++ }
++
++ /* save or restore the value SidebarWidth */
++ if(prev_show_value != option(OPTSIDEBAR)) {
++ if(prev_show_value && !option(OPTSIDEBAR)) {
++ saveSidebarWidth = SidebarWidth;
++ SidebarWidth = 0;
++ } else if(!prev_show_value && option(OPTSIDEBAR)) {
++ mutt_buffy_check(1); /* we probably have bad or no numbers */
++ SidebarWidth = saveSidebarWidth;
++ }
++ prev_show_value = option(OPTSIDEBAR);
++ }
++
++
++/* if ( SidebarWidth == 0 ) return 0; */
++ if (SidebarWidth > 0 && option (OPTSIDEBAR)
++ && delim_len >= SidebarWidth) {
++ unset_option (OPTSIDEBAR);
++ /* saveSidebarWidth = SidebarWidth; */
++ if (saveSidebarWidth > delim_len) {
++ SidebarWidth = saveSidebarWidth;
++ mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
++ sleep (2);
++ } else {
++ SidebarWidth = 0;
++ mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar. Please set your sidebar_width to a sane value."));
++ sleep (4); /* the advise to set a sane value should be seen long enough */
++ }
++ saveSidebarWidth = 0;
++ return (0);
++ }
++
++ if ( SidebarWidth == 0 || !option(OPTSIDEBAR)) {
++ if (SidebarWidth > 0) {
++ saveSidebarWidth = SidebarWidth;
++ SidebarWidth = 0;
++ }
++ unset_option(OPTSIDEBAR);
++ return 0;
++ }
++
++ /* get attributes for divider */
++ SETCOLOR(MT_COLOR_STATUS);
++#ifndef USE_SLANG_CURSES
++ attr_get(&attrs, &color_pair, 0);
++#else
++ color_pair = attr_get();
++#endif
++ SETCOLOR(MT_COLOR_NORMAL);
++
++ /* draw the divider */
++
++ SidebarHeight = LINES - 1;
++ if(option(OPTHELP) || !option(OPTSTATUSONTOP))
++ SidebarHeight--;
++
++ for ( ; lines < SidebarHeight; lines++ ) {
++ move(lines, SidebarWidth - delim_len);
++ addstr(NONULL(SidebarDelim));
++#ifndef USE_SLANG_CURSES
++ mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
++#endif
++ }
++
++ if ( Incoming == 0 ) return 0;
++ lines = 0;
++ if(option(OPTSTATUSONTOP) || option(OPTHELP))
++ lines++; /* either one will occupy the first line */
++
++ if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 )
++ calc_boundaries(menu);
++ if ( CurBuffy == 0 ) CurBuffy = Incoming;
++
++ tmp = TopBuffy;
++
++ SETCOLOR(MT_COLOR_NORMAL);
++
++ for ( ; tmp && lines < SidebarHeight; tmp = tmp->next ) {
++ if ( tmp == CurBuffy )
++ SETCOLOR(MT_COLOR_INDICATOR);
++ else if ( tmp->msg_unread > 0 )
++ SETCOLOR(MT_COLOR_NEW);
++ else if ( tmp->msg_flagged > 0 )
++ SETCOLOR(MT_COLOR_FLAGGED);
++ else
++ SETCOLOR(MT_COLOR_NORMAL);
++
++ move( lines, 0 );
++ if ( Context && Context->path &&
++ (!strcmp(tmp->path, Context->path)||
++ !strcmp(tmp->realpath, Context->path)) ) {
++ tmp->msg_unread = Context->unread;
++ tmp->msgcount = Context->msgcount;
++ tmp->msg_flagged = Context->flagged;
++ }
++ /* check whether Maildir is a prefix of the current folder's path */
++ short maildir_is_prefix = 0;
++ if ( (strlen(tmp->path) > strlen(Maildir)) &&
++ (strncmp(Maildir, tmp->path, strlen(Maildir)) == 0) )
++ maildir_is_prefix = 1;
++ /* calculate depth of current folder and generate its display name with indented spaces */
++ int sidebar_folder_depth = 0;
++ char *sidebar_folder_name;
++ sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + 1);
++ if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) {
++ char *tmp_folder_name;
++ int i;
++ tmp_folder_name = tmp->path + strlen(Maildir) + 1;
++ for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) {
++ if (tmp_folder_name[i] == '/' || tmp_folder_name[i] == '.') sidebar_folder_depth++;
++ }
++ if (sidebar_folder_depth > 0) {
++ if (option(OPTSIDEBARSHORTPATH)) {
++ tmp_folder_name = strrchr(tmp->path, '.');
++ if (tmp_folder_name == NULL)
++ tmp_folder_name = mutt_basename(tmp->path);
++ else
++ tmp_folder_name++;
++ }
++ else
++ tmp_folder_name = tmp->path + strlen(Maildir) + 1;
++ sidebar_folder_name = malloc(strlen(tmp_folder_name) + sidebar_folder_depth*strlen(NONULL(SidebarIndentStr)) + 1);
++ sidebar_folder_name[0]=0;
++ for (i=0; i < sidebar_folder_depth; i++)
++ strncat(sidebar_folder_name, NONULL(SidebarIndentStr), strlen(NONULL(SidebarIndentStr)));
++ strncat(sidebar_folder_name, tmp_folder_name, strlen(tmp_folder_name));
++ }
++ }
++ printw( "%.*s", SidebarWidth - delim_len + 1,
++ make_sidebar_entry(sidebar_folder_name, tmp->msgcount,
++ tmp->msg_unread, tmp->msg_flagged));
++ if (sidebar_folder_depth > 0)
++ free(sidebar_folder_name);
++ lines++;
++ }
++ SETCOLOR(MT_COLOR_NORMAL);
++ for ( ; lines < SidebarHeight; lines++ ) {
++ int i = 0;
++ move( lines, 0 );
++ for ( ; i < SidebarWidth - delim_len; i++ )
++ addch(' ');
++ }
++ return 0;
++}
++
++
++void set_buffystats(CONTEXT* Context)
++{
++ BUFFY *tmp = Incoming;
++ while(tmp) {
++ if(Context && (!strcmp(tmp->path, Context->path) ||
++ !strcmp(tmp->realpath, Context->path))) {
++ tmp->msg_unread = Context->unread;
++ tmp->msgcount = Context->msgcount;
++ tmp->msg_flagged = Context->flagged;
++ break;
++ }
++ tmp = tmp->next;
++ }
++}
++
++void scroll_sidebar(int op, int menu)
++{
++ if(!SidebarWidth) return;
++ if(!CurBuffy) return;
++
++ switch (op) {
++ case OP_SIDEBAR_NEXT:
++ if ( CurBuffy->next == NULL ) return;
++ CurBuffy = CurBuffy->next;
++ break;
++ case OP_SIDEBAR_PREV:
++ if ( CurBuffy->prev == NULL ) return;
++ CurBuffy = CurBuffy->prev;
++ break;
++ case OP_SIDEBAR_SCROLL_UP:
++ CurBuffy = TopBuffy;
++ if ( CurBuffy != Incoming ) {
++ calc_boundaries(menu);
++ CurBuffy = CurBuffy->prev;
++ }
++ break;
++ case OP_SIDEBAR_SCROLL_DOWN:
++ CurBuffy = BottomBuffy;
++ if ( CurBuffy->next ) {
++ calc_boundaries(menu);
++ CurBuffy = CurBuffy->next;
++ }
++ break;
++ default:
++ return;
++ }
++ calc_boundaries(menu);
++ draw_sidebar(menu);
++}
++
+diff -ruN mutt-1.6.0.orig/sidebar.h mutt-1.6.0/sidebar.h
+--- mutt-1.6.0.orig/sidebar.h 1970-01-01 01:00:00.000000000 +0100
++++ mutt-1.6.0/sidebar.h 2016-04-08 20:19:20.000000000 +0200
+@@ -0,0 +1,36 @@
++/*
++ * Copyright (C) ????-2004 Justin Hibbits <jrh29 at po.cwru.edu>
++ * Copyright (C) 2004 Thomer M. Gil <mutt at thomer.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
++ */
++
++#ifndef SIDEBAR_H
++#define SIDEBAR_H
++
++struct MBOX_LIST {
++ char *path;
++ int msgcount;
++ int new;
++} MBLIST;
++
++/* parameter is whether or not to go to the status line */
++/* used for omitting the last | that covers up the status bar in the index */
++int draw_sidebar(int);
++void scroll_sidebar(int, int);
++void set_curbuffy(char*);
++void set_buffystats(CONTEXT*);
++
++#endif /* SIDEBAR_H */
Modified: trunk/dports/mail/mutt-devel/Portfile
===================================================================
--- trunk/dports/mail/mutt-devel/Portfile 2016-04-08 18:05:17 UTC (rev 147580)
+++ trunk/dports/mail/mutt-devel/Portfile 2016-04-08 18:50:22 UTC (rev 147581)
@@ -4,203 +4,11 @@
PortSystem 1.0
name mutt-devel
-conflicts mutt
version 1.5.24
-revision 1
+revision 2
categories mail
-platforms darwin
-license GPL-2
-maintainers nomaintainer
description The Mutt E-Mail Client
-long_description Mutt is a small but very powerful text-based MIME \
- mail client. Mutt is highly configurable, and is \
- well suited to the mail power user with advanced \
- features like key bindings, keyboard macros, mail \
- threading, regular expression searches and \
- a powerful pattern matching language for selecting \
- groups of messages.
-homepage http://www.mutt.org/
-depends_lib port:gettext \
- port:libiconv \
- port:ncurses
-
-depends_run path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
-
-master_sites https://bitbucket.org/mutt/mutt/downloads/
-distname mutt-${version}
-checksums ${distfiles} \
- rmd160 7fe7e653c27c9b580f958493638c1248d0ad5591 \
- sha256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200
-
-patch.pre_args -p1
-# Fix for handling emails from bad clients w.r.t smime
-# See https://trac.macports.org/ticket/39362 and http://dev.mutt.org/trac/ticket/3285
-patchfiles-append patch-thunderbird-fix.diff
-
-
-configure.args --disable-warnings \
- --mandir=${prefix}/share/man \
- --with-docdir=${prefix}/share/doc/mutt \
- --with-libiconv-prefix=${prefix} \
- --with-curses=${prefix} \
- --disable-silent-rules
-
-default_variants +pop +imap
-
-if {![variant_isset db4] && ![variant_isset qdbm] && ![variant_isset tokyocabinet]} {
- variant_set gdbm
-}
-
-# These variants' patches modify Makefile.am
-if {[variant_isset compress] || [variant_isset sidebar]} {
- use_autoreconf yes
-}
-
-post-destroot {
- # delete pgpring to avoid a conflict with signing-party
- delete ${destroot}${prefix}/bin/pgpring ${destroot}${prefix}/share/man/man1/pgpring.1
- # delete horribly outdated ca bundle, I hope people weren't using that!
- delete ${destroot}${prefix}/share/doc/mutt/samples/ca-bundle.crt
-}
-
-variant idn description {Internationalized Domain Name support} {
- configure.args-append --with-idn=${prefix}
- depends_lib-append port:libidn port:zlib
-}
-
-variant pop description {POP support} {
- configure.args-append --enable-pop
-}
-variant imap description {IMAP support} {
- configure.args-append --enable-imap
-}
-variant ssl description {Secure Sockets Layer support} {
- configure.args-append --with-ssl=${prefix}
- depends_lib-append path:lib/libssl.dylib:openssl
-}
-variant sasl description {Simple Authentication and Security Layer support} {
- configure.args-append --with-sasl=${prefix}
- depends_lib-append port:cyrus-sasl2
-}
-
-variant debug description {Debugging support} {
- configure.args-append --enable-debug
-}
-
-variant gnuregex description {Use the GNU regular expression library} {
- configure.args-append --with-regex
-}
-
-variant compress description {Compressed folders} {
- configure.args-append --enable-compressed
- patch_sites-append http://www.mutt.org.ua/download/mutt-1.5.24/
- patchfiles-append patch-1.5.24.rr.compressed.gz
- checksums-append patch-1.5.24.rr.compressed.gz \
- rmd160 2bf71a26de195ce11ed4ffa25403363cab7c9b72 \
- sha256 c5eb9b53f7bd3feaa5ee03722575f64e43512b756c099ffe20db6fe5c958e3dc
-}
-
-variant headercache conflicts db4 description {Enable header caching (requires gdbm, qdbm, or tokyocabinet)} {
- configure.args-append --enable-hcache
- configure.ldflags-append "-L/usr/lib"
-}
-
-variant qdbm conflicts db4 gdbm tokyocabinet description {Use QDBM database} {
- depends_lib-append port:qdbm
- configure.args-append --with-qdbm \
- --without-bdb \
- --without-gdbm \
- --without-tokyocabinet
-}
-
-variant gdbm conflicts db4 qdbm tokyocabinet description {Use GNU dbm database} {
- depends_lib-append port:gdbm
- configure.args-append --with-gdbm \
- --without-bdb \
- --without-qdbm \
- --without-tokyocabinet
-}
-
-variant db4 conflicts qdbm gdbm tokyocabinet description {Use Berkeley DB database} {
- depends_lib-append port:db44
- configure.args-append --with-bdb=${prefix} \
- --without-qdbm \
- --without-gdbm \
- --without-tokyocabinet
- configure.cppflags-append "-I${prefix}/include/db44"
- configure.ldflags-append "-L${prefix}/lib/db44"
-}
-
-variant tokyocabinet conflicts db4 gdbm qdbm description {Use Tokyo Cabinet database} {
- depends_lib-append port:tokyocabinet
- configure.args-append --with-tokyocabinet \
- --without-bdb \
- --without-gdbm \
- --without-qdbm
-}
-
-# The patches for nntp and sidebar conflict, see ticket #15135
-variant nntp conflicts sidebar description {NNTP support} {
- configure.args-append --enable-nntp
- patch_sites-append http://www.mutt.org.ua/download/mutt-1.5.24/
- patchfiles-append patch-1.5.24.vvv.nntp.gz
- checksums-append patch-1.5.24.vvv.nntp.gz \
- rmd160 028b86c3864ec2b8a485b998ce42d55fbb98e205 \
- sha256 d34be4542d549aab6de9f7038c88b3eeefe826db643c92b27e1e65ab5f7d573e
-}
-
-variant deepif description {Allow nested if-else sequences in strings} {
- patch_sites-append http://home.uchicago.edu/~dgc/sw/mutt/
- patchfiles-append patch-1.5.8.dgc.deepif.1
- checksums-append patch-1.5.8.dgc.deepif.1 \
- rmd160 9372934147e8b832390c45833d0b8ce6c704dd24 \
- sha256 570c343a440f5957e8e4639bda598c861cfaeae065a380a2c01ccb17d373ce6b
-}
-
-variant date_conditional requires deepif description \
- {Allow the format of dates in the index to vary based on how recent the message is} {
- # original, but now dgc hosts it with -p1
- #patch_sites-append http://www.schrab.com/aaron/mutt/
- patch_sites-append http://home.uchicago.edu/~dgc/sw/mutt/
- patchfiles-append patch-1.5.8.ats.date_conditional.1
- checksums-append patch-1.5.8.ats.date_conditional.1 \
- rmd160 fc3703edc66b5043227a7abcfed10a9c44873fd0 \
- sha256 9e81f9f52577eb572e29651402ded3690e470d1628a890af9f3ad25b665d600f
-}
-
-variant xlabel description {Custom message-tagging - X-Label:} {
- patchfiles-append patch-1.5.21.mp.xlabel_ext.9
-}
-
-variant smtp description {Include internal SMTP relay support} {
- configure.args-append --enable-smtp
-}
-
-variant sidebar conflicts nntp trash description {Add a sidebar with a list of folders} {
- # http://www.lunar-linux.org/mutt-sidebar/
- patch_sites-append http://lunar-linux.org/~tchan/mutt:sidebar-patch
- patchfiles-append patch-1.5.24.sidebar.20151111.txt:sidebar-patch \
- 1-Make_hierarchy_separator_for_folder_indentation_configurable.patch \
- 2-Support_long_er__folder_names_in_sidebar.patch
- checksums-append patch-1.5.24.sidebar.20151111.txt \
- rmd160 521938ab47440e93f73bc5ae358e867ab3d3212c \
- sha256 66441edf056032119f854fc5ee86c73eece8b95dc998c0cfae5ed05b0b035070
-}
-
-# Trash patch from https://trac.macports.org/ticket/20412 conflicts with sidebar patch on global.h
-variant trash conflicts sidebar description {Add a Trash folder} {
- patchfiles-append patch-1.5.24-trash_folder-purge_message.diff
-}
-
-variant gpgme description {Enable GPGME crypto support} {
- configure.args-append --enable-gpgme \
- --with-gpgme-prefix=${prefix}
- depends_lib-append port:gpgme
-}
-
-notes "This port no longer installs the pgpring binary. Please install the signing-party port if you need it."
-
-livecheck.type regex
-livecheck.regex {Mutt (\d+(?:\.\d+)*) was released}
+replaced_by mutt
+PortGroup obsolete 1.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160408/16ef4a2b/attachment-0001.html>
More information about the macports-changes
mailing list