Index: head/mail/mutt/Makefile
===================================================================
--- head/mail/mutt/Makefile	(revision 460774)
+++ head/mail/mutt/Makefile	(revision 460775)
@@ -1,276 +1,276 @@
 # Created by: Udo Schweigert
 # $FreeBSD$
 
 PORTNAME=	mutt
-PORTVERSION=	1.9.2
+PORTVERSION=	1.9.3
 PORTREVISION?=	0
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
 		https://bitbucket.org/mutt/mutt/downloads/ \
 		ftp://ftp.demon.co.uk/pub/mirrors/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://vc.org.ua/mutt/:vc
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	dereks@lifeofadishwasher.com
 COMMENT?=	Small but powerful text based program for read/writing e-mail
 
 LICENSE=	GPLv2+
 
 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]*
 
 DOCSDIR?=	${PREFIX}/share/doc/mutt
 EXAMPLESDIR?=	${PREFIX}/share/examples/mutt
 DATADIR?=	${PREFIX}/share/mutt
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-fcntl --with-ssl=${OPENSSLBASE} \
 		--with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
 		--enable-external-dotlock --enable-pop --enable-imap \
 		--enable-compressed --enable-sidebar
 
 USES+=		cpe ncurses shebangfix ssl
 SHEBANG_FILES=	doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl
 
 .if defined(MUTT_CONFIGURE_ARGS)
 CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
 
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
 
 .if defined (MUTT_LITE)
 OPTIONS_EXCLUDE=	NLS DOCS EXAMPLES
 .else
 OPTIONS_DEFINE=	SASL DEBUG DOCS EXAMPLES FLOCK \
 		FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
 		LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
 		NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
 		SMIME_OUTLOOK_COMPAT SMTP URLVIEW XML
 
 OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
 OPTIONS_RADIO=	SPELL
 OPTIONS_RADIO_SPELL=	ASPELL ISPELL
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SINGLE_HCACHE=	HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE
 OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
 
 SASL_DESC=	SASL authentication
 DEBUG_DESC=	Debugging capabilities
 FLOCK_DESC=	flock() usage
 FORCEBASE64_DESC=	Option to force base64 encoding for compose
 GPGME_DESC=	Gpgme interface
 GREETING_PATCH_DESC=	Greeting support
 HTML_DESC=	HTML documentation
 IDN_DESC=	International Domain Names (implies ICONV)
 IFDEF_PATCH_DESC=	ifdef feature
 LOCALES_FIX_DESC=	Locales fix
 MAILBOX_MANPAGES_DESC=	Install mbox.5/mmdf.5 manpages
 MAILDIR_MTIME_PATCH_DESC=	Maildir mtime patch
 NCURSES_DESC=	Ncurses support
 NLS_DESC=	Native language support (implies ICONV)
 QUOTE_PATCH_DESC=	Extended quoting
 REVERSE_REPLY_PATCH_DESC=	Reverse_reply
 SLANG_DESC=	SLANG support
 SMART_DATE_DESC=	Dynamic date formatting with "%@"
 SMIME_OUTLOOK_COMPAT_DESC=	SMIME outlook compatibility
 SMTP_DESC=	SMTP relay support
 HCACHE_DESC=	Header Cache support
 HCACHE_BDB_DESC=	Use Berkeley DB (BDB)
 HCACHE_TOKYOCABINET_DESC=	Use Tokyo Cabinet
 HCACHE_KYOTOCABINET_DESC=	Use Kyoto Cabinet
 HCACHE_NONE_DESC=	Disable Header Cache
 URLVIEW_DESC=	Use urlview for the URL selector menu
 XML_DESC=	Use XML tools for rebuilding documentation
 
 OPTIONS_DEFAULT=	GPGME HTML HCACHE_BDB ICONV IDN \
 		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
 		NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
 		SMIME_OUTLOOK_COMPAT SASL SMTP URLVIEW XML GSSAPI_NONE
 .endif
 
 RUN_DEPENDS+=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 .if !defined (MUTT_LITE)
 ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
 ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
 ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
 .endif
 
 .if defined (MUTT_LITE)
 PKGNAMESUFFIX=	-lite
 USES+=	ncurses
 PLIST_SUB+=	MAILBOX_MANPAGES=""
 PLIST_SUB+=	HTML="@comment "
 PLIST_SUB+=	NNTP="@comment "
 # XXX bug in bpm ?
 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
 SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE}
 SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_VARS=	PKGMESSAGE=${FILESDIR}/pkg-message.slang
 
 NCURSES_USES=	ncurses
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_IMPLIES=	ICONV
 
 # Handle GSSAPI from various places
 GSSAPI_BASE_USES=	gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_USES=	gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_NONE_CONFIGURE_ON=	--without-gss
 
 HCACHE_NONE_CONFIGURE_ON=	--disable-hcache
 HCACHE_NONE_CONFIGURE_OFF=	--enable-hcache --without-qdbm --without-gdbm
 
 HCACHE_BDB_CONFIGURE_WITH=	bdb
 HCACHE_BDB_USES=	bdb:42+
 
 HCACHE_TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet
 HCACHE_TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 HCACHE_KYOTOCABINET_CONFIGURE_WITH=	kyotocabinet
 HCACHE_KYOTOCABINET_LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 
 ICONV_USES=	iconv:translit
 ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 ICONV_CONFIGURE_OFF=	--disable-iconv
 
 ASPELL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aspell
 REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
 
 SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smime-outlook
 SMART_DATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smartdate
 
 FLOCK_CONFIGURE_ENABLE=	flock
 
 LOCALES_FIX_CONFIGURE_ON=	--enable-locales-fix
 
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_WITH=	idn
 IDN_IMPLIES=	ICONV
 
 IFDEF_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ifdef
 
 GPGME_LIB_DEPENDS+=	libgpgme.so:security/gpgme
 GPGME_LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error
 GPGME_LIB_DEPENDS+=	libassuan.so:security/libassuan
 GPGME_CONFIGURE_ENABLE=	gpgme
 
 SMTP_CONFIGURE_ENABLE=	smtp
 
 GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
 
 QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
 			patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
 
 NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
 NNTP_CONFIGURE_ON=	--enable-nntp
 NNTP_VARS=	XML_NEEDED=yes
 NNTP_CATEGORIES=	news
 
 DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
 
 .include <bsd.port.options.mk>
 
 # un/comment as each VERSION is created for PORTVERSION
 VVV_PATCH_VERSION=	1.9.1
