Upgrade to 1.3.21 (from maintainer)

Add news to CATEGORIES if MUTT_WITH_NNTP defined

PR:		29952
Submitted by:	Udo Schweigert <ust@cert.siemens.de>

3 files changed, 15 insertions, 9 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index a0aa93561a98..aa53d2cc9571 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -7,9 +7,11 @@
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.3.20
-PORTREVISION=	2
+PORTVERSION=	1.3.21
 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/
 DISTNAME=	mutt-${PORTVERSION}i
@@ -38,6 +40,7 @@ PATCH_SITES+=	http://www.mutt.org.ua/download/mutt-${PATCH_VERSION}/ \
 		ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${PATCH_VERSION}/
 .endif
 
+PATCH_VERSION=	1.3.20
 .if !defined(PATCH_VERSION)
 PATCH_VERSION=	${PORTVERSION}
 .endif
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index a9f21bf434c4..4323329b5a17 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (mutt/mutt-1.3.20i.tar.gz) = 802bf75acd19566848e29dff0aef9940
+MD5 (mutt/mutt-1.3.21i.tar.gz) = ecb73e9db793df3246670d1dfeb352f2
 MD5 (mutt/patch-1.3.20.rr.compressed.gz) = e5fcd9e272262173045f4022995cf119
 MD5 (mutt/patch-1.3.20.vvv.nntp.gz) = 52e8576f272b0d9a65ef4b3bff4916ff
 MD5 (mutt/patch-1.3.20.vvv.initials.gz) = 04553b07741c82ca024d4cd194915dd2
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index d3ad99e665ee..cedd17383f0c 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -261,8 +261,8 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual255.html
 %%SUB_HTML%%share/doc/mutt/html/manual256.html
 %%SUB_HTML%%share/doc/mutt/html/manual257.html
-%%SUB_HTML%%share/doc/mutt/html/manual258.html             
-%%SUB_HTML%%share/doc/mutt/html/manual259.html             
+%%SUB_HTML%%share/doc/mutt/html/manual258.html
+%%SUB_HTML%%share/doc/mutt/html/manual259.html
 %%SUB_HTML%%share/doc/mutt/html/manual26.html
 %%SUB_HTML%%share/doc/mutt/html/manual260.html
 %%SUB_HTML%%share/doc/mutt/html/manual261.html
@@ -334,7 +334,6 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual322.html
 %%SUB_HTML%%share/doc/mutt/html/manual323.html
 %%SUB_HTML%%share/doc/mutt/html/manual324.html
-%%SUB_HTML%%share/doc/mutt/html/manual325.html
 %%SUB_HTML%%share/doc/mutt/html/manual31.html
 %%SUB_HTML%%share/doc/mutt/html/manual32.html
 %%SUB_HTML%%share/doc/mutt/html/manual33.html
@@ -411,20 +410,21 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual98.html
 %%SUB_HTML%%share/doc/mutt/html/manual99.html
 %%SUB_HTML%%share/doc/mutt/html/manual_toc.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual325.html
 %%SUB_ADD_A%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual325.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual327.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual329.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual330.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual325.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual327.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual330.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual325.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual327.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual328.html
@@ -446,6 +446,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_D%%share/doc/mutt/html/manual344.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual345.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual346.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual325.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual327.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual328.html
@@ -469,6 +470,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_E%%share/doc/mutt/html/manual346.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual347.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual348.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual325.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual327.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual328.html
@@ -495,6 +497,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_F%%share/doc/mutt/html/manual349.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual350.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual351.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual325.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual327.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual328.html