Attachment #173443 for bug #211266




# $FreeBSD$

PORTNAME=	notmuch
PORTVERSION=	0.22.1
CATEGORIES=	mail
MASTER_SITES=	http://notmuchmail.org/releases/



LICENSE=	GPLv3

BUILD_DEPENDS=	c++filt:devel/binutils

BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
		c++filt:devel/binutils
LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
		libxapian.so:databases/xapian-core \
		libtalloc.so:devel/talloc

BROKEN_powerpc64=	Does not build

OPTIONS_DEFINE=	BASH DOXYGEN EMACS MANPAGES RUBY ZSH
EMACS_DESC=	Install EMACS lisp files (requires emacs)
ZSH_DESC=	Install zsh completion
OPTIONS_SUB=	yes

BASH_BUILD_DEPENDS=	bash-completion>=1.90:shells/bash-completion
BASH_RUN_DEPENDS=	${BASH_BUILD_DEPENDS}
BASH_CONFIGURE_WITH=	bash-completion
DOXYGEN_CONFIGURE_WITH=	api-docs
DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
EMACS_CONFIGURE_WITH=	emacs
EMACS_CONFIGURE_ON=	--emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
			--emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR}
EMACS_USE=	EMACS=yes
MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
RUBY_USE=	RUBY=yes
ZSH_CONFIGURE_WITH=	zsh-completion

HAS_CONFIGURE=	yes
USES=		gmake pkgconfig python:build
USE_GNOME+=	glib20
CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
USE_LDCONFIG=	yes


Lines 1-3 Link Here

(-)b/mail/notmuch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1463745210	1	TIMESTAMP = 1469017581
2	SHA256 (notmuch-0.22.tar.gz) = d64118ef926ba06fba814a89a75d20b0c8c8ec07dd65e41bb9f1e9db0dcfb99a	2	SHA256 (notmuch-0.22.1.tar.gz) = e739457794f3c2b363beffa3ed9e8a2786921031c80672f5b06d0880876a974b
3	SIZE (notmuch-0.22.tar.gz) = 682458	3	SIZE (notmuch-0.22.1.tar.gz) = 683286




--- configure.orig	2016-07-19 09:43:20 UTC
+++ configure
@@ -66,6 +66,7 @@ PYTHON=${PYTHON:-}
 PREFIX=/usr/local
 LIBDIR=
 WITH_DOCS=1
+WITH_API_DOCS=1
 WITH_EMACS=1
 WITH_BASH=1
 WITH_RUBY=1
@@ -134,7 +135,8 @@ Some features can be disabled (--with-fe
 --without-feature) :
 
 	--without-bash-completion	Do not install bash completions files
-	--without-docs			Do not install documentation and man pages
+	--without-docs			Do not install man pages
+	--without-api-docs		Do not install API documentation
 	--without-emacs			Do not install lisp file
 	--without-ruby			Do not install ruby bindings
 	--without-zsh-completion	Do not install zsh completions files
@@ -185,6 +187,14 @@ for option; do
 	fi
     elif [ "${option}" = '--without-docs' ] ; then
 	WITH_DOCS=0
+    elif [ "${option%%=*}" = '--with-api-docs' ]; then
+	if [ "${option#*=}" = 'no' ]; then
+	    WITH_API_DOCS=0
+	else
+	    WITH_API_DOCS=1
+	fi
+    elif [ "${option}" = '--without-api-docs' ] ; then
+	WITH_API_DOCS=0
     elif [ "${option%%=*}" = '--with-emacs' ]; then
 	if [ "${option#*=}" = 'no' ]; then
 	    WITH_EMACS=0
@@ -507,7 +517,7 @@ else
 fi
 
 have_doxygen=0
-if [ $WITH_DOCS = "1" ] ; then
+if [ $WITH_API_DOCS = "1" ] ; then
     printf "Checking if doxygen is available... "
     if command -v doxygen > /dev/null; then
 	printf "Yes.\n"




