CVS commit: pkgsrc/mail/neomutt

["ng0" <ng0%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ng0
Date:           Mon Nov 11 14:32:43 UTC 2019

Modified Files:
        pkgsrc/mail/neomutt: Makefile options.mk

Log Message:
neomutt: Provide notmuch pkg option.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/mail/neomutt/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/neomutt/options.mk

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

Modified files:

Index: pkgsrc/mail/neomutt/Makefile
diff -u pkgsrc/mail/neomutt/Makefile:1.48 pkgsrc/mail/neomutt/Makefile:1.49
--- pkgsrc/mail/neomutt/Makefile:1.48   Wed Nov  6 12:28:47 2019
+++ pkgsrc/mail/neomutt/Makefile        Mon Nov 11 14:32:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/11/06 12:28:47 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2019/11/11 14:32:42 ng0 Exp $
 
 DISTNAME=              neomutt-20191102
 CATEGORIES=            mail
@@ -18,7 +18,6 @@ BUILD_DEPENDS+=               docbook-xsl-[0-9]*:../.
 
 HAS_CONFIGURE=         yes
 EXTRACT_USING=         bsdtar
-CONFIGURE_ARGS+=       --notmuch
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 
@@ -41,5 +40,4 @@ CONFIGURE_ENV+=               SENDMAIL=/usr/sbin/send
 .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"

Index: pkgsrc/mail/neomutt/options.mk
diff -u pkgsrc/mail/neomutt/options.mk:1.13 pkgsrc/mail/neomutt/options.mk:1.14
--- pkgsrc/mail/neomutt/options.mk:1.13 Sat Nov  2 16:25:23 2019
+++ pkgsrc/mail/neomutt/options.mk      Mon Nov 11 14:32:43 2019
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.13 2019/11/02 16:25:23 rillig Exp $
+# $NetBSD: options.mk,v 1.14 2019/11/11 14:32:43 ng0 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
+PKG_SUPPORTED_OPTIONS+=                tokyocabinet notmuch
 PKG_SUGGESTED_OPTIONS=         gpgme gssapi idn ncursesw sasl smime ssl
-PKG_SUGGESTED_OPTIONS+=                tokyocabinet
+PKG_SUGGESTED_OPTIONS+=                tokyocabinet notmuch
 
 .include "../../mk/bsd.options.mk"
 
@@ -140,3 +140,13 @@ CONFIGURE_ARGS+=   --with-gpgme=${BUILDLIN
 .else
 CONFIGURE_ARGS+=       --disable-gpgme
 .endif
+
+###
+### notmuch support
+###
+.if !empty(PKG_OPTIONS:Mnotmuch)
+.include "../../mail/notmuch/buildlink3.mk"
+CONFIGURE_ARGS+=       --notmuch
+.else
+CONFIGURE_ARGS+=       --disable-notmuch
+.endif