neomutt-git: build from git, sync with mail/neomutt.

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Mon Feb 27 16:16:01 2023 +0100
Changeset:	a6e93cfd959b1010c891e19ee93df9f8ac6fc170

Modified Files:
	neomutt-git/Makefile
	neomutt-git/PLIST
	neomutt-git/options.mk

Log Message:
neomutt-git: build from git, sync with mail/neomutt.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a6e93cfd959b1010c891e19ee93df9f8ac6fc170

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 neomutt-git/Makefile   | 15 +++++++++---
 neomutt-git/PLIST      | 63 +++++++++++++++-----------------------------------
 neomutt-git/options.mk | 31 +++++++++++--------------
 3 files changed, 44 insertions(+), 65 deletions(-)

diffs:
diff --git a/neomutt-git/Makefile b/neomutt-git/Makefile
index ae47a71096..b4755c802e 100644
--- a/neomutt-git/Makefile
+++ b/neomutt-git/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.67 2021/05/24 19:52:43 wiz Exp $
 
-DISTNAME=		neomutt-20201127
+DISTNAME=		neomutt-20230227
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
-GITHUB_TAG=		${PKGVERSION_NOREV}
+#GITHUB_TAG=		${PKGVERSION_NOREV}
 GIT_REPO=		https://github.com/neomutt/neomutt.git
 
 MAINTAINER=		wiz%NetBSD.org@localhost
@@ -17,7 +17,8 @@ BUILD_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 BUILD_DEPENDS+=		w3m-[0-9]*:../../www/w3m
 DEPENDS+=		mime-types-[0-9]*:../../misc/mime-types
 
-USE_TOOLS+=		msgfmt gmake perl:build
+USE_TOOLS+=		msgfmt gmake perl:build pkg-config
+CONFLICTS=		neomutt-[0-9]*
 
 HAS_CONFIGURE=		yes
 EXTRACT_USING=		bsdtar
@@ -40,10 +41,18 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} DOTLOCK_GROUP= sysconfdir=${EGDIR}
 CONFIGURE_ENV+=		SENDMAIL=/usr/sbin/sendmail
 .endif
 
+SUBST_CLASSES+=			interpreter
+SUBST_STAGE.interpreter=	pre-configure
+SUBST_MESSAGE.interpreter=	Substituting /usr/bin/env python3 interpreter lines
+SUBST_FILES.interpreter=	contrib/oauth2/mutt_oauth2.py
+SUBST_FILES.interpreter+=	data/account-command/macos-keychain/keychain.py
+SUBST_SED.interpreter+=		-e "s,\#! */usr/bin/env *python3,\#!${PYTHONBIN},"
+
 .include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/neomutt-git/PLIST b/neomutt-git/PLIST
index de44076781..f280f6d90e 100644
--- a/neomutt-git/PLIST
+++ b/neomutt-git/PLIST
@@ -17,63 +17,19 @@ share/doc/neomutt/LICENSE.md
 share/doc/neomutt/README.md
 share/doc/neomutt/SECURITY.md
 share/doc/neomutt/advancedusage.html
-share/doc/neomutt/colorschemes/neonwolf-256.neomuttrc
-share/doc/neomutt/colorschemes/solarized-dark-256.neomuttrc
-share/doc/neomutt/colorschemes/vombatidae.neomuttrc
-share/doc/neomutt/colorschemes/zenburn.neomuttrc
 share/doc/neomutt/configuration.html
 share/doc/neomutt/gettingstarted.html
-share/doc/neomutt/hcache-bench/README.md
-share/doc/neomutt/hcache-bench/neomutt-hcache-bench.sh
-share/doc/neomutt/hcache-bench/neomuttrc
 share/doc/neomutt/index.html
 share/doc/neomutt/intro.html
-share/doc/neomutt/keybase/LICENSE
-share/doc/neomutt/keybase/README.md
-share/doc/neomutt/keybase/attachmentView.png
-share/doc/neomutt/keybase/decrypt.sh
-share/doc/neomutt/keybase/install.sh
-share/doc/neomutt/keybase/keybase.py
-share/doc/neomutt/keybase/neomuttrc
-share/doc/neomutt/keybase/pagerMode.png
-share/doc/neomutt/keybase/pgpdecrypt.sh
-share/doc/neomutt/keybase/pgpverify.sh
-share/doc/neomutt/keybase/verify.sh
-share/doc/neomutt/logo/neomutt-128.png
-share/doc/neomutt/logo/neomutt-256.png
-share/doc/neomutt/logo/neomutt-32.png
-share/doc/neomutt/logo/neomutt-64.png
-share/doc/neomutt/logo/neomutt.svg
-share/doc/neomutt/lua/test_lua-api_runner.neomuttrc
-share/doc/neomutt/lua/test_lua-api_spec.lua
 share/doc/neomutt/manual.html
 share/doc/neomutt/manual.txt
-share/doc/neomutt/mime.types
 share/doc/neomutt/mimesupport.html
 share/doc/neomutt/miscellany.html
-share/doc/neomutt/oauth2/mutt_oauth2.py
-share/doc/neomutt/oauth2/mutt_oauth2.py.README
 share/doc/neomutt/optionalfeatures.html
 share/doc/neomutt/reference.html
