Update to version 1.3.23.2.

PR:		31876
Submitted by:	maintainer

4 files changed, 59 insertions, 36 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 780aac7e9621..eb5080170519 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.3.23.1
+PORTVERSION=	1.3.23.2
 CATEGORIES+=	mail
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -132,6 +132,8 @@ 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 558c5aa3fe06..1f537c8b7ff0 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (mutt/mutt-1.3.23.1i.tar.gz) = a7b47db9f847db6b6fd5f8dfd0ed9fa2
-MD5 (mutt/patch-1.3.23.1.rr.compressed.gz) = 69dc2ede44bc78901e4aff20ba0ed880
-MD5 (mutt/patch-1.3.23.1.vvv.nntp.gz) = d209d54678432252d0b5a140f7e67461
-MD5 (mutt/patch-1.3.23.1.vvv.initials.gz) = 9cfd85feda954a8a5e6ac3b74ebb4319
-MD5 (mutt/patch-1.3.23.1.vvv.quote.gz) = a6bf22e788b9be14494a646d47fdfe7b
-MD5 (mutt/patch-1.3.23.1.vvv.ru.gz) = c53d02b3fa0b170ec3a2b6617bbbfe46
+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
diff --git a/mail/mutt-devel/files/extra-patchlist.sh b/mail/mutt-devel/files/extra-patchlist.sh
new file mode 100644
index 000000000000..9cefc141b6b4
--- /dev/null
+++ b/mail/mutt-devel/files/extra-patchlist.sh
@@ -0,0 +1,18 @@
+#!/bin/sh --
+
+cat <<EOF
+/* this is an autogenerated file.  do not edit. */
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "mutt.h"
+
+void mutt_print_patchlist (void)
+{
+EOF
+
+while read patch ; do
+	echo "  puts (\"${patch}\");"
+done
+
+echo "}"
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index 035e09eec54e..465f0f9e489a 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -45,6 +45,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%PORTDOCS%%share/doc/mutt/README.SECURITY
 %%PORTDOCS%%share/doc/mutt/README.SSL
 %%PORTDOCS%%share/doc/mutt/manual.txt
+%%PORTDOCS%%share/doc/mutt/patch-notes.txt
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
@@ -343,6 +344,8 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual329.html
 %%SUB_HTML%%share/doc/mutt/html/manual33.html
 %%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/manual34.html
 %%SUB_HTML%%share/doc/mutt/html/manual35.html
 %%SUB_HTML%%share/doc/mutt/html/manual36.html
@@ -415,25 +418,23 @@ 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/manual331.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual332.html
 %%SUB_ADD_A%%share/doc/mutt/html/manual333.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual332.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_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_C%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual332.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_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
 %%SUB_ADD_C%%share/doc/mutt/html/manual337.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual338.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual332.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_D%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual335.html
@@ -454,8 +455,8 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_D%%share/doc/mutt/html/manual350.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual351.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual352.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual332.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_E%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual335.html
@@ -478,8 +479,8 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_E%%share/doc/mutt/html/manual352.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual353.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual354.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual332.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_F%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual335.html
@@ -505,8 +506,8 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_F%%share/doc/mutt/html/manual355.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual356.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual357.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual332.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_G%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual335.html
@@ -534,22 +535,22 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_G%%share/doc/mutt/html/manual357.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual358.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual359.html
-%%SUB_ADD_H%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_H%%share/doc/mutt/html/manual332.html
-%%SUB_ADD_I%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_I%%share/doc/mutt/html/manual332.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_H%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_I%%share/doc/mutt/html/manual333.html
 %%SUB_ADD_I%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_I%%share/doc/mutt/html/manual335.html
-%%SUB_ADD_J%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_J%%share/doc/mutt/html/manual332.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_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_K%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_K%%share/doc/mutt/html/manual332.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_K%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual335.html
@@ -570,8 +571,8 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_K%%share/doc/mutt/html/manual350.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual351.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual352.html
-%%SUB_ADD_L%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_L%%share/doc/mutt/html/manual332.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_L%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual335.html
@@ -594,8 +595,8 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_L%%share/doc/mutt/html/manual352.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual353.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual354.html
-%%SUB_ADD_M%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_M%%share/doc/mutt/html/manual332.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_M%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual335.html
@@ -621,8 +622,8 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_M%%share/doc/mutt/html/manual355.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual356.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual357.html
-%%SUB_ADD_N%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_N%%share/doc/mutt/html/manual332.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_N%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual335.html
@@ -650,6 +651,8 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_N%%share/doc/mutt/html/manual357.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual358.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual359.html
-%%SUB_ADD_O%%share/doc/mutt/html/manual331.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_HTML%%@dirrm share/doc/mutt/html
 %%PORTDOCS%%@dirrm share/doc/mutt