Index: head/devel/magit/Makefile
===================================================================
--- head/devel/magit/Makefile	(revision 462856)
+++ head/devel/magit/Makefile	(revision 462857)
@@ -1,44 +1,44 @@
 # Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	magit
 PORTVERSION=	2.11.0
 PORTREVISION=	1
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Interface to Git for Emacs
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el \
-		with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor
-RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el \
-		with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor
+BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \
+		with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR}
+RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \
+		with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 
 INFO=		magit magit-popup
 PORTDOCS=	AUTHORS.md
 NO_ARCH=	yes
 
 ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 MAKE_ENV+=	INSTALL_INFO=install-info \
 		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR}  -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
 		VERSION=${PORTVERSION} \
 		lispdir=${PREFIX}/${ELISPDIR} \
 		infodir=${PREFIX}/${INFO_PATH} \
 		docdir=${DOCSDIR}
 PLIST_SUB+=	ELISPDIR=${ELISPDIR}
 
 OPTIONS_DEFINE=			DOCS GIT_SUBVERSION
 GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
 GIT_SUBVERSION_BUILD_DEPENDS=	git-subversion>0:devel/git-subversion
 GIT_SUBVERSION_BUILD_DEPENDS_OFF=	git>0:devel/git
 GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
 GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:devel/git
 
 .include <bsd.port.mk>
Index: head/lang/alchemist.el/Makefile
===================================================================
--- head/lang/alchemist.el/Makefile	(revision 462856)
+++ head/lang/alchemist.el/Makefile	(revision 462857)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	alchemist.el
 PORTVERSION=	1.8.2
 DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	lang
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Elixir Tooling Integration Into Emacs
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	elixir-mode.el${EMACS_PKGNAMESUFFIX}>=0:lang/elixir-mode.el
+RUN_DEPENDS=	elixir-mode.el${EMACS_PKGNAMESUFFIX}>=0:lang/elixir-mode.el@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	tonini
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server/lib
 	${INSTALL_DATA} ${WRKSRC}/*.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/alchemist-server/*.exs ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server
 	(cd ${WRKSRC}/alchemist-server/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server/lib)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>