Update to 1.5.23 using mail/mutt-devel.

Upstream now calls this the stable version

27 files changed, 589 insertions, 455 deletions

diff --git a/mail/mutt/DEINSTALL b/mail/mutt/DEINSTALL
new file mode 100644
index 00000000000..253ac92f7ea
--- /dev/null
+++ b/mail/mutt/DEINSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.5 2015/09/03 14:49:02 wiz Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} -f @DOCDIR@/samples
+	;;
+esac
diff --git a/mail/mutt/DESCR b/mail/mutt/DESCR
index 05f7d3e4bb2..7319ded1093 100644
--- a/mail/mutt/DESCR
+++ b/mail/mutt/DESCR
@@ -5,6 +5,6 @@ The Mutt E-Mail Client by Michael Elkins <me@cs.hmc.edu>
 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, color, PGP, POP3, IMAP, various mailbox formats,
-regular expression searches and a powerful pattern matching language
-for selecting groups of messages.
+mail threading, color, PGP and S/MIME, POP3, IMAP, various mailbox
+formats, regular expression searches and a powerful pattern matching
+language for selecting groups of messages.
diff --git a/mail/mutt/INSTALL b/mail/mutt/INSTALL
new file mode 100644
index 00000000000..9dafd582669
--- /dev/null
+++ b/mail/mutt/INSTALL
@@ -0,0 +1,8 @@
+# $NetBSD: INSTALL,v 1.6 2015/09/03 14:49:02 wiz Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${RM} -f @DOCDIR@/samples
+	${LN} -sf ../../examples/mutt @DOCDIR@/samples
+	;;
+esac
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 35d82c41500..853414c80c7 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,103 +1,19 @@
-# $NetBSD: Makefile,v 1.171 2015/08/18 07:31:11 wiz Exp $
+# $NetBSD: Makefile,v 1.172 2015/09/03 14:49:02 wiz Exp $
 
-DISTNAME=		mutt-1.4.2.3
-PKGREVISION=		9
+DISTNAME=		mutt-1.5.23
+PKGREVISION=		7
 CATEGORIES=		mail
-MASTER_SITES=		ftp://ftp.mutt.org/mutt/ \
+MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
+			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
 			ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
 			ftp://ftp.fu-berlin.de/unix/mail/mutt/
+MASTER_SITES=		${MUTT_SITES:=devel/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		tonio@NetBSD.org
 HOMEPAGE=		http://www.mutt.org/
-COMMENT=		Text-based MIME mail client with PGP support
-LICENSE=		gnu-gpl-v2
+COMMENT=		Text-based MIME mail client with PGP & S/MIME support
+LICENSE=		gnu-gpl-v2 OR gnu-gpl-v3 # or newer
 
-.include "../../mk/bsd.prefs.mk"
-
-WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		msgfmt
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}		\
-			--with-docdir=${PREFIX}/share/doc/mutt		\
-			--without-included-gettext			\
-			--enable-external-dotlock			\
-			--enable-pop					\
-			--enable-imap
-MAKE_ENV+=		CHGRP=${CHGRP:Q}
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
-# Force sendmail to /usr/sbin to avoid postfix's
-# ${LOCALBASE}/sbin/sendmail.  Should be enabled on all platforms which
-# support mailwrapper.
-CONFIGURE_ENV+=		SENDMAIL=/usr/sbin/sendmail
-.endif
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--without-wc-funcs
-.endif
-
-.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
-CONFIGURE_ENV+=		ac_cv_header_inttypes_h=no
-.endif
-
-SUBST_CLASSES+=		gpg
-SUBST_MESSAGE.gpg=	Fixing path to GnuPG binary.
-SUBST_STAGE.gpg=	post-patch
-SUBST_FILES.gpg=	contrib/gpg.rc
-SUBST_SED.gpg=		-e "s,/usr/bin/gpg,gpg,g"
-
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	Fixing pathnames in manual page.
-SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	doc/mutt.man
-SUBST_SED.paths=	-e "s,/usr/local/doc/mutt/,${DOCDIR}/,g"
-SUBST_SED.paths+=	-e "s,/etc/,${PKG_SYSCONFDIR}/,g"
-SUBST_SED.paths+=	-e "s,/usr/local/,${PREFIX}/,g"
-
-.if ${OPSYS} == "Interix"
-SUBST_CLASSES+=		mgroup
-SUBST_MESSAGE.mgroup=	Configuring mail group.
-SUBST_STAGE.mgroup=	post-patch
-SUBST_FILES.mgroup=	configure
-SUBST_SED.mgroup=	-e "s,DOTLOCK_GROUP='mail',DOTLOCK_GROUP='+Administrators',"
-
-CPPFLAGS+=		-D__BROKEN_INTERIX_FORK
-.endif
-
-# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
-# there.
-#
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
-CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
-.endif
-
-.include "options.mk"
-
-LDFLAGS+=		${_STRIPFLAG_CC}
-
-DOCDIR=			${PREFIX}/share/doc/mutt
-EGDIR=			${PREFIX}/share/examples/mutt
-CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
-CONF_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-FILES_SUBST+=		DOCDIR=${DOCDIR:Q}
-
-INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
-
-SPECIAL_PERMS+=		bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
-INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-
-# Pre-create some directories and symlinks used during the installation
-# process.
-#
-pre-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-	${RM} -f ${DESTDIR}${DOCDIR}/samples
-	${LN} -sf ${DESTDIR}${EGDIR} ${DESTDIR}${DOCDIR}/samples
+.include "Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/Makefile.common b/mail/mutt/Makefile.common
new file mode 100644
index 00000000000..6dbd952942d
--- /dev/null
+++ b/mail/mutt/Makefile.common
@@ -0,0 +1,57 @@
+# $NetBSD: Makefile.common,v 1.1 2015/09/03 14:49:02 wiz Exp $
+#
+# used by mail/mutt/Makefile
+# used by mail/mutt-kz/Makefile
+
+.include "../../mk/bsd.prefs.mk"
+
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gmake msgfmt perl
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/mutt
+CONFIGURE_ARGS+=	--without-included-gettext
+CONFIGURE_ARGS+=	--enable-external-dotlock
+CONFIGURE_ARGS+=	--enable-pop
+CONFIGURE_ARGS+=	--enable-imap
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
+# Force sendmail to /usr/sbin to avoid postfix's
+# ${LOCALBASE}/sbin/sendmail.  Should be enabled on all platforms which
+# support mailwrapper.
+CONFIGURE_ENV+=		SENDMAIL=/usr/sbin/sendmail
+.endif
+
+.if (${OPSYS} == "SunOS")
+CONFIGURE_ARGS+=	--without-wc-funcs
+.endif
+
+# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
+# there.
+#
+.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
+CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
+.endif
+
+.include "options.mk"
+
+LDFLAGS+=		${_STRIPFLAG_CC}
+
+DOCDIR=			${PREFIX}/share/doc/mutt
+EGDIR=			${PREFIX}/share/examples/mutt
+CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+CONF_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+FILES_SUBST+=		DOCDIR=${DOCDIR}
+INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
+
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	doc/Muttrc
+SUBST_VARS.paths+=	DOCDIR PREFIX
+SUBST_STAGE.paths=	pre-configure
+
+SPECIAL_PERMS+=	bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
index 7e7833287cc..35bae39b1bd 100644
--- a/mail/mutt/PLIST
+++ b/mail/mutt/PLIST
@@ -1,14 +1,20 @@
-@comment $NetBSD: PLIST,v 1.15 2010/04/10 16:08:50 tron Exp $
+@comment $NetBSD: PLIST,v 1.16 2015/09/03 14:49:02 wiz Exp $
 bin/flea
 bin/mutt
