15 files changed, 236 insertions, 159 deletions
diff --git a/mail/Makefile b/mail/Makefile
index 68bafb99f911..20b06d4d4037 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -274,6 +274,8 @@
     SUBDIR += nohtml
     SUBDIR += normalizemime
     SUBDIR += notmuch
+    SUBDIR += notmuch-emacs
+    SUBDIR += notmuch-mutt
     SUBDIR += nullmailer
     SUBDIR += nullpop
     SUBDIR += offlineimap
diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile
new file mode 100644
index 000000000000..f7f704228f8a
--- /dev/null
+++ b/mail/notmuch-emacs/Makefile
@@ -0,0 +1,67 @@
+# $FreeBSD$
+
+CATEGORIES=	mail elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
+
+COMMENT=	Emacs major-mode for the Notmuch email search and tagging application
+
+RUN_DEPENDS=	notmuch:mail/notmuch
+
+USES=		emacs gmake
+
+INSTALL_TARGET=	install-emacs
+MAKE_ARGS+=	subdirs+=emacs
+MASTERDIR=	${.CURDIR}/../notmuch
+NO_ARCH=	yes
+
+OPTIONS_DEFINE=	DESKTOP DOCS MANPAGES
+OPTIONS_DEFAULT=	MANPAGES
+OPTIONS_SUB=	yes
+
+DESKTOP_DESC=	Install .desktop file for notmuch-emacs-mua
+
+DESKTOP_MAKE_ARGS=	WITH_DESKTOP=1
+DESKTOP_USES=	desktop-file-utils
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+DOCS_INFO=	notmuch-emacs
+DOCS_USES=	makeinfo
+MANPAGES_ALL_TARGET=	build-man
+MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+MANPAGES_INSTALL_TARGET=	install-man
+MANPAGES_MAKE_ARGS=	subdirs+=doc
+
+# fake ./configure to avoid unneeded dependencies
+do-configure:
+	@${CP} ${WRKSRC}/version ${WRKSRC}/version.stamp
+	@${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local
+	@${PRINTF} \
+		'%s\n' \
+		desktop_dir=${PREFIX}/share/applications \
+		emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
+		emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
+		HAVE_EMACS=1 \
+		HAVE_SPHINX=1 \
+		mandir=${MANPREFIX}/man \
+		prefix=${PREFIX} \
+		srcdir=. \
+		WITH_EMACS=1 \
+		> ${WRKSRC}/Makefile.config
+
+do-build-DOCS-on:
+	@${MAKE_CMD} -C ${WRKSRC} subdirs=doc sphinx-texinfo
+	@${MAKE_CMD} -C ${WRKSRC}/doc/_build/texinfo MAKEINFO='${MAKEINFO} --no-split' info
+
+do-install-DOCS-on:
+	${INSTALL_MAN} ${WRKSRC}/doc/_build/texinfo/notmuch-emacs.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
+
+post-install:
+	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el
+
+# keep poudriere testport happy
+post-install-MANPAGES-on:
+	@${FIND} ${STAGEDIR}${MANPREFIX}/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete
+
+.include "${MASTERDIR}/Makefile"
+
+# modify what Mk/Uses/emacs.mk set
+MAKE_ARGS+=	EMACS+=--quick
diff --git a/mail/notmuch-emacs/pkg-descr b/mail/notmuch-emacs/pkg-descr
new file mode 100644
index 000000000000..842b5c82e314
--- /dev/null
+++ b/mail/notmuch-emacs/pkg-descr
@@ -0,0 +1,4 @@
+An Emacs major-mode for interfacing with the notmuch
+thread-based email indexing, tagging and search application.
+
+WWW: https://notmuchmail.org/notmuch-emacs/
diff --git a/mail/notmuch-emacs/pkg-plist b/mail/notmuch-emacs/pkg-plist
new file mode 100644
index 000000000000..6a6e7e317fc3
--- /dev/null
+++ b/mail/notmuch-emacs/pkg-plist
@@ -0,0 +1,46 @@
+%%DESKTOP%%share/applications/notmuch-emacs-mua.desktop
+%%EMACS_SITE_LISPDIR%%/coolj.el.gz
+%%EMACS_SITE_LISPDIR%%/coolj.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-address.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-address.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-company.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-company.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-compat.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-compat.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-crypto.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-crypto.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-draft.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-draft.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-hello.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-hello.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-jump.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-jump.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-lib.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-lib.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-logo.png
+%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-message.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-message.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-mua.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-mua.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-parser.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-parser.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-print.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-print.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-query.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-query.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-show.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-show.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-tag.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-tag.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-tree.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-tree.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-version.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-version.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-wash.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch-wash.elc
+%%EMACS_SITE_LISPDIR%%/notmuch.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch.elc
+%%MANPAGES%%man/man1/notmuch-emacs-mua.1.gz
+bin/notmuch-emacs-mua
diff --git a/mail/notmuch-mutt/Makefile b/mail/notmuch-mutt/Makefile
new file mode 100644
index 000000000000..40b75608c2ed
--- /dev/null
+++ b/mail/notmuch-mutt/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+CATEGORIES=	mail
+PKGNAMESUFFIX=	-mutt
+
+COMMENT=	Integrates the Notmuch email search and tagging application with Mutt
+
+RUN_DEPENDS=	mutt:mail/mutt \
+		notmuch:mail/notmuch \
+		p5-Mail-Box>0:mail/p5-Mail-Box \
+		p5-Mail-Tools>0:mail/p5-Mail-Tools \
+		p5-String-ShellQuote>0:textproc/p5-String-ShellQuote \
+		p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu
+
+USES=		gmake perl5
+
+MASTERDIR=	${.CURDIR}/../notmuch
+NO_ARCH=	yes
+WRKSRC_SUBDIR=	contrib/notmuch-mutt
+
+OPTIONS_DEFINE=	EXAMPLES MANPAGES
+OPTIONS_DEFAULT=	MANPAGES
+OPTIONS_SUB=	yes
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/notmuch-mutt ${STAGEDIR}${PREFIX}/bin
+
+do-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/notmuch-mutt.rc ${STAGEDIR}${EXAMPLESDIR}/notmuch-mutt.rc
+
+do-install-MANPAGES-on:
+	${INSTALL_MAN} ${WRKSRC}/notmuch-mutt.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/notmuch-mutt/pkg-descr b/mail/notmuch-mutt/pkg-descr
new file mode 100644
index 000000000000..d77ae4adde2a
--- /dev/null
+++ b/mail/notmuch-mutt/pkg-descr
@@ -0,0 +1,10 @@
+Notmuch is a great mail indexing tool that can also be used
+in conjunction with existing Mail User Agents (MUA) instead
+of replacing them.  The advantage of such mixed solutions is
+that users can benefit from Notmuch features (such as full-text
+search and thread reconstruction) without having to change MUA.
+
+The notmuch-mutt script bridges the gap between Notmuch and
+Mutt.
+
+WWW: https://notmuchmail.org/notmuch-mutt/
diff --git a/mail/notmuch-mutt/pkg-plist b/mail/notmuch-mutt/pkg-plist
new file mode 100644
index 000000000000..6a399a0c893a
--- /dev/null
+++ b/mail/notmuch-mutt/pkg-plist
@@ -0,0 +1,3 @@
+%%MANPAGES%%man/man1/notmuch-mutt.1.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notmuch-mutt.rc
+bin/notmuch-mutt
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index c80f079bd188..79ff689a5c66 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -2,20 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	notmuch
-PORTVERSION=	0.25.3
-PORTREVISION=	1
-CATEGORIES=	mail
+PORTVERSION=	0.26
+CATEGORIES?=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
-MAINTAINER=	mp39590@gmail.com
-COMMENT=	Thread-based email index, search, and tagging application
+MAINTAINER=	seschwar@gmail.com
+COMMENT?=	Thread-based email index, search and tagging application
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING-GPL-3
+LICENSE_FILE=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3
 
-BROKEN_powerpc64=	Does not build
+BROKEN_powerpc64=	Does not build due to databases/xapian-core
 
-BUILD_DEPENDS=	c++filt:devel/binutils
+.ifndef MASTERDIR
 LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
 		libxapian.so:databases/xapian-core \
 		libtalloc.so:devel/talloc
@@ -32,58 +31,46 @@ TEST_DEPENDS=	bash:shells/bash \
 
 USES=		gmake pkgconfig python:build,test
 USE_GNOME=	glib20
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
 USE_LDCONFIG=	yes
 
-MAKE_ENV+=	PYTHONCMD=${PYTHON_CMD}
-
-TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic count new insert tagging atomicity \
-		message-property regexp-query" \
-		V=1 \
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
+		--prefix=${PREFIX} \
+		--with-bash-completion \
+		--with-retry-lock \
+		--with-zsh-completion \
+		--without-emacs
+CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
+TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic.12 count.14 insert.2[89] insert.3[0-9] message-property.6 regexp-query.21" \
 		TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
-		BSD_GDB=${LOCALBASE}/bin/gdb
-
+		TEST_GDB=${LOCALBASE}/bin/gdb \
+		V=1
 TEST_TARGET=	test
+.endif
 
-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
+PKGDIR=		${.CURDIR}
+
+.ifndef MASTERDIR
+OPTIONS_DEFINE=	DOXYGEN MANPAGES
+OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=	yes
 
-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
-EMACS_CONFIGURE_ON=	--emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
-			--emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR}
-EMACS_USES=	emacs
-EMACS_VARS=	PKGNAMESUFFIX=${EMACS_PKGNAMESUFFIX}
+DOXYGEN_CONFIGURE_WITH=	api-docs
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
-MUTT_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu \
-			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_USES=	perl5
-RUBY_USE=	RUBY=yes
-ZSH_CONFIGURE_WITH=	zsh-completion
+MANPAGES_CONFIGURE_WITH=	docs
 
