Flavorize and modernize Emacs ports

- Convert USE_EMACS to USES=emacs
- Remove editors/emacs-nox11 (refer to nox flavors of editors/emacs and
  editors/emacs-devel)
- Permit default Emacs flavor to be specified in make.conf
- Rename japanese/migemo-emacs23 to japanese/migemo-emacs
- Update and simplify audio/emms and fix build on FreeBSD 10 [1]
- Update databases/bbdd and fix build on FreeBSD 10 [1]
- Update editors/emacs-devel
- Ensure Makefile shell commands that change directory are executed in a
  subshell
- Silence some portlint warnings

[1] By not depending on base texinfo

PR:		225404
Reviewed by:	antoine
Approved by:	portmgr (mat) ashish (maintainer)
Differential Revision:	https://reviews.freebsd.org/D13506

26 files changed, 474 insertions, 673 deletions

diff --git a/editors/Makefile b/editors/Makefile
index 63a9772e5bd3..76d487c69f41 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -36,7 +36,6 @@
     SUBDIR += editorconfig-core-c
     SUBDIR += emacs
     SUBDIR += emacs-devel
-    SUBDIR += emacs-nox11
     SUBDIR += encryptpad
     SUBDIR += fileobj
     SUBDIR += flim
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 5f9578332b09..bedefd3be501 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -3,33 +3,24 @@
 
 PORTNAME=	apel
 PORTVERSION=	${APEL_VER}
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/apel/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Portable Emacs Library
 
 LICENSE=	GPLv2
 
-# distfile version
-APEL_VER=	10.8
-# apel lispdir
-APEL_LISPDIR?=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
-APEL_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
-
-# emacs port setup
-USE_EMACS=	yes
+USES=		emacs
 
-DESCR=		${PKGDIR}/pkg-descr
+NO_ARCH=	yes
 
-# target name for make build
-ALL_TARGET?=	elc
-# environments
-MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBASE}" \
-		LISPDIR="${STAGEDIR}${APEL_LISPDIR}" \
-		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${APEL_VERSION_SPECIFIC_LISPDIR}"
+APEL_VER=	10.8
+ALL_TARGET=	elc
+MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" \
+		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}"
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/editors/apel/files/patch-poe.el b/editors/apel/files/patch-poe.el
index ae72010f76fd..656a4f5829f5 100644
--- a/editors/apel/files/patch-poe.el
+++ b/editors/apel/files/patch-poe.el
@@ -714,7 +714,7 @@
 +       (prog1
 +	   (buffer-string)
 +	 (kill-buffer nil)))))
