Index: head/mail/notmuch/Makefile
===================================================================
--- head/mail/notmuch/Makefile
+++ head/mail/notmuch/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	notmuch
-PORTVERSION=	0.24.2
+PORTVERSION=	0.25
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
@@ -21,31 +21,35 @@
 		dtach:misc/dtach \
 		gdate:sysutils/coreutils \
 		gbase64:sysutils/coreutils \
-		gwc:sysutils/coreutils \
-		gsed:sysutils/coreutils \
+		gsed:textproc/gsed \
 		gsha256sum:sysutils/coreutils \
 		gpg:security/gnupg \
+		gwc:sysutils/coreutils \
 		${LOCALBASE}/bin/gdb:devel/gdb
 
 BROKEN_powerpc64=	Does not build
 
 HAS_CONFIGURE=	yes
-USES=		gmake pkgconfig python:build
+USES=		gmake pkgconfig python:build,test
 USE_GNOME=	glib20
 CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
 USE_LDCONFIG=	yes
 
 MAKE_ENV+=	PYTHONCMD=${PYTHON_CMD}
 
-TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic count insert smime atomicity \
-		message-property new regexp-query tagging" \
+TEST_ENV+=	NOTMUCH_SKIP_TESTS="address basic count crypto db-features \
+		database-modified dump-restore emacs emacs-large-search-buffer \
+		from-guessing insert json lib-error new parse-time-string \
+		python search search-output sexp smime symbol-hiding tagging \
+		thread-order thread-search" \
 		V=1 \
 		TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		BSD_GDB=${LOCALBASE}/bin/gdb
 
 TEST_TARGET=	test
 
-OPTIONS_DEFINE=	BASH DOXYGEN EMACS MANPAGES MUTT RUBY ZSH
+OPTIONS_DEFINE=	BASH DESKTOP DOXYGEN EMACS MANPAGES MUTT RUBY ZSH
+DESKTOP_DESC=	Install desktop file
 EMACS_DESC=	Install EMACS lisp files (requires emacs)
 MUTT_DESC=	Install notmuch-mutt script
 OPTIONS_SUB=	yes
@@ -53,6 +57,8 @@
 BASH_BUILD_DEPENDS=	bash-completion>=1.90:shells/bash-completion
 BASH_RUN_DEPENDS=	${BASH_BUILD_DEPENDS}
 BASH_CONFIGURE_WITH=	bash-completion
+DESKTOP_CONFIGURE_WITH=	desktop
+DESKTOP_USES=		desktop-file-utils
 DOXYGEN_CONFIGURE_WITH=	api-docs
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 EMACS_CONFIGURE_WITH=	emacs
@@ -64,7 +70,7 @@
 			p5-Mail-Tools>0:mail/p5-Mail-Tools \
 			p5-Mail-Box>0:mail/p5-Mail-Box \
 			p5-String-ShellQuote>0:textproc/p5-String-ShellQuote
-MUTT_USE=	PERL=yes
+MUTT_USES=	perl5
 RUBY_USE=	RUBY=yes
 ZSH_CONFIGURE_WITH=	zsh-completion
 
@@ -78,6 +84,6 @@
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.4.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.5.0.0
 
 .include <bsd.port.mk>
Index: head/mail/notmuch/distinfo
===================================================================
--- head/mail/notmuch/distinfo
+++ head/mail/notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500399569
-SHA256 (notmuch-0.24.2.tar.gz) = aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51
-SIZE (notmuch-0.24.2.tar.gz) = 709272
+TIMESTAMP = 1501171431
+SHA256 (notmuch-0.25.tar.gz) = 65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b
+SIZE (notmuch-0.25.tar.gz) = 882093
Index: head/mail/notmuch/pkg-plist
===================================================================
--- head/mail/notmuch/pkg-plist
+++ head/mail/notmuch/pkg-plist
@@ -3,8 +3,8 @@
 %%MUTT%%bin/notmuch-mutt
 include/notmuch.h
 lib/libnotmuch.so
-lib/libnotmuch.so.4
-lib/libnotmuch.so.4.4.0
+lib/libnotmuch.so.5
+lib/libnotmuch.so.5.0.0
 %%MANPAGES%%man/man1/notmuch-address.1.gz
 %%MANPAGES%%man/man1/notmuch-compact.1.gz
 %%MANPAGES%%man/man1/notmuch-config.1.gz
@@ -24,7 +24,7 @@
 %%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
+%%BASH%%share/bash-completion/completions/notmuch
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.elc
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.el
@@ -68,5 +68,5 @@
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.elc
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.elc
-%%EMACS%%share/applications/notmuch-emacs-mua.desktop
+%%DESKTOP%%share/applications/notmuch-emacs-mua.desktop
 %%ZSH%%share/zsh/functions/Completion/Unix/_notmuch