-do-build-MUTT-on:
-	${MAKE_CMD} -C ${WRKSRC}/contrib/notmuch-mutt all
-	${GZIP_CMD} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt.1
-
-do-install-MUTT-on:
-	${INSTALL_SCRIPT} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
+# install completions even in absence of shells/bash-completions
+post-configure:
+	@${REINPLACE_CMD} -e '/^WITH_BASH[[:blank:]]*=/s/=.*/= 1/' ${WRKSRC}/Makefile.config
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.5.0.0
 
+# keep poudriere testport happy
+post-install-MANPAGES-on:
+	@${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz
+.endif
+
 .include <bsd.port.mk>
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index 5068e232d577..49c83604f1f9 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513159673
-SHA256 (notmuch-0.25.3.tar.gz) = 4bd58e035c34a36ba3c7027e19f763905b99812eeabab283146ef12b3310ddbb
-SIZE (notmuch-0.25.3.tar.gz) = 883151
+TIMESTAMP = 1515614677
+SHA256 (notmuch-0.26.tar.gz) = d3e894ed2ad9d721a442663f07a6f2a241dc98be7cc4af681f16edf88e0d76df
+SIZE (notmuch-0.26.tar.gz) = 906327
diff --git a/mail/notmuch/files/patch-emacs_notmuch-emacs-mua b/mail/notmuch/files/patch-emacs_notmuch-emacs-mua
deleted file mode 100644
index 56878a4b1648..000000000000
--- a/mail/notmuch/files/patch-emacs_notmuch-emacs-mua
+++ /dev/null
@@ -1,35 +0,0 @@
---- emacs/notmuch-emacs-mua.orig	2017-07-18 20:34:56 UTC
-+++ emacs/notmuch-emacs-mua
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/bin/sh
- #
- # notmuch-emacs-mua - start composing a mail on the command line
- #
-@@ -26,8 +26,8 @@ set -eu
- # calling convention: escape -v var "$arg" (like in bash printf).
- escape ()
- {
--    local __escape_arg__=${3//\\/\\\\}
--    printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"
-+    __escape_arg__="$(printf '%s' "$3" | sed -e 's|\\|\\\\|g' -e 's|\"|\\\"|g')"
-+    eval "$2=\$__escape_arg__"
- }
- 
- EMACS=${EMACS:-emacs}
-@@ -150,14 +150,14 @@ if [ -n "${MAILTO}" ]; then
- 	exit 1
-     fi
-     ELISP="(browse-url-mail \"${MAILTO}\")"
--elif [ -z "${ELISP}" -a -n "${HELLO}" ]; then
-+elif [ -z "${ELISP}" ] && [ -n "${HELLO}" ]; then
-     ELISP="(notmuch)"
- else
-     ELISP="(notmuch-mua-new-mail) ${ELISP}"
- fi
- 
- # Kill the terminal/frame if we're creating one.
--if [ -z "$USE_EMACSCLIENT" -o -n "$CREATE_FRAME" -o -n "$NO_WINDOW" ]; then
-+if [ -z "$USE_EMACSCLIENT" ] || [ -n "$CREATE_FRAME" ] || [ -n "$NO_WINDOW" ]; then
-     ELISP="${ELISP} (message-add-action #'save-buffers-kill-terminal 'exit)"
- fi
diff --git a/mail/notmuch/pkg-descr b/mail/notmuch/pkg-descr
index 4bb5b833ed8c..e37de3a9e655 100644
--- a/mail/notmuch/pkg-descr
+++ b/mail/notmuch/pkg-descr
@@ -1,3 +1,6 @@
-Notmuch - thread-based email index, search and tagging.
+Notmuch is a system for indexing, searching, reading, and
+tagging large collections of email messages in maildir or mh
+format.  It uses the Xapian library to provide fast, full-text
+search with a convenient search syntax.
 
-WWW: http://notmuchmail.org/
+WWW: https://notmuchmail.org/
diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist
index b97227ec73f5..64f03b949435 100644
--- a/mail/notmuch/pkg-plist
+++ b/mail/notmuch/pkg-plist
@@ -1,18 +1,12 @@
-bin/notmuch
-%%EMACS%%bin/notmuch-emacs-mua
-%%MUTT%%bin/notmuch-mutt
-include/notmuch.h
-lib/libnotmuch.so
-lib/libnotmuch.so.5
-lib/libnotmuch.so.5.0.0
+%%DOXYGEN%%man/man3/notmuch.3.gz
 %%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-reindex.1.gz
 %%MANPAGES%%man/man1/notmuch-reply.1.gz
 %%MANPAGES%%man/man1/notmuch-restore.1.gz
 %%MANPAGES%%man/man1/notmuch-search.1.gz
@@ -20,53 +14,13 @@ lib/libnotmuch.so.5.0.0
 %%MANPAGES%%man/man1/notmuch-show.1.gz
 %%MANPAGES%%man/man1/notmuch-tag.1.gz
 %%MANPAGES%%man/man1/notmuch.1.gz
-%%MUTT%%man/man1/notmuch-mutt.1.gz
-%%DOXYGEN%%man/man3/notmuch.3.gz
 %%MANPAGES%%man/man5/notmuch-hooks.5.gz
+%%MANPAGES%%man/man7/notmuch-properties.7.gz
 %%MANPAGES%%man/man7/notmuch-search-terms.7.gz
-%%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
-%%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-draft.el
-%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-draft.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
-%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.el
-%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.elc
-%%DESKTOP%%share/applications/notmuch-emacs-mua.desktop
-%%ZSH%%share/zsh/functions/Completion/Unix/_notmuch
+bin/notmuch
+include/notmuch.h
+lib/libnotmuch.so
+lib/libnotmuch.so.5
+lib/libnotmuch.so.5.0.0
+share/bash-completion/completions/notmuch
+share/zsh/functions/Completion/Unix/_notmuch
diff --git a/mail/py-notmuch/Makefile b/mail/py-notmuch/Makefile
index 1f7a5d7a3036..f3dfde1f6e10 100644
--- a/mail/py-notmuch/Makefile
+++ b/mail/py-notmuch/Makefile
@@ -1,25 +1,29 @@
 # $FreeBSD$
 
-PORTNAME=	notmuch
-PORTVERSION=	0.25
 CATEGORIES=	mail python
-MASTER_SITES=	http://notmuchmail.org/releases/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	geier@lostpackets.de
-COMMENT=	Python binding of the notmuch mail search and indexing library
-
-LICENSE=	GPLv3+
-LICENSE_FILE=	${WRKSRC}/../../COPYING-GPL-3
+COMMENT=	Python interface for the Notmuch email search and tagging library
 
 LIB_DEPENDS=	libnotmuch.so:mail/notmuch
 
-WRKSRC_SUBDIR=	bindings/python
-
 USES=		python
 USE_PYTHON=	autoplist distutils
+
+MASTERDIR=	${.CURDIR}/../notmuch
 NO_ARCH=	yes
+PORTDOCS=	python/
+WRKSRC_SUBDIR=	bindings/python
+
+OPTIONS_DEFINE=	DOCS
+
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+
+do-build-DOCS-on:
+	@${MAKE_CMD} -C ${WRKSRC}/docs html
 
-MAKE_ENV+=	PYTHONCMD=${PYTHON_CMD}
+do-install-DOCS-on:
+	cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/python
+	@${RM} ${STAGEDIR}${DOCSDIR}/python/.buildinfo
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/py-notmuch/distinfo b/mail/py-notmuch/distinfo
deleted file mode 100644
index a763791620ea..000000000000
--- a/mail/py-notmuch/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1504984307
-SHA256 (notmuch-0.25.tar.gz) = 65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b
-SIZE (notmuch-0.25.tar.gz) = 882093
diff --git a/mail/py-notmuch/pkg-descr b/mail/py-notmuch/pkg-descr
index 04d8ac3ef64b..753d93cdb3de 100644
--- a/mail/py-notmuch/pkg-descr
+++ b/mail/py-notmuch/pkg-descr
@@ -1,3 +1,3 @@
 Python binding of the notmuch mail search and indexing library.
 
-WWW: http://notmuchmail.org
+WWW: https://notmuchmail.org/