- 
+
  ;; Emacs 20.1 and later: (combine-after-change-calls &rest BODY)
  (defmacro-maybe combine-after-change-calls (&rest body)
 @@ -1056,20 +1056,20 @@ STRING should be given if the last searc
@@ -752,7 +752,20 @@
  If second arg FIXEDCASE is non-nil, do not alter case of replacement text.
  Otherwise maybe capitalize the whole text, or maybe just word initials,
  based on the replaced text.
-@@ -1090,38 +1090,38 @@ Leaves point at end of replacement text.
+@@ -1080,48 +1080,48 @@ then capitalize each word in NEWTEXT.
+
+ If third arg LITERAL is non-nil, insert NEWTEXT literally.
+ Otherwise treat `\' as special:
+-  `\&' in NEWTEXT means substitute original matched text.
+-  `\N' means substitute what matched the Nth `\(...\)'.
++  `\\&' in NEWTEXT means substitute original matched text.
++  `\\N' means substitute what matched the Nth `\\(...\\)'.
+        If Nth parens didn't match, substitute nothing.
+-  `\\' means insert one `\'.
++  `\\\\' means insert one `\\'.
+ FIXEDCASE and LITERAL are optional arguments.
+ Leaves point at end of replacement text.
+
  The optional fourth argument STRING can be a string to modify.
  In that case, this function creates and returns a new string
  which is made by replacing the part of STRING that was matched."
@@ -823,7 +836,20 @@
  If second arg FIXEDCASE is non-nil, do not alter case of replacement text.
  Otherwise maybe capitalize the whole text, or maybe just word initials,
  based on the replaced text.
-@@ -1142,24 +1142,24 @@ Leaves point at end of replacement text.
+@@ -1132,34 +1132,34 @@ then capitalize each word in NEWTEXT.
+
+ If third arg LITERAL is non-nil, insert NEWTEXT literally.
+ Otherwise treat `\' as special:
+-  `\&' in NEWTEXT means substitute original matched text.
+-  `\N' means substitute what matched the Nth `\(...\)'.
++  `\\&' in NEWTEXT means substitute original matched text.
++  `\\N' means substitute what matched the Nth `\\(...\\)'.
+        If Nth parens didn't match, substitute nothing.
+-  `\\' means insert one `\'.
++  `\\\\' means insert one `\'.
+ FIXEDCASE and LITERAL are optional arguments.
+ Leaves point at end of replacement text.
+
  The optional fourth argument STRING can be a string to modify.
  In that case, this function creates and returns a new string
  which is made by replacing the part of STRING that was matched."
diff --git a/editors/apel/pkg-plist b/editors/apel/pkg-plist
index 69f1bdb50a02..ef30f7292adf 100644
--- a/editors/apel/pkg-plist
+++ b/editors/apel/pkg-plist
@@ -1,59 +1,59 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-23.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-23.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-20.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-20.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-e20.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-e20.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-20.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-20.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-20.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-20.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-e20.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-e20.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20_3.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20_3.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.elc
+%%EMACS_SITE_LISPDIR%%/apel/alist.el
+%%EMACS_SITE_LISPDIR%%/apel/alist.elc
+%%EMACS_SITE_LISPDIR%%/apel/calist.el
+%%EMACS_SITE_LISPDIR%%/apel/calist.elc
+%%EMACS_SITE_LISPDIR%%/apel/filename.el
+%%EMACS_SITE_LISPDIR%%/apel/filename.elc
+%%EMACS_SITE_LISPDIR%%/apel/install.el
+%%EMACS_SITE_LISPDIR%%/apel/install.elc
+%%EMACS_SITE_LISPDIR%%/apel/path-util.el
+%%EMACS_SITE_LISPDIR%%/apel/path-util.elc
+%%EMACS_SITE_LISPDIR%%/emu/apel-ver.el
+%%EMACS_SITE_LISPDIR%%/emu/apel-ver.elc
+%%EMACS_SITE_LISPDIR%%/emu/broken.el
+%%EMACS_SITE_LISPDIR%%/emu/broken.elc
+%%EMACS_SITE_LISPDIR%%/emu/emu.el
+%%EMACS_SITE_LISPDIR%%/emu/emu.elc
+%%EMACS_SITE_LISPDIR%%/emu/inv-23.el
+%%EMACS_SITE_LISPDIR%%/emu/inv-23.elc
+%%EMACS_SITE_LISPDIR%%/emu/invisible.el
+%%EMACS_SITE_LISPDIR%%/emu/invisible.elc
+%%EMACS_SITE_LISPDIR%%/emu/mcharset.el
+%%EMACS_SITE_LISPDIR%%/emu/mcharset.elc
+%%EMACS_SITE_LISPDIR%%/emu/mcs-20.el
+%%EMACS_SITE_LISPDIR%%/emu/mcs-20.elc
+%%EMACS_SITE_LISPDIR%%/emu/mcs-e20.el
+%%EMACS_SITE_LISPDIR%%/emu/mcs-e20.elc
+%%EMACS_SITE_LISPDIR%%/emu/mule-caesar.el
+%%EMACS_SITE_LISPDIR%%/emu/mule-caesar.elc
+%%EMACS_SITE_LISPDIR%%/emu/pccl.el
+%%EMACS_SITE_LISPDIR%%/emu/pccl.elc
+%%EMACS_SITE_LISPDIR%%/emu/pccl-20.el
+%%EMACS_SITE_LISPDIR%%/emu/pccl-20.elc
+%%EMACS_SITE_LISPDIR%%/emu/pces.el
+%%EMACS_SITE_LISPDIR%%/emu/pces.elc
+%%EMACS_SITE_LISPDIR%%/emu/pces-20.el
+%%EMACS_SITE_LISPDIR%%/emu/pces-20.elc
+%%EMACS_SITE_LISPDIR%%/emu/pces-e20.el
+%%EMACS_SITE_LISPDIR%%/emu/pces-e20.elc
+%%EMACS_SITE_LISPDIR%%/emu/pcustom.el
+%%EMACS_SITE_LISPDIR%%/emu/pcustom.elc
+%%EMACS_SITE_LISPDIR%%/emu/poe.el
+%%EMACS_SITE_LISPDIR%%/emu/poe.elc
+%%EMACS_SITE_LISPDIR%%/emu/poem.el
+%%EMACS_SITE_LISPDIR%%/emu/poem.elc
+%%EMACS_SITE_LISPDIR%%/emu/poem-e20.el
+%%EMACS_SITE_LISPDIR%%/emu/poem-e20.elc
+%%EMACS_SITE_LISPDIR%%/emu/poem-e20_3.el
+%%EMACS_SITE_LISPDIR%%/emu/poem-e20_3.elc
+%%EMACS_SITE_LISPDIR%%/emu/product.el
+%%EMACS_SITE_LISPDIR%%/emu/product.elc
+%%EMACS_SITE_LISPDIR%%/emu/pym.el
+%%EMACS_SITE_LISPDIR%%/emu/pym.elc
+%%EMACS_SITE_LISPDIR%%/emu/richtext.el
+%%EMACS_SITE_LISPDIR%%/emu/richtext.elc
+%%EMACS_SITE_LISPDIR%%/emu/static.el
+%%EMACS_SITE_LISPDIR%%/emu/static.elc
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README.en
 %%PORTDOCS%%%%DOCSDIR%%/README.ja
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 5a316f9c0901..2f67eb8765ad 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -7,24 +7,30 @@ PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	ashish@FreeBSD.org
+MAINTAINER=	emacs@FreeBSD.org
 COMMENT=	GNU editing macros
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	emacs25-[0-9]* emacs-nox11-[0-9]*
+CONFLICTS_INSTALL=	emacs emacs-canna emacs-nox
 
+FLAVORS=		full nox
+full_CONFLICTS_INSTALL=	emacs-devel_nox
+full_PKGNAMESUFFIX=	-devel
+nox_CONFLICTS_INSTALL=	emacs-devel
+nox_PKGNAMESUFFIX=	-devel_nox
+
+USES=		autoreconf:build cpe gmake makeinfo ncurses pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	6b8e9b7
+GH_TAGNAME=	b3fb0d4
 
+CPE_VENDOR=	gnu
 EMACS_VER=	27.0.50
-EMACS_REV=	20171118
+EMACS_REV=	20180122
 GNU_CONFIGURE=	yes
-USES=		autoreconf:build cpe gmake makeinfo ncurses pkgconfig
 INFO_PATH=	${DATADIR_REL}/info
-CPE_VENDOR=	gnu
 
 SUB_FILES=	sources.el
 SUB_LIST=	EMACS_VER=${EMACS_VER}
@@ -33,33 +39,29 @@ CONFIGURE_ARGS=	--with-gameuser=games:games
 
 PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
 
-INFO=	ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede	\
-	ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc	\
-	ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info	\
-	mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg	\
-	rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar	\
+INFO=	ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \
+	ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc \
+	ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \
+	mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg \
+	rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar \
 	srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
 
-MAKE_JOBS_UNSAFE=	yes
-
 OPTIONS_DEFINE=	ACL DBUS GNUTLS LCMS2 LLDB MODULES SOURCES THREADS X11 XML
-
-OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
+OPTIONS_DEFAULT=	ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK3 \
+			JPEG KQUEUE LCMS2 M17N MAGICK MODULES OSS OTF PNG \
+			SCROLLBARS SOURCES SVG THREADS TIFF X11 XFT XIM XML XPM
+OPTIONS_SUB=	YES
+OPTIONS_GROUP=	GRAPHICS NEEDX11
+OPTIONS_GROUP_GRAPHICS=	CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
+OPTIONS_GROUP_NEEDX11=	GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM XWIDGETS
+OPTIONS_RADIO=	FILENOTIFY SOUND X11TOOLKIT
 OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
-OPTIONS_RADIO_SOUND=		ALSA OSS
+OPTIONS_RADIO_SOUND=	ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
-OPTIONS_GROUP=			GRAPHICS NEEDX11
-OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
-OPTIONS_GROUP_NEEDX11=		GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM     \
-				XWIDGETS
-
-OPTIONS_DEFAULT=	ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2    \
-			JPEG KQUEUE LCMS2 M17N MAGICK MODULES OSS OTF PNG SCROLLBARS  \
-			SOURCES SVG THREADS TIFF X11 XFT XIM XML XPM
 
 ACL_DESC=	Access control list support
 CAIRO_DESC=	Experimental Cairo support    (implies PNG, XFT)
-FILENOTIFY_DESC=File notification support
+FILENOTIFY_DESC=	File notification support
 GCONF_DESC=	GConf configuration support
 GFILE_DESC=	File notification via gfile
 GRAPHICS_DESC=	Graphics support (each implies X11)
@@ -83,8 +85,6 @@ XAW_DESC=	Athena widgets
 XIM_DESC=	X Input Method Support
 XWIDGETS_DESC=	GTK widgets in Emacs buffers  (requires GTK3)
 
-OPTIONS_SUB=		YES
-
 ACL_CONFIGURE_ENABLE=	acl
 ALSA_CONFIGURE_ON=	--with-sound=alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
@@ -103,7 +103,7 @@ GIF_IMPLIES=		X11
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 GSETTINGS_USE=		GNOME=glib20
-GSETTINGS_CONFIGURE_WITH=gsettings
+GSETTINGS_CONFIGURE_WITH=	gsettings
 GSETTINGS_IMPLIES=	DBUS X11
 GTK2_USE=		GNOME=cairo,gtk20
 GTK2_USES=		gettext
@@ -141,7 +141,7 @@ OTF_IMPLIES=		X11 XFT
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 PNG_IMPLIES=		X11
-SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
+SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
 SCROLLBARS_IMPLIES=	X11
 SVG_USE=		GNOME=cairo,librsvg2
 SVG_CONFIGURE_WITH=	rsvg
@@ -176,10 +176,24 @@ XPM_USE=		XORG=xpm
 XPM_CONFIGURE_WITH=	xpm
 XPM_IMPLIES=		X11
 XWIDGETS_USE=		XORG=xcomposite
-XWIDGETS_CONFIGURE_WITH=xwidgets
+XWIDGETS_CONFIGURE_WITH=	xwidgets
 XWIDGETS_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 XWIDGETS_IMPLIES=	GTK3
 
+.if ${FLAVOR:U} == nox
+OPTIONS_EXCLUDE=	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
+CONFIGURE_ARGS+=	--with-sound=no --without-cairo --without-dbus \
+			--without-gconf --without-gif --without-gsettings \
+			--with-x-toolkit=no --without-jpeg --without-lcms2 \
+			--without-m17n-flt --without-imagemagick \
+			--without-libotf --without-png \
+			--without-toolkit-scroll-bars --without-rsvg \
+			--without-tiff --without-xim --without-xpm \
+			--without-xwidgets
+.endif
+
 .include <bsd.port.options.mk>
 
 # has graphics/ImageMagick been compiled with OPENMP?
@@ -203,7 +217,9 @@ post-patch-X11-off:
 
 post-install-SOURCES-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
+	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \
+		${STAGEDIR}${DATADIR}/${EMACS_VER}/src
+	${INSTALL_DATA} ${WRKDIR}/sources.el \
+		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
 
 .include <bsd.port.mk>
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 62b1c98cd0a8..ca5ed042b4dc 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1510982076
-SHA256 (emacs-mirror-emacs-27.0.50.20171118-6b8e9b7_GH0.tar.gz) = 8b52b9a2e6c6a2f6c4cc37ed093f42656dc19541e91f207fc7a2735597349309
-SIZE (emacs-mirror-emacs-27.0.50.20171118-6b8e9b7_GH0.tar.gz) = 39857493
+TIMESTAMP = 1516592732
+SHA256 (emacs-mirror-emacs-27.0.50.20180122-b3fb0d4_GH0.tar.gz) = fd8eeb871e5044bb92050b870c9cfc507d6ad1eee62e3b4990cb34248bc63987
+SIZE (emacs-mirror-emacs-27.0.50.20180122-b3fb0d4_GH0.tar.gz) = 39977340
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 65fbfe4497ac..ab1903df5029 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -17,6 +17,11 @@ man/man1/emacsclient.1.gz
 man/man1/etags.1.gz
 share/appdata/emacs.appdata.xml
 share/applications/emacs.desktop
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-buffer.gdb
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.icon
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.service
 %%DATADIR%%/%%EMACS_VER%%/etc/AUTHORS
 %%DATADIR%%/%%EMACS_VER%%/etc/CALC-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/CENSORSHIP
@@ -196,11 +201,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color.ti
 %%DATADIR%%/%%EMACS_VER%%/etc/edt-user.el
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-buffer.gdb
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.icon
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.service
 %%DATADIR%%/%%EMACS_VER%%/etc/enriched.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/forms/README
 %%DATADIR%%/%%EMACS_VER%%/etc/forms/forms-d2.dat
@@ -1617,8 +1617,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pcase.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pcase.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/pixel-scroll.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/pixel-scroll.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/radix-tree.el.gz
@@ -1655,10 +1653,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/testcover.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer-list.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer-list.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tq.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tq.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/trace.el.gz
@@ -1751,6 +1749,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-lang.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-list.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-list.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-log.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-log.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-match.el.gz
@@ -1972,10 +1971,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-picon.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-range.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-range.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-registry.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-registry.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-score.el.gz
@@ -2132,16 +2131,16 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/hippie-exp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ido.el.gz
@@ -2663,6 +2662,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz
@@ -2673,8 +2674,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
@@ -2693,10 +2692,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/mailcap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/mailcap.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/net-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/net-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/netrc.el.gz
@@ -2719,8 +2718,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/nsm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/pinentry.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/pinentry.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/pop3.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/pop3.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/puny.el.gz
@@ -2771,6 +2768,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tls.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-adb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-adb.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-archive.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-archive.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cache.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cache.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cmds.el.gz
@@ -3210,6 +3209,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/pcmpl-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/pcomplete.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/pcomplete.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/pixel-scroll.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/pixel-scroll.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/5x5.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/5x5.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/animate.el.gz
@@ -3352,10 +3353,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/executable.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/gdb-mi.el.gz
@@ -3450,9 +3451,9 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-def.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/recentf.el.gz
@@ -3563,6 +3564,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/screen.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sun.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sun.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tty-colors.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tty-colors.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tvi970.el.gz
@@ -3686,8 +3689,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/timezone.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tmm.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/tmm.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tool-bar.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/tool-bar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tooltip.el.gz
@@ -3893,6 +3894,9 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
 %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
+%%DATADIR%%/%%EMACS_VER%%/src/json.c
+%%DATADIR%%/%%EMACS_VER%%/src/ptr-bounds.h
+%%DATADIR%%/%%EMACS_VER%%/src/w32cygwinx.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
@@ -4025,10 +4029,10 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sysselect.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syssignal.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sysstdio.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systime.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systty.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systime.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systty.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syswait.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/term.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/termcap.c
@@ -4053,8 +4057,6 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h
@@ -4099,6 +4101,8 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xsmfns.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
 %%DATADIR%%/site-lisp/subdirs.el
 share/icons/hicolor/128x128/apps/emacs.png
 share/icons/hicolor/16x16/apps/emacs.png
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
deleted file mode 100644
index 46a90f2dd270..000000000000
--- a/editors/emacs-nox11/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: phoffman@proper.com
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-nox11
-
-CONFLICTS_INSTALL=	emacs-[0-9]* emacs-devel-[0-9]*
-
-OPTIONS_EXCLUDE=	CAIRO GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK    \
-			MOTIF OTF PNG SCROLLBARS SVG TIFF X11 XAW XAW3D XFT XIM \
-			XPM XWIDGETS
-OPTIONS_DEFAULT=	GNUTLS MODULES SOURCES XML
-
-MASTERDIR=		${.CURDIR}/../emacs
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 57b477985a14..b4ca81a8321d 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,67 +3,69 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU
-PKGNAMESUFFIX?=	25
 
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	ashish@FreeBSD.org
+MAINTAINER=	emacs@FreeBSD.org
 COMMENT=	GNU editing macros
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS_INSTALL?=	emacs-devel-[0-9]* emacs-nox11-[0-9]*
+BROKEN_aarch64=	Fails to link: missing sbrk
+CONFLICTS_INSTALL=	emacs-devel emacs-devel_nox
 
-BROKEN_aarch64=		Fails to link: missing sbrk
+FLAVORS=		full canna nox
+full_CONFLICTS_INSTALL=	emacs-canna emacs-nox
+canna_CONFLICTS_INSTALL=	emacs emacs-nox
+canna_PKGNAMESUFFIX=	-canna
+canna_DESCR=		${.CURDIR}/pkg-descr-canna
+canna_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
+nox_CONFLICTS_INSTALL=	emacs emacs-canna
+nox_PKGNAMESUFFIX=	-nox
 
+USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
+
+CPE_VENDOR=	gnu
 EMACS_VER=	25.3
 GNU_CONFIGURE=	yes
-USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
-# Building with GCC 4.6+ requires it; remove after 9.3 EOL
-LDFLAGS+=	${ncurses_ARGS:Mport:C/.+/-ltinfo/}
 INFO_PATH=	${DATADIR_REL}/info
-CPE_VENDOR=	gnu
 
 SUB_FILES=	sources.el
-SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
-SUB_LIST+=	EMACS_VER=${EMACS_VER} # sources.el
+SUB_LIST=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} \
+		EMACS_VER=${EMACS_VER} # sources.el
 
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-gameuser=games:games
 
 PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
 
-INFO=	ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede	\
-	ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc	\
-	ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info	\
-	mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg	\
-	rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar	\
+INFO=	ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \
+	ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc \
+	ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \
+	mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg \
+	rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar \
 	srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
 
-OPTIONS_DEFINE=	ACL CANNA DBUS GNUTLS LLDB MODULES SOURCES X11 XML
-
-OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
+OPTIONS_DEFINE=	ACL DBUS GNUTLS LLDB MODULES SOURCES X11 XML
+OPTIONS_DEFAULT=	ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG KQUEUE  \
+			M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
+			TIFF X11 XFT XIM XML XPM
+OPTIONS_SUB=	YES
+OPTIONS_GROUP=	GRAPHICS NEEDX11
+OPTIONS_GROUP_GRAPHICS=	CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
+OPTIONS_GROUP_NEEDX11=	GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM XWIDGETS
+OPTIONS_RADIO=	FILENOTIFY SOUND X11TOOLKIT
 OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
-OPTIONS_RADIO_SOUND=		ALSA OSS
+OPTIONS_RADIO_SOUND=	ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
-OPTIONS_GROUP=			GRAPHICS NEEDX11
-OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
-OPTIONS_GROUP_NEEDX11=		GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM     \
-				XWIDGETS
-
-OPTIONS_DEFAULT?=	ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG KQUEUE    \
-			M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG  \
-			TIFF X11 XFT XIM XML XPM
 
 ACL_DESC=	Access control list support
 CAIRO_DESC=	Experimental Cairo library support     (implies PNG, XFT)
 CANNA_DESC=	Japanese input support
-FILENOTIFY_DESC=File notification support
+FILENOTIFY_DESC=	File notification support
 GFILE_DESC=	File notification via gfile
 GRAPHICS_DESC=	Graphics support (each implies X11)
 GSETTINGS_DESC=	GSettings API for application settings
@@ -75,30 +77,22 @@ M17N_DESC=	M17N for text-shaping                  (implies XFT)
 MODULES_DESC=	Dynamic modules support
 NEEDX11_DESC=	Other X11-dependent (each implies X11)
 OTF_DESC=	Opentype fonts                         (implies XFT)
-SCROLLBARS_DESC=Toolkit scroll-bars
+SCROLLBARS_DESC=	Toolkit scroll-bars
 SOURCES_DESC=	Install sources
 SVG_DESC=	Scalable vector graphics support       (implies PNG)
 X11_DESC=	X window system support
-X11TOOLKIT_DESC=X11 toolkit (each implies X11)
+X11TOOLKIT_DESC=	X11 toolkit (each implies X11)
 XAW3D_DESC=	Athena3D widgets
 XAW_DESC=	Athena widgets
 XIM_DESC=	X Input Method
 XWIDGETS_DESC=	GTK widgets in Emacs buffers           (requires GTK3)
 
-OPTIONS_SUB=		YES
-
 ACL_CONFIGURE_ENABLE=	acl
 ALSA_CONFIGURE_ON=	--with-sound=alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 CAIRO_USE=		GNOME=cairo
 CAIRO_CONFIGURE_WITH=	cairo
 CAIRO_IMPLIES=		PNG XFT X11
-CANNA_CONFIGURE_WITH=	canna
-CANNA_PATCH_SITES=	http://www.gentei.org/~yuuji/software/emacs25canna/ \
-			http://distfiles.pirateparty.in/ashish/ \
-			LOCAL/ashish
-CANNA_PATCHFILES=	emacs25.1canna-20160919.diff.gz
-CANNA_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
 GCONF_USE=		GNOME=gconf2
@@ -111,7 +105,7 @@ GIF_IMPLIES=		X11
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 GSETTINGS_USE=		GNOME=glib20
-GSETTINGS_CONFIGURE_WITH=gsettings
+GSETTINGS_CONFIGURE_WITH=	gsettings
 GSETTINGS_IMPLIES=	DBUS X11
 GTK2_USE=		GNOME=cairo,gtk20
 GTK2_USES=		gettext-runtime
@@ -147,7 +141,7 @@ OTF_IMPLIES=		X11 XFT
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 PNG_IMPLIES=		X11
-SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
+SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
 SCROLLBARS_IMPLIES=	X11
 SVG_USE=		GNOME=cairo,librsvg2
 SVG_CONFIGURE_WITH=	rsvg
@@ -181,10 +175,35 @@ XPM_USE=		XORG=xpm
 XPM_CONFIGURE_WITH=	xpm
 XPM_IMPLIES=		X11
 XWIDGETS_USE=		XORG=xcomposite
-XWIDGETS_CONFIGURE_WITH=xwidgets
+XWIDGETS_CONFIGURE_WITH=	xwidgets
 XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 XWIDGETS_IMPLIES=	GTK3
 
+.if ${FLAVOR:U} == canna
+CONFIGURE_WITH=		canna
+PATCH_DIST_STRIP=	-p1
+PATCH_SITES=		http://www.gentei.org/~yuuji/software/emacs25canna/ \
+			http://distfiles.pirateparty.in/ashish/ \
+			LOCAL/ashish
+PATCHFILES=		emacs25.2canna-20170507.diff.gz
+PLIST_FILES+=		${DATADIR}/${EMACS_VER}/lisp/canna.el.gz \
+			${DATADIR}/${EMACS_VER}/lisp/canna.elc \
+			${DATADIR}/${EMACS_VER}/lisp/isearch-ext.el.gz \
+			${DATADIR}/${EMACS_VER}/lisp/isearch-ext.elc \
+			${SOURCES}${DATADIR}/${EMACS_VER}/src/canna.c
+.elif ${FLAVOR:U} == nox
+OPTIONS_EXCLUDE=	ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
+			M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF XAW \
+			XAW3D X11 XFT XIM XPM XWIDGETS
+CONFIGURE_ARGS+=	--with-sound=no --without-cairo --without-dbus \
+			--without-gconf --without-gif --without-gsettings \
+			--with-x-toolkit=no --without-jpeg --without-m17n-flt \
+			--without-imagemagick --without-libotf --without-png \
+			--without-toolkit-scroll-bars --without-rsvg \
+			--without-tiff --without-xim --without-xpm \
+			--without-xwidgets
+.endif
+
 .include <bsd.port.options.mk>
 
 # has graphics/ImageMagick been compiled with OPENMP?
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 4be0987b8d82..3e89cc3f334e 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1505178274
 SHA256 (emacs-25.3.tar.xz) = 253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b
 SIZE (emacs-25.3.tar.xz) = 42854740
