Disable emacs detection by default.

Add notmuch emacs option that pulls in emacs and installs compiled lisp
files as well.

Based on a similar patch by J. Lewis Muir on pkgsrc-users.

Bump PKGREVISION.

3 files changed, 72 insertions, 35 deletions

diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index fb2484b25f3..fb81fde6dcb 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2014/07/03 15:01:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2014/08/17 10:45:05 wiz Exp $
 
 DISTNAME=	notmuch-0.18.1
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
@@ -16,6 +17,8 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config
 MAKE_FLAGS+=	PYTHONBIN=${PYTHONBIN}
 
+.include "options.mk"
+
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 
diff --git a/mail/notmuch/PLIST b/mail/notmuch/PLIST
index e9171591c31..304afd596d8 100644
--- a/mail/notmuch/PLIST
+++ b/mail/notmuch/PLIST
@@ -1,40 +1,57 @@
-@comment $NetBSD: PLIST,v 1.2 2014/07/03 15:01:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/08/17 10:45:05 wiz Exp $
 bin/notmuch
 include/notmuch.h
 lib/libnotmuch.so
 lib/libnotmuch.so.3
 lib/libnotmuch.so.3.1.0
-man/man1/notmuch-compact.1.gz
-man/man1/notmuch-config.1.gz
-man/man1/notmuch-count.1.gz
-man/man1/notmuch-dump.1.gz
-man/man1/notmuch-insert.1.gz
-man/man1/notmuch-new.1.gz
-man/man1/notmuch-reply.1.gz
-man/man1/notmuch-restore.1.gz
-man/man1/notmuch-search.1.gz
-man/man1/notmuch-setup.1.gz
-man/man1/notmuch-show.1.gz
-man/man1/notmuch-tag.1.gz
-man/man1/notmuch.1.gz
-man/man5/notmuch-hooks.5.gz
-man/man7/notmuch-search-terms.7.gz
-share/emacs/site-lisp/coolj.el
-share/emacs/site-lisp/notmuch-address.el
-share/emacs/site-lisp/notmuch-crypto.el
-share/emacs/site-lisp/notmuch-hello.el
-share/emacs/site-lisp/notmuch-lib.el
-share/emacs/site-lisp/notmuch-logo.png
-share/emacs/site-lisp/notmuch-maildir-fcc.el
-share/emacs/site-lisp/notmuch-message.el
-share/emacs/site-lisp/notmuch-mua.el
-share/emacs/site-lisp/notmuch-parser.el
-share/emacs/site-lisp/notmuch-print.el
-share/emacs/site-lisp/notmuch-query.el
-share/emacs/site-lisp/notmuch-show.el
-share/emacs/site-lisp/notmuch-tag.el
-share/emacs/site-lisp/notmuch-tree.el
-share/emacs/site-lisp/notmuch-version.el
-share/emacs/site-lisp/notmuch-wash.el
-share/emacs/site-lisp/notmuch.el
+man/man1/notmuch-compact.1
+man/man1/notmuch-config.1
+man/man1/notmuch-count.1
+man/man1/notmuch-dump.1
+man/man1/notmuch-insert.1
+man/man1/notmuch-new.1
+man/man1/notmuch-reply.1
+man/man1/notmuch-restore.1
+man/man1/notmuch-search.1
+man/man1/notmuch-setup.1
+man/man1/notmuch-show.1
+man/man1/notmuch-tag.1
+man/man1/notmuch.1
+man/man5/notmuch-hooks.5
+man/man7/notmuch-search-terms.7
+${PLIST.emacs}share/emacs/site-lisp/coolj.el
+${PLIST.emacs}share/emacs/site-lisp/coolj.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-address.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-address.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-lib.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-lib.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-logo.png
+${PLIST.emacs}share/emacs/site-lisp/notmuch-maildir-fcc.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-maildir-fcc.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-message.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-message.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-mua.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-mua.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-parser.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-parser.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-print.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-print.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-query.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-query.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-show.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-show.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-tag.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-tag.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-tree.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-tree.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-version.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-version.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-wash.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-wash.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch.elc
 share/examples/notmuch/zsh/functions/Completion/Unix/_notmuch
diff --git a/mail/notmuch/options.mk b/mail/notmuch/options.mk
new file mode 100644
index 00000000000..d4b1ef6d873
--- /dev/null
+++ b/mail/notmuch/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2014/08/17 10:45:05 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.notmuch
+PKG_SUPPORTED_OPTIONS=	notmuch-emacs
+
+.include "../../mk/bsd.options.mk"
+
+###
+### emacs support
+###
+PLIST_VARS+=		emacs
+.if !empty(PKG_OPTIONS:Mnotmuch-emacs)
+BUILD_DEPENDS+=		emacs>=24.0:../../editors/emacs
+PLIST.emacs=		yes
+.else
+CONFIGURE_ARGS+=	--without-emacs
+.endif