* Upgrade to 1.5.3.

* Fix a MASTER_SITES directory.
* Some patches you can turn on with knobs are not yet available.

PR:		ports/46043
Submitted by:	maintainer

4 files changed, 27 insertions, 25 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 9d3c355188fd..5cc3d2476937 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -67,15 +67,15 @@
 #  WITH_MUTT_IFDEF_PATCH
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.5.1
-PORTREVISION?=	4
+PORTVERSION=	1.5.3
+#PORTREVISION?=	0
 CATEGORIES+=	mail
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
 .endif
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
 		ftp://ftp.parodius.com/pub/mutt/devel/ \
-		ftp://ftp.mutt.org/pub/mutt/devel/
+		ftp://ftp.mutt.org/mutt/devel/
 DISTNAME=	mutt-${PORTVERSION}i
 
 MAINTAINER=	udo.schweigert@siemens.com
@@ -178,9 +178,10 @@ USE_OPENSSL=	yes
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 .endif
 .if defined(WITH_MUTT_PGP_PATCH)
-SGML_NEEDED=	yes
-pre-configure::
-	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw
+.error The WITH_MUTT_PGP_PATCH option is currently not available
+#SGML_NEEDED=	yes
+#pre-configure::
+#	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw
 .endif
 .if defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
 pre-configure::
@@ -220,20 +221,24 @@ PATCHFILES+=	patch-${PATCH_VERSION}.vvv.initials.gz \
 SGML_NEEDED=	yes
 .endif
 .if defined(WITH_MUTT_EDIT_THREADS)
-PATCHFILES+=	patch-${PATCH_VERSION}.cd.edit_threads.9.2
+.error The WITH_MUTT_EDIT_THREADS option is currently not available
+#PATCHFILES+=	patch-${PATCH_VERSION}.cd.edit_threads.9.2
 CONFIGURE_ARGS+=	--enable-imap-edit-threads
 SGML_NEEDED=	yes
 .endif
 .if defined(WITH_MUTT_SIGNATURE_MENU)
-PATCHFILES+=	patch-${PATCH_VERSION}.cd.signatures_menu.2.1
+.error The WITH_MUTT_SIGNATURE_MENU option is currently not available
+#PATCHFILES+=	patch-${PATCH_VERSION}.cd.signatures_menu.2.1
 SGML_NEEDED=	yes
 .endif
 .if defined(WITH_MUTT_IFDEF_PATCH)
-PATCHFILES+=	patch-${PATCH_VERSION}.cd.ifdef.1
+.error The WITH_MUTT_IFDEF_PATCH option is currently not available
+#PATCHFILES+=	patch-${PATCH_VERSION}.cd.ifdef.1
 SGML_NEEDED=	yes
 .endif
 .if defined(WITH_MUTT_MBOX_HOOK_PATCH)
-PATCHFILES+=	patch-1.5.1.dw.mbox-hook.1
+.error The WITH_MUTT_MBOX_HOOK_PATCH option is currently not available
+#PATCHFILES+=	patch-${PATCH_VERSION}.dw.mbox-hook.1
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index ff756c7292ad..f9c064225e40 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,9 +1,5 @@
-MD5 (mutt/mutt-1.5.1i.tar.gz) = 5f281dcab555e9c206a5cd16a530e0da
-MD5 (mutt/patch-1.5.1.rr.compressed.gz) = 583f434aa7e440806d12f2143ecff3d8
-MD5 (mutt/patch-1.5.1.vvv.nntp.gz) = 5bce8bf3d320808cfa7b822ebcc5086d
-MD5 (mutt/patch-1.5.1.vvv.initials.gz) = 39cd4f8beff1664a3078d4a1a08c7b5e
-MD5 (mutt/patch-1.5.1.vvv.quote.gz) = 83aa6b5a9c1117d7f15df0c59037c318
-MD5 (mutt/patch-1.5.1.cd.edit_threads.9.2) = cbbae803c62b3304cac76a6185745f8f
-MD5 (mutt/patch-1.5.1.cd.signatures_menu.2.1) = 599637b340de9d57ce75545384ad51f3
-MD5 (mutt/patch-1.5.1.cd.ifdef.1) = 3ee107f5ce66f7fb6a5bab698c5b7f90
-MD5 (mutt/patch-1.5.1.dw.mbox-hook.1) = 2a04bc3bae302ed106c1f320398b902f
+MD5 (mutt/mutt-1.5.3i.tar.gz) = 38a3dec075c7954a5fe62ce178310d22
+MD5 (mutt/patch-1.5.3.rr.compressed.gz) = 029b7bf58f53f4c7dcd542beac0c4757
+MD5 (mutt/patch-1.5.3.vvv.nntp.gz) = 6399a40b4a7ce3448b0329ceec38f35b
+MD5 (mutt/patch-1.5.3.vvv.initials.gz) = 9397128c901c32b6de585ef089ead87f
+MD5 (mutt/patch-1.5.3.vvv.quote.gz) = dc24cc5765dfbbf98a9c2027d950c07a
diff --git a/mail/mutt-devel/files/patch-05 b/mail/mutt-devel/files/patch-05
index ded7b305c35a..c6ffc222301d 100644
--- a/mail/mutt-devel/files/patch-05
+++ b/mail/mutt-devel/files/patch-05
@@ -63,8 +63,8 @@
    {
    case -1: /* abort - don't resort */
      return -1;
---- compose.c.orig	Tue Mar 26 23:03:26 2002
-+++ compose.c	Thu May  2 09:21:11 2002
+--- compose.c.orig	Wed Dec 11 12:20:04 2002
++++ compose.c	Tue Dec 17 19:57:50 2002
 @@ -173,7 +173,7 @@
    char input_signas[SHORT_STRING];
  
@@ -78,14 +78,14 @@
      char *p;
  
    switch (mutt_multi_choice (_("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "),
--			     _("ewsabf")))
-+			     N_("ewsabf")))
+-			     _("eswabf")))
++			     N_("eswabf")))
    {
    case 1: /* (e)ncrypt */
      msg->security |= SMIMEENCRYPT;
 @@ -239,7 +239,7 @@
      msg->security |= SMIMEENCRYPT;
-     switch (mutt_multi_choice (_("1: DES, 2: Tripple-DES, 3: RC2-40,"
+     switch (mutt_multi_choice (_("1: DES, 2: Triple-DES, 3: RC2-40,"
  				 " 4: RC2-64, 5: RC2-128, or (f)orget it? "),
 -			       _("12345f"))) {
 +			       N_("12345f"))) {
diff --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist
index d7a43de036a2..aa7b085f10c6 100644
--- a/mail/mutt-devel/scripts/generate-plist
+++ b/mail/mutt-devel/scripts/generate-plist
@@ -63,6 +63,7 @@ cat >> $tmp_first <<EOF
 share/doc/mutt/ABOUT-NLS
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
+share/doc/mutt/ChangeLog.old
 share/doc/mutt/GPL
 share/doc/mutt/INSTALL
 share/doc/mutt/NEWS
@@ -121,7 +122,7 @@ echo "share/doc/mutt/manual.ps" >> $tmp_first
 fi
 
 if [ "$MUTT_HTML" = "yes" ]; then
-  html=361
+  html=363
   if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
     html=$(($html + 5))
   fi