-bin/muttbug
 bin/mutt_dotlock
+bin/muttbug
 bin/pgpewrap
 bin/pgpring
+${PLIST.smime}bin/smime_keys
 man/man1/flea.1
 man/man1/mutt.1
+man/man1/mutt_dotlock.1
 man/man1/muttbug.1
+man/man1/pgpewrap.1
+man/man1/pgpring.1
+man/man1/smime_keys.1
 man/man5/mutt-mbox.5
+man/man5/mutt-mmdf.5
 man/man5/muttrc.5
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
@@ -20,22 +26,32 @@ share/doc/mutt/README
 share/doc/mutt/README.SECURITY
 share/doc/mutt/README.SSL
 share/doc/mutt/TODO
+share/doc/mutt/advancedusage.html
 share/doc/mutt/applying-patches.txt
+${PLIST.compressed}share/doc/mutt/compressed-folders.html
+share/doc/mutt/configuration.html
 share/doc/mutt/devel-notes.txt
-share/doc/mutt/html/manual-1.html
-share/doc/mutt/html/manual-2.html
-share/doc/mutt/html/manual-3.html
-share/doc/mutt/html/manual-4.html
-share/doc/mutt/html/manual-5.html
-share/doc/mutt/html/manual-6.html
-share/doc/mutt/html/manual-7.html
-share/doc/mutt/html/manual.html
+share/doc/mutt/gettingstarted.html
+share/doc/mutt/index.html
+share/doc/mutt/intro.html
+share/doc/mutt/manual.html
 share/doc/mutt/manual.txt
+share/doc/mutt/mimesupport.html
+share/doc/mutt/miscellany.html
+share/doc/mutt/optionalfeatures.html
 share/doc/mutt/patch-notes.txt
+share/doc/mutt/reference.html
+share/doc/mutt/security.html
+share/doc/mutt/smime-notes.txt
+share/doc/mutt/tuning.html
 share/examples/mutt/Mush.rc
 share/examples/mutt/Muttrc
+share/examples/mutt/Muttrc.dist
 share/examples/mutt/Pine.rc
 share/examples/mutt/Tin.rc
+share/examples/mutt/ca-bundle.crt
+share/examples/mutt/colors.default
+share/examples/mutt/colors.linux
 share/examples/mutt/gpg.rc
 share/examples/mutt/iconv/iconv.aix-3.2.5.rc
 share/examples/mutt/iconv/iconv.aix-4.1.5.rc
@@ -56,14 +72,16 @@ share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
 share/examples/mutt/iconv/iconv.solaris-2.6.rc
 share/examples/mutt/iconv/iconv.solaris-2.7.rc
 share/examples/mutt/mime.types
+share/examples/mutt/mime.types.dist
+share/examples/mutt/mutt_xtitle
 share/examples/mutt/pgp2.rc
 share/examples/mutt/pgp5.rc
 share/examples/mutt/pgp6.rc
 share/examples/mutt/sample.mailcap
 share/examples/mutt/sample.muttrc
 share/examples/mutt/sample.muttrc-tlr
-@comment This entry must be specified after share/examples/mutt!
-share/doc/mutt/samples
+share/examples/mutt/smime.rc
+share/examples/mutt/smime_keys_test.pl
 share/locale/bg/LC_MESSAGES/mutt.mo
 share/locale/ca/LC_MESSAGES/mutt.mo
 share/locale/cs/LC_MESSAGES/mutt.mo
@@ -73,7 +91,9 @@ share/locale/el/LC_MESSAGES/mutt.mo
 share/locale/eo/LC_MESSAGES/mutt.mo
 share/locale/es/LC_MESSAGES/mutt.mo
 share/locale/et/LC_MESSAGES/mutt.mo
+share/locale/eu/LC_MESSAGES/mutt.mo
 share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/ga/LC_MESSAGES/mutt.mo
 share/locale/gl/LC_MESSAGES/mutt.mo
 share/locale/hu/LC_MESSAGES/mutt.mo
 share/locale/id/LC_MESSAGES/mutt.mo
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 89f2fb9e867..e9df006edcf 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,17 +1,21 @@
-$NetBSD: distinfo,v 1.36 2013/05/12 17:26:46 uwe Exp $
+$NetBSD: distinfo,v 1.37 2015/09/03 14:49:02 wiz Exp $
 