-share/doc/neomutt/samples/Mush.rc
-share/doc/neomutt/samples/Pine.rc
-share/doc/neomutt/samples/Tin.rc
-share/doc/neomutt/samples/colors.default
-share/doc/neomutt/samples/colors.linux
-share/doc/neomutt/samples/gpg.rc
-share/doc/neomutt/samples/mairix_filter.pl
-share/doc/neomutt/samples/markdown2html.py
-share/doc/neomutt/samples/sample.mailcap
-share/doc/neomutt/samples/sample.neomuttrc
-share/doc/neomutt/samples/sample.neomuttrc-starter
-share/doc/neomutt/samples/sample.neomuttrc-tlr
-share/doc/neomutt/samples/smime.rc
-share/doc/neomutt/samples/smime_keys_test.pl
 share/doc/neomutt/security.html
 share/doc/neomutt/smime-notes.txt
 share/doc/neomutt/tuning.html
-share/doc/neomutt/vim-keys/README.md
-share/doc/neomutt/vim-keys/vim-keys.rc
 share/examples/neomutt/neomuttrc
 share/locale/bg/LC_MESSAGES/neomutt.mo
 share/locale/ca/LC_MESSAGES/neomutt.mo
@@ -108,3 +64,22 @@ share/locale/tr/LC_MESSAGES/neomutt.mo
 share/locale/uk/LC_MESSAGES/neomutt.mo
 share/locale/zh_CN/LC_MESSAGES/neomutt.mo
 share/locale/zh_TW/LC_MESSAGES/neomutt.mo
+share/neomutt/account-command/README.md
+share/neomutt/account-command/gpg-json/README.md
+share/neomutt/account-command/gpg-json/credentials.sh
+share/neomutt/account-command/macos-keychain/README.md
+share/neomutt/account-command/macos-keychain/keychain.py
+share/neomutt/colorschemes/neonwolf-256.neomuttrc
+share/neomutt/colorschemes/solarized-dark-256.neomuttrc
+share/neomutt/colorschemes/vombatidae.neomuttrc
+share/neomutt/colorschemes/zenburn.neomuttrc
+share/neomutt/logo/neomutt-128.png
+share/neomutt/logo/neomutt-256.png
+share/neomutt/logo/neomutt-32.png
+share/neomutt/logo/neomutt-64.png
+share/neomutt/logo/neomutt.svg
+share/neomutt/mime.types
+share/neomutt/oauth2/mutt_oauth2.py
+share/neomutt/oauth2/mutt_oauth2.py.README
+share/neomutt/vim-keys/README.md
+share/neomutt/vim-keys/vim-keys.rc
diff --git a/neomutt-git/options.mk b/neomutt-git/options.mk
index cf93c34fc2..2f5a6ed541 100644
--- a/neomutt-git/options.mk
+++ b/neomutt-git/options.mk
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.16 2020/06/22 06:08:35 wiz Exp $
+# $NetBSD: options.mk,v 1.18 2022/09/20 17:13:24 nikita Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.neomutt
 PKG_OPTIONS_REQUIRED_GROUPS=	display
-PKG_OPTIONS_GROUP.display=	curses ncurses ncursesw slang
-PKG_SUPPORTED_OPTIONS=		debug gpgme gssapi idn ssl smime sasl
-PKG_SUPPORTED_OPTIONS+=		tokyocabinet notmuch lua
+PKG_OPTIONS_GROUP.display=	curses ncurses ncursesw
+PKG_SUPPORTED_OPTIONS=		tokyocabinet lmdb
+PKG_SUPPORTED_OPTIONS+=		debug gpgme gssapi idn ssl smime sasl
+PKG_SUPPORTED_OPTIONS+=		notmuch lua
 PKG_SUGGESTED_OPTIONS=		gpgme gssapi idn ncursesw sasl smime ssl
 PKG_SUGGESTED_OPTIONS+=		tokyocabinet notmuch
 
@@ -19,14 +20,6 @@ CONFIGURE_ENV+=		ac_cv_path_KRB5CFGPATH=${KRB5_CONFIG}
 CONFIGURE_ARGS+=	--with-gss=${KRB5BASE}
 .endif
 
-###
-### Slang
-###
-.if !empty(PKG_OPTIONS:Mslang)
-.  include "../../devel/libslang/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang}
-.endif
-
 ###
 ### ncurses
 ###
@@ -84,7 +77,7 @@ CONFIGURE_ARGS+=	--disable-ssl
 PLIST_VARS+=		smime
 .if !empty(PKG_OPTIONS:Msmime)
 USE_TOOLS+=		perl:run
-REPLACE_PERL+=		contrib/samples/*.pl contrib/smime_keys
+REPLACE_PERL+=		*/*.pl contrib/smime_keys
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--smime
 PLIST.smime=		yes
@@ -95,7 +88,12 @@ CONFIGURE_ARGS+=	--disable-smime
 ###
 ### Header cache
 ###
-.if !empty(PKG_OPTIONS:Mtokyocabinet)
+.if !empty(PKG_OPTIONS:Mlmdb)
+.include "../../databases/lmdb/buildlink3.mk"
+CONFIGURE_ARGS+=	--lmdb
+CONFIGURE_ARGS+=	--disable-gdbm
+CONFIGURE_ARGS+=	--disable-bdb
+.elif !empty(PKG_OPTIONS:Mtokyocabinet)
 .include "../../databases/tokyocabinet/buildlink3.mk"
 CONFIGURE_ARGS+=	--tokyocabinet
 CONFIGURE_ARGS+=	--disable-gdbm
@@ -134,11 +132,8 @@ CFLAGS+=	-g
 ### gpgme support
 ###
 .if !empty(PKG_OPTIONS:Mgpgme)
-.  include "../../security/gpgme/buildlink3.mk"
 CONFIGURE_ARGS+=	--gpgme
-CONFIGURE_ARGS+=	--with-gpgme=${BUILDLINK_PREFIX.gpgme}
-.else
-CONFIGURE_ARGS+=	--disable-gpgme
+.include "../../security/gpgme/buildlink3.mk"
 .endif
 
 ###