- Update to 1.7.1

- Move some vars around to make portlint happy
- Use MUTT_LITE instead of LITE
- Fetch deepif and date-contitional from remote locations
- Reword COMMENT
- Bring back remote patch versions incase mutt version and patch
  versions arn't in sync
- Remove date_conditional patch pulled in remotely
- Add two new sidebar samples
- convert patch-* patches to makepatch patches
- Greeting patch 1.7.1 now PATCHFILE
- make makesum will pull all optional dist/patchfiles

PR:		213431
Submitted by:	maintainer (dereks lifeofadishwasher com)

21 files changed, 223 insertions, 385 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index df2593c4870c..b2a642c16c80 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mutt
-PORTVERSION=	1.7.0
+PORTVERSION=	1.7.1
 PORTREVISION?=	0
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
@@ -12,20 +12,25 @@ MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	mutt
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES+=	http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
-		http://home.woolridge.ca/mutt/patches/:dw
+		http://home.uchicago.edu/~dgc/sw/mutt/:dgc \
+		https://www.schrab.com/aaron/mutt/:ats \
+		http://vc.org.ua/mutt/:vc
+PATCH_DIST_STRIP=	-p1
+PATCHFILES=	patch-1.5.1.dgc.deepif.1:dgc \
+			patch-1.7.0.ats.date_conditional.1:ats
 
 MAINTAINER?=	dereks@lifeofadishwasher.com
-COMMENT?=	The Mongrel of Mail User Agents
+COMMENT?=	Small but powerful text based program for read/writing e-mail
 
 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]*
 
-DIST_SUBDIR=	mutt
 DOCSDIR?=	${PREFIX}/share/doc/mutt
 EXAMPLESDIR?=	${PREFIX}/share/examples/mutt
 DATADIR?=	${PREFIX}/share/mutt
@@ -49,11 +54,6 @@ AUTOMAKE_ARGS=	--add-missing --foreign
 OPTIONS_SUB=	yes
 
 .if defined (MUTT_LITE)
-LITE=	yes
-USES+=	ncurses
-.endif
-
-.if defined (LITE)
 OPTIONS_UNSET=	NLS DOCS EXAMPLES
 .else
 OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
@@ -111,7 +111,7 @@ OPTIONS_DEFAULT=	COMPRESSED_FOLDERS HTML ICONV IDN IFDEF_PATCH \
 
 RUN_DEPENDS+=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
-.if !defined (LITE)
+.if !defined (MUTT_LITE)
 ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
 ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
 ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
@@ -119,8 +119,8 @@ ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
 .endif
 
-.if defined (LITE)
-PKGNAMESUFFIX=	-lite
+.if defined (MUTT_LITE)
+USES+=	ncurses
 PLIST_SUB+=	MAILBOX_MANPAGES=""
 PLIST_SUB+=	COMPRESSED_FOLDERS="@comment "
 PLIST_SUB+=	HTML="@comment "
@@ -131,6 +131,11 @@ PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=	--disable-nls --disable-iconv --without-idn
 .endif
 
+.ifmake makesum # for optional distfiles patchfiles
+PORT_DBDIR=		/dev/null
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+.endif
+
 DEBUG_CONFIGURE_ON=	--enable-debug
 
 # Handle ncurses/ncurses-port/slang
@@ -187,6 +192,8 @@ SMTP_CONFIGURE_ENABLE=	smtp
 
 MAILDIR_HEADER_CACHE_CONFIGURE_OFF=	--without-qdbm
 
+GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
+
 COMPRESSED_FOLDERS_DISTFILES=	patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
 COMPRESSED_FOLDERS_CONFIGURE_ON=	--enable-compressed
 COMPRESSED_FOLDERS_VARS=	XML_NEEDED=yes
@@ -209,15 +216,19 @@ DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
 
 .include <bsd.port.options.mk>
 
-DW_PATCH_VERSION=	1.5.6
+# un/comment as each VERSION is created for PORTVERSION
+#VVV_PATCH_VERSION=	1.7.0
+#RR_PATCH_VERSION=	1.7.0
+#GREETING_PATCH_VERSION=	1.7.0
+
 .if !defined(VVV_PATCH_VERSION)
 VVV_PATCH_VERSION=	${PORTVERSION}
 .endif
 .if !defined(RR_PATCH_VERSION)
 RR_PATCH_VERSION=	${PORTVERSION}
 .endif
-.if !defined(DW_PATCH_VERSION)
-DW_PATCH_VERSION=	${PORTVERSION}
+.if !defined(GREETING_PATCH_VERSION)
+GREETING_PATCH_VERSION=	${PORTVERSION}
 .endif
 
 # XXX
@@ -234,8 +245,6 @@ LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
 CFLAGS+=		${CFLAGS_ADD}
 LDFLAGS+=		${LDFLAGS_ADD}
 
