- Update to 1.5.15

PR:		111414
Submitted by:	Udo Schweigert <udo.schweigert@siemens.com> (maintainer)

4 files changed, 29 insertions, 22 deletions

diff --git a/mail/mutt-devel/files/extra-patch-aspell b/mail/mutt-devel/files/extra-patch-aspell
index 38c2a9f044bf..bae66411cca7 100644
--- a/mail/mutt-devel/files/extra-patch-aspell
+++ b/mail/mutt-devel/files/extra-patch-aspell
@@ -1,5 +1,5 @@
---- Muttrc.head.in.orig	Thu Jan 24 13:10:47 2002
-+++ Muttrc.head.in	Tue Nov  9 08:53:14 2004
+--- Muttrc.head.orig	Thu Jan 24 13:10:47 2002
++++ Muttrc.head	Tue Nov  9 08:53:14 2004
 @@ -19,6 +19,8 @@
  macro index   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
  macro pager   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
diff --git a/mail/mutt-devel/files/extra-patch-doc-ref b/mail/mutt-devel/files/extra-patch-doc-ref
index 99222e0bceb0..794773e35e90 100644
--- a/mail/mutt-devel/files/extra-patch-doc-ref
+++ b/mail/mutt-devel/files/extra-patch-doc-ref
@@ -1,12 +1,12 @@
---- doc/mutt.man.orig	Mon Jul 13 12:50:38 1998
-+++ doc/mutt.man	Thu Oct  1 22:15:40 1998
-@@ -20,7 +20,8 @@
- .SH DESCRIPTION
- Mutt is a small but very powerful text based program for reading electronic
- mail under unix operating systems, including support color terminals, MIME,
--and a threaded sorting mode.
-+and a threaded sorting mode.  Details of how to use all of this is
+--- doc/mutt.man.orig	Wed Apr  4 07:37:13 2007
++++ doc/mutt.man	Mon Apr  9 15:39:36 2007
+@@ -57,7 +57,8 @@
+ .PP
+ Mutt is a small but very powerful text based program for reading and sending electronic
+ mail under unix operating systems, including support for color terminals, MIME,
+-OpenPGP, and a threaded sorting mode.
++OpenPGP, and a threaded sorting mode. Details of how to use all of this is
 +available in \fI${DOCSDIR}\fP.
  .SH OPTIONS
- .IP "-a \fIfile\fP"
- Attach a file to your message using MIME.
+ .PP
+ .IP "-A \fIalias\fP"
diff --git a/mail/mutt-devel/files/patch-examples b/mail/mutt-devel/files/patch-examples
index 6240da00148b..6c565bf8f584 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 Aug 30 14:30:28 2006
-+++ Makefile.am	Wed Aug 30 14:31:49 2006
+--- Makefile.am.orig	Mon Apr  9 15:21:50 2007
++++ Makefile.am	Mon Apr  9 15:24:06 2007
 @@ -13,7 +13,7 @@
  
  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 hcversion.h
++BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h Muttrc
  
  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
  mutt_SOURCES = $(BUILT_SOURCES) \
diff --git a/mail/mutt-devel/files/patch-hcache-db b/mail/mutt-devel/files/patch-hcache-db
index b7e8e68e4dcf..1c5a676d11f3 100644
--- a/mail/mutt-devel/files/patch-hcache-db
+++ b/mail/mutt-devel/files/patch-hcache-db
@@ -1,11 +1,18 @@
---- configure.in.orig2	Tue Feb  8 09:02:55 2005
-+++ configure.in	Tue Feb  8 09:04:01 2005
-@@ -811,7 +811,7 @@
+--- configure.ac.orig2	Mon Apr  9 15:24:59 2007
++++ configure.ac	Mon Apr  9 15:28:42 2007
+@@ -886,12 +886,12 @@
+         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"
+-            for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do
++            for v in BerkeleyDB.4.2; do
                  bdbpfx="$bdbpfx $d/$v"
              done
          done
--        BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
-+        BDB_VERSIONS="db-4.2 db4.2 db42 ''"
-         AC_MSG_CHECKING([for BerkeleyDB > 4.0])
+-        BDB_VERSIONS="db-4 db4 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
+-        AC_MSG_CHECKING([for BerkeleyDB > 4.0])
++	BDB_VERSIONS="db-4.2 db4.2 db42 ''"
++        AC_MSG_CHECKING([for BerkeleyDB = 4.2])
          for d in $bdbpfx; do
              BDB_INCLUDE_DIR=""
+             BDB_LIB_DIR=""