3 files changed, 28 insertions, 26 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 8d78bba6aa76..049d2b228188 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.3.23.2
+PORTVERSION=	1.3.24
 CATEGORIES+=	mail
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -15,7 +15,10 @@ CATEGORIES+=	news
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
 		ftp://ftp.parodius.com/pub/mutt/ \
 		ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
-		ftp://ftp.parodius.com/pub/mutt/devel/
+		ftp://ftp.parodius.com/pub/mutt/devel/ \
+		ftp://ftp.mutt.org/pub/mutt/ \
+		ftp://ftp.mutt.org/pub/mutt/devel/ 
+
 DISTNAME=	mutt-${PORTVERSION}i
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -31,7 +34,7 @@ CONFIGURE_ARGS=	--enable-flock --disable-fcntl \
 .include <bsd.port.pre.mk>
 
 USE_AUTOMAKE=	yes
-USE_GMAKE=	yes
+AUTOMAKE_ARGS= -i
 
 .if defined(WITH_MUTT_COMPRESSED_FOLDERS) || defined(WITH_MUTT_NNTP) || \
 		defined(WITH_MUTT_RU_PATCH) || defined(WITH_MUTT_QUOTE_PATCH)
@@ -143,8 +146,6 @@ MAN5=		muttrc.5 mbox.5
 post-patch::
 	 @${PERL} -pi.fbsd -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
-	 @${CP} ${PATCHDIR}/extra-patchlist.sh ${WRKSRC}/patchlist.sh
-	 @${CHMOD} 700 ${WRKSRC}/patchlist.sh
 
 pre-configure::
 	@(cd ${WRKSRC}; ${ACLOCAL} -I m4)
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 1f537c8b7ff0..2151007706e5 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (mutt/mutt-1.3.23.2i.tar.gz) = 8c78e7caab878890fdbc2500c2b5e4be
-MD5 (mutt/patch-1.3.23.2.rr.compressed.gz) = ab200bddffedf3bfcbdc34abb706d93d
-MD5 (mutt/patch-1.3.23.2.vvv.nntp.gz) = 8ea008de78e4a54ce430cb3acd806c62
-MD5 (mutt/patch-1.3.23.2.vvv.initials.gz) = edd65a44f71302e296bdfe3cc38f4319
-MD5 (mutt/patch-1.3.23.2.vvv.quote.gz) = e0046191258bee10f85b37c3909960ce
-MD5 (mutt/patch-1.3.23.2.vvv.ru.gz) = 7e2e5b8a01320804cb03eecf5901c654
+MD5 (mutt/mutt-1.3.24i.tar.gz) = 19628b9836d204abc23226257e260342
+MD5 (mutt/patch-1.3.24.rr.compressed.gz) = 1693be8a98ca72846cd072830ea6e1cc
+MD5 (mutt/patch-1.3.24.vvv.nntp.gz) = daefef62e90eb52bf3c8450725149c68
+MD5 (mutt/patch-1.3.24.vvv.initials.gz) = 3b31cace25ce4f3410bc07a8f5859815
+MD5 (mutt/patch-1.3.24.vvv.quote.gz) = 49e66afbbfaeb0dbe6f1a8378cda0f08
+MD5 (mutt/patch-1.3.24.vvv.ru.gz) = 71d358000c2ba047c1d91cfb7c10695c
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index 465f0f9e489a..2dbdf8bd1152 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -346,6 +346,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual330.html
 %%SUB_HTML%%share/doc/mutt/html/manual331.html
 %%SUB_HTML%%share/doc/mutt/html/manual332.html
+%%SUB_HTML%%share/doc/mutt/html/manual333.html
 %%SUB_HTML%%share/doc/mutt/html/manual34.html
 %%SUB_HTML%%share/doc/mutt/html/manual35.html
 %%SUB_HTML%%share/doc/mutt/html/manual36.html
@@ -418,16 +419,15 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual97.html
 %%SUB_HTML%%share/doc/mutt/html/manual98.html
 %%SUB_HTML%%share/doc/mutt/html/manual99.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual333.html
 %%SUB_ADD_A%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_A%%share/doc/mutt/html/manual335.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual336.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual336.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual337.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual338.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual339.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual336.html
@@ -435,7 +435,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_C%%share/doc/mutt/html/manual338.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual339.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual341.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual336.html
@@ -457,7 +457,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_D%%share/doc/mutt/html/manual352.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual353.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual354.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual355.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual336.html
@@ -481,7 +481,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_E%%share/doc/mutt/html/manual354.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual355.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual356.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual357.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual336.html
@@ -508,7 +508,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_F%%share/doc/mutt/html/manual357.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual358.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual359.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual360.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual336.html
@@ -537,21 +537,21 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_G%%share/doc/mutt/html/manual359.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual360.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual361.html
-%%SUB_ADD_H%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual362.html
 %%SUB_ADD_H%%share/doc/mutt/html/manual334.html
-%%SUB_ADD_I%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_H%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_I%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_I%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_I%%share/doc/mutt/html/manual336.html
 %%SUB_ADD_I%%share/doc/mutt/html/manual337.html
-%%SUB_ADD_J%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_I%%share/doc/mutt/html/manual338.html
 %%SUB_ADD_J%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_J%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_J%%share/doc/mutt/html/manual336.html
 %%SUB_ADD_J%%share/doc/mutt/html/manual337.html
 %%SUB_ADD_J%%share/doc/mutt/html/manual338.html
 %%SUB_ADD_J%%share/doc/mutt/html/manual339.html
-%%SUB_ADD_K%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_J%%share/doc/mutt/html/manual340.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual336.html
@@ -573,7 +573,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_K%%share/doc/mutt/html/manual352.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual353.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual354.html
-%%SUB_ADD_L%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual355.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual336.html
@@ -597,7 +597,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_L%%share/doc/mutt/html/manual354.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual355.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual356.html
-%%SUB_ADD_M%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual357.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual336.html
@@ -624,7 +624,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_M%%share/doc/mutt/html/manual357.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual358.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual359.html
-%%SUB_ADD_N%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual360.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual336.html
@@ -653,6 +653,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_N%%share/doc/mutt/html/manual359.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual360.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual361.html
-%%SUB_ADD_O%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual362.html
+%%SUB_ADD_O%%share/doc/mutt/html/manual334.html
 %%SUB_HTML%%@dirrm share/doc/mutt/html
 %%PORTDOCS%%@dirrm share/doc/mutt