Sun Aug 17 10:45:05 2014 UTC ()
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.


(wiz)
diff -r1.2 -r1.3 pkgsrc/mail/notmuch/Makefile
diff -r1.2 -r1.3 pkgsrc/mail/notmuch/PLIST
diff -r0 -r1.1 pkgsrc/mail/notmuch/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/mail/notmuch/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/Makefile 2014/07/03 15:01:46 1.2
+++ pkgsrc/mail/notmuch/Makefile 2014/08/17 10:45:05 1.3
@@ -1,29 +1,32 @@ @@ -1,29 +1,32 @@
1# $NetBSD: Makefile,v 1.2 2014/07/03 15:01:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2014/08/17 10:45:05 wiz Exp $
2 2
3DISTNAME= notmuch-0.18.1 3DISTNAME= notmuch-0.18.1
 4PKGREVISION= 1
4CATEGORIES= mail 5CATEGORIES= mail
5MASTER_SITES= http://notmuchmail.org/releases/ 6MASTER_SITES= http://notmuchmail.org/releases/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://notmuchmail.org/ 9HOMEPAGE= http://notmuchmail.org/
9COMMENT= Mail indexer 10COMMENT= Mail indexer
10LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
11 12
12BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils 13BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
13 14
14HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
17MAKE_FLAGS+= PYTHONBIN=${PYTHONBIN} 18MAKE_FLAGS+= PYTHONBIN=${PYTHONBIN}
18 19
 20.include "options.mk"
 21
