- update to 0.17

- while here convert to staging, adopt new lib_depends format, move gmake
  into uses

This includes a patch that fixed building with Clang so it should now build
fine on FreeBSD 10.  Also switched to using gmime2.6

PR:		185396
Submitted by:	maintainer, ross@rosstimson.com

3 files changed, 25 insertions, 23 deletions

diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index 93a0062fbb0e..0a4e9132d100 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	notmuch
-PORTVERSION=	0.15.2
-PORTREVISION=	1
+PORTVERSION=	0.17
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
@@ -12,25 +11,13 @@ COMMENT=	Thread-based email index, search, and tagging application
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	gmime-2.4:${PORTSDIR}/mail/gmime24 \
-		xapian:${PORTSDIR}/databases/xapian-core \
-		talloc:${PORTSDIR}/devel/talloc
+LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
+		libxapian.so:${PORTSDIR}/databases/xapian-core \
+		libtalloc.so:${PORTSDIR}/devel/talloc
 
 HAS_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		pkgconfig gmake
 CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-MAN1=		notmuch.1 notmuch-config.1 \
-		notmuch-count.1 notmuch-dump.1 \
-		notmuch-new.1 notmuch-reply.1 \
-		notmuch-restore.1 notmuch-search.1 \
-		notmuch-setup.1 notmuch-show.1 \
-		notmuch-tag.1
-MAN5=		notmuch-hooks.5
-MAN7=		notmuch-search-terms.7
-MANCOMPRESSED=	yes
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index e857e75c911f..c81ccf9911d4 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.15.2.tar.gz) = a6e8af6382ab6df4a944bbffda9eb22639612c047b94632168b4270f2af59c0d
-SIZE (notmuch-0.15.2.tar.gz) = 560411
+SHA256 (notmuch-0.17.tar.gz) = d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc637c4dcebdb57d5c4bcbe95
+SIZE (notmuch-0.17.tar.gz) = 606710
diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist
index 8010e8756fb7..9be6e3b16ca6 100644
--- a/mail/notmuch/pkg-plist
+++ b/mail/notmuch/pkg-plist
@@ -1,9 +1,24 @@
 bin/notmuch
 etc/bash_completion.d/notmuch
 include/notmuch.h
-lib/libnotmuch.so.3.0.0
+lib/libnotmuch.so.3.1.0
 lib/libnotmuch.so
 lib/libnotmuch.so.3
+man/man1/notmuch-compact.1.gz
+man/man1/notmuch-config.1.gz
+man/man1/notmuch-count.1.gz
+man/man1/notmuch-dump.1.gz
+man/man1/notmuch-insert.1.gz
+man/man1/notmuch-new.1.gz
+man/man1/notmuch-reply.1.gz
+man/man1/notmuch-restore.1.gz
+man/man1/notmuch-search.1.gz
+man/man1/notmuch-setup.1.gz
+man/man1/notmuch-show.1.gz
+man/man1/notmuch-tag.1.gz
+man/man1/notmuch.1.gz
+man/man5/notmuch-hooks.5.gz
+man/man7/notmuch-search-terms.7.gz
 share/emacs/site-lisp/coolj.el
 share/emacs/site-lisp/notmuch-logo.png
 share/emacs/site-lisp/notmuch-address.el
@@ -13,16 +28,16 @@ share/emacs/site-lisp/notmuch-lib.el
 share/emacs/site-lisp/notmuch-maildir-fcc.el
 share/emacs/site-lisp/notmuch-message.el
 share/emacs/site-lisp/notmuch-mua.el
+share/emacs/site-lisp/notmuch-parser.el
 share/emacs/site-lisp/notmuch-print.el
 share/emacs/site-lisp/notmuch-query.el
 share/emacs/site-lisp/notmuch-show.el
 share/emacs/site-lisp/notmuch-tag.el
+share/emacs/site-lisp/notmuch-tree.el
 share/emacs/site-lisp/notmuch-wash.el
 share/emacs/site-lisp/notmuch.el
 share/zsh/functions/Completion/Unix/_notmuch
 @dirrmtry etc/bash_completion.d
-@dirrmtry share/emacs/site-lisp
-@dirrmtry share/emacs
 @dirrmtry share/zsh/functions/Completion/Unix
 @dirrmtry share/zsh/functions/Completion
 @dirrmtry share/zsh/functions