mail/neomutt: update to 20211029

This release removes SLANG option (support has been removed upstream)

4 files changed, 16 insertions, 29 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index 3ea173b893cc..ecbd8ded0412 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	neomutt
-PORTVERSION=	20210205
+PORTVERSION=	20211029
 CATEGORIES=	mail
 
 MAINTAINER=	bapt@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support \
 		urlview:textproc/urlview
 
-USES=		cpe iconv:translit localbase perl5 shebangfix ssl
+USES=		cpe iconv:translit localbase ncurses perl5 shebangfix ssl
 
 USE_GITHUB=	yes
 USE_PERL5=	build
@@ -26,8 +26,7 @@ OPTIONS_DEFINE=	NLS DOCS SASL IDN FLOCK GPGME NOTMUCH
 OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES GSSAPI_BASE
 OPTIONS_MULTI=	HCACHE
 OPTIONS_MULTI_HCACHE=	BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET
-OPTIONS_SINGLE=	SCREEN GSSAPI
-OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
+OPTIONS_SINGLE=	GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
 FLOCK_DESC=	Use flock() to lock files
@@ -79,11 +78,6 @@ GPGME_CONFIGURE_ENABLE=	gpgme
 NOTMUCH_LIB_DEPENDS=	libnotmuch.so:mail/notmuch
 NOTMUCH_CONFIGURE_ENABLE=	notmuch
 
-SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE} --with-ui=slang
-SLANG_CONFIGURE_OFF=	--with-ui=ncurses
-SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
-SLANG_VARS=	PKGMESSAGE=${FILESDIR}/pkg-message.slang
-
 # GSSAPI
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--gss
@@ -92,8 +86,6 @@ GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${LOCALBASE}
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--with-gss=${LOCALBASE}
 
-NCURSES_USES=	ncurses
-
 DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
 			${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
 			lynx:www/lynx
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index a40a61392af5..5e059d98bdf1 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612670122
-SHA256 (neomutt-neomutt-20210205_GH0.tar.gz) = 77e177780fc2d8abb475d9cac4342c7e61d53c243f6ce2f9bc86d819fc962cdb
-SIZE (neomutt-neomutt-20210205_GH0.tar.gz) = 3476980
+TIMESTAMP = 1635844293
+SHA256 (neomutt-neomutt-20211029_GH0.tar.gz) = 08245cfa7aec80b895771fd1adcbb7b86e9c0434dfa64574e3c8c4d692aaa078
+SIZE (neomutt-neomutt-20211029_GH0.tar.gz) = 3702926
diff --git a/mail/neomutt/files/pkg-message.slang b/mail/neomutt/files/pkg-message.slang
deleted file mode 100644
index 1cba45db708e..000000000000
--- a/mail/neomutt/files/pkg-message.slang
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-You have installed mutt with SLANG support.
-This may work for a color terminal only when defining
-COLORTERM=yes and COLORFGBG=\"color1;color2\" in your
-environment.
-EOM
-}
-]
diff --git a/mail/neomutt/pkg-plist b/mail/neomutt/pkg-plist
index 2b19c4cc32af..7b918216c6fc 100644
--- a/mail/neomutt/pkg-plist
+++ b/mail/neomutt/pkg-plist
@@ -29,23 +29,25 @@ man/man5/neomuttrc.5.gz
 %%NLS%%share/locale/ja/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/nb_NO/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/neomutt.mo
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.md
 %%PORTDOCS%%%%DOCSDIR%%/CODE_OF_CONDUCT.md
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.md
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY.md
 %%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
 %%PORTDOCS%%%%DOCSDIR%%/colorschemes/neonwolf-256.neomuttrc
@@ -55,8 +57,8 @@ man/man5/neomuttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
 %%PORTDOCS%%%%DOCSDIR%%/hcache-bench/README.md
-%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomuttrc
 %%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomutt-hcache-bench.sh
+%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomuttrc
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/keybase/LICENSE
@@ -79,9 +81,11 @@ man/man5/neomuttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_spec.lua
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
 %%PORTDOCS%%%%DOCSDIR%%/mime.types
+%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
 %%PORTDOCS%%%%DOCSDIR%%/miscellany.html
+%%PORTDOCS%%%%DOCSDIR%%/oauth2/mutt_oauth2.py
+%%PORTDOCS%%%%DOCSDIR%%/oauth2/mutt_oauth2.py.README
 %%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
 %%PORTDOCS%%%%DOCSDIR%%/reference.html
 %%PORTDOCS%%%%DOCSDIR%%/samples/Mush.rc
@@ -91,12 +95,13 @@ man/man5/neomuttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/samples/colors.linux
 %%PORTDOCS%%%%DOCSDIR%%/samples/gpg.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/mairix_filter.pl
+%%PORTDOCS%%%%DOCSDIR%%/samples/markdown2html.py
 %%PORTDOCS%%%%DOCSDIR%%/samples/sample.mailcap
 %%PORTDOCS%%%%DOCSDIR%%/samples/sample.neomuttrc
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.neomuttrc-starter
 %%PORTDOCS%%%%DOCSDIR%%/samples/sample.neomuttrc-tlr
 %%PORTDOCS%%%%DOCSDIR%%/samples/smime.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/smime_keys_test.pl
-%%PORTDOCS%%%%DOCSDIR%%/samples/sample.neomuttrc-starter
 %%PORTDOCS%%%%DOCSDIR%%/security.html
 %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/tuning.html