Wed Apr 3 14:50:35 2019 UTC ()
Split documentation to doc option

It is enabled by default and no revbump is needed.


(ryoon)
diff -r1.45 -r1.46 pkgsrc/mail/notmuch/Makefile
diff -r1.13 -r1.14 pkgsrc/mail/notmuch/PLIST
diff -r1.1 -r1.2 pkgsrc/mail/notmuch/options.mk
cvs diff -r1.45 -r1.46 pkgsrc/mail/notmuch/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/Makefile 2019/03/11 14:41:05 1.45
+++ pkgsrc/mail/notmuch/Makefile 2019/04/03 14:50:35 1.46
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.45 2019/03/11 14:41:05 ryoon Exp $ 1# $NetBSD: Makefile,v 1.46 2019/04/03 14:50:35 ryoon Exp $
2 2
3DISTNAME= notmuch-0.28.3 3DISTNAME= notmuch-0.28.3
4CATEGORIES= mail 4CATEGORIES= mail
5MASTER_SITES= https://notmuchmail.org/releases/ 5MASTER_SITES= https://notmuchmail.org/releases/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://notmuchmail.org/ 8HOMEPAGE= https://notmuchmail.org/
9COMMENT= Mail indexer 9COMMENT= Mail indexer
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 
13 
14HAS_CONFIGURE= yes 12HAS_CONFIGURE= yes
15USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
16USE_TOOLS+= bash gmake makeinfo pkg-config 14USE_TOOLS+= bash gmake makeinfo pkg-config
17MAKE_FLAGS+= PYTHON=${PYTHONBIN} 15MAKE_FLAGS+= PYTHON=${PYTHONBIN}
18INFO_FILES= yes 16INFO_FILES= yes
19#TEST_TARGET= check 17#TEST_TARGET= check
20 18
21REPLACE_BASH+= emacs/notmuch-emacs-mua 19REPLACE_BASH+= emacs/notmuch-emacs-mua
22 20
23.include "options.mk" 21.include "options.mk"
24 22
25CONFIGURE_ARGS+= --prefix=${PREFIX} 23CONFIGURE_ARGS+= --prefix=${PREFIX}
26CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 24CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
cvs diff -r1.13 -r1.14 pkgsrc/mail/notmuch/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/PLIST 2019/03/08 18:27:31 1.13
+++ pkgsrc/mail/notmuch/PLIST 2019/04/03 14:50:35 1.14
@@ -1,58 +1,58 @@ @@ -1,58 +1,58 @@
1@comment $NetBSD: PLIST,v 1.13 2019/03/08 18:27:31 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.14 2019/04/03 14:50:35 ryoon Exp $
2bin/notmuch 2bin/notmuch
3${PLIST.emacs}bin/notmuch-emacs-mua 3${PLIST.emacs}bin/notmuch-emacs-mua
4include/notmuch.h 4include/notmuch.h
5info/notmuch-address.info 5${PLIST.doc}info/notmuch-address.info
6info/notmuch-compact.info 6${PLIST.doc}info/notmuch-compact.info
7info/notmuch-config.info 7${PLIST.doc}info/notmuch-config.info
8info/notmuch-count.info 8${PLIST.doc}info/notmuch-count.info
9info/notmuch-dump.info 9${PLIST.doc}info/notmuch-dump.info
10info/notmuch-emacs-mua.info 10${PLIST.doc}info/notmuch-emacs-mua.info
11info/notmuch-emacs.info 11${PLIST.doc}Info/notmuch-emacs.info
12info/notmuch-hooks.info 12${PLIST.doc}info/notmuch-hooks.info
13info/notmuch-insert.info 13${PLIST.doc}info/notmuch-insert.info
14info/notmuch-new.info 14${PLIST.doc}info/notmuch-new.info
15info/notmuch-properties.info 15${PLIST.doc}info/notmuch-properties.info
16info/notmuch-reindex.info 16${PLIST.doc}info/notmuch-reindex.info
17info/notmuch-reply.info 17${PLIST.doc}info/notmuch-reply.info
18info/notmuch-restore.info 18${PLIST.doc}info/notmuch-restore.info
19info/notmuch-search-terms.info 19${PLIST.doc}info/notmuch-search-terms.info
20info/notmuch-search.info 20${PLIST.doc}info/notmuch-search.info
21info/notmuch-show.info 21${PLIST.doc}info/notmuch-show.info
22info/notmuch-tag.info 22${PLIST.doc}info/notmuch-tag.info
23info/notmuch.info 23${PLIST.doc}info/notmuch.info
24lib/libnotmuch.so 24lib/libnotmuch.so
25lib/libnotmuch.so.5 25lib/libnotmuch.so.5
26lib/libnotmuch.so.5.2.0 26lib/libnotmuch.so.5.2.0
27man/man1/notmuch-address.1 27${PLIST.doc}man/man1/notmuch-address.1
28man/man1/notmuch-compact.1 28${PLIST.doc}man/man1/notmuch-compact.1
29man/man1/notmuch-config.1 29${PLIST.doc}man/man1/notmuch-config.1
30man/man1/notmuch-count.1 30${PLIST.doc}man/man1/notmuch-count.1
31man/man1/notmuch-dump.1 31${PLIST.doc}man/man1/notmuch-dump.1
32man/man1/notmuch-emacs-mua.1 32${PLIST.doc}man/man1/notmuch-emacs-mua.1
33man/man1/notmuch-insert.1 33${PLIST.doc}man/man1/notmuch-insert.1
34man/man1/notmuch-new.1 34${PLIST.doc}man/man1/notmuch-new.1
35man/man1/notmuch-reindex.1 35${PLIST.doc}man/man1/notmuch-reindex.1
36man/man1/notmuch-reply.1 36${PLIST.doc}man/man1/notmuch-reply.1
37man/man1/notmuch-restore.1 37${PLIST.doc}man/man1/notmuch-restore.1
38man/man1/notmuch-search.1 38${PLIST.doc}man/man1/notmuch-search.1
39man/man1/notmuch-setup.1 39${PLIST.doc}man/man1/notmuch-setup.1
40man/man1/notmuch-show.1 40${PLIST.doc}man/man1/notmuch-show.1
41man/man1/notmuch-tag.1 41${PLIST.doc}man/man1/notmuch-tag.1
42man/man1/notmuch.1 42${PLIST.doc}man/man1/notmuch.1
43man/man5/notmuch-hooks.5 43${PLIST.doc}man/man5/notmuch-hooks.5
44man/man7/notmuch-properties.7 44${PLIST.doc}man/man7/notmuch-properties.7
45man/man7/notmuch-search-terms.7 45${PLIST.doc}man/man7/notmuch-search-terms.7
46${PLIST.emacs}share/emacs/site-lisp/coolj.el 46${PLIST.emacs}share/emacs/site-lisp/coolj.el
47${PLIST.emacs}share/emacs/site-lisp/coolj.elc 47${PLIST.emacs}share/emacs/site-lisp/coolj.elc
48${PLIST.emacs}share/emacs/site-lisp/notmuch-address.el 48${PLIST.emacs}share/emacs/site-lisp/notmuch-address.el
49${PLIST.emacs}share/emacs/site-lisp/notmuch-address.elc 49${PLIST.emacs}share/emacs/site-lisp/notmuch-address.elc
50${PLIST.emacs}share/emacs/site-lisp/notmuch-company.el 50${PLIST.emacs}share/emacs/site-lisp/notmuch-company.el
51${PLIST.emacs}share/emacs/site-lisp/notmuch-company.elc 51${PLIST.emacs}share/emacs/site-lisp/notmuch-company.elc
52${PLIST.emacs}share/emacs/site-lisp/notmuch-compat.el 52${PLIST.emacs}share/emacs/site-lisp/notmuch-compat.el
53${PLIST.emacs}share/emacs/site-lisp/notmuch-compat.elc 53${PLIST.emacs}share/emacs/site-lisp/notmuch-compat.elc
54${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.el 54${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.el
55${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.elc 55${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.elc
56${PLIST.emacs}share/emacs/site-lisp/notmuch-draft.el 56${PLIST.emacs}share/emacs/site-lisp/notmuch-draft.el
57${PLIST.emacs}share/emacs/site-lisp/notmuch-draft.elc 57${PLIST.emacs}share/emacs/site-lisp/notmuch-draft.elc
58${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.el 58${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.el
cvs diff -r1.1 -r1.2 pkgsrc/mail/notmuch/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/options.mk 2014/08/17 10:45:05 1.1
+++ pkgsrc/mail/notmuch/options.mk 2019/04/03 14:50:35 1.2
@@ -1,17 +1,30 @@ @@ -1,17 +1,30 @@
1# $NetBSD: options.mk,v 1.1 2014/08/17 10:45:05 wiz Exp $ 1# $NetBSD: options.mk,v 1.2 2019/04/03 14:50:35 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.notmuch 3PKG_OPTIONS_VAR= PKG_OPTIONS.notmuch
4PKG_SUPPORTED_OPTIONS= notmuch-emacs 4PKG_SUPPORTED_OPTIONS= notmuch-emacs doc
 5PKG_SUGGESTED_OPTIONS+= doc
5 6
6.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
7 8
8### 9###
9### emacs support 10### emacs support
10### 11###
11PLIST_VARS+= emacs 12PLIST_VARS+= emacs
12.if !empty(PKG_OPTIONS:Mnotmuch-emacs) 13.if !empty(PKG_OPTIONS:Mnotmuch-emacs)
13BUILD_DEPENDS+= emacs>=24.0:../../editors/emacs 14BUILD_DEPENDS+= emacs>=24.0:../../editors/emacs
14PLIST.emacs= yes 15PLIST.emacs= yes
15.else 16.else
16CONFIGURE_ARGS+= --without-emacs 17CONFIGURE_ARGS+= --without-emacs
17.endif 18.endif
 19
 20###
 21### documentation support
 22###
 23PLIST_VARS+= doc
 24.if !empty(PKG_OPTIONS:Mdoc)
 25PLIST.doc= yes
 26BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 27.else
 28CONFIGURE_ARGS+= --without-docs
 29CONFIGURE_ARGS+= --without-api-docs
 30.endif