mail/neomutt: update to 20230322

While here switch from libidn to libidn2 [1]

PR:	270617

3 files changed, 48 insertions, 72 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index 82b5e8b0cabd..0de7b3a2bee2 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	neomutt
-PORTVERSION=	20220429
+PORTVERSION=	20230322
 CATEGORIES=	mail
 
 MAINTAINER=	bapt@FreeBSD.org
@@ -45,6 +45,7 @@ CONFIGURE_ARGS=	--with-ssl="${OPENSSLBASE}" \
 		--locales-fix \
 		--fmemopen \
 		--pcre2 \
+		--disable-idn \
 		--mandir=${PREFIX}/man \
 		${ICONV_CONFIGURE_ARGS}
 CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
@@ -66,8 +67,8 @@ TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
-IDN_LIB_DEPENDS=	libidn.so:dns/libidn
-IDN_CONFIGURE_ENABLE=	idn
+IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
+IDN_CONFIGURE_ON=	idn2
 
 FLOCK_CONFIGURE_ON=	--with-lock=flock
 
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index 3d631df2d435..b9e4c9ce545a 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651252013
-SHA256 (neomutt-neomutt-20220429_GH0.tar.gz) = 45496542897ba8de6bc7cce3f5951d9033ed1c49e5d6f1353adaeefe795d9043
-SIZE (neomutt-neomutt-20220429_GH0.tar.gz) = 3774374
+TIMESTAMP = 1680538430
+SHA256 (neomutt-neomutt-20230322_GH0.tar.gz) = 47f024d4ae2d976f95b626c5fe6cad6ef22ed187426efbd7cf61435ba1790a48
+SIZE (neomutt-neomutt-20230322_GH0.tar.gz) = 3716391
diff --git a/mail/neomutt/pkg-plist b/mail/neomutt/pkg-plist
index 2568e22aff2f..879d504a5157 100644
--- a/mail/neomutt/pkg-plist
+++ b/mail/neomutt/pkg-plist
@@ -8,6 +8,28 @@ libexec/neomutt/smime_keys
 %%PORTDOCS%%man/man5/mmdf_neomutt.5.gz
 %%PORTDOCS%%man/man5/neomuttrc.5.gz
 @sample etc/neomuttrc.dist etc/neomuttrc
+%%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%%/SECURITY.md
+%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
+%%PORTDOCS%%%%DOCSDIR%%/configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
+%%PORTDOCS%%%%DOCSDIR%%/miscellany.html
+%%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
+%%PORTDOCS%%%%DOCSDIR%%/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/tuning.html
 %%NLS%%share/locale/bg/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/neomutt.mo
@@ -41,69 +63,22 @@ libexec/neomutt/smime_keys
 %%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%%/SECURITY.md
-%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
-%%PORTDOCS%%%%DOCSDIR%%/colorschemes/neonwolf-256.neomuttrc
-%%PORTDOCS%%%%DOCSDIR%%/colorschemes/solarized-dark-256.neomuttrc
-%%PORTDOCS%%%%DOCSDIR%%/colorschemes/vombatidae.neomuttrc
-%%PORTDOCS%%%%DOCSDIR%%/colorschemes/zenburn.neomuttrc
-%%PORTDOCS%%%%DOCSDIR%%/configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
-%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/README.md
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/keybase/README.md
-%%PORTDOCS%%%%DOCSDIR%%/keybase/attachmentView.png
-%%PORTDOCS%%%%DOCSDIR%%/keybase/decrypt.sh
-%%PORTDOCS%%%%DOCSDIR%%/keybase/install.sh
-%%PORTDOCS%%%%DOCSDIR%%/keybase/keybase.py
-%%PORTDOCS%%%%DOCSDIR%%/keybase/neomuttrc
-%%PORTDOCS%%%%DOCSDIR%%/keybase/pagerMode.png
-%%PORTDOCS%%%%DOCSDIR%%/keybase/pgpdecrypt.sh
-%%PORTDOCS%%%%DOCSDIR%%/keybase/pgpverify.sh
-%%PORTDOCS%%%%DOCSDIR%%/keybase/verify.sh
-%%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-128.png
-%%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-256.png
-%%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-32.png
-%%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-64.png
-%%PORTDOCS%%%%DOCSDIR%%/logo/neomutt.svg
-%%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_runner.neomuttrc
-%%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_spec.lua
-%%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual.txt
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/samples/Pine.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/Tin.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/colors.default
-%%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%%/security.html
-%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/tuning.html
-%%PORTDOCS%%%%DOCSDIR%%/vim-keys/README.md
-%%PORTDOCS%%%%DOCSDIR%%/vim-keys/vim-keys.rc
+%%DATADIR%%/account-command/README.md
+%%DATADIR%%/account-command/gpg-json/README.md
+%%DATADIR%%/account-command/gpg-json/credentials.sh
+%%DATADIR%%/account-command/macos-keychain/README.md
+%%DATADIR%%/account-command/macos-keychain/keychain.py
+%%DATADIR%%/colorschemes/neonwolf-256.neomuttrc
+%%DATADIR%%/colorschemes/solarized-dark-256.neomuttrc
+%%DATADIR%%/colorschemes/vombatidae.neomuttrc
+%%DATADIR%%/colorschemes/zenburn.neomuttrc
+%%DATADIR%%/logo/neomutt-128.png
+%%DATADIR%%/logo/neomutt-256.png
+%%DATADIR%%/logo/neomutt-32.png
+%%DATADIR%%/logo/neomutt-64.png
+%%DATADIR%%/logo/neomutt.svg
+%%DATADIR%%/mime.types
+%%DATADIR%%/oauth2/mutt_oauth2.py
+%%DATADIR%%/oauth2/mutt_oauth2.py.README
+%%DATADIR%%/vim-keys/README.md
+%%DATADIR%%/vim-keys/vim-keys.rc