lib/libnotmuch.so
lib/libnotmuch.so.4
lib/libnotmuch.so.4.3.0
%%MANPAGES%%man/man1/notmuch-address.1.gz
%%MANPAGES%%man/man1/notmuch-compact.1.gz
%%MANPAGES%%man/man1/notmuch-config.1.gz
%%MANPAGES%%man/man1/notmuch-count.1.gz
%%MANPAGES%%man/man1/notmuch-dump.1.gz
%%MANPAGES%%man/man1/notmuch-emacs-mua.1.gz
%%MANPAGES%%man/man1/notmuch-insert.1.gz
%%MANPAGES%%man/man1/notmuch-new.1.gz
%%MANPAGES%%man/man1/notmuch-reply.1.gz
%%MANPAGES%%man/man1/notmuch-restore.1.gz
%%MANPAGES%%man/man1/notmuch-search.1.gz
%%MANPAGES%%man/man1/notmuch-setup.1.gz
%%MANPAGES%%man/man1/notmuch-show.1.gz
%%MANPAGES%%man/man1/notmuch-tag.1.gz
%%MANPAGES%%man/man1/notmuch.1.gz
%%DOXYGEN%%man/man3/notmuch.3.gz
%%MANPAGES%%man/man5/notmuch-hooks.5.gz
%%MANPAGES%%man/man7/notmuch-search-terms.7.gz
%%BASH%%etc/bash_completion.d/notmuch
%%EMACS%%share/emacs/site-lisp/coolj.el
%%EMACS%%share/emacs/site-lisp/coolj.elc

Return to bug 211266

Lines 2-8 Link Here

(-)b/mail/notmuch/Makefile (-12 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= notmuch	4	PORTNAME= notmuch
5	PORTVERSION= 0.22	5	PORTVERSION= 0.22.1
6	CATEGORIES= mail	6	CATEGORIES= mail
7	MASTER_SITES= http://notmuchmail.org/releases/	7	MASTER_SITES= http://notmuchmail.org/releases/
8		8
Lines 11-41 COMMENT= Thread-based email index, search, and tagging application Link Here
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13		13
14	BROKEN_powerpc64= Does not build	14	BUILD_DEPENDS= c++filt:devel/binutils
15
16	BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \
17	c++filt:devel/binutils
18	LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \	15	LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \
19	libxapian.so:databases/xapian-core \	16	libxapian.so:databases/xapian-core \
20	libtalloc.so:devel/talloc	17	libtalloc.so:devel/talloc
21		18
22	OPTIONS_DEFINE= BASH EMACS ZSH	19	BROKEN_powerpc64= Does not build
23	BASH_DESC= Install bash completion (requires shells/bash-completion)	20
		21	OPTIONS_DEFINE= BASH DOXYGEN EMACS MANPAGES RUBY ZSH
24	EMACS_DESC= Install EMACS lisp files (requires emacs)	22	EMACS_DESC= Install EMACS lisp files (requires emacs)
25	ZSH_DESC= Install zsh completion
26	OPTIONS_SUB= yes	23	OPTIONS_SUB= yes
27		24
28	BASH_BUILD_DEPENDS= bash-completion>=1.90:shells/bash-completion	25	BASH_BUILD_DEPENDS= bash-completion>=1.90:shells/bash-completion
29	BASH_RUN_DEPENDS= ${BASH_BUILD_DEPENDS}	26	BASH_RUN_DEPENDS= ${BASH_BUILD_DEPENDS}
30	BASH_CONFIGURE_OFF= --without-bash-completion	27	BASH_CONFIGURE_WITH= bash-completion
31	EMACS_CONFIGURE_OFF= --without-emacs	28	DOXYGEN_CONFIGURE_WITH= api-docs
		29	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
		30	EMACS_CONFIGURE_WITH= emacs
32	EMACS_CONFIGURE_ON= --emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \	31	EMACS_CONFIGURE_ON= --emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
33	--emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR}	32	--emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR}
34	EMACS_USE= EMACS=yes	33	EMACS_USE= EMACS=yes
35	ZSH_CONFIGURE_OFF= --without-zsh-completion	34	MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx
		35	RUBY_USE= RUBY=yes
		36	ZSH_CONFIGURE_WITH= zsh-completion
36		37
37	HAS_CONFIGURE= yes	38	HAS_CONFIGURE= yes
38	USES= gmake pkgconfig python:build	39	USES= gmake pkgconfig python:build
		40	USE_GNOME+= glib20
39	CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man	41	CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man
40	USE_LDCONFIG= yes	42	USE_LDCONFIG= yes
41		43

Added Link Here

