Update mail/mutt-devel to 1.5.15

- Remove the mutt-compressed option for now, as it is not updated upstream
- Add a mutt-smtp option (suggested by Brian de Alwis), to enable smtp relay
  support in mutt

Changes:
The keys used are:
  !: modified feature, -: deleted feature, +: new feature

  - $imap_home_namespace (useless clutter)
  + $check_mbox_size (use size change instead of atime for new mail)
  ! improved f=f support wraps lines at $wrap if $wrap is not 0
  + $wrap (>0 wraps at $wrap, <0 = $wrapmargin)
  + $assumed_charset, $attach_charset, $ignore_linear_white_space
  + $save_history, $history_file (save history across sessions)
  + $smtp_url (ESMTP relay support)
  + $crypt_use_pka (use GPGME PKA signature verification)

8 files changed, 72 insertions, 45 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 52b358ae5fe..18285a28e33 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2007/03/04 17:22:45 tonio Exp $
+# $NetBSD: Makefile,v 1.58 2007/04/21 18:27:21 tonio Exp $
 
-DISTNAME=		mutt-1.5.14
-PKGREVISION=		1
+DISTNAME=		mutt-1.5.15
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -63,11 +62,4 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 
-# Fix some absolute paths in installed files.
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	Fix absolute path
-SUBST_STAGE.paths=	post-build
-SUBST_FILES.paths=	contrib/gpg.rc
-SUBST_SED.paths=	-e 's,/usr/bin/gpg,gpg,g'
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
index 1730029be63..893ef8f9e2a 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2007/03/04 17:22:45 tonio Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/04/21 18:27:21 tonio Exp $
 bin/flea
 bin/mutt
 bin/muttbug
@@ -68,6 +68,7 @@ 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
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index eee07c4ee0f..f97e0d939a6 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.38 2007/03/04 17:22:45 tonio Exp $
+$NetBSD: distinfo,v 1.39 2007/04/21 18:27:21 tonio Exp $
 
-SHA1 (mutt-1.5.14.tar.gz) = 7be098c13302fab8a954095d17a9a64e1e1519c1
-RMD160 (mutt-1.5.14.tar.gz) = ed4eeaf75d37757ed5b370e9763b6f8524df5ca7
-Size (mutt-1.5.14.tar.gz) = 3441678 bytes
-SHA1 (patch-1.5.14.rr.compressed.1.gz) = c0a74886515fed94826b1d5f8d2a7c42a9ea6f26
-RMD160 (patch-1.5.14.rr.compressed.1.gz) = 0756a878cc309636df164cfe21507e8554142c4f
-Size (patch-1.5.14.rr.compressed.1.gz) = 10558 bytes
+SHA1 (mutt-1.5.15.tar.gz) = 1adabf6e07e099bb664c83e3c0100bbbdfec7a9a
+RMD160 (mutt-1.5.15.tar.gz) = 0cc084d2fcdabc0bc41632fcff90703c206de3db
+Size (mutt-1.5.15.tar.gz) = 3517899 bytes
+SHA1 (patch-1.5.14.rr.compressed.1.gz) = 118471717402ef11a670bd9bcf8d5729887b9206
+RMD160 (patch-1.5.14.rr.compressed.1.gz) = b7ea187d53979fabe87a1fdff3bab8ebefaa64ba
+Size (patch-1.5.14.rr.compressed.1.gz) = 10289 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 4f9e8cbcec719263998d61fcc9a707548d804477
 SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
-SHA1 (patch-ag) = 84637d95fa9aa0cf58a6e6b2c82b783efa21cf66
+SHA1 (patch-ae) = 012cc88016c9de1677ca3430342763c419725c0f
+SHA1 (patch-ag) = b8daf23256cd2cfd8c60cae646eb36ec1656823f
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
-SHA1 (patch-ai) = 7d9883198a22615fb1792a41fce3ee9821f48f08
-SHA1 (patch-al) = c803e21197de3317f42e073da5731b1b4371eabd
+SHA1 (patch-ai) = 9cbd895520d94d11655c57c01d3e8b4150f0e9bb
+SHA1 (patch-al) = d4dae28192d7a3b3fad316d9f31ab69106eac9c2
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index f143b3b2298..d443b238f84 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.23 2007/03/04 17:22:45 tonio Exp $
+# $NetBSD: options.mk,v 1.24 2007/04/21 18:27:21 tonio Exp $
 
 # 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 smime sasl mutt-hcache idn mutt-compressed-mbox debug
+PKG_SUPPORTED_OPTIONS=	ssl smime sasl mutt-hcache idn mutt-smtp debug
 PKG_SUGGESTED_OPTIONS=	ssl smime curses
 
 .include "../../mk/bsd.options.mk"
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 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
 
@@ -97,13 +97,12 @@ CONFIGURE_ARGS+=	--disable-hcache
 .endif
 
 ###
-### Compressed mail boxes
+### Internal SMTP relay support
 ###
-.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
-PATCH_SITES=		http://www.spinnaker.de/mutt/compressed/
-PATCHFILES+=		patch-1.5.14.rr.compressed.1.gz
-PATCH_DIST_STRIP=	-p1
-CONFIGURE_ARGS+=	--enable-compressed
+.if !empty(PKG_OPTIONS:Mmutt-smtp)
+CONFIGURE_ARGS+=       --enable-smtp
+.else
+CONFIGURE_ARGS+=       --disable-smtp
 .endif
 
 ###
