This is an update for mutt; I got bored waiting for a new sidebar patch so I did the update for that myself.
I've been using it (no flavor) since release on sparc64 with IMAP mailboxes without any trouble, and briefly tested with sidebar on amd64. - Mutt 1.5.16 was released on June 9, 2007. This release is largely a bug-fix release, but it does contain a couple of small new features (next-unread-mailbox, $message_cache_clean). - Mutt 1.5.15 was released on April 6, 2007. This version has several new and long-standing feature patches applied in anticipation of a feature freeze toward 1.6. These include built-in SMTP, flowed mail support improvements, xterm title updating, charset improvements, GPG PKA support, etc. See the ChangeLog for full details. >> http://www.mutt.org/doc/devel/UPDATING (changes since in-tree v1.5.12): !: modified feature, -: deleted feature, +: new feature + next-unread-mailbox + $message_cache_clean (clean cache on sync) 1.5.15 (2007-04-06) - $imap_home_namespace (useless clutter) + $check_mbox_size (use size change instead of atime for new mail) ! improved f=f support wraps lines at $wrap if $wrap is not 0 + $wrap (>0 wraps at $wrap, <0 = $wrapmargin) + $assumed_charset, $attach_charset, $ignore_linear_white_space + $save_history, $history_file (save history across sessions) + $smtp_url (ESMTP relay support) + $crypt_use_pka (use GPGME PKA signature verification) 1.5.13 (2006-08-14): + thread patterns. Use ~(...) to match all threads that contain a message that matches ... >> Port changes - build package for sidebar - move AUTOCONF_VERSION to {stable,snapshot}/Makefile and use 2.60 for snapshot (maybe not necessary). tests/comments welcomed. >> Diff Index: Makefile =================================================================== RCS file: /cvs/ports/mail/mutt/Makefile,v retrieving revision 1.51 diff -u -p -r1.51 Makefile --- Makefile 19 Feb 2005 15:42:58 -0000 1.51 +++ Makefile 15 Jun 2007 14:51:54 -0000 @@ -5,5 +5,6 @@ SUBDIR += snapshot SUBDIR += snapshot,compressed SUBDIR += snapshot,hcache + SUBDIR += snapshot,sidebar .include <bsd.port.subdir.mk> Index: Makefile.inc =================================================================== RCS file: /cvs/ports/mail/mutt/Makefile.inc,v retrieving revision 1.23 diff -u -p -r1.23 Makefile.inc --- Makefile.inc 3 Aug 2006 19:56:08 -0000 1.23 +++ Makefile.inc 15 Jun 2007 14:51:54 -0000 @@ -10,7 +10,7 @@ MASTER_SITES_MUTT= ftp://ftp.fu-berlin.d ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ MASTER_SITES0= http://www.spinnaker.de/mutt/compressed/ -MASTER_SITES1= http://mirrors.protection.cx/~jolan/ +MASTER_SITES1= http://spacehopper.org/ MODULES= devel/gettext @@ -25,7 +25,6 @@ WANTLIB= c crypto des ssl FLAVORS+= slang mixmaster compressed FLAVOR?= -AUTOCONF_VERSION?= 2.59 CONFIGURE_STYLE= autoconf old CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \ --with-docdir="${PREFIX}/share/doc/mutt" \ @@ -35,7 +34,8 @@ CONFIGURE_ARGS= --with-sharedir="${PREFI --enable-imap \ --enable-pop \ --with-ssl \ - --sysconfdir=${CONFDIR} + --sysconfdir=${CONFDIR} \ + --mandir=${PREFIX}/man .if ${KERBEROS5} == "yes" CONFIGURE_ARGS+=--with-gss @@ -85,10 +85,10 @@ CONFIGURE_ARGS+= --without-idn .endif .if ${FLAVOR:L:Msidebar} -PATCHFILES+= patch-1.5.12.sidebar.20060720.txt-fixed:1 +PATCHFILES+= patch-1.5.16.sidebar.txt:1 PATCH_DIST_STRIP= -p1 .else -SUPDISTFILES+= patch-1.5.12.sidebar.20060720.txt-fixed:1 +SUPDISTFILES+= patch-1.5.16.sidebar.txt:1 .endif .if defined(HOMESPOOL) Index: snapshot/Makefile =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- snapshot/Makefile 4 May 2007 09:09:31 -0000 1.41 +++ snapshot/Makefile 15 Jun 2007 14:51:54 -0000 @@ -2,10 +2,10 @@ COMMENT= "tty-based e-mail client, development version" -VERSION= 1.5.12 +VERSION= 1.5.16 DISTNAME= mutt-${VERSION} -PKGNAME= ${DISTNAME}p0 MASTER_SITES= ${MASTER_SITES_MUTT:=devel/} +AUTOCONF_VERSION?= 2.60 FLAVORS= hcache idn sidebar Index: snapshot/distinfo =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/distinfo,v retrieving revision 1.24 diff -u -p -r1.24 distinfo --- snapshot/distinfo 5 Apr 2007 16:20:03 -0000 1.24 +++ snapshot/distinfo 15 Jun 2007 14:51:54 -0000 @@ -1,15 +1,15 @@ -MD5 (mutt-1.5.12.tar.gz) = VxlsgWIRpykA/cVDQesBMg== -MD5 (patch-1.5.12.rr.compressed.1.gz) = u35DnXSyLt6RLS0whisTZw== -MD5 (patch-1.5.12.sidebar.20060720.txt-fixed) = D50gbC1jspWBqTT2rt/7wg== -RMD160 (mutt-1.5.12.tar.gz) = 5o1MWwmbgUh2nROKNvqFYbJ4lpw= -RMD160 (patch-1.5.12.rr.compressed.1.gz) = fJujLZRMyELDQFNe5ikTMFLiaA8= -RMD160 (patch-1.5.12.sidebar.20060720.txt-fixed) = vqh6fLv/g4mRLb2VIxYZ9dLQJ+4= -SHA1 (mutt-1.5.12.tar.gz) = u4iKNfQqd95+MmwDtghUrRzCZuo= -SHA1 (patch-1.5.12.rr.compressed.1.gz) = I9Ix9D2D4B55zemGFnkRZUFDZEY= -SHA1 (patch-1.5.12.sidebar.20060720.txt-fixed) = 3t8eNwwIwiTVYrUkk1mKNKe2HP8= -SHA256 (mutt-1.5.12.tar.gz) = DQwqts6g2TV5vFSQ+v2uO/ZABw2ZNJDHsAzKxPqAi2c= -SHA256 (patch-1.5.12.rr.compressed.1.gz) = 3XJf+4BlEhPJbbTvta8NASJzQMvgr0L0mHdTnVoEjpE= -SHA256 (patch-1.5.12.sidebar.20060720.txt-fixed) = aodlLbf+M3VRvt3CBISTfnbf6Kf3JxChnJXvfBCyX+M= -SIZE (mutt-1.5.12.tar.gz) = 3440835 -SIZE (patch-1.5.12.rr.compressed.1.gz) = 10430 -SIZE (patch-1.5.12.sidebar.20060720.txt-fixed) = 47421 +MD5 (mutt-1.5.16.tar.gz) = EO/3Ak27fOH3c9aIpp6p2w== +MD5 (patch-1.5.16.rr.compressed.1.gz) = St5xYsuTi8FRkLrqi5iSVA== +MD5 (patch-1.5.16.sidebar.txt) = Me9/WpVI767ssby2uePkYw== +RMD160 (mutt-1.5.16.tar.gz) = OzRVmapiqVa5yIGZT/10FWpb+Ag= +RMD160 (patch-1.5.16.rr.compressed.1.gz) = MulgEqbUn2Fu8GViucKafJU4L8I= +RMD160 (patch-1.5.16.sidebar.txt) = 9b71caq/743Qw+ISBv5gWnKmgKg= +SHA1 (mutt-1.5.16.tar.gz) = SqqCvcddXhKsxy309h+7+H/WT8E= +SHA1 (patch-1.5.16.rr.compressed.1.gz) = nLX1bHvXnu38h26A3IwczUEus0M= +SHA1 (patch-1.5.16.sidebar.txt) = zoKMAsbqbwNxarkkdEMsGaY3HJA= +SHA256 (mutt-1.5.16.tar.gz) = gl6SCzlNtvVvqN60WXfAYTMfWdlTlE4n/1lWJbutPoM= +SHA256 (patch-1.5.16.rr.compressed.1.gz) = 4UJ6Tw/XJ5v194AkcrsmKfvfkoVDC1x3xziayWKs0+c= +SHA256 (patch-1.5.16.sidebar.txt) = DaSKRzkuYBWofGE3mdqri+RRWD69cF63iF5/rjBeraM= +SIZE (mutt-1.5.16.tar.gz) = 3534894 +SIZE (patch-1.5.16.rr.compressed.1.gz) = 10542 +SIZE (patch-1.5.16.sidebar.txt) = 42221 Index: snapshot/patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-Makefile_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-Makefile_in --- snapshot/patches/patch-Makefile_in 2 Aug 2006 14:30:09 -0000 1.3 +++ snapshot/patches/patch-Makefile_in 15 Jun 2007 14:51:54 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2006/08/02 14:30:09 bernd Exp $ ---- Makefile.in.orig Fri Jul 14 20:21:03 2006 -+++ Makefile.in Fri Jul 21 18:08:41 2006 -@@ -939,7 +939,7 @@ info: info-recursive +--- Makefile.in.orig Sun Jun 10 03:43:26 2007 ++++ Makefile.in Sun Jun 10 09:03:52 2007 +@@ -948,7 +948,7 @@ info: info-recursive info-am: Index: snapshot/patches/patch-browser_c =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-browser_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-browser_c --- snapshot/patches/patch-browser_c 14 Sep 2005 21:00:03 -0000 1.3 +++ snapshot/patches/patch-browser_c 15 Jun 2007 14:51:54 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-browser_c,v 1.3 2005/09/14 21:00:03 bernd Exp $ ---- browser.c.orig Thu Aug 11 21:37:01 2005 -+++ browser.c Fri Aug 12 09:21:37 2005 +--- browser.c.orig Mon Apr 16 00:56:26 2007 ++++ browser.c Sun Jun 10 09:03:52 2007 @@ -27,6 +27,7 @@ #include "buffy.h" #include "mapping.h" @@ -9,7 +9,7 @@ $OpenBSD: patch-browser_c,v 1.3 2005/09/ #include "mailbox.h" #include "browser.h" #ifdef USE_IMAP -@@ -351,6 +352,21 @@ static void init_state (struct browser_s +@@ -352,6 +353,21 @@ static void init_state (struct browser_state *state, M menu->data = state->entry; } @@ -31,7 +31,7 @@ $OpenBSD: patch-browser_c,v 1.3 2005/09/ static int examine_directory (MUTTMENU *menu, struct browser_state *state, char *d, const char *prefix) { -@@ -414,6 +430,7 @@ static int examine_directory (MUTTMENU * +@@ -415,6 +431,7 @@ static int examine_directory (MUTTMENU *menu, struct b tmp = Incoming; while (tmp && mutt_strcmp (buffer, tmp->path)) tmp = tmp->next; @@ -39,7 +39,7 @@ $OpenBSD: patch-browser_c,v 1.3 2005/09/ add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0); } closedir (dp); -@@ -459,6 +476,7 @@ static int examine_mailboxes (MUTTMENU * +@@ -464,6 +481,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b strfcpy (buffer, NONULL(tmp->path), sizeof (buffer)); mutt_pretty_mailbox (buffer); Index: snapshot/patches/patch-configure_ac =================================================================== RCS file: snapshot/patches/patch-configure_ac diff -N snapshot/patches/patch-configure_ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ snapshot/patches/patch-configure_ac 15 Jun 2007 14:51:54 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- configure.ac.orig Wed May 2 14:28:41 2007 ++++ configure.ac Wed May 2 14:29:23 2007 +@@ -531,7 +531,7 @@ docdir=$mutt_cv_docdir + AC_SUBST(docdir) + + if test x$mutt_cv_setgid = xyes; then +- DOTLOCK_GROUP='mail' ++ DOTLOCK_GROUP='wheel' + DOTLOCK_PERMISSION=2755 + else + DOTLOCK_GROUP='' Index: snapshot/patches/patch-configure_in =================================================================== RCS file: snapshot/patches/patch-configure_in diff -N snapshot/patches/patch-configure_in --- snapshot/patches/patch-configure_in 2 Aug 2006 14:30:09 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.5 2006/08/02 14:30:09 bernd Exp $ ---- configure.in.orig Fri Jul 14 20:15:32 2006 -+++ configure.in Sat Jul 15 11:06:15 2006 -@@ -476,7 +476,7 @@ docdir=$mutt_cv_docdir - AC_SUBST(docdir) - - if test x$mutt_cv_setgid = xyes; then -- DOTLOCK_GROUP='mail' -+ DOTLOCK_GROUP='wheel' - DOTLOCK_PERMISSION=2755 - else - DOTLOCK_GROUP='' Index: snapshot/patches/patch-doc_Makefile_in =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-doc_Makefile_in,v retrieving revision 1.5 diff -u -p -r1.5 patch-doc_Makefile_in --- snapshot/patches/patch-doc_Makefile_in 2 Aug 2006 14:30:09 -0000 1.5 +++ snapshot/patches/patch-doc_Makefile_in 15 Jun 2007 14:51:54 -0000 @@ -1,16 +1,16 @@ $OpenBSD: patch-doc_Makefile_in,v 1.5 2006/08/02 14:30:09 bernd Exp $ ---- doc/Makefile.in.orig Wed Jul 5 10:40:07 2006 -+++ doc/Makefile.in Sat Jul 15 11:08:39 2006 -@@ -71,7 +71,7 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTA - all: ../makedoc$(EXEEXT) +--- doc/Makefile.in.orig Sun Jun 10 03:43:25 2007 ++++ doc/Makefile.in Sun Jun 10 09:03:52 2007 +@@ -396,7 +396,7 @@ uninstall-am: uninstall-info-am uninstall-local + all: $(MAKE) makedoc-all -makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt +makedoc-all: mutt.1 muttrc.man - install: makedoc-all instdoc + install-data-local: makedoc-all instdoc $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 -@@ -171,8 +171,8 @@ update-doc: stamp-doc-xml stamp-doc-chun +@@ -475,8 +475,8 @@ update-doc: stamp-doc-xml stamp-doc-chunked manual.txt muttrc.man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \ @@ -19,5 +19,5 @@ $OpenBSD: patch-doc_Makefile_in,v 1.5 20 + cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail | \ + /usr/bin/tbl > muttrc.man - EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \ - -e 's,@bindir\@,$(bindir),g' \ + mutt.1: $(srcdir)/mutt.man + $(EDIT) $(srcdir)/mutt.man > $@ Index: snapshot/patches/patch-filter_c =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-filter_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-filter_c --- snapshot/patches/patch-filter_c 14 Sep 2005 21:00:03 -0000 1.3 +++ snapshot/patches/patch-filter_c 15 Jun 2007 14:51:54 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-filter_c,v 1.3 2005/09/14 21:00:03 bernd Exp $ ---- filter.c.orig Thu Feb 3 19:47:52 2005 -+++ filter.c Fri Aug 12 09:21:37 2005 -@@ -117,7 +117,7 @@ mutt_create_filter_fd (const char *cmd, +--- filter.c.orig Sun Apr 1 22:58:55 2007 ++++ filter.c Wed May 2 14:27:31 2007 +@@ -117,7 +117,7 @@ mutt_create_filter_fd (const char *cmd, FILE **in, FIL close (fderr); } Index: snapshot/patches/patch-mutt_tunnel_c =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-mutt_tunnel_c,v retrieving revision 1.4 diff -u -p -r1.4 patch-mutt_tunnel_c --- snapshot/patches/patch-mutt_tunnel_c 2 Aug 2006 14:30:09 -0000 1.4 +++ snapshot/patches/patch-mutt_tunnel_c 15 Jun 2007 14:51:54 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-mutt_tunnel_c,v 1.4 2006/08/02 14:30:09 bernd Exp $ ---- mutt_tunnel.c.orig Tue Dec 20 10:36:02 2005 -+++ mutt_tunnel.c Sat Jul 15 11:06:15 2006 -@@ -97,7 +97,7 @@ static int tunnel_socket_open (CONNECTIO +--- mutt_tunnel.c.orig Sun Apr 1 22:58:56 2007 ++++ mutt_tunnel.c Wed May 2 14:27:31 2007 +@@ -97,7 +97,7 @@ static int tunnel_socket_open (CONNECTION *conn) /* Don't let the subprocess think it can use the controlling tty */ setsid (); Index: snapshot/patches/patch-muttlib_c =================================================================== RCS file: snapshot/patches/patch-muttlib_c diff -N snapshot/patches/patch-muttlib_c --- snapshot/patches/patch-muttlib_c 4 May 2007 09:09:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-muttlib_c,v 1.1 2007/05/04 09:09:31 kili Exp $ - ---- muttlib.c.orig Thu May 3 09:41:31 2007 -+++ muttlib.c Thu May 3 13:54:16 2007 -@@ -536,7 +536,9 @@ char *mutt_gecos_name (char *dest, size_t destlen, str - { - if (dest[idx] == '&') - { -- memmove (&dest[idx + pwnl], &dest[idx + 1], -+ /* Don't move if destination is outside buffer. */ -+ if (idx + pwnl < destlen) -+ memmove (&dest[idx + pwnl], &dest[idx + 1], - MAX(destlen - idx - pwnl - 1, 0)); - memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl)); - dest[idx] = toupper ((unsigned char) dest[idx]); Index: snapshot/patches/patch-system_c =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-system_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-system_c --- snapshot/patches/patch-system_c 14 Sep 2005 21:00:03 -0000 1.3 +++ snapshot/patches/patch-system_c 15 Jun 2007 14:51:54 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-system_c,v 1.3 2005/09/14 21:00:03 bernd Exp $ ---- system.c.orig Thu Feb 3 19:47:53 2005 -+++ system.c Fri Aug 12 09:21:37 2005 -@@ -114,7 +114,7 @@ int _mutt_system (const char *cmd, int f +--- system.c.orig Sun Apr 1 22:58:58 2007 ++++ system.c Wed May 2 14:27:31 2007 +@@ -114,7 +114,7 @@ int _mutt_system (const char *cmd, int flags) sigaction (SIGTSTP, &act, NULL); sigaction (SIGCONT, &act, NULL); Index: snapshot/pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- snapshot/pkg/PLIST 2 Aug 2006 14:30:09 -0000 1.15 +++ snapshot/pkg/PLIST 15 Jun 2007 14:51:54 -0000 @@ -40,6 +40,7 @@ share/doc/mutt/patch-notes.txt share/doc/mutt/reference.html share/doc/mutt/samples/ share/doc/mutt/smime-notes.txt +share/doc/mutt/tuning.html share/examples/mutt/ @sample ${CONFDIR}/ share/examples/mutt/Mush.rc @@ -72,6 +73,7 @@ share/examples/mutt/iconv/iconv.solaris- share/examples/mutt/iconv/iconv.solaris-2.7.rc share/examples/mutt/mime.types.sample @sample ${CONFDIR}/mime.types +share/examples/mutt/mutt_xtitle share/examples/mutt/pgp2.rc share/examples/mutt/pgp5.rc share/examples/mutt/pgp6.rc Index: stable/Makefile =================================================================== RCS file: /cvs/ports/mail/mutt/stable/Makefile,v retrieving revision 1.31 diff -u -p -r1.31 Makefile --- stable/Makefile 4 May 2007 09:09:31 -0000 1.31 +++ stable/Makefile 15 Jun 2007 14:51:54 -0000 @@ -6,5 +6,6 @@ VERSION= 1.4.2.2 DISTNAME= mutt-${VERSION}i PKGNAME= ${DISTNAME}p0 MASTER_SITES= ${MASTER_SITES_MUTT} +AUTOCONF_VERSION?= 2.59 .include <bsd.port.mk>