-GREETING_PATCH_VERSION=	1.9.1
+GREETING_PATCH_VERSION=	1.9.2
 
 .if !defined(VVV_PATCH_VERSION)
 VVV_PATCH_VERSION=	${PORTVERSION}
 .endif
 .if !defined(GREETING_PATCH_VERSION)
 GREETING_PATCH_VERSION=	${PORTVERSION}
 .endif
 
 LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
 
 post-patch-NNTP-on:
 # Restore timestamps for autotools sources
 	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
 	@${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
 .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
 .endif
 .if ${PORT_OPTIONS:MFORCEBASE64}
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp
 .endif
 
 post-patch-NNTP-off:
 .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
 .endif
 .if ${PORT_OPTIONS:MFORCEBASE64}
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
 .endif
 
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
 
 post-install-NNTP-on:
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 
 pre-configure::
 	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
 	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
 		${WRKSRC}/contrib/pgp6.rc
 	@${REINPLACE_CMD} -E -e 's#(/samples|samples/)#share/examples/mutt#g' \
 		${WRKSRC}/doc/reference.html \
 		${WRKSRC}/doc/manual.html \
 		${WRKSRC}/doc/manual.txt \
 		${WRKSRC}/doc/Muttrc \
 		${WRKSRC}/INSTALL \
 		${WRKSRC}/init.h
 	@${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
 		${WRKSRC}/contrib/Makefile.in
 
 pre-configure-HCACHE_BDB-on:
 	@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 .if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
 BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
 		lynx:www/lynx
 .else
 pre-build::
 	@${REINPLACE_CMD} \
 		-e 's,manual.html stamp-doc-rc stamp-doc-chunked manual.txt,stamp-doc-rc,' \
 		${WRKSRC}/doc/Makefile
 .endif
 
 .include <bsd.port.mk>
Index: head/mail/mutt/distinfo
===================================================================
--- head/mail/mutt/distinfo	(revision 460774)
+++ head/mail/mutt/distinfo	(revision 460775)
@@ -1,11 +1,11 @@
-TIMESTAMP = 1513396241
-SHA256 (mutt/mutt-1.9.2.tar.gz) = a2e152a352bbf02d222d54074199d9c53821c19f700c4cb85f78fa85faed7896
-SIZE (mutt/mutt-1.9.2.tar.gz) = 4195627
-SHA256 (mutt/mutt-1.9.1.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
-SIZE (mutt/mutt-1.9.1.vc.greeting) = 4534
+TIMESTAMP = 1517087010
+SHA256 (mutt/mutt-1.9.3.tar.gz) = 431a85d6933ddf75cae51c9966c17d33e32fb0588cb3bbec9d32e01b267b76e1
+SIZE (mutt/mutt-1.9.3.tar.gz) = 4196100
+SHA256 (mutt/mutt-1.9.2.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
+SIZE (mutt/mutt-1.9.2.vc.greeting) = 4534
 SHA256 (mutt/patch-1.9.1.vvv.nntp.gz) = f7098b713dfcbb2a4a6e5edaf536eb99be6d92fad073d5d3ac436b0191c7c892
 SIZE (mutt/patch-1.9.1.vvv.nntp.gz) = 60687
 SHA256 (mutt/patch-1.9.1.vvv.initials.gz) = 4673ca438fb673dfee09c6b8b8f9e8e78af06056f1b515c6030b0533dae847e5
 SIZE (mutt/patch-1.9.1.vvv.initials.gz) = 681
 SHA256 (mutt/patch-1.9.1.vvv.quote.gz) = 22967bd615bd0c10046e264270b6d9cd037fd078365ed3bc1f4d631b8c69b003
 SIZE (mutt/patch-1.9.1.vvv.quote.gz) = 1279
Index: head/mail/mutt/files/extra-patch-smartdate
===================================================================
--- head/mail/mutt/files/extra-patch-smartdate	(revision 460774)
+++ head/mail/mutt/files/extra-patch-smartdate	(revision 460775)
@@ -1,126 +1,126 @@
---- hdrline.c.orig	2017-06-03 23:31:21 UTC
+--- hdrline.c.orig	2018-01-27 22:22:49 UTC
 +++ hdrline.c
 @@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
   * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
   * %Z = status flags	*/
  
 +static void
 +format_smartdate( char *buf, size_t max, struct tm *tm, smartdate_type type )
 +{
 +    char *strftime_fmt = NULL;
 +
 +    switch( type ) {
 +        case FUTURE:        /* Date in the future */
 +            strftime_fmt = "%d%h%y!";
 +            break;
 +        case SMARTTIME:     /* Today */
 +            strftime_fmt = "%I:%M %p";
 +            break;
 +        case YESTERDAY:     /* Yesterday */
 +            strncpy( buf, "Yesterday", max );
 +            break;
 +        case WEEKDAY:       /* Within the last 7 days */
 +            strftime_fmt = "%A";
 +            break;
 +        case STANDARD:      /* Within the last six months */
 +            strftime_fmt = "%h %d";
 +            break;
 +        case ANCIENT:       /* Older than 6 months */
 +            strftime_fmt = "%h %Y";
 +            break;
 +    }
 +
 +    if( strftime_fmt != NULL ) {
 +        strftime( buf, max, strftime_fmt, tm );
 +    }
 +}
 +
 +static void
 +smartdate( char *buf, size_t max, struct tm *tm )
 +{
 +    smartdate_type type = 0;
 +
 +    struct tm now;
 +
 +    time_t sse = mktime( tm );   /* Seconds since epoch */
 +    time_t sse_now = time(NULL); /* Seconds since epoch until now */
 +
 +    int dse = 0;            /* Days since epoch */
 +    int dse_now = 0;        /* Days since epoch until today */
 +
 +    /* Calculate the number of days since epoch */
 +    dse = sse / (60*60*24);
 +    dse_now = sse_now / (60*60*24);
 +
 +    /* Default display type */
 +    type = STANDARD;
 +
 +    /* Check if the date is in the future */
 +    if( dse > dse_now ) {
 +        type = FUTURE;
 +    }
 +    else {
 +        int diff = dse_now - dse;
 +        if( diff == 0 ) type = SMARTTIME;
 +        else if( diff == 1 ) type = YESTERDAY;
 +        else if( diff < 7 ) type = WEEKDAY;
 +        else if( diff > 215 ) type = ANCIENT;  /* Surely older than six
 +                                                  months */
 +        else if( diff > 180 ) {
 +            /*
 +             * Slightly heavy calculation to check if the date is more
 +             * than six months in the past.  This calculation uses
 +             * calendar months and not the exact number of days.  So,
 +             * January 31, 2003 would be considered more than six months
 +             * old whether today's date is August 1 or August 31, 2003
 +             */
 +            int monthdiff;
 +            localtime_r( &sse_now, &now );
 +            monthdiff = ( now.tm_mon - tm->tm_mon )
 +                + ( ( now.tm_year - tm->tm_year ) * 12 );
 +            if( monthdiff > 6 ) {
 +                type = ANCIENT;
 +            }
 +        }
 +    }
 +
 +    format_smartdate( buf, max, tm, type );
 +}
 +
  static const char *
  hdr_format_str (char *dest,
  		size_t destlen,
-@@ -469,7 +552,13 @@ hdr_format_str (char *dest,
+@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
  
          if (!do_locales)
            setlocale (LC_TIME, "C");
 -        strftime (buf2, sizeof (buf2), dest, tm);
 +		/* Identify the non-strftime smartdate pattern (%@) */
 +		if( strncmp( dest, "%@", 2 ) == 0 ) {
 +			smartdate( buf2, sizeof( buf2 ), tm );
 +		}
 +		else {
 +			strftime (buf2, sizeof (buf2), dest, tm);
 +		}
          if (!do_locales)
            setlocale (LC_TIME, "");
  
---- mutt.h.orig	2017-05-30 19:27:53 UTC
+--- mutt.h.orig	2018-01-27 22:22:49 UTC
 +++ mutt.h
 @@ -134,6 +134,16 @@ typedef enum
    MUTT_FORMAT_NOFILTER    = (1<<7)  /* do not allow filtering on this pass */
  } format_flag;
  
 +/* flags for SmartDate */
 +typedef enum {
 +    FUTURE      = 1,
 +    SMARTTIME   = 2,
 +    YESTERDAY   = 3,
 +    WEEKDAY     = 4,
 +    STANDARD    = 5,
 +    ANCIENT     = 6
 +} smartdate_type;
 +
  /* types for mutt_add_hook() */
  #define MUTT_FOLDERHOOK  1
  #define MUTT_MBOXHOOK    (1<<1)
Index: head/mail/mutt/files/patch-Makefile.in
===================================================================
--- head/mail/mutt/files/patch-Makefile.in	(revision 460774)
+++ head/mail/mutt/files/patch-Makefile.in	(revision 460775)
@@ -1,29 +1,30 @@
-Index: Makefile.in
-@@ -471,7 +471,7 @@
+--- Makefile.in.orig	2018-01-27 21:26:30 UTC
++++ Makefile.in
+@@ -471,7 +471,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
  @BUILD_DOC_TRUE@DOC_SUBDIR = doc
  @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
  @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
 -SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
 +SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)
- bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
+ bin_SCRIPTS = $(SMIMEAUX_TARGET)
  @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
  BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
-@@ -1359,18 +1359,9 @@
+@@ -1353,18 +1353,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)
 -	$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
 -	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
 -		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
 -	fi
  
  uninstall-local:
  	for i in mime.types ; do \
Index: head/mail/mutt/files/patch-doc_Makefile.in
===================================================================
--- head/mail/mutt/files/patch-doc_Makefile.in	(revision 460774)
+++ head/mail/mutt/files/patch-doc_Makefile.in	(revision 460775)
@@ -1,28 +1,29 @@
-Index: doc/Makefile.in
-@@ -667,14 +667,7 @@
+--- doc/Makefile.in.orig	2018-01-27 22:36:31 UTC
++++ doc/Makefile.in
+@@ -664,14 +664,7 @@ install-data-local: makedoc-all instdoc
  	-for f in $(HTML_DOCFILES) ; do \
  		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
  	done
 -	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
 -	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
 -		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
 -	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
 -	 	mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
 -	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
 -		$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
 -	fi
 +	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
  
  uninstall-local:
- 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
-@@ -697,9 +690,7 @@
+ 	for f in mutt.1 mutt_dotlock.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
+@@ -694,9 +687,7 @@ uninstall-local:
  
  check:
  manual.txt: manual.html
 -	-LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
 -	LC_ALL=C w3m -dump manual.html > $@ || \
 -	LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
 +	-LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@
  
  Muttrc: stamp-doc-rc
  
Index: head/mail/mutt/pkg-plist
===================================================================
--- head/mail/mutt/pkg-plist	(revision 460774)
+++ head/mail/mutt/pkg-plist	(revision 460775)
@@ -1,112 +1,108 @@
-bin/flea
 bin/mutt
-bin/muttbug
 @(,mail,2755) bin/mutt_dotlock
 bin/pgpewrap
 bin/pgpring
 bin/smime_keys
 @sample etc/Muttrc.sample
-man/man1/flea.1.gz
 man/man1/mutt.1.gz
 man/man1/mutt_dotlock.1.gz
-man/man1/muttbug.1.gz
 man/man1/pgpewrap.1.gz
 man/man1/pgpring.1.gz
 man/man1/smime_keys.1.gz
 man/man5/mailcap.5.gz
 %%MAILBOX_MANPAGES%%man/man5/mbox.5.gz
 %%MAILBOX_MANPAGES%%man/man5/mmdf.5.gz
 man/man5/muttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/GPL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
 %%PORTDOCS%%%%DOCSDIR%%/README.SSL
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
 %%NNTP%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.nntp
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/configuration.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/index.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/miscellany.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/reference.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/security.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tuning.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-compress
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime_keys_test.pl
 %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/da/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/de/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/el/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/id/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/it/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo