12 files changed, 83 insertions, 502 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 5c2ae17dbbff..e07af97581c6 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -106,8 +106,8 @@
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.5.11
-PORTREVISION?=	3
+PORTVERSION=	1.5.12
+PORTREVISION?=	0
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -194,6 +194,7 @@ AC_PATCH_VERSION=	${PORTVERSION}
 WITH_MUTT_IMAP_HEADER_CACHE=	yes
 .endif
 .if defined(WITH_MUTT_SIDEBAR_PATCH)
+IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH does not work at the moment
 .if defined(WITH_MUTT_NNTP)
 IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
 .endif
@@ -315,10 +316,6 @@ LIB_DEPENDS+=	gpgme:${PORTSDIR}/security/gpgme
 post-patch::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
 .endif
-.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
-post-patch::
-	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-header-cache
-.endif
 .if defined(WITH_MUTT_SIGNATURE_MENU)
 XML_NEEDED=	yes
 post-patch::
@@ -402,7 +399,7 @@ XML_NEEDED=	yes
 pre-patch::
 	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
 	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
-		 ${WRKDIR}/patch-nntp
+		${WRKDIR}/patch-nntp
 	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
 .endif
 .if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
@@ -414,10 +411,10 @@ XML_NEEDED=	yes
 DISTFILES+=	patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1:cd
 #XML_NEEDED=	yes
 pre-patch::
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1 > ${WRKDIR}/patch-ifdef
-	${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.sgml.head$$/,/^diff/d' \
+	@${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1 > ${WRKDIR}/patch-ifdef
+	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.sgml.head$$/,/^diff/d' \
 		 ${WRKDIR}/patch-ifdef
-	${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-ifdef
+	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-ifdef
 .endif
 .if defined(WITH_MUTT_MBOX_HOOK_PATCH)
 PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 625ac2f5e6be..2b2f65f6853e 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,27 +1,24 @@
-MD5 (mutt/mutt-1.5.11.tar.gz) = 00e6f8f7c37d4840e5e30583ebee21ce
-SHA256 (mutt/mutt-1.5.11.tar.gz) = 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474
-SIZE (mutt/mutt-1.5.11.tar.gz) = 3187375
-MD5 (mutt/patch-1.5.11.rr.compressed.gz) = 95ec112ae0ce2cbd1b67bcc68756bf97
-SHA256 (mutt/patch-1.5.11.rr.compressed.gz) = 1e2697136e0431508d2447de8b67fb32114d0b08ec043cc929e3ddf07202fcb5
-SIZE (mutt/patch-1.5.11.rr.compressed.gz) = 9995
-MD5 (mutt/patch-1.5.11.vvv.nntp.gz) = f5a2f99940a4bbeef2d1062e9280462c
-SHA256 (mutt/patch-1.5.11.vvv.nntp.gz) = ec316b84dcd5718abad2276e587ea5f7b80a2b1ebfe2509321857f3ac4aa6691
-SIZE (mutt/patch-1.5.11.vvv.nntp.gz) = 54943
+MD5 (mutt/mutt-1.5.12.tar.gz) = 57196c816211a72900fdc54341eb0132
+SHA256 (mutt/mutt-1.5.12.tar.gz) = 0d0c2ab6cea0d93579bc5490fafdae3bf640070d993490c7b00ccac4fa808b67
+SIZE (mutt/mutt-1.5.12.tar.gz) = 3440835
+MD5 (mutt/patch-1.5.12.rr.compressed.gz) = 9a164da2a647de6a6e19c4d43bd032aa
+SHA256 (mutt/patch-1.5.12.rr.compressed.gz) = 8311bdb651a39e492ac66591324c0c21a3d7c7c7c487a86676db01fd62f12606
+SIZE (mutt/patch-1.5.12.rr.compressed.gz) = 10066
+MD5 (mutt/patch-1.5.12.vvv.nntp.gz) = 7cbc1e12a743b3ad9a594a5da29f6d35
+SHA256 (mutt/patch-1.5.12.vvv.nntp.gz) = 5d921156e0b3e6ccb53964c8308a0c3f2b57357512b453a8bdfa49e7978c0f05
+SIZE (mutt/patch-1.5.12.vvv.nntp.gz) = 54910
 MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
 SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373
 SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
-MD5 (mutt/patch-1.5.11.vvv.initials.gz) = 1d6e82f41b96a47862f6cd7cfd943ec6
-SHA256 (mutt/patch-1.5.11.vvv.initials.gz) = a16566b77f2c90b06d1cd6a24de6983c0cca11a229c4bdeba28d7931068f4d0f
-SIZE (mutt/patch-1.5.11.vvv.initials.gz) = 684
-MD5 (mutt/patch-1.5.11.vvv.quote.gz) = 5409e89072f83ffbe87d2358948816db
-SHA256 (mutt/patch-1.5.11.vvv.quote.gz) = 1f3f8b3b2d7ddf1bf9f203efbf79be526c0bc687fe65d9361d236972aaac4f34
-SIZE (mutt/patch-1.5.11.vvv.quote.gz) = 1958
+MD5 (mutt/patch-1.5.12.vvv.initials.gz) = 1cc3b352f92c14f619c534aaa8e4900d
+SHA256 (mutt/patch-1.5.12.vvv.initials.gz) = 4b4e8953c0d8144366ae8ca1a616253218981dbca4bf312c87766fa9c408833f
+SIZE (mutt/patch-1.5.12.vvv.initials.gz) = 683
+MD5 (mutt/patch-1.5.12.vvv.quote.gz) = 48df3c09a4a467ce0347588ecff1d73b
+SHA256 (mutt/patch-1.5.12.vvv.quote.gz) = 5110a3437311e07216b102c17f3888b4fff2f593f1107fd46247559028b9d6d2
+SIZE (mutt/patch-1.5.12.vvv.quote.gz) = 1967
 MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
 SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
 SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
 MD5 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 45cacc5155f1865ace31c72e2bffee63
 SHA256 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 41ae6d049d2d39c3bb01d534a760372ec571bc51e90c259f529c477aa41d3d7e
 SIZE (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 2555
-MD5 (mutt/patch-1.5.11.sidebar.20060225.txt) = a1d5726cfcd6ddb55c40491b2567f6db
-SHA256 (mutt/patch-1.5.11.sidebar.20060225.txt) = 2bdc62298cffed83854a83a1ad100fdf8285dd6d9bfb59a818e5cf4dc5d2b700
-SIZE (mutt/patch-1.5.11.sidebar.20060225.txt) = 47547
diff --git a/mail/mutt-devel/files/extra-patch-doc-xml b/mail/mutt-devel/files/extra-patch-doc-xml
index 60e38afca3f3..6321bff8f8fe 100644
--- a/mail/mutt-devel/files/extra-patch-doc-xml
+++ b/mail/mutt-devel/files/extra-patch-doc-xml
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig2	Sat Feb  2 18:30:27 2002
-+++ doc/Makefile.in	Sat Feb  2 18:32:39 2002
-@@ -60,7 +60,7 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	README NEWS TODO README.SECURITY README.SSL 
+--- doc/Makefile.in.orig2	Mon Jul 17 15:50:28 2006
++++ doc/Makefile.in	Mon Jul 17 15:50:57 2006
+@@ -71,7 +71,7 @@
+ all: ../makedoc$(EXEEXT)
+ 	$(MAKE) makedoc-all
  
--all: mutt.1 muttrc.man
-+all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
+-makedoc-all: mutt.1 muttrc.man
++makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
  
- try-html: ../makedoc
- 	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
+ install: makedoc-all instdoc
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
diff --git a/mail/mutt-devel/files/extra-patch-maildir-header-cache b/mail/mutt-devel/files/extra-patch-maildir-header-cache
deleted file mode 100644
index df28dd82a648..000000000000
--- a/mail/mutt-devel/files/extra-patch-maildir-header-cache
+++ /dev/null
@@ -1,256 +0,0 @@
-diff -Nru a/PATCHES b/PATCHES
---- a/PATCHES
-+++ b/PATCHES
-@@ -0,0 +1 @@
-+mutt-cvs-header-cache.30
---- a/configure.in
-+++ b/configure.in
-@@ -804,10 +804,23 @@
-     OLDLIBS="$LIBS"
- 
-     need_md5="yes"
-+
-+    ac_prefer_qdbm=yes
-+    AC_ARG_WITH(qdbm, AC_HELP_STRING([--without-qdbm], [Don't use qdbm even if it is available]),
-+        ac_prefer_qdbm=$withval)
-+    if test x$ac_prefer_qdbm != xno; then
-+        CPPFLAGS="$OLDCPPFLAGS"
-+        LIBS="$OLDLIBS -lqdbm";
-+        AC_CACHE_CHECK(for vlopen, ac_cv_vlopen,[
-+            ac_cv_vlopen=no
-+            AC_TRY_LINK([#include <villa.h>],[vlopen(0,0,0);],[ac_cv_vlopen=yes])
-+        ])
-+    fi
-+
-     ac_prefer_gdbm=yes
-     AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available]),
-         ac_prefer_gdbm=$withval)
--    if test x$ac_prefer_gdbm != xno; then
-+    if test x$ac_prefer_gdbm != xno -a x$ac_cv_vlopen != xyes; then
-         CPPFLAGS="$OLDCPPFLAGS"
-         LIBS="$OLDLIBS -lgdbm";
-         AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,[
-@@ -819,7 +832,7 @@
-     ac_bdb_prefix=yes
-     AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available]),
-         ac_bdb_prefix=$withval)
--    if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then
-+    if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; 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
-             bdbpfx="$bdbpfx $d"
-@@ -865,7 +878,11 @@
-         fi
-     fi
- 
--    if test x$ac_cv_gdbmopen = xyes; then
-+    if test x$ac_cv_vlopen = xyes; then
-+        CPPFLAGS="$OLDCPPFLAGS"
-+        LIBS="$OLDLIBS -lqdbm";
-+        AC_DEFINE(HAVE_QDBM, 1, [QDBM Support])
-+    elif test x$ac_cv_gdbmopen = xyes; then
-         CPPFLAGS="$OLDCPPFLAGS"
-         LIBS="$OLDLIBS -lgdbm";
-         AC_DEFINE(HAVE_GDBM, 1, [GDBM Support])
---- a/hcache.c
-+++ b/hcache.c
-@@ -22,7 +22,11 @@
- #include "config.h"
- #endif				/* HAVE_CONFIG_H */
- 
--#if HAVE_GDBM
-+#if HAVE_QDBM
-+#include <depot.h>
-+#include <cabin.h>
-+#include <villa.h>
-+#elif HAVE_GDBM
- #include <gdbm.h>
- #elif HAVE_DB4
- #include <db.h>
-@@ -42,7 +46,14 @@
- #include "lib.h"
- #include "md5.h"
- 
--#if HAVE_GDBM
-+#if HAVE_QDBM
-+static struct header_cache
-+{
-+  VILLA *db;
-+  char *folder;
-+  unsigned int crc;
-+} HEADER_CACHE;
-+#elif HAVE_GDBM
- static struct header_cache
- {
-   GDBM_FILE db;
-@@ -615,7 +626,139 @@
-   return h;
- }
- 
--#if HAVE_GDBM
-+#if HAVE_QDBM
-+void *
-+mutt_hcache_open(const char *path, const char *folder)
-+{
-+  struct header_cache *h = safe_calloc(1, sizeof (HEADER_CACHE));
-+  int    flags = 0;
-+#if 0 /* FIXME */
-+  int pagesize = atoi(HeaderCachePageSize) ? atoi(HeaderCachePageSize) : 16384;
-+#endif
-+  h->db = NULL;
-+  h->folder = safe_strdup(folder);
-+  h->crc = generate_crc32();
-+
-+  if (!path || path[0] == '\0')
-+  {
-+    FREE(&h->folder);
-+    FREE(&h);
-+    return NULL;
-+  }
-+
-+  path = mutt_hcache_per_folder(path, folder);
-+
-+  if (option(OPTHCACHECOMPRESS))
-+    flags = VL_OZCOMP;
-+
-+  h->db = vlopen(path, flags | VL_OWRITER | VL_OCREAT, VL_CMPLEX);
-+  if (h->db)
-+    return h;
-+
-+  /* if rw failed try ro */
-+  h->db = vlopen(path, flags | VL_OREADER, 0);
-+  if (h->db)
-+    return h;
-+  else
-+  {
-+    FREE(&h->folder);
-+    FREE(&h);
-+
-+    return NULL;
-+  }
-+}
-+
-+void
-+mutt_hcache_close(void *db)
-+{
-+  struct header_cache *h = db;
-+
-+  if (!h)
-+    return;
-+
-+  vlclose(h->db);
-+  FREE(&h->folder);
-+  FREE(&h);
-+}
-+
-+void *
-+mutt_hcache_fetch(void *db, const char *filename,
-+		  size_t(*keylen) (const char *fn))
-+{
-+  struct header_cache *h = db;
-+  char path[_POSIX_PATH_MAX];
-+  int ksize;
-+  char *data = NULL;
-+
-+  if (!h)
-+    return NULL;
-+
-+  strncpy(path, h->folder, sizeof (path));
-+  safe_strcat(path, sizeof (path), filename);
-+
-+  ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
-+
-+  data = vlget(h->db, path, ksize, NULL);
-+
-+  if (! crc32_matches(data, h->crc))
-+  {
-+    if (data) { 
-+      FREE(&data);
-+    }
-+    return NULL;
-+  }
-+
-+  return data;
-+}
-+
-+int
-+mutt_hcache_store(void *db, const char *filename, HEADER * header,
-+		  unsigned long uid_validity,
-+		  size_t(*keylen) (const char *fn))
-+{
-+  struct header_cache *h = db;
-+  char path[_POSIX_PATH_MAX];
-+  int ret;
-+  int ksize, dsize;
-+  char *data = NULL;
-+
-+  if (!h)
-+    return -1;
-+
-+  strncpy(path, h->folder, sizeof (path));
-+  safe_strcat(path, sizeof (path), filename);
-+
-+  ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
-+
-+  data  = mutt_hcache_dump(db, header, &dsize, uid_validity);
-+
-+  ret = vlput(h->db, path, ksize, data, dsize, VL_DOVER);
-+
-+  FREE(&data);
-+
-+  return ret;
-+}
-+
-+int
-+mutt_hcache_delete(void *db, const char *filename,
-+		   size_t(*keylen) (const char *fn))
-+{
-+  struct header_cache *h = db;
-+  char path[_POSIX_PATH_MAX];
-+  int ksize;
-+
-+  if (!h)
-+    return -1;
-+
-+  strncpy(path, h->folder, sizeof (path));
-+  safe_strcat(path, sizeof (path), filename);
-+
-+  ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
-+
-+  return vlout(h->db, path, ksize);
-+}
-+
-+#elif HAVE_GDBM
- 
- void *
- mutt_hcache_open(const char *path, const char *folder)
---- a/init.h
-+++ b/init.h
-@@ -1079,6 +1079,15 @@
-   ** files when the header cache is in use.  This incurs one stat(2) per
-   ** message every time the folder is opened.
-   */
-+#if HAVE_QDBM
-+  { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, 0 },
-+  /*
-+  ** .pp
-+  ** If enabled the header cache will be compressed. So only one fifth of the usual
-+  ** diskspace is used, but the uncompression can result in a slower open of the
-+  ** cached folder.
-+  */
-+#endif /* HAVE_QDBM */
-   { "header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384" },
-   /*
-   ** .pp
---- a/mutt.h
-+++ b/mutt.h
-@@ -353,6 +353,9 @@
-   OPTFORWQUOTE,
- #if USE_HCACHE
-   OPTHCACHEVERIFY,
-+#if HAVE_QDBM
-+  OPTHCACHECOMPRESS,
-+#endif /* HAVE_QDBM */
- #endif
-   OPTHDRS,
-   OPTHEADER,
diff --git a/mail/mutt-devel/files/extra-patch-reverse_reply b/mail/mutt-devel/files/extra-patch-reverse_reply
index ab6169ddc6e0..4605f77de67d 100644
--- a/mail/mutt-devel/files/extra-patch-reverse_reply
+++ b/mail/mutt-devel/files/extra-patch-reverse_reply
@@ -29,16 +29,16 @@ diff -u PATCHES PATCHES
    OPTRFC2047PARAMS,
    OPTSAVEADDRESS,
    OPTSAVEEMPTY,
---- protos.h.orig	2005-02-01 09:59:02.000000000 +0100
-+++ protos.h	2005-05-25 18:20:57.000000000 +0200
-@@ -84,6 +84,7 @@
- ADDRESS *mutt_get_address (ENVELOPE *, char **);
+--- protos.h.orig	Wed Jul 12 01:32:28 2006
++++ protos.h	Mon Jul 17 16:14:16 2006
+@@ -92,6 +92,7 @@
  ADDRESS *mutt_lookup_alias (const char *s);
  ADDRESS *mutt_remove_duplicates (ADDRESS *);
+ ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
 +ADDRESS *mutt_reverse_address (ADDRESS *);
  ADDRESS *mutt_expand_aliases (ADDRESS *);
  ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
- 
+
 --- send.c.orig	2005-02-03 19:47:53.000000000 +0100
 +++ send.c	2005-05-25 18:20:57.000000000 +0200
 @@ -588,6 +588,10 @@
diff --git a/mail/mutt-devel/files/extra-patch-signature-menu b/mail/mutt-devel/files/extra-patch-signature-menu
index 677f4534e154..029dd4ac215d 100644
--- a/mail/mutt-devel/files/extra-patch-signature-menu
+++ b/mail/mutt-devel/files/extra-patch-signature-menu
@@ -13,18 +13,18 @@
  	status.c system.c thread.c charset.c history.c lib.c \
  	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
  	url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h
---- mutt-1.5.11/Makefile.in.orig	Thu Sep 15 16:22:50 2005
-+++ mutt-1.5.11/Makefile.in	Sat Mar 11 21:50:27 2006
-@@ -89,7 +89,7 @@
- 	recvattach.$(OBJEXT) recvcmd.$(OBJEXT) rfc822.$(OBJEXT) \
- 	rfc1524.$(OBJEXT) rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) \
- 	score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
--	signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
-+	signal.$(OBJEXT) signature.${OBJEXT} sort.$(OBJEXT) status.$(OBJEXT) \
- 	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
- 	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
- 	editmsg.$(OBJEXT) utf8.$(OBJEXT) mbyte.$(OBJEXT) \
-@@ -307,7 +307,7 @@
+--- mutt-1.5.12/Makefile.in.orig	Mon Jul 17 16:29:15 2006
++++ mutt-1.5.12/Makefile.in	Mon Jul 17 16:30:26 2006
+@@ -90,7 +90,7 @@
+ 	query.$(OBJEXT) recvattach.$(OBJEXT) recvcmd.$(OBJEXT) \
+ 	rfc822.$(OBJEXT) rfc1524.$(OBJEXT) rfc2047.$(OBJEXT) \
+ 	rfc2231.$(OBJEXT) score.$(OBJEXT) send.$(OBJEXT) \
+-	sendlib.$(OBJEXT) signal.$(OBJEXT) sort.$(OBJEXT) \
++	sendlib.$(OBJEXT) signal.$(OBJEXT) signature.$(OBJEXT) sort.$(OBJEXT) \
+ 	status.$(OBJEXT) system.$(OBJEXT) thread.$(OBJEXT) \
+ 	charset.$(OBJEXT) history.$(OBJEXT) lib.$(OBJEXT) \
+ 	muttlib.$(OBJEXT) editmsg.$(OBJEXT) utf8.$(OBJEXT) \
+@@ -309,7 +309,7 @@
  	main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \
  	postpone.c query.c recvattach.c recvcmd.c \
  	rfc822.c rfc1524.c rfc2047.c rfc2231.c \
@@ -87,16 +87,16 @@
        case OP_PIPE:
        case OP_FILTER:
          CHECK_COUNT;
---- mutt-1.5.11/doc/manual.xml.head.orig	Tue Sep  6 18:46:44 2005
-+++ mutt-1.5.11/doc/manual.xml.head	Sat Mar 11 21:48:05 2006
-@@ -908,6 +908,7 @@
- c       edit-cc                 edit the Cc field
- b       edit-bcc                edit the Bcc field
- y       send-message            send the message
-+ESC s	signature-menu		select a signature and append it to your mail
- s       edit-subject            edit the Subject
- S       smime-menu              select S/MIME options
- f       edit-fcc                specify an ``Fcc'' mailbox
+--- mutt-1.5.12/doc/manual.xml.head.orig	Mon Jul 17 16:21:01 2006
++++ mutt-1.5.12/doc/manual.xml.head	Mon Jul 17 16:24:46 2006
+@@ -999,6 +999,7 @@
+ <row><entry>c</entry><entry>edit-cc</entry><entry>edit the Cc field</entry></row>
+ <row><entry>b</entry><entry>edit-bcc</entry><entry>edit the Bcc field</entry></row>
+ <row><entry>y</entry><entry>send-message</entry><entry>send the message</entry></row>
++<row><entry>ESC s</entry><entry>signature-menu</entry><entry>select a signature and append it to your mail</entry></row>
+ <row><entry>s</entry><entry>edit-subject</entry><entry>edit the Subject</entry></row>
+ <row><entry>S</entry><entry>smime-menu</entry><entry>select S/MIME options</entry></row>
+ <row><entry>f</entry><entry>edit-fcc</entry><entry>specify an ``Fcc'' mailbox</entry></row>
 --- mutt-1.5.11/functions.h.orig	Sun Jul 24 18:56:42 2005
 +++ mutt-1.5.11/functions.h	Sat Mar 11 21:48:05 2006
 @@ -311,6 +311,7 @@
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
index 5dc5db37a3e2..e4113b220cdb 100644
--- a/mail/mutt-devel/files/patch-02
+++ b/mail/mutt-devel/files/patch-02
@@ -1,15 +1,15 @@
---- doc/Makefile.in.orig	Sun Sep 18 19:42:14 2005
-+++ doc/Makefile.in	Sun Sep 18 19:44:13 2005
-@@ -68,7 +68,7 @@
- 	ChangeLog.old					\
- 	README NEWS TODO README.SECURITY README.SSL 
+--- doc/Makefile.in.orig1	Wed Jul  5 10:40:07 2006
++++ doc/Makefile.in	Mon Jul 17 15:49:28 2006
+@@ -71,7 +71,7 @@
+ all: ../makedoc$(EXEEXT)
+ 	$(MAKE) makedoc-all
  
--all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
-+all: mutt.1 muttrc.man
+-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
++makedoc-all: mutt.1 muttrc.man
  
- install: all instdoc
+ install: makedoc-all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -89,9 +89,6 @@
+@@ -92,9 +92,6 @@
  		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
  	done
  	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
@@ -19,20 +19,12 @@
  
  uninstall:
  	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
-@@ -108,13 +105,13 @@
+@@ -111,7 +108,7 @@
  
  check:
  manual.txt: manual.html
 -	-lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
 +	-lynx -dump -nolist -with_backspaces manual.html > $@
  
- manual.html: $(srcdir)/html.xsl manual.xml
--	-xsltproc --nonet -o $@ $^
-+	-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
- 
- manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
--	-xsltproc --nonet $^
-+	-xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
- 	touch stamp-doc-chunked
- 
- manual.pdf: stamp-doc-tex
+ manual.html: $(srcdir)/html.xsl stamp-doc-xml
+ 	-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
diff --git a/mail/mutt-devel/files/patch-doc-manual.xml.head b/mail/mutt-devel/files/patch-doc-manual.xml.head
index b1ee1bd73199..8ae856b420ff 100644
--- a/mail/mutt-devel/files/patch-doc-manual.xml.head
+++ b/mail/mutt-devel/files/patch-doc-manual.xml.head
@@ -1,124 +1,10 @@
---- doc/manual.xml.head.orig	Mon Sep 19 08:20:38 2005
-+++ doc/manual.xml.head	Mon Sep 19 08:26:14 2005
+--- doc/manual.xml.head.orig	Mon Jul 17 15:23:46 2006
++++ doc/manual.xml.head	Mon Jul 17 15:30:23 2006
 @@ -1,6 +1,6 @@
  <?xml version="1.0" standalone="no"?>
- <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 -  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 +  "/usr/local/share/xml/docbook/4.2/docbookx.dtd">
- <article>
+ <book>
  
- <articleinfo>
-@@ -241,24 +241,24 @@
- <screen>
- ^A or &lt;Home&gt;    bol             move to the start of the line
- ^B or &lt;Left&gt;    backward-char   move back one char
--Esc B		backward-word	move back one word
-+Esc B           backward-word   move back one word
- ^D or &lt;Delete&gt;  delete-char     delete the char under the cursor
- ^E or &lt;End&gt;     eol             move to the end of the line
- ^F or &lt;Right&gt;   forward-char    move forward one char
--Esc F		forward-word	move forward one word
-+Esc F           forward-word    move forward one word
- &lt;Tab&gt;           complete        complete filename or alias
- ^T              complete-query  complete address with query
- ^K              kill-eol        delete to the end of the line
--ESC d		kill-eow	delete to the end ot the word
-+ESC d           kill-eow        delete to the end ot the word
- ^W              kill-word       kill the word in front of the cursor
- ^U              kill-line       delete entire line
- ^V              quote-char      quote the next typed key
- &lt;Up&gt;            history-up      recall previous string from history
- &lt;Down&gt;          history-down    recall next string from history
- &lt;BackSpace&gt;     backspace       kill the char in front of the cursor
--Esc u		upcase-word	convert word to upper case
--Esc l		downcase-word	convert word to lower case
--Esc c		capitalize-word capitalize the word
-+Esc u           upcase-word     convert word to upper case
-+Esc l           downcase-word   convert word to lower case
-+Esc c           capitalize-word capitalize the word
- ^G              n/a             abort
- &lt;Return&gt;        n/a             finish editing
- </screen>
-@@ -620,8 +620,8 @@
- ESC p   previous-subthread      jump to the start of the previous subthread
- ESC r   read-subthread          mark the current subthread as read
- ESC t   tag-thread              toggle the tag on the current thread
--ESC v	collapse-thread		toggle collapse for the current thread
--ESC V	collapse-all		toggle collapse for all threads
-+ESC v   collapse-thread         toggle collapse for the current thread
-+ESC V   collapse-all            toggle collapse for all threads
- P       parent-message          jump to parent message in thread
- </screen>
- 
-@@ -898,7 +898,7 @@
- 
- <screen>
- a       attach-file             attach a file
--A	attach-message		attach message(s) to the message
-+A       attach-message          attach message(s) to the message
- ESC k   attach-key              attach a PGP public key
- d       edit-description        edit description on attachment
- D       detach-file             detach a file
-@@ -914,7 +914,7 @@
- p       pgp-menu                select PGP options
- P       postpone-message        postpone this message until later
- q       quit                    quit (abort) sending the message
--w	write-fcc		write the message to a folder
-+w       write-fcc               write the message to a folder
- i       ispell                  check spelling (if available on your system)
- ^F      forget-passphrase       wipe passphrase(s) from memory
- </screen>
-@@ -3286,7 +3286,7 @@
- ~h EXPR         messages which contain EXPR in the message header
- ~H EXPR         messages with a spam attribute matching EXPR
- ~i EXPR         message which match EXPR in the ``Message-ID'' field
--~k		message contains PGP key material
-+~k              message contains PGP key material
- ~L EXPR         message is either originated or received by EXPR
- ~l              message is addressed to a known mailing list
- ~m [MIN]-[MAX]  message in the range MIN to MAX *)
-@@ -3302,15 +3302,15 @@
- ~S              superseded messages
- ~t EXPR         messages addressed to EXPR
- ~T              tagged messages
--~u		message is addressed to a subscribed mailing list
-+~u              message is addressed to a subscribed mailing list
- ~U              unread messages
--~v		message is part of a collapsed thread.
--~V		cryptographically verified messages
-+~v              message is part of a collapsed thread.
-+~V              cryptographically verified messages
- ~x EXPR         messages which contain EXPR in the `References' field
- ~y EXPR         messages which contain EXPR in the `X-Label' field
- ~z [MIN]-[MAX]  messages with a size in the range MIN to MAX *)
--~=		duplicated messages (see $duplicate_threads)
--~$		unreferenced messages (requires threaded view)
-+~=              duplicated messages (see $duplicate_threads)
-+~$              unreferenced messages (requires threaded view)
- </screen>
- 
- </para>
-@@ -3502,10 +3502,10 @@
- one of the following units:
- 
- <screen>
--y	years
--m	months
--w	weeks
--d	days
-+y       years
-+m       months
-+w       weeks
-+d       days
- </screen>
- 
- As a special case, you can replace the sign by a ``*'' character,
-@@ -5461,7 +5461,7 @@
- <para>
- 
- <screen>
---A	expand an alias
-+-A      expand an alias
- -a      attach a file to a message
- -b      specify a blind carbon-copy (BCC) address
- -c      specify a carbon-copy (Cc) address
+ <bookinfo>
diff --git a/mail/mutt-devel/files/patch-examples b/mail/mutt-devel/files/patch-examples
index 3f523836f0bb..05dcb5200635 100644
--- a/mail/mutt-devel/files/patch-examples
+++ b/mail/mutt-devel/files/patch-examples
@@ -48,14 +48,14 @@
    ** (S/MIME only)
    */
    { "smime_verify_command", 	DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
---- Makefile.am.orig	Wed Mar 26 13:13:10 2003
-+++ Makefile.am	Wed Mar 26 13:25:40 2003
+--- Makefile.am.orig	Mon Jul 17 15:31:10 2006
++++ Makefile.am	Mon Jul 17 15:32:52 2006
 @@ -13,7 +13,7 @@
  
- bin_SCRIPTS = muttbug flea
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
  
--BUILT_SOURCES = keymap_defs.h patchlist.c
-+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
+-BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h
++BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h Muttrc
  
  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
  mutt_SOURCES = $(BUILT_SOURCES) \
diff --git a/mail/mutt-devel/files/patch-imap-browse.c b/mail/mutt-devel/files/patch-imap-browse.c
deleted file mode 100644
index 86cda3140e69..000000000000
--- a/mail/mutt-devel/files/patch-imap-browse.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- imap/browse.c.orig
-+++ imap/browse.c
-@@ -505,7 +505,7 @@ static int browse_get_namespace (IMAP_DA
- 	    if (*s == '\"')
- 	    {
- 	      s++;
--	      while (*s && *s != '\"') 
-+	      while (*s && *s != '\"' && n < sizeof (ns) - 1) 
- 	      {
- 		if (*s == '\\')
- 		  s++;
-@@ -516,12 +516,14 @@ static int browse_get_namespace (IMAP_DA
- 		s++;
- 	    }
- 	    else
--	      while (*s && !ISSPACE (*s)) 
-+	      while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1)
- 	      {
- 		ns[n++] = *s;
- 		s++;
- 	      }
- 	    ns[n] = '\0';
-+	    if (n == sizeof (ns) - 1)
-+	      dprint (1, (debugfile, "browse_get_namespace: too long: [%s]\n", ns));
- 	    /* delim? */
- 	    s = imap_next_word (s);
- 	    /* delimiter is meaningless if namespace is "". Why does
-
diff --git a/mail/mutt-devel/files/patch-smime.c b/mail/mutt-devel/files/patch-smime.c
deleted file mode 100644
index ffd679b26069..000000000000
--- a/mail/mutt-devel/files/patch-smime.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- smime.c.orig	Sun Aug 14 14:33:37 2005
-+++ smime.c	Thu Feb 16 08:49:37 2006
-@@ -1989,7 +1989,6 @@
- 
-     if ((p = smime_ask_for_key (_("Sign as: "), NULL, 0))) 
-     {
--      p[mutt_strlen (p)-1] = '\0';
-       mutt_str_replace (&SmimeDefaultKey, p);
- 	
-       msg->security |= SIGN;
diff --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist
index 9cb1e0b10736..03d4a8fa5263 100644
--- a/mail/mutt-devel/scripts/generate-plist
+++ b/mail/mutt-devel/scripts/generate-plist
@@ -38,10 +38,12 @@ share/locale/cs/LC_MESSAGES/mutt.mo
 share/locale/da/LC_MESSAGES/mutt.mo
 share/locale/de/LC_MESSAGES/mutt.mo
 share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/eu/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/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
@@ -126,6 +128,7 @@ EOF
     echo "%%DOCSDIR%%/html/configuration.html" >> $tmp_first
     echo "%%DOCSDIR%%/html/gettingstarted.html" >> $tmp_first
     echo "%%DOCSDIR%%/html/index.html" >> $tmp_first
+    echo "%%DOCSDIR%%/html/intro.html" >> $tmp_first
     echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first
     echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first
     echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first