Index: head/mail/mu4e-maildirs/Makefile
===================================================================
--- head/mail/mu4e-maildirs/Makefile	(revision 526481)
+++ head/mail/mu4e-maildirs/Makefile	(revision 526482)
@@ -1,50 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	mu4e-maildirs
 PORTVERSION=	0.8.20180606
 PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Maildirs extension for Mu4e
 
 LICENSE=	GPLv3
 
-BROKEN=		mu4e-maildirs-extension.el:517:1:Error: Invalid function: (func-or-shortcut)
-
 BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
 		mu4e${EMACS_PKGNAMESUFFIX}>0:mail/mu4e@${EMACS_FLAVOR}
 RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
 		mu4e${EMACS_PKGNAMESUFFIX}>0:mail/mu4e@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}-extension
 GH_ACCOUNT=	agpchil
 GH_TAGNAME=	3ef4c48
 
 NO_ARCH=	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
 
 do-build:
 	cd ${WRKSRC} && ${EMACS_CMD} --batch \
-	    -f batch-byte-compile mu4e-maildirs-extension.el && \
+	    --eval "(provide 'mu4e)" \
+	    --eval "(defvar mu4e~main-buffer-name \"tests\")" \
+	    --eval "(defvar mu4e-mu-binary \"mu\")" \
+	    --eval "(require 'cl)" \
+	    -l dash.el \
+	    -l mu4e-maildirs-extension.el \
+	    --eval "(byte-compile-file \"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>