-SHA1 (mutt-1.4.2.3.tar.gz) = b23e46873f0247e85a4417cf338d64ea698c9b2c
-RMD160 (mutt-1.4.2.3.tar.gz) = 59e66c308cd4967e587ad1dc73dd76c7f0d06ef1
-Size (mutt-1.4.2.3.tar.gz) = 2646433 bytes
-SHA1 (patch-aa) = 057c11486bb855e321853a106992c8792b75b812
-SHA1 (patch-ab) = 45f3438a2ca0f8565d12c648eb358d7a33d6c745
-SHA1 (patch-ac) = acfece3438c1cadc43247c590045699be7212ede
-SHA1 (patch-ad) = 8baac1337c1ab65e98055915f045e99d91015677
-SHA1 (patch-ag) = c369b0b5d4855e50a016530f81190b2cbd47cef1
-SHA1 (patch-ah) = 04549728683b4250a26f6d6c7a212b8d505014d2
-SHA1 (patch-ai) = 317b736d6b9a896e1ee185cce37a1c2184c02cde
-SHA1 (patch-aj) = a0ee2bc9a7b9e743e313101899de3d991a9d2cad
-SHA1 (patch-ak) = 689305356812d04bd3b490c436ed898a4b308136
-SHA1 (patch-al) = d03611108f76c33e87ac89a6e7eefc012297df86
-SHA1 (patch-am) = faa80ebf308eddfcbbe5aeab2f52d2d356d540cf
-SHA1 (patch-mbox.c) = 287334abc477182719c10c84845e97cde42e0ffc
+SHA1 (mutt-1.5.23.tar.gz) = 8ac821d8b1e25504a31bf5fda9c08d93a4acc862
+RMD160 (mutt-1.5.23.tar.gz) = 2476a9e202ab1cd20a512253246e37538e0aad5a
+Size (mutt-1.5.23.tar.gz) = 3782032 bytes
+SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
+SHA1 (patch-ab) = 857799206db0784672ad9042799eb12703711a31
+SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
+SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
+SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
+SHA1 (patch-af) = edc107c535789919ba2cda5f81a4b640b6100b91
+SHA1 (patch-ag) = 6633e7485c948433f9122a649fdf3a548197eced
+SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed
+SHA1 (patch-al) = 49542905cde263b8d4c79f71cce3759024c804a3
+SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
+SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
+SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
+SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
+SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d
+SHA1 (patch-sendlib.c) = 7394a7814f3986d5fc82c6a5dab76d9b85212c0b
+SHA1 (patch-1.5.23.rr.compressed.gz) = 59cfc764e2878efafb0fa16ae17e6a733efac958
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk
index ef533d37dd5..0904388d497 100644
--- a/mail/mutt/options.mk
+++ b/mail/mutt/options.mk
@@ -1,10 +1,17 @@
-# $NetBSD: options.mk,v 1.13 2010/02/26 11:00:40 drochner Exp $
+# $NetBSD: options.mk,v 1.14 2015/09/03 14:49:02 wiz Exp $
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.mutt
+# Global and legacy options
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
 PKG_OPTIONS_REQUIRED_GROUPS=	display
 PKG_OPTIONS_GROUP.display=	slang ncurses ncursesw curses
-PKG_SUPPORTED_OPTIONS=		ssl buffy-size
-PKG_SUGGESTED_OPTIONS=		ssl curses
+PKG_SUPPORTED_OPTIONS=	debug gpgme idn ssl smime sasl
+PKG_SUPPORTED_OPTIONS+=	mutt-hcache tokyocabinet mutt-smtp
+PKG_SUPPORTED_OPTIONS+=	mutt-compressed-mbox
+PKG_SUPPORTED_OPTIONS+=	mutt-sidebar
+# Comment the following line out on updates.
+#PKG_SUPPORTED_OPTIONS+=	mutt-xlabel
+PKG_SUGGESTED_OPTIONS=	ssl smime curses
 
 .include "../../mk/bsd.options.mk"
 
@@ -26,10 +33,23 @@ CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
 .endif
 
 ###
+### SASLv2
+###
+.if !empty(PKG_OPTIONS:Msasl)
+.  include "../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
+.endif
+
 ### curses
 ###
 .if !empty(PKG_OPTIONS:Mcurses)
 .  include "../../mk/curses.buildlink3.mk"
+.  if ${OPSYS} == "SunOS"
+BUILDLINK_PASSTHRU_DIRS+=	/usr/xpg4
+CONFIGURE_ARGS+=	--with-curses=/usr/xpg4
+LDFLAGS+=		-L/usr/xpg4/lib${LIBABISUFFIX}
+LDFLAGS+=		${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
+.  endif
 .endif
 
 ###
@@ -41,7 +61,7 @@ CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
 SUBST_CLASSES+=		curse
 SUBST_MESSAGE.curse=	Fixing mutt to avoid ncursesw
 SUBST_STAGE.curse=	post-patch
-SUBST_FILES.curse=	configure.in configure
+SUBST_FILES.curse=	configure
 SUBST_SED.curse=	-e 's,for lib in ncurses ncursesw,for lib in ncurses,'
 .endif
 
@@ -56,8 +76,119 @@ CONFIGURE_ARGS+=	--without-ssl
 .endif
 
 ###
-### configure option --enable-buffy-size
+### S/MIME
+###
+PLIST_VARS+=		smime
+.if !empty(PKG_OPTIONS:Msmime)
+USE_TOOLS+=		perl:run
+REPLACE_PERL+=		*.pl */*.pl
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-smime
+PLIST.smime=		yes
+.else
+CONFIGURE_ARGS+=	--disable-smime
+.endif
+
+###
+### Header cache
+###
+.if !empty(PKG_OPTIONS:Mmutt-hcache)
+.  if !empty(PKG_OPTIONS:Mtokyocabinet)
+.  include "../../databases/tokyocabinet/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-hcache
+CONFIGURE_ARGS+=	--enable-tokyocabinet
+CONFIGURE_ARGS+=	--without-gdbm
+CONFIGURE_ARGS+=	--without-bdb
+.  else
+BDB_ACCEPTED=		db4 db5
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
+.  include "../../mk/bdb.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-hcache
+CONFIGURE_ARGS+=	--without-gdbm
+# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
+# since the real -I and -L flags are added by buildlink already.
+CONFIGURE_ENV+=		BDB_INCLUDE_DIR=${BDBBASE}/include
+CONFIGURE_ENV+=		BDB_LIB_DIR=${BDBBASE}/lib
+CONFIGURE_ENV+=		BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
+.  endif
+.else
+CONFIGURE_ARGS+=	--disable-hcache
+.endif
+
+PLIST_VARS+=		compressed
+###
+### Compressed mail boxes
+###
+.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
+PATCH_SITES+=		http://mutt.org.ua/download/${PKGNAME_NOREV}/
+PATCHFILES+=		patch-${PKGVERSION_NOREV}.rr.compressed.gz
+PATCH_DIST_STRIP=	-p1
+CONFIGURE_ARGS+=	--enable-compressed
+SUBST_CLASSES+=		compress
+SUBST_MESSAGE.compress=	Patch Makefile.in to avoid autoreconf for compress
+SUBST_STAGE.compress=	post-patch
+SUBST_FILES.compress=	Makefile.in
+SUBST_SED.compress=	-e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,'
+SUBST_SED.compress+=	-e 's,^EXTRA_DIST = ,EXTRA_DIST = compress.h ,'
+SUBST_SED.compress+=	-e 's,^mutt_OBJECTS = ,mutt_OBJECTS = compress.o ,'
+PLIST.compressed=	yes
+# add xsltproc to be able to regenerate the documentation
+BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
+.endif
+
+###
+### Internal SMTP relay support
+###
+.if !empty(PKG_OPTIONS:Mmutt-smtp)
+CONFIGURE_ARGS+=	--enable-smtp
+.else
+CONFIGURE_ARGS+=	--disable-smtp
+.endif
+
+###
+### Sidebar support
+###
+.if !empty(PKG_OPTIONS:Mmutt-sidebar)
+PATCH_SITES+=		http://lunar-linux.org/~tchan/mutt/
+PATCHFILES+=		patch-1.5.23.sidebar.20140412.txt
+PATCH_DIST_STRIP=	-p1
+PATCH_FUZZ_FACTOR=	-F1
+.endif
+
+###
+### X-Label header support
+###
+.if !empty(PKG_OPTIONS:Mmutt-xlabel)
+PATCH_SITES=		http://home.uchicago.edu/~dgc/sw/mutt/
+PATCHFILES+=		patch-1.5.17.dgc.xlabel_ext.9
+PATCH_DIST_STRIP=	-p1
+.endif
+
+###
+### Internationalized Domain Names
 ###
-.if !empty(PKG_OPTIONS:Mbuffy-size)
-CONFIGURE_ARGS+=	--enable-buffy-size
+.if !empty(PKG_OPTIONS:Midn)
+.  include "../../devel/libidn/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-idn=${BUILDLINK_PREFIX.libidn}
+.else
+CONFIGURE_ARGS+=	--with-idn=no
+.endif
+
+###
+### Enable debugging support
+###
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug
+CFLAGS+= -g
+.endif
+
+###
+### gpgme support
+###
+.if !empty(PKG_OPTIONS:Mgpgme)
+.  include "../../security/gpgme/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-gpgme
+CONFIGURE_ARGS+=	--with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme}
+.else
+CONFIGURE_ARGS+=	--disable-gpgme
 .endif
diff --git a/mail/mutt/patches/patch-aa b/mail/mutt/patches/patch-aa
index 2dda924cd5b..e0ccd84096e 100644
--- a/mail/mutt/patches/patch-aa
+++ b/mail/mutt/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.7 2004/02/02 07:05:33 tron Exp $
+$NetBSD: patch-aa,v 1.8 2015/09/03 14:49:02 wiz Exp $
 
---- send.c.orig	Wed Jan 30 23:50:59 2002
-+++ send.c	Mon Feb  2 08:00:16 2004
-@@ -1611,6 +1611,13 @@
+--- send.c.orig	Sun Feb  1 12:10:58 2004
++++ send.c
+@@ -1689,6 +1689,13 @@ full_fcc:
      }
    }
  
-+#ifdef HAVE_PGP
++#ifdef CRYPT_BACKEND_CLASSIC_PGP
 +  {
-+    /* Extend the expiry time while messages keep getting sent.  */
++    /* Extend the PGP expiry time while messages are being sent. */
 +    extern time_t PgpExptime;
 +    PgpExptime = time (NULL) + PgpTimeout;
 +  }
