Index: head/mail/mu/Makefile
===================================================================
--- head/mail/mu/Makefile	(revision 404098)
+++ head/mail/mu/Makefile	(revision 404099)
@@ -1,51 +1,48 @@
 # Created by: rea@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	mu
-PORTVERSION=	0.9.12
-DISTVERSIONPREFIX=	v
+PORTVERSION=	0.9.15
 CATEGORIES=	mail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mail searching frontend for Xapian
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core \
 		libgmime-2.6.so:${PORTSDIR}/mail/gmime26
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	djcb
 
 USES=		autoreconf gmake libtool makeinfo pkgconfig
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --disable-gtk
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=		GUILE MU4E
+OPTIONS_DEFINE=		DOCS GUILE MU4E
 OPTIONS_SUB=		yes
 
 GUILE_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
 GUILE_USE=		ldconfig=yes
 GUILE_CONFIGURE_ENABLE=	guile
 GUILE_INFO=		mu-guile
 MU4E_DESC=		Email client for Emacs
 MU4E_USE=		emacs=yes
 MU4E_CONFIGURE_ENABLE=	mu4e
 MU4E_INFO=		mu4e
 
-.include <bsd.port.options.mk>
-
 post-install:
 	(cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
 		${STAGEDIR}${PREFIX}/bin)
-.if ${PORT_OPTIONS:MGUILE}
+
+post-install-GUILE-on:
 	(${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
 		${XARGS} ${STRIP_CMD})
-.endif
 
 .include <bsd.port.mk>
Index: head/mail/mu/distinfo
===================================================================
--- head/mail/mu/distinfo	(revision 404098)
+++ head/mail/mu/distinfo	(revision 404099)
@@ -1,2 +1,2 @@
-SHA256 (djcb-mu-v0.9.12_GH0.tar.gz) = b871124fc7774a2593815f89286671a8f31d7243bb898a8ca454685599f2b9af
-SIZE (djcb-mu-v0.9.12_GH0.tar.gz) = 2196977
+SHA256 (djcb-mu-0.9.15_GH0.tar.gz) = 60c63fdf1b726696cb0028b86eaee2aa72e171493b2d5626ea173b912ff25d4c
+SIZE (djcb-mu-0.9.15_GH0.tar.gz) = 2203193
Index: head/mail/mu/pkg-plist
===================================================================
--- head/mail/mu/pkg-plist	(revision 404098)
+++ head/mail/mu/pkg-plist	(revision 404099)
@@ -1,71 +1,71 @@
 bin/mu
 bin/mu-ask
 %%GUILE%%lib/libguile-mu.a
 %%GUILE%%lib/libguile-mu.so
 %%GUILE%%lib/libguile-mu.so.0
 %%GUILE%%lib/libguile-mu.so.0.0.0
 man/man1/mu-add.1.gz
 man/man1/mu-cfind.1.gz
 man/man1/mu-easy.1.gz
 man/man1/mu-extract.1.gz
 man/man1/mu-find.1.gz
 man/man1/mu-help.1.gz
 man/man1/mu-index.1.gz
 man/man1/mu-mkdir.1.gz
 man/man1/mu-remove.1.gz
 man/man1/mu-script.1.gz
 man/man1/mu-server.1.gz
 man/man1/mu-verify.1.gz
 man/man1/mu-view.1.gz
 man/man1/mu.1.gz
 man/man1/mug.1.gz
 man/man5/mu-bookmarks.5.gz
-%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-about.el
-%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-about.elc
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.org
+%%PORTDOCS%%%%MU4E%%%%DOCSDIR%%/mu4e-about.org
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-utils.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-utils.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/org-old-mu4e.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/org-old-mu4e.elc
 %%GUILE%%share/guile/site/2.0/mu.scm
 %%GUILE%%share/guile/site/2.0/mu/plot.scm
 %%GUILE%%share/guile/site/2.0/mu/script.scm
 %%GUILE%%share/guile/site/2.0/mu/stats.scm
 %%GUILE%%%%DATADIR%%/scripts/find-dups.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-count.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-per-hour.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-per-month.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-per-year.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-per-year-month.scm