CVS commit: pkgsrc/mail/notmuch

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Apr  3 14:50:35 UTC 2019

Modified Files:
        pkgsrc/mail/notmuch: Makefile PLIST options.mk

Log Message:
Split documentation to doc option

It is enabled by default and no revbump is needed.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/mail/notmuch/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/notmuch/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/notmuch/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/notmuch/Makefile
diff -u pkgsrc/mail/notmuch/Makefile:1.45 pkgsrc/mail/notmuch/Makefile:1.46
--- pkgsrc/mail/notmuch/Makefile:1.45   Mon Mar 11 14:41:05 2019
+++ pkgsrc/mail/notmuch/Makefile        Wed Apr  3 14:50:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/03/11 14:41:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2019/04/03 14:50:35 ryoon Exp $
 
 DISTNAME=      notmuch-0.28.3
 CATEGORIES=    mail
@@ -9,8 +9,6 @@ HOMEPAGE=       https://notmuchmail.org/
 COMMENT=       Mail indexer
 LICENSE=       gnu-gpl-v3
 
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
-
 HAS_CONFIGURE= yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    bash gmake makeinfo pkg-config

Index: pkgsrc/mail/notmuch/PLIST
diff -u pkgsrc/mail/notmuch/PLIST:1.13 pkgsrc/mail/notmuch/PLIST:1.14
--- pkgsrc/mail/notmuch/PLIST:1.13      Fri Mar  8 18:27:31 2019
+++ pkgsrc/mail/notmuch/PLIST   Wed Apr  3 14:50:35 2019
@@ -1,48 +1,48 @@
-@comment $NetBSD: PLIST,v 1.13 2019/03/08 18:27:31 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/04/03 14:50:35 ryoon Exp $
 bin/notmuch
 ${PLIST.emacs}bin/notmuch-emacs-mua
 include/notmuch.h
-info/notmuch-address.info
-info/notmuch-compact.info
-info/notmuch-config.info
-info/notmuch-count.info
-info/notmuch-dump.info
-info/notmuch-emacs-mua.info
-info/notmuch-emacs.info
-info/notmuch-hooks.info
-info/notmuch-insert.info
-info/notmuch-new.info
-info/notmuch-properties.info
-info/notmuch-reindex.info
-info/notmuch-reply.info
-info/notmuch-restore.info
-info/notmuch-search-terms.info
-info/notmuch-search.info
-info/notmuch-show.info
-info/notmuch-tag.info
-info/notmuch.info
+${PLIST.doc}info/notmuch-address.info
+${PLIST.doc}info/notmuch-compact.info
+${PLIST.doc}info/notmuch-config.info
+${PLIST.doc}info/notmuch-count.info
+${PLIST.doc}info/notmuch-dump.info
+${PLIST.doc}info/notmuch-emacs-mua.info
+${PLIST.doc}Info/notmuch-emacs.info
+${PLIST.doc}info/notmuch-hooks.info
+${PLIST.doc}info/notmuch-insert.info
+${PLIST.doc}info/notmuch-new.info
+${PLIST.doc}info/notmuch-properties.info
+${PLIST.doc}info/notmuch-reindex.info
+${PLIST.doc}info/notmuch-reply.info
+${PLIST.doc}info/notmuch-restore.info
+${PLIST.doc}info/notmuch-search-terms.info
+${PLIST.doc}info/notmuch-search.info
+${PLIST.doc}info/notmuch-show.info
+${PLIST.doc}info/notmuch-tag.info
+${PLIST.doc}info/notmuch.info
 lib/libnotmuch.so
 lib/libnotmuch.so.5
 lib/libnotmuch.so.5.2.0
-man/man1/notmuch-address.1
-man/man1/notmuch-compact.1
-man/man1/notmuch-config.1
-man/man1/notmuch-count.1
-man/man1/notmuch-dump.1
-man/man1/notmuch-emacs-mua.1
-man/man1/notmuch-insert.1
-man/man1/notmuch-new.1
-man/man1/notmuch-reindex.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-properties.7
-man/man7/notmuch-search-terms.7
+${PLIST.doc}man/man1/notmuch-address.1
+${PLIST.doc}man/man1/notmuch-compact.1
+${PLIST.doc}man/man1/notmuch-config.1
+${PLIST.doc}man/man1/notmuch-count.1
+${PLIST.doc}man/man1/notmuch-dump.1
+${PLIST.doc}man/man1/notmuch-emacs-mua.1
+${PLIST.doc}man/man1/notmuch-insert.1
+${PLIST.doc}man/man1/notmuch-new.1
+${PLIST.doc}man/man1/notmuch-reindex.1
+${PLIST.doc}man/man1/notmuch-reply.1
+${PLIST.doc}man/man1/notmuch-restore.1
+${PLIST.doc}man/man1/notmuch-search.1
+${PLIST.doc}man/man1/notmuch-setup.1
+${PLIST.doc}man/man1/notmuch-show.1
+${PLIST.doc}man/man1/notmuch-tag.1
+${PLIST.doc}man/man1/notmuch.1
+${PLIST.doc}man/man5/notmuch-hooks.5
+${PLIST.doc}man/man7/notmuch-properties.7
+${PLIST.doc}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

Index: pkgsrc/mail/notmuch/options.mk
diff -u pkgsrc/mail/notmuch/options.mk:1.1 pkgsrc/mail/notmuch/options.mk:1.2
--- pkgsrc/mail/notmuch/options.mk:1.1  Sun Aug 17 10:45:05 2014
+++ pkgsrc/mail/notmuch/options.mk      Wed Apr  3 14:50:35 2019
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2014/08/17 10:45:05 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/04/03 14:50:35 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.notmuch
-PKG_SUPPORTED_OPTIONS= notmuch-emacs
+PKG_SUPPORTED_OPTIONS= notmuch-emacs doc
+PKG_SUGGESTED_OPTIONS+=        doc
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,3 +16,15 @@ PLIST.emacs=         yes
 .else
 CONFIGURE_ARGS+=       --without-emacs
 .endif
+
+###
+### documentation support
+###
+PLIST_VARS+=           doc
+.if !empty(PKG_OPTIONS:Mdoc)
+PLIST.doc=             yes
+BUILD_DEPENDS+=                ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+.else
+CONFIGURE_ARGS+=       --without-docs
+CONFIGURE_ARGS+=       --without-api-docs
+.endif