12 files changed, 73 insertions, 89 deletions

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}