12 files changed, 231 insertions, 49 deletions

diff --git a/mail/Makefile b/mail/Makefile
index ec6e380ffc1a..2fd2b488db36 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -268,6 +268,8 @@
     SUBDIR += msgconvert
     SUBDIR += msmtp
     SUBDIR += mu
+    SUBDIR += mu4e
+    SUBDIR += mu4e-maildirs
     SUBDIR += mulberry
     SUBDIR += mutt
     SUBDIR += mutt-lite
diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index cf6567991a26..9871dbd59713 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.9.16
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
-MAINTAINER=	wwaites@tardis.ed.ac.uk
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Mail searching frontend for Xapian
 
 LICENSE=	GPLv3+
@@ -21,26 +21,23 @@ GH_ACCOUNT=	djcb
 USES=		autoreconf gmake libtool makeinfo pkgconfig
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-silent-rules --disable-gtk
+CONFIGURE_ARGS=	--disable-silent-rules --disable-gtk --disable-mu4e
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=		DOCS GUILE MU4E
+OPTIONS_DEFINE=		DOCS GUILE
 OPTIONS_SUB=		yes
 
 GUILE_LIB_DEPENDS=	libguile-2.0.so: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
 
 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/mu-ask ${STAGEDIR}${PREFIX}/bin
+	cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
+	    ${STAGEDIR}${PREFIX}/bin
 
 post-install-GUILE-on:
-	(${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
-		${XARGS} ${STRIP_CMD})
+	${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
+	    ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist
index 2f4f296890a8..ff18a076a9bf 100644
--- a/mail/mu/pkg-plist
+++ b/mail/mu/pkg-plist
@@ -21,45 +21,6 @@ man/man1/mu.1.gz
 man/man1/mug.1.gz
 man/man5/mu-bookmarks.5.gz
 %%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-context.el
-%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.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
diff --git a/mail/mu4e-maildirs/Makefile b/mail/mu4e-maildirs/Makefile
new file mode 100644
index 000000000000..3d70a19f103f
--- /dev/null
+++ b/mail/mu4e-maildirs/Makefile
@@ -0,0 +1,45 @@
+# $FreeBSD$
+
+PORTNAME=	mu4e-maildirs
+PORTVERSION=	0.8.20160126
+CATEGORIES=	mail
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Maildirs extension for Mu4e
+
+LICENSE=	GPLv3
+
+RUN_DEPENDS:=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/mu4e/mu4e.elc:mail/mu4e \
+		${BUILD_DEPENDS}
+BUILD_DEPENDS=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/dash.el:devel/dash.el
+
+USE_GITHUB=	yes
+GH_PROJECT=	${PORTNAME}-extension
+GH_ACCOUNT=	agpchil
+GH_TAGNAME=	f759dff
+USE_EMACS=	yes
+NO_CONFIGURE=	yes
+PLIST_FILES=	${EMACS_SITE_LISPDIR}/mu4e/mu4e-maildirs-extension.elc \
+		${EMACS_SITE_LISPDIR}/mu4e/mu4e-maildirs-extension.el.gz
+PORTDOCS=	README.md
+
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=DOCS
+
+do-build:
+	cd ${WRKSRC} && ${EMACS_CMD} --batch \
+	    -f batch-byte-compile mu4e-maildirs-extension.el && \
+	    ${GZIP_CMD} mu4e-maildirs-extension.el
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e
+	cd ${WRKSRC} && ${INSTALL_DATA} \
+	    mu4e-maildirs-extension.elc \
+	    mu4e-maildirs-extension.el.gz \
+	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/mail/mu4e-maildirs/distinfo b/mail/mu4e-maildirs/distinfo
new file mode 100644
index 000000000000..9de7a3ca964c
--- /dev/null
+++ b/mail/mu4e-maildirs/distinfo
@@ -0,0 +1,2 @@
+SHA256 (agpchil-mu4e-maildirs-extension-0.8.20160126-f759dff_GH0.tar.gz) = c014dd9a8f017b9d1eb5e06f03f479713074c4642105eed64e337c3385e498a7
+SIZE (agpchil-mu4e-maildirs-extension-0.8.20160126-f759dff_GH0.tar.gz) = 10215
diff --git a/mail/mu4e-maildirs/pkg-descr b/mail/mu4e-maildirs/pkg-descr
new file mode 100644
index 000000000000..3375a6ecec80
--- /dev/null
+++ b/mail/mu4e-maildirs/pkg-descr
@@ -0,0 +1,3 @@
+This is an mu4e extension to show a maildir summary in `mu4e-main-view`.
+
+WWW: https://github.com/agpchil/mu4e-maildirs-extension
diff --git a/mail/mu4e-maildirs/pkg-message b/mail/mu4e-maildirs/pkg-message
new file mode 100644
index 000000000000..cf3d0aef88f2
--- /dev/null
+++ b/mail/mu4e-maildirs/pkg-message
@@ -0,0 +1,4 @@
+To enable this extension, add the following lines into ~/.emacs:
+
+(require 'mu4e-maildirs-extension)
+(mu4e-maildirs-extension)
diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile
new file mode 100644
index 000000000000..48e7de960395
--- /dev/null
+++ b/mail/mu4e/Makefile
@@ -0,0 +1,39 @@
+# $FreeBSD$
+
+PORTNAME=	mu4e
+PORTVERSION=	0.9.16
+DISTVERSIONPREFIX=	v
+CATEGORIES=	mail
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Emacs frontend for Mu
+
+LICENSE=	GPLv3
+
+RUN_DEPENDS=	mu:mail/mu
+
+USES=		autoreconf gmake makeinfo pkgconfig
+USE_GITHUB=	yes
+GH_PROJECT=	mu
+GH_ACCOUNT=	djcb
+USE_EMACS=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-silent-rules \
+		--disable-gtk \
+		--disable-webkit \
+		--disable-guile \
+		--docdir="${DOCSDIR}" \
+		--enable-mu4e
+INFO=		mu4e
+BUILD_WRKSRC=	${WRKSRC}/mu4e
+INSTALL_WRKSRC=	${WRKSRC}/mu4e
+INSTALL_TARGET=	install-strip
+
+OPTIONS_DEFINE=		DOCS
+OPTIONS_SUB=		yes
+
+post-install:
+	cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
+	    ${GZIP_CMD} *.el
+
+.include <bsd.port.mk>
diff --git a/mail/mu4e/distinfo b/mail/mu4e/distinfo
new file mode 100644
index 000000000000..c4f1596d427b
--- /dev/null
+++ b/mail/mu4e/distinfo
@@ -0,0 +1,2 @@
+SHA256 (djcb-mu-v0.9.16_GH0.tar.gz) = af086880b00a6954bc1135b226b66a33205893600c8dd04139a6871c62c6f05c
+SIZE (djcb-mu-v0.9.16_GH0.tar.gz) = 2212969
diff --git a/mail/mu4e/files/patch-configure.ac b/mail/mu4e/files/patch-configure.ac
new file mode 100644
index 000000000000..eae4c8acb748
--- /dev/null
+++ b/mail/mu4e/files/patch-configure.ac
@@ -0,0 +1,84 @@
+--- configure.ac.orig	2016-01-20 18:19:35 UTC
++++ configure.ac
+@@ -30,25 +30,25 @@ AC_SUBST(prefix)
+ 
+ # AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out
+ # when a c++ compiler is not found. Weird, huh?
+-AC_PROG_CXX
+-AC_PROG_CC
+-AC_PROG_CC_STDC
+-AC_PROG_CC_C99
++#AC_PROG_CXX
++#AC_PROG_CC
++#AC_PROG_CC_STDC
++#AC_PROG_CC_C99
+ AC_PROG_INSTALL
+-AC_HEADER_STDC
++#AC_HEADER_STDC
+ 
+ # for now, use AM_PROG_LIBTOOL, as we don't want to require
+ # a too new setup for autotools/libtool
+-AM_PROG_LIBTOOL
++#AM_PROG_LIBTOOL
+ #LT_INIT([disable-shared])
+ 
+ AC_PROG_AWK
+ AC_CHECK_PROG(SORT,sort,sort)
+ 
+-AC_CHECK_HEADERS([wordexp.h])
++#AC_CHECK_HEADERS([wordexp.h])
+ 
+ # use the 64-bit versions
+-AC_SYS_LARGEFILE
++#AC_SYS_LARGEFILE
+ 
+ # check for makeinfo
+ AC_CHECK_PROG(have_makeinfo,makeinfo,yes,no)
+@@ -110,16 +110,16 @@ AS_IF([test "x$PKG_CONFIG" = "xno"],[
+ 
+ # glib2?
+ # we need 2.14 at least, because we use GRegex
+-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.24 gobject-2.0 gio-2.0)
++#PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.24 gobject-2.0 gio-2.0)
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+-glib_version="`$PKG_CONFIG --modversion glib-2.0`"
++#glib_version="`$PKG_CONFIG --modversion glib-2.0`"
+ 
+ # gmime
+-PKG_CHECK_MODULES(GMIME,gmime-2.6 >= 2.6.7)
++#PKG_CHECK_MODULES(GMIME,gmime-2.6 >= 2.6.7)
+ AC_SUBST(GMIME_CFLAGS)
+ AC_SUBST(GMIME_LIBS)
+-gmime_version="`$PKG_CONFIG --modversion gmime-2.6`"
++#gmime_version="`$PKG_CONFIG --modversion gmime-2.6`"
+ 
+ 
+ # xapian checking - we need 1.2.x at least
+@@ -246,26 +246,9 @@ AS_IF([test "x$PMCCABE" = "xno"],[
+ 
+ AC_CONFIG_FILES([
+ Makefile
+-mu/Makefile
+-mu/tests/Makefile
+-lib/Makefile
+-lib/doxyfile
+-lib/tests/Makefile
+ mu4e/Makefile
+ mu4e/mu4e-meta.el
+ mu4e/texi.texi
+-guile/Makefile
+-guile/texi.texi
+-guile/mu/Makefile
+-guile/examples/Makefile
+-guile/tests/Makefile
+-guile/scripts/Makefile
+-toys/Makefile
+-toys/mug/Makefile
+-toys/msg2pdf/Makefile
+-man/Makefile
+-m4/Makefile
+-contrib/Makefile
+ ])
+ AC_OUTPUT
+ 
diff --git a/mail/mu4e/pkg-descr b/mail/mu4e/pkg-descr
new file mode 100644
index 000000000000..58bdb511cc9b
--- /dev/null
+++ b/mail/mu4e/pkg-descr
@@ -0,0 +1,4 @@
+mu4e is an Emacs frontend for mu, a tool for dealing with e-mail
+messages stored in the Maildir-format, on Unix-like systems.
+
+WWW: http://www.djcbsoftware.nl/code/mu/
diff --git a/mail/mu4e/pkg-plist b/mail/mu4e/pkg-plist
new file mode 100644
index 000000000000..f0b3154a6585
--- /dev/null
+++ b/mail/mu4e/pkg-plist
@@ -0,0 +1,39 @@
+%%PORTDOCS%%%%DOCSDIR%%/mu4e-about.org
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-utils.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-utils.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/org-old-mu4e.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/org-old-mu4e.elc