19CONFIGURE_ARGS+= --prefix=${PREFIX} 22CONFIGURE_ARGS+= --prefix=${PREFIX}
20CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 23CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
21 24
22PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # as of 0.18 25PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # as of 0.18
23.include "../../lang/python/application.mk" 26.include "../../lang/python/application.mk"
24.include "../../mail/gmime24/buildlink3.mk" 27.include "../../mail/gmime24/buildlink3.mk"
25.include "../../textproc/xapian/buildlink3.mk" 28.include "../../textproc/xapian/buildlink3.mk"
26.include "../../devel/talloc/buildlink3.mk" 29.include "../../devel/talloc/buildlink3.mk"
27BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.5.2 30BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.5.2
28.include "../../devel/zlib/buildlink3.mk" 31.include "../../devel/zlib/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/mail/notmuch/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/PLIST 2014/07/03 15:01:46 1.2
+++ pkgsrc/mail/notmuch/PLIST 2014/08/17 10:45:05 1.3
@@ -1,40 +1,57 @@ @@ -1,40 +1,57 @@
1@comment $NetBSD: PLIST,v 1.2 2014/07/03 15:01:46 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2014/08/17 10:45:05 wiz Exp $
2bin/notmuch 2bin/notmuch
3include/notmuch.h 3include/notmuch.h
4lib/libnotmuch.so 4lib/libnotmuch.so
5lib/libnotmuch.so.3 5lib/libnotmuch.so.3
6lib/libnotmuch.so.3.1.0 6lib/libnotmuch.so.3.1.0
7man/man1/notmuch-compact.1.gz 7man/man1/notmuch-compact.1
8man/man1/notmuch-config.1.gz 8man/man1/notmuch-config.1
9man/man1/notmuch-count.1.gz 9man/man1/notmuch-count.1
10man/man1/notmuch-dump.1.gz 10man/man1/notmuch-dump.1
11man/man1/notmuch-insert.1.gz 11man/man1/notmuch-insert.1
12man/man1/notmuch-new.1.gz 12man/man1/notmuch-new.1
13man/man1/notmuch-reply.1.gz 13man/man1/notmuch-reply.1
14man/man1/notmuch-restore.1.gz 14man/man1/notmuch-restore.1
15man/man1/notmuch-search.1.gz 15man/man1/notmuch-search.1
16man/man1/notmuch-setup.1.gz 16man/man1/notmuch-setup.1
17man/man1/notmuch-show.1.gz 17man/man1/notmuch-show.1
18man/man1/notmuch-tag.1.gz 18man/man1/notmuch-tag.1
19man/man1/notmuch.1.gz 19man/man1/notmuch.1
20man/man5/notmuch-hooks.5.gz 20man/man5/notmuch-hooks.5
21man/man7/notmuch-search-terms.7.gz 21man/man7/notmuch-search-terms.7
22share/emacs/site-lisp/coolj.el 22${PLIST.emacs}share/emacs/site-lisp/coolj.el
23share/emacs/site-lisp/notmuch-address.el 23${PLIST.emacs}share/emacs/site-lisp/coolj.elc
24share/emacs/site-lisp/notmuch-crypto.el 24${PLIST.emacs}share/emacs/site-lisp/notmuch-address.el
25share/emacs/site-lisp/notmuch-hello.el 25${PLIST.emacs}share/emacs/site-lisp/notmuch-address.elc
26share/emacs/site-lisp/notmuch-lib.el 26${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.el
27share/emacs/site-lisp/notmuch-logo.png 27${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.elc
28share/emacs/site-lisp/notmuch-maildir-fcc.el 28${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.el
29share/emacs/site-lisp/notmuch-message.el 29${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.elc
30share/emacs/site-lisp/notmuch-mua.el 30${PLIST.emacs}share/emacs/site-lisp/notmuch-lib.el
31share/emacs/site-lisp/notmuch-parser.el 31${PLIST.emacs}share/emacs/site-lisp/notmuch-lib.elc
32share/emacs/site-lisp/notmuch-print.el 32${PLIST.emacs}share/emacs/site-lisp/notmuch-logo.png
33share/emacs/site-lisp/notmuch-query.el 33${PLIST.emacs}share/emacs/site-lisp/notmuch-maildir-fcc.el
34share/emacs/site-lisp/notmuch-show.el 34${PLIST.emacs}share/emacs/site-lisp/notmuch-maildir-fcc.elc
35share/emacs/site-lisp/notmuch-tag.el 35${PLIST.emacs}share/emacs/site-lisp/notmuch-message.el
36share/emacs/site-lisp/notmuch-tree.el 36${PLIST.emacs}share/emacs/site-lisp/notmuch-message.elc
37share/emacs/site-lisp/notmuch-version.el 37${PLIST.emacs}share/emacs/site-lisp/notmuch-mua.el
38share/emacs/site-lisp/notmuch-wash.el 38${PLIST.emacs}share/emacs/site-lisp/notmuch-mua.elc
39share/emacs/site-lisp/notmuch.el 39${PLIST.emacs}share/emacs/site-lisp/notmuch-parser.el
 40${PLIST.emacs}share/emacs/site-lisp/notmuch-parser.elc
 41${PLIST.emacs}share/emacs/site-lisp/notmuch-print.el
 42${PLIST.emacs}share/emacs/site-lisp/notmuch-print.elc
 43${PLIST.emacs}share/emacs/site-lisp/notmuch-query.el
 44${PLIST.emacs}share/emacs/site-lisp/notmuch-query.elc
 45${PLIST.emacs}share/emacs/site-lisp/notmuch-show.el
 46${PLIST.emacs}share/emacs/site-lisp/notmuch-show.elc
 47${PLIST.emacs}share/emacs/site-lisp/notmuch-tag.el
 48${PLIST.emacs}share/emacs/site-lisp/notmuch-tag.elc
 49${PLIST.emacs}share/emacs/site-lisp/notmuch-tree.el
 50${PLIST.emacs}share/emacs/site-lisp/notmuch-tree.elc
 51${PLIST.emacs}share/emacs/site-lisp/notmuch-version.el
 52${PLIST.emacs}share/emacs/site-lisp/notmuch-version.elc
 53${PLIST.emacs}share/emacs/site-lisp/notmuch-wash.el
 54${PLIST.emacs}share/emacs/site-lisp/notmuch-wash.elc
 55${PLIST.emacs}share/emacs/site-lisp/notmuch.el
 56${PLIST.emacs}share/emacs/site-lisp/notmuch.elc
40share/examples/notmuch/zsh/functions/Completion/Unix/_notmuch 57share/examples/notmuch/zsh/functions/Completion/Unix/_notmuch
File Added: pkgsrc/mail/notmuch/options.mk
# $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