Import neomutt-20160611 as mail/neomutt.

What is NeoMutt?

* NeoMutt is a project of projects.
* A place to gather all the patches against Mutt.
* A place for all the developers to gather.

Hopefully this will build the community and reduce duplicated effort.

5 files changed, 338 insertions, 0 deletions

diff --git a/mail/neomutt/DESCR b/mail/neomutt/DESCR
new file mode 100644
index 00000000000..922fc06f237
--- /dev/null
+++ b/mail/neomutt/DESCR
@@ -0,0 +1,7 @@
+What is NeoMutt?
+
+* NeoMutt is a project of projects.
+* A place to gather all the patches against Mutt.
+* A place for all the developers to gather.
+
+Hopefully this will build the community and reduce duplicated effort.
diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
new file mode 100644
index 00000000000..09feb92cad1
--- /dev/null
+++ b/mail/neomutt/Makefile
@@ -0,0 +1,47 @@
+# $NetBSD: Makefile,v 1.1 2016/07/11 22:05:02 wiz Exp $
+
+DISTNAME=		neomutt-20160611
+CATEGORIES=		mail
+MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
+GITHUB_TAG=		${DISTNAME}
+
+MAINTAINER=		wiz@NetBSD.org
+HOMEPAGE=		http://www.neomutt.org/
+COMMENT=		Fork of mutt with integrated community patches
+LICENSE=		gnu-gpl-v2 OR gnu-gpl-v3 # or newer
+
+USE_TOOLS+=		autoconf automake autoreconf
+
+SPECIAL_PERMS+=		bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-included-gettext
+CONFIGURE_ARGS+=	--enable-external-dotlock
+CONFIGURE_ARGS+=	--enable-imap
+CONFIGURE_ARGS+=	--enable-notmuch
+CONFIGURE_ARGS+=	--enable-pop
+
+EGDIR=			${PREFIX}/share/examples/mutt
+CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+CONF_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+INSTALLATION_DIRS+=     ${DOCDIR} ${EGDIR}
+INSTALL_MAKE_FLAGS=     ${MAKE_FLAGS} sysconfdir=${EGDIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
+# Force sendmail to /usr/sbin to avoid postfix's
+# ${LOCALBASE}/sbin/sendmail.  Should be enabled on all platforms which
+# support mailwrapper.
+CONFIGURE_ENV+=		SENDMAIL=/usr/sbin/sendmail
+.endif
+
+.include "options.mk"
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -fiv
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mail/notmuch/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/neomutt/PLIST b/mail/neomutt/PLIST
new file mode 100644
index 00000000000..309c9700f63
--- /dev/null
+++ b/mail/neomutt/PLIST
@@ -0,0 +1,112 @@
+@comment $NetBSD: PLIST,v 1.1 2016/07/11 22:05:02 wiz Exp $
+bin/flea
+bin/mutt
+bin/mutt_dotlock
+bin/muttbug
+bin/pgpewrap
+bin/pgpring
+bin/smime_keys
+man/man1/flea.1
+man/man1/mutt.1
+man/man1/mutt_dotlock.1
+man/man1/muttbug.1
+man/man1/pgpewrap.1
+man/man1/pgpring.1
+man/man1/smime_keys.1
+man/man5/mbox.5
+man/man5/mmdf.5
+man/man5/muttrc.5
+share/doc/mutt/COPYRIGHT
+share/doc/mutt/ChangeLog
+share/doc/mutt/GPL
+share/doc/mutt/INSTALL
+share/doc/mutt/NEWS
+share/doc/mutt/PGP-Notes.txt
+share/doc/mutt/README
+share/doc/mutt/README.SECURITY
+share/doc/mutt/README.SSL
+share/doc/mutt/TODO
+share/doc/mutt/advancedusage.html
+share/doc/mutt/applying-patches.txt
+share/doc/mutt/configuration.html
+share/doc/mutt/devel-notes.txt
+share/doc/mutt/gettingstarted.html
+share/doc/mutt/index.html
+share/doc/mutt/intro.html
+share/doc/mutt/manual.html
+share/doc/mutt/manual.txt
+share/doc/mutt/mimesupport.html
+share/doc/mutt/miscellany.html
+share/doc/mutt/optionalfeatures.html
+share/doc/mutt/patch-notes.txt
+share/doc/mutt/reference.html
+share/doc/mutt/samples/Mush.rc
+share/doc/mutt/samples/Pine.rc
+share/doc/mutt/samples/Tin.rc
+share/doc/mutt/samples/ca-bundle.crt
+share/doc/mutt/samples/colors.default
+share/doc/mutt/samples/colors.linux
+share/doc/mutt/samples/gpg.rc
+share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
+share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
+share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
+share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
+share/doc/mutt/samples/mutt_xtitle
+share/doc/mutt/samples/pgp2.rc
+share/doc/mutt/samples/pgp5.rc
+share/doc/mutt/samples/pgp6.rc
+share/doc/mutt/samples/sample.mailcap
+share/doc/mutt/samples/sample.muttrc
+share/doc/mutt/samples/sample.muttrc-tlr
+share/doc/mutt/samples/smime.rc
+share/doc/mutt/samples/smime_keys_test.pl
+share/doc/mutt/security.html
+share/doc/mutt/smime-notes.txt
+share/doc/mutt/tuning.html
+share/examples/mutt/Muttrc
+share/examples/mutt/Muttrc.dist
+share/examples/mutt/mime.types
+share/examples/mutt/mime.types.dist
+share/locale/bg/LC_MESSAGES/mutt.mo
+share/locale/ca/LC_MESSAGES/mutt.mo
+share/locale/cs/LC_MESSAGES/mutt.mo
+share/locale/da/LC_MESSAGES/mutt.mo
+share/locale/de/LC_MESSAGES/mutt.mo
+share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/eo/LC_MESSAGES/mutt.mo
+share/locale/es/LC_MESSAGES/mutt.mo
+share/locale/et/LC_MESSAGES/mutt.mo
+share/locale/eu/LC_MESSAGES/mutt.mo
+share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/ga/LC_MESSAGES/mutt.mo
+share/locale/gl/LC_MESSAGES/mutt.mo
+share/locale/hu/LC_MESSAGES/mutt.mo
+share/locale/id/LC_MESSAGES/mutt.mo
+share/locale/it/LC_MESSAGES/mutt.mo
+share/locale/ja/LC_MESSAGES/mutt.mo
+share/locale/ko/LC_MESSAGES/mutt.mo
+share/locale/lt/LC_MESSAGES/mutt.mo
+share/locale/nl/LC_MESSAGES/mutt.mo
+share/locale/pl/LC_MESSAGES/mutt.mo
+share/locale/pt_BR/LC_MESSAGES/mutt.mo
+share/locale/ru/LC_MESSAGES/mutt.mo
+share/locale/sk/LC_MESSAGES/mutt.mo
+share/locale/sv/LC_MESSAGES/mutt.mo
+share/locale/tr/LC_MESSAGES/mutt.mo
+share/locale/uk/LC_MESSAGES/mutt.mo
+share/locale/zh_CN/LC_MESSAGES/mutt.mo
+share/locale/zh_TW/LC_MESSAGES/mutt.mo
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
new file mode 100644
index 00000000000..0cad7621c35
--- /dev/null
+++ b/mail/neomutt/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2016/07/11 22:05:02 wiz Exp $
+
+SHA1 (neomutt-20160611.tar.gz) = e7b23dc8b7d5009ab1319ac4f1017847c95dcbce
+RMD160 (neomutt-20160611.tar.gz) = 1633a610f8772ad87661967e1c0f240b71c04dfe
+SHA512 (neomutt-20160611.tar.gz) = e91b8e3e0f186b1c312268893f1f6b882d2a8a5cfb9739d2ad3c5da1aa87ca56bd54d80ae28035770e478516aa64abf414a4e276eaf120a2e8d0cfe99ae2c7d2
+Size (neomutt-20160611.tar.gz) = 2498035 bytes
diff --git a/mail/neomutt/options.mk b/mail/neomutt/options.mk
new file mode 100644
index 00000000000..e8712089443
--- /dev/null
+++ b/mail/neomutt/options.mk
@@ -0,0 +1,166 @@
+# $NetBSD: options.mk,v 1.1 2016/07/11 22:05:02 wiz Exp $
+
+# Global and legacy options
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.neomutt
+PKG_OPTIONS_REQUIRED_GROUPS=	display
+PKG_OPTIONS_GROUP.display=	slang ncurses ncursesw curses
+PKG_SUPPORTED_OPTIONS=	debug gpgme idn ssl smime sasl
+PKG_SUPPORTED_OPTIONS+=	mutt-hcache tokyocabinet mutt-smtp
+PKG_SUPPORTED_OPTIONS+=	mutt-compressed-mbox
+PKG_SUPPORTED_OPTIONS+=	mutt-sidebar
+PKG_SUGGESTED_OPTIONS=	curses gpgme idn mutt-hcache mutt-smtp sasl smime ssl
+PKG_SUGGESTED_OPTIONS+=	mutt-compressed-mbox
+PKG_SUGGESTED_OPTIONS+=	mutt-hcache tokyocabinet mutt-smtp
+PKG_SUGGESTED_OPTIONS+=	mutt-compressed-mbox
+PKG_SUGGESTED_OPTIONS+=	mutt-sidebar
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Slang
+###
+.if !empty(PKG_OPTIONS:Mslang)
+.  include "../../devel/libslang/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang}
+.endif
+
+###
+### ncurses
+###
+.if !empty(PKG_OPTIONS:Mncurses)
+USE_NCURSES=		yes
+.  include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
+.endif
+
+###
+### SASLv2
+###
+.if !empty(PKG_OPTIONS:Msasl)
+.  include "../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
+.endif
+
+### curses
+###
+.if !empty(PKG_OPTIONS:Mcurses)
+.  include "../../mk/curses.buildlink3.mk"
+OPSYSVARS+=			BUILDLINK_PASSTHRU_DIRS
+BUILDLINK_PASSTHRU_DIRS.SunOS+=	/usr/xpg4
+CONFIGURE_ARGS.SunOS+=		--with-curses=/usr/xpg4
+LDFLAGS.SunOS+=			-L/usr/xpg4/lib${LIBABISUFFIX}
+LDFLAGS.SunOS+=			${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
+.endif
+
+###
+### ncursesw
+###
+.if !empty(PKG_OPTIONS:Mncursesw)
+.  include "../../devel/ncursesw/buildlink3.mk"
+.else
+SUBST_CLASSES+=		curse
+SUBST_MESSAGE.curse=	Fixing mutt to avoid ncursesw
+SUBST_STAGE.curse=	post-patch
+SUBST_FILES.curse=	configure.ac
+SUBST_SED.curse=	-e 's,for lib in ncurses ncursesw,for lib in ncurses,'
+.endif
+
+###
+### SSL
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
+.else
+CONFIGURE_ARGS+=	--without-ssl
+.endif
+
+###
+### S/MIME
+###
+PLIST_VARS+=		smime
+.if !empty(PKG_OPTIONS:Msmime)
+USE_TOOLS+=		perl:run
+REPLACE_PERL+=		*.pl */*.pl
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-smime
+PLIST.smime=		yes
+.else
+CONFIGURE_ARGS+=	--disable-smime
+.endif
+
+###
+### Header cache
+###
+.if !empty(PKG_OPTIONS:Mmutt-hcache)
+.  if !empty(PKG_OPTIONS:Mtokyocabinet)
+.  include "../../databases/tokyocabinet/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-hcache
+CONFIGURE_ARGS+=	--enable-tokyocabinet
+CONFIGURE_ARGS+=	--without-gdbm
+CONFIGURE_ARGS+=	--without-bdb
+.  else
+BDB_ACCEPTED=		db4 db5
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
+.  include "../../mk/bdb.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-hcache
+CONFIGURE_ARGS+=	--without-gdbm
+# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
+# since the real -I and -L flags are added by buildlink already.
+CONFIGURE_ENV+=		BDB_INCLUDE_DIR=${BDBBASE}/include
+CONFIGURE_ENV+=		BDB_LIB_DIR=${BDBBASE}/lib
+CONFIGURE_ENV+=		BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
+.  endif
+.else
+CONFIGURE_ARGS+=	--disable-hcache
+.endif
+
+###
+### Compressed mail boxes
+###
+PLIST_VARS+=		compressed_mbox
+.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
+CONFIGURE_ARGS+=	--enable-compressed
+# add xsltproc to be able to regenerate the documentation
+BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+.endif
+
+###
+### Internal SMTP relay support
+###
+.if !empty(PKG_OPTIONS:Mmutt-smtp)
+CONFIGURE_ARGS+=	--enable-smtp
+.else
+CONFIGURE_ARGS+=	--disable-smtp
+.endif
+
+###
+### Internationalized Domain Names
+###
+.if !empty(PKG_OPTIONS:Midn)
+.  include "../../devel/libidn/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-idn=${BUILDLINK_PREFIX.libidn}
+.else
+CONFIGURE_ARGS+=	--with-idn=no
+.endif
+
+###
+### Enable debugging support
+###
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug
+CFLAGS+= -g
+.endif
+
+###
+### gpgme support
+###
+.if !empty(PKG_OPTIONS:Mgpgme)
+.  include "../../security/gpgme/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-gpgme
+CONFIGURE_ARGS+=	--with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme}
+.else
+CONFIGURE_ARGS+=	--disable-gpgme
+.endif