@@ -, +, @@ 
    mail/gmime30
    devel/json-glib [1]
---
 mail/mu/Makefile | 28 ++++++++++++++++++++--------
 mail/mu/distinfo |  6 +++---
 2 files changed, 23 insertions(+), 11 deletions(-)
--- b/mail/mu/Makefile	
+++ b/mail/mu/Makefile	
@@ -2,9 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	mu
-PORTVERSION=	1.0
-DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTVERSION=	1.2
 CATEGORIES=	mail
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -14,7 +12,8 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libxapian.so:databases/xapian-core \
-		libgmime-2.6.so:mail/gmime26
+		libgmime-3.0.so:mail/gmime30 \
+		libjson-glib-1.0.so:devel/json-glib
 
 USES=		autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
 		libtool makeinfo pkgconfig
@@ -25,6 +24,7 @@ USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk --disable-mu4e
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	test
 
 OPTIONS_DEFINE=		DOCS GUILE
 OPTIONS_SUB=		yes
@@ -33,10 +33,22 @@ GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2
 GUILE_USE=		ldconfig=yes
 GUILE_CONFIGURE_ENABLE=	guile
 GUILE_INFO=		mu-guile
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \
-	    ${WRKSRC}/configure.ac
+GUILE_USE_LDCONFIG=	yes
+
+# These patch tests.  Reported upstream:
+# https://github.com/djcb/mu/pull/1512
+# https://github.com/djcb/mu/pull/1511
+# https://github.com/djcb/mu/pull/1510
+pre-patch:
+	@${REINPLACE_CMD} -e 's/:alpha:]]/:alnum:]][[:alnum:]-]/' \
+		${WRKSRC}/lib/tests/test-mu-maildir.c
+
+	@${REINPLACE_CMD} -e '/LC_ALL/s/\.utf8/.UTF-8/' \
+		${WRKSRC}/lib/tests/test-mu-common.c
+
+	@${REINPLACE_CMD} -e '/nonexistent/s/\%s/find \%s/' \
+			  -e '/f:socrates/s/find//' \
+		${WRKSRC}/mu/tests/test-mu-cmd.c
 
 post-install:
 	cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
--- b/mail/mu/distinfo	
+++ b/mail/mu/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1519797729
-SHA256 (djcb-mu-v1.0_GH0.tar.gz) = 533149abab967e2809f72e9fe62c6deb71d45b6ad2a5846247733a1dd2de69a0
-SIZE (djcb-mu-v1.0_GH0.tar.gz) = 2273670
+TIMESTAMP = 1573422497
+SHA256 (djcb-mu-1.2_GH0.tar.gz) = 75ac379ddbaa35ab54035b057bf729537afbef09c71505c2f7209826265e049a
+SIZE (djcb-mu-1.2_GH0.tar.gz) = 2297571
--