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

14 files changed, 105 insertions, 126 deletions

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.
 **********************************************************************
-