-PATCH_DIST_STRIP=	-p1
-
 pre-patch-PARENT_CHILD_MATCH_PATCH-on:
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match
 
@@ -273,9 +282,6 @@ post-install:
 post-install-NNTP-on:
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
 
-post-patch-GREETING_PATCH-on:
-	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting
-
 post-patch-IFDEF_PATCH-on:
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
 
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 97032c1d57ea..40c171daceaf 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,13 +1,19 @@
-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
+TIMESTAMP = 1476585934
+SHA256 (mutt/mutt-1.7.1.tar.gz) = e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df
+SIZE (mutt/mutt-1.7.1.tar.gz) = 4025008
+SHA256 (mutt/patch-1.7.1.rr.compressed.gz) = 97bc56bbc6b0312b87e8dfb68dd9b551edb9d6771bb1b52b1c6f63f51d0bd05b
+SIZE (mutt/patch-1.7.1.rr.compressed.gz) = 9985
+SHA256 (mutt/patch-1.7.1.vvv.nntp.gz) = 798db983e3d63d954bfd88e0b8771f806afddf0ae07cc9a03d27def355675687
+SIZE (mutt/patch-1.7.1.vvv.nntp.gz) = 61201
+SHA256 (mutt/patch-1.7.1.vvv.nntp_ru.gz) = 497f96c19ff17330404667a63c1abd6a5b309004c4dc5100f73973012ad8a2c1
+SIZE (mutt/patch-1.7.1.vvv.nntp_ru.gz) = 5494
+SHA256 (mutt/patch-1.5.1.dgc.deepif.1) = d655a2f0003bdb2efb7ee5a8c77c113da661110e9c63289f03eb622773fc7a34
+SIZE (mutt/patch-1.5.1.dgc.deepif.1) = 767
+SHA256 (mutt/patch-1.7.0.ats.date_conditional.1) = a7f65e0b6e59713582b3b0a1c3d3c0e54e5875f5dfe3bda285e51a5b6d96e14e
+SIZE (mutt/patch-1.7.0.ats.date_conditional.1) = 2415
+SHA256 (mutt/mutt-1.7.1.vc.greeting) = 05dce466675c8692ab4a2c34d309de06e98e965241249e3cfccbb8d10873b9a3
+SIZE (mutt/mutt-1.7.1.vc.greeting) = 4175
+SHA256 (mutt/patch-1.7.1.vvv.initials.gz) = 1405104d8929d672dc5ffebbca8ea5601a88c515e862ec2f89e5b92bfdb53ad0
+SIZE (mutt/patch-1.7.1.vvv.initials.gz) = 675
+SHA256 (mutt/patch-1.7.1.vvv.quote.gz) = de0e47fb8ffe1ab6587aba37438c90443bee6508759bf82d8aa5da27317b3cc7
+SIZE (mutt/patch-1.7.1.vvv.quote.gz) = 1258
diff --git a/mail/mutt/files/patch-Makefile.am b/mail/mutt/files/patch-Makefile.am
index d9f71ab4a834..c0bd04fd1535 100644
--- a/mail/mutt/files/patch-Makefile.am
+++ b/mail/mutt/files/patch-Makefile.am
@@ -1,6 +1,23 @@
---- Makefile.am.orig	2015-09-10 07:37:42.000000000 +0200
-+++ Makefile.am	2015-09-10 07:38:51.000000000 +0200
-@@ -162,10 +162,6 @@
+--- Makefile.am.orig	2016-10-08 19:30:21 UTC
++++ Makefile.am
+@@ -10,7 +10,7 @@ IMAP_SUBDIR = imap
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+ 
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
+ 
+ bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
+ 
+@@ -157,18 +157,9 @@ install-exec-hook:
+ 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
+ 		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
+ 	fi
+-	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
+-		chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
+-		chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
+-		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
+-	fi
  
  install-data-local:
  	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
