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
author: Joseph Mingrone <jrm@FreeBSD.org> 2018-02-01 18:03:09 +0000
committer: Joseph Mingrone <jrm@FreeBSD.org> 2018-02-01 18:03:09 +0000
commit: a3cc513bfc69ef10d52ed310dd9a6e6bb8c57491 (patch)
tree: 4a6b8513515fb032f2183d945863a1d39dbcd0c1
parent: 7a6d87cd185d39c7023ee32da472cca4f391e7f2 (diff)
download: ports-a3cc513bfc69ef10d52ed310dd9a6e6bb8c57491.tar.gz
ports-a3cc513bfc69ef10d52ed310dd9a6e6bb8c57491.zip
140 files changed, 2271 insertions, 2679 deletions
diff --git a/MOVED b/MOVED
index 4d37e72fb9db..99817cc05ac8 100644
--- a/MOVED
+++ b/MOVED
@@ -9907,3 +9907,5 @@ www/rubygem-jekyll-watch1|www/rubygem-jekyll-watch|2018-01-31|Has expired: Use w
 www/rubygem-puma2|www/rubygem-puma|2018-01-31|Has expired: Use www/rubygem-puma instead
 www/rubygem-turbolinks-classic|www/rubygem-turbolinks|2018-01-31|Has expired: Use www/rubygem-turbolinks instead
 databases/mysql-proxy||2018-01-31|Has expired: No longer maintained and not recommended for production use
+japanese/migemo-emacs23|japanese/migemo-emacs|2018-02-01|Moved to version agnostic name
+editors/emacs-nox11|editors/emacs@nox|2018-02-01|Moved to a flavored version
diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
new file mode 100644
index 000000000000..0a2166524882
--- /dev/null
+++ b/Mk/Uses/emacs.mk
@@ -0,0 +1,133 @@
+# $FreeBSD$
+#
+# Provide support for ports requiring Emacs.  This includes flavors with proper
+# dependencies and useful variables.
+#
+# Feature:		emacs
+# Usage:		USES=emacs or USES=emacs:args
+# Valid ARGS:	build, run
+#
+# build			Indicates that Emacs is needed at build time.
+# run			Indicates that Emacs is needed at run time.
+#
+# If build and run are omitted from the argument list, Emacs will be added to
+# BUILD_DEPENDS and RUN_DEPENDS.  EMACS_NO_DEPENDS can be set to prevent both
+# Emacs dependencies.
+#
+# Variables, which can be set in make.conf:
+# DEFAULT_VERSIONS+=          The default flavor for Emacs ports can be added to
+#                             DEFAULT_VERSIONS.  For example,
+#                             DEFAULT_VERSIONS+= emacs=nox
+#                             Valid flavors: full canna nox devel_full devel_nox
+#                             Flavors specified on the command line take precedence.
+#
+# Variables, which can be set by ports:
+# EMACS_FLAVORS_EXCLUDE:      Do NOT build these Emacs flavors.
+#                             If EMACS_FLAVORS_EXCLUDE is not define then all
+#                             valid Emacs flavors are assumed.
+#
+# EMACS_NO_DEPENDS:           Do NOT add build or run dependencies on Emacs.
+#
+# Variables, which can be read by ports:
+# EMACS_CMD:                  Emacs command with full path (e.g. /usr/local/bin/emacs-25.3)
+# EMACS_FLAVOR:               Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR})
+# EMACS_LIBDIR:               Emacs Library directory without ${PREFIX} (e.g. share/emacs)
+# EMACS_LIBDIR_WITH_VER:      Library directory without ${PREFIX} including version (e.g. share/emacs/25.3)
+# EMACS_MAJOR_VER:            Emacs major version (e.g. 25)
+# EMACS_PKGNAMESUFFIX:        PKGNAMESUFFIX to distinguish Emacs flavors
+# EMACS_SITE_LISPDIR:         Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp)
+# EMACS_VER:                  Emacs version (e.g. 25.3)
+# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/25.3/site-lisp)
+#-------------------------------------------------------------------------------
+#
+# MAINTAINER:	emacs@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_EMACS_MK)
+_INCLUDE_USES_EMACS_MK=	yes
+
+# Make sure that no dependency or some other environment variable
+# pollutes the build/run dependency detection
+.undef _EMACS_BUILD_DEP
+.undef _EMACS_RUN_DEP
+_EMACS_ARGS=		${emacs_ARGS:S/,/ /g}
+.if ${_EMACS_ARGS:Mbuild}
+_EMACS_BUILD_DEP=	yes
+_EMACS_ARGS:=		${_EMACS_ARGS:Nbuild}
+.endif
+.if ${_EMACS_ARGS:Mrun}
+_EMACS_RUN_DEP=	yes
+_EMACS_ARGS:=		${_EMACS_ARGS:Nrun}
+.endif
+
+# If the port does not specify a build or run dependency, and does not define
+# EMACS_NO_DEPENDS, assume both dependencies are required.
+.if !defined(_EMACS_BUILD_DEP) && !defined(_EMACS_RUN_DEP) && \
+	!defined(EMACS_NO_DEPENDS)
+_EMACS_BUILD_DEP=	yes
+_EMACS_RUN_DEP=		yes
+.endif
+
+.if defined(_EMACS_RUN_DEP)
+FLAVORS=	full canna nox devel_full devel_nox
+.for flavor in ${EMACS_FLAVORS_EXCLUDE}
+FLAVORS:=	${FLAVORS:N${flavor}}
+.endfor
+.else
+FLAVORS=	full
+.endif
+
+.if empty(FLAVOR)
+.if defined(EMACS_DEFAULT)
+FLAVOR=	${EMACS_DEFAULT}
+.else
+FLAVOR=	${FLAVORS:[1]}
+.endif
+.endif
+EMACS_FLAVOR=	${FLAVOR}
+
+.if ${FLAVOR:Mdevel*}
+EMACS_VER=			27.0.50
+EMACS_PORTDIR=		editors/emacs-devel
+.else
+EMACS_VER=			25.3
+EMACS_PORTDIR=		editors/emacs
+.endif
+
+EMACS_MAJOR_VER=	${EMACS_VER:C/\..*//}
+EMACS_LIBDIR=		share/emacs
+EMACS_LIBDIR_WITH_VER=	share/emacs/${EMACS_VER}
+EMACS_PORT_NAME=	emacs${EMACS_MAJOR_VER}
+
+.if ${FLAVOR:M*nox}
+EMACS_PKGNAMESUFFIX=		-${EMACS_PORT_NAME}_nox
+.elif ${FLAVOR:Mcanna}
+EMACS_PKGNAMESUFFIX=		-${EMACS_PORT_NAME}_canna
+.else
+EMACS_PKGNAMESUFFIX=		-${EMACS_PORT_NAME}
+.endif
+
+EMACS_CMD=	${PREFIX}/bin/emacs-${EMACS_VER}
+EMACS_SITE_LISPDIR=	${EMACS_LIBDIR}/site-lisp
+EMACS_VERSION_SITE_LISPDIR=	${EMACS_LIBDIR_WITH_VER}/site-lisp
+
+.if defined(_EMACS_BUILD_DEP)
+BUILD_DEPENDS+=		${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
+.endif
+.if defined(_EMACS_RUN_DEP)
+RUN_DEPENDS+=	${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
+.endif
+
+MAKE_ARGS+=	EMACS=${EMACS_CMD}
+SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} \
+		EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
+		EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \
+		EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR}
+
+PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} \
+		EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
+		EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \
+		EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR}
+
+.endif # _INCLUDE_USES_EMACS_MK
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index d60aca24243c..7070f1949a20 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -15,8 +15,8 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 
 LOCALBASE?=	/usr/local
 
-.for lang in APACHE BDB FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA MYSQL \
-	PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
+.for lang in APACHE BDB EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA \
+	MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
 .if defined(${lang}_DEFAULT)
 ERROR+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
 .endif
@@ -32,6 +32,8 @@ ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
 APACHE_DEFAULT?=	2.4
 # Possible values: 48, 5, 6
 BDB_DEFAULT?=		5
+# Possible_values: full canna nox devel_full devel_nox
+#EMACS_DEFAULT?=	let the flavor be the default if not explicitly set
 # Possible values: 2.5
 FIREBIRD_DEFAULT?=	2.5
 # Possible values: flang (experimental), gfortran
diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
deleted file mode 100644
index c80ba763aa22..000000000000
--- a/Mk/bsd.emacs.mk
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-#	$FreeBSD$
-#
-#	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
-#
-
-Emacs_Include=			bsd.emacs.mk
-Emacs_Include_MAINTAINER=	ashish@FreeBSD.org
-
-EMACS_PORT_NAME?=	emacs25
-
-#
-# This file for ports which depend on emacs family.
-# Define EMACS_PORT_NAME variable before bsd.port.[pre.]mk
-# and it will automatically include this file.
-#
-# This file exports the following common variables:
-#
-# EMACS_NAME:
-#		emacsen's command-line basename.
-#		ex.) "emacs" when emacsen is a emacs-20.6.
-#
-# EMACS_VER:
-#		emacsen's version.
-#		ex.) "20.6" when emacsen is a emacs-20.6.
-#
-# EMACS_MAJOR_VER:
-#		emacsen's major version.
-#		ex.) "20" when emacsen is a emacs-20.6.
-#
-# EMACS_LIBDIR:
-#		emacsen's library directory name without ${PREFIX}.
-#		ex.) "share/emacs" when emacsen is a emacs-20.6.
-#
-# EMACS_LIBDIR_WITH_VER:
-#		emacsen's version specific library directory name
-#		without ${PREFIX}.
-#		ex.) "share/emacs/20.6" when emacsen is a emacs-20.6.
-#
-# EMACS_CMD:
-#		emacsen's command-line filename. (full path)
-#		ex.) "/usr/local/bin/emacs-20.6" when emacsen is a
-#		     emacs-20.6 and ${PREFIX} is "/usr/local".
-#
-# EMACS_SITE_LISPDIR:
-#		emacsen's site-lisp directory name without ${PREFIX}.
-#		ex.) "share/emacs/site-lisp" when emacsen is a emacs-20.6.
-#
-# EMACS_VERSION_SITE_LISPDIR:
-#		emacsen's version specific site-lisp directory name
-#		without	${PREFIX}.
-#		ex.) "share/emacs/20.6/site-lisp" when emacsen is a
-#		emacs-20.6.
-#
-# EMACS_NO_BUILD_DEPENDS:
-#		If set "YES" to this variable, port does not
-#		build-depend on EMACS_PORT_NAME's emacsen.
-#
-# EMACS_NO_RUN_DEPENDS:
-#		If set "YES" to this variable, port does not
-#		run-depend on EMACS_PORT_NAME's emacsen.
-#
-
-EMACS_MASTERDIR_PKGFILES?=	NO
-
-# Emacs-25.x
-.if (${EMACS_PORT_NAME} == "emacs25")
-EMACS_NAME=		emacs
-EMACS_VER=		25.3
-EMACS_MAJOR_VER=	25
-EMACS_LIBDIR?=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTDIR=		editors/emacs
-EMACS_COMMON_PORT=	NO
-EMACS_HAS_MULE=		YES
-EMACS_NO_SUBDIRSEL=	NO
-.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
-DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
-PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
-.endif
-
-# Emacs-26.x (development version)
-.elif (${EMACS_PORT_NAME} == "emacs-devel")
-EMACS_NAME=		emacs
-EMACS_VER=		27.0.50
-EMACS_MAJOR_VER=	27
-EMACS_LIBDIR?=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTDIR=		editors/emacs-devel
-EMACS_COMMON_PORT=	NO
-EMACS_HAS_MULE=		YES
-EMACS_NO_SUBDIRSEL=	NO
-.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
-DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
-PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
-.endif
-
-.elif (${EMACS_PORT_NAME} == "emacs-nox11")
-EMACS_NAME=		emacs
-EMACS_VER=		25.3
-EMACS_MAJOR_VER=	25
-EMACS_LIBDIR=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTDIR=		editors/emacs-nox11
-EMACS_COMMON_PORT=	NO
-EMACS_HAS_MULE=		YES
-EMACS_NO_SUBDIRSEL=	NO
-.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
-DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
-PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
-.endif
-
-.else
-check-makevars::
-	@${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
-	@${ECHO} "Valid values are:"
-	@${ECHO} "	Emacs  family: emacs25 emacs-devel emacs-nox11"
-	@${FALSE}
-.endif
-
-
-#
-# Common Definitions
-#
-
-# find where emacsen is installed
-# look for it in PREFIX first and fall back to LOCALBASE then
-.if exists(/bin/${EMACS_NAME}-${EMACS_VER})
-EMACS_BASE?=			${PREFIX}
-.else
-EMACS_BASE?=			${LOCALBASE}
-.endif
-# emacsen command-line filename
-EMACS_CMD?=			${EMACS_BASE}/bin/${EMACS_NAME}-${EMACS_VER}
-# emacsen core elisp filename
-EMACS_CORE_DIR=			${EMACS_LIBDIR_WITH_VER}/lisp/${EMACS_CORE_SUBDIR}
-EMACS_COREEL=			${EMACS_BASE}/${EMACS_CORE_DIR}/startup.el
-# emacsen libdir without ${LOCALBASE}
-EMACS_SITE_LISPDIR?=		${EMACS_LIBDIR}/site-lisp
-EMACS_VERSION_SITE_LISPDIR?=	${EMACS_LIBDIR_WITH_VER}/site-lisp
-
-# build&run-dependency
-EMACS_NO_BUILD_DEPENDS?=	NO
-EMACS_NO_RUN_DEPENDS?=		NO
-.if (${EMACS_NO_BUILD_DEPENDS} == "NO")
-BUILD_DEPENDS+=		${EMACS_CMD}:${EMACS_PORTDIR}
-.endif
-.if (${EMACS_NO_RUN_DEPENDS} == "NO")
-.if defined(EMACS_COMMON_PORT) && (${EMACS_COMMON_PORT} == "YES")
-RUN_DEPENDS+=	${EMACS_COREEL}:${EMACS_PORTDIR}-common
-.else
-RUN_DEPENDS+=	${EMACS_CMD}:${EMACS_PORTDIR}
-.endif
-.endif
-
-# environments for build
-MAKE_ARGS+=	EMACS=${EMACS_CMD}
-SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} \
-		EMACS_VER=${EMACS_VER} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \
-		EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR}
-# pkg/PLIST substrings
-PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} \
-		EMACS_VER=${EMACS_VER} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \
-		EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR}
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 519ecda8f1af..6e64bfba420f 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1365,10 +1365,6 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 .include "${PORTSDIR}/Mk/bsd.local.mk"
 .endif
 
-.if defined(USE_EMACS)
-.include "${PORTSDIR}/Mk/bsd.emacs.mk"
-.endif
-
 .if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} ))
 DEV_WARNING+=		"Using USE_PHP alone is deprecated, please use USES=php"
 USES+=	php
diff --git a/UPDATING b/UPDATING
index 8a7d594b6579..80b1d205e590 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,45 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20180201:
+  AFFECTS: users of editors/emacs* and all ports using Emacs via USES=emacs
+  AUTHOR: jrm@FreeBSD.org
+
+  The Emacs ports framework has been updated to support flavors and the
+  editors/emacs-nox11 port has been replaced by the nox flavors of
+  editors/emacs and editors/emacs-devel.
+
+  Supported Flavors
+  --------------------------------------------------------
+  editor/emacs:        full canna nox
+  editors/emacs-devel: full nox
+  ports using Emacs:   full canna nox devel_full devel_nox
+  --------------------------------------------------------
+
+  For those using pre-built packages, if
+
+     # pkg upgrade
+
+  does not install the new Emacs package, use one of
+
+     # pkg install emacs
+     # pkg install emacs-canna
+     # pkg install emacs-nox
+     # pkg install emacs-devel
+     # pkg install emacs-devel_nox
+
+  For those building their own packages, a flavor other than the default must be
+  specified.  For example, to build editors/emacs with the nox flavor, or to
+  build a port using Emacs with the devel_full flavor use
+
+     # make FLAVOR=nox install
+     # make FLAVOR=devel_full
+
+  An alternative to the default flavor, full, can be set in make.conf.  For
+  example, to set the nox flavor as the default, use
+
+     DEFAULT_VERSIONS+=emacs=nox
+
 20180117:
   AFFECTS: users of x11-toolkits/kf5-kirigami2 and x11/kf5-plasma-framework
   AUTHOR: kde@FreeBSD.org
diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index 1711cb408a26..b3ed9ae77167 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -2,39 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	emms
-PORTVERSION=	4.3
-PORTREVISION=	1
+DISTVERSION=	4.4
 CATEGORIES=	audio elisp
 MASTER_SITES=	GNU
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The Emacs Multi-Media System
+COMMENT=	Emacs Multi-Media System
 
 LICENSE=	GPLv3
 
-USES=		gmake makeinfo
-USE_EMACS=	yes
-MAKE_ENV=	SITELISP="${PREFIX}/${EMACS_SITE_LISPDIR}/emms" \
-		INSTALLINFO="${TRUE}"
+# do not depend on base texinfo on 10
+BUILD_DEPENDS=	texi2dvi:print/texinfo
 
-INFO=		emms
-
-.include <bsd.port.pre.mk>
+USES=		emacs gmake
 
-.if ${EMACS_PORT_NAME} != "emacs25"
-PORTNAMESUFFIX=	${PKGNAMESUFFIX}
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|^\(DESTDIR\)=|\1?=| ; \
-		 s|^\(PREFIX\)=$$(DESTDIR)|\1?=| ; \
-		 s|^\(INFODIR\)=|\1?=| ; \
-		 s|^\(MAN1DIR\)=$$(PREFIX)/share|\1?=$$(PREFIX)| ; \
-		 s|^\(SITELISP\)=|\1?=| ; \
-		 s|^\(INSTALLINFO\) =|INSTALLINFO ?=| ; \
-		 s| \($$(SITELISP)\)| $$(DESTDIR)\1|g ; \
-		 s| \($$(INFODIR)\)| $$(DESTDIR)\1|g ; \
-		 s| \($$(MAN1DIR)\)| $$(DESTDIR)\1|g' ${WRKSRC}/Makefile
+INFO=		emms
+NO_ARCH=	yes
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/emms/distinfo b/audio/emms/distinfo
index f6e8a0f3df66..0aca9f3aacf4 100644
--- a/audio/emms/distinfo
+++ b/audio/emms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495277936
-SHA256 (emms-4.3.tar.gz) = 00112d631eee0cfee80a85c048bfbf7c2d25886067ee02152376208ae87c2c36
-SIZE (emms-4.3.tar.gz) = 287153
+TIMESTAMP = 1515254365
+SHA256 (emms-4.4.tar.gz) = 10ecc2e9c957ca1f80bbf8d9a0473b9eae552218aaea278dc8b10564215513ac
+SIZE (emms-4.4.tar.gz) = 288922
diff --git a/audio/emms/files/patch-Makefile b/audio/emms/files/patch-Makefile
new file mode 100644
index 000000000000..d1988b0ac182
--- /dev/null
+++ b/audio/emms/files/patch-Makefile
@@ -0,0 +1,18 @@
+--- Makefile.orig	2018-01-06 17:26:53 UTC
++++ Makefile
+@@ -10,13 +10,13 @@ ALLCOMPILED=$(wildcard $(LISPDIR)/*.elc)
+ DESTDIR=
+ PREFIX=$(DESTDIR)/usr/local
+ INFODIR=$(PREFIX)/info
+-MAN1DIR=$(PREFIX)/share/man/man1
++MAN1DIR=$(PREFIX)/man/man1
+ BINDIR=$(PREFIX)/bin
+ SITELISP=$(PREFIX)/share/emacs/site-lisp/emms
+ 
+ GINSTALLINFO = /usr/bin/ginstall-info --info-dir=$(INFODIR)
+ # For systems without ginstall-info
+-INSTALLINFO = /usr/bin/install-info --info-dir=$(INFODIR)
++INSTALLINFO = /usr/local/bin/install-info --info-dir=$(INFODIR)
+ CHANGELOG_CMD = git log --pretty=medium --no-merges
+ 
+ # The currently released version of EMMS
diff --git a/audio/emms/files/patch-doc_Makefile b/audio/emms/files/patch-doc_Makefile
new file mode 100644
index 000000000000..3c8e6b3b4176
--- /dev/null
+++ b/audio/emms/files/patch-doc_Makefile
@@ -0,0 +1,12 @@
+--- doc/Makefile.orig	2018-01-06 17:09:29 UTC
++++ doc/Makefile
+@@ -7,7 +7,7 @@ clean:
+ 	rm -f *.info
+ 
+ %.info: %.texinfo
+-	makeinfo --no-split $<
++	${LOCALBASE}/bin/makeinfo --no-split $<
+ 
+ %.html: %.texinfo
+-	makeinfo --html --no-split $<
++	${LOCALBASE}/bin/makeinfo --html --no-split $<
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 95e1d3723a53..68043b3af1ee 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -3,35 +3,32 @@
 
 PORTNAME=	dinotrace
 PORTVERSION=	9.4c
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	http://www.veripool.org/ftp/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical signal trace waveform viewer
 
-OPTIONS_DEFINE=	EMACS
-OPTIONS_DEFAULT=	EMACS
-EMACS_DESC=	Install Emacs supplimentary files
+LICENSE=	GPLv3+
 
-USE_XORG=	x11 sm ice xmu xt
 USES=		gmake motif perl5 tar:tgz
+USE_XORG=	x11 sm ice xmu xt
 USE_PERL5=	build
+
 GNU_CONFIGURE=	yes
 
 INFO=		dinotrace
 PLIST_FILES=	bin/dinotrace
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	EMACS
+OPTIONS_DEFAULT=	EMACS
+EMACS_DESC=	Install Emacs supplimentary files
 
-.if ${PORT_OPTIONS:MEMACS}
-RUN_DEPENDS+=	verilog-mode.el>0:cad/verilog-mode.el
-USE_EMACS=	yes
-EMACS_NO_BUILD_DEPENDS=	yes
-.for F in dinotrace.el sim-log.el
-PLIST_FILES+=	${EMACS_SITE_LISPDIR}/${F}
-.endfor
-.endif
+EMACS_USES=	emacs:run
+EMACS_RUN_DEPENDS=	verilog-mode.el${EMACS_PKGNAMESUFFIX}>0:cad/verilog-mode.el@${FLAVOR}
+EMACS_PLIST_FILES=	${EMACS_SITE_LISPDIR}/dinotrace.el ${EMACS_SITE_LISPDIR}/sim-log.el
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"-O3"|""|' ${WRKSRC}/configure
diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile
index 0d6e4fbbe12a..b054c49de667 100644
--- a/cad/verilog-mode.el/Makefile
+++ b/cad/verilog-mode.el/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	verilog-mode.el
 PORTVERSION=	801
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad elisp
 MASTER_SITES=	http://www.veripool.org/ftp/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME:R}-${PORTVERSION}.${PORTNAME:E}
 EXTRACT_SUFX=	.gz
 
@@ -21,8 +22,7 @@ EXTRACT_AFTER_ARGS=	> ${PORTNAME}
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-USE_EMACS=	yes
-EMACS_NO_BUILD_DEPENDS=	yes
+USES=		emacs:run
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/${PORTNAME}
 
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 7be38b5661d0..19ae8e522320 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -2,40 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	bbdb
-PORTVERSION=	2.35
-PORTREVISION=	12
+DISTVERSION=	3.1.2
 CATEGORIES=	databases elisp
-MASTER_SITES=	SF
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+MASTER_SITES=	SAVANNAH
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	dryice@FreeBSD.org
 COMMENT=	Big Brother Database
 
-USE_EMACS=	yes
+LICENSE=	GPLv3+
 
-USES=		makeinfo
-ALL_TARGET=	bbdb info
-MAKE_ARGS=	MAKE="${MAKE} clean MAKEINFO=\"${MAKEINFO} --no-split\""
-BBDB_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
-MAKE_JOBS_UNSAFE=	yes
+# do not depend on base texinfo on 10
+BUILD_DEPENDS=	texi2dvi:print/texinfo
+
+USES=		emacs
+USE_TEX=	latex:build
 
+BBDB_LISPDIR=	${EMACS_SITE_LISPDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD}
+INFO=		bbdb
+PORTDOCS=	bbdb.pdf
+NO_ARCH=	yes
+PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-INFO=	bbdb
-.endif
-
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-.if ${PORT_OPTIONS:MDOCS}
-	${INSTALL_DATA} ${WRKSRC}/texinfo/bbdb.info ${STAGEDIR}${PREFIX}/info
-.endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc \
+		${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \
+		${STAGEDIR}${PREFIX}/${INFO_PATH}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/bbdb.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/bbdb/distinfo b/databases/bbdb/distinfo
index c836c9a8b072..e83055742595 100644
--- a/databases/bbdb/distinfo
+++ b/databases/bbdb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bbdb-2.35.tar.gz) = c71a46fcd9ae4d68d9fa970d175ff84cd85780dc3f9aec603688deff252aedb8
-SIZE (bbdb-2.35.tar.gz) = 767464
+TIMESTAMP = 1513893339
+SHA256 (bbdb-3.1.2.tar.gz) = 05780f030584ddaa717d04700bc70e7d9e929141223c7f130fc0c778d73241bf
+SIZE (bbdb-3.1.2.tar.gz) = 378935
diff --git a/databases/bbdb/pkg-plist b/databases/bbdb/pkg-plist
index 9d94a0636578..b4550c6bcdce 100644
--- a/databases/bbdb/pkg-plist
+++ b/databases/bbdb/pkg-plist
@@ -1,33 +1,33 @@
-%%BBDB_LISPDIR%%/bbdb.el
-%%BBDB_LISPDIR%%/bbdb.elc
-%%BBDB_LISPDIR%%/bbdb-autoloads.el
+%%BBDB_LISPDIR%%/bbdb-anniv.el
+%%BBDB_LISPDIR%%/bbdb-anniv.elc
 %%BBDB_LISPDIR%%/bbdb-com.el
 %%BBDB_LISPDIR%%/bbdb-com.elc
-%%BBDB_LISPDIR%%/bbdb-ftp.el
-%%BBDB_LISPDIR%%/bbdb-ftp.elc
 %%BBDB_LISPDIR%%/bbdb-gnus.el
-%%BBDB_LISPDIR%%/bbdb-gui.el
-%%BBDB_LISPDIR%%/bbdb-gui.elc
-%%BBDB_LISPDIR%%/bbdb-hooks.el
-%%BBDB_LISPDIR%%/bbdb-hooks.elc
-%%BBDB_LISPDIR%%/bbdb-merge.el
-%%BBDB_LISPDIR%%/bbdb-merge.elc
+%%BBDB_LISPDIR%%/bbdb-gnus.elc
+%%BBDB_LISPDIR%%/bbdb-ispell.el
+%%BBDB_LISPDIR%%/bbdb-ispell.elc
+%%BBDB_LISPDIR%%/bbdb-loaddefs.el
+%%BBDB_LISPDIR%%/bbdb-message.el
+%%BBDB_LISPDIR%%/bbdb-message.elc
 %%BBDB_LISPDIR%%/bbdb-mhe.el
+%%BBDB_LISPDIR%%/bbdb-mhe.elc
 %%BBDB_LISPDIR%%/bbdb-migrate.el
 %%BBDB_LISPDIR%%/bbdb-migrate.elc
+%%BBDB_LISPDIR%%/bbdb-mua.el
+%%BBDB_LISPDIR%%/bbdb-mua.elc
+%%BBDB_LISPDIR%%/bbdb-pgp.el
+%%BBDB_LISPDIR%%/bbdb-pgp.elc
+%%BBDB_LISPDIR%%/bbdb-pkg.el
 %%BBDB_LISPDIR%%/bbdb-print.el
 %%BBDB_LISPDIR%%/bbdb-print.elc
-%%BBDB_LISPDIR%%/bbdb-reportmail.el
 %%BBDB_LISPDIR%%/bbdb-rmail.el
+%%BBDB_LISPDIR%%/bbdb-rmail.elc
 %%BBDB_LISPDIR%%/bbdb-sc.el
 %%BBDB_LISPDIR%%/bbdb-sc.elc
+%%BBDB_LISPDIR%%/bbdb-site.el
+%%BBDB_LISPDIR%%/bbdb-site.elc
 %%BBDB_LISPDIR%%/bbdb-snarf.el
 %%BBDB_LISPDIR%%/bbdb-snarf.elc
-%%BBDB_LISPDIR%%/bbdb-srv.el
 %%BBDB_LISPDIR%%/bbdb-vm.el
-%%BBDB_LISPDIR%%/bbdb-w3.el
-%%BBDB_LISPDIR%%/bbdb-w3.elc
-%%BBDB_LISPDIR%%/bbdb-whois.el
-%%BBDB_LISPDIR%%/bbdb-whois.elc
-%%BBDB_LISPDIR%%/bbdb-xemacs.el
-%%BBDB_LISPDIR%%/bbdb-xemacs.elc
+%%BBDB_LISPDIR%%/bbdb.el
+%%BBDB_LISPDIR%%/bbdb.elc
diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 0a01f1fb468a..a0df2b5fd1bb 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -55,8 +55,9 @@ PORTDOCS=	NEWS UPGRADING
 OPTIONS_DEFINE=	DOCS EMACS SERVER
 OPTIONS_DEFAULT=SERVER
 OPTIONS_SUB=	yes
-EMACS_USE=	EMACS=yes
-EMACS_DESC=	Add support for default version of EMACS
+EMACS_USES=	emacs
+EMACS_DESC=	Install Emacs Lisp support file
+EMACS_VARS=	EMACS_NO_DEPENDS=yes
 SERVER_DESC=	Install the gnats server too
 
 .include <bsd.port.options.mk>
diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile
index 5cec2172d5f3..477de7847392 100644
--- a/deskutils/howm/Makefile
+++ b/deskutils/howm/Makefile
@@ -2,32 +2,39 @@
 
 PORTNAME=	howm
 PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://howm.sourceforge.jp/a/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Write fragmentarily and read collectively
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		emacs
+
 GNU_CONFIGURE=	yes
-USE_EMACS=	yes
-ELISP=		action-lock.el bcomp.el cheat-font-lock.el \
-		howm-common.el howm-date.el howm-menu.el howm-misc.el \
-		howm-mode.el howm-reminder.el \
-		howm-version.el howm-view.el howm.el riffle.el
 
-OPTIONS_DEFINE=	COMPILED_ELISP DOCS EXAMPLES
-OPTIONS_DEFAULT=COMPILED_ELISP
-COMPILED_ELISP_DESC=	Install pre-compiled ELISP files
-OPTIONS_SUB=	yes
+PORTDOCS=	*.html *.png
+PORTEXAMPLES=	en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+NO_ARCH=	yes
 
 do-install:
-	(cd ${WRKSRC}; ${INSTALL_DATA} *.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
-	(cd ${WRKSRC}; ${INSTALL_DATA} *.elc ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ja ${STAGEDIR}${EXAMPLESDIR}/en
-	(cd ${WRKSRC}; ${INSTALL_DATA} ja/0* ${STAGEDIR}${EXAMPLESDIR}/ja)
-	(cd ${WRKSRC}; ${INSTALL_DATA} en/0* ${STAGEDIR}${EXAMPLESDIR}/en)
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.png ${STAGEDIR}${DOCSDIR})
+	cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc \
+		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.png ${STAGEDIR}${DOCSDIR})
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/en ${STAGEDIR}${EXAMPLESDIR}/ja
+	(cd ${WRKSRC} && ${INSTALL_DATA} ja/0* ${STAGEDIR}${EXAMPLESDIR}/ja)
+	(cd ${WRKSRC} && ${INSTALL_DATA} en/0* ${STAGEDIR}${EXAMPLESDIR}/en)
 
 .include <bsd.port.mk>
diff --git a/deskutils/howm/files/patch-howm-vars.el b/deskutils/howm/files/patch-howm-vars.el
index dc235cd564af..a8fd9667139c 100644
--- a/deskutils/howm/files/patch-howm-vars.el
+++ b/deskutils/howm/files/patch-howm-vars.el
@@ -1,6 +1,6 @@
---- howm-vars.el.orig	2015-12-31 22:41:45.000000000 +0900
-+++ howm-vars.el	2016-11-26 22:46:32.596292000 +0900
-@@ -759,7 +759,7 @@
+--- howm-vars.el.orig	2015-12-31 13:41:45 UTC
++++ howm-vars.el
+@@ -759,7 +759,7 @@ When the value is elisp function, it is 
  This variable is obsolete and may be removed in future.")
  (defvar howm-view-grep-default-option
    ;; "labels" causes a trouble in git-head emacs (d5e3922) [2015-01-31]
diff --git a/deskutils/howm/pkg-plist b/deskutils/howm/pkg-plist
index 7a4f681f9184..0fdb9910691c 100644
--- a/deskutils/howm/pkg-plist
+++ b/deskutils/howm/pkg-plist
@@ -1,66 +1,46 @@
 %%EMACS_SITE_LISPDIR%%/action-lock.el
+%%EMACS_SITE_LISPDIR%%/action-lock.elc
 %%EMACS_SITE_LISPDIR%%/bcomp.el
 %%EMACS_SITE_LISPDIR%%/cheat-font-lock.el
+%%EMACS_SITE_LISPDIR%%/cheat-font-lock.elc
 %%EMACS_SITE_LISPDIR%%/gfunc.el
+%%EMACS_SITE_LISPDIR%%/gfunc.elc
 %%EMACS_SITE_LISPDIR%%/honest-report.el
+%%EMACS_SITE_LISPDIR%%/honest-report.elc
 %%EMACS_SITE_LISPDIR%%/howm-backend.el
+%%EMACS_SITE_LISPDIR%%/howm-backend.elc
 %%EMACS_SITE_LISPDIR%%/howm-cl.el
+%%EMACS_SITE_LISPDIR%%/howm-cl.elc
 %%EMACS_SITE_LISPDIR%%/howm-common.el
+%%EMACS_SITE_LISPDIR%%/howm-common.elc
 %%EMACS_SITE_LISPDIR%%/howm-date.el
+%%EMACS_SITE_LISPDIR%%/howm-date.elc
 %%EMACS_SITE_LISPDIR%%/howm-lang-en.el
+%%EMACS_SITE_LISPDIR%%/howm-lang-en.elc
 %%EMACS_SITE_LISPDIR%%/howm-lang-ja.el
+%%EMACS_SITE_LISPDIR%%/howm-lang-ja.elc
 %%EMACS_SITE_LISPDIR%%/howm-menu-en.el
+%%EMACS_SITE_LISPDIR%%/howm-menu-en.elc
 %%EMACS_SITE_LISPDIR%%/howm-menu-ja.el
+%%EMACS_SITE_LISPDIR%%/howm-menu-ja.elc
 %%EMACS_SITE_LISPDIR%%/howm-menu.el
+%%EMACS_SITE_LISPDIR%%/howm-menu.elc
 %%EMACS_SITE_LISPDIR%%/howm-misc.el
+%%EMACS_SITE_LISPDIR%%/howm-misc.elc
 %%EMACS_SITE_LISPDIR%%/howm-mkmenu.el
 %%EMACS_SITE_LISPDIR%%/howm-mode.el
+%%EMACS_SITE_LISPDIR%%/howm-mode.elc
 %%EMACS_SITE_LISPDIR%%/howm-reminder.el
+%%EMACS_SITE_LISPDIR%%/howm-reminder.elc
 %%EMACS_SITE_LISPDIR%%/howm-vars.el
+%%EMACS_SITE_LISPDIR%%/howm-vars.elc
 %%EMACS_SITE_LISPDIR%%/howm-version.el
+%%EMACS_SITE_LISPDIR%%/howm-version.elc
 %%EMACS_SITE_LISPDIR%%/howm-view.el
+%%EMACS_SITE_LISPDIR%%/howm-view.elc
 %%EMACS_SITE_LISPDIR%%/howm.el
+%%EMACS_SITE_LISPDIR%%/howm.elc
 %%EMACS_SITE_LISPDIR%%/illusion.el
+%%EMACS_SITE_LISPDIR%%/illusion.elc
 %%EMACS_SITE_LISPDIR%%/riffle.el
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/action-lock.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/cheat-font-lock.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/gfunc.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/honest-report.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-backend.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-cl.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-common.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-date.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-lang-en.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-lang-ja.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-menu-en.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-menu-ja.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-menu.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-misc.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-mode.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-reminder.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-vars.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-version.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-view.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/illusion.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/riffle.elc
-%%EXAMPLESDIR%%/en/0000-00-00-000000.txt
-%%EXAMPLESDIR%%/ja/0000-00-00-000000.txt
-%%DOCSDIR%%/README-j.html
-%%DOCSDIR%%/README.html
-%%DOCSDIR%%/cat.png
-%%DOCSDIR%%/come.png
-%%DOCSDIR%%/go.png
-%%DOCSDIR%%/index-j.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/menu.png
-%%DOCSDIR%%/s-cat.png
-%%DOCSDIR%%/s-menu.png
-%%DOCSDIR%%/s-screen-shot.png
-%%DOCSDIR%%/s-search.png
-%%DOCSDIR%%/s-source.png
-%%DOCSDIR%%/screen-shot.png
-%%DOCSDIR%%/search.png
-%%DOCSDIR%%/source.png
-%%DOCSDIR%%/todo.png
-%%DOCSDIR%%/updown.png
+%%EMACS_SITE_LISPDIR%%/riffle.elc
diff --git a/devel/cask/Makefile b/devel/cask/Makefile
index cb3cb1f1f500..80e0038e548e 100644
--- a/devel/cask/Makefile
+++ b/devel/cask/Makefile
@@ -2,38 +2,42 @@
 
 PORTNAME=	cask
 PORTVERSION=	0.8.1
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	devel elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Project management tool for Emacs
 
 LICENSE=	GPLv3
 
+USES=		emacs python shebangfix
 USE_GITHUB=	yes
-USE_EMACS=	yes
-USES=		python
+
+NO_ARCH=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	%%EMACS_SITE_LISPDIR%%/cask.el \
-		%%EMACS_SITE_LISPDIR%%/cask-bootstrap.el \
-		%%EMACS_SITE_LISPDIR%%/cask-cli.el \
-		%%EMACS_SITE_LISPDIR%%/package-legacy.el \
-		%%EMACS_SITE_LISPDIR%%/templates/init.tpl \
-		%%EMACS_SITE_LISPDIR%%/templates/init-dev.tpl \
+PLIST_FILES=	${EMACS_SITE_LISPDIR}/cask.el \
+		${EMACS_SITE_LISPDIR}/cask-bootstrap.el \
+		${EMACS_SITE_LISPDIR}/cask-cli.el \
+		${EMACS_SITE_LISPDIR}/package-legacy.el \
+		${EMACS_SITE_LISPDIR}/templates/init.tpl \
+		${EMACS_SITE_LISPDIR}/templates/init-dev.tpl \
 		bin/cask
 
+SHEBANG_FILES=	bin/cask
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|os.path.dirname(CASK_BIN_DIRECTORY)|"${PREFIX}/${EMACS_SITE_LISPDIR}"|' \
 	    ${WRKSRC}/bin/cask
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_DATA} \
-	    ${PLIST_FILES:M*.el:T} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} \
+	    ${PLIST_FILES:M*.el:T} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates
-	cd ${WRKSRC}/templates && ${INSTALL_DATA} ${PLIST_FILES:M*.tpl:T} \
-	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates
+	(cd ${WRKSRC}/templates && ${INSTALL_DATA} ${PLIST_FILES:M*.tpl:T} \
+	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates)
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/cask \
 	    ${STAGEDIR}${PREFIX}/bin/cask
 
diff --git a/devel/cdash/Makefile b/devel/cdash/Makefile
index 6540624c6b14..4bca56bcf084 100644
--- a/devel/cdash/Makefile
+++ b/devel/cdash/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cdash
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cdash.org/wp-content/uploads/2014/11/
 DISTNAME=	CDash-2-2-3
diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index 7a4f658ea05f..070844ba6042 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -3,24 +3,25 @@
 PORTNAME=	clojure-cider
 PORTVERSION=	0.16.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Clojure IDE and REPL for Emacs
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	clojure-mode.el>0:lang/clojure-mode.el \
-		dash.el>0:devel/dash.el \
-		epl.el>0:devel/epl.el \
-		pkg-info.el>0:devel/pkg-info.el
+RUN_DEPENDS=	clojure-mode.el${EMACS_PKGNAMESUFFIX}>0:lang/clojure-mode.el@${EMACS_FLAVOR} \
+		dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
+		epl.el${EMACS_PKGNAMESUFFIX}>0:devel/epl.el@${EMACS_FLAVOR} \
+		pkg-info.el${EMACS_PKGNAMESUFFIX}>0:devel/pkg-info.el@${EMACS_FLAVOR}
 
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	clojure-emacs
 GH_PROJECT=	cider
 
-USE_EMACS=	yes
-
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/devel/dash.el/Makefile b/devel/dash.el/Makefile
index 1dc95e0d0a80..d80a7dd2035a 100644
--- a/devel/dash.el/Makefile
+++ b/devel/dash.el/Makefile
@@ -2,23 +2,26 @@
 
 PORTNAME=	dash.el
 PORTVERSION=	2.13.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Modern list library for Emacs
 
 LICENSE=	GPLv3
 
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	magnars
-USE_EMACS=	yes
+
+NO_ARCH=	yes
 NO_BUILD=	yes
-PLIST_FILES=	%%EMACS_SITE_LISPDIR%%/dash.el \
-		%%EMACS_SITE_LISPDIR%%/dash-functional.el
+PLIST_FILES=	${EMACS_SITE_LISPDIR}/dash.el \
+		${EMACS_SITE_LISPDIR}/dash-functional.el
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
-	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
+	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index a3360a04ac0d..5c75699ea913 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -2,20 +2,23 @@
 
 PORTNAME=	distel
 PORTVERSION=	4.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Distel extends Emacs Lisp with Erlang-style message passing
 
+LICENSE=	MIT
+
 BUILD_DEPENDS+=	erlc:lang/erlang
 
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	massemanet
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-USE_EMACS=	yes
 NO_ARCH=	yes
 
 DISTEL_DOCS=	AUTHORS ChangeLog INSTALL INSTALL.WIN32 NEWS README README.ie-session
diff --git a/devel/epl.el/Makefile b/devel/epl.el/Makefile
index 9670dca7c6b4..66a4e6605299 100644
--- a/devel/epl.el/Makefile
+++ b/devel/epl.el/Makefile
@@ -2,23 +2,25 @@
 
 PORTNAME=	epl.el
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Emacs Package Library
 
 LICENSE=	GPLv3
 
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	cask
 GH_PROJECT=	epl
-USE_EMACS=	yes
+
 NO_BUILD=	yes
-PLIST_FILES=	%%EMACS_SITE_LISPDIR%%/epl.el
+PLIST_FILES=	${EMACS_SITE_LISPDIR}/epl.el
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
-	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
+	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/git-modes/Makefile b/devel/git-modes/Makefile
index fec2a7b4234b..ed7f923f01e4 100644
--- a/devel/git-modes/Makefile
+++ b/devel/git-modes/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	git-modes
 PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel elisp
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	GNU Emacs modes for Git-related files
@@ -14,11 +14,10 @@ COMMENT=	GNU Emacs modes for Git-related files
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		emacs gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
-USES=		gmake
-USE_EMACS=	yes
 PORTDOCS=	README.md
 NO_ARCH=	yes
 
diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 41d2bce26f00..18c392322c71 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -3,8 +3,9 @@
 
 PORTNAME=	magit
 PORTVERSION=	2.11.0
+PORTREVISION=	1
 CATEGORIES=	devel elisp
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Interface to Git for Emacs
@@ -12,27 +13,18 @@ COMMENT=	Interface to Git for Emacs
 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${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=		gmake makeinfo
-USE_EMACS=	yes
+USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
+
 INFO=		magit magit-popup
 PORTDOCS=	AUTHORS.md
 NO_ARCH=	yes
 
-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.pre.mk>
-
 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}" \
@@ -42,4 +34,11 @@ MAKE_ENV+=	INSTALL_INFO=install-info \
 		docdir=${DOCSDIR}
 PLIST_SUB+=	ELISPDIR=${ELISPDIR}
 
-.include <bsd.port.post.mk>
+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>
diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile
index b665c47c974c..4e26042c302d 100644
--- a/devel/p5-Sepia/Makefile
+++ b/devel/p5-Sepia/Makefile
@@ -3,10 +3,11 @@
 
 PORTNAME=	Sepia
 PORTVERSION=	0.992
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Simple Emacs-Perl Interface
@@ -20,9 +21,8 @@ BUILD_DEPENDS=	p5-Devel-Size>=0:devel/p5-Devel-Size \
 		p5-BSD-Resource>=0:devel/p5-BSD-Resource
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gmake makeinfo perl5
+USES=		emacs gmake makeinfo perl5
 USE_PERL5=	configure
-USE_EMACS=	yes
 
 INFO=	sepia
 
diff --git a/devel/pkg-info.el/Makefile b/devel/pkg-info.el/Makefile
index f3a95f1ccb3f..fb5e1d4d50db 100644
--- a/devel/pkg-info.el/Makefile
+++ b/devel/pkg-info.el/Makefile
@@ -4,20 +4,23 @@ PORTNAME=	pkg-info.el
 PORTVERSION=	0.6
 PORTREVISION=	1
 CATEGORIES=	devel elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Provide information about Emacs packages
 
 LICENSE=	GPLv3
 
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	lunaryorn
-USE_EMACS=	yes
+
+NO_ARCH=	yes
 NO_BUILD=	yes
-PLIST_FILES=	%%EMACS_SITE_LISPDIR%%/pkg-info.el
+PLIST_FILES=	${EMACS_SITE_LISPDIR}/pkg-info.el
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
-	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
+	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile
index da494cd5e4d7..beb8e6dcdb3f 100644
--- a/devel/psvn/Makefile
+++ b/devel/psvn/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	psvn
 PORTVERSION=	20120326.212349
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel elisp
 MASTER_SITES=	http://www.xsteve.at/prg/emacs/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	psvn.el
 EXTRACT_SUFX=	# empty
 
@@ -17,7 +17,7 @@ LICENSE=	GPLv2+
 
 RUN_DEPENDS=	svn:devel/subversion
 
-USE_EMACS=	yes
+USES=		emacs
 
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
@@ -30,7 +30,7 @@ PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}/psvn.el \
 ELISPDIR=	${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-build:
-	cd ${WRKSRC}; ${EMACS_CMD} -batch -q -f batch-byte-compile psvn.el
+	(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -f batch-byte-compile psvn.el)
 
 do-install:
 	@${MKDIR} ${ELISPDIR}
diff --git a/devel/pymacs/Makefile b/devel/pymacs/Makefile
index bde2065e2817..2fd7bda1455a 100644
--- a/devel/pymacs/Makefile
+++ b/devel/pymacs/Makefile
@@ -4,19 +4,18 @@
 PORTNAME=	Pymacs
 PORTVERSION=	0.25
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel editors python elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python package for scripting emacs
 
 LICENSE=	GPLv2
 
+USES=		emacs python:2.7
 USE_GITHUB=	yes
 GH_ACCOUNT=	pinard
-
-USES=		python:2.7
-USE_EMACS=	yes
 USE_PYTHON=	distutils
 
 pre-configure:
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 \
diff --git a/graphics/xface.el/Makefile b/graphics/xface.el/Makefile
index 80e806286f8e..9fc07787fe6f 100644
--- a/graphics/xface.el/Makefile
+++ b/graphics/xface.el/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	xface.el
 PORTVERSION=	1.3.6.24
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	graphics elisp
 MASTER_SITES=	http://www.jpl.org/ftp/pub/elisp/ \
 		ftp://ftp.jpl.org/pub/elisp/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	x-face-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,7 +17,8 @@ LICENSE=	GPLv2+
 
 RUN_DEPENDS=	compface:mail/faces
 
-USE_EMACS=	yes
+USES=		emacs
+EMACS_FLAVORS_EXCLUDE=	devel_full devel_nox # fail to build
 
 LISP_FILES=	x-face
 LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/x-face
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 7f403c2e4fe0..286a8d98e7c9 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	riece
 PORTVERSION=	9.0.0
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	SAVANNAH
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IRC client for Emacs
@@ -15,17 +15,16 @@ COMMENT=	IRC client for Emacs
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		emacs gmake
+
 NO_ARCH=	yes
-USES=		gmake
-USE_EMACS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+INFO=		riece-en riece-ja
 
 OPTIONS_DEFINE=	DOCS
 
-INFO=	riece-en riece-ja
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in AUTHORS ChangeLog NEWS NEWS.ja README README.ja doc/HACKING doc/HACKING.ja
diff --git a/japanese/Makefile b/japanese/Makefile
index 027d6d3b9dfc..01982bda6a4b 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -169,7 +169,7 @@
     SUBDIR += mg
     SUBDIR += mh
     SUBDIR += migemo
-    SUBDIR += migemo-emacs23
+    SUBDIR += migemo-emacs
     SUBDIR += migemo.el
     SUBDIR += mime_pls
     SUBDIR += ming
diff --git a/japanese/boiled-mozc/Makefile b/japanese/boiled-mozc/Makefile
index c9541ad4702c..2913c832d927 100644
--- a/japanese/boiled-mozc/Makefile
+++ b/japanese/boiled-mozc/Makefile
@@ -2,30 +2,29 @@
 
 PORTNAME=	boiled-mozc
 PORTVERSION=	0.7
-PORTREVISION=	3
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTVERSIONPREFIX=v
+PORTREVISION=	4
 CATEGORIES=	japanese editors elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Wrapper to mozc.el that offers modeless ("boil"ed) input style
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz:japanese/mozc-el
-RUN_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz:japanese/mozc-el
-
-GH_ACCOUNT=	tadanagao
+BUILD_DEPENDS=	ja-mozc-el${EMACS_PKGNAMESUFFIX}>0:japanese/mozc-el@${EMACS_FLAVOR}
+RUN_DEPENDS=	ja-mozc-el${EMACS_PKGNAMESUFFIX}>0:japanese/mozc-el@${EMACS_FLAVOR}
 
+USES=		emacs
 USE_GITHUB=	yes
-USE_EMACS=	yes
+GH_ACCOUNT=	tadanagao
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}.el \
 		${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}.elc
 
 do-build:
-	@cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
-		-f batch-byte-compile ${PORTNAME}.el
+	@(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
+		-f batch-byte-compile ${PORTNAME}.el)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index bfa5921c788e..7938b136bc8b 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	ddskk
 PORTVERSION=	15.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/ \
 		ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
 		http://www.ring.gr.jp/archives/elisp/skk/maintrunk/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple Kana to Kanji conversion program on Emacsen
@@ -16,7 +16,8 @@ COMMENT=	Simple Kana to Kanji conversion program on Emacsen
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/READMEs/COPYING
 
-USE_EMACS=	yes
+USES=		emacs
+
 MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}" \
 		SKK_LISPDIR="${STAGEDIR}${PREFIX}/${SKK_LISPDIR}" \
 		SKK_INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}"
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index 807c14f870d5..2878caab5cc5 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -6,40 +6,19 @@ PORTVERSION=	1.4.1
 PORTREVISION=	19
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/lookup/dist/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@utahime.org
-COMMENT=	Search interface on ${EMACS_PORT_NAME} for CD-ROM books, etc
+COMMENT=	Emacs search interface for CD-ROM books, etc
 
 LICENSE=	GPLv2
 
-USE_EMACS=	yes
+USES=		emacs
 
-INFO?=		lookup lookup-guide
-
-.include <bsd.port.pre.mk>
-
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
-EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
-ELISPDIR=	${EMACSDIR}/lisp/lookup
-MANIFEST=	MANIFEST.lookup
-.else
-ELISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/lookup
-PLIST_SUB=	ELISPDIR=${EMACS_VERSION_SITE_LISPDIR}
-.endif
+EMACS_FLAVORS_EXCLUDE=	devel_full and devel_nox # fail to build
+INFO=		lookup lookup-guide
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
-		--with-lispdir=${ELISPDIR}
-
-post-install:
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
-	${RM} ${WRKDIR}/${MANIFEST}
-	emacsdir=`${ECHO_CMD} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \
-	${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \
-		${SED} -e "s;^$${emacsdir}/;;" > ${WRKDIR}/${MANIFEST}
-	${MKDIR} ${EMACSDIR}/pkginfo
-	${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
-		${EMACSDIR}/pkginfo/
-.endif
+		--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/lookup
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/lookup/pkg-plist b/japanese/lookup/pkg-plist
index e6a58a3dab0c..9722a73ccade 100644
--- a/japanese/lookup/pkg-plist
+++ b/japanese/lookup/pkg-plist
@@ -1,48 +1,48 @@
-%%ELISPDIR%%/lookup/evi.el
-%%ELISPDIR%%/lookup/evi.elc
-%%ELISPDIR%%/lookup/evi-mule.el
-%%ELISPDIR%%/lookup/evi-mule.elc
-%%ELISPDIR%%/lookup/lookup.el
-%%ELISPDIR%%/lookup/lookup.elc
-%%ELISPDIR%%/lookup/lookup-utils.el
-%%ELISPDIR%%/lookup/lookup-utils.elc
-%%ELISPDIR%%/lookup/lookup-types.el
-%%ELISPDIR%%/lookup/lookup-types.elc
-%%ELISPDIR%%/lookup/lookup-vse.el
-%%ELISPDIR%%/lookup/lookup-vse.elc
-%%ELISPDIR%%/lookup/lookup-package.el
-%%ELISPDIR%%/lookup/lookup-package.elc
-%%ELISPDIR%%/lookup/lookup-kanji.el
-%%ELISPDIR%%/lookup/lookup-kanji.elc
-%%ELISPDIR%%/lookup/lookup-entry.el
-%%ELISPDIR%%/lookup/lookup-entry.elc
-%%ELISPDIR%%/lookup/lookup-content.el
-%%ELISPDIR%%/lookup/lookup-content.elc
-%%ELISPDIR%%/lookup/lookup-select.el
-%%ELISPDIR%%/lookup/lookup-select.elc
-%%ELISPDIR%%/lookup/ndic.el
-%%ELISPDIR%%/lookup/ndic.elc
-%%ELISPDIR%%/lookup/ndeb.el
-%%ELISPDIR%%/lookup/ndeb.elc
-%%ELISPDIR%%/lookup/ndeb-binary.el
-%%ELISPDIR%%/lookup/ndeb-binary.elc
-%%ELISPDIR%%/lookup/ndtp.el
-%%ELISPDIR%%/lookup/ndtp.elc
-%%ELISPDIR%%/lookup/ndict.el
-%%ELISPDIR%%/lookup/ndict.elc
-%%ELISPDIR%%/lookup/ndkks.el
-%%ELISPDIR%%/lookup/ndkks.elc
-%%ELISPDIR%%/lookup/ndspell.el
-%%ELISPDIR%%/lookup/ndspell.elc
-%%ELISPDIR%%/lookup/ndcookie.el
-%%ELISPDIR%%/lookup/ndcookie.elc
-%%ELISPDIR%%/lookup/ndmisc.el
-%%ELISPDIR%%/lookup/ndmisc.elc
-%%ELISPDIR%%/lookup/ndsrd.el
-%%ELISPDIR%%/lookup/ndsrd.elc
-%%ELISPDIR%%/lookup/sdicf.el
-%%ELISPDIR%%/lookup/sdicf.elc
-%%ELISPDIR%%/lookup/stem-english.el
-%%ELISPDIR%%/lookup/stem-english.elc
-%%ELISPDIR%%/lookup/lookup-vars.el
-%%ELISPDIR%%/lookup/lookup-vars.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/evi.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/evi.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/evi-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/evi-mule.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-utils.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-utils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-types.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-types.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-vse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-vse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-package.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-package.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-kanji.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-kanji.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-entry.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-entry.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-content.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-content.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-select.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-select.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndeb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndeb.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndeb-binary.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndeb-binary.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndtp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndtp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndict.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndict.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndkks.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndkks.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndspell.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndspell.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndcookie.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndcookie.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndmisc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndmisc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndsrd.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndsrd.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/sdicf.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/sdicf.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/stem-english.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/stem-english.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-vars.el
+%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-vars.elc
diff --git a/japanese/migemo-emacs23/Makefile b/japanese/migemo-emacs/Makefile
index 6a0be81efd45..81461d8fb3e5 100644
--- a/japanese/migemo-emacs23/Makefile
+++ b/japanese/migemo-emacs/Makefile
@@ -1,21 +1,21 @@
 # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PORTREVISION=	2
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 COMMENT=	Japanese incremental search tool for emacs
 MASTERDIR=	${.CURDIR}/../../japanese/migemo
-PKGDIR=	${.CURDIR}
+PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 PKGMESSAGE=	${MASTERDIR}/pkg-message
 
-USE_EMACS=	yes
-BUILD_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:editors/apel
-RUN_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:editors/apel \
+BUILD_DEPENDS=	editors/apel${EMACS_PKGNAMESUFFIX}:editors/apel
+RUN_DEPENDS=	editors/apel${EMACS_PKGNAMESUFFIX}:editors/apel \
 		migemo:japanese/migemo
 
-CONFLICTS=	ja-migemo-emacs22-[0-9]* \
-	ja-migemo-emacs21-[0-9]*
+USES=		emacs
+
+CONFLICTS=	ja-migemo.el
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD}
@@ -27,4 +27,5 @@ SLAVE_PORT=	yes
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/migemo.el ${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/migemo.elc ${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/site-lisp
+
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/migemo-emacs23/pkg-descr b/japanese/migemo-emacs/pkg-descr
index 7e9cc1490258..7e9cc1490258 100644
--- a/japanese/migemo-emacs23/pkg-descr
+++ b/japanese/migemo-emacs/pkg-descr
diff --git a/japanese/migemo.el/Makefile b/japanese/migemo.el/Makefile
index e0a1f23d2f32..a8506583e620 100644
--- a/japanese/migemo.el/Makefile
+++ b/japanese/migemo.el/Makefile
@@ -3,39 +3,35 @@
 
 PORTNAME=	migemo.el
 PORTVERSION=	1.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Japanese incremental search tool for Emacs
 
 LICENSE=	GPLv2
 
-USE_EMACS=	yes
-USE_GITHUB=	yes
-
 RUN_DEPENDS=	cmigemo:japanese/cmigemo
 
+USES=		emacs
+USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-jp
 GH_PROJECT=	migemo
 
-CONFLICTS=	ja-migemo-emacs24-[0-9]*
-
+CONFLICTS=	ja-migemo-emacs
+NO_ARCH=	yes
 NO_BUILD=	yes
-
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/migemo.el
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
-OPTINOS_DEFAULT=	DOCS
-
-.include <bsd.port.options.mk>
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/migemo.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index 5cb6ab4e63de..f574b6cef6af 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${RUBY_SITELIBDIR}/romkan.rb:japanese/ruby-romkan \
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rubydir=${RUBY_SITELIBDIR}
-USES=		autoreconf
+USES+=		autoreconf
 USE_RUBY=	yes
 
 .if !defined(SLAVE_PORT)
diff --git a/japanese/mozc-el/Makefile b/japanese/mozc-el/Makefile
index 50df45cac44b..9e5c342b833d 100644
--- a/japanese/mozc-el/Makefile
+++ b/japanese/mozc-el/Makefile
@@ -1,8 +1,8 @@
 # Created by: TAKANO, Yuji
 # $FreeBSD$
 
-PORTREVISION=	1
-PKGNAMESUFFIX=	-el-${EMACS_PORT_NAME}
+PORTREVISION=	2
+PKGNAMESUFFIX=	-el${EMACS_PKGNAMESUFFIX}
 
 COMMENT=	Emacs input method for Mozc
 
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 3cdda3b351ae..19f5039212a6 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -57,7 +57,7 @@ USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20
 LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 .elif ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el"
-USE_EMACS=	yes
+USES+=		emacs
 .elif ${BUILD_MOZC_LIST:Mfcitx_mozc}
 USES+=		gettext-tools
 .endif
diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index eafd2ab6c372..a010d937a095 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	navi2ch
 PORTVERSION=	2.0.0.d
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	2ch.net and 2ch-like BBS navigator for Emacsen
@@ -16,10 +16,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/2chproxy.pl:japanese/p5-2chproxy
 
-USE_EMACS=	yes
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	naota
 GH_TAGNAME=	faebfd1
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	EMACS="${EMACS_CMD}"
 CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${LISPDIR}/${PORTNAME}
diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index 07779a3fe6dc..7dd02dab475a 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -3,38 +3,41 @@
 
 PORTNAME=	yc.el
 PORTVERSION=	5.2.1
-PORTREVISION=	12
+PORTREVISION=	13
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	yc-${PORTVERSION}.el
 EXTRACT_SUFX=	.gz
 
 MAINTAINER=	t@nakao.org
-COMMENT=	Yet another Canna client for Emacs/XEmacs
+COMMENT=	Yet another Canna client for Emacs
 
 EXTRACT_CMD=	${GZCAT}
 EXTRACT_BEFORE_ARGS=	#
 EXTRACT_AFTER_ARGS=	> yc.el
 NO_WRKSUBDIR=	yes
 
-USE_EMACS=	yes
+USES=		emacs
+EMACS_FLAVORS_EXCLUDE=	devel_full devel_nox # fail to build
+
 YC_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
 
-PLIST_FILES=	%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.el \
-		%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.elc
+PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/yc/yc.el \
+		${EMACS_VERSION_SITE_LISPDIR}/yc/yc.elc
 
 OPTIONS_DEFINE=	ICANNA
 ICANNA_DESC=	Enable icanna support
 ICANNA_RUN_DEPENDS=	icanna:japanese/icanna
 
 do-build:
-	@cd ${WRKSRC} && \
-	${EMACS_CMD} -batch -f batch-byte-compile yc.el
+	@(cd ${WRKSRC} && \
+	${EMACS_CMD} -batch -f batch-byte-compile yc.el)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${YC_LISPDIR}
-	@cd ${WRKSRC} && \
-	${INSTALL_SCRIPT} yc.el yc.elc ${STAGEDIR}${YC_LISPDIR}
+	(cd ${WRKSRC} && \
+		${INSTALL_SCRIPT} yc.el yc.elc ${STAGEDIR}${YC_LISPDIR})
 
 .include <bsd.port.mk>
diff --git a/japanese/yc.el/pkg-message b/japanese/yc.el/pkg-message
index 6c4fa6f86e02..f8e9c0392b67 100644
--- a/japanese/yc.el/pkg-message
+++ b/japanese/yc.el/pkg-message
@@ -19,4 +19,3 @@ Note:
   in emacs21 or former version of emacsen, define WITH_ICANNA to add
   dependency to ports ja-icanna.
 **********************************************************************
-
diff --git a/lang/alchemist.el/Makefile b/lang/alchemist.el/Makefile
index b91c5d0bde2a..698f5f8a9401 100644
--- a/lang/alchemist.el/Makefile
+++ b/lang/alchemist.el/Makefile
@@ -2,32 +2,33 @@
 
 PORTNAME=	alchemist.el
 PORTVERSION=	1.8.2
-PORTREVISION=	1
 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>=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
-USE_EMACS=	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
+	(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}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/lang/clojure-mode.el/Makefile b/lang/clojure-mode.el/Makefile
index 2ae155d87d6c..8826ec659b37 100644
--- a/lang/clojure-mode.el/Makefile
+++ b/lang/clojure-mode.el/Makefile
@@ -3,21 +3,21 @@
 
 PORTNAME=	clojure-mode.el
 PORTVERSION=	5.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	lang elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	harrigan-s@outlook.com
 COMMENT=	Emacs lisp module for the Clojure language
 
 LICENSE=	GPLv3
 
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	clojure-emacs
 GH_PROJECT=	clojure-mode
 
-USE_EMACS=	yes
-
 NO_ARCH=	yes
 NO_BUILD=	yes
 
diff --git a/lang/csharp-mode.el/Makefile b/lang/csharp-mode.el/Makefile
index 96a0829d9ec6..47851432af1d 100644
--- a/lang/csharp-mode.el/Makefile
+++ b/lang/csharp-mode.el/Makefile
@@ -3,21 +3,23 @@
 
 PORTNAME=	csharp-mode.el
 PORTVERSION=	0.9.0
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	lang elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Emacs/XEmacs major mode for editing C\# source code
+COMMENT=	Emacs major mode for editing C\# source code
 
 LICENSE=	GPLv2
 
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	josteink
 GH_PROJECT=	csharp-mode
 
+NO_ARCH=	yes
 NO_BUILD=	yes
-USE_EMACS=	yes
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/csharp-mode.el
 
diff --git a/lang/elixir-mode.el/Makefile b/lang/elixir-mode.el/Makefile
index 28a52ff9e1b7..96bcf86ac787 100644
--- a/lang/elixir-mode.el/Makefile
+++ b/lang/elixir-mode.el/Makefile
@@ -1,21 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	elixir-mode.el
-PORTVERSION=	2.3.1
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTVERSION=	2.3.1
+PORTREVISION=	2
 CATEGORIES=	lang
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Emacs major mode for Elixir
 
 LICENSE=	GPLv3
 
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	elixir-lang
 GH_PROJECT=	emacs-elixir
 
-USE_EMACS=	yes
+NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
diff --git a/lang/haskell-mode.el/Makefile b/lang/haskell-mode.el/Makefile
index 8f0b837d30c8..f5a3f70f4c2e 100644
--- a/lang/haskell-mode.el/Makefile
+++ b/lang/haskell-mode.el/Makefile
@@ -2,27 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	haskell-mode
-PORTVERSION=	16.1
-PORTREVISION=	1
 DISTVERSIONPREFIX=v
+DISTVERSION=	16.1
+PORTREVISION=	2
 CATEGORIES=	lang elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	aehlig@linta.de
 COMMENT=	Emacs lisp mode for editing haskell programs
 
 LICENSE=	GPLv3
 
-USE_EMACS=	yes
-
-OPTIONS_DEFINE=	DOCS
-
+USES=		emacs gmake
+USE_GITHUB=	yes
 GH_ACCOUNT=	haskell
+
 PORTDOCS=	NEWS README.md
-USE_GITHUB=	yes
-USES=		gmake
 ALL_TARGET=	haskell-mode-autoloads.el
 NO_ARCH=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 ELISPDIR=	${PREFIX}/${PLIST_DIRS}
 ELISPFILES=	ghc-core.el ghci-script-mode.el haskell-align-imports.el \
 		haskell-c2hs.el \
diff --git a/lang/pure/Makefile b/lang/pure/Makefile
index 604da9b34ff6..03f8c32dcb62 100644
--- a/lang/pure/Makefile
+++ b/lang/pure/Makefile
@@ -75,7 +75,7 @@ DISTFILES+=	${EXTRACT_ONLY} ${PORTNAME}-docs-${PORTVERSION}.tar.gz
 .endif
 
 .if ${PORT_OPTIONS:MEMACS}
-USE_EMACS=	yes
+USES+=			emacs:build
 MAKE_ARGS+=	emacs_prefix=${PREFIX}
 .endif
 
diff --git a/lang/quack/Makefile b/lang/quack/Makefile
index 6924356a03d4..0f944666c402 100644
--- a/lang/quack/Makefile
+++ b/lang/quack/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	quack
 PORTVERSION=	0.47
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang scheme elisp
 MASTER_SITES=	http://www.neilvandyke.org/quack/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.el
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
@@ -17,7 +18,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	wget:ftp/wget
 
-USE_EMACS=	yes
+USES=		emacs
 
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
diff --git a/lang/tuareg-mode.el/Makefile b/lang/tuareg-mode.el/Makefile
index 6de2bcc38b48..f8e3275f3da0 100644
--- a/lang/tuareg-mode.el/Makefile
+++ b/lang/tuareg-mode.el/Makefile
@@ -3,25 +3,25 @@
 
 PORTNAME=	tuareg-mode
 PORTVERSION=	2.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	lang elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	michipili@gmail.com
 COMMENT=	Emacs major mode for editing Caml code
 
 LICENSE=	GPLv2
 
-USE_EMACS=	yes
+USES=		emacs
 USE_GITHUB=	yes
-
 GH_ACCOUNT=	ocaml
 GH_PROJECT=	tuareg
 
 OPTIONS_DEFINE=	DOCS
 ELISP_FILES=	ocamldebug.el tuareg.el
 .for f in ${ELISP_FILES}
-PLIST_FILES+=	%%EMACS_SITE_LISPDIR%%/$f %%EMACS_SITE_LISPDIR%%/$fc
+PLIST_FILES+=	${EMACS_SITE_LISPDIR}/$f ${EMACS_SITE_LISPDIR}/$fc
 .endfor
 
 PORTDOCS=	README.md
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index fbec63bd2ebd..3702b242e6b5 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -43,7 +43,7 @@ OPTIONS_EXCLUDE+=	PAM
 .endif
 
 EMACS_DESC=		Install EMACS lisp files (requires emacs)
-EMACS_USE=		EMACS=yes
+EMACS_USES=		emacs:build
 EMACS_CONFIGURE_ON=	--with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/anubis
 EMACS_CONFIGURE_OFF=	--with-lispdir=no
 
diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile
index 58c896477ebc..208f2f2ed3c1 100644
--- a/mail/c-sig/Makefile
+++ b/mail/c-sig/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	c-sig
 PORTVERSION=	3.8
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	mail elisp
 MASTER_SITES=	LOCAL/tota/${PORTNAME}
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	yasu@utahime.org
@@ -14,7 +14,7 @@ COMMENT=	Signature insertion tool for Emacs
 
 LICENSE=	GPLv2+
 
-USE_EMACS=	yes
+USES=		emacs
 
 NO_WRKSUBDIR=	yes
 
diff --git a/mail/mailest/Makefile b/mail/mailest/Makefile
index 19742be01401..f69c284aec45 100644
--- a/mail/mailest/Makefile
+++ b/mail/mailest/Makefile
@@ -3,8 +3,9 @@
 PORTNAME=	mailest
 PORTVERSION=	0.9.22
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Hyper Estraier backend for Mew
@@ -18,12 +19,12 @@ LICENSE_FILE_${L}=	${WRKSRC}/LICENSE.${L}
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libqdbm.so:databases/qdbm \
 		libestraier.so:textproc/hyperestraier
-RUN_DEPENDS=	mewl:mail/mew
+RUN_DEPENDS=	mew${EMACS_PKGNAMESUFFIX}>0:mail/mew@${EMACS_FLAVOR}
 
-USES=		iconv fakeroot
-USE_EMACS=	yes
+USES=		emacs fakeroot iconv
 USE_GITHUB=	yes
 GH_ACCOUNT=	yasuoka
+
 MAKE_ENV=	USE_BSDMAKE=true WITH_INSTALL_AS_USER=true
 
 LICENSE_BSD2CLAUSE_SRC=	bytebuf.c replace/sys/tree.h
diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile
index 3a3772f30869..de517a8373c3 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -40,7 +40,7 @@ TOKYOCABINET_DESC=	Tokyo Cabinet database support
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 
-EMACS_USE=		EMACS=yes
+EMACS_USES=		emacs:build
 EMACS_IMPLIES=		MH
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
@@ -89,12 +89,6 @@ PGSQL_CONFIGURE_WITH=	postgres
 TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMH} && exists(${LOCALBASE}/bin/emacs)
-USE_EMACS=	yes
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/need_charset_alias=/s|true|false|' \
 		${WRKSRC}/lib/gnu/Makefile.in
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index eeb5e199a03f..f2ec2f2a4dea 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	mew
 PORTVERSION=	6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.mew.org/Release/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	Messaging in the Emacs World for emacs
@@ -14,15 +14,8 @@ COMMENT=	Messaging in the Emacs World for emacs
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/00copyright
 
-OPTIONS_DEFINE=	DATABASE DOCS STUNNEL
-OPTIONS_DEFAULT=STUNNEL
-DATABASE_DESC=	Support database feature (with Ruby & Sqlite3)
-DATABASE_RUN_DEPENDS=	rubygem-sqlite3>=0:databases/rubygem-sqlite3
-STUNNEL_DESC=	Support SSL feature using stunnel
-STUNNEL_RUN_DEPENDS=	stunnel>=0:security/stunnel
+USES=		emacs
 
-# emacs port setup
-USE_EMACS=	yes
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-elispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew \
@@ -41,11 +34,18 @@ PORTDOCS=	00api 00changes.0 00changes.1 00changes.2 00changes.3 \
 		00changes.6.5 00changes.6.6 00changes.6.7 \
 		00diff 00readme dot.emacs dot.mew dot.theme
 
+OPTIONS_DEFINE=	DATABASE DOCS STUNNEL
+OPTIONS_DEFAULT=STUNNEL
+DATABASE_DESC=	Support database feature (with Ruby & Sqlite3)
+DATABASE_RUN_DEPENDS=	rubygem-sqlite3>=0:databases/rubygem-sqlite3
+STUNNEL_DESC=	Support SSL feature using stunnel
+STUNNEL_RUN_DEPENDS=	stunnel>=0:security/stunnel
+
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/${INFO_PATH}/*.info.~1~
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/mail/mu4e-maildirs/Makefile b/mail/mu4e-maildirs/Makefile
index 66c17eff54d3..0882b205332e 100644
--- a/mail/mu4e-maildirs/Makefile
+++ b/mail/mu4e-maildirs/Makefile
@@ -2,9 +2,9 @@
 
 PORTNAME=	mu4e-maildirs
 PORTVERSION=	0.8.20160126
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Maildirs extension for Mu4e
@@ -12,14 +12,15 @@ COMMENT=	Maildirs extension for Mu4e
 LICENSE=	GPLv3
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/dash.el:devel/dash.el \
-		${LOCALBASE}/${EMACS_SITE_LISPDIR}/mu4e/mu4e.elc:mail/mu4e
+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=	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
diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile
index 0665ebc14ca9..4514d528daf9 100644
--- a/mail/mu4e/Makefile
+++ b/mail/mu4e/Makefile
@@ -2,10 +2,10 @@
 
 PORTNAME=	mu4e
 PORTVERSION=	0.9.16
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	mail
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Emacs frontend for Mu
@@ -14,11 +14,11 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	mu:mail/mu
 
-USES=		autoreconf gmake makeinfo pkgconfig
+USES=		autoreconf emacs gmake makeinfo pkgconfig
 USE_GITHUB=	yes
 GH_PROJECT=	mu
 GH_ACCOUNT=	djcb
-USE_EMACS=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk \
 		--disable-webkit \
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index 566a3c84f6a6..c80f079bd188 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	notmuch
 PORTVERSION=	0.25.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
@@ -12,12 +13,14 @@ COMMENT=	Thread-based email index, search, and tagging application
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING-GPL-3
 
+BROKEN_powerpc64=	Does not build
+
 BUILD_DEPENDS=	c++filt:devel/binutils
 LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
 		libxapian.so:databases/xapian-core \
 		libtalloc.so:devel/talloc
 TEST_DEPENDS=	bash:shells/bash \
-		emacs:editors/emacs-nox11 \
+		emacs:editors/emacs@nox \
 		dtach:misc/dtach \
 		gdate:sysutils/coreutils \
 		gbase64:sysutils/coreutils \
@@ -27,11 +30,10 @@ TEST_DEPENDS=	bash:shells/bash \
 		gwc:sysutils/coreutils \
 		${LOCALBASE}/bin/gdb:devel/gdb
 
-BROKEN_powerpc64=	Does not build
-
-HAS_CONFIGURE=	yes
 USES=		gmake pkgconfig python:build,test
 USE_GNOME=	glib20
+
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
 USE_LDCONFIG=	yes
 
@@ -61,7 +63,8 @@ DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 EMACS_CONFIGURE_WITH=	emacs
 EMACS_CONFIGURE_ON=	--emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
 			--emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR}
-EMACS_USE=	EMACS=yes
+EMACS_USES=	emacs
+EMACS_VARS=	PKGNAMESUFFIX=${EMACS_PKGNAMESUFFIX}
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MUTT_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu \
 			p5-Mail-Tools>0:mail/p5-Mail-Tools \
diff --git a/mail/wanderlust-devel/Makefile b/mail/wanderlust-devel/Makefile
index 73e3d07362b2..5c7ab8bcee8d 100644
--- a/mail/wanderlust-devel/Makefile
+++ b/mail/wanderlust-devel/Makefile
@@ -5,122 +5,67 @@ PORTNAME=	wanderlust
 PORTVERSION=	2.15.9.b.${SNAPDATE}
 PORTREVISION=	2
 CATEGORIES=	mail elisp
-PKGNAMESUFFIX=	-devel-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	Yet another message interface on Emacsen
+COMMENT=	Mail and news system for Emacs
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_EMACS=	yes
-USE_GITHUB=	yes
+BUILD_DEPENDS=	emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \
+		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
+		x-face-e21${EMACS_PKGNAMESUFFIX}>0:mail/x-face-e21@${EMACS_FLAVOR}
+RUN_DEPENDS=	emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \
+		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR}
 
+USES=		emacs
+EMACS_FLAVORS_EXCLUDE=	devel_full devel_nox # www/emacs-w3m fails to configure
+USE_GITHUB=	yes
 GH_TAGNAME=	770d54f
 
+NO_ARCH=	yes
 SNAPDATE=	20170628
+CONFLICTS=	wanderlust
 
-CONFLICTS=	wanderlust-*-2.14.*
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-.include <bsd.port.pre.mk>
-
-MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}
-MIMEUI_PRODUCT=	semi
-MIMEUI_VERSION=	1.14
-MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
-
-BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
-
-.if (${EMACS_NAME} == "emacs") && (${EMACS_MAJOR_VER} >= 22)
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:mail/x-face-e21
-.endif
-
-EMACS_W3M_PORT_NAME=	emacs-w3m
-EMACS_W3M_LISP_FILE=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
-
-.if exists(${EMACS_W3M_LISP_FILE})
-BUILD_DEPENDS+=	${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
-RUN_DEPENDS+=	${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
-SHIMBUN=	""
-.else
-SHIMBUN=	"@comment "
-.endif
+MAKE_ARGS+=	EMACS=${EMACS_CMD} \
+		FLAGS="-batch -q -no-site-file" \
+		LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} \
+		INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} \
+		PIXMAPDIR=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/wl/icons
 
-INFODIR=	${PREFIX}/info
 INFO=		wl wl-ja
-UTILSDIR=	${EMACS_VERSION_SITE_LISPDIR}/wl
-WL_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/wl
-WL_ICONDIR=	${EMACS_LIBDIR_WITH_VER}/etc/wl/icons
-STARTUPDIR=	${EMACS_VERSION_SITE_LISPDIR}
+PORTDATA=	ja.Emacs
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-DOCSDIR_JA=	${PREFIX}/share/doc/ja/wanderlust
-DOCS=		README.md NEWS doc/wl.texi
-DOCS_JA=	README.ja NEWS.ja doc/wl-ja.texi
-EXAMPLESLANG=	en ja
-EXAMPLES=	dot.addresses dot.folders dot.wl
-UTILS=		bbdb-wl.el
-
-PLIST_SUB+=	DIRSECTION=${DIRSECTION} \
-		STARTUPDIR=${STARTUPDIR} \
-		WL_LISPDIR=${WL_LISPDIR} \
-		WL_ICONDIR=${WL_ICONDIR} \
-		SHIMBUN=${SHIMBUN} \
-		DOCSDIR_JA=${DOCSDIR_JA:S,^${PREFIX}/,,}
-
-PLIST=		${PKGDIR}/pkg-plist
-MAKE_ARGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \
-		LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
-		INFODIR=${STAGEDIR}${INFODIR} \
-		PIXMAPDIR=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR_WITH_VER}/etc/wl/icons \
-		FLAGS="-batch -q -no-site-file"
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	@${CP} ${FILESDIR}/WL-CFG ${WRKSRC}
 
-post-configure:
-	${REINPLACE_CMD} -e 's|%%EMACS_LIBDIR_WITH_VER%%|${PREFIX}/${EMACS_LIBDIR_WITH_VER}|' ${WRKSRC}/WL-MK
-
 post-install:
-.if !exists(${EMACS_W3M_LISP_FILE})
-	${INSTALL_DATA} ${WRKSRC}/elmo/elmo-shimbun.el ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MAKE} install-docs
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MAKE} install-examples
-.endif
-	@${MAKE} install-utils
-
-# local targets
-install-docs:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+	${INSTALL} -d ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/wl \
+		${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${FILESDIR}/wanderlust-startup.el \
+		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+	${INSTALL_DATA} \
+		${WRKSRC}/elmo/elmo-shimbun.el \
+		${WRKSRC}/utils/bbdb-wl.el \
+		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/wl
+	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${STAGEDIR}${DATADIR}
+
+post-install-DOCS-on:
+	${INSTALL} -d ${STAGEDIR}/${DOCSDIR}
+.for f in README* NEWS* doc/wl*.texi
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.for i in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR_JA}
-.endfor
-
-install-examples:
-.for l in ${EXAMPLESLANG}
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/$l
-	for i in ${EXAMPLES} ; do \
-		${INSTALL_DATA} ${WRKSRC}/samples/$l/$$i ${STAGEDIR}${EXAMPLESDIR}/$l; \
-	done
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${STAGEDIR}${EXAMPLESDIR}/ja
 
-install-utils:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${UTILSDIR}
-.for i in ${UTILS}
-	${INSTALL_DATA} ${WRKSRC}/utils/${i} ${STAGEDIR}${PREFIX}/${UTILSDIR}
-.endfor
-	@${MKDIR} ${PREFIX}/${STARTUPDIR}
-	@${INSTALL_DATA} ${FILESDIR}/wanderlust-startup.el ${STAGEDIR}${PREFIX}/${STARTUPDIR}
+post-install-EXAMPLES-on:
+	${INSTALL} -d ${STAGEDIR}/${EXAMPLESDIR}
+	(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} "en ja" \
+		${STAGEDIR}${EXAMPLESDIR})
+	${RM} ${STAGEDIR}${EXAMPLESDIR}/en/*.orig \
+		${STAGEDIR}${EXAMPLESDIR}/ja/*.orig
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/wanderlust-devel/files/patch-Makefile b/mail/wanderlust-devel/files/patch-Makefile
index 2320a7e85703..5435eab8971c 100644
--- a/mail/wanderlust-devel/files/patch-Makefile
+++ b/mail/wanderlust-devel/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2008-02-19 20:29:06.000000000 +0900
-+++ Makefile	2009-12-28 01:33:12.000000000 +0900
-@@ -92,7 +92,7 @@
+--- Makefile.orig	2017-06-28 06:06:07 UTC
++++ Makefile
+@@ -91,7 +91,7 @@ install-package:
  		$(PACKAGEDIR) $(PIXMAPDIR)
  
  info:
@@ -9,7 +9,7 @@
  
  install-info:
  	$(EMACS) $(FLAGS) -l WL-MK -f install-wl-info $(INFODIR)
-@@ -110,9 +110,9 @@
+@@ -109,9 +109,9 @@ mostlyclean-dvi:
  clean-dvi: mostlyclean-dvi
  	rm -f doc/*.dvi
  
diff --git a/mail/wanderlust-devel/files/patch-WL-MK b/mail/wanderlust-devel/files/patch-WL-MK
index 771e231a12df..f6ae6ddf306e 100644
--- a/mail/wanderlust-devel/files/patch-WL-MK
+++ b/mail/wanderlust-devel/files/patch-WL-MK
@@ -1,5 +1,5 @@
---- WL-MK.orig	2012-01-23 21:34:34.000000000 +0900
-+++ WL-MK	2012-01-23 21:38:11.000000000 +0900
+--- WL-MK.orig	2017-06-28 06:06:07 UTC
++++ WL-MK
 @@ -131,7 +131,7 @@
      (defvar PIXMAPDIR
        (if (string= pixmap-dir "NONE")
diff --git a/mail/wanderlust-devel/files/patch-samples_en_dot.wl b/mail/wanderlust-devel/files/patch-samples_en_dot.wl
index cb2d5e450955..dc2652fa7925 100644
--- a/mail/wanderlust-devel/files/patch-samples_en_dot.wl
+++ b/mail/wanderlust-devel/files/patch-samples_en_dot.wl
@@ -1,6 +1,6 @@
---- samples/en/dot.wl.orig	2009-09-26 19:47:36.000000000 +0900
-+++ samples/en/dot.wl	2009-09-26 19:47:42.000000000 +0900
-@@ -314,7 +314,7 @@
+--- samples/en/dot.wl.orig	2017-06-28 06:06:07 UTC
++++ samples/en/dot.wl
+@@ -327,7 +327,7 @@
  
  	;; for Emacs21
  	((and (not (featurep 'xemacs))
diff --git a/mail/wanderlust-devel/files/patch-samples_ja_dot.wl b/mail/wanderlust-devel/files/patch-samples_ja_dot.wl
index ffecfd83733d..2a68eaef78d0 100644
--- a/mail/wanderlust-devel/files/patch-samples_ja_dot.wl
+++ b/mail/wanderlust-devel/files/patch-samples_ja_dot.wl
@@ -1,6 +1,6 @@
---- samples/ja/dot.wl.orig	2009-09-26 19:48:32.000000000 +0900
-+++ samples/ja/dot.wl	2009-09-26 19:49:02.000000000 +0900
-@@ -320,7 +320,7 @@
+--- samples/ja/dot.wl.orig	2017-06-28 06:06:07 UTC
++++ samples/ja/dot.wl
+@@ -332,7 +332,7 @@
  
  	;; for Emacs21
  	((and (not (featurep 'xemacs))
diff --git a/mail/wanderlust-devel/pkg-plist b/mail/wanderlust-devel/pkg-plist
index bc3c9a2dc0af..35d9b61dbde1 100644
--- a/mail/wanderlust-devel/pkg-plist
+++ b/mail/wanderlust-devel/pkg-plist
@@ -1,254 +1,241 @@
-%%PORTDOCS%%%%DOCSDIR_JA%%/NEWS.ja
-%%PORTDOCS%%%%DOCSDIR_JA%%/README.ja
-%%PORTDOCS%%%%DOCSDIR_JA%%/wl-ja.texi
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/wl.texi
-%%WL_LISPDIR%%/acap.el
-%%WL_LISPDIR%%/acap.elc
-%%WL_LISPDIR%%/bbdb-wl.el
-%%WL_LISPDIR%%/elmo-access.el
-%%WL_LISPDIR%%/elmo-access.elc
-%%WL_LISPDIR%%/elmo-archive.el
-%%WL_LISPDIR%%/elmo-archive.elc
-%%WL_LISPDIR%%/elmo-cache.el
-%%WL_LISPDIR%%/elmo-cache.elc
-%%WL_LISPDIR%%/elmo-date.el
-%%WL_LISPDIR%%/elmo-date.elc
-%%WL_LISPDIR%%/elmo-dop.el
-%%WL_LISPDIR%%/elmo-dop.elc
-%%WL_LISPDIR%%/elmo-file.el
-%%WL_LISPDIR%%/elmo-file.elc
-%%WL_LISPDIR%%/elmo-filter.el
-%%WL_LISPDIR%%/elmo-filter.elc
-%%WL_LISPDIR%%/elmo-flag.el
-%%WL_LISPDIR%%/elmo-flag.elc
-%%WL_LISPDIR%%/elmo-imap4.el
-%%WL_LISPDIR%%/elmo-imap4.elc
-%%WL_LISPDIR%%/elmo-internal.el
-%%WL_LISPDIR%%/elmo-internal.elc
-%%WL_LISPDIR%%/elmo-localdir.el
-%%WL_LISPDIR%%/elmo-localdir.elc
-%%WL_LISPDIR%%/elmo-localnews.el
-%%WL_LISPDIR%%/elmo-localnews.elc
-%%WL_LISPDIR%%/elmo-maildir.el
-%%WL_LISPDIR%%/elmo-maildir.elc
-%%WL_LISPDIR%%/elmo-map.el
-%%WL_LISPDIR%%/elmo-map.elc
-%%WL_LISPDIR%%/elmo-mime.el
-%%WL_LISPDIR%%/elmo-mime.elc
-%%WL_LISPDIR%%/elmo-msgdb.el
-%%WL_LISPDIR%%/elmo-msgdb.elc
-%%WL_LISPDIR%%/elmo-multi.el
-%%WL_LISPDIR%%/elmo-multi.elc
-%%WL_LISPDIR%%/elmo-net.el
-%%WL_LISPDIR%%/elmo-net.elc
-%%WL_LISPDIR%%/elmo-nntp.el
-%%WL_LISPDIR%%/elmo-nntp.elc
-%%WL_LISPDIR%%/elmo-null.el
-%%WL_LISPDIR%%/elmo-null.elc
-%%WL_LISPDIR%%/elmo-passwd.el
-%%WL_LISPDIR%%/elmo-passwd.elc
-%%WL_LISPDIR%%/elmo-pipe.el
-%%WL_LISPDIR%%/elmo-pipe.elc
-%%WL_LISPDIR%%/elmo-pop3.el
-%%WL_LISPDIR%%/elmo-pop3.elc
-%%WL_LISPDIR%%/elmo-rss.el
-%%WL_LISPDIR%%/elmo-rss.elc
-%%WL_LISPDIR%%/elmo-search.el
-%%WL_LISPDIR%%/elmo-search.elc
-%%WL_LISPDIR%%/elmo-sendlog.el
-%%WL_LISPDIR%%/elmo-sendlog.elc
-%%WL_LISPDIR%%/elmo-shimbun.el
-%%SHIMBUN%%%%WL_LISPDIR%%/elmo-shimbun.elc
-%%WL_LISPDIR%%/elmo-signal.el
-%%WL_LISPDIR%%/elmo-signal.elc
-%%WL_LISPDIR%%/elmo-spam.el
-%%WL_LISPDIR%%/elmo-spam.elc
-%%WL_LISPDIR%%/elmo-split.el
-%%WL_LISPDIR%%/elmo-split.elc
-%%WL_LISPDIR%%/elmo-util.el
-%%WL_LISPDIR%%/elmo-util.elc
-%%WL_LISPDIR%%/elmo-vars.el
-%%WL_LISPDIR%%/elmo-vars.elc
-%%WL_LISPDIR%%/elmo-version.el
-%%WL_LISPDIR%%/elmo-version.elc
-%%WL_LISPDIR%%/elmo.el
-%%WL_LISPDIR%%/elmo.elc
-%%WL_LISPDIR%%/elsp-bogofilter.el
-%%WL_LISPDIR%%/elsp-bogofilter.elc
-%%WL_LISPDIR%%/elsp-bsfilter.el
-%%WL_LISPDIR%%/elsp-bsfilter.elc
-%%WL_LISPDIR%%/elsp-sa.el
-%%WL_LISPDIR%%/elsp-sa.elc
-%%WL_LISPDIR%%/elsp-spamoracle.el
-%%WL_LISPDIR%%/elsp-spamoracle.elc
-%%WL_LISPDIR%%/im-wl.el
-%%WL_LISPDIR%%/im-wl.elc
-%%WL_LISPDIR%%/modb-entity.el
-%%WL_LISPDIR%%/modb-entity.elc
-%%WL_LISPDIR%%/modb-legacy.el
-%%WL_LISPDIR%%/modb-legacy.elc
-%%WL_LISPDIR%%/modb-standard.el
-%%WL_LISPDIR%%/modb-standard.elc
-%%WL_LISPDIR%%/modb.el
-%%WL_LISPDIR%%/modb.elc
-%%WL_LISPDIR%%/mmimap.el
-%%WL_LISPDIR%%/mmimap.elc
-%%WL_LISPDIR%%/pldap.el
-%%WL_LISPDIR%%/pldap.elc
-%%WL_LISPDIR%%/rfc2368.el
-%%WL_LISPDIR%%/rfc2368.elc
-%%WL_LISPDIR%%/slp.el
-%%WL_LISPDIR%%/slp.elc
-%%WL_LISPDIR%%/ssl.el
-%%WL_LISPDIR%%/ssl.elc
-%%WL_LISPDIR%%/wl-acap.el
-%%WL_LISPDIR%%/wl-acap.elc
-%%WL_LISPDIR%%/wl-action.el
-%%WL_LISPDIR%%/wl-action.elc
-%%WL_LISPDIR%%/wl-addrbook.el
-%%WL_LISPDIR%%/wl-addrbook.elc
-%%WL_LISPDIR%%/wl-address.el
-%%WL_LISPDIR%%/wl-address.elc
-%%WL_LISPDIR%%/wl-addrmgr.el
-%%WL_LISPDIR%%/wl-addrmgr.elc
-%%WL_LISPDIR%%/wl-batch.el
-%%WL_LISPDIR%%/wl-batch.elc
-%%WL_LISPDIR%%/wl-complete.el
-%%WL_LISPDIR%%/wl-complete.elc
-%%WL_LISPDIR%%/wl-demo.el
-%%WL_LISPDIR%%/wl-demo.elc
-%%WL_LISPDIR%%/wl-draft.el
-%%WL_LISPDIR%%/wl-draft.elc
-%%WL_LISPDIR%%/wl-e21.el
-%%WL_LISPDIR%%/wl-e21.elc
-%%WL_LISPDIR%%/wl-expire.el
-%%WL_LISPDIR%%/wl-expire.elc
-%%WL_LISPDIR%%/wl-fldmgr.el
-%%WL_LISPDIR%%/wl-fldmgr.elc
-%%WL_LISPDIR%%/wl-folder.el
-%%WL_LISPDIR%%/wl-folder.elc
-%%WL_LISPDIR%%/wl-highlight.el
-%%WL_LISPDIR%%/wl-highlight.elc
-%%WL_LISPDIR%%/wl-mailto.el
-%%WL_LISPDIR%%/wl-mailto.elc
-%%WL_LISPDIR%%/wl-message.el
-%%WL_LISPDIR%%/wl-message.elc
-%%WL_LISPDIR%%/wl-mime.el
-%%WL_LISPDIR%%/wl-mime.elc
-%%WL_LISPDIR%%/wl-news.el
-%%WL_LISPDIR%%/wl-qs.el
-%%WL_LISPDIR%%/wl-qs.elc
-%%WL_LISPDIR%%/wl-refile.el
-%%WL_LISPDIR%%/wl-refile.elc
-%%WL_LISPDIR%%/wl-score.el
-%%WL_LISPDIR%%/wl-score.elc
-%%WL_LISPDIR%%/wl-spam.el
-%%WL_LISPDIR%%/wl-spam.elc
-%%WL_LISPDIR%%/wl-summary.el
-%%WL_LISPDIR%%/wl-summary.elc
-%%WL_LISPDIR%%/wl-template.el
-%%WL_LISPDIR%%/wl-template.elc
-%%WL_LISPDIR%%/wl-thread.el
-%%WL_LISPDIR%%/wl-thread.elc
-%%WL_LISPDIR%%/wl-util.el
-%%WL_LISPDIR%%/wl-util.elc
-%%WL_LISPDIR%%/wl-vars.el
-%%WL_LISPDIR%%/wl-vars.elc
-%%WL_LISPDIR%%/wl-version.el
-%%WL_LISPDIR%%/wl-version.elc
-%%WL_LISPDIR%%/wl.el
-%%WL_LISPDIR%%/wl.elc
-%%STARTUPDIR%%/wanderlust-startup.el
-%%WL_ICONDIR%%/access.xpm
-%%WL_ICONDIR%%/archive.xpm
-%%WL_ICONDIR%%/closed.xpm
-%%WL_ICONDIR%%/draft.xpm
-%%WL_ICONDIR%%/elmo.xpm
-%%WL_ICONDIR%%/file.xpm
-%%WL_ICONDIR%%/filter.xpm
-%%WL_ICONDIR%%/imap.xpm
-%%WL_ICONDIR%%/internal.xpm
-%%WL_ICONDIR%%/letter.xpm
-%%WL_ICONDIR%%/local.xpm
-%%WL_ICONDIR%%/localnews.xpm
-%%WL_ICONDIR%%/maildir.xpm
-%%WL_ICONDIR%%/multi.xpm
-%%WL_ICONDIR%%/news.xpm
-%%WL_ICONDIR%%/nmz.xpm
-%%WL_ICONDIR%%/no-letter.xpm
-%%WL_ICONDIR%%/opened.xpm
-%%WL_ICONDIR%%/pipe.xpm
-%%WL_ICONDIR%%/plugged.xpm
-%%WL_ICONDIR%%/pop.xpm
-%%WL_ICONDIR%%/queue.xpm
-%%WL_ICONDIR%%/shimbun.xpm
-%%WL_ICONDIR%%/trash-e.xpm
-%%WL_ICONDIR%%/trash.xpm
-%%WL_ICONDIR%%/unplugged.xpm
-%%WL_ICONDIR%%/wl-alpha-logo.img
-%%WL_ICONDIR%%/wl-alpha-logo.xbm
-%%WL_ICONDIR%%/wl-alpha-logo.xpm
-%%WL_ICONDIR%%/wl-alpha-xmas-logo.img
-%%WL_ICONDIR%%/wl-alpha-xmas-logo.xbm
-%%WL_ICONDIR%%/wl-alpha-xmas-logo.xpm
-%%WL_ICONDIR%%/wl-beta-logo.img
-%%WL_ICONDIR%%/wl-beta-logo.xbm
-%%WL_ICONDIR%%/wl-beta-logo.xpm
-%%WL_ICONDIR%%/wl-beta-xmas-logo.img
-%%WL_ICONDIR%%/wl-beta-xmas-logo.xbm
-%%WL_ICONDIR%%/wl-beta-xmas-logo.xpm
-%%WL_ICONDIR%%/wl-draft-insert-signature-up.xpm
-%%WL_ICONDIR%%/wl-draft-kill-up.xpm
-%%WL_ICONDIR%%/wl-draft-save-and-exit-up.xpm
-%%WL_ICONDIR%%/wl-draft-send-from-toolbar-down.xpm
-%%WL_ICONDIR%%/wl-draft-send-from-toolbar-up.xpm
-%%WL_ICONDIR%%/wl-draft-up.xpm
-%%WL_ICONDIR%%/wl-draft-yank-original-up.xpm
-%%WL_ICONDIR%%/wl-exit-up.xpm
-%%WL_ICONDIR%%/wl-folder-check-current-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-empty-trash-up.xpm
-%%WL_ICONDIR%%/wl-folder-goto-draft-folder-up.xpm
-%%WL_ICONDIR%%/wl-folder-jump-to-current-entity-no-sync-up.xpm
-%%WL_ICONDIR%%/wl-folder-jump-to-current-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-next-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-prev-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-read-up.xpm
-%%WL_ICONDIR%%/wl-folder-select-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-sync-current-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-zoom-entity-up.xpm
-%%WL_ICONDIR%%/wl-message-extract-content-up.xpm
-%%WL_ICONDIR%%/wl-message-next-content-up.xpm
-%%WL_ICONDIR%%/wl-message-play-content-up.xpm
-%%WL_ICONDIR%%/wl-message-prev-content-up.xpm
-%%WL_ICONDIR%%/wl-message-quit-up.xpm
-%%WL_ICONDIR%%/wl-message-read-up.xpm
-%%WL_ICONDIR%%/wl-stable-logo.img
-%%WL_ICONDIR%%/wl-stable-logo.xbm
-%%WL_ICONDIR%%/wl-stable-logo.xpm
-%%WL_ICONDIR%%/wl-stable-xmas-logo.img
-%%WL_ICONDIR%%/wl-stable-xmas-logo.xbm
-%%WL_ICONDIR%%/wl-stable-xmas-logo.xpm
-%%WL_ICONDIR%%/wl-summary-delete-up.xpm
-%%WL_ICONDIR%%/wl-summary-dispose-up.xpm
-%%WL_ICONDIR%%/wl-summary-exit-up.xpm
-%%WL_ICONDIR%%/wl-summary-forward-up.xpm
-%%WL_ICONDIR%%/wl-summary-jump-to-current-message-up.xpm
-%%WL_ICONDIR%%/wl-summary-next-page-up.xpm
-%%WL_ICONDIR%%/wl-summary-next-up.xpm
-%%WL_ICONDIR%%/wl-summary-prev-page-up.xpm
-%%WL_ICONDIR%%/wl-summary-prev-up.xpm
-%%WL_ICONDIR%%/wl-summary-read-up.xpm
-%%WL_ICONDIR%%/wl-summary-reply-up.xpm
-%%WL_ICONDIR%%/wl-summary-reply-with-citation-up.xpm
-%%WL_ICONDIR%%/wl-summary-set-flags-up.xpm
-%%WL_ICONDIR%%/wl-summary-sync-force-update-up.xpm
-%%WL_ICONDIR%%/wl-write-current-folder-up.xpm
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/en/dot.addresses
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/en/dot.folders
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/en/dot.wl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ja/dot.addresses
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ja/dot.folders
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ja/dot.wl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ja/ja.Emacs
+%%EMACS_LIBDIR%%/etc/wl/icons/access.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/archive.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/closed.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/draft.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/elmo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/file.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/filter.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/imap.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/internal.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/letter.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/local.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/localnews.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/maildir.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/multi.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/news.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/nmz.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/no-letter.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/opened.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/pipe.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/plugged.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/pop.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/queue.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/shimbun.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/trash-e.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/trash.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/unplugged.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-xmas-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-xmas-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-xmas-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-xmas-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-xmas-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-xmas-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-insert-signature-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-kill-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-save-and-exit-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-send-from-toolbar-down.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-send-from-toolbar-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-yank-original-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-exit-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-check-current-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-empty-trash-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-goto-draft-folder-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-jump-to-current-entity-no-sync-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-jump-to-current-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-next-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-prev-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-read-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-select-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-sync-current-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-zoom-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-extract-content-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-next-content-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-play-content-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-prev-content-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-quit-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-read-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-xmas-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-xmas-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-xmas-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-delete-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-dispose-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-exit-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-forward-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-jump-to-current-message-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-next-page-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-next-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-prev-page-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-prev-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-read-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-reply-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-reply-with-citation-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-set-flags-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-sync-force-update-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-write-current-folder-up.xpm
+%%EMACS_SITE_LISPDIR%%/wanderlust-startup.el
+%%EMACS_SITE_LISPDIR%%/wl/acap.el
+%%EMACS_SITE_LISPDIR%%/wl/acap.elc
+%%EMACS_SITE_LISPDIR%%/wl/bbdb-wl.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-access.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-access.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-archive.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-archive.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-cache.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-cache.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-date.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-date.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-dop.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-dop.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-file.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-file.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-filter.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-filter.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-flag.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-flag.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-imap4.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-imap4.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-internal.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-internal.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-localdir.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-localdir.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-localnews.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-localnews.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-maildir.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-maildir.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-map.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-map.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-mime.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-mime.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-msgdb.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-msgdb.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-multi.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-multi.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-net.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-net.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-nntp.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-nntp.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-null.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-null.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-passwd.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-passwd.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-pipe.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-pipe.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-pop3.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-pop3.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-rss.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-rss.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-search.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-search.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-sendlog.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-sendlog.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-shimbun.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-shimbun.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-signal.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-signal.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-spam.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-spam.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-split.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-split.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-util.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-util.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-vars.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-vars.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-version.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-version.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo.elc
+%%EMACS_SITE_LISPDIR%%/wl/elsp-bogofilter.el
+%%EMACS_SITE_LISPDIR%%/wl/elsp-bogofilter.elc
+%%EMACS_SITE_LISPDIR%%/wl/elsp-bsfilter.el
+%%EMACS_SITE_LISPDIR%%/wl/elsp-bsfilter.elc
+%%EMACS_SITE_LISPDIR%%/wl/elsp-sa.el
+%%EMACS_SITE_LISPDIR%%/wl/elsp-sa.elc
+%%EMACS_SITE_LISPDIR%%/wl/elsp-spamoracle.el
+%%EMACS_SITE_LISPDIR%%/wl/elsp-spamoracle.elc
+%%EMACS_SITE_LISPDIR%%/wl/im-wl.el
+%%EMACS_SITE_LISPDIR%%/wl/im-wl.elc
+%%EMACS_SITE_LISPDIR%%/wl/mmimap.el
+%%EMACS_SITE_LISPDIR%%/wl/mmimap.elc
+%%EMACS_SITE_LISPDIR%%/wl/modb-entity.el
+%%EMACS_SITE_LISPDIR%%/wl/modb-entity.elc
+%%EMACS_SITE_LISPDIR%%/wl/modb-legacy.el
+%%EMACS_SITE_LISPDIR%%/wl/modb-legacy.elc
+%%EMACS_SITE_LISPDIR%%/wl/modb-standard.el
+%%EMACS_SITE_LISPDIR%%/wl/modb-standard.elc
+%%EMACS_SITE_LISPDIR%%/wl/modb.el
+%%EMACS_SITE_LISPDIR%%/wl/modb.elc
+%%EMACS_SITE_LISPDIR%%/wl/pldap.el
+%%EMACS_SITE_LISPDIR%%/wl/pldap.elc
+%%EMACS_SITE_LISPDIR%%/wl/rfc2368.el
+%%EMACS_SITE_LISPDIR%%/wl/rfc2368.elc
+%%EMACS_SITE_LISPDIR%%/wl/slp.el
+%%EMACS_SITE_LISPDIR%%/wl/slp.elc
+%%EMACS_SITE_LISPDIR%%/wl/ssl.el
+%%EMACS_SITE_LISPDIR%%/wl/ssl.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-acap.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-acap.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-action.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-action.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-addrbook.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-addrbook.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-address.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-address.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-addrmgr.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-addrmgr.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-batch.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-batch.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-complete.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-complete.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-demo.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-demo.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-draft.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-draft.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-e21.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-e21.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-expire.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-expire.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-fldmgr.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-fldmgr.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-folder.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-folder.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-highlight.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-highlight.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-mailto.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-mailto.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-message.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-message.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-mime.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-mime.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-news.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-qs.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-qs.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-refile.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-refile.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-score.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-score.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-spam.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-spam.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-summary.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-summary.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-template.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-template.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-thread.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-thread.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-util.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-util.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-vars.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-vars.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-version.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-version.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl.el
+%%EMACS_SITE_LISPDIR%%/wl/wl.elc
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index cb43b7ae428e..f9e00d31b984 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -7,114 +7,65 @@ PORTREVISION=	19
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
 		http://www.jpl.org/elips/wl/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	wl-${PORTVERSION}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
+DISTNAME=	wl-${DISTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT?=	Yet another message interface on Emacsen
+COMMENT=	Mail and news system for Emacs
 
-USE_EMACS=	yes
-NO_ARCH=	yes
-
-CONFLICTS=	wanderlust-*-2.15.*
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.pre.mk>
-
-EMACS_W3M_PORT_NAME?=	emacs-w3m
-EMACS_W3M_LISP_FILE?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
-
-MIMEUI_PORT_NAME?=	${MIMEUI_PRODUCT}
-MIMEUI_PRODUCT=	semi
-MIMEUI_VERSION=	1.14
-MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
-
-BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
-
-.if (${EMACS_NAME} == "emacs") && (${EMACS_MAJOR_VER} == 23)
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:mail/x-face-e21
-.endif
+LICENSE=	GPLv2+
 
-.if exists(${EMACS_W3M_LISP_FILE})
-BUILD_DEPENDS+=	${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
-RUN_DEPENDS+=	${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
-SHIMBUN=	""
-.else
-SHIMBUN=	"@comment "
-.endif
+BUILD_DEPENDS=	semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
+		emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR}
+RUN_DEPENDS=	semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
+		emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR}
 
-ALL_TARGET?=	all info
-INSTALL_TARGET?=	install install-info
-INFODIR=	${PREFIX}/info
-UTILSDIR?=	${EMACS_VERSION_SITE_LISPDIR}/wl
-WL_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/wl
-WL_ICONDIR=	${EMACS_LIBDIR_WITH_VER}/etc/wl/icons
-STARTUPDIR?=	${EMACS_VERSION_SITE_LISPDIR}
+USES=		emacs
+EMACS_FLAVORS_EXCLUDE=	devel_full devel_nox # www/emacs-w3m fails to configure
 
-DIRSECTION=	"The Emacs editor and associated tools"
-PORTDOCDIR=	share/doc/wanderlust
-PORTDOCDIR_JA=	share/doc/ja/wanderlust
-DOCS=		README NEWS doc/wl.texi
-DOCS_JA=	README.ja NEWS.ja doc/wl-ja.texi
-SAMPLESDIR=	share/examples/wanderlust
-SAMPLESLANG=	en ja
-SAMPLES=	dot.addresses dot.folders dot.wl
-UTILS=		bbdb-wl.el
+NO_ARCH=	yes
+CONFLICTS=	wanderlust-devel
 
-PLIST_SUB+=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
-		DIRSECTION=${DIRSECTION} \
-		STARTUPDIR=${STARTUPDIR} \
-		WL_LISPDIR=${WL_LISPDIR} \
-		WL_ICONDIR=${WL_ICONDIR} \
-		SHIMBUN=${SHIMBUN}
-WRK_STARTUP_FILE=	${WRKDIR}/wanderlust-startup.el
 MAKE_ARGS+=	EMACS=${EMACS_CMD} \
-		LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
-		FLAGS="-batch -q -no-site-file"
+		FLAGS="-batch -q -no-site-file" \
+		LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} \
+		INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} \
+		PIXMAPDIR=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/wl/icons
+ALL_TARGET=	all info
+INSTALL_TARGET=	install install-info
+
 INFO=		wl wl-ja
-PLIST=		${PKGDIR}/pkg-plist.emacs
-MAKE_ARGS+=	INFODIR=${STAGEDIR}${INFODIR} \
-		PIXMAPDIR=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR_WITH_VER}/etc/wl/icons
+PORTDATA=	ja.Emacs
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	@${CP} ${FILESDIR}/WL-CFG ${WRKSRC}
 
 post-install:
-.if !exists(${EMACS_W3M_LISP_FILE})
-	${INSTALL_DATA} ${WRKSRC}/elmo/elmo-shimbun.el ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl
-.endif
-	${MAKE} install-samples
-	${MAKE} install-utils
+	${INSTALL} -d ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/wl \
+		${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${FILESDIR}/wanderlust-startup.el \
+		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+	${INSTALL_DATA} \
+		${WRKSRC}/elmo/elmo-shimbun.el \
+		${WRKSRC}/utils/bbdb-wl.el \
+		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/wl
+	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${STAGEDIR}${DATADIR}
 
-# local targets
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTDOCDIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTDOCDIR_JA}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/${PORTDOCDIR}
-.endfor
-.for i in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/${PORTDOCDIR_JA}
+	${INSTALL} -d ${STAGEDIR}/${DOCSDIR}
+.for f in README* NEWS* doc/wl*.texi
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-install-samples:
-.for l in ${SAMPLESLANG}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${SAMPLESDIR}/$l
-	for i in ${SAMPLES} ; do \
-		${INSTALL_DATA} ${WRKSRC}/samples/$l/$$i ${STAGEDIR}${PREFIX}/${SAMPLESDIR}/$l; \
-	done
-.endfor
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/wanderlust
-	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${STAGEDIR}${PREFIX}/share/wanderlust
-
-install-utils:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${UTILSDIR}
-.for i in ${UTILS}
-	${INSTALL_DATA} ${WRKSRC}/utils/${i} ${STAGEDIR}${PREFIX}/${UTILSDIR}
-.endfor
-	${MKDIR} ${STAGEDIR}${PREFIX}/${STARTUPDIR}
-	${INSTALL_DATA} ${FILESDIR}/wanderlust-startup.el ${STAGEDIR}${PREFIX}/${STARTUPDIR}
+post-install-EXAMPLES-on:
+	${INSTALL} -d ${STAGEDIR}/${EXAMPLESDIR}
+	(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} "en ja" \
+		${STAGEDIR}${EXAMPLESDIR})
+	${RM} ${STAGEDIR}${EXAMPLESDIR}/en/*.orig \
+		${STAGEDIR}${EXAMPLESDIR}/ja/*.orig
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/wanderlust/files/patch-Makefile b/mail/wanderlust/files/patch-Makefile
index 9716ac1b2b66..8584bf73d3f0 100644
--- a/mail/wanderlust/files/patch-Makefile
+++ b/mail/wanderlust/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2009-12-28 01:20:59.000000000 +0900
-+++ Makefile	2009-12-28 01:22:55.000000000 +0900
-@@ -91,7 +91,7 @@
+--- Makefile.orig	2005-01-23 10:10:44 UTC
++++ Makefile
+@@ -91,7 +91,7 @@ install-package:
  		$(PACKAGEDIR) $(PIXMAPDIR)
  
  info:
diff --git a/mail/wanderlust/files/patch-samples_en_dot.wl b/mail/wanderlust/files/patch-samples_en_dot.wl
index cb2d5e450955..107316f6d4e2 100644
--- a/mail/wanderlust/files/patch-samples_en_dot.wl
+++ b/mail/wanderlust/files/patch-samples_en_dot.wl
@@ -1,5 +1,5 @@
---- samples/en/dot.wl.orig	2009-09-26 19:47:36.000000000 +0900
-+++ samples/en/dot.wl	2009-09-26 19:47:42.000000000 +0900
+--- samples/en/dot.wl.orig	2004-11-26 03:59:36 UTC
++++ samples/en/dot.wl
 @@ -314,7 +314,7 @@
  
  	;; for Emacs21
diff --git a/mail/wanderlust/files/patch-samples_ja_dot.wl b/mail/wanderlust/files/patch-samples_ja_dot.wl
index ffecfd83733d..f3c74da58840 100644
--- a/mail/wanderlust/files/patch-samples_ja_dot.wl
+++ b/mail/wanderlust/files/patch-samples_ja_dot.wl
@@ -1,5 +1,5 @@
---- samples/ja/dot.wl.orig	2009-09-26 19:48:32.000000000 +0900
-+++ samples/ja/dot.wl	2009-09-26 19:49:02.000000000 +0900
+--- samples/ja/dot.wl.orig	2004-11-26 03:59:37 UTC
++++ samples/ja/dot.wl
 @@ -320,7 +320,7 @@
  
  	;; for Emacs21
diff --git a/mail/wanderlust/files/patch-utils_ptexinfmt.el b/mail/wanderlust/files/patch-utils_ptexinfmt.el
index 3964160234bc..25d938a645c6 100644
--- a/mail/wanderlust/files/patch-utils_ptexinfmt.el
+++ b/mail/wanderlust/files/patch-utils_ptexinfmt.el
@@ -1,6 +1,6 @@
---- utils/ptexinfmt.el.orig
+--- utils/ptexinfmt.el.orig	2005-02-24 08:16:41 UTC
 +++ utils/ptexinfmt.el
-@@ -68,50 +68,50 @@
+@@ -68,50 +68,50 @@ This is last argument in `ptexinfmt-brok
    "Declare a symbol FACILITY is broken if ASSERTION is nil.
  DOCSTRING will be printed if ASSERTION is nil and
  `ptexinfmt-disable-broken-notice-flag' is nil."
@@ -69,7 +69,7 @@
  
  ;; sort -fd
  (ptexinfmt-broken-facility texinfo-format-printindex
-@@ -509,7 +509,7 @@
+@@ -509,7 +509,7 @@ For example, @verb\{|@|\} results in @ a
    (goto-char texinfo-command-start))
  
  ;; @,{c}	==>	c,	cedilla accent
diff --git a/mail/wanderlust/files/patch-wl_wl-draft.el b/mail/wanderlust/files/patch-wl_wl-draft.el
index 5d683609c63f..2be9d7e543b0 100644
--- a/mail/wanderlust/files/patch-wl_wl-draft.el
+++ b/mail/wanderlust/files/patch-wl_wl-draft.el
@@ -1,6 +1,6 @@
---- wl/wl-draft.el.orig	2009-09-23 20:33:55.000000000 +0900
-+++ wl/wl-draft.el	2009-09-23 20:34:31.000000000 +0900
-@@ -147,10 +147,6 @@
+--- wl/wl-draft.el.orig	2005-03-20 13:10:03 UTC
++++ wl/wl-draft.el
+@@ -147,10 +147,6 @@ e.g.
  	     (if (eq wl-smtp-connection-type 'ssl)
  		 #'open-ssl-stream
  	       smtp-open-connection-function))
diff --git a/mail/wanderlust/pkg-message b/mail/wanderlust/pkg-message
index add3dd434ba1..96f14e077749 100644
--- a/mail/wanderlust/pkg-message
+++ b/mail/wanderlust/pkg-message
@@ -1,10 +1,9 @@
 ************************************************************
-* Before using Wanderlust, you must set following elisp    *
-* to your own .emacs file.                                 *
+* Before using Wanderlust, you must include the line below *
+* in one of your Emacs initialization files.               *
 *                                                          *
 * (require 'wanderlust-startup)                            *
 *                                                          *
 * Sample configuration files are installed into            *
-* ${PREFIX}/share/examples/wanderlust.  Please copy to     *
-* your home directory and edit them.                       *
+* ${PREFIX}/share/examples/wanderlust.                     *
 ************************************************************
diff --git a/mail/wanderlust/pkg-plist b/mail/wanderlust/pkg-plist
new file mode 100644
index 000000000000..1e72c055e58e
--- /dev/null
+++ b/mail/wanderlust/pkg-plist
@@ -0,0 +1,237 @@
+%%EMACS_LIBDIR%%/etc/wl/icons/access.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/archive.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/closed.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/draft.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/elmo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/file.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/filter.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/imap.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/internal.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/letter.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/local.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/localnews.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/maildir.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/multi.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/news.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/nmz.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/no-letter.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/opened.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/pipe.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/plugged.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/pop.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/queue.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/shimbun.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/trash-e.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/trash.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/unplugged.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-xmas-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-xmas-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-alpha-xmas-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-xmas-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-xmas-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-beta-xmas-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-insert-signature-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-kill-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-save-and-exit-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-send-from-toolbar-down.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-send-from-toolbar-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-draft-yank-original-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-exit-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-check-current-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-empty-trash-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-goto-draft-folder-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-jump-to-current-entity-no-sync-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-jump-to-current-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-next-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-prev-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-read-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-select-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-sync-current-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-folder-zoom-entity-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-extract-content-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-next-content-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-play-content-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-prev-content-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-quit-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-message-read-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-xmas-logo.img
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-xmas-logo.xbm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-stable-xmas-logo.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-delete-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-dispose-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-exit-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-forward-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-jump-to-current-message-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-next-page-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-next-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-prev-page-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-prev-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-read-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-reply-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-reply-with-citation-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-set-flags-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-sync-force-update-up.xpm
+%%EMACS_LIBDIR%%/etc/wl/icons/wl-write-current-folder-up.xpm
+%%EMACS_SITE_LISPDIR%%/wanderlust-startup.el
+%%EMACS_SITE_LISPDIR%%/wl/acap.el
+%%EMACS_SITE_LISPDIR%%/wl/acap.elc
+%%EMACS_SITE_LISPDIR%%/wl/bbdb-wl.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-access.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-access.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-archive.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-archive.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-cache.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-cache.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-date.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-date.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-dop.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-dop.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-file.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-file.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-filter.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-filter.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-flag.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-flag.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-imap4.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-imap4.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-internal.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-internal.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-localdir.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-localdir.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-localnews.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-localnews.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-maildir.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-maildir.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-map.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-map.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-mime.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-mime.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-msgdb.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-msgdb.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-multi.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-multi.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-net.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-net.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-nmz.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-nmz.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-nntp.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-nntp.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-null.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-null.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-pipe.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-pipe.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-pop3.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-pop3.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-sendlog.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-sendlog.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-shimbun.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-shimbun.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-signal.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-signal.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-spam.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-spam.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-split.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-split.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-util.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-util.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-vars.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-vars.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-version.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-version.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo.elc
+%%EMACS_SITE_LISPDIR%%/wl/elsp-bogofilter.el
+%%EMACS_SITE_LISPDIR%%/wl/elsp-bogofilter.elc
+%%EMACS_SITE_LISPDIR%%/wl/elsp-bsfilter.el
+%%EMACS_SITE_LISPDIR%%/wl/elsp-bsfilter.elc
+%%EMACS_SITE_LISPDIR%%/wl/elsp-sa.el
+%%EMACS_SITE_LISPDIR%%/wl/elsp-sa.elc
+%%EMACS_SITE_LISPDIR%%/wl/elsp-spamoracle.el
+%%EMACS_SITE_LISPDIR%%/wl/elsp-spamoracle.elc
+%%EMACS_SITE_LISPDIR%%/wl/im-wl.el
+%%EMACS_SITE_LISPDIR%%/wl/im-wl.elc
+%%EMACS_SITE_LISPDIR%%/wl/mmimap.el
+%%EMACS_SITE_LISPDIR%%/wl/mmimap.elc
+%%EMACS_SITE_LISPDIR%%/wl/modb-entity.el
+%%EMACS_SITE_LISPDIR%%/wl/modb-entity.elc
+%%EMACS_SITE_LISPDIR%%/wl/modb-legacy.el
+%%EMACS_SITE_LISPDIR%%/wl/modb-legacy.elc
+%%EMACS_SITE_LISPDIR%%/wl/modb-standard.el
+%%EMACS_SITE_LISPDIR%%/wl/modb-standard.elc
+%%EMACS_SITE_LISPDIR%%/wl/modb.el
+%%EMACS_SITE_LISPDIR%%/wl/modb.elc
+%%EMACS_SITE_LISPDIR%%/wl/pldap.el
+%%EMACS_SITE_LISPDIR%%/wl/pldap.elc
+%%EMACS_SITE_LISPDIR%%/wl/rfc2368.el
+%%EMACS_SITE_LISPDIR%%/wl/rfc2368.elc
+%%EMACS_SITE_LISPDIR%%/wl/slp.el
+%%EMACS_SITE_LISPDIR%%/wl/slp.elc
+%%EMACS_SITE_LISPDIR%%/wl/ssl.el
+%%EMACS_SITE_LISPDIR%%/wl/ssl.elc
+%%EMACS_SITE_LISPDIR%%/wl/utf7.el
+%%EMACS_SITE_LISPDIR%%/wl/utf7.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-acap.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-acap.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-action.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-action.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-addrbook.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-addrbook.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-address.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-address.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-addrmgr.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-addrmgr.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-batch.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-batch.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-complete.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-complete.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-demo.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-demo.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-draft.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-draft.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-e21.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-e21.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-expire.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-expire.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-fldmgr.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-fldmgr.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-folder.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-folder.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-highlight.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-highlight.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-mailto.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-mailto.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-message.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-message.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-mime.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-mime.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-news.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-refile.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-refile.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-score.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-score.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-spam.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-spam.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-summary.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-summary.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-template.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-template.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-thread.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-thread.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-util.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-util.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-vars.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-vars.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl-version.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-version.elc
+%%EMACS_SITE_LISPDIR%%/wl/wl.el
+%%EMACS_SITE_LISPDIR%%/wl/wl.elc
diff --git a/mail/wanderlust/pkg-plist.emacs b/mail/wanderlust/pkg-plist.emacs
deleted file mode 100644
index 2a4edd2d8e04..000000000000
--- a/mail/wanderlust/pkg-plist.emacs
+++ /dev/null
@@ -1,250 +0,0 @@
-%%PORTDOCS%%share/doc/ja/wanderlust/NEWS.ja
-%%PORTDOCS%%share/doc/ja/wanderlust/README.ja
-%%PORTDOCS%%share/doc/ja/wanderlust/wl-ja.texi
-%%PORTDOCS%%share/doc/wanderlust/NEWS
-%%PORTDOCS%%share/doc/wanderlust/README
-%%PORTDOCS%%share/doc/wanderlust/wl.texi
-%%WL_LISPDIR%%/acap.el
-%%WL_LISPDIR%%/acap.elc
-%%WL_LISPDIR%%/bbdb-wl.el
-%%WL_LISPDIR%%/elmo-access.el
-%%WL_LISPDIR%%/elmo-access.elc
-%%WL_LISPDIR%%/elmo-archive.el
-%%WL_LISPDIR%%/elmo-archive.elc
-%%WL_LISPDIR%%/elmo-cache.el
-%%WL_LISPDIR%%/elmo-cache.elc
-%%WL_LISPDIR%%/elmo-date.el
-%%WL_LISPDIR%%/elmo-date.elc
-%%WL_LISPDIR%%/elmo-dop.el
-%%WL_LISPDIR%%/elmo-dop.elc
-%%WL_LISPDIR%%/elmo-file.el
-%%WL_LISPDIR%%/elmo-file.elc
-%%WL_LISPDIR%%/elmo-filter.el
-%%WL_LISPDIR%%/elmo-filter.elc
-%%WL_LISPDIR%%/elmo-flag.el
-%%WL_LISPDIR%%/elmo-flag.elc
-%%WL_LISPDIR%%/elmo-imap4.el
-%%WL_LISPDIR%%/elmo-imap4.elc
-%%WL_LISPDIR%%/elmo-internal.el
-%%WL_LISPDIR%%/elmo-internal.elc
-%%WL_LISPDIR%%/elmo-localdir.el
-%%WL_LISPDIR%%/elmo-localdir.elc
-%%WL_LISPDIR%%/elmo-localnews.el
-%%WL_LISPDIR%%/elmo-localnews.elc
-%%WL_LISPDIR%%/elmo-maildir.el
-%%WL_LISPDIR%%/elmo-maildir.elc
-%%WL_LISPDIR%%/elmo-map.el
-%%WL_LISPDIR%%/elmo-map.elc
-%%WL_LISPDIR%%/elmo-mime.el
-%%WL_LISPDIR%%/elmo-mime.elc
-%%WL_LISPDIR%%/elmo-msgdb.el
-%%WL_LISPDIR%%/elmo-msgdb.elc
-%%WL_LISPDIR%%/elmo-multi.el
-%%WL_LISPDIR%%/elmo-multi.elc
-%%WL_LISPDIR%%/elmo-net.el
-%%WL_LISPDIR%%/elmo-net.elc
-%%WL_LISPDIR%%/elmo-nmz.el
-%%WL_LISPDIR%%/elmo-nmz.elc
-%%WL_LISPDIR%%/elmo-nntp.el
-%%WL_LISPDIR%%/elmo-nntp.elc
-%%WL_LISPDIR%%/elmo-null.el
-%%WL_LISPDIR%%/elmo-null.elc
-%%WL_LISPDIR%%/elmo-pipe.el
-%%WL_LISPDIR%%/elmo-pipe.elc
-%%WL_LISPDIR%%/elmo-pop3.el
-%%WL_LISPDIR%%/elmo-pop3.elc
-%%WL_LISPDIR%%/elmo-sendlog.el
-%%WL_LISPDIR%%/elmo-sendlog.elc
-%%WL_LISPDIR%%/elmo-shimbun.el
-%%SHIMBUN%%%%WL_LISPDIR%%/elmo-shimbun.elc
-%%WL_LISPDIR%%/elmo-signal.el
-%%WL_LISPDIR%%/elmo-signal.elc
-%%WL_LISPDIR%%/elmo-spam.el
-%%WL_LISPDIR%%/elmo-spam.elc
-%%WL_LISPDIR%%/elmo-split.el
-%%WL_LISPDIR%%/elmo-split.elc
-%%WL_LISPDIR%%/elmo-util.el
-%%WL_LISPDIR%%/elmo-util.elc
-%%WL_LISPDIR%%/elmo-vars.el
-%%WL_LISPDIR%%/elmo-vars.elc
-%%WL_LISPDIR%%/elmo-version.el
-%%WL_LISPDIR%%/elmo-version.elc
-%%WL_LISPDIR%%/elmo.el
-%%WL_LISPDIR%%/elmo.elc
-%%WL_LISPDIR%%/elsp-bogofilter.el
-%%WL_LISPDIR%%/elsp-bogofilter.elc
-%%WL_LISPDIR%%/elsp-bsfilter.el
-%%WL_LISPDIR%%/elsp-bsfilter.elc
-%%WL_LISPDIR%%/elsp-sa.el
-%%WL_LISPDIR%%/elsp-sa.elc
-%%WL_LISPDIR%%/elsp-spamoracle.el
-%%WL_LISPDIR%%/elsp-spamoracle.elc
-%%WL_LISPDIR%%/im-wl.el
-%%WL_LISPDIR%%/im-wl.elc
-%%WL_LISPDIR%%/modb-entity.el
-%%WL_LISPDIR%%/modb-entity.elc
-%%WL_LISPDIR%%/modb-legacy.el
-%%WL_LISPDIR%%/modb-legacy.elc
-%%WL_LISPDIR%%/modb-standard.el
-%%WL_LISPDIR%%/modb-standard.elc
-%%WL_LISPDIR%%/modb.el
-%%WL_LISPDIR%%/modb.elc
-%%WL_LISPDIR%%/mmimap.el
-%%WL_LISPDIR%%/mmimap.elc
-%%WL_LISPDIR%%/pldap.el
-%%WL_LISPDIR%%/pldap.elc
-%%WL_LISPDIR%%/rfc2368.el
-%%WL_LISPDIR%%/rfc2368.elc
-%%WL_LISPDIR%%/slp.el
-%%WL_LISPDIR%%/slp.elc
-%%WL_LISPDIR%%/ssl.el
-%%WL_LISPDIR%%/ssl.elc
-%%WL_LISPDIR%%/utf7.el
-%%WL_LISPDIR%%/utf7.elc
-%%WL_LISPDIR%%/wl-acap.el
-%%WL_LISPDIR%%/wl-acap.elc
-%%WL_LISPDIR%%/wl-action.el
-%%WL_LISPDIR%%/wl-action.elc
-%%WL_LISPDIR%%/wl-addrbook.el
-%%WL_LISPDIR%%/wl-addrbook.elc
-%%WL_LISPDIR%%/wl-address.el
-%%WL_LISPDIR%%/wl-address.elc
-%%WL_LISPDIR%%/wl-addrmgr.el
-%%WL_LISPDIR%%/wl-addrmgr.elc
-%%WL_LISPDIR%%/wl-batch.el
-%%WL_LISPDIR%%/wl-batch.elc
-%%WL_LISPDIR%%/wl-complete.el
-%%WL_LISPDIR%%/wl-complete.elc
-%%WL_LISPDIR%%/wl-demo.el
-%%WL_LISPDIR%%/wl-demo.elc
-%%WL_LISPDIR%%/wl-draft.el
-%%WL_LISPDIR%%/wl-draft.elc
-%%WL_LISPDIR%%/wl-e21.el
-%%WL_LISPDIR%%/wl-e21.elc
-%%WL_LISPDIR%%/wl-expire.el
-%%WL_LISPDIR%%/wl-expire.elc
-%%WL_LISPDIR%%/wl-fldmgr.el
-%%WL_LISPDIR%%/wl-fldmgr.elc
-%%WL_LISPDIR%%/wl-folder.el
-%%WL_LISPDIR%%/wl-folder.elc
-%%WL_LISPDIR%%/wl-highlight.el
-%%WL_LISPDIR%%/wl-highlight.elc
-%%WL_LISPDIR%%/wl-mailto.el
-%%WL_LISPDIR%%/wl-mailto.elc
-%%WL_LISPDIR%%/wl-message.el
-%%WL_LISPDIR%%/wl-message.elc
-%%WL_LISPDIR%%/wl-mime.el
-%%WL_LISPDIR%%/wl-mime.elc
-%%WL_LISPDIR%%/wl-news.el
-%%WL_LISPDIR%%/wl-refile.el
-%%WL_LISPDIR%%/wl-refile.elc
-%%WL_LISPDIR%%/wl-score.el
-%%WL_LISPDIR%%/wl-score.elc
-%%WL_LISPDIR%%/wl-spam.el
-%%WL_LISPDIR%%/wl-spam.elc
-%%WL_LISPDIR%%/wl-summary.el
-%%WL_LISPDIR%%/wl-summary.elc
-%%WL_LISPDIR%%/wl-template.el
-%%WL_LISPDIR%%/wl-template.elc
-%%WL_LISPDIR%%/wl-thread.el
-%%WL_LISPDIR%%/wl-thread.elc
-%%WL_LISPDIR%%/wl-util.el
-%%WL_LISPDIR%%/wl-util.elc
-%%WL_LISPDIR%%/wl-vars.el
-%%WL_LISPDIR%%/wl-vars.elc
-%%WL_LISPDIR%%/wl-version.el
-%%WL_LISPDIR%%/wl-version.elc
-%%WL_LISPDIR%%/wl.el
-%%WL_LISPDIR%%/wl.elc
-%%STARTUPDIR%%/wanderlust-startup.el
-%%WL_ICONDIR%%/access.xpm
-%%WL_ICONDIR%%/archive.xpm
-%%WL_ICONDIR%%/closed.xpm
-%%WL_ICONDIR%%/draft.xpm
-%%WL_ICONDIR%%/elmo.xpm
-%%WL_ICONDIR%%/file.xpm
-%%WL_ICONDIR%%/filter.xpm
-%%WL_ICONDIR%%/imap.xpm
-%%WL_ICONDIR%%/internal.xpm
-%%WL_ICONDIR%%/letter.xpm
-%%WL_ICONDIR%%/local.xpm
-%%WL_ICONDIR%%/localnews.xpm
-%%WL_ICONDIR%%/maildir.xpm
-%%WL_ICONDIR%%/multi.xpm
-%%WL_ICONDIR%%/news.xpm
-%%WL_ICONDIR%%/nmz.xpm
-%%WL_ICONDIR%%/no-letter.xpm
-%%WL_ICONDIR%%/opened.xpm
-%%WL_ICONDIR%%/pipe.xpm
-%%WL_ICONDIR%%/plugged.xpm
-%%WL_ICONDIR%%/pop.xpm
-%%WL_ICONDIR%%/queue.xpm
-%%WL_ICONDIR%%/shimbun.xpm
-%%WL_ICONDIR%%/trash-e.xpm
-%%WL_ICONDIR%%/trash.xpm
-%%WL_ICONDIR%%/unplugged.xpm
-%%WL_ICONDIR%%/wl-alpha-logo.img
-%%WL_ICONDIR%%/wl-alpha-logo.xbm
-%%WL_ICONDIR%%/wl-alpha-logo.xpm
-%%WL_ICONDIR%%/wl-alpha-xmas-logo.img
-%%WL_ICONDIR%%/wl-alpha-xmas-logo.xbm
-%%WL_ICONDIR%%/wl-alpha-xmas-logo.xpm
-%%WL_ICONDIR%%/wl-beta-logo.img
-%%WL_ICONDIR%%/wl-beta-logo.xbm
-%%WL_ICONDIR%%/wl-beta-logo.xpm
-%%WL_ICONDIR%%/wl-beta-xmas-logo.img
-%%WL_ICONDIR%%/wl-beta-xmas-logo.xbm
-%%WL_ICONDIR%%/wl-beta-xmas-logo.xpm
-%%WL_ICONDIR%%/wl-draft-insert-signature-up.xpm
-%%WL_ICONDIR%%/wl-draft-kill-up.xpm
-%%WL_ICONDIR%%/wl-draft-save-and-exit-up.xpm
-%%WL_ICONDIR%%/wl-draft-send-from-toolbar-down.xpm
-%%WL_ICONDIR%%/wl-draft-send-from-toolbar-up.xpm
-%%WL_ICONDIR%%/wl-draft-up.xpm
-%%WL_ICONDIR%%/wl-draft-yank-original-up.xpm
-%%WL_ICONDIR%%/wl-exit-up.xpm
-%%WL_ICONDIR%%/wl-folder-check-current-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-empty-trash-up.xpm
-%%WL_ICONDIR%%/wl-folder-goto-draft-folder-up.xpm
-%%WL_ICONDIR%%/wl-folder-jump-to-current-entity-no-sync-up.xpm
-%%WL_ICONDIR%%/wl-folder-jump-to-current-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-next-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-prev-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-read-up.xpm
-%%WL_ICONDIR%%/wl-folder-select-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-sync-current-entity-up.xpm
-%%WL_ICONDIR%%/wl-folder-zoom-entity-up.xpm
-%%WL_ICONDIR%%/wl-message-extract-content-up.xpm
-%%WL_ICONDIR%%/wl-message-next-content-up.xpm
-%%WL_ICONDIR%%/wl-message-play-content-up.xpm
-%%WL_ICONDIR%%/wl-message-prev-content-up.xpm
-%%WL_ICONDIR%%/wl-message-quit-up.xpm
-%%WL_ICONDIR%%/wl-message-read-up.xpm
-%%WL_ICONDIR%%/wl-stable-logo.img
-%%WL_ICONDIR%%/wl-stable-logo.xbm
-%%WL_ICONDIR%%/wl-stable-logo.xpm
-%%WL_ICONDIR%%/wl-stable-xmas-logo.img
-%%WL_ICONDIR%%/wl-stable-xmas-logo.xbm
-%%WL_ICONDIR%%/wl-stable-xmas-logo.xpm
-%%WL_ICONDIR%%/wl-summary-delete-up.xpm
-%%WL_ICONDIR%%/wl-summary-dispose-up.xpm
-%%WL_ICONDIR%%/wl-summary-exit-up.xpm
-%%WL_ICONDIR%%/wl-summary-forward-up.xpm
-%%WL_ICONDIR%%/wl-summary-jump-to-current-message-up.xpm
-%%WL_ICONDIR%%/wl-summary-next-page-up.xpm
-%%WL_ICONDIR%%/wl-summary-next-up.xpm
-%%WL_ICONDIR%%/wl-summary-prev-page-up.xpm
-%%WL_ICONDIR%%/wl-summary-prev-up.xpm
-%%WL_ICONDIR%%/wl-summary-read-up.xpm
-%%WL_ICONDIR%%/wl-summary-reply-up.xpm
-%%WL_ICONDIR%%/wl-summary-reply-with-citation-up.xpm
-%%WL_ICONDIR%%/wl-summary-set-flags-up.xpm
-%%WL_ICONDIR%%/wl-summary-sync-force-update-up.xpm
-%%WL_ICONDIR%%/wl-write-current-folder-up.xpm
-share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.folders
-share/examples/wanderlust/en/dot.wl
-share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.folders
-share/examples/wanderlust/ja/dot.wl
-share/wanderlust/ja.Emacs
diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile
index d89e3081a664..4ea04e547211 100644
--- a/mail/x-face-e21/Makefile
+++ b/mail/x-face-e21/Makefile
@@ -3,21 +3,19 @@
 
 PORTNAME=	x-face-e21
 PORTVERSION=	20070306
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.jpl.org/elips/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}.el
 EXTRACT_SUFX=	.gz
 
 MAINTAINER=	ume@FreeBSD.org
-COMMENT=	X-Face utilities for Emacs 21 (and possibly 22)
+COMMENT=	X-Face utilities for Emacs
 
 RUN_DEPENDS=	uncompface:mail/faces
 
-USE_EMACS=	yes
-
-.include <bsd.port.pre.mk>
+USES=		emacs
 
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${GZCAT}
@@ -28,14 +26,14 @@ PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \
 		${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME}c
 
 do-build:
-	@cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
-		-f batch-byte-compile ${DISTNAME}
+	@(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
+		-f batch-byte-compile ${DISTNAME})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${DISTNAME} \
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${DISTNAME}c \
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}c \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/xcite/Makefile b/mail/xcite/Makefile
index c53ea09c82cf..d7e79c5da496 100644
--- a/mail/xcite/Makefile
+++ b/mail/xcite/Makefile
@@ -3,17 +3,17 @@
 
 PORTNAME=	xcite
 PORTVERSION=	1.60
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.gentei.org/~yuuji/software/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}.el
 EXTRACT_SUFX=	# empty
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Exciting Cite for any Mail/News reading modes on Emacs
 
-USE_EMACS=	yes
+USES=		emacs
 
 NO_WRKSUBDIR=	yes
 
@@ -25,14 +25,14 @@ PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \
 		${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME}c
 
 do-build:
-	@cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
-		-f batch-byte-compile ${DISTNAME}
+	@(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
+		-f batch-byte-compile ${DISTNAME})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${DISTNAME} \
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${DISTNAME}c \
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}c \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/math/coq/Makefile b/math/coq/Makefile
index 1ae05356c74b..f95b47f9a83a 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -2,11 +2,12 @@
 
 PORTNAME=	coq
 PORTVERSION=	8.6
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	math
 MASTER_SITES=	http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \
 		ftp://ftp.stack.nl/pub/users/johans/coq/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Theorem prover based on lambda-C
@@ -14,20 +15,20 @@ COMMENT=	Theorem prover based on lambda-C
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_armv6=	fails to compile: Fatal error: exception Invalid_argument("index out of bounds")
+BROKEN_armv7=	fails to compile: Fatal error: exception Invalid_argument("index out of bounds")
+BROKEN_powerpc=	fails to link
+
 BUILD_DEPENDS=	camlp5:devel/ocaml-camlp5 \
 		ocamlfind:devel/ocaml-findlib
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-BROKEN_armv6=		fails to compile: Fatal error: exception Invalid_argument("index out of bounds")
-BROKEN_armv7=		fails to compile: Fatal error: exception Invalid_argument("index out of bounds")
-BROKEN_powerpc=		fails to link
-
-USES=		gmake gettext-runtime
-USE_EMACS=	yes
+USES=		emacs gmake gettext-runtime
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtksourceview2 pango
 USE_LDCONFIG=	${PREFIX}/lib/coq
 USE_OCAML=	yes
+
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-prefix ${PREFIX} \
 		-mandir ${PREFIX}/man \
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 4b6465306969..bfde590904cb 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -3,9 +3,11 @@
 
 PORTNAME=	ess
 DISTVERSION=	17.11
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/ \
 		http://stat.ethz.ch/ESS/downloads/ess/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	rhurlin@gwdg.de
 COMMENT=	R support for Emacsen
@@ -17,8 +19,7 @@ RUN_DEPENDS=	R:math/R
 
 NO_ARCH=	yes
 
-USES=		gmake makeinfo tar:tgz
-USE_EMACS=	yes
+USES=		emacs gmake makeinfo tar:tgz
 
 INFO=		ess
 
diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile
index bebf05cbecf6..88622f1d54bd 100644
--- a/math/proofgeneral/Makefile
+++ b/math/proofgeneral/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	proofgeneral
 PORTVERSION=	4.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
-PKGNAMESUFFIX=	-${EMACS_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	ProofGeneral-${PORTVERSION}
 
 MAINTAINER=	beyert@cs.ucr.edu
@@ -18,20 +18,15 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
-USE_EMACS=	yes
+USES=		emacs gmake perl5 shebangfix tar:tgz
+EMACS_FLAVORS_EXCLUDE=	nox devel_nox
+
 INSTALLS_ICONS=	yes
-USES=		gmake perl5 shebangfix tar:tgz
 SHEBANG_FILES=	lego/legotags coq/coqtags isar/isartags
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_NAME} == xemacs
-IGNORE=	the ProofGeneral developers no longer support XEmacs
-.endif
-
 MAKE_ARGS+=	PREFIX="${LOCALBASE}" DEST_PREFIX="${STAGEDIR}${PREFIX}" \
-	MAKE="${MAKE_CMD}" EMACS="${EMACS_NAME}" EMACS_NAME="${EMACS_NAME}" \
+	MAKE="${MAKE_CMD}" EMACS=emacs EMACS_NAME=emacs \
 	DOCDIR="${STAGEDIR}${DOCSDIR}" MANDIR="${STAGEDIR}${PREFIX}/man/man1" \
 	INFODIR="${STAGEDIR}${PREFIX}/info" \
 	BINDIR="${STAGEDIR}${PREFIX}/bin" DESKTOP="${STAGEDIR}${PREFIX}/share" \
@@ -45,16 +40,15 @@ SUB_FILES=	pkg-message
 SUB_LIST=	EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
 
 INFO=		PG-adapting ProofGeneral
-
-.if ${PORT_OPTIONS:MDOCS}
-MAKE_ARGS+=	DOCSDIR=${DOCSDIR} INSTALLDOC=install-doc
-BUILD_DEPENDS+=	texi2html:textproc/texi2html
-.endif
-
 PORTDOCS=	AUTHORS BUGS CHANGES COMPATIBILITY COPYING INSTALL \
 		PG-adapting ProofGeneral README REGISTER acl2 hol98 isar lego \
 		pgshell phox twelf
 
+OPTIONS_DEFINE=	DOCS
+
+DOCS_MAKE_ARGS=	DOCSDIR=${DOCSDIR} INSTALLDOC=install-doc
+DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
 		${WRKSRC}/etc/desktop/proofgeneral.desktop
@@ -67,7 +61,7 @@ post-patch:
 		's|PGHOMEDEFAULT=$$HOME|PGHOMEDEFAULT=${PREFIX}/${EMACS_SITE_LISPDIR}|g' \
 	${WRKSRC}/bin/proofgeneral
 	@${TOUCH} ${WRKSRC}/.byte-compile
-	@${REINPLACE_CMD} -e 's,%%EMACS_NAME%%,${EMACS_NAME},' \
+	@${REINPLACE_CMD} -e 's,%%EMACS_NAME%%,emacs,' \
 		${WRKSRC}/isar/interface
 
 pre-build:
@@ -75,7 +69,11 @@ pre-build:
 	@${RM} ${WRKSRC}/.byte-compile || ${TRUE}
 #.endif
 
-post-install:
+post-install-DOCS-on:
 	@${FIND} ${STAGEDIR}${DOCSDIR} -type d -empty -delete
 
-.include <bsd.port.post.mk>
+post-install-DOCS-off:
+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1
+
+.include <bsd.port.mk>
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index 8a91aba294a2..100fad9eca54 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -3,27 +3,34 @@
 
 PORTNAME=	elscreen
 PORTVERSION=	1.4.6
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	misc elisp
 MASTER_SITES=	ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	kuriyama@FreeBSD.org
-COMMENT=	GNU screen like utility on Emacsen
+COMMENT=	Emacs utility similar to GNU Screen
 
-RUN_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel
+RUN_DEPENDS=	apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR}
 
-USE_EMACS=	yes
+USES=		emacs
 
-EMACS_NO_BUILD_DEPENDS=	YES
+NO_ARCH=	yes
 NO_BUILD=	YES
 
+PLIST_FILES=	${EMACS_SITE_LISPDIR}/elscreen.el
+PORTDOCS=	ChangeLog README
+
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/elscreen.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/elscreen.el \
+		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ChangeLog README
+
+do-install-DOCS-on:
+.for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
diff --git a/misc/elscreen/pkg-plist b/misc/elscreen/pkg-plist
deleted file mode 100644
index b1617868ad02..000000000000
--- a/misc/elscreen/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-share/emacs/site-lisp/elscreen.el
-%%PORTDOCS%%share/doc/elscreen/ChangeLog
-%%PORTDOCS%%share/doc/elscreen/README
diff --git a/net-im/jabber.el/Makefile b/net-im/jabber.el/Makefile
index 3518c63a6ff1..ea8b8c934cf8 100644
--- a/net-im/jabber.el/Makefile
+++ b/net-im/jabber.el/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	jabber.el
 PORTVERSION=	0.8.92
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-im elisp
 MASTER_SITES=	SF/emacs-jabber/emacs-jabber%20beta%20versions/${PORTVERSION}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=		emacs-jabber-${PORTVERSION}
 
 MAINTAINER=	max.n.boyarov@gmail.com
@@ -13,19 +14,16 @@ COMMENT=	Minimal jabber client for [X]Emacs
 
 RUN_DEPENDS=	${LOCALBASE}/bin/gnutls-cli:security/gnutls
 
-INFO=		emacs-jabber
-PORTDOCS+=	AUTHORS NEWS README
-
-USE_EMACS=	yes
+USES=		emacs gmake
 GNU_CONFIGURE=	yes
-USES=		gmake
 
-OPTIONS_DEFINE=	DOCS
+INFO=		emacs-jabber
+PORTDOCS=	AUTHORS NEWS README
 
-CONFIGURE_ARGS+=	--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacs-jabber \
-			--disable-schemas-install
+CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacs-jabber \
+		--disable-schemas-install
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 pre-configure:
 	${REINPLACE_CMD} -e 's/jabber\.info/emacs-jabber.info/' \
@@ -40,7 +38,7 @@ pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacs-jabber
 
 post-install:
-		${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 		${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}/
 .endfor
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 3f1395e9e371..cb733a63c247 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -16,9 +16,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
-CONFLICTS=	freeradius-0.* openradius-0.* radiusd-cistron-1.*
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
 USES=		cpe gmake libtool
 USE_RC_SUBR=	radiusd
 USE_SUBMAKE=	yes
@@ -26,6 +23,10 @@ USE_LDCONFIG=	yes
 CPE_PRODUCT=	radius
 CPE_VENDOR=	gnu
 
+CONFLICTS=	freeradius-0.* openradius-0.* radiusd-cistron-1.*
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 DATADIR=	${PREFIX}/share/radius
 
@@ -52,8 +53,9 @@ MYSQL_CONFIGURE_WITH=		mysql
 PGSQL_USES=			pgsql
 PGSQL_CONFIGURE_WITH=		postgres
 DBM_CONFIGURE_ENABLE=		dbm=ndbm
-EMACS_USE=			emacs=yes
+EMACS_USES=			emacs
 EMACS_CONFIGURE_WITH=		lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}
+EMACS_NO_DEPENDS=		yes
 NLS_USES=			gettext
 NLS_CONFIGURE_OFF=		--disable-nls
 PAM_CONFIGURE_ENABLE=		pam
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index 3b81ac5dc820..b9462c5137d9 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -3,18 +3,20 @@
 
 PORTNAME=	tramp
 PORTVERSION=	2.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net elisp
 MASTER_SITES=	GNU
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	kuriyama@FreeBSD.org
-COMMENT=	Transparent remote file access tool for emacsen
+COMMENT=	Transparent remote file access tool for Emacs
 
-USE_EMACS=	yes
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		cpe emacs gmake makeinfo
 
 GNU_CONFIGURE=	yes
-USES=		cpe gmake makeinfo
 CPE_VENDOR=	gnu
 
 TRAMP_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
@@ -28,4 +30,8 @@ INFO=		tramp
 post-patch:
 	@${REINPLACE_CMD} 's/^make/${MAKE_CMD}/' ${WRKSRC}/configure
 
+.if ${FLAVOR:U} != nox && ${FLAVOR:U} != devel_nox
+PLIST_FILES+=	${TRAMP_LISPDIR}/tramp-gvfs.el ${TRAMP_LISPDIR}/tramp-gvfs.elc
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/tramp/files/patch-texi-Makefile.in b/net/tramp/files/patch-texi-Makefile.in
index 8f0c5d2e6c91..62ca428a94f4 100644
--- a/net/tramp/files/patch-texi-Makefile.in
+++ b/net/tramp/files/patch-texi-Makefile.in
@@ -1,6 +1,6 @@
---- texi/Makefile.in.orig	2016-01-25 20:09:17.000000000 +0900
-+++ texi/Makefile.in	2016-11-29 15:30:25.384280000 +0900
-@@ -45,8 +45,8 @@
+--- texi/Makefile.in.orig	2016-01-25 11:09:17 UTC
++++ texi/Makefile.in
+@@ -45,8 +45,8 @@ DESTDIR		=
  
  TEXI_FILES	= tramp.texi trampver.texi doclicense.texi docstyle.texi \
  		  $(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi)
diff --git a/net/tramp/pkg-plist b/net/tramp/pkg-plist
index e8eeab46f0bc..ffb5ce059d5b 100644
--- a/net/tramp/pkg-plist
+++ b/net/tramp/pkg-plist
@@ -8,8 +8,6 @@
 %%TRAMP_LISPDIR%%/tramp-compat.elc
 %%TRAMP_LISPDIR%%/tramp-ftp.el
 %%TRAMP_LISPDIR%%/tramp-ftp.elc
-%%TRAMP_LISPDIR%%/tramp-gvfs.el
-%%TRAMP_LISPDIR%%/tramp-gvfs.elc
 %%TRAMP_LISPDIR%%/tramp-gw.el
 %%TRAMP_LISPDIR%%/tramp-gw.elc
 %%TRAMP_LISPDIR%%/tramp-loaddefs.el
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index a39d8ca194b8..7cbe1aa88e71 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -43,7 +43,7 @@ I18N_DESC=Enable I18N support
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-EMACS_USE=		EMACS=yes
+EMACS_USES=		emacs:build
 EMACS_CONFIGURE_ON=	--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.options.mk>
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 8b88b067cc8d..fd86637dc79f 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -3,20 +3,20 @@
 
 PORTNAME=	auctex
 PORTVERSION=	11.90
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print elisp
 MASTER_SITES=	GNU
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Integrated environment for writing LaTeX using GNU Emacs
 
 LICENSE=	GPLv3
 
-USES=		ghostscript gmake
-USE_EMACS=	yes
+USES=		emacs ghostscript gmake
 USE_TEX=	latex texhash
 TEXHASHDIRS=	${TEXMFDIR}
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
 	--with-auto-dir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/auctex/auto \
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index 89a6a6a7ec18..50b60770cd2b 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -3,17 +3,18 @@
 
 PORTNAME=	Hyperlatex
 DISTVERSION=	2.9a
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	print
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce HTML and printed documents from LaTeX source
 
 RUN_DEPENDS=	ppmtogif:graphics/netpbm
 
+USES=		emacs
 USE_TEX=	latex
-USE_EMACS=	yes
 
 LATEX_DIR=	${PREFIX}/share/texmf/tex/latex/hyperlatex
 HYPERLATEX_DIR=	${PREFIX}/share/hyperlatex
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index 7354ce4e760b..6f9338553f26 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -3,17 +3,18 @@
 
 PORTNAME=	yatex
 PORTVERSION=	1.77
+PORTREVISION=	1
 CATEGORIES?=	print elisp
 MASTER_SITES=	http://www.yatex.org/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Yet Another LaTeX mode and html mode on Emacs
 
-USES=		dos2unix
-USE_EMACS=	yes
-EMACS_NO_RUN_DEPENDS=	yes
-EMACS_NO_BUILD_DEPENDS=	yes
+USES=		dos2unix emacs
+EMACS_NO_DEPENDS=	yes
+
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message yatex-startup.el
diff --git a/security/starttls/Makefile b/security/starttls/Makefile
index 12d0df0b0581..e21ba37d4f72 100644
--- a/security/starttls/Makefile
+++ b/security/starttls/Makefile
@@ -2,16 +2,17 @@
 
 PORTNAME=	starttls
 PORTVERSION=	0.10
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.opaopa.org/pub/elisp/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Simple wrapper program for STARTTLS on ${EMACS_PORT_NAME}
 
+USES=		emacs gmake ssl
+
 GNU_CONFIGURE=	yes
-USES=		gmake ssl
-USE_EMACS=	yes
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/lr/Makefile b/sysutils/lr/Makefile
index 36255e492505..d0020bb1d2b4 100644
--- a/sysutils/lr/Makefile
+++ b/sysutils/lr/Makefile
@@ -28,9 +28,8 @@ NEOVIM_DESC=	Neovim plugin
 VIM_DESC=	Vim plugin
 
 OPTIONS_SUB=	yes
-EMACS_USE=	emacs=yes
-EMACS_NO_BUILD_DEPENDS=	yes
-EMACS_NO_RUN_DEPENDS=	yes
+EMACS_USES=	emacs
+EMACS_VARS=	EMACS_NO_DEPENDS=yes
 
 CONTRIB_RUN_DEPENDS=	xe:sysutils/xe
 
diff --git a/sysutils/puppet-mode.el/Makefile b/sysutils/puppet-mode.el/Makefile
index f323978d634a..a8669bc397ea 100644
--- a/sysutils/puppet-mode.el/Makefile
+++ b/sysutils/puppet-mode.el/Makefile
@@ -3,21 +3,26 @@
 
 PORTNAME=	puppet-mode.el
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Simple mode for editing puppet manifests
 
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		emacs
 USE_GITHUB=	yes
-GH_PROJECT=	puppet-syntax-emacs
 GH_ACCOUNT=	puppetlabs
+GH_PROJECT=	puppet-syntax-emacs
 GH_TAGNAME=	be5d708
 
+NO_ARCH=	yes
 NO_BUILD=	yes
-USE_EMACS=	yes
 
-PLIST_FILES=	%%EMACS_SITE_LISPDIR%%/puppet-mode.el
+PLIST_FILES=	${EMACS_SITE_LISPDIR}/puppet-mode.el
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/puppet-mode.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile
index b7791f980b2a..c5b76c1efb47 100644
--- a/textproc/dictem/Makefile
+++ b/textproc/dictem/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	dictem
 PORTVERSION=	1.0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc net elisp
 MASTER_SITES=	SF/dictem/dictem/dictem-${PORTVERSION}
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	max.n.boyarov@gmail.com
 COMMENT=	DictEm is a dict client for [X]Emacs
@@ -15,36 +15,29 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/bin/dict:textproc/dict
 
-USE_EMACS=	yes
+USES=		emacs
 
 SRC_EL=		dictem.el dictem-lingvo-dsl.el dictem-elisp.el
 
 .for f in ${SRC_EL}
-PLIST_FILES+=	${LISPDIR}/${f} \
-		${LISPDIR}/${f:S/.el$/.elc/}
+PLIST_FILES+=	${LISPDIR}/${f} ${LISPDIR}/${f}c
 .endfor
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PORTDOCS+=	README AUTHORS NEWS COPYING TODO
+PORTDOCS=	README AUTHORS NEWS COPYING TODO
 
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_NAME} == "xemacs"
-LISPDIR=	${EMACS_LIBDIR}/site-packages/lisp/dictem
-.else
 LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/dictem
-.endif
+
+OPTIONS_DEFINE=	DOCS
 
 do-build:
-	cd ${WRKSRC} && ${EMACS_CMD} --no-site-file --no-init-file -batch \
-		-l compile.el -f compile-dictem ${SRC_EL}
+	(cd ${WRKSRC} && ${EMACS_CMD} --no-site-file --no-init-file -batch \
+		-l compile.el -f compile-dictem ${SRC_EL})
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${LISPDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${SRC_EL} ${SRC_EL:S/.el$/.elc/} \
-		 ${STAGEDIR}${PREFIX}/${LISPDIR}/
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${SRC_EL} ${SRC_EL:S/.el$/.elc/} \
+		 ${STAGEDIR}${PREFIX}/${LISPDIR}/)
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -52,4 +45,4 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile
index 7b10d418c211..7f6a4e764743 100644
--- a/textproc/dictionary/Makefile
+++ b/textproc/dictionary/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	dictionary
 PORTVERSION=	1.8.7
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	textproc net elisp
 MASTER_SITES=	http://me.in-berlin.de/~myrkr/dictionary/ \
 		http://bsdchat.com/dist/dryice/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dictionary client for Emacs
@@ -15,7 +15,7 @@ COMMENT=	Dictionary client for Emacs
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL
 
-USE_EMACS=	yes
+USES=		emacs
 
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 ELS=		connection.el dictionary.el link.el
diff --git a/textproc/doc-mode.el/Makefile b/textproc/doc-mode.el/Makefile
index c405aeca2e23..ef5b829eab4f 100644
--- a/textproc/doc-mode.el/Makefile
+++ b/textproc/doc-mode.el/Makefile
@@ -3,16 +3,17 @@
 
 PORTNAME=	doc-mode.el
 PORTVERSION=	1.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	textproc elisp
 MASTER_SITES=	SF/xpt/doc-mode/doc-mode-${PORTVERSION}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	doc-mode-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Asciidoc fontlocking for emacs
 
-USE_EMACS=	yes
+USES=		emacs tar:tgz
+
 NO_BUILD=	yes
 
 do-install:
diff --git a/textproc/emacs-wiki/Makefile b/textproc/emacs-wiki/Makefile
index 13a2f503696d..9ca5058229db 100644
--- a/textproc/emacs-wiki/Makefile
+++ b/textproc/emacs-wiki/Makefile
@@ -3,32 +3,29 @@
 
 PORTNAME=	emacs-wiki
 PORTVERSION=	2.72
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://www.mwolson.org/static/dist/emacs-wiki/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	dryice@FreeBSD.org
 COMMENT=	Create and use hyperlinks and simple formatting in plain text files
 
-USES=		makeinfo
-USE_EMACS=	yes
+RUN_DEPENDS=	xml-parse.el${EMACS_PKGNAMESUFFIX}>0:textproc/xml-parse.el@${EMACS_FLAVOR}
+RUN_DEPENDS=	htmlize.el${EMACS_PKGNAMESUFFIX}>0:textproc/htmlize.el@${EMACS_FLAVOR}
+
+USES=		emacs makeinfo
 
 OPTIONS_DEFINE=	CONTRIB
 CONTRIB_DESC=	Install extra packages. This can shadow versions already there.
 OPTIONS_SUB=	yes
 
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/xml-parse.el:textproc/xml-parse.el
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/htmlize.el:textproc/htmlize.el
-
 INFO=		emacs-wiki
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
-.include <bsd.port.options.mk>
-
 do-build:
-	cd ${WRKSRC}; makeinfo --no-split emacs-wiki.texi
+	(cd ${WRKSRC}; makeinfo --no-split emacs-wiki.texi)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${LISPDIR}
@@ -36,11 +33,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${LISPDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/emacs-wiki.info ${STAGEDIR}${PREFIX}/info
-.if ${PORT_OPTIONS:MCONTRIB}
+
+do-install-CONTRIB-on:
 	${MKDIR} ${STAGEDIR}${LISPDIR}/contrib
 .for i in *.el
 	${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${STAGEDIR}${LISPDIR}/contrib
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/htmlize.el/Makefile b/textproc/htmlize.el/Makefile
index 35dc563e08db..116366b9a890 100644
--- a/textproc/htmlize.el/Makefile
+++ b/textproc/htmlize.el/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	htmlize.el
 PORTVERSION=	1.39
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://fly.srk.fer.hr/~hniksic/emacs/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}.cgi
 EXTRACT_SUFX=
 DIST_SUBDIR=	repacked
@@ -13,7 +14,8 @@ DIST_SUBDIR=	repacked
 MAINTAINER=	dryice@FreeBSD.org
 COMMENT=	Emacs major mode to create HTML files from Emacs buffers (in colour!)
 
-USE_EMACS=	yes
+USES=		emacs
+
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
diff --git a/textproc/ibus-el/Makefile b/textproc/ibus-el/Makefile
index 3aa2deb95966..5797f8fb82fa 100644
--- a/textproc/ibus-el/Makefile
+++ b/textproc/ibus-el/Makefile
@@ -2,45 +2,44 @@
 
 PORTNAME=	ibus-el
 PORTVERSION=	0.3.2
-#PORTREVISION=	0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://www11.atwiki.jp/s-irie/pub/emacs/ibus/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	IBus client for GNU Emacs
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/doc/COPYING
+
 RUN_DEPENDS=	ibus-daemon:textproc/ibus \
 		${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib
 
-USES=		python:2.7,run
-USE_EMACS=	yes
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/doc/COPYING
+USES=		emacs python:2.7,run shebangfix
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/ibus.el \
 		${EMACS_VERSION_SITE_LISPDIR}/ibus.elc \
 		libexec/ibus-el-agent
 PORTDOCS=	README
+SHEBANG_FILES=	ibus-el-agent
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
-	@cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
-		-f batch-byte-compile ibus.el
+	@(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
+		-f batch-byte-compile ibus.el)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ibus.el \
+	${INSTALL_DATA} ${WRKSRC}/ibus.el \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ibus.elc \
+	${INSTALL_DATA} ${WRKSRC}/ibus.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/ibus-el-agent \
+	${INSTALL_SCRIPT} ${WRKSRC}/ibus-el-agent \
 		${STAGEDIR}${PREFIX}/libexec
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} && \
-		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && \
+		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/textproc/markdown-mode.el/Makefile b/textproc/markdown-mode.el/Makefile
index 9214a63029d4..a9dd6ff492d0 100644
--- a/textproc/markdown-mode.el/Makefile
+++ b/textproc/markdown-mode.el/Makefile
@@ -2,25 +2,26 @@
 
 PORTNAME=	markdown-mode.el
 PORTVERSION=	2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://jblevins.org/projects/markdown-mode/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	markdown-mode.el
 EXTRACT_SUFX=	# empty
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	Emacs/XEmacs major mode for editing Markdown-formatted text
+COMMENT=	Emacs major mode for editing Markdown-formatted text
 
 LICENSE=	GPLv3+
 
+USES=		emacs
+
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-USE_EMACS=	yes
-
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/markdown-mode.el
 
 do-install:
diff --git a/textproc/muse/Makefile b/textproc/muse/Makefile
index 2ee52e4474e8..1b8be0414823 100644
--- a/textproc/muse/Makefile
+++ b/textproc/muse/Makefile
@@ -3,18 +3,17 @@
 
 PORTNAME=	muse
 PORTVERSION=	3.20
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://download.gna.org/muse-el/ \
 		LOCAL/dryice \
 		http://dryice.name/computer/FreeBSD/distfiles/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Authoring and publishing environment for Emacs
 
-USE_EMACS=	yes
-USES=		gmake makeinfo
+USES=		emacs gmake makeinfo
 
 INFO=		muse
 
@@ -37,10 +36,4 @@ post-install:
 		${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} scripts ${STAGEDIR}${DOCSDIR})
 
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_PORT_NAME} != "emacs23"
-PORTNAMESUFFIX=	${PKGNAMESUFFIX}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 14c583ba705a..7d3841b49a93 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -3,27 +3,21 @@
 
 PORTNAME=	uim-el
 PORTVERSION=	1.8.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/uim/uim/releases/download/uim-${PORTVERSION}/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	uim-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Emacs lisp for uim input method library
 
-CONFLICTS?=	uim-el-xemacs21-mule-[0-9]* \
-		uim-el-emacs22-[0-9]* \
-		uim-el-emacs21-[0-9]*
-
 RUN_DEPENDS=	uim-el-agent:textproc/uim
 
-OPTIONS_DEFINE=	DOCS
-
-USES=		gettext-tools gmake iconv perl5 tar:bzip2
-USE_PERL5=	build
+USES=		emacs gettext-tools gmake iconv perl5 tar:bzip2
 USE_GNOME=	intltool
-USE_EMACS=	yes
+USE_PERL5=	build
+
 GNU_CONFIGURE=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/emacs
@@ -37,6 +31,8 @@ LIBS+=		-L${LOCALBASE}/lib
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim-el
 PLIST_SUB+=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
diff --git a/textproc/xml-lite.el/Makefile b/textproc/xml-lite.el/Makefile
index cd298e956d71..3a803151ceb5 100644
--- a/textproc/xml-lite.el/Makefile
+++ b/textproc/xml-lite.el/Makefile
@@ -3,17 +3,19 @@
 
 PORTNAME=	xml-lite.el
 PORTVERSION=	1.1
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://dogbiscuit.org/mdub/software/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	# empty
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple XML-editing for GNU Emacs
 
-USE_EMACS=	yes
+USES=		emacs
+
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
diff --git a/textproc/xml-parse.el/Makefile b/textproc/xml-parse.el/Makefile
index 0aeaaeb35fba..aeb1b7f450ba 100644
--- a/textproc/xml-parse.el/Makefile
+++ b/textproc/xml-parse.el/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	xml-parse.el
 PORTVERSION=	1.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://dryice.name/computer/FreeBSD/distfiles/ \
 		http://sacha.free.net.ph/notebook/emacs/ \
 		http://ports.toco-domains.de/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=
 EXTRACT_ONLY=
@@ -16,7 +16,8 @@ EXTRACT_ONLY=
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Code to efficiently read/write XML data with Elisp
 
-USE_EMACS=	yes
+USES=		emacs
+
 NO_BUILD=	yes
 
 do-install:
diff --git a/textproc/yaml-mode.el/Makefile b/textproc/yaml-mode.el/Makefile
index fd4ee0754cc1..dc84a1e54208 100644
--- a/textproc/yaml-mode.el/Makefile
+++ b/textproc/yaml-mode.el/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	yaml-mode.el
 PORTVERSION=	0.0.13
-PORTREVISION=	2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	3
 CATEGORIES=	textproc elisp
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Simple major mode to edit YAML file for Emacsen
@@ -14,12 +14,11 @@ COMMENT=	Simple major mode to edit YAML file for Emacsen
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	yoshiki
 GH_PROJECT=	yaml-mode
 
-USE_EMACS=	yes
-
 MAKE_ENV=	LISPDIR=${LISPDIR}
 
 LISPDIR=	${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 159714c9d690..d49e147fdc03 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -3,127 +3,61 @@
 
 PORTNAME=	emacs-w3m
 PORTVERSION=	1.4.598.b.${SNAPDATE}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www elisp
 MASTER_SITES=	LOCAL/nobutaka
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	${PORTNAME}-1.4.598-${SNAPDATE}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-1.4.598-${SNAPDATE}
 
 MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT?=	Simple front-end to w3m for emacs
+COMMENT=	Simple front-end to w3m for emacs
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf tar:bzip2
-USE_EMACS=	yes
+BUILD_DEPENDS=	w3m:www/w3m
+RUN_DEPENDS=	w3m:www/w3m
 
-SNAPDATE=	20170903
+USES=		autoreconf emacs tar:bzip2
+EMACS_FLAVORS_EXCLUDE=	devel_full devel_nox # fail during configure
 
+ALL_TARGET=	default
+INSTALL_TARGET=	install install-icons
+
+NO_ARCH=	yes
+SNAPDATE=	20170903
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS?=	--with-emacs=${EMACS_CMD} \
-			--with-lispdir=${PREFIX}/${LISPDIR} \
-			--with-icondir=${PREFIX}/${ICONDIR} \
-			--without-compress-install
-LISPDIR?=	${EMACS_VERSION_SITE_LISPDIR}/w3m
-ICONDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m/icons
-ETCDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m
+CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
+		--with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/w3m \
+		--with-icondir=${PREFIX}/${EMACS_LIBDIR}/etc/w3m/icons \
+		--without-compress-install
 
 INFO=		emacs-w3m-ja emacs-w3m
+PORTDOCS=	README*
 
-ALL_TARGET=	default
-
-PLIST_SUB+=	LISPDIR=${LISPDIR} \
-		ICONDIR=${ICONDIR} \
-		ETCDIR=${ETCDIR} \
-		SHIMBUN=${SHIMBUN}
-
-DOCS=		README
-DOCS_JA=	README.ja
-
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
-DOCSDIR_JA=	${PREFIX}/share/doc/ja/${PORTNAME}
-
-OPTIONS_DEFINE=	DOCS OCTET_VIEWER SHIMBUN
+OPTIONS_DEFINE=		DOCS OCTET_VIEWER SHIMBUN
 OPTIONS_DEFAULT=	OCTET_VIEWER SHIMBUN
+OPTIONS_SUB=		yes
 
 OCTET_VIEWER_DESC=	Octet stream viewer support
-SHIMBUN_DESC=	Build and/or install Shimbun
-
-.include <bsd.port.options.mk>
-
-.if !${PORT_OPTIONS:MSHIMBUN}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.in
-SHIMBUN=	"@comment "
-.else
-SHIMBUN=	""
-.endif
+SHIMBUN_DESC=		Build and/or install Shimbun
 
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} >= 23
-FLIM_PORT=	editors/flim
-SEMI_PORT=	editors/semi
-INSTALL_TARGET=	install install-icons
-PLIST_SUB+=	EMACS23=""
-.else
-PLIST_SUB+=	EMACS23="@comment "
-.endif
+SHIMBUN_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-Makefile.in
+SHIMBUN_BUILD_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
+SHIMBUN_RUN_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
 
-.if ${EMACS_PORT_NAME} == "emacs22"
-INSTALL_TARGET=	install install-icons
-.endif
-
-.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} < 22
-MULE_UCS_PORT=	converters/mule-ucs
-INSTALL_TARGET=	install install-icons
-.endif
-
-FLIM_TRUNK=	1.14
-FLIM_COOKIE=	${LOCALBASE}/share/flim/flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-FLIM_PORT?=	editors/flim-${EMACS_PORT_NAME}
-
-SEMI_TRUNK=	1.14
-SEMI_COOKIE=	${LOCALBASE}/share/semi/semi-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-SEMI_PORT?=	editors/semi-${EMACS_PORT_NAME}
-
-MULE_UCS_PORT?=	converters/mule-ucs-${EMACS_PORT_NAME}
-MULE_UCS_ELISP_FILE=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs/un-define.el
-
-BUILD_DEPENDS+=	w3m:www/w3m
-RUN_DEPENDS+=	w3m:www/w3m
-.if ${PORT_OPTIONS:MSHIMBUN}
-BUILD_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
-RUN_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
-.endif
-.if ${PORT_OPTIONS:MOCTET_VIEWER}
-RUN_DEPENDS+=	${SEMI_COOKIE}:${SEMI_PORT} \
+OCTET_VIEWER_RUN_DEPENDS=\
+		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
 		wvHtml:textproc/wv \
 		xlhtml:textproc/xlhtml
-PLIST_SUB+=	OCTET_VIEWER=""
-.else
-PLIST_SUB+=	OCTET_VIEWER="@comment "
-.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} < 22
-RUN_DEPENDS+=	${MULE_UCS_ELISP_FILE}:${MULE_UCS_PORT}
-.endif
-.endif
 
 post-patch:
 	@${MV} ${WRKSRC}/aclocal.m4 ${WRKSRC}/acinclude.m4
-.if defined(EMACS_PACKAGESDIR)
-	@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}
-.endif
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-.for i in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR_JA}
-.endfor
-
-.include <bsd.port.post.mk>
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/www/emacs-w3m/files/_pkg.el b/www/emacs-w3m/files/_pkg.el
deleted file mode 100644
index dd5c3a8e146e..000000000000
--- a/www/emacs-w3m/files/_pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;###autoload
-(package-provide 'w3m
-                 :version 1.3
-                 :type 'regular)
diff --git a/www/emacs-w3m/files/extra-patch-Makefile.in b/www/emacs-w3m/files/extra-patch-Makefile.in
index 15883fceeefa..a3bd89cf4e06 100644
--- a/www/emacs-w3m/files/extra-patch-Makefile.in
+++ b/www/emacs-w3m/files/extra-patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2014-06-28 14:59:34.000000000 +0900
-+++ Makefile.in	2014-06-28 15:02:17.000000000 +0900
-@@ -99,19 +99,6 @@
+--- Makefile.in.orig	2017-12-31 05:56:38 UTC
++++ Makefile.in
+@@ -99,19 +99,6 @@ install-lisp: lisp
  	      $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/s$$p";\
  	    fi;\
  	  done;\
@@ -10,7 +10,7 @@
 -	    if test $(COMPRESS_INSTALL) = yes -a -n "$(GZIP_PROG)"\
 -		-a -f "shimbun/$$p"c; then\
 -		rm -f "$(DESTDIR)$(lispdir)/$$p".gz;\
--		$(GZIP_PROG) -9n "$(DESTDIR)$(lispdir)/$$p";\
+-		"$(GZIP_PROG)" -9n "$(DESTDIR)$(lispdir)/$$p";\
 -	    fi;\
 -	  done;\
 -	  for p in `cd shimbun && echo *.elc`; do\
diff --git a/www/emacs-w3m/files/patch-Makefile.in b/www/emacs-w3m/files/patch-Makefile.in
index 0e7bc9980b98..240a93604489 100644
--- a/www/emacs-w3m/files/patch-Makefile.in
+++ b/www/emacs-w3m/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2012-03-07 00:42:29.000000000 +0900
-+++ Makefile.in	2012-03-07 00:45:51.000000000 +0900
-@@ -64,7 +64,7 @@
+--- Makefile.in.orig	2017-12-31 05:59:39 UTC
++++ Makefile.in
+@@ -66,7 +66,7 @@ install-ja: install-lisp install-info-ja
  
  install-lisp: lisp
  	@$(SHELL) $(srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)";\
@@ -9,7 +9,7 @@
  	  if test -f "$$p"; then\
  	    case "$$p" in\
  	      $(IGNORES)) ;;\
-@@ -86,7 +86,7 @@
+@@ -93,7 +93,7 @@ install-lisp: lisp
  	  fi;\
  	done;\
  	if test -f shimbun/shimbun.elc; then\
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index ce2da958b669..d3b644526dd6 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -1,381 +1,379 @@
-%%ICONDIR%%/antenna-up.png
-%%ICONDIR%%/antenna-up.xpm
-%%ICONDIR%%/back-disabled.png
-%%ICONDIR%%/back-disabled.xpm
-%%ICONDIR%%/back-up.png
-%%ICONDIR%%/back-up.xpm
-%%ICONDIR%%/copy-up.png
-%%ICONDIR%%/copy-up.xpm
-%%ICONDIR%%/db-history-up.png
-%%ICONDIR%%/db-history-up.xpm
-%%ICONDIR%%/forward-disabled.png
-%%ICONDIR%%/forward-disabled.xpm
-%%ICONDIR%%/forward-up.png
-%%ICONDIR%%/forward-up.xpm
-%%ICONDIR%%/history-up.png
-%%ICONDIR%%/history-up.xpm
-%%ICONDIR%%/home-up.png
-%%ICONDIR%%/home-up.xpm
-%%ICONDIR%%/image-up.png
-%%ICONDIR%%/image-up.xpm
-%%ICONDIR%%/open-up.png
-%%ICONDIR%%/open-up.xpm
-%%ICONDIR%%/parent-disabled.png
-%%ICONDIR%%/parent-disabled.xpm
-%%ICONDIR%%/parent-up.png
-%%ICONDIR%%/parent-up.xpm
-%%ICONDIR%%/reload-up.png
-%%ICONDIR%%/reload-up.xpm
-%%ICONDIR%%/save-up.png
-%%ICONDIR%%/save-up.xpm
-%%ICONDIR%%/search-up.png
-%%ICONDIR%%/search-up.xpm
-%%ICONDIR%%/spinner.gif
-%%ICONDIR%%/state-00.png
-%%ICONDIR%%/state-00.xpm
-%%ICONDIR%%/state-01.png
-%%ICONDIR%%/state-01.xpm
-%%ICONDIR%%/state-10.png
-%%ICONDIR%%/state-10.xpm
-%%ICONDIR%%/state-11.png
-%%ICONDIR%%/state-11.xpm
-%%ICONDIR%%/weather-up.png
-%%ICONDIR%%/weather-up.xpm
-%%LISPDIR%%/bookmark-w3m.el
-%%EMACS23%%%%LISPDIR%%/bookmark-w3m.elc
-%%SHIMBUN%%%%LISPDIR%%/mew-shimbun.el
-%%SHIMBUN%%@unexec rm -f %D/%%LISPDIR%%/mew-shimbun.elc
-%%LISPDIR%%/mew-w3m.el
-@unexec rm -f %D/%%LISPDIR%%/mew-w3m.elc
-%%LISPDIR%%/mime-w3m.el
-%%LISPDIR%%/mime-w3m.elc
-%%LISPDIR%%/octet.el
-%%OCTET_VIEWER%%%%LISPDIR%%/octet.elc
-%%SHIMBUN%%%%LISPDIR%%/nnshimbun.el
-%%SHIMBUN%%%%LISPDIR%%/nnshimbun.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-2ch.el
-%%SHIMBUN%%%%LISPDIR%%/sb-2ch.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-airs.el
-%%SHIMBUN%%%%LISPDIR%%/sb-airs.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-aljazeera.el
-%%SHIMBUN%%%%LISPDIR%%/sb-aljazeera.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-arch-bluegate.el
-%%SHIMBUN%%%%LISPDIR%%/sb-arch-bluegate.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.el
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.el
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi.el
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.el
-%%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-atom-hash.el
-%%SHIMBUN%%%%LISPDIR%%/sb-atom-hash.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-atom.el
-%%SHIMBUN%%%%LISPDIR%%/sb-atom.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-bbc.el
-%%SHIMBUN%%%%LISPDIR%%/sb-bbc.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el
-%%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-chise.el
-%%SHIMBUN%%%%LISPDIR%%/sb-chise.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.el
-%%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-cnet.el
-%%SHIMBUN%%%%LISPDIR%%/sb-cnet.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-cnn-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-cnn-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-coldsync.el
-%%SHIMBUN%%%%LISPDIR%%/sb-coldsync.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-debian.el
-%%SHIMBUN%%%%LISPDIR%%/sb-debian.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-debugmagazin-de.el
-%%SHIMBUN%%%%LISPDIR%%/sb-debugmagazin-de.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-dennou.el
-%%SHIMBUN%%%%LISPDIR%%/sb-dennou.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-digiko.el
-%%SHIMBUN%%%%LISPDIR%%/sb-digiko.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-elips.el
-%%SHIMBUN%%%%LISPDIR%%/sb-elips.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-emacs-w3m.el
-%%SHIMBUN%%%%LISPDIR%%/sb-emacs-w3m.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-emacswiki.el
-%%SHIMBUN%%%%LISPDIR%%/sb-emacswiki.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-engadget-ja.el
-%%SHIMBUN%%%%LISPDIR%%/sb-engadget-ja.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-excite.el
-%%SHIMBUN%%%%LISPDIR%%/sb-excite.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-exconn.el
-%%SHIMBUN%%%%LISPDIR%%/sb-exconn.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-f1fan.el
-%%SHIMBUN%%%%LISPDIR%%/sb-f1fan.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-fau.el
-%%SHIMBUN%%%%LISPDIR%%/sb-fau.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-ffii.el
-%%SHIMBUN%%%%LISPDIR%%/sb-ffii.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-fml.el
-%%SHIMBUN%%%%LISPDIR%%/sb-fml.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.el
-%%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-glimpse.el
-%%SHIMBUN%%%%LISPDIR%%/sb-glimpse.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-gnome.el
-%%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-haiku-os.el
-%%SHIMBUN%%%%LISPDIR%%/sb-haiku-os.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-hash.el
-%%SHIMBUN%%%%LISPDIR%%/sb-hash.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-heise.el
-%%SHIMBUN%%%%LISPDIR%%/sb-heise.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-hns.el
-%%SHIMBUN%%%%LISPDIR%%/sb-hns.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.el
-%%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-impress.el
-%%SHIMBUN%%%%LISPDIR%%/sb-impress.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-infoshop.el
-%%SHIMBUN%%%%LISPDIR%%/sb-infoshop.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-itmedia.el
-%%SHIMBUN%%%%LISPDIR%%/sb-itmedia.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-japantimes.el
-%%SHIMBUN%%%%LISPDIR%%/sb-japantimes.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.el
-%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-jpilot.el
-%%SHIMBUN%%%%LISPDIR%%/sb-jpilot.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-jpo.el
-%%SHIMBUN%%%%LISPDIR%%/sb-jpo.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-kantei.el
-%%SHIMBUN%%%%LISPDIR%%/sb-kantei.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-kde.el
-%%SHIMBUN%%%%LISPDIR%%/sb-kde.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-kyoko-np.el
-%%SHIMBUN%%%%LISPDIR%%/sb-kyoko-np.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-laut-de.el
-%%SHIMBUN%%%%LISPDIR%%/sb-laut-de.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-lotusex.el
-%%SHIMBUN%%%%LISPDIR%%/sb-lotusex.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-lump.el
-%%SHIMBUN%%%%LISPDIR%%/sb-lump.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-m17n.el
-%%SHIMBUN%%%%LISPDIR%%/sb-m17n.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-macosx-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-macosx-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mailarc.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mailarc.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mailman.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mailman.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-makanai.el
-%%SHIMBUN%%%%LISPDIR%%/sb-makanai.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-marc-aims.el
-%%SHIMBUN%%%%LISPDIR%%/sb-marc-aims.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-meadow.el
-%%SHIMBUN%%%%LISPDIR%%/sb-meadow.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mew.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mew.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mhonarc.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mhonarc.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mozilla-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mozilla-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-msdn.el
-%%SHIMBUN%%%%LISPDIR%%/sb-msdn.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-msports-nifty.el
-%%SHIMBUN%%%%LISPDIR%%/sb-msports-nifty.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-multi.el
-%%SHIMBUN%%%%LISPDIR%%/sb-multi.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-n24-de.el
-%%SHIMBUN%%%%LISPDIR%%/sb-n24-de.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-namazu.el
-%%SHIMBUN%%%%LISPDIR%%/sb-namazu.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-netbsd.el
-%%SHIMBUN%%%%LISPDIR%%/sb-netbsd.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkangendai.el
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkangendai.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.el
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.el
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-nytimes.el
-%%SHIMBUN%%%%LISPDIR%%/sb-nytimes.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-opentechpress-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-opentechpress-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-orca.el
-%%SHIMBUN%%%%LISPDIR%%/sb-orca.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-palmfan.el
-%%SHIMBUN%%%%LISPDIR%%/sb-palmfan.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.el
-%%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-perlentaucher-de.el
-%%SHIMBUN%%%%LISPDIR%%/sb-perlentaucher-de.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.el
-%%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-pilot-mailsync.el
-%%SHIMBUN%%%%LISPDIR%%/sb-pilot-mailsync.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-plucker.el
-%%SHIMBUN%%%%LISPDIR%%/sb-plucker.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-pocketgames.el
-%%SHIMBUN%%%%LISPDIR%%/sb-pocketgames.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-rakuten.el
-%%SHIMBUN%%%%LISPDIR%%/sb-rakuten.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-redhat.el
-%%SHIMBUN%%%%LISPDIR%%/sb-redhat.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-rediff.el
-%%SHIMBUN%%%%LISPDIR%%/sb-rediff.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-rss-blogs.el
-%%SHIMBUN%%%%LISPDIR%%/sb-rss-blogs.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-rss-hash.el
-%%SHIMBUN%%%%LISPDIR%%/sb-rss-hash.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-rss.el
-%%SHIMBUN%%%%LISPDIR%%/sb-rss.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
-%%SHIMBUN%%%%LISPDIR%%/sb-ruby.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-sankei.el
-%%SHIMBUN%%%%LISPDIR%%/sb-sankei.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-savannah.el
-%%SHIMBUN%%%%LISPDIR%%/sb-savannah.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-scipy.el
-%%SHIMBUN%%%%LISPDIR%%/sb-scipy.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-security-memo.el
-%%SHIMBUN%%%%LISPDIR%%/sb-security-memo.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-slashdot.el
-%%SHIMBUN%%%%LISPDIR%%/sb-slashdot.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-sml.el
-%%SHIMBUN%%%%LISPDIR%%/sb-sml.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-sourceforge-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-sourceforge-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-spiegel.el
-%%SHIMBUN%%%%LISPDIR%%/sb-spiegel.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-sponichi.el
-%%SHIMBUN%%%%LISPDIR%%/sb-sponichi.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-squeak-dev.el
-%%SHIMBUN%%%%LISPDIR%%/sb-squeak-dev.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.el
-%%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-sueddeutsche-de.el
-%%SHIMBUN%%%%LISPDIR%%/sb-sueddeutsche-de.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-tcup.el
-%%SHIMBUN%%%%LISPDIR%%/sb-tcup.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-tdiary-ml.el
-%%SHIMBUN%%%%LISPDIR%%/sb-tdiary-ml.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-tdiary.el
-%%SHIMBUN%%%%LISPDIR%%/sb-tdiary.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-tech-on.el
-%%SHIMBUN%%%%LISPDIR%%/sb-tech-on.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-texfaq.el
-%%SHIMBUN%%%%LISPDIR%%/sb-texfaq.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-text.el
-%%SHIMBUN%%%%LISPDIR%%/sb-text.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-the-onion.el
-%%SHIMBUN%%%%LISPDIR%%/sb-the-onion.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-the-register.el
-%%SHIMBUN%%%%LISPDIR%%/sb-the-register.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-tigris.el
-%%SHIMBUN%%%%LISPDIR%%/sb-tigris.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-toshiba.el
-%%SHIMBUN%%%%LISPDIR%%/sb-toshiba.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.el
-%%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.el
-%%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-welt-de.el
-%%SHIMBUN%%%%LISPDIR%%/sb-welt-de.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-wiki.el
-%%SHIMBUN%%%%LISPDIR%%/sb-wiki.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-wikimedia.el
-%%SHIMBUN%%%%LISPDIR%%/sb-wikimedia.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-wincefan.el
-%%SHIMBUN%%%%LISPDIR%%/sb-wincefan.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-wired-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-wired-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-x51.el
-%%SHIMBUN%%%%LISPDIR%%/sb-x51.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-xemacs.el
-%%SHIMBUN%%%%LISPDIR%%/sb-xemacs.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yahoo-auctions.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yahoo-auctions.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yahoo-sports.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yahoo-sports.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yahoo.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yahoo.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yoshirin.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yoshirin.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-zeit-de.el
-%%SHIMBUN%%%%LISPDIR%%/sb-zeit-de.elc
-%%SHIMBUN%%%%LISPDIR%%/shimbun.el
-%%SHIMBUN%%%%LISPDIR%%/shimbun.elc
-%%LISPDIR%%/w3m-antenna.el
-%%LISPDIR%%/w3m-antenna.elc
-%%LISPDIR%%/w3m-bookmark.el
-%%LISPDIR%%/w3m-bookmark.elc
-%%LISPDIR%%/w3m-bug.el
-%%LISPDIR%%/w3m-bug.elc
-%%LISPDIR%%/w3m-ccl.el
-%%LISPDIR%%/w3m-ccl.elc
-%%LISPDIR%%/w3m-cookie.el
-%%LISPDIR%%/w3m-cookie.elc
-%%LISPDIR%%/w3m-dtree.el
-%%LISPDIR%%/w3m-dtree.elc
-%%LISPDIR%%/w3m-ems.el
-%%LISPDIR%%/w3m-ems.elc
-%%LISPDIR%%/w3m-favicon.el
-%%LISPDIR%%/w3m-favicon.elc
-%%LISPDIR%%/w3m-fb.el
-%%LISPDIR%%/w3m-fb.elc
-%%LISPDIR%%/w3m-filter.el
-%%LISPDIR%%/w3m-filter.elc
-%%LISPDIR%%/w3m-form.el
-%%LISPDIR%%/w3m-form.elc
-%%LISPDIR%%/w3m-hist.el
-%%LISPDIR%%/w3m-hist.elc
-%%LISPDIR%%/w3m-image.el
-%%LISPDIR%%/w3m-image.elc
-%%LISPDIR%%/w3m-lnum.el
-%%LISPDIR%%/w3m-lnum.elc
-%%LISPDIR%%/w3m-load.el
-%%LISPDIR%%/w3m-load.elc
-%%LISPDIR%%/w3m-mail.el
-%%LISPDIR%%/w3m-mail.elc
-%%LISPDIR%%/w3m-namazu.el
-%%LISPDIR%%/w3m-namazu.elc
-%%LISPDIR%%/w3m-perldoc.el
-%%LISPDIR%%/w3m-perldoc.elc
-%%LISPDIR%%/w3m-proc.el
-%%LISPDIR%%/w3m-proc.elc
-%%LISPDIR%%/w3m-rss.el
-%%LISPDIR%%/w3m-rss.elc
-%%LISPDIR%%/w3m-save.el
-%%LISPDIR%%/w3m-save.elc
-%%LISPDIR%%/w3m-search.el
-%%LISPDIR%%/w3m-search.elc
-%%LISPDIR%%/w3m-session.el
-%%LISPDIR%%/w3m-session.elc
-%%LISPDIR%%/w3m-symbol.el
-%%LISPDIR%%/w3m-symbol.elc
-%%LISPDIR%%/w3m-tabmenu.el
-%%LISPDIR%%/w3m-tabmenu.elc
-%%LISPDIR%%/w3m-ucs.el
-@unexec rm -f %D/%%LISPDIR%%/w3m-ucs.elc
-%%LISPDIR%%/w3m-util.el
-%%LISPDIR%%/w3m-util.elc
-%%LISPDIR%%/w3m-weather.el
-%%LISPDIR%%/w3m-weather.elc
-%%LISPDIR%%/w3m.elc
-%%LISPDIR%%/w3m.el
-%%PORTDOCS%%share/doc/ja/emacs-w3m/README.ja
-%%PORTDOCS%%share/doc/emacs-w3m/README
+%%EMACS_LIBDIR%%/etc/w3m/icons/antenna-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/antenna-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/back-disabled.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/back-disabled.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/back-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/back-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/copy-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/copy-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/db-history-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/db-history-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/forward-disabled.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/forward-disabled.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/forward-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/forward-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/history-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/history-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/home-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/home-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/image-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/image-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/open-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/open-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/parent-disabled.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/parent-disabled.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/parent-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/parent-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/reload-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/reload-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/save-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/save-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/search-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/search-up.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/spinner.gif
+%%EMACS_LIBDIR%%/etc/w3m/icons/state-00.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/state-00.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/state-01.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/state-01.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/state-10.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/state-10.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/state-11.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/state-11.xpm
+%%EMACS_LIBDIR%%/etc/w3m/icons/weather-up.png
+%%EMACS_LIBDIR%%/etc/w3m/icons/weather-up.xpm
+%%EMACS_SITE_LISPDIR%%/w3m/bookmark-w3m.el
+%%EMACS_SITE_LISPDIR%%/w3m/bookmark-w3m.elc
+%%EMACS_SITE_LISPDIR%%/w3m/mew-w3m.el
+@postunexec rm -f %D/%%EMACS_SITE_LISPDIR%%/w3m/mew-w3m.elc
+%%EMACS_SITE_LISPDIR%%/w3m/mime-w3m.el
+%%EMACS_SITE_LISPDIR%%/w3m/mime-w3m.elc
+%%EMACS_SITE_LISPDIR%%/w3m/octet.el
+%%OCTET_VIEWER%%%%EMACS_SITE_LISPDIR%%/w3m/octet.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/mew-shimbun.el
+%%SHIMBUN%%@postunexec rm -f %D/%%EMACS_SITE_LISPDIR%%/w3m/mew-shimbun.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/nnshimbun.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/nnshimbun.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-2ch.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-2ch.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-airs.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-airs.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-aljazeera.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-aljazeera.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-arch-bluegate.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-arch-bluegate.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-asahi-html.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-asahi-html.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-asahi-mytown.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-asahi-mytown.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-asahi.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-asahi.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-atmarkit.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-atmarkit.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-atom-hash.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-atom-hash.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-atom.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-atom.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-bbc.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-bbc.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-bbdb-ml.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-bbdb-ml.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-chise.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-chise.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-cgi-board.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-cgi-board.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-cnet-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-cnet-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-cnet.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-cnet.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-cnn-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-cnn-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-coldsync.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-coldsync.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-debian-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-debian-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-debian.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-debian.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-debugmagazin-de.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-debugmagazin-de.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-dennou.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-dennou.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-digiko.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-digiko.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-elips.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-elips.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-emacs-w3m.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-emacs-w3m.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-emacswiki.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-emacswiki.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-engadget-ja.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-engadget-ja.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-excite.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-excite.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-exconn.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-exconn.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-f1fan.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-f1fan.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-fau.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-fau.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-ffii.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-ffii.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-fml.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-fml.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-geocrawler.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-geocrawler.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-glimpse.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-glimpse.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-gnome.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-gnome.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-haiku-os.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-haiku-os.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-hash.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-hash.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-heise.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-heise.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-hns.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-hns.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-ibm-dev.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-ibm-dev.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-impress.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-impress.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-infoshop.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-infoshop.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-itmedia.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-itmedia.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-japantimes.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-japantimes.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-javaconf.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-javaconf.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-jpilot.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-jpilot.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-jpo.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-jpo.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-kantei.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-kantei.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-kde.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-kde.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-kyoko-np.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-kyoko-np.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-laut-de.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-laut-de.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-linuxce-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-linuxce-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-lotusex.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-lotusex.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-lump.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-lump.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-m17n.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-m17n.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-macosx-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-macosx-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mailarc.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mailarc.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mailman.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mailman.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mainichi.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mainichi.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-makanai.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-makanai.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-marc-aims.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-marc-aims.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-meadow.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-meadow.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mew.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mew.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mhonarc.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mhonarc.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mozilla-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-mozilla-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-msdn.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-msdn.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-msports-nifty.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-msports-nifty.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-multi.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-multi.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-n24-de.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-n24-de.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-namazu.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-namazu.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-netbsd.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-netbsd.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-nikkangendai.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-nikkangendai.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-nikkansports.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-nikkansports.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-nikkei.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-nikkei.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-nytimes.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-nytimes.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-opentechpress-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-opentechpress-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-orca.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-orca.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-palmfan.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-palmfan.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-pcweb-column.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-pcweb-column.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-perlentaucher-de.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-perlentaucher-de.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-pilot-link.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-pilot-link.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-pilot-mailsync.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-pilot-mailsync.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-plucker.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-plucker.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-pocketgames.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-pocketgames.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-rakuten.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-rakuten.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-redhat.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-redhat.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-rediff.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-rediff.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-rss-blogs.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-rss-blogs.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-rss-hash.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-rss-hash.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-rss.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-rss.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-ruby.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-ruby.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-sankei.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-sankei.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-savannah.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-savannah.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-scipy.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-scipy.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-security-memo.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-security-memo.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-slashdot-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-slashdot-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-slashdot.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-slashdot.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-sml.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-sml.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-sourceforge-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-sourceforge-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-spiegel.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-spiegel.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-sponichi.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-sponichi.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-squeak-dev.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-squeak-dev.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-squeak-ja.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-squeak-ja.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-sueddeutsche-de.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-sueddeutsche-de.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-tcup.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-tcup.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-tdiary-ml.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-tdiary-ml.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-tdiary.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-tdiary.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-tech-on.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-tech-on.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-texfaq.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-texfaq.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-text.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-text.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-the-onion.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-the-onion.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-the-register.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-the-register.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-tigris.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-tigris.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-toshiba.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-toshiba.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-vinelinux.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-vinelinux.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-w3m-dev.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-w3m-dev.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-welt-de.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-welt-de.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-wiki.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-wiki.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-wikimedia.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-wikimedia.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-wincefan.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-wincefan.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-wired-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-wired-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-x51.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-x51.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-xemacs.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-xemacs.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yahoo-auctions.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yahoo-auctions.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yahoo-sports.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yahoo-sports.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yahoo.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yahoo.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yomiuri-html.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yomiuri-html.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yomiuri.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yomiuri.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yoshirin.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-yoshirin.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-zdnet-jp.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-zdnet-jp.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-zeit-de.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/sb-zeit-de.elc
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/shimbun.el
+%%SHIMBUN%%%%EMACS_SITE_LISPDIR%%/w3m/shimbun.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-antenna.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-antenna.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-bookmark.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-bookmark.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-bug.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-bug.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-ccl.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-ccl.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-cookie.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-cookie.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-dtree.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-dtree.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-ems.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-ems.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-favicon.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-favicon.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-fb.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-fb.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-filter.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-filter.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-form.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-form.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-hist.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-hist.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-image.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-image.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-lnum.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-lnum.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-load.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-load.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-mail.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-mail.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-namazu.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-namazu.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-perldoc.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-perldoc.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-proc.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-proc.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-rss.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-rss.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-save.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-save.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-search.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-search.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-session.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-session.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-symbol.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-symbol.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-tabmenu.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-tabmenu.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-ucs.el
+@postunexec rm -f %D/%%EMACS_SITE_LISPDIR%%/w3m/w3m-ucs.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-util.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-util.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-weather.el
+%%EMACS_SITE_LISPDIR%%/w3m/w3m-weather.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m.elc
+%%EMACS_SITE_LISPDIR%%/w3m/w3m.el
author	Joseph Mingrone <jrm@FreeBSD.org>	2018-02-01 18:03:09 +0000
committer	Joseph Mingrone <jrm@FreeBSD.org>	2018-02-01 18:03:09 +0000
commit	a3cc513bfc69ef10d52ed310dd9a6e6bb8c57491 (patch)
tree	4a6b8513515fb032f2183d945863a1d39dbcd0c1
parent	7a6d87cd185d39c7023ee32da472cca4f391e7f2 (diff)
download	ports-a3cc513bfc69ef10d52ed310dd9a6e6bb8c57491.tar.gz ports-a3cc513bfc69ef10d52ed310dd9a6e6bb8c57491.zip