-+#endif /* HAVE_PGP */
++#endif
  
    rv = 0;
    
diff --git a/mail/mutt/patches/patch-ab b/mail/mutt/patches/patch-ab
index 803a8e24b4a..77d308e65ad 100644
--- a/mail/mutt/patches/patch-ab
+++ b/mail/mutt/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.15 2010/04/10 16:08:51 tron Exp $
+$NetBSD: patch-ab,v 1.16 2015/09/03 14:49:02 wiz Exp $
 
---- Makefile.in.orig	2007-05-27 02:00:00.000000000 +0100
-+++ Makefile.in	2010-04-10 16:54:51.000000000 +0100
-@@ -165,7 +165,7 @@
+--- Makefile.in.orig	2013-10-18 06:49:17.000000000 +0100
++++ Makefile.in	2013-10-18 10:50:46.000000000 +0100
+@@ -109,7 +109,7 @@
+ CONFIG_CLEAN_VPATH_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+-am_mutt_OBJECTS = addrbook.$(OBJEXT) alias.$(OBJEXT) attach.$(OBJEXT) \
++am_mutt_OBJECTS = mvchgat.$(OBJEXT) addrbook.$(OBJEXT) alias.$(OBJEXT) attach.$(OBJEXT) \
+ 	base64.$(OBJEXT) browser.$(OBJEXT) buffy.$(OBJEXT) \
+ 	color.$(OBJEXT) crypt.$(OBJEXT) cryptglue.$(OBJEXT) \
+ 	commands.$(OBJEXT) complete.$(OBJEXT) compose.$(OBJEXT) \
+@@ -325,7 +325,7 @@
  DBX = @DBX@
  DEBUGGER = @DEBUGGER@
  DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -11,31 +20,23 @@ $NetBSD: patch-ab,v 1.15 2010/04/10 16:08:51 tron Exp $
  	-DHAVE_CONFIG_H=1
  
  DEPDIR = @DEPDIR@
-@@ -266,7 +266,7 @@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
--localedir = @localedir@
-+localedir = /usr/pkg/share/locale
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
-@@ -908,8 +908,7 @@
- 
- install-data-am: install-data-local
- 
--install-exec-am: install-binPROGRAMS install-binSCRIPTS \
--	install-exec-local
-+install-exec-am: install-binPROGRAMS install-binSCRIPTS
- 
- install-info: install-info-recursive
- 
-@@ -987,7 +986,7 @@
+@@ -786,6 +786,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc2231.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc3676.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc822.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mvchgat.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe_asprintf.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/score.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@
+@@ -1313,11 +1314,6 @@
+ 		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 \
+-	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
 -		chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