diff --git a/mail/mutt/files/patch-Makefile.am.doc b/mail/mutt/files/patch-Makefile.am.doc
deleted file mode 100644
index 5c5854250df1..000000000000
--- a/mail/mutt/files/patch-Makefile.am.doc
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig2	Mon Feb  7 10:20:52 2005
-+++ Makefile.am	Mon Feb  7 10:29:41 2005
-@@ -10,7 +10,7 @@
- IMAP_INCLUDES = -I$(top_srcdir)/imap
- endif
- 
--SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
-+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
- 
- bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
- 
diff --git a/mail/mutt/files/patch-browser.c b/mail/mutt/files/patch-browser.c
index 45f206e92ef8..26bd6245b33a 100644
--- a/mail/mutt/files/patch-browser.c
+++ b/mail/mutt/files/patch-browser.c
@@ -1,5 +1,6 @@
-Index: browser.c
-@@ -80,6 +80,12 @@
+--- browser.c.orig	2016-10-08 19:35:50 UTC
++++ browser.c
+@@ -80,6 +80,12 @@ static int browser_compare_subject (cons
    struct folder_file *pa = (struct folder_file *) a;
    struct folder_file *pb = (struct folder_file *) b;
  
@@ -12,7 +13,7 @@ Index: browser.c
    int r = mutt_strcoll (pa->name, pb->name);
  
    return ((BrowserSort & SORT_REVERSE) ? -r : r);
-@@ -90,6 +96,12 @@
+@@ -90,6 +96,12 @@ static int browser_compare_date (const v
    struct folder_file *pa = (struct folder_file *) a;
    struct folder_file *pb = (struct folder_file *) b;
  
@@ -25,7 +26,7 @@ Index: browser.c
    int r = pa->mtime - pb->mtime;
  
    return ((BrowserSort & SORT_REVERSE) ? -r : r);
-@@ -100,6 +112,12 @@
+@@ -100,6 +112,12 @@ static int browser_compare_size (const v
    struct folder_file *pa = (struct folder_file *) a;
    struct folder_file *pb = (struct folder_file *) b;
  
diff --git a/mail/mutt/files/patch-contrib-Makefile.am b/mail/mutt/files/patch-contrib-Makefile.am
deleted file mode 100644
index 2328b65e1b37..000000000000
--- a/mail/mutt/files/patch-contrib-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.am.orig	Tue Jul 18 20:04:14 2006
-+++ contrib/Makefile.am	Wed Aug 30 16:15:04 2006
-@@ -2,7 +2,7 @@
- 
- subdir = contrib
- 
--SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
- 	sample.muttrc  sample.mailcap sample.muttrc-tlr \
- 	colors.default colors.linux smime.rc \
- 	ca-bundle.crt smime_keys_test.pl
diff --git a/mail/mutt/files/patch-contrib_Makefile.am b/mail/mutt/files/patch-contrib_Makefile.am
new file mode 100644
index 000000000000..4978832a4caa
--- /dev/null
+++ b/mail/mutt/files/patch-contrib_Makefile.am
@@ -0,0 +1,11 @@
+--- contrib/Makefile.am.orig	2016-10-08 19:30:21 UTC
++++ contrib/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ subdir = contrib
+ 
+-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
++SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
+ 	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
+ 	sample.vimrc-sidebar colors.default colors.linux smime.rc \
+ 	ca-bundle.crt smime_keys_test.pl mutt_xtitle
diff --git a/mail/mutt/files/patch-date-conditional b/mail/mutt/files/patch-date-conditional
deleted file mode 100644
index 56662cf0360b..000000000000
--- a/mail/mutt/files/patch-date-conditional
+++ /dev/null
@@ -1,147 +0,0 @@
---- PATCHES~	never
-+++ PATCHES	Thu Jun 13 16:25:05 CDT 2002
-@@ -0,0 +1 @@
-+dgc.deepif.1
-diff -Pur mutt-1.5.1-base/muttlib.c mutt-1.5.1/muttlib.c
---- muttlib.c	Tue Mar 26 16:47:06 2002
-+++ muttlib.c	Thu Jun 13 15:28:20 2002
-@@ -978,6 +978,12 @@
- 	count = 0;
-         while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
- 	{
-+	  if (*src == '\\')
-+	  {
-+	    src++;
-+	    if (!*src)
-+	      break;
-+	  }
-           *cp++ = *src++;
- 	  count++;
- 	}
-@@ -990,7 +996,13 @@
- 	count = 0;
- 	while (count < sizeof (elsestring) && *src && *src != '?')
- 	{
--	  *cp++ = *src++;
-+	  if (*src == '\\')
-+	  {
-+	    src++;
-+	    if (!*src)
-+	      break;
-+	  }
-+          *cp++ = *src++;
- 	  count++;
- 	}
- 	*cp = 0;
-Index: PATCHES
-===================================================================
---- PATCHES	(revision 22)
-+++ PATCHES	(revision 22)
-@@ -0,0 +1 @@
-+patch-1.5.0.ats.date_conditional.1
-Index: muttlib.c
-===================================================================
---- muttlib.c	(revision 22)
-+++ muttlib.c	(revision 22)
-@@ -944,7 +944,16 @@
-       if (*src == '?')
-       {
- 	flags |= MUTT_FORMAT_OPTIONAL;
--	src++;
-+	ch = *(++src); /* save the character to switch on */
-+	cp = prefix;
-+	++src;
-+	count = 0;
-+	while (count < sizeof (prefix) && *src != '?')
-+	{
-+	  *cp++ = *src++;
-+	  count++;
-+	}
-+	*cp = 0;
-       }
-       else
-       {
-@@ -960,12 +969,12 @@
- 	  count++;
- 	}
- 	*cp = 0;
--      }
- 
--      if (!*src)
--	break; /* bad format */
-+	if (!*src)
-+	  break; /* bad format */
- 
--      ch = *src++; /* save the character to switch on */
-+	ch = *src++; /* save the character to switch on */
-+      }
- 
-       if (flags & M_FORMAT_OPTIONAL)
-       {
---- hdrline.c.orig	Tue Jun 29 15:01:28 2004
-+++ hdrline.c	Tue Jun 29 15:02:59 2004
-@@ -316,6 +316,64 @@
- 	const char *cp;
- 	struct tm *tm; 
- 	time_t T;
-+	int i = 0, invert = 0;
-+
-+	if (optional && (op == '[' || op == '(')) {
-+	  char *is;
-+          int d;
-+	  T = time(NULL);
-+	  tm = localtime(&T);
-+	  d = (T + tm->tm_gmtoff) % 86400;
-+	  T -= (op == '(') ? hdr->received : hdr->date_sent;
-+
-+	  is = (char *)prefix;
-+	  if( *is == '>' ) {
-+	    invert = 1;
-+	    ++is;
-+	  }
-+
-+	  while( *is && *is != '?' ) {
-+	    int t = strtol (is, &is, 10);
-+	    switch (*(is++)) {
-+	      case '?':
-+		break;
-+	      case 'y':
-+		t *= 365 * 24 * 60 * 60;
-+		break;
-+	      case 'M':
-+		t *= 30 * 24 * 60 * 60;
-+		break;
-+	      case 'w':
-+		t *= 7 * 24 * 60 * 60;
-+		break;
-+	      case 'd':
-+		t *= 24 * 60 * 60;
-+		break;
-+	      case 't':
-+		if (t > 1) {
-+		  t = (t-1) * 24 * 60 * 60;
-+		} else {
-+		  t = 0;
-+		}
-+		t += d;
-+		break;
-+	      case 'h':
-+		t *= 60 * 60;
-+		break;
-+	      case 'm':
-+		t *= 60;
-+		break;
-+	    }
-+	    i += t;
-+	  }
-+
-+	  if (i < 0)
-+	    i *= -1;
-+
-+	  if( (T > i || T < -1*i) ^ invert )
-+	    optional = 0;
-+	  break;
-+	}
- 
- 	p = dest;
- 
diff --git a/mail/mutt/files/patch-doc-Muttrc b/mail/mutt/files/patch-doc-Muttrc
deleted file mode 100644
index 69d353f64b40..000000000000
--- a/mail/mutt/files/patch-doc-Muttrc
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/Muttrc.orig	Sat May 13 08:30:44 2000
-+++ doc/Muttrc	Sat May 13 08:32:05 2000
-@@ -629,6 +629,7 @@
- # Type: boolean
- # Default: yes
- # 
-+set followup_to=no
- # 
- # Controls whether or not the Mail-Followup-To header field is
- # generated when sending mail.  When set, Mutt will generate this
diff --git a/mail/mutt/files/patch-doc-Makefile.am b/mail/mutt/files/patch-doc_Makefile.am
index 557432a6a60b..e743b3cace29 100644
--- a/mail/mutt/files/patch-doc-Makefile.am
+++ b/mail/mutt/files/patch-doc_Makefile.am
@@ -1,6 +1,6 @@
---- doc/Makefile.am.orig	2014-05-31 14:09:54.000000000 +0200
-+++ doc/Makefile.am	2014-05-31 14:12:07.000000000 +0200
-@@ -77,14 +77,7 @@
+--- doc/Makefile.am.orig	2016-10-08 19:30:21 UTC
++++ doc/Makefile.am
+@@ -79,14 +79,7 @@ install-data-local: makedoc-all instdoc
  	-for f in $(HTML_DOCFILES) ; do \
  		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
  	done
@@ -16,7 +16,7 @@
  
  uninstall-local:
  	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
-@@ -107,9 +100,7 @@
+@@ -109,9 +102,7 @@ uninstall-local:
  
  check:
  manual.txt: manual.html
diff --git a/mail/mutt/files/patch-doc_Muttrc b/mail/mutt/files/patch-doc_Muttrc
new file mode 100644
index 000000000000..2bb4083167bf
--- /dev/null
+++ b/mail/mutt/files/patch-doc_Muttrc
@@ -0,0 +1,10 @@
+--- doc/Muttrc.orig	2016-10-08 19:48:13 UTC
++++ doc/Muttrc
+@@ -626,6 +626,7 @@ attachments   -I message/external-body
+ # will be saved for later references.  Also see $record,
+ # $save_name, $force_name and ``fcc-hook''.
+ # 
++set followup_to=no
+ # 
+ # set crypt_autoencrypt=no
+ #
diff --git a/mail/mutt/files/patch-doc-manual.xml.head b/mail/mutt/files/patch-doc_manual.xml.head
index 82ab62c1cbe8..47e37feee99d 100644
--- a/mail/mutt/files/patch-doc-manual.xml.head
+++ b/mail/mutt/files/patch-doc_manual.xml.head
@@ -1,5 +1,5 @@
---- doc/manual.xml.head.orig	2009-06-22 08:35:06.000000000 +0200
-+++ doc/manual.xml.head	2009-06-22 08:37:31.000000000 +0200
+--- doc/manual.xml.head.orig	2016-10-08 19:35:50 UTC
++++ doc/manual.xml.head
 @@ -1,6 +1,6 @@
  <?xml version="1.0" standalone="no"?>
  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
diff --git a/mail/mutt/files/patch-examples b/mail/mutt/files/patch-examples
index d39b6d3edf22..e4ed56d893e1 100644
--- a/mail/mutt/files/patch-examples
+++ b/mail/mutt/files/patch-examples
@@ -1,14 +1,32 @@
---- contrib/Makefile.am.orig	2015-09-10 08:43:38.000000000 +0200
-+++ contrib/Makefile.am	2015-09-10 08:48:05.000000000 +0200
+--- INSTALL.orig	2016-10-08 19:30:21 UTC
++++ INSTALL
+@@ -228,13 +228,13 @@ If you decide to use your system's iconv
+ need to tell mutt about implementation-defined names for some
+ character sets.  Sample configuration files for various systems can
+ be found in the directory contrib/iconv/ in this source
+-distribution, and will be installed in the samples/iconv directory
++distribution, and will be installed in the share/examples/mutt/iconv directory
+ as part of mutt's documentation.
+ 
+ In order to use these sample configuration files, just put a line
+ like
+ 
+-     source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
++     source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc
+ 
+ into your system's global Muttrc, which normally resides in /etc or
+ /usr/local/etc.
+--- contrib/Makefile.am.orig	2016-10-08 19:30:21 UTC
++++ contrib/Makefile.am
 @@ -1,6 +1,7 @@
  # $Id$
  
  subdir = contrib
 +samplesdir = @samplesdir@
  
- SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
- 	sample.muttrc  sample.mailcap sample.muttrc-tlr \
-@@ -14,12 +15,12 @@
+ SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
+ 	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
+@@ -14,12 +15,12 @@ EXTRA_DIST = language.txt language50.txt
  	iconv/make.sh
  
  install-data-local:
@@ -24,9 +42,33 @@
  	done
  
  uninstall-local:
---- init.h.orig	2009-02-06 13:27:52.000000000 +0100
-+++ init.h	2009-02-06 13:34:09.000000000 +0100
-@@ -1808,9 +1808,8 @@
+--- doc/manual.txt.orig	2016-10-08 19:55:06 UTC
++++ doc/manual.txt
+@@ -8073,8 +8073,8 @@ set imap_authenticators="gssapi:cram-md5
+ 
+    For examples on how to configure these formats for the various versions
+    of PGP which are floating around, see the pgp and gpg sample
+-   configuration files in the samples/ subdirectory which has been
+-   installed on your system alongside the documentation. (PGP only)
++   configuration files in the share/examples/mutt/ subdirectory which has
++   been installed on your system alongside the documentation. (PGP only)
+ 
+ 3.166. pgp_decrypt_command
+ 
+@@ -9332,8 +9332,8 @@ set sidebar_delim_chars='.'
+    or "-CAfile [1766]$$ssmmiimmee__ccaa__llooccaattiioonn".
+ 
+    For examples on how to configure these formats, see the smime.rc in the
+-   samples/ subdirectory which has been installed on your system alongside
+-   the documentation. (S/MIME only)
++   share/examples/mutt/ subdirectory which has been installed on your system
++   alongside the documentation. (S/MIME only)
+ 
+ 3.271. smime_decrypt_use_default_key
+ 
+--- init.h.orig	2016-10-08 19:35:50 UTC
++++ init.h
+@@ -1814,9 +1814,8 @@ struct option_t MuttVars[] = {
    ** .pp
    ** For examples on how to configure these formats for the various versions
    ** of PGP which are floating around, see the pgp and gpg sample configuration files in
@@ -36,9 +78,9 @@
 +  ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
 +  **  your system. (PGP only)
    */
-   { "pgp_getkeys_command",	DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
+   { "pgp_decrypt_command", 	DT_STR, R_NONE, UL &PgpDecryptCommand, 0},
    /*
-@@ -2017,9 +2016,8 @@
+@@ -2942,9 +2941,8 @@ struct option_t MuttVars[] = {
    ** .de
    ** .pp
    ** For examples on how to configure these formats, see the \fCsmime.rc\fP in
@@ -48,47 +90,5 @@
 +  ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
 +  ** your system. (S/MIME only)
    */
-   { "smime_verify_command", 	DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
+   { "smime_decrypt_use_default_key",	DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
    /*
---- INSTALL.orig	Mon Nov 25 15:16:46 2002
-+++ INSTALL	Wed Mar 26 15:59:57 2003
-@@ -225,13 +225,13 @@
- need to tell mutt about implementation-defined names for some
- character sets.  Sample configuration files for various systems can
- be found in the directory contrib/iconv/ in this source
--distribution, and will be installed in the samples/iconv directory
-+distribution, and will be installed in the share/examples/mutt/iconv directory
- as part of mutt's documentation.
- 
- In order to use these sample configuration files, just put a line
- like
- 
--     source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
-+     source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc
- 
- into your system's global Muttrc, which normally resides in /etc or
- /usr/local/etc.
---- doc/manual.txt.orig	2015-08-30 19:25:51.000000000 +0200
-+++ doc/manual.txt	2015-09-10 08:56:32.000000000 +0200
-@@ -7736,8 +7736,8 @@
- 
-    For examples on how to configure these formats for the various versions
-    of PGP which are floating around, see the pgp and gpg sample
--   configuration files in the samples/ subdirectory which has been
--   installed on your system alongside the documentation. (PGP only)
-+   configuration files in the share/examples/mutt/ subdirectory which has
-+   been installed on your system alongside the documentation. (PGP only)
- 
- 3.162. pgp_decrypt_command
- 
-@@ -8783,8 +8783,8 @@
-       "-CAfile $$ssmmiimmee__ccaa__llooccaattiioonn".
- 
-    For examples on how to configure these formats, see the smime.rc in the
--   samples/ subdirectory which has been installed on your system alongside
--   the documentation. (S/MIME only)
-+   share/examples/mutt/ subdirectory which has been installed on your system
-+   alongside the documentation. (S/MIME only)
- 
- 3.252. smime_decrypt_use_default_key
- 
diff --git a/mail/mutt/files/patch-imap-message.c b/mail/mutt/files/patch-imap-message.c
deleted file mode 100644
index 7db99b5da207..000000000000
--- a/mail/mutt/files/patch-imap-message.c
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch fixes a segfault that happens when the IMAP server sends some
-additional flags for the same message ID, see upstream bug
-http://bugs.mutt.org/3288
-
---- imap/message.c
-+++ imap/message.c
-@@ -288,7 +288,7 @@
-         continue;
-       }
-       /* May receive FLAGS updates in a separate untagged response (#2935) */
--      if (idx < ctx->msgcount)
-+      if (ctx->hdrs[idx] != NULL)
-       {
- 	dprint (2, (debugfile, "imap_read_headers: message %d is not new\n",
- 		    h.sid));
diff --git a/mail/mutt/files/patch-m4-gssapi.m4 b/mail/mutt/files/patch-m4_gssapi.m4
index 24bfbb384e64..3bbb3f5700cc 100644
--- a/mail/mutt/files/patch-m4-gssapi.m4
+++ b/mail/mutt/files/patch-m4_gssapi.m4
@@ -1,7 +1,7 @@
---- m4/gssapi.m4.orig	2015-08-30 19:06:38.000000000 +0200
-+++ m4/gssapi.m4	2016-01-25 15:04:37.448609000 +0100
-@@ -27,6 +27,7 @@
-     GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`"
+--- m4/gssapi.m4.orig	2016-10-08 19:30:21 UTC
++++ m4/gssapi.m4
+@@ -27,6 +27,7 @@ AC_DEFUN([MUTT_AM_PATH_GSSAPI],
+     GSSAPI_LIBS="`$KRB5CFGPATH --libs gssapi`"
      case "`$KRB5CFGPATH --version`" in
        "Kerberos 5 "*)	GSSAPI_IMPL="MIT";;
 +      "FreeBSD heimdal"*)		GSSAPI_IMPL="Heimdal";;
diff --git a/mail/mutt/files/patch-mktemp b/mail/mutt/files/patch-muttlib.c
index ea344c679986..3ff48049efb4 100644
--- a/mail/mutt/files/patch-mktemp
+++ b/mail/mutt/files/patch-muttlib.c
@@ -1,6 +1,6 @@
---- muttlib.c.orig	2015-09-10 08:59:45.000000000 +0200
-+++ muttlib.c	2015-09-10 09:04:24.000000000 +0200
-@@ -774,16 +774,15 @@
+--- muttlib.c.orig	2016-10-08 19:35:50 UTC
++++ muttlib.c
+@@ -779,16 +779,15 @@ void mutt_merge_envelopes(ENVELOPE* base
  void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix,
                     const char *src, int line)
  {
diff --git a/mail/mutt/files/patch-smime-self b/mail/mutt/files/patch-smime-self
index 3d656129104b..c6fc5121d30b 100644
--- a/mail/mutt/files/patch-smime-self
+++ b/mail/mutt/files/patch-smime-self
@@ -1,7 +1,22 @@
-Base: http://descolada.dartmouth.edu/mutt/patch-1.5.4+-ow.smime-encrypt-self.2
---- crypt.c	7 Mar 2003 08:23:27 -0000	3.17
-+++ crypt.c	7 May 2003 14:57:00 -0000
-@@ -246,8 +246,18 @@
+--- contrib/smime.rc.orig	2016-10-08 19:30:21 UTC
++++ contrib/smime.rc
+@@ -23,8 +23,12 @@ set crypt_verify_sig = yes
+ 
+ # The (default) keyfile for signing/decrypting.  Uncomment the following
+ # line and replace the keyid with your own.
+-set smime_default_key="12345678.0"
++# set smime_default_key="12345678.0"
+ 
++# Uncomment the following line in addition to the one above, if you want that
++# all encrypted messages are also encrypted with your default key.
++# set smime_encrypt_self = yes
++  
+ # Uncomment to make mutt ask what key to use when trying to decrypt a message.
+ # It will use the default key above (if that was set) else.
+ # unset smime_decrypt_use_default_key
+--- crypt.c.orig	2016-10-08 19:35:50 UTC
++++ crypt.c
+@@ -231,8 +231,18 @@ int mutt_protect (HEADER *msg, char *key
      if ((WithCrypto & APPLICATION_SMIME)
          && (msg->security & APPLICATION_SMIME))
      {
@@ -22,9 +37,9 @@ Base: http://descolada.dartmouth.edu/mutt/patch-1.5.4+-ow.smime-encrypt-self.2
        {
  	/* signed ? free it! */
  	return (-1);
---- init.h.orig	2015-09-10 09:06:48.000000000 +0200
-+++ init.h	2015-09-10 09:08:24.000000000 +0200
-@@ -2748,6 +2748,11 @@
+--- init.h.orig	2016-10-08 19:35:50 UTC
++++ init.h
+@@ -2971,6 +2971,11 @@ struct option_t MuttVars[] = {
    ** possible \fCprintf(3)\fP-like sequences.
    ** (S/MIME only)
    */
@@ -36,30 +51,13 @@ Base: http://descolada.dartmouth.edu/mutt/patch-1.5.4+-ow.smime-encrypt-self.2
    { "smime_encrypt_with",	DT_STR,	 R_NONE, UL &SmimeCryptAlg, UL "aes256" },
    /*
    ** .pp
-diff -u -d -b -B -r3.18 mutt.h
---- mutt.h.orig	Thu Nov  6 08:15:51 2003
-+++ mutt.h	Thu Nov  6 08:16:43 2003
-@@ -275,6 +275,7 @@
-   OPT_DELETE,
+--- mutt.h.orig	2016-10-08 19:30:21 UTC
++++ mutt.h
+@@ -263,6 +263,7 @@ enum
    OPT_FORWEDIT,
+   OPT_FCCATTACH,
    OPT_INCLUDE,
 +  OPT_SMIMEENCRYPTSELF,
    OPT_MFUPTO,
    OPT_MIMEFWD,
    OPT_MIMEFWDREST,
---- contrib/smime.rc.orig	2015-08-30 19:06:38.000000000 +0200
-+++ contrib/smime.rc	2015-09-10 09:14:20.000000000 +0200
-@@ -23,8 +23,12 @@
- 
- # The (default) keyfile for signing/decrypting.  Uncomment the following
- # line and replace the keyid with your own.
--set smime_default_key="12345678.0"
-+# set smime_default_key="12345678.0"
- 
-+# Uncomment the following line in addition to the one above, if you want that
-+# all encrypted messages are also encrypted with your default key.
-+# set smime_encrypt_self = yes
-+  
- # Uncomment to make mutt ask what key to use when trying to decrypt a message.
- # It will use the default key above (if that was set) else.
- # unset smime_decrypt_use_default_key
diff --git a/mail/mutt/files/patch-smime-sender b/mail/mutt/files/patch-smime-sender
index 1c34b135e9c0..dbfa5508319c 100644
--- a/mail/mutt/files/patch-smime-sender
+++ b/mail/mutt/files/patch-smime-sender
@@ -1,6 +1,6 @@
---- commands.c.orig	Thu Mar 20 20:37:21 2003
-+++ commands.c	Thu Mar 20 20:40:29 2003
-@@ -178,7 +178,7 @@
+--- commands.c.orig	2016-10-08 19:30:21 UTC
++++ commands.c
+@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)
      {
        if (cur->security & GOODSIGN)
        {
@@ -9,11 +9,25 @@
  	  mutt_message ( _("S/MIME signature successfully verified."));
  	else
  	  mutt_error ( _("S/MIME certificate owner does not match sender."));
---- init.h.orig2	Fri May 31 10:14:05 2002
-+++ init.h	Fri May 31 10:54:55 2002
-@@ -1435,6 +1435,15 @@
-   ** This flag controls wether you want to be asked to enter a label for a certificate
-   ** about to be added to the database or not. It is set by default.
+--- contrib/smime.rc.orig	2016-10-08 19:30:21 UTC
++++ contrib/smime.rc
+@@ -8,7 +8,10 @@ set smime_is_default
+ 
+ # Uncomment this if you don't want to set labels for certificates you add.
+ # unset smime_ask_cert_label
+-
++ 
++# Uncomment this if you don't want to check for sender's email address
++# set smime_dont_check_sender = yes
++  
+ # Passphrase expiration
+ set smime_timeout=300
+ 
+--- init.h.orig	2016-10-08 19:35:50 UTC
++++ init.h
+@@ -2946,6 +2946,15 @@ struct option_t MuttVars[] = {
+   ** alongside the documentation.
+   ** (S/MIME only)
    */
 +  { "smime_dont_check_sender",	DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },
 +  /*
@@ -27,27 +41,13 @@
    { "smime_decrypt_use_default_key",	DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
    /*
    ** .pp
---- mutt.h.orig2	Fri May 31 10:14:06 2002
-+++ mutt.h	Fri May 31 10:24:03 2002
-@@ -453,6 +453,7 @@
- #ifdef HAVE_SMIME
+--- mutt.h.orig	2016-10-08 19:30:21 UTC
++++ mutt.h
+@@ -486,6 +486,7 @@ enum
+   OPTCRYPTTIMESTAMP,
    OPTSMIMEISDEFAULT,
    OPTASKCERTLABEL,
 +  OPTSMIMENOSENDER,
    OPTSDEFAULTDECRYPTKEY,
- #endif
- #ifdef HAVE_PGP
---- contrib/smime.rc.orig	2015-09-10 09:16:17.000000000 +0200
-+++ contrib/smime.rc	2015-09-10 09:18:18.000000000 +0200
-@@ -8,7 +8,10 @@
- 
- # Uncomment this if you don't want to set labels for certificates you add.
- # unset smime_ask_cert_label
--
-+ 
-+# Uncomment this if you don't want to check for sender's email address
-+# set smime_dont_check_sender = yes
-+  
- # Passphrase expiration
- set smime_timeout=300
- 
+   OPTPGPIGNORESUB,
+   OPTPGPCHECKEXIT,
diff --git a/mail/mutt/files/patch-staging-Makefile.am b/mail/mutt/files/patch-staging-Makefile.am
deleted file mode 100644
index 0fcb2723adb3..000000000000
--- a/mail/mutt/files/patch-staging-Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.am.orig	2015-09-10 09:19:15.000000000 +0200
-+++ Makefile.am	2015-09-10 09:21:00.000000000 +0200
-@@ -150,15 +150,6 @@
- 	$(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
- 
- install-exec-hook:
--	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then	\
--		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
--		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
--	fi
--	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
--		chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
--		chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
--		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
--	fi
- 
- install-data-local:
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
diff --git a/mail/mutt/files/patch-threadcomplete b/mail/mutt/files/patch-threadcomplete
index 20a168d61563..117ed1dfc2cb 100644
--- a/mail/mutt/files/patch-threadcomplete
+++ b/mail/mutt/files/patch-threadcomplete
@@ -1,25 +1,24 @@
---- mutt.h.orig2	Mon Sep  6 09:24:17 2004
-+++ mutt.h	Mon Sep  6 09:27:04 2004
-@@ -212,6 +212,7 @@
-   MUTT_LIMIT,
+--- mutt.h.orig	2016-10-08 19:30:21 UTC
++++ mutt.h
+@@ -190,6 +190,7 @@ enum
    MUTT_EXPIRED,
    MUTT_SUPERSEDED,
    MUTT_TRASH,
 +  MUTT_THREADCOMPLETE,
  
    /* actions for mutt_pattern_comp/mutt_pattern_exec */
-   M_AND,
---- pattern.c.orig2	Sun Sep 18 15:17:46 2005
-+++ pattern.c	Sun Sep 18 15:19:48 2005
-@@ -54,6 +54,7 @@
+   MUTT_AND,
+--- pattern.c.orig	2016-10-08 19:30:21 UTC
++++ pattern.c
+@@ -56,6 +56,7 @@ static const struct pattern_flags
  }
  Flags[] =
  {
 +  { '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 @@
+   { 'b', MUTT_BODY,		MUTT_FULL_MSG,	eat_regexp },
+   { 'B', MUTT_WHOLE_MSG,		MUTT_FULL_MSG,	eat_regexp },
+@@ -1185,6 +1186,16 @@ mutt_pattern_exec (struct pattern_t *pat
                                               2, h->env->to, h->env->cc));
      case MUTT_LIST:	/* known list, subscribed or not */
        return (pat->not ^ mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc));
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index 1b636ab3b1ba..55533a06f3db 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -76,7 +76,9 @@ man/man5/muttrc.5.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime_keys_test.pl
 %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo