Index: devel/magit/Makefile
===================================================================
--- devel/magit/Makefile
+++ devel/magit/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	magit
 PORTVERSION=	2.11.0
+PORTREVISION=	1
 CATEGORIES=	devel elisp
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Interface to Git for Emacs
@@ -12,10 +12,10 @@
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	dash.el>=2.12.1:devel/dash.el \
-		with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor
-RUN_DEPENDS=	dash.el>=2.12.1:devel/dash.el \
-		with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor
+BUILD_DEPENDS=	dash.el${PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${FLAVOR} \
+		with-editor${PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${FLAVOR}
+RUN_DEPENDS=	dash.el${PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${FLAVOR} \
+		with-editor${PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${FLAVOR}
 
 USES=		gmake makeinfo
 USE_EMACS=	yes
Index: editors/emacs-devel/Makefile
===================================================================
--- editors/emacs-devel/Makefile
+++ editors/emacs-devel/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	emacs
 DISTVERSION=	${EMACS_VER}.${EMACS_REV}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	GNU editing macros
@@ -13,7 +13,13 @@
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	emacs25-[0-9]* emacs-nox11-[0-9]*
+CONFLICTS_INSTALL=	emacs-[0-9]* emacs-canna* emacs-lite*
+
+FLAVORS=		default lite
+default_CONFLICTS_INSTALL+=	emacs-devel-lite*
+default_PKGNAMESUFFIX=	-devel
+lite_CONFLICTS_INSTALL=	emacs-devel-[0-9]*
+lite_PKGNAMESUFFIX=	-devel_lite
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
@@ -180,6 +186,12 @@
 XWIDGETS_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 XWIDGETS_IMPLIES=	GTK3
 
+.if ${FLAVOR:U} == lite
+OPTIONS_EXCLUDE=	ACL ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
+			LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \
+			XAW XAW3D X11 XFT XIM XPM XWIDGETS
+.endif
+
 .include <bsd.port.options.mk>
 
 # has graphics/ImageMagick been compiled with OPENMP?