7 files changed, 47 insertions, 64 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 49eab4b3733d..092bed425102 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -101,16 +101,13 @@
 # If you want to enable the reverse_reply option define:
 #  WITH_MUTT_REVERSE_REPLY_PATCH
 #
-# If you want to enable the assumed_charset option define:
-#  WITH_MUTT_ASSUMED_CHARSET_PATCH
-#
 # If you want to enable the `greeting' option define:
 #  WITH_MUTT_GREETING_PATCH
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.5.14
-PORTREVISION?=	1
+PORTVERSION=	1.5.15
+PORTREVISION?=	0
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -201,11 +198,6 @@ WITH_MUTT_IMAP_HEADER_CACHE=	yes
 IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
 .endif
 .endif
-.if defined(WITH_MUTT_ASSUMED_CHARSET_PATCH)
-.if defined(WITH_MUTT_NNTP)
-IGNORE=	cannot install: the WITH_MUTT_ASSUMED_CHARSET_PATCH and WITH_MUTT_NNTP are not compatible
-.endif
-.endif
 
 .if defined (MUTT_LITE)
 WITHOUT_MUTT_XML=			yes
@@ -319,6 +311,7 @@ post-patch::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
 .endif
 .if defined(WITH_MUTT_SIGNATURE_MENU)
+IGNORE=	The WITH_MUTT_SIGNATURE_MENU does not work at the moment.
 XML_NEEDED=	yes
 post-patch::
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu
@@ -431,7 +424,7 @@ pre-patch::
 PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
 .endif
 .if defined(WITH_MUTT_SIDEBAR_PATCH)
-SIDEBAR_PATCH=	patch-1.5.14.sidebar.20070223.txt
+SIDEBAR_PATCH=	patch-1.5.15.sidebar.20070408.txt
 DISTFILES+=	${SIDEBAR_PATCH}:tchan
 XML_NEEDED=	yes
 pre-patch::
@@ -440,9 +433,6 @@ pre-patch::
 		 ${WRKDIR}/patch-sidebar
 	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-sidebar
 .endif
-.if defined(WITH_MUTT_ASSUMED_CHARSET_PATCH)
-PATCHFILES+=	patch-${AC_PATCH_VERSION}.tt.assumed_charset.2.gz:jp
-.endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 MAN1=		mutt.1 mutt_dotlock.1 flea.1 muttbug.1
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 7ab264943320..cc5f7127a2bd 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,27 +1,12 @@
-MD5 (mutt/mutt-1.5.14.tar.gz) = 6d33b4f0074e39772021d947c49b30c6
-SHA256 (mutt/mutt-1.5.14.tar.gz) = 9dbee28bd48a0f1779ba3b00f98dda74a3f629e8109f1842616d48b85013946a
-SIZE (mutt/mutt-1.5.14.tar.gz) = 3441678
-MD5 (mutt/patch-1.5.14.rr.compressed.gz) = 383897af9c41a95a3c36d76ee206811d
-SHA256 (mutt/patch-1.5.14.rr.compressed.gz) = 34b6f642d1daab31acb655d008ccba92aefadc4730c3b12ee64265285f8f34d7
-SIZE (mutt/patch-1.5.14.rr.compressed.gz) = 10168
-MD5 (mutt/patch-1.5.14.vvv.nntp.gz) = 3c1554f33161329225900fee899cd2b8
-SHA256 (mutt/patch-1.5.14.vvv.nntp.gz) = 415fe575b895a79ddf91ff81566a88b12268076ccf870b1306741e4dfbe781ee
-SIZE (mutt/patch-1.5.14.vvv.nntp.gz) = 54928
-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.14.vvv.initials.gz) = 60ca699e3959db53dec418ca08d028e1
-SHA256 (mutt/patch-1.5.14.vvv.initials.gz) = 0c71d08ff4fa82208f59567c6f2666a58a5bd2664c0ef57f5ababedb0f0bb0f8
-SIZE (mutt/patch-1.5.14.vvv.initials.gz) = 692
-MD5 (mutt/patch-1.5.14.vvv.quote.gz) = fb4bf5bd63d219205447009c2270676b
-SHA256 (mutt/patch-1.5.14.vvv.quote.gz) = 0b64a611a638ecf1298db85b614454630ffedf26095c9b7c2a77b47db5a5bd9f
-SIZE (mutt/patch-1.5.14.vvv.quote.gz) = 1962
-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.14.sidebar.20070223.txt) = b4cb93ec7053ca2be1f4253d8c545937
-SHA256 (mutt/patch-1.5.14.sidebar.20070223.txt) = 56c5fc62a50ef2031736e6e4aee81931444e4545b86f05636496284e4a88f331
-SIZE (mutt/patch-1.5.14.sidebar.20070223.txt) = 50978
-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/mutt-1.5.15.tar.gz) = b2c1eb45fd958f6589ee52a98f2a3ce1
+SHA256 (mutt/mutt-1.5.15.tar.gz) = 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a
+SIZE (mutt/mutt-1.5.15.tar.gz) = 3517899
+MD5 (mutt/patch-1.5.15.rr.compressed.gz) = b2c3af62e5469826e445113bc85ce0c3
+SHA256 (mutt/patch-1.5.15.rr.compressed.gz) = 4542be2062337224783631f5730d97a5a351a69737bf772b81010e5be16277f7
+SIZE (mutt/patch-1.5.15.rr.compressed.gz) = 10084
+MD5 (mutt/patch-1.5.15.vvv.initials.gz) = 414606ce18de730d1bb6478899532644
+SHA256 (mutt/patch-1.5.15.vvv.initials.gz) = 9385915adb106abba6f1576be58901f368688b1d55ef454e3993394828ee17e1
+SIZE (mutt/patch-1.5.15.vvv.initials.gz) = 684
+MD5 (mutt/patch-1.5.15.vvv.quote.gz) = 93276f86e544e69a0e83808279f3b175
+SHA256 (mutt/patch-1.5.15.vvv.quote.gz) = 4afe6cc178b08ebd735d04053198f6539c87a0cdc1c5a8a51affc3598504e3a5
+SIZE (mutt/patch-1.5.15.vvv.quote.gz) = 1585
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=""
diff --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist
index 22ebd8eb6ea0..67367cca143f 100644
--- a/mail/mutt-devel/scripts/generate-plist
+++ b/mail/mutt-devel/scripts/generate-plist
@@ -38,10 +38,10 @@ 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/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
@@ -92,6 +92,7 @@ if [ "$MUTT_PORTDOCS" = "yes" ]; then
 %%EXAMPLESDIR%%/colors.default
 %%EXAMPLESDIR%%/colors.linux
 %%EXAMPLESDIR%%/gpg.rc
+%%EXAMPLESDIR%%/mutt_xtitle
 %%EXAMPLESDIR%%/pgp2.rc
 %%EXAMPLESDIR%%/pgp6.rc
 %%EXAMPLESDIR%%/sample.mailcap