-+		$(CHGRP) @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
- 		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
- 		{ echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
- 	fi
+-		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:
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
diff --git a/mail/mutt/patches/patch-ac b/mail/mutt/patches/patch-ac
index 9322408414a..16e549c7bbd 100644
--- a/mail/mutt/patches/patch-ac
+++ b/mail/mutt/patches/patch-ac
@@ -1,15 +1,17 @@
-$NetBSD: patch-ac,v 1.6 2004/02/20 14:02:04 wiz Exp $
---- curs_main.c.orig	Wed Jan 16 21:44:25 2002
-+++ curs_main.c	Mon Feb  2 08:17:26 2004
-@@ -989,6 +989,11 @@
-           cp = _("Open mailbox");
+$NetBSD: patch-ac,v 1.7 2015/09/03 14:49:02 wiz Exp $
+
+--- config.h.in.orig	2009-08-02 09:34:54 +0300
++++ config.h.in	2009-08-02 09:36:37 +0300
+@@ -442,6 +442,12 @@
+ /* Define to 1 if you have the `__argz_stringify' function. */
+ #undef HAVE___ARGZ_STRINGIFY
  
- 	buf[0] = '\0';
-+	if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
-+	{
-+	  strfcpy (buf, Context->path, sizeof (buf));
-+	  mutt_pretty_mailbox (buf);
-+	}
- 	mutt_buffy (buf, sizeof (buf));
- 
- 	if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
++/* Define to 1 if you have the `mvchgat' function. */
++#undef HAVE_MVCHGAT
++
++/* Define to 1 if you have the `mvwchgat' function. */
++#undef HAVE_MVWCHGAT
++
+ /* Is mail spooled to the user's home directory? If defined, MAILPATH should
+    be set to the filename of the spool mailbox relative the the home
+    directory. use: configure --with-homespool=FILE */
diff --git a/mail/mutt/patches/patch-ad b/mail/mutt/patches/patch-ad
index aded4370a80..4bee552db47 100644
--- a/mail/mutt/patches/patch-ad
+++ b/mail/mutt/patches/patch-ad
@@ -1,91 +1,32 @@
-$NetBSD: patch-ad,v 1.9 2006/12/11 12:46:51 salo Exp $
+$NetBSD: patch-ad,v 1.10 2015/09/03 14:49:02 wiz Exp $
 
-Security fixes for CVE-2006-5297 and CVE-2006-5298, from mutt git.
-
---- lib.c.orig	2002-04-29 19:12:18.000000000 +0200
-+++ lib.c	2006-12-11 13:24:17.000000000 +0100
-@@ -346,13 +346,84 @@ int safe_rename (const char *src, const 
-   return 0;
- }
+--- contrib/Makefile.in.orig	2006-08-14 16:09:28.000000000 +0200
++++ contrib/Makefile.in
+@@ -365,21 +365,20 @@ uninstall-am: uninstall-info-am uninstal
  
-+/* Create a temporary directory next to a file name */
-+
-+int mutt_mkwrapdir (const char *path, char *newfile, size_t nflen, 
-+		    char *newdir, size_t ndlen)
-+{
-+  const char *basename;
-+  char parent[_POSIX_PATH_MAX];
-+  char *p;
-+  int rv;
-+
-+  strfcpy (parent, NONULL (path), sizeof (parent));
-+  
-+  if ((p = strrchr (parent, '/')))
-+  {
-+    *p = '\0';
-+    basename = p + 1;
-+  }
-+  else
-+  {
-+    strfcpy (parent, ".", sizeof (parent));
-+    basename = path;
-+  }
-+
-+  do 
-+  {
-+    snprintf (newdir, ndlen, "%s/%s", parent, ".muttXXXXXX");
-+    mktemp (newdir);
-+  } 
-+  while ((rv = mkdir (newdir, 0700)) == -1 && errno == EEXIST);
-+  
-+  if (rv == -1)
-+    return -1;
-+  
-+  snprintf (newfile, nflen, "%s/%s", newdir, NONULL(basename));
-+  return 0;  
-+}
-+
-+int mutt_put_file_in_place (const char *path, const char *safe_file, const char *safe_dir)
-+{
-+  int rv;
-+  
-+  rv = safe_rename (safe_file, path);
-+  unlink (safe_file);
-+  rmdir (safe_dir);
-+  return rv;
-+}
-+
- int safe_open (const char *path, int flags)
- {
-   struct stat osb, nsb;
-   int fd;
  
-+  if (flags & O_EXCL) 
-+  {
-+    char safe_file[_POSIX_PATH_MAX];
-+    char safe_dir[_POSIX_PATH_MAX];
-+
-+    if (mutt_mkwrapdir (path, safe_file, sizeof (safe_file),
-+			safe_dir, sizeof (safe_dir)) == -1)
-+      return -1;
-+    
-+    if ((fd = open (safe_file, flags, 0600)) < 0)
-+    {
-+      rmdir (safe_dir);
-+      return fd;
-+    }
-+    
-+    if (mutt_put_file_in_place (path, safe_file, safe_dir) == -1)
-+    {
-+      close (fd);
-+      return -1;
-+    }
-+  }
-+  else
-+  {
-   if ((fd = open (path, flags, 0600)) < 0)
-     return fd;
-+  }
+ install-data-local:
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/iconv
+ 	for f in $(SAMPLES) ; do \
+-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
++		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(sysconfdir) ;	\
+ 	done
+ 	for f in $(srcdir)/iconv/*.rc ; do					\
+-		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
++		$(INSTALL) -m 644 $$f $(DESTDIR)$(sysconfdir)/iconv	  ;	\
+ 	done
  
-   /* make sure the file is not symlink */
-   if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
+ uninstall-local:
+ 	for f in $(SAMPLES) ; do \
+-		rm -f $(DESTDIR)$(docdir)/samples/$$f ; \
++		rm -f $(DESTDIR)$(sysconfdir)/$$f ; \
+ 	done
+-	-rm -rf $(DESTDIR)$(docdir)/samples/iconv
+-	-rmdir $(DESTDIR)$(docdir)/samples
+-	-rmdir $(DESTDIR)$(docdir)
++	-rm -rf $(DESTDIR)$(sysconfdir)/iconv
++	-rmdir $(DESTDIR)$(sysconfdir)
+ dist-hook: Makefile $(DISTFILES)
+ 	mkdir -p $(distdir)/iconv
+ 	for file in $(srcdir)/iconv/*.rc ; do					\
diff --git a/mail/mutt/patches/patch-ae b/mail/mutt/patches/patch-ae
new file mode 100644
index 00000000000..cb7b5d6aba3
--- /dev/null
+++ b/mail/mutt/patches/patch-ae
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.6 2015/09/03 14:49:02 wiz Exp $
+
+Work around the broken IMAP implementation of Exchange 2010.
+Patch taken from here:
+
+http://dev.mutt.org/trac/ticket/3459
+
+--- imap/message.c.orig	2010-08-24 17:34:21.000000000 +0100
++++ imap/message.c	2011-02-03 13:17:56.000000000 +0000
+@@ -242,6 +242,14 @@
+       char *cmd;
+ 
+       fetchlast = msgend + 1;
++      /* Microsoft Exchange 2010 violates the IMAP protocol and 
++       * starts omitting messages if one FETCHes more than 2047 (or
++       * or somewhere around that number. We therefore split the
++       * FETCH into chunks of 2000 messages each. */
++      if (fetchlast - msgno - 1 > 2000)
++      {
++        fetchlast = msgno + 1 + 2000;
++      }
+       safe_asprintf (&cmd, "FETCH %d:%d (UID FLAGS INTERNALDATE RFC822.SIZE %s)",
+                      msgno + 1, fetchlast, hdrreq);
+       imap_cmd_start (idata, cmd);
diff --git a/mail/mutt/patches/patch-af b/mail/mutt/patches/patch-af
new file mode 100644
index 00000000000..29a8eb1cee2
--- /dev/null
+++ b/mail/mutt/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.6 2015/09/03 14:49:02 wiz Exp $
+
+1.) On some systems, curses.h defines TRUE and FALSE, so conditionalise
+    them here to avoid compiler complaints about duplicate definitions.
+
+--- lib.h.orig	2014-03-12 16:03:45.000000000 +0000
++++ lib.h	2014-12-19 20:41:07.000000000 +0000
+@@ -54,8 +54,12 @@
+ #  define N_(a) a
+ # endif
+ 
+-# define TRUE 1
+-# define FALSE 0
++# ifndef TRUE
++#  define TRUE 1
++# endif
++# ifndef FALSE
++#  define FALSE 0
++# endif
+ 
+ # define HUGE_STRING	5120
+ # define LONG_STRING     1024
diff --git a/mail/mutt/patches/patch-ag b/mail/mutt/patches/patch-ag
index 269f3f71163..7d793f40106 100644
--- a/mail/mutt/patches/patch-ag
+++ b/mail/mutt/patches/patch-ag
@@ -1,16 +1,15 @@
-$NetBSD: patch-ag,v 1.7 2004/07/17 00:33:15 schmonz Exp $
+$NetBSD: patch-ag,v 1.8 2015/09/03 14:49:02 wiz Exp $
 
---- doc/Makefile.in.orig	2001-11-06 14:12:31.000000000 -0500
+--- doc/Makefile.in.orig	2010-08-25 16:31:48.000000000 +0000
 +++ doc/Makefile.in
-@@ -74,10 +74,8 @@ install: all instdoc
- 	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
- 	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
- 	echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
--	./instdoc $(srcdir)/dotlock.man \
--		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+@@ -532,8 +532,8 @@ install-data-local: makedoc-all instdoc
+ 	test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
+ 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
  	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
 -	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
+-	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
 +	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
++	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mutt-mmdf.5
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- 	for f in $(srcdir_DOCFILES) ; do \
- 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+ 	for f in $(topsrcdir_DOCFILES) ; do \
+ 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
diff --git a/mail/mutt/patches/patch-ah b/mail/mutt/patches/patch-ah
index 697b872f7a7..8384247e205 100644
--- a/mail/mutt/patches/patch-ah
+++ b/mail/mutt/patches/patch-ah
@@ -1,17 +1,17 @@
-$NetBSD: patch-ah,v 1.5 2004/02/20 14:02:04 wiz Exp $
---- init.h.orig	Wed Jul 24 10:41:29 2002
-+++ init.h	Mon Feb  2 08:17:26 2004
-@@ -278,6 +278,13 @@
-   ** .pp
-   ** Character set your terminal uses to display and enter textual data.
-   */
-+  { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 },
-+  /*
-+  ** .pp
-+  ** When this variable is set, the change-folder command will start at the
-+  ** next folder after the current folder in your mailbox list instead of
-+  ** starting at the first folder.
-+  */
-   { "check_new",	DT_BOOL, R_NONE, OPTCHECKNEW, 1 },
-   /*
-   ** .pp
+$NetBSD: patch-ah,v 1.6 2015/09/03 14:49:02 wiz Exp $
+
+mutt_curses.h refers to event_t from mutt,h, and SHORT_STRING from lib.h,
+so include those headers here.
+
+--- mutt_curses.h.orig	2008-11-11 21:55:47.000000000 +0200
++++ mutt_curses.h
+@@ -52,6 +52,9 @@
+ # include <curses.h>
+ #endif
+ 
++#include "lib.h" /* for SHORT_STRING */
++#include "mutt.h" /* for event_t */
++
+ #define M_ENTER_C '\n'
+ #define M_ENTER_S "\n"
+ 
diff --git a/mail/mutt/patches/patch-ai b/mail/mutt/patches/patch-ai
deleted file mode 100644
index 7caf46885ba..00000000000
--- a/mail/mutt/patches/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ai,v 1.6 2004/02/20 14:02:04 wiz Exp $
---- mutt.h.orig	Wed Jul 24 11:46:58 2002
-+++ mutt.h	Mon Feb  2 08:17:26 2004
-@@ -322,6 +322,7 @@
-   OPTBEEP,
-   OPTBEEPNEW,
-   OPTBOUNCEDELIVERED,
-+  OPTCHANGEFOLDERNEXT,
-   OPTCHECKNEW,
-   OPTCOLLAPSEUNREAD,
-   OPTCONFIRMAPPEND,
diff --git a/mail/mutt/patches/patch-aj b/mail/mutt/patches/patch-aj
deleted file mode 100644
index e54f90d7546..00000000000
--- a/mail/mutt/patches/patch-aj
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aj,v 1.6 2004/02/20 14:02:04 wiz Exp $
---- buffy.c.orig	Mon Mar 25 12:30:23 2002
-+++ buffy.c	Mon Feb  2 08:17:26 2004
-@@ -440,7 +440,7 @@
-   {
-   case 0:
- 
--    s = '\0';
-+    *s = '\0';
-     break;
- 
-   case 1:
-@@ -449,7 +449,7 @@
-       tmp = tmp->next;
-     if (!tmp)
-     {
--      s = '\0';
-+      *s = '\0';
-       mutt_buffy_check (1); /* buffy was wrong - resync things */
-       break;
-     }
-@@ -475,7 +475,7 @@
-     }
-     if (count >= 3)
-     {
--      s = '\0';
-+      *s = '\0';
-       mutt_buffy_check (1); /* buffy was wrong - resync things */
-       break;
-     }
diff --git a/mail/mutt/patches/patch-ak b/mail/mutt/patches/patch-ak
deleted file mode 100644
index 0da29364412..00000000000
--- a/mail/mutt/patches/patch-ak
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2004/02/02 07:21:24 tron Exp $
-
---- pgp.c.orig	Wed Jan  9 16:39:28 2002
-+++ pgp.c	Sun Feb  1 23:32:50 2004
-@@ -55,7 +55,7 @@
- 
- 
- char PgpPass[STRING];
--static time_t PgpExptime = 0; /* when does the cached passphrase expire? */
-+time_t PgpExptime = 0; /* when does the cached passphrase expire? */
- 
- void pgp_void_passphrase (void)
- {
-@@ -737,14 +737,14 @@
-     
-     if (pgp_copy_checksig  (pgperr, s->fpout) >= 0)
-       badsig = 0;
--
--    safe_fclose (&pgperr);
-     
-     if ((rv = mutt_wait_filter (thepid)))
-       badsig = -1;
-     
-      dprint (1, (debugfile, "pgp_verify_one: mutt_wait_filter returned %d.\n", rv));
-   }
-+
-+  safe_fclose (&pgperr);
-   
-   state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
-   
diff --git a/mail/mutt/patches/patch-al b/mail/mutt/patches/patch-al
index 94af6df0801..1d91948d002 100644
--- a/mail/mutt/patches/patch-al
+++ b/mail/mutt/patches/patch-al
@@ -1,15 +1,22 @@
-$NetBSD: patch-al,v 1.8 2006/04/11 13:26:01 tron Exp $
+$NetBSD: patch-al,v 1.9 2015/09/03 14:49:02 wiz Exp $
 
---- pop_lib.c.orig	2005-12-26 06:28:37.000000000 -0800
-+++ pop_lib.c	2005-12-26 06:28:40.000000000 -0800
-@@ -155,8 +155,10 @@
+--- configure.orig	2010-08-25 16:31:47.000000000 +0000
++++ configure
+@@ -7836,7 +7836,7 @@ fi
  
-       if (!pop_data->expire)
- 	msg = _("Unable to leave messages on server.");
-+/*
-       if (!pop_data->cmd_top)
- 	msg = _("Command TOP is not supported by server.");
-+*/
-       if (!pop_data->cmd_uidl)
- 	msg = _("Command UIDL is not supported by server.");
-       break;
+         old_LIBS="$LIBS"
+         LIBS="$LIBS $MUTTLIBS"
+-        for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm
++        for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm mvchgat mvwchgat
+ do
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_func declaration" >&5
+@@ -8856,7 +8856,7 @@ fi
+ 
+ if test x$mutt_cv_setgid = xyes; then
+         DOTLOCK_GROUP='mail'
+-        DOTLOCK_PERMISSION=2755
++        DOTLOCK_PERMISSION=2555
+ else
+         DOTLOCK_GROUP=''
+         DOTLOCK_PERMISSION=755
diff --git a/mail/mutt/patches/patch-am b/mail/mutt/patches/patch-am
index 8e781fe6e07..597eff560e7 100644
--- a/mail/mutt/patches/patch-am
+++ b/mail/mutt/patches/patch-am
@@ -1,41 +1,14 @@
-$NetBSD: patch-am,v 1.1 2006/01/01 19:40:43 ben Exp $
+$NetBSD: patch-am,v 1.2 2015/09/03 14:49:02 wiz Exp $
 
---- sendlib.c.orig	Fri May 31 09:59:39 2002
-+++ sendlib.c
-@@ -1803,6 +1803,7 @@ send_msg (const char *path, char **args,
-      */
-     setsid ();
-   
-+#if !defined(__BROKEN_INTERIX_FORK)
-     /* next we close all open files */
- #if defined(OPEN_MAX)
-     for (fd = 0; fd < OPEN_MAX; fd++)
-@@ -1815,9 +1816,27 @@ send_msg (const char *path, char **args,
-     close (1);
-     close (2);
- #endif
-+#endif
- 
-     /* now the second fork() */
--    if ((pid = fork ()) == 0)
-+    pid = fork ();
-+
-+#if defined(__BROKEN_INTERIX_FORK)
-+    /* next we close all open files */
-+#if defined(OPEN_MAX)
-+    for (fd = 0; fd < OPEN_MAX; fd++)
-+      close (fd);
-+#elif defined(_POSIX_OPEN_MAX)
-+    for (fd = 0; fd < _POSIX_OPEN_MAX; fd++)
-+      close (fd);
-+#else
-+    close (0);
-+    close (1);
-+    close (2);
-+#endif
-+#endif
-+
-+    if (pid == 0)
-     {
-       /* "msg" will be opened as stdin */
-       if (open (msg, O_RDONLY, 0) < 0)
+Add change_folder_next option.
+
+--- mutt.h.orig	2007-08-29 02:44:16.000000000 +0900
++++ mutt.h	2007-12-06 17:36:02.000000000 +0900
+@@ -339,6 +339,7 @@
+   OPTBEEPNEW,
+   OPTBOUNCEDELIVERED,
+   OPTBRAILLEFRIENDLY,
++  OPTCHANGEFOLDERNEXT,
+   OPTCHECKMBOXSIZE,
+   OPTCHECKNEW,
+   OPTCOLLAPSEUNREAD,
diff --git a/mail/mutt/patches/patch-an b/mail/mutt/patches/patch-an
new file mode 100644
index 00000000000..9054da21a97
--- /dev/null
+++ b/mail/mutt/patches/patch-an
@@ -0,0 +1,18 @@
+$NetBSD: patch-an,v 1.1 2015/09/03 14:49:02 wiz Exp $
+
+--- init.h.orig	2010-09-15 15:39:31.000000000 +0000
++++ init.h
+@@ -355,6 +355,13 @@ struct option_t MuttVars[] = {
+   ** \fBNote:\fP It should only be set in case Mutt isn't able to determine the
+   ** character set used correctly.
+   */
++  { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 },
++  /*
++  ** .pp
++  ** When this variable is set, the change-folder command will start at the
++  ** next folder after the current folder in your mailbox list instead of
++  ** starting at the first folder.
++  */
+   { "check_mbox_size",	DT_BOOL, R_NONE, OPTCHECKMBOXSIZE, 0 },
+   /*
+   ** .pp
diff --git a/mail/mutt/patches/patch-ao b/mail/mutt/patches/patch-ao
new file mode 100644
index 00000000000..773be154ac2
--- /dev/null
+++ b/mail/mutt/patches/patch-ao
@@ -0,0 +1,18 @@
+$NetBSD: patch-ao,v 1.1 2015/09/03 14:49:02 wiz Exp $
+
+Add change_folder_next option.
+
+--- curs_main.c.orig	2007-12-06 17:32:01.000000000 +0900
++++ curs_main.c	2007-12-06 17:34:20.000000000 +0900
+@@ -1080,6 +1080,11 @@
+ 	}
+ 	else
+ 	{
++	  if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
++	  {
++	    strfcpy (buf, Context->path, sizeof (buf));
++	    mutt_pretty_mailbox (buf, sizeof (buf));
++	  }
+ 	  mutt_buffy (buf, sizeof (buf));
+ 
+ 	  if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
diff --git a/mail/mutt/patches/patch-ap b/mail/mutt/patches/patch-ap
new file mode 100644
index 00000000000..46630cc3b1d
--- /dev/null
+++ b/mail/mutt/patches/patch-ap
@@ -0,0 +1,36 @@
+$NetBSD: patch-ap,v 1.1 2015/09/03 14:49:02 wiz Exp $
+
+--- doc/Muttrc.orig	2009-01-06 01:36:17.000000000 +0100
++++ doc/Muttrc
+@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
+ "call urlview to extract URLs out of a message"
+ 
+ # Show documentation when pressing F1
+-macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
++macro generic,pager <F1> "<shell-escape> less @DOCDIR@/manual.txt<Enter>" "show Mutt documentation"
+ 
+ # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
+ macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
+@@ -750,11 +750,11 @@ attachments   -I message/external-body
+ # filtered message is read from the standard output.
+ # 
+ # 
+-# set dotlock_program="/usr/local/bin/mutt_dotlock"
++# set dotlock_program="@PREFIX@/bin/mutt_dotlock"
+ #
+ # Name: dotlock_program
+ # Type: path
+-# Default: "/usr/local/bin/mutt_dotlock"
++# Default: "@PREFIX@/bin/mutt_dotlock"
+ # 
+ # 
+ # Contains the path of the mutt_dotlock(8) binary to be used by
+@@ -4472,7 +4472,7 @@ attachments   -I message/external-body
+ # Setting this variable will cause mutt to open a pipe to a command
+ # instead of a raw socket. You may be able to use this to set up
+ # preauthenticated connections to your IMAP/POP3/SMTP server. Example:
+-# set tunnel="ssh -q mailhost.net /usr/local/libexec/imapd"
++# set tunnel="ssh -q mailhost.net @PREFIX@/libexec/imapd"
+ # 
+ # Note: For this example to work you must be able to log in to the remote
+ # machine without having to enter a password.
diff --git a/mail/mutt/patches/patch-aq b/mail/mutt/patches/patch-aq
new file mode 100644
index 00000000000..b4e22348e93
--- /dev/null
+++ b/mail/mutt/patches/patch-aq
@@ -0,0 +1,32 @@
+$NetBSD: patch-aq,v 1.1 2015/09/03 14:49:02 wiz Exp $
+
+--- mvchgat.c.orig	2011-07-05 08:47:10.596708000 +0000
++++ mvchgat.c
+@@ -0,0 +1,27 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "mutt.h"
++#include "mutt_curses.h"
++
++#ifndef USE_SLANG_CURSES
++#ifndef HAVE_MVWCHGAT
++int
++mvwchgat(WINDOW *win, int y, int x, int count, attr_t attr, short color,
++	const void *opts)
++{
++	wmove(win, y, x);
++	return wattr_set(win, attr, color, opts);
++}
++#endif
++
++#ifndef HAVE_MVCHGAT
++int
++mvchgat(int y, int x, int count, attr_t attr, short color,
++	const void *opts)
++{
++	return mvwchgat(stdscr, y, x, count, attr, color, opts);
++}
++#endif
++#endif
diff --git a/mail/mutt/patches/patch-mbox.c b/mail/mutt/patches/patch-mbox.c
deleted file mode 100644
index 8f897b842a5..00000000000
--- a/mail/mutt/patches/patch-mbox.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-mbox.c,v 1.1 2013/05/12 17:26:46 uwe Exp $
-
-Make argument type match conversion specifier to print correct numbers
-on big-endian systems.
-
---- mbox.c.orig	2007-05-23 01:17:53.000000000 +0000
-+++ mbox.c
-@@ -127,7 +127,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
-       count++;
-       if (!ctx->quiet && ReadInc && ((count % ReadInc == 0) || count == 1))
- 	mutt_message (_("Reading %s... %d (%d%%)"), ctx->path, count,
--		      loc / (ctx->size / 100 + 1));
-+		      (int)(loc / (ctx->size / 100 + 1)));
- 
- 
-       if (ctx->msgcount == ctx->hdrmax)
-@@ -288,7 +288,7 @@ int mbox_parse_mailbox (CONTEXT *ctx)
- 
-       if (!ctx->quiet && ReadInc && ((count % ReadInc == 0) || count == 1))
- 	mutt_message (_("Reading %s... %d (%d%%)"), ctx->path, count,
--		      ftell (ctx->fp) / (ctx->size / 100 + 1));
-+		      (int)(ftell (ctx->fp) / (ctx->size / 100 + 1)));
- 
-       if (ctx->msgcount == ctx->hdrmax)
- 	mx_alloc_memory (ctx);
-@@ -796,7 +796,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
-       j++;
-       if (!ctx->quiet && WriteInc && ((i % WriteInc) == 0 || j == 1))
- 	mutt_message (_("Writing messages... %d (%d%%)"), i,
--		      ftell (ctx->fp) / (ctx->size / 100 + 1));
-+		      (int)(ftell (ctx->fp) / (ctx->size / 100 + 1)));
- 
-       if (ctx->magic == M_MMDF)
-       {
diff --git a/mail/mutt/patches/patch-sendlib.c b/mail/mutt/patches/patch-sendlib.c
new file mode 100644
index 00000000000..32cf422f7de
--- /dev/null
+++ b/mail/mutt/patches/patch-sendlib.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-sendlib.c,v 1.1 2015/09/03 14:49:02 wiz Exp $
+
+Fix CVE-2014-9116 using the upstream patch from
+http://dev.mutt.org/trac/changeset/0aebf1df43598b442ac75ae4fe17875351854db0
+
+--- sendlib.c.orig	2014-03-12 16:03:45.000000000 +0000
++++ sendlib.c
+@@ -1814,7 +1814,14 @@ static int write_one_header (FILE *fp, i
+     {
+       tagbuf = mutt_substrdup (start, t);
+       /* skip over the colon separating the header field name and value */
+-      t = skip_email_wsp(t + 1);
++      ++t;
++
++      /* skip over any leading whitespace (WSP, as defined in RFC5322)
++       * NOTE: skip_email_wsp() does the wrong thing here.
++       *       See tickets 3609 and 3716. */
++      while (*t == ' ' || *t == '\t')
++        t++;
++
+       valbuf = mutt_substrdup (t, end);
+     }
+     dprint(4,(debugfile,"mwoh: buf[%s%s] too long, "