-SHA256 (emacs25.1canna-20160919.diff.gz) = b0ef90be88e8b947d41805713735a79c6f78e2401b749d5e6d1e3fd1bc7e5f32
-SIZE (emacs25.1canna-20160919.diff.gz) = 31671
+SHA256 (emacs25.2canna-20170507.diff.gz) = 16e05ef901fddafb16d8384ad9c047769e4c0757939036d1f8128359801bfd86
+SIZE (emacs25.2canna-20170507.diff.gz) = 31655
diff --git a/editors/emacs/pkg-descr b/editors/emacs/pkg-descr
index 417949c10234..ca8a268f4774 100644
--- a/editors/emacs/pkg-descr
+++ b/editors/emacs/pkg-descr
@@ -1,17 +1,17 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
+GNU Emacs is an extensible, customizable, free/libre text editor.  At its
+core is an interpreter for Emacs Lisp, a dialect of the Lisp programming
+language with extensions to support text editing.
 
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
+The features of GNU Emacs include:
+  - content-aware editing modes, including syntax coloring, for many file
+    types
+  - complete built-in documentation, including a tutorial for new users
+  - full Unicode support for nearly all human scripts
+  - powerful customizability, using Emacs Lisp code or a graphical
+    interface
+  - a vast ecosystem of functionality beyond text editing, including a
+    project planner, mail and news reader, debugger interface, calendar,
+    even a psychotherapist, and more
+  - a packaging system for downloading and installing extensions.
 
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
-
-Canna support is contributed by Yuji TAKANO (takachan@running-dog.net).
-
-WWW: http://www.gnu.org/software/emacs/
+WWW: https://www.gnu.org/software/emacs/
diff --git a/editors/emacs/pkg-descr-canna b/editors/emacs/pkg-descr-canna
new file mode 100644
index 000000000000..3194b00ce438
--- /dev/null
+++ b/editors/emacs/pkg-descr-canna
@@ -0,0 +1,19 @@
+GNU Emacs is an extensible, customizable, free/libre text editor.  At its
+core is an interpreter for Emacs Lisp, a dialect of the Lisp programming
+language with extensions to support text editing.
+
+The features of GNU Emacs include:
+  - content-aware editing modes, including syntax coloring, for many file
+    types
+  - complete built-in documentation, including a tutorial for new users
+  - full Unicode support for nearly all human scripts
+  - powerful customizability, using Emacs Lisp code or a graphical
+    interface
+  - a vast ecosystem of functionality beyond text editing, including a
+    project planner, mail and news reader, debugger interface, calendar,
+    even a psychotherapist, and more
+  - a packaging system for downloading and installing extensions.
+
+Canna support is contributed by Yuji TAKANO (takachan@running-dog.net).
+
+WWW: https://www.gnu.org/software/emacs/
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 60370c8cfd53..78dc13eb5707 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -1201,8 +1201,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/timeclock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/todo-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/todo-mode.elc
-%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/canna.el.gz
-%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/canna.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/case-table.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/case-table.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cdl.el.gz
@@ -2392,8 +2390,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.elc
-%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-ext.el.gz
-%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-ext.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/jit-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/jit-lock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/jka-cmpr-hook.el.gz
@@ -3980,7 +3976,6 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bytecode.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callint.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callproc.c
-%%CANNA%%%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/canna.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/casefiddle.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/casetab.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/category.c
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index ba3e67effa1d..bdf9cac08ce2 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -2,194 +2,54 @@
 # $FreeBSD$
 
 PORTNAME=	flim
-PORTVERSION=	${FLIM_VER}
-PORTREVISION=	16
+PORTVERSION=	1.14.9
+PORTREVISION=	17
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
-MASTER_SITES=	http://git.chise.org/elisp/dist/flim/flim-1.14/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+MASTER_SITES=	http://git.chise.org/elisp/dist/${PORTNAME}/${PORTNAME}-${DISTVERSION:R}/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Message representation or encoding elisp library for emacs
 
 LICENSE=	GPLv2
 
-PORTCLASS?=	master
+BUILD_DEPENDS=	apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR} \
+		nkf:japanese/nkf
+RUN_DEPENDS=	apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR}
 
-USES=		cpe makeinfo
-NO_ARCH=	yes
+USES=		cpe emacs makeinfo
 
 CPE_VENDOR=	gnu
+NO_ARCH=	yes
 
-# distfile version
-FLIM_VER=	${FLIM_TRUNK}.9
-FLIM_TRUNK=	1.14
-# document install directory by install-doc target
-FLIMDOCDIR?=	share/doc/flim
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-# flim lispdir
-FLIM_LISPDIR=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
-FLIM_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
+ALL_TARGET=	elc
 
-PORTCLASS?=	master
-USE_EMACS=	yes
+MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" \
+		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}"
 
-EMACS_MASTERDIR_PKGFILES=YES
-DESCR=		${PKGDIR}/pkg-descr
+INFO=		mime-en mime-ja
 
 OPTIONS_DEFINE=	DOCS
 
-# target name for make build
-ALL_TARGET?=	elc
-# environments
-PLIST_SUB+=	FLIMDOCDIR=${FLIMDOCDIR} FLIM_COOKIE=${FLIM_COOKIE}
-MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBASE}" \
-		LISPDIR="${STAGEDIR}${FLIM_LISPDIR}" \
-		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${FLIM_VERSION_SPECIFIC_LISPDIR}"
-
-.include <bsd.port.pre.mk>
-
-PLIST=		${PKGDIR}/pkg-plist.emacs21
-# depends on apel
-BUILD_DEPENDS+=	apel-${EMACS_PORT_NAME}>0:editors/apel
-RUN_DEPENDS+=	apel-${EMACS_PORT_NAME}>0:editors/apel
-
-.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
-# info files JIS to EUC
-BUILD_DEPENDS+=	nkf:japanese/nkf
-.endif
-
-# makeinfo stuff
-MAKEINFO_FLAGS=		--no-split --no-validate
-MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
-MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
-
-.if ! defined(EMACS_PACKAGESDIR) || ! defined(MANIFEST)
-INFO=		mime-en
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
-INFO+=		mime-ja
-.endif
-.endif
-
-.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
-pre-build: pkg-el-copy
-.endif
-
-.if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
-post-build: info-build-by-emacs
-.else
-post-build: info-build
-.endif
-
-.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
-pre-install: mkdir-site-packages
-.endif
-.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
-pre-install: pkg-el-install
-.endif
-
-POST_INSTALL_TARGET=	pkgcookie-install
-.if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
-POST_INSTALL_TARGET+=	info-package-install manifest-install
-.else
-POST_INSTALL_TARGET+=	info-install
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-POST_INSTALL_TARGET+=	doc-install
-.endif
-
-post-install: ${POST_INSTALL_TARGET}
-
-###############################################################################
-#
-# miscellaneous local functions
-#
-info-build:
+post-build:
 	@(cd ${WRKSRC} ; \
-	for i in mime-en.texi; do \
-		${MV} $${i} $${i}.jis ; \
-		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
-	done)
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
-	@(cd ${WRKSRC} ; \
-	for i in mime-ja.texi; do \
-		${MV} $${i} $${i}.jis ; \
-		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
+	for i in mime-en.texi mime-ja.texi; do \
+		${CAT} $${i} | nkf -e > $${i}.jis ; \
+		${MAKEINFO} --no-split --no-validate $${i}.jis ; \
 	done)