(-)b/mail/notmuch/files/patch-configure (+44 lines)
1	--- configure.orig 2016-07-19 09:43:20 UTC
2	+++ configure
3	@@ -66,6 +66,7 @@ PYTHON=${PYTHON:-}
4	PREFIX=/usr/local
5	LIBDIR=
6	WITH_DOCS=1
7	+WITH_API_DOCS=1
8	WITH_EMACS=1
9	WITH_BASH=1
10	WITH_RUBY=1
11	@@ -134,7 +135,8 @@ Some features can be disabled (--with-fe
12	--without-feature) :
13
14	--without-bash-completion Do not install bash completions files
15	- --without-docs Do not install documentation and man pages
16	+ --without-docs Do not install man pages
17	+ --without-api-docs Do not install API documentation
18	--without-emacs Do not install lisp file
19	--without-ruby Do not install ruby bindings
20	--without-zsh-completion Do not install zsh completions files
21	@@ -185,6 +187,14 @@ for option; do
22	fi
23	elif [ "${option}" = '--without-docs' ] ; then
24	WITH_DOCS=0
25	+ elif [ "${option%%=*}" = '--with-api-docs' ]; then
26	+ if [ "${option#*=}" = 'no' ]; then
27	+ WITH_API_DOCS=0
28	+ else
29	+ WITH_API_DOCS=1
30	+ fi
31	+ elif [ "${option}" = '--without-api-docs' ] ; then
32	+ WITH_API_DOCS=0
33	elif [ "${option%%=*}" = '--with-emacs' ]; then
34	if [ "${option#*=}" = 'no' ]; then
35	WITH_EMACS=0
36	@@ -507,7 +517,7 @@ else
37	fi
38
39	have_doxygen=0
40	-if [ $WITH_DOCS = "1" ] ; then
41	+if [ $WITH_API_DOCS = "1" ] ; then
42	printf "Checking if doxygen is available... "
43	if command -v doxygen > /dev/null; then
44	printf "Yes.\n"

Lines 3-25 include/notmuch.h Link Here

(-)b/mail/notmuch/pkg-plist (-17 / +18 lines)
3	lib/libnotmuch.so	3	lib/libnotmuch.so
4	lib/libnotmuch.so.4	4	lib/libnotmuch.so.4
5	lib/libnotmuch.so.4.3.0	5	lib/libnotmuch.so.4.3.0
6	man/man1/notmuch-address.1.gz	6	%%MANPAGES%%man/man1/notmuch-address.1.gz
7	man/man1/notmuch-compact.1.gz	7	%%MANPAGES%%man/man1/notmuch-compact.1.gz
8	man/man1/notmuch-config.1.gz	8	%%MANPAGES%%man/man1/notmuch-config.1.gz
9	man/man1/notmuch-count.1.gz	9	%%MANPAGES%%man/man1/notmuch-count.1.gz
10	man/man1/notmuch-dump.1.gz	10	%%MANPAGES%%man/man1/notmuch-dump.1.gz
11	man/man1/notmuch-emacs-mua.1.gz	11	%%MANPAGES%%man/man1/notmuch-emacs-mua.1.gz
12	man/man1/notmuch-insert.1.gz	12	%%MANPAGES%%man/man1/notmuch-insert.1.gz
13	man/man1/notmuch-new.1.gz	13	%%MANPAGES%%man/man1/notmuch-new.1.gz
14	man/man1/notmuch-reply.1.gz	14	%%MANPAGES%%man/man1/notmuch-reply.1.gz
15	man/man1/notmuch-restore.1.gz	15	%%MANPAGES%%man/man1/notmuch-restore.1.gz
16	man/man1/notmuch-search.1.gz	16	%%MANPAGES%%man/man1/notmuch-search.1.gz
17	man/man1/notmuch-setup.1.gz	17	%%MANPAGES%%man/man1/notmuch-setup.1.gz
18	man/man1/notmuch-show.1.gz	18	%%MANPAGES%%man/man1/notmuch-show.1.gz
19	man/man1/notmuch-tag.1.gz	19	%%MANPAGES%%man/man1/notmuch-tag.1.gz
20	man/man1/notmuch.1.gz	20	%%MANPAGES%%man/man1/notmuch.1.gz
21	man/man5/notmuch-hooks.5.gz	21	%%DOXYGEN%%man/man3/notmuch.3.gz
22	man/man7/notmuch-search-terms.7.gz	22	%%MANPAGES%%man/man5/notmuch-hooks.5.gz
		23	%%MANPAGES%%man/man7/notmuch-search-terms.7.gz
23	%%BASH%%etc/bash_completion.d/notmuch	24	%%BASH%%etc/bash_completion.d/notmuch
24	%%EMACS%%share/emacs/site-lisp/coolj.el	25	%%EMACS%%share/emacs/site-lisp/coolj.el
25	%%EMACS%%share/emacs/site-lisp/coolj.elc	26	%%EMACS%%share/emacs/site-lisp/coolj.elc