Attachment #176117 for bug #213240




# $FreeBSD$

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



MAKE_ENV+=		PYTHONCMD=${PYTHON_CMD}

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 1000712
BROKEN=	Does not build on FreeBSD 9
.endif

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.4.0

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)b/mail/notmuch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1473408075	1	TIMESTAMP = 1477336281
2	SHA256 (notmuch-0.22.2.tar.gz) = 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1	2	SHA256 (notmuch-0.23.1.tar.gz) = e8012a1aa9afa47dfeb78f826610577e6bf9714e0933f28139c8611aad96d180
3	SIZE (notmuch-0.22.2.tar.gz) = 683796	3	SIZE (notmuch-0.23.1.tar.gz) = 690069




--- 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"




include/notmuch.h
lib/libnotmuch.so
lib/libnotmuch.so.4
lib/libnotmuch.so.4.4.0
%%MANPAGES%%man/man1/notmuch-address.1.gz
%%MANPAGES%%man/man1/notmuch-compact.1.gz
%%MANPAGES%%man/man1/notmuch-config.1.gz

%%MANPAGES%%man/man5/notmuch-hooks.5.gz
%%MANPAGES%%man/man7/notmuch-search-terms.7.gz
%%BASH%%etc/bash_completion.d/notmuch
%%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-hello.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-hello.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-jump.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-jump.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-lib.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-lib.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-logo.png
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-message.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-message.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-mua.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-mua.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-parser.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-parser.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-print.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-print.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-query.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-query.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-show.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-show.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tag.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tag.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tree.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tree.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-version.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-version.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-wash.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-wash.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch.elc
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.el
%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.elc
%%ZSH%%share/zsh/functions/Completion/Unix/_notmuch

Return to bug 213240

Lines 2-8 Link Here