-.endif
 
-info-build-by-emacs:
-	@(cd ${WRKSRC} ; \
-	for i in mime-en.texi; do \
-		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
-	done)
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
+post-install:
 	@(cd ${WRKSRC} ; \
-	for i in mime-ja.texi; do \
-		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
-	done)
-.endif
-
-pkg-el-copy:
-	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
-	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
-	fi)
-
-pkg-el-install:
-	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
-	${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
-	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
-		${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
-	fi)
-
-mkdir-site-packages:
-	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
-		${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
+	for i in mime-en.info mime-ja.info; do \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${PREFIX}/info ; \
 	done)
 
-doc-install:
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/${FLIMDOCDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* VERSION ; do \
-		${INSTALL_DATA} $${i} ${STAGEDIR}${LOCALBASE}/${FLIMDOCDIR}/ ; \
+		${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}/ ; \
 	done)
 
-info-install:
-	@(cd ${WRKSRC} ; \
-	for i in mime-en.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \
-	done)
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
-	@(cd ${WRKSRC} ; \
-	for i in mime-ja.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \
-	done)
-.endif
-
-info-package-install:
-	@(cd ${WRKSRC} ; \
-	for i in mime-en.info mime-ja.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} \
-				${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
-	done ; \
-	${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
-	for i in mime-en.texi mime-ja.texi; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} \
-				${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
-	done)
-
-manifest-install:
-	@${RM} ${WRKDIR}/${MANIFEST}
-	@${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
-		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
-	${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
-		${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
-
-pkgcookie-install:
-# install package-cookie
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/flim
-	@${TOUCH} ${STAGEDIR}${LOCALBASE}/share/flim/${FLIM_COOKIE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/flim/files/_pkg.el b/editors/flim/files/_pkg.el
deleted file mode 100644
index 06bed35ab245..000000000000
--- a/editors/flim/files/_pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;###autoload
-(package-provide 'flim
-                 :version 1.14
-                 :type 'regular)
diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist
new file mode 100644
index 000000000000..b1112f3bb69b
--- /dev/null
+++ b/editors/flim/pkg-plist
@@ -0,0 +1,77 @@
+%%EMACS_SITE_LISPDIR%%/flim/eword-decode.el
+%%EMACS_SITE_LISPDIR%%/flim/eword-decode.elc
+%%EMACS_SITE_LISPDIR%%/flim/eword-encode.el
+%%EMACS_SITE_LISPDIR%%/flim/eword-encode.elc
+%%EMACS_SITE_LISPDIR%%/flim/hex-util.el
+%%EMACS_SITE_LISPDIR%%/flim/hex-util.elc
+%%EMACS_SITE_LISPDIR%%/flim/hmac-def.el
+%%EMACS_SITE_LISPDIR%%/flim/hmac-def.elc
+%%EMACS_SITE_LISPDIR%%/flim/hmac-md5.el
+%%EMACS_SITE_LISPDIR%%/flim/hmac-md5.elc
+%%EMACS_SITE_LISPDIR%%/flim/hmac-sha1.el
+%%EMACS_SITE_LISPDIR%%/flim/hmac-sha1.elc
+%%EMACS_SITE_LISPDIR%%/flim/luna.el
+%%EMACS_SITE_LISPDIR%%/flim/luna.elc
+%%EMACS_SITE_LISPDIR%%/flim/lunit.el
+%%EMACS_SITE_LISPDIR%%/flim/lunit.elc
+%%EMACS_SITE_LISPDIR%%/flim/md4.el
+%%EMACS_SITE_LISPDIR%%/flim/md4.elc
+%%EMACS_SITE_LISPDIR%%/flim/md5.el
+%%EMACS_SITE_LISPDIR%%/flim/md5.elc
+%%EMACS_SITE_LISPDIR%%/flim/mel-b-ccl.el
+%%EMACS_SITE_LISPDIR%%/flim/mel-b-ccl.elc
+%%EMACS_SITE_LISPDIR%%/flim/mel-b-el.el
+%%EMACS_SITE_LISPDIR%%/flim/mel-b-el.elc
+%%EMACS_SITE_LISPDIR%%/flim/mel-g.el
+%%EMACS_SITE_LISPDIR%%/flim/mel-g.elc
+%%EMACS_SITE_LISPDIR%%/flim/mel-q-ccl.el
+%%EMACS_SITE_LISPDIR%%/flim/mel-q-ccl.elc
+%%EMACS_SITE_LISPDIR%%/flim/mel-q.el
+%%EMACS_SITE_LISPDIR%%/flim/mel-q.elc
+%%EMACS_SITE_LISPDIR%%/flim/mel-u.el
+%%EMACS_SITE_LISPDIR%%/flim/mel-u.elc
+%%EMACS_SITE_LISPDIR%%/flim/mel.el
+%%EMACS_SITE_LISPDIR%%/flim/mel.elc
+%%EMACS_SITE_LISPDIR%%/flim/mime-conf.el
+%%EMACS_SITE_LISPDIR%%/flim/mime-conf.elc
+%%EMACS_SITE_LISPDIR%%/flim/mime-def.el
+%%EMACS_SITE_LISPDIR%%/flim/mime-def.elc
+%%EMACS_SITE_LISPDIR%%/flim/mime-parse.el
+%%EMACS_SITE_LISPDIR%%/flim/mime-parse.elc
+%%EMACS_SITE_LISPDIR%%/flim/mime.el
+%%EMACS_SITE_LISPDIR%%/flim/mime.elc
+%%EMACS_SITE_LISPDIR%%/flim/mmbuffer.el
+%%EMACS_SITE_LISPDIR%%/flim/mmbuffer.elc
+%%EMACS_SITE_LISPDIR%%/flim/mmcooked.el
+%%EMACS_SITE_LISPDIR%%/flim/mmcooked.elc
+%%EMACS_SITE_LISPDIR%%/flim/mmexternal.el
+%%EMACS_SITE_LISPDIR%%/flim/mmexternal.elc
+%%EMACS_SITE_LISPDIR%%/flim/mmgeneric.el
+%%EMACS_SITE_LISPDIR%%/flim/mmgeneric.elc
+%%EMACS_SITE_LISPDIR%%/flim/ntlm.el
+%%EMACS_SITE_LISPDIR%%/flim/ntlm.elc
+%%EMACS_SITE_LISPDIR%%/flim/qmtp.el
+%%EMACS_SITE_LISPDIR%%/flim/qmtp.elc
+%%EMACS_SITE_LISPDIR%%/flim/sasl-cram.el
+%%EMACS_SITE_LISPDIR%%/flim/sasl-cram.elc
+%%EMACS_SITE_LISPDIR%%/flim/sasl-digest.el
+%%EMACS_SITE_LISPDIR%%/flim/sasl-digest.elc
+%%EMACS_SITE_LISPDIR%%/flim/sasl-ntlm.el
+%%EMACS_SITE_LISPDIR%%/flim/sasl-ntlm.elc
+%%EMACS_SITE_LISPDIR%%/flim/sasl-scram.el
+%%EMACS_SITE_LISPDIR%%/flim/sasl-scram.elc
+%%EMACS_SITE_LISPDIR%%/flim/sasl.el
+%%EMACS_SITE_LISPDIR%%/flim/sasl.elc
+%%EMACS_SITE_LISPDIR%%/flim/sha1-el.el
+%%EMACS_SITE_LISPDIR%%/flim/sha1-el.elc
+%%EMACS_SITE_LISPDIR%%/flim/sha1.el
+%%EMACS_SITE_LISPDIR%%/flim/sha1.elc
+%%EMACS_SITE_LISPDIR%%/flim/smtp.el
+%%EMACS_SITE_LISPDIR%%/flim/smtp.elc
+%%EMACS_SITE_LISPDIR%%/flim/std11.el
+%%EMACS_SITE_LISPDIR%%/flim/std11.elc
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README.en
+%%PORTDOCS%%%%DOCSDIR%%/README.ja
+%%PORTDOCS%%%%DOCSDIR%%/VERSION
diff --git a/editors/flim/pkg-plist.emacs21 b/editors/flim/pkg-plist.emacs21
deleted file mode 100644
index 59d6b763bf9a..000000000000
--- a/editors/flim/pkg-plist.emacs21
+++ /dev/null
@@ -1,78 +0,0 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/md4.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/md4.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/ntlm.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/ntlm.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-ntlm.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-ntlm.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.elc
-%%PORTDOCS%%%%FLIMDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%FLIMDOCDIR%%/NEWS
-%%PORTDOCS%%%%FLIMDOCDIR%%/README.en
-%%PORTDOCS%%%%FLIMDOCDIR%%/README.ja
-%%PORTDOCS%%%%FLIMDOCDIR%%/VERSION
-share/flim/%%FLIM_COOKIE%%
diff --git a/editors/paredit-mode.el/Makefile b/editors/paredit-mode.el/Makefile
index 3a3d53437968..82d8e6cc1120 100644
--- a/editors/paredit-mode.el/Makefile
+++ b/editors/paredit-mode.el/Makefile
@@ -2,9 +2,10 @@
 
 PORTNAME=	paredit-mode.el
 PORTVERSION=	24
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://mumble.net/~campbell/emacs/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	paredit-${PORTVERSION}.el
 EXTRACT_SUFX=
 EXTRACT_ONLY=
@@ -12,11 +13,11 @@ EXTRACT_ONLY=
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Minor mode for performing editing of S-expression data
 
-USE_EMACS=	yes
+USES=		emacs
 
 NO_BUILD=	yes
 
-PLIST_FILES=	%%EMACS_SITE_LISPDIR%%/paredit.el
+PLIST_FILES=	${EMACS_SITE_LISPDIR}/paredit.el
 
 do-install:
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/paredit.el
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 724b3b28eb05..4681ca3a245a 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	psgml
 PORTVERSION=	1.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}-1.3.2
 
 PATCH_SITES=	LOCAL/hrs
@@ -17,7 +17,8 @@ COMMENT=	Major mode for editing SGML and XML documents for Emacs
 
 LICENSE=	GPLv2
 
-USE_EMACS=	yes
+USES=		emacs
+
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--lispdir=${PSGML_LISPDIR}
 CONFIGURE_ENV=	EMACS=${EMACS_CMD}
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 80bd8fca599f..5c4d1ccb1dc0 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -6,165 +6,53 @@ PORTVERSION=	${SEMI_VER}
 PORTREVISION=	19
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	SEMI, Library of MIME feature for GNU Emacs for emacs
 
 LICENSE=	GPLv2
 
-USES=		makeinfo
+BUILD_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR} \
+		nkf:japanese/nkf
+RUN_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
 
-PORTCLASS?=	master
+USES=		emacs makeinfo
+
+NO_ARCH=	yes
 
-# distfile version
 FLIM_TRUNK=	1.14
-SEMI_TRUNK=	1.14
 SEMI_VER=	${SEMI_TRUNK}.6
-# document install directory by install-doc target
-SEMIDOCDIR?=	share/doc/semi
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages
-# semi lispdir
-SEMI_LISPDIR=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
-SEMI_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
+SEMI_TRUNK=	1.14
 
-USE_EMACS=	yes
+ALL_TARGET=	elc
 
-EMACS_MASTERDIR_PKGFILES=YES
-DESCR=		${PKGDIR}/pkg-descr
+MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" \
+		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${EMACS_VERSION_SITE_LISPDIR}"
 
-# target name for make build
-ALL_TARGET?=	elc
-# environments
-PLIST_SUB+=	SEMIDOCDIR=${SEMIDOCDIR} SEMI_COOKIE=${SEMI_COOKIE}
-MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBASE}" \
-		LISPDIR="${STAGEDIR}${SEMI_LISPDIR}" \
-		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${SEMI_VERSION_SPECIFIC_LISPDIR}"
+INFO=		mime-ui-en mime-ui-ja
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-PLIST=		${PKGDIR}/pkg-plist.emacs20
-# depends on flim
-BUILD_DEPENDS+=	flim-${EMACS_PORT_NAME}>0:editors/flim
-RUN_DEPENDS+=	flim-${EMACS_PORT_NAME}>0:editors/flim
-
-.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
-# info files JIS to EUC
-BUILD_DEPENDS+=	nkf:japanese/nkf
-.endif
-
-MAKEINFO_FLAGS=		--no-split --no-validate
-MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
-MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
-
-.if ! defined(EMACS_PACKAGESDIR) || ! defined(MANIFEST)
-INFO=		mime-ui-en
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
-INFO+=		mime-ui-ja
-.endif
-.endif
-
 post-build:
-.if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
-	@${MAKE} -C ${.CURDIR} info-build-by-emacs
-.else
-	@${MAKE} -C ${.CURDIR} info-build
-.endif
-
-pre-install:
-.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
-	@${MAKE} -C ${.CURDIR} mkdir-site-packages
-.endif
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/semi
-	@${TOUCH} ${STAGEDIR}${LOCALBASE}/share/semi/${SEMI_COOKIE}
-.if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
-	@${MAKE} -C ${.CURDIR} info-package-install
-	@${MAKE} -C ${.CURDIR} manifest-install
-.else
-	@${MAKE} -C ${.CURDIR} info-install
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MAKE} -C ${.CURDIR} doc-install
-.endif
-
-###############################################################################
-#
-# miscellaneous local functions
-#
-info-build:
 	@(cd ${WRKSRC} ; \
-	for i in mime-ui-en.texi; do \
-		${MV} $${i} $${i}.jis ; \
-		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
-	done)
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
-	@(cd ${WRKSRC} ; \
-	for i in mime-ui-ja.texi; do \
-		${MV} $${i} $${i}.jis ; \
-		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
+	for i in mime-ui-en.texi mime-ui-ja.texi; do \
+		${CAT} $${i} | nkf -e > $${i}.jis ; \
+		${MAKEINFO} --no-split --no-validate $${i}.jis ; \
 	done)
-.endif
 
-info-build-by-emacs:
-	@(cd ${WRKSRC} ; \
-	for i in mime-ui-en.texi; do \
-		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
-	done)
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
+post-install:
 	@(cd ${WRKSRC} ; \
-	for i in mime-ui-ja.texi; do \
-		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
-	done)
-.endif
-
-mkdir-site-packages:
-	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
-		${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
+	for i in mime-ui-en.info mime-ui-ja.info; do \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${PREFIX}/info ; \
 	done)
 
-doc-install:
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/${SEMIDOCDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
-		${INSTALL_DATA} $${i} ${STAGEDIR}${LOCALBASE}/${SEMIDOCDIR}/ ; \
-	done)
-
-info-install:
-	@(cd ${WRKSRC} ; \
-	for i in mime-ui-en.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \
+		${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}/ ; \
 	done)
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
-	@(cd ${WRKSRC} ; \
-	for i in mime-ui-ja.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \
-	done)
-.endif
-
-info-package-install:
-	@(cd ${WRKSRC} ; \
-	for i in mime-ui-en.info mime-ui-ja.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} \
-			${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
-	done ; \
-	${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
-	for i in mime-ui-en.texi mime-ui-ja.texi; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} \
-			${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
-	done)
-
-manifest-install:
-	@${RM} ${WRKDIR}/${MANIFEST}
-	@${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
-		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
-	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
-		${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/semi/pkg-plist b/editors/semi/pkg-plist
new file mode 100644
index 000000000000..47d19ee55814
--- /dev/null
+++ b/editors/semi/pkg-plist
@@ -0,0 +1,48 @@
+%%EMACS_SITE_LISPDIR%%/semi/mail-mime-setup.el
+%%EMACS_SITE_LISPDIR%%/semi/mail-mime-setup.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-bbdb.el
+@rmtry %%EMACS_SITE_LISPDIR%%/semi/mime-bbdb.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-edit.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-edit.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-image.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-image.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-partial.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-partial.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-pgp.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-pgp.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-play.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-play.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-setup.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-setup.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-view.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-view.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-w3.el
+@rmtry %%EMACS_SITE_LISPDIR%%/semi/mime-w3.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg-def.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg-def.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg-gpg.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg-gpg.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg-parse.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg-parse.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp5.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp5.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg.elc
+%%EMACS_SITE_LISPDIR%%/semi/postpet.el
+%%EMACS_SITE_LISPDIR%%/semi/postpet.elc
+%%EMACS_SITE_LISPDIR%%/semi/semi-def.el
+%%EMACS_SITE_LISPDIR%%/semi/semi-def.elc
+%%EMACS_SITE_LISPDIR%%/semi/semi-setup.el
+%%EMACS_SITE_LISPDIR%%/semi/semi-setup.elc
+%%EMACS_SITE_LISPDIR%%/semi/signature.el
+%%EMACS_SITE_LISPDIR%%/semi/signature.elc
+%%EMACS_SITE_LISPDIR%%/semi/smime.el
+%%EMACS_SITE_LISPDIR%%/semi/smime.elc
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README.en
+%%PORTDOCS%%%%DOCSDIR%%/README.ja
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/VERSION
diff --git a/editors/semi/pkg-plist.emacs20 b/editors/semi/pkg-plist.emacs20
deleted file mode 100644
index 990f1fbb73b2..000000000000
--- a/editors/semi/pkg-plist.emacs20
+++ /dev/null
@@ -1,49 +0,0 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.el
-@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el
-@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.elc
-%%PORTDOCS%%%%SEMIDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%SEMIDOCDIR%%/NEWS
-%%PORTDOCS%%%%SEMIDOCDIR%%/README.en
-%%PORTDOCS%%%%SEMIDOCDIR%%/README.ja
-%%PORTDOCS%%%%SEMIDOCDIR%%/TODO
-%%PORTDOCS%%%%SEMIDOCDIR%%/VERSION
-share/semi/%%SEMI_COOKIE%%
diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index 8ccfa4974ead..d72136f61d92 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	slime
 PORTVERSION=	2.15
-PORTREVISION=	2
 DISTVERSIONPREFIX=v
+PORTREVISION=	3
 CATEGORIES=	editors elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Superior Lisp Interaction Mode for Emacs
@@ -17,8 +18,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	texinfo>=5.2:print/texinfo
 
-USES=		gmake
-USE_EMACS=	yes
+USES=		emacs gmake
 USE_GITHUB=	yes
 
 SLIME_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/slime
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 5757cbba3d57..64bb067b13c5 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -3,19 +3,21 @@
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.19.14
-PORTREVISION=	2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	3
 CATEGORIES=	editors elisp
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Egg V4, Multilingual Input Method for Emacsen
 
 LICENSE=	GPLv2
 
-USE_EMACS=	yes
+USES=		emacs
+EMACS_FLAVORS_EXCLUDE=	devel_full # fails to build
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrs-allbsd
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lispdir="${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}"
 CONFIGURE_ENV=	EMACS="${EMACS_CMD}"
diff --git a/editors/web-mode/Makefile b/editors/web-mode/Makefile
index 6f15853e92a9..422ec2b95b76 100644
--- a/editors/web-mode/Makefile
+++ b/editors/web-mode/Makefile
@@ -2,27 +2,28 @@
 
 PORTNAME=	web-mode
 PORTVERSION=	14
-PORTREVISION=	2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	3
 CATEGORIES=	editors elisp
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Autonomous Emacs major-mode for editing web templates
 
 LICENSE=	GPLv2
 
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	fxbois
-USE_EMACS=	yes
+
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV=	EMACS="${EMACS_CMD}" LISPDIR="${WEBMODE_LISPDIR}" \
 		DESTDIR="${STAGEDIR}"
 SUB_FILES=	web-mode-autoloads.el
 SUB_LIST=	LISPDIR="${WEBMODE_LISPDIR}"
 WEBMODE_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/web-mode
-PLIST_FILES=	%%EMACS_VERSION_SITE_LISPDIR%%/web-mode/web-mode.elc.gz \
-		%%EMACS_VERSION_SITE_LISPDIR%%/web-mode-autoloads.el
+PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/web-mode/web-mode.elc.gz \
+		${EMACS_VERSION_SITE_LISPDIR}/web-mode-autoloads.el
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/web-mode-autoloads.el \
diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile
index 662adbc3fec7..ea99d631fa24 100644
--- a/editors/with-editor/Makefile
+++ b/editors/with-editor/Makefile
@@ -4,8 +4,9 @@
 PORTNAME=	with-editor
 PORTVERSION=	2.7.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	editors elisp
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Use the Emacsclient as the $$EDITOR of child processes
@@ -13,14 +14,13 @@ COMMENT=	Use the Emacsclient as the $$EDITOR of child processes
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
-USES=		gmake makeinfo
-USE_EMACS=	yes
-MAKE_ENV=	EFLAGS="-L ${PREFIX}/${EMACS_SITE_LISPDIR}"
-NO_ARCH=	yes
 INFO=		with-editor
+MAKE_ENV+=	EFLAGS="-L ${PREFIX}/${EMACS_SITE_LISPDIR}"
+NO_ARCH=	yes
 PORTDOCS=	README.md
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/with-editor.el \