Update mail/mutt-devel to 1.5.11

Add support for Internationalized Domain Names (though disabled by default)

This release features many bugfixes,
~h can match folded headers
~u match only suscribed lists, ~l all
progress indication when uploading imap and pop messages

This fixes PR 31451

6 files changed, 32 insertions, 53 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 9aadf757de3..dd2bae77f6c 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2005/09/06 07:26:35 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/10/03 14:16:53 tonio Exp $
 
-DISTNAME=		mutt-1.5.10i
-PKGNAME=		${DISTNAME:C/i$//}
+DISTNAME=		mutt-1.5.11
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -17,7 +16,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
 
-WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 BUILD_USES_MSGFMT=	yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		perl:run
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
index 6d6fc924623..b38c3f33824 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/09/03 16:57:07 tonio Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/10/03 14:16:53 tonio Exp $
 bin/flea
 bin/mutt
 bin/muttbug
@@ -26,14 +26,14 @@ share/doc/mutt/README.SSL
 share/doc/mutt/TODO
 share/doc/mutt/applying-patches.txt
 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/manual.html
+share/doc/mutt/index.html
+share/doc/mutt/gettingstarted.html
+share/doc/mutt/configuration.html
+share/doc/mutt/mimesupport.html
+share/doc/mutt/advancedusage.html
+share/doc/mutt/reference.html
+share/doc/mutt/miscellany.html
 share/doc/mutt/manual.txt
 share/doc/mutt/patch-notes.txt
 share/doc/mutt/smime-notes.txt
@@ -101,5 +101,4 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/mutt.mo
 @dirrm share/examples/mutt/iconv
 @dirrm share/examples/mutt
-@dirrm share/doc/mutt/html
 @dirrm share/doc/mutt
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index a59f872e6f0..1004abe42da 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.26 2005/09/03 16:57:07 tonio Exp $
+$NetBSD: distinfo,v 1.27 2005/10/03 14:16:53 tonio Exp $
 
-SHA1 (mutt-1.5.10i.tar.gz) = 3f9cbd330b1458a5c317fd29331f425aa36e0877
-RMD160 (mutt-1.5.10i.tar.gz) = e6855dd72e41b5e451b17bac9934bea8ca0c5db7
-Size (mutt-1.5.10i.tar.gz) = 3156345 bytes
+SHA1 (mutt-1.5.11.tar.gz) = cc5823016fe7de6ee3a131b19a3f78796f9f53d5
+RMD160 (mutt-1.5.11.tar.gz) = 812bfa6b1c9bfb1650341f7522298699c7b214a5
+Size (mutt-1.5.11.tar.gz) = 3187375 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = deab9098ad64ab77b29233a3bf3df1439f36989a
 SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 SHA1 (patch-ad) = c427d4ef5129018f26e5a4b3ee2fa5bfb59af3b9
-SHA1 (patch-ae) = b3d88646e7c350f00a551d1127e517b0dd19c5c1
-SHA1 (patch-ag) = 134cd5f16d0be9c4f15eb13e8908079794dfe7f6
+SHA1 (patch-ag) = 84637d95fa9aa0cf58a6e6b2c82b783efa21cf66
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
 SHA1 (patch-ai) = 7d9883198a22615fb1792a41fce3ee9821f48f08
 SHA1 (patch-al) = 9a2c61fae88c6c42534490ee19498677a355c276
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index da1dc320c6e..0f999f3333f 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.8 2005/09/03 03:21:23 jlam Exp $
+# $NetBSD: options.mk,v 1.9 2005/10/03 14:16:53 tonio Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
-PKG_SUPPORTED_OPTIONS=	slang ncurses ssl sasl mutt-hcache
+PKG_SUPPORTED_OPTIONS=	slang ncurses ssl sasl mutt-hcache idn
 PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
@@ -58,3 +58,13 @@ CONFIGURE_ENV+=		BDB_LIB=${BDB_LIBS:S/^-l//}
 .else
 CONFIGURE_ARGS+=	--disable-hcache
 .endif
+
+###
+### Internationalized Domain Names
+###
+.if !empty(PKG_OPTIONS:Midn)
+.  include "../../devel/libidn/buildlink3.mk"
+CONFIGURE_ARGS+=  --with-idn=${BUILDLINK_PREFIX.libidn}
+.else
+CONFIGURE_ARGS+=  --disable-idn
+.endif
diff --git a/mail/mutt-devel/patches/patch-ae b/mail/mutt-devel/patches/patch-ae
deleted file mode 100644
index 778f547171b..00000000000
--- a/mail/mutt-devel/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2005/09/03 16:57:07 tonio Exp $
-
-Fix PR 30981
-
---- imap/auth_sasl.c.orig	2005-09-03 18:38:04.000000000 +0200
-+++ imap/auth_sasl.c	2005-09-03 18:39:26.000000000 +0200
-@@ -150,7 +150,10 @@
-       }
-     }
- 
--    if (!client_start)
-+    /* client-start is only available with the SASL-IR extension, but
-+     * SASL 2.1 seems to want to use it regardless, at least for DIGEST
-+     * fast reauth. Override if the server sent an initial continuation */
-+    if (!client_start || buf[0])
-     {
-       do
-       {
diff --git a/mail/mutt-devel/patches/patch-ag b/mail/mutt-devel/patches/patch-ag
index 3ff01e206d3..bf14dc065c1 100644
--- a/mail/mutt-devel/patches/patch-ag
+++ b/mail/mutt-devel/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2005/09/03 16:57:07 tonio Exp $
+$NetBSD: patch-ag,v 1.5 2005/10/03 14:16:53 tonio Exp $
 
---- doc/Makefile.in.orig	2005-08-11 21:37:02.000000000 +0200
-+++ doc/Makefile.in	2005-09-03 11:16:26.000000000 +0200
-@@ -81,8 +81,8 @@
+--- doc/Makefile.in.orig	2005-09-15 14:19:54.000000000 +0000
++++ doc/Makefile.in
+@@ -79,8 +79,8 @@ install: all instdoc
  	./instdoc $(srcdir)/dotlock.man \
  		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
  	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
@@ -13,12 +13,3 @@ $NetBSD: patch-ag,v 1.4 2005/09/03 16:57:07 tonio Exp $
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
  	for f in $(topsrcdir_DOCFILES) ; do \
  		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
-@@ -170,7 +170,7 @@
- 	-e 's,@docdir\@,$(docdir),g'
- 
- mutt.1: $(srcdir)/mutt.man
--	$(EDIT) $< > $@
-+	$(EDIT) $(srcdir)/mutt.man > $@
- 
- muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
- 	$(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | 	    \