(-)b/mail/notmuch/Makefile (-3 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= notmuch	4	PORTNAME= notmuch
5	PORTVERSION= 0.22.2	5	PORTVERSION= 0.23.1
6	CATEGORIES= mail	6	CATEGORIES= mail
7	MASTER_SITES= http://notmuchmail.org/releases/	7	MASTER_SITES= http://notmuchmail.org/releases/
8		8
Lines 44-51 USE_LDCONFIG= yes Link Here
44		44
45	MAKE_ENV+= PYTHONCMD=${PYTHON_CMD}	45	MAKE_ENV+= PYTHONCMD=${PYTHON_CMD}
46		46
		47	.include <bsd.port.pre.mk>
		48
		49	.if ${OSVERSION} < 1000712
		50	BROKEN= Does not build on FreeBSD 9
		51	.endif
		52
47	post-install:	53	post-install:
48	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch	54	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
49	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.3.0	55	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.4.0
50		56
51	.include <bsd.port.mk>	57	.include <bsd.port.post.mk>

Removed Link Here

(-)a/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 2-8 bin/notmuch Link Here

(-)b/mail/notmuch/pkg-plist (-38 / +40 lines)
2	include/notmuch.h	2	include/notmuch.h
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.4.0
6	%%MANPAGES%%man/man1/notmuch-address.1.gz	6	%%MANPAGES%%man/man1/notmuch-address.1.gz
7	%%MANPAGES%%man/man1/notmuch-compact.1.gz	7	%%MANPAGES%%man/man1/notmuch-compact.1.gz
8	%%MANPAGES%%man/man1/notmuch-config.1.gz	8	%%MANPAGES%%man/man1/notmuch-config.1.gz
Lines 22-62 lib/libnotmuch.so.4.3.0 Link Here
22	%%MANPAGES%%man/man5/notmuch-hooks.5.gz	22	%%MANPAGES%%man/man5/notmuch-hooks.5.gz
23	%%MANPAGES%%man/man7/notmuch-search-terms.7.gz	23	%%MANPAGES%%man/man7/notmuch-search-terms.7.gz
24	%%BASH%%etc/bash_completion.d/notmuch	24	%%BASH%%etc/bash_completion.d/notmuch
25	%%EMACS%%share/emacs/site-lisp/coolj.el	25	%%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.el
26	%%EMACS%%share/emacs/site-lisp/coolj.elc	26	%%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.elc
27	%%EMACS%%share/emacs/site-lisp/notmuch-address.el	27	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.el
28	%%EMACS%%share/emacs/site-lisp/notmuch-address.elc	28	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.elc
29	%%EMACS%%share/emacs/site-lisp/notmuch-crypto.el	29	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.el
30	%%EMACS%%share/emacs/site-lisp/notmuch-crypto.elc	30	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.elc
31	%%EMACS%%share/emacs/site-lisp/notmuch-hello.el	31	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-hello.el
32	%%EMACS%%share/emacs/site-lisp/notmuch-hello.elc	32	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-hello.elc
33	%%EMACS%%share/emacs/site-lisp/notmuch-jump.el	33	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-jump.el
34	%%EMACS%%share/emacs/site-lisp/notmuch-jump.elc	34	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-jump.elc
35	%%EMACS%%share/emacs/site-lisp/notmuch-lib.el	35	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-lib.el
36	%%EMACS%%share/emacs/site-lisp/notmuch-lib.elc	36	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-lib.elc
37	%%EMACS%%share/emacs/site-lisp/notmuch-logo.png	37	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-logo.png
38	%%EMACS%%share/emacs/site-lisp/notmuch-maildir-fcc.el	38	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.el
39	%%EMACS%%share/emacs/site-lisp/notmuch-maildir-fcc.elc	39	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.elc
40	%%EMACS%%share/emacs/site-lisp/notmuch-message.el	40	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-message.el
41	%%EMACS%%share/emacs/site-lisp/notmuch-message.elc	41	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-message.elc
42	%%EMACS%%share/emacs/site-lisp/notmuch-mua.el	42	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-mua.el
43	%%EMACS%%share/emacs/site-lisp/notmuch-mua.elc	43	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-mua.elc
44	%%EMACS%%share/emacs/site-lisp/notmuch-parser.el	44	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-parser.el
45	%%EMACS%%share/emacs/site-lisp/notmuch-parser.elc	45	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-parser.elc
46	%%EMACS%%share/emacs/site-lisp/notmuch-print.el	46	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-print.el
47	%%EMACS%%share/emacs/site-lisp/notmuch-print.elc	47	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-print.elc
48	%%EMACS%%share/emacs/site-lisp/notmuch-query.el	48	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-query.el
49	%%EMACS%%share/emacs/site-lisp/notmuch-query.elc	49	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-query.elc
50	%%EMACS%%share/emacs/site-lisp/notmuch-show.el	50	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-show.el
51	%%EMACS%%share/emacs/site-lisp/notmuch-show.elc	51	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-show.elc
52	%%EMACS%%share/emacs/site-lisp/notmuch-tag.el	52	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tag.el
53	%%EMACS%%share/emacs/site-lisp/notmuch-tag.elc	53	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tag.elc
54	%%EMACS%%share/emacs/site-lisp/notmuch-tree.el	54	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tree.el
55	%%EMACS%%share/emacs/site-lisp/notmuch-tree.elc	55	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tree.elc
56	%%EMACS%%share/emacs/site-lisp/notmuch-version.el	56	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-version.el
57	%%EMACS%%share/emacs/site-lisp/notmuch-version.elc	57	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-version.elc
58	%%EMACS%%share/emacs/site-lisp/notmuch-wash.el	58	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-wash.el
59	%%EMACS%%share/emacs/site-lisp/notmuch-wash.elc	59	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-wash.elc
60	%%EMACS%%share/emacs/site-lisp/notmuch.el	60	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch.el
61	%%EMACS%%share/emacs/site-lisp/notmuch.elc	61	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch.elc
		62	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.el
		63	%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.elc
62	%%ZSH%%share/zsh/functions/Completion/Unix/_notmuch	64	%%ZSH%%share/zsh/functions/Completion/Unix/_notmuch