@@ -121,4 +120,5 @@ CONFIGURE_ARGS+=	--disable-idn
 ###
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
+CFLAGS+= -g
 .endif
diff --git a/mail/mutt-devel/patches/patch-ae b/mail/mutt-devel/patches/patch-ae
new file mode 100644
index 00000000000..9bed964d58c
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ae
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.10 2007/04/21 18:27:21 tonio Exp $
+
+http://dev.mutt.org/hg/mutt/rev/9f6afccedd2f
+
+--- imap/imap.c.orig	2007-04-06 21:52:53.000000000 +0200
++++ imap/imap.c
+@@ -757,9 +757,6 @@ int imap_open_mailbox (CONTEXT* ctx)
+   return 0;
+ 
+  fail:
+-#ifdef USE_HCACHE
+-  mutt_hcache_close (idata->hcache);
+-#endif
+   if (idata->state == IMAP_SELECTED)
+     idata->state = IMAP_AUTHENTICATED;
+  fail_noidata:
+@@ -1324,6 +1321,7 @@ int imap_close_mailbox (CONTEXT* ctx)
+ 
+ #ifdef USE_HCACHE
+   mutt_hcache_close (idata->hcache);
++  idata->hcache = NULL;
+ #endif
+   mutt_bcache_close (&idata->bcache);
+ 
diff --git a/mail/mutt-devel/patches/patch-ag b/mail/mutt-devel/patches/patch-ag
index bf14dc065c1..a1c26daf002 100644
--- a/mail/mutt-devel/patches/patch-ag
+++ b/mail/mutt-devel/patches/patch-ag
@@ -1,8 +1,17 @@
-$NetBSD: patch-ag,v 1.5 2005/10/03 14:16:53 tonio Exp $
+$NetBSD: patch-ag,v 1.6 2007/04/21 18:27:21 tonio Exp $
 
---- doc/Makefile.in.orig	2005-09-15 14:19:54.000000000 +0000
+--- doc/Makefile.in.orig	2007-04-06 09:17:10.000000000 +0200
 +++ doc/Makefile.in
-@@ -79,8 +79,8 @@ install: all instdoc
+@@ -395,7 +395,7 @@ uninstall-am: uninstall-info-am uninstal
+ all:
+ 	$(MAKE) makedoc-all
+ 
+-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
++makedoc-all: mutt.1 muttrc.man
+ 
+ install-data-local: makedoc-all instdoc
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
+@@ -406,8 +406,8 @@ install-data-local: makedoc-all instdoc
  	./instdoc $(srcdir)/dotlock.man \
  		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
  	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
diff --git a/mail/mutt-devel/patches/patch-ai b/mail/mutt-devel/patches/patch-ai
index 41b8414f77e..bd976a7d2ad 100644
--- a/mail/mutt-devel/patches/patch-ai
+++ b/mail/mutt-devel/patches/patch-ai
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.2 2005/09/03 16:57:07 tonio Exp $
+$NetBSD: patch-ai,v 1.3 2007/04/21 18:27:21 tonio Exp $
 
---- mutt.h.orig	2005-09-03 10:51:23.000000000 +0200
-+++ mutt.h	2005-09-03 10:52:23.000000000 +0200
-@@ -336,6 +336,7 @@
+--- mutt.h.orig	2007-04-02 20:04:35.000000000 +0200
++++ mutt.h
+@@ -338,6 +338,7 @@ enum
    OPTBEEP,
    OPTBEEPNEW,
    OPTBOUNCEDELIVERED,
 +  OPTCHANGEFOLDERNEXT,
    OPTBRAILLEFRIENDLY,
+   OPTCHECKMBOXSIZE,
    OPTCHECKNEW,
-   OPTCOLLAPSEUNREAD,
diff --git a/mail/mutt-devel/patches/patch-al b/mail/mutt-devel/patches/patch-al
index d31cce3a744..6dcc242d836 100644
--- a/mail/mutt-devel/patches/patch-al
+++ b/mail/mutt-devel/patches/patch-al
@@ -1,16 +1,16 @@
-$NetBSD: patch-al,v 1.5 2007/03/04 13:43:45 tonio Exp $
+$NetBSD: patch-al,v 1.6 2007/04/21 18:27:21 tonio Exp $
 
---- configure.orig	2006-09-01 09:01:21.000000000 +0200
+--- configure.orig	2007-04-06 09:17:16.000000000 +0200
 +++ configure
-@@ -17512,6 +17512,7 @@ if test "${with_bdb+set}" = set; then
+@@ -17924,6 +17924,7 @@ if test "${with_bdb+set}" = set; then
    withval=$with_bdb; ac_bdb_prefix=$withval
  fi
  
 +    if test x$BDB_INCLUDE_DIR = x -o test x$BDB_LIB_DIR = x -o test x$BDB_LIB = x; then
-     if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then
+     if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a $use_qdbm != yes; then
          test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
          for d in $ac_bdb_prefix; do
-@@ -17618,6 +17619,9 @@ echo "${ECHO_T}yes" >&6; }
+@@ -18032,6 +18033,9 @@ echo "${ECHO_T}yes" >&6; }
  echo "${ECHO_T}no" >&6; }
          fi
      fi
@@ -18,5 +18,5 @@ $NetBSD: patch-al,v 1.5 2007/03/04 13:43:45 tonio Exp $
 +        ac_cv_dbcreate=yes
 +    fi
  
-     if test x$ac_cv_vlopen = xyes; then
-         CPPFLAGS="$OLDCPPFLAGS"
+     if test "$use_qdbm" = yes; then
+