Move mk/emacs.mk to editors/emacs/modules.mk.

Don't call pkg_info to get the installed Emacs version; always use the
version matching EMACS_TYPE set by users.  Be DEPENDS to it.  This should
address pkg/37146 by Aleksey Cheusov.

While here convert some emacs lisp packages to user-destdir.

28 files changed, 459 insertions, 58 deletions

diff --git a/editors/emacs-nox11/buildlink3.mk b/editors/emacs-nox11/buildlink3.mk
index e167a89328c..4d203b93838 100644
--- a/editors/emacs-nox11/buildlink3.mk
+++ b/editors/emacs-nox11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:02 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+=	emacs-nox11
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-nox11
 
 .if ${EMACS_NOX11_BUILDLINK3_MK} == "+"
-.include "../../mk/emacs.mk"
-BUILDLINK_API_DEPENDS.emacs-nox11+=	${_EMACS_REQD.emacs22nox}
-BUILDLINK_PKGSRCDIR.emacs-nox11?=	${_EMACS_DEP.emacs22nox}
+.include "../../editors/emacs/modules.mk"
+BUILDLINK_API_DEPENDS.emacs-nox11+=	${_EMACS_REQD}
+BUILDLINK_PKGSRCDIR.emacs-nox11?=	${_EMACS_PKGDIR}
 .endif	# EMACS_NOX11_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs-nox11=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/editors/emacs-nox11/version.mk b/editors/emacs-nox11/version.mk
new file mode 100644
index 00000000000..ed737417c68
--- /dev/null
+++ b/editors/emacs-nox11/version.mk
@@ -0,0 +1,9 @@
+# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+
+_EMACS_FLAVOR=	emacs
+_EMACS_REQD=	emacs-nox11>=22<23
+_EMACS_PKGDEP.base=
+_EMACS_PKGDEP.leim=
+
+_EMACS_VERSION_MAJOR=	22
+_EMACS_VERSION_MINOR=	1
diff --git a/editors/emacs-packages/Makefile b/editors/emacs-packages/Makefile
index 0d539aa7dbf..63d6db0e080 100644
--- a/editors/emacs-packages/Makefile
+++ b/editors/emacs-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/10/30 12:46:01 dsainty Exp $
+# $NetBSD: Makefile,v 1.24 2008/10/11 09:31:56 uebayasi Exp $
 
 DISTNAME=	emacs-packages-0.9
 CATEGORIES=	meta-pkgs editors
@@ -9,7 +9,7 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	# empty
 COMMENT=	Meta-package for the GNU Emacs lisp packages
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 # XXX
 # Please update the version of this package (emacs-package) when you
diff --git a/editors/emacs/buildlink3.mk b/editors/emacs/buildlink3.mk
index 231eceaf891..02b5e681ab4 100644
--- a/editors/emacs/buildlink3.mk
+++ b/editors/emacs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:03 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+=	emacs
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs
 
 .if ${EMACS_BUILDLINK3_MK} == "+"
-.include "../../mk/emacs.mk"
-BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD.emacs22}
-BUILDLINK_PKGSRCDIR.emacs?=	${_EMACS_DEP.emacs22}
+.include "../../editors/emacs/modules.mk"
+BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD}
+BUILDLINK_PKGSRCDIR.emacs?=	${_EMACS_PKGDIR}
 .endif	# EMACS_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/editors/emacs/modules.mk b/editors/emacs/modules.mk
new file mode 100644
index 00000000000..ef8acdebe5c
--- /dev/null
+++ b/editors/emacs/modules.mk
@@ -0,0 +1,317 @@
+# $NetBSD: modules.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+#
+# This Makefile fragment handles Emacs Lisp Packages (== ELPs).
+#
+# Note to users:
+#
+#	* Users choose one favourite Emacs version (default GNU Emacs 21).
+#
+#	* Emacs Lisp files are installed...
+#	  	GNU emacs
+#	  		-> ${PREFIX}/share/emacs/site-lisp/foo/...
+#		XEmacs
+#	  		->${PREFIX}/lib/xemacs/site-packages/lisp/foo/...
+#
+#	* You can't install an ELP for both Emacs and XEmacs
+#	  simultaneously.
+#
+#	* XEmacs package's names are prefix'ed by "xemacs-".
+#
+# Note to package developers:
+#
+#	* XEmacs package's names are prefix'ed by "xemacs-".
+#
+#	  This is to make sure ELPs for XEmacs keep their own dependency
+#	  tree (for example, if an ELP "bar" depends on another ELP "foo",
+#	  "xemacs-bar" depends on "xemacs-foo".  "foo" (installed for GNU
+#	  Emacs) is useless for "xemacs-bar" in this case.).
+#
+#	  Make sure too that "foo" and "xemacs-foo" conflict each other,
+#	  since they can share some files.  (Making all ELPs separately
+#	  installable for GNU Emacs/XEmacs might be possible.)
+#
+#	* Assume each ELP supports all Emacs versions by default.  If the
+#	  ELP supports only certain Emacs versions, define EMACS_VERSIONS
+#	  _ACCEPTED explicitly before including mk/emacs.mk.
+#
+# Variables for users:
+#
+#	EMACS_TYPE
+#		Description:
+#			The user's favourite Emacs version.
+#		Possible values:
+#			emacs21, emacs21nox, emacs22, emacs22nox, emacs20, xemacs215, xemacs215nox, xemacs214, xemacs214nox
+#		Default value:
+#			emacs22
+#
+# Variables ELPs can provide:
+#
+#	EMACS_MODULES
+#		Description:
+#			List of Emacs LISP modules that the current ELP
+#			needs at run-time.
+#		Possible values:
+#			base, leim
+#		Default value:
+#			<undefined>
+#
+#	EMACS_VERSIONS_ACCEPTED
+#		Description:
+#			Versions the ELP accepts (supports).
+#		Possible values:
+#			emacs21, emacs21nox, emacs22, emacs22nox, emacs20, xemacs215, xemacs215nox, xemacs214, xemacs214nox
+#		Default value:
+#			emacs21, emacs21nox, emacs22, emacs22nox, emacs20, xemacs215, xemacs215nox, xemacs214, xemacs214nox
+#
+# Variables provided for ELPs:
+#
+#	EMACS_BIN
+#		Description:
+#			Path to Emacs executable.
+#		Possible values:
+#			${PREFIX}/bin/emacs, ${PREFIX}/bin/xemacs
+#
+#	EMACS_ETCPREFIX
+#		Description:
+#			Path to the directory misc. files should be
+#			installed into.  ELPs should append a short
+#			name as a subdirectory.
+#		Possible values:
+#			${PREFIX}/share
+#	  		${PREFIX}/lib/xemacs/site-packages/etc
+#
+#	EMACS_FLAVOR
+#		Description:
+#			GNU Emacs (emacs) or XEmacs (xemacs).
+#		Possible values:
+#			emacs, xemacs
+#
+#	EMACS_INFOPREFIX
+#		Description:
+#			Path to the directory Info files should be
+#			installed into.  Unlike EMACS_ETCPREFIX or
+#			EMACS_LISPPREFIX, subdirectory is not needed.
+#		Possible values:
+#			${PREFIX}/${PKGINFODIR}
+#	  		${PREFIX}/lib/xemacs/site-packages/info
+#
+#	EMACS_LISPPREFIX
+#		Description:
+#			installed into.  ELPs should append a short name
+#			as a subdirectory.
+#		Possible values:
+#			${PREFIX}/share/emacs/site-lisp
+#	  		${PREFIX}/lib/xemacs/site-packages/lisp
+#
+#	EMACS_PKGNAME_PREFIX
+#		Description:
+#			The prefix of PKGNAME and DEPENDS lines.  All ELPs
+#			must honour this!
+#		Possible values:
+#			"", "xemacs-"
+#
+#	EMACS_VERSION_MAJOR
+#		Description:
+#			Emacs major version.
+#		Possible values:
+#			20, 21, 22, <integers more than that in the future>
+#
+#	EMACS_VERSION_MINOR
+#		Description:
+#			Emacs minor version.
+#		Possible values:
+#			<integer>
+#
+# Variables provided in ELPs' PLIST:
+#
+#	EMACS_ETCPREFIX
+#		Description:
+#			Same as the one in Makefile, except that
+#			${PREFIX} is omitted in PLIST.
+#		Possible values:
+#			share
+#	  		lib/xemacs/site-packages/etc
+#
+#	EMACS_INFOPREFIX
+#		Description:
+#			Same as the one in Makefile, except that
+#			${PREFIX} is omitted in PLIST.
+#		Possible values:
+#			${PKGINFODIR}
+#	  		lib/xemacs/site-packages/info
+#
+#	EMACS_LISPPREFIX
+#		Description:
+#			Same as the one in Makefile, except that
+#			${PREFIX} is omitted in PLIST.
+#		Possible values:
+#			share/emacs/site-lisp
+#	  		lib/xemacs/site-packages/lisp
+#
+#	EMACS_VERSION
+#		Description:
+#			XXX
+#		Possible values:
+#			XXX
+#
+#	FOR_{emacs21,emacs21nox,emacs22,emacs22nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#	FOR_{emacs,xemacs}
+#	FOR_{emacs_x,emacs_nox}
+#	NOTFOR_{emacs21,emacs21nox,emacs22,emacs22nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#	NOTFOR_{emacs,xemacs}
+#	NOTFOR_{emacs_x,emacs_nox}
+#		Description:
+#			These macros will become either an empty string or
+#			"@comment" depending on the Emacs version; when
+#			"emacs21" is used, ${FOR_emacs} and ${FOR_emacs21}
+#			become "" (empty), and other macros become
+#			"@comment"; this means that only the PLIST lines
+#			prefixed by ${FOR_emacs} and ${FOR_emacs21} are
+#			valid.
+#
+#			NOTFOR_* is the opposite of FOR_*.
+#		Possible values:
+#			"", "@comment"
+#
+
+.if !defined(EMACS_MK)
+EMACS_MK=	# defined
+
+_VARGROUPS+=		emacs
+_USER_VARS.emacs=	EMACS_TYPE
+_PKG_VARS.emacs=	EMACS_MODULES EMACS_VERSIONS_ACCEPTED
+_SYS_VARS.emacs=	EMACS_BIN EMACS_ETCPREFIX EMACS_FLAVOR \
+			EMACS_INFOPREFIX EMACS_LISPPREFIX \
+			EMACS_PKGNAME_PREFIX \
+			EMACS_VERSION_MAJOR EMACS_VERSION_MINOR
+_DEF_VARS.emacs=	_EMACS_TYPE _EMACS_PKGBASE
+BUILD_DEFS+=		${_USER_VARS.emacs}
+BUILD_DEFS_EFFECTS+=	${_SYS_VARS.emacs}
+
+.include "../../mk/bsd.prefs.mk"
+
+#
+# Constants
+#
+
+_EMACS_VERSIONS_ALL= \
+	emacs20 emacs21 emacs21nox emacs22 emacs22nox \
+	xemacs214 xemacs214nox xemacs215 xemacs215nox
+
+_EMACS_PKGDIR_MAP= \
+	emacs20@../../editors/emacs20 \
+	emacs21@../../editors/emacs21 \
+	emacs21nox@../../editors/emacs21-nox11 \
+	emacs22@../../editors/emacs \
+	emacs22nox@../../editors/emacs-nox11 \
+	xemacs214@../../editors/xemacs \
+	xemacs214nox@../../editors/xemacs-nox11 \
+	xemacs215@../../editors/xemacs-current \
+	xemacs215nox@../../editors/xemacs-current-nox11
+
+_EMACS_ETCDIR.emacs=		share
+_EMACS_INFODIR.emacs=		${PKGINFODIR}
+_EMACS_LISPDIR.emacs=		share/emacs/site-lisp
+_EMACS_PKGNAME_PREFIX.emacs=
+_EMACS_CONFLICTS.emacs=		xemacs-${PKGBASE}-[0-9]*
+
+_EMACS_ETCDIR.xemacs=		lib/xemacs/site-packages/etc
+_EMACS_INFODIR.xemacs=		lib/xemacs/site-packages/info
+_EMACS_LISPDIR.xemacs=		lib/xemacs/site-packages/lisp
+_EMACS_PKGNAME_PREFIX.xemacs=	xemacs-
+_EMACS_CONFLICTS.xemacs=	${PKGBASE:C|^xemacs-||}-[0-9]*
+
+#
+# Version decision
+#
+# 1. Pick up an emacs version.
+#
+#	add a dependency to the version;
+#
+# 2. Check if a given package can be used for the emacs version.
+#
+# 	if (package accepts the emacs version)
+#		nothing to do;
+#	else
+#		abort;
+#
+
+_EMACS_TYPE=	${EMACS_TYPE}
+
+EMACS_VERSIONS_ACCEPTED?=	${_EMACS_VERSIONS_ALL}
+.if empty(EMACS_VERSIONS_ACCEPTED:M${_EMACS_TYPE})
+PKG_FAIL_REASON+=	"Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}"
+PKG_FAIL_REASON+=	"No valid Emacs version installed found"
+.endif
+
+_EMACS_PKGDIR=	${_EMACS_PKGDIR_MAP:M${_EMACS_TYPE}@*:C|${_EMACS_TYPE}@||}
+
+.include "${_EMACS_PKGDIR}/version.mk"
+
+#
+# Dependencies and conflicts
+#
+
+DEPENDS+=	${_EMACS_REQD}:${_EMACS_PKGDIR}
+CONFLICTS+=	${_EMACS_CONFLICTS.${_EMACS_FLAVOR}}
+
+EMACS_MODULES?=
+.for _mod_ in ${EMACS_MODULES}
+.if !empty(_EMACS_PKGDEP.${_mod_})
+DEPENDS+=	${_EMACS_PKGDEP.${_mod_}}
+.endif
+.endfor
+
+#
+# Macros for packages
+#
+
+EMACS_FLAVOR=		${_EMACS_FLAVOR}
+EMACS_BIN=		${PREFIX}/bin/${_EMACS_FLAVOR}
+EMACS_VERSION_MAJOR=	${_EMACS_VERSION_MAJOR}
+EMACS_VERSION_MINOR=	${_EMACS_VERSION_MINOR}
+EMACS_ETCPREFIX=	${PREFIX}/${_EMACS_ETCDIR.${_EMACS_FLAVOR}}
+EMACS_INFOPREFIX=	${PREFIX}/${_EMACS_INFODIR.${_EMACS_FLAVOR}}
+EMACS_LISPPREFIX=	${PREFIX}/${_EMACS_LISPDIR.${_EMACS_FLAVOR}}
+EMACS_PKGNAME_PREFIX=	${_EMACS_PKGNAME_PREFIX.${_EMACS_FLAVOR}}
+
+GNU_CONFIGURE_INFODIR?=	${EMACS_INFOPREFIX}
+
+_EMACS_PLIST_SUBST=
+.for e in ${_EMACS_VERSIONS_ALL} emacs xemacs
+.  if "${e}" == ${EMACS_FLAVOR} || "${e}" == ${_EMACS_TYPE}
+_EMACS_PLIST_SUBST+=	FOR_${e}="" NOTFOR_${e}="@comment "
+.  else
+_EMACS_PLIST_SUBST+=	FOR_${e}="@comment " NOTFOR_${e}=""
+.  endif
+.endfor
+.if empty(EMACS_TYPE:M*nox)
+_EMACS_PLIST_SUBST+=	FOR_emacs_x="" NOTFOR_emacs_x="@comment "
+_EMACS_PLIST_SUBST+=	FOR_emacs_nox="@comment " NOTFOR_emacs_nox="" 
+.else
+_EMACS_PLIST_SUBST+=	FOR_emacs_x="@comment " NOTFOR_emacs_x=""
+_EMACS_PLIST_SUBST+=	FOR_emacs_nox="" NOTFOR_emacs_nox="@comment " 
+.endif
+
+_EMACS_PLIST_SUBST+=	EMACS_FLAVOR=${EMACS_FLAVOR:Q}
+_EMACS_PLIST_SUBST+=	EMACS_VERSION=${_EMACS_VERSION_MAJOR:Q}.${_EMACS_VERSION_MINOR:Q}
+_EMACS_PLIST_SUBST+=	EMACS_ETCPREFIX=${EMACS_ETCPREFIX:C|^${PREFIX}/||}
+_EMACS_PLIST_SUBST+=	EMACS_INFOPREFIX=${EMACS_INFOPREFIX:C|^${PREFIX}/||}
+_EMACS_PLIST_SUBST+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX:C|^${PREFIX}/||}
+
+PLIST_SUBST+=		${_EMACS_PLIST_SUBST}
+
+PRINT_PLIST_AWK+=	{ gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \
+			"$${EMACS_LISPPREFIX}"); \
+			print; next; }
+
+#
+# Build environment (buildlink3)
+#
+
+_EMACS_DIR=	${BUILDLINK_DIR}/share/emacs
+ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
+
+.include	"${_EMACS_PKGDIR}/buildlink3.mk"
+
+.endif	# EMACS_MK
diff --git a/editors/emacs/version.mk b/editors/emacs/version.mk
new file mode 100644
index 00000000000..bf23fb598cb
--- /dev/null
+++ b/editors/emacs/version.mk
@@ -0,0 +1,9 @@
+# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+
+_EMACS_FLAVOR=	emacs
+_EMACS_REQD=	emacs>=22
+_EMACS_PKGDEP.base=
+_EMACS_PKGDEP.leim=
+
+_EMACS_VERSION_MAJOR=	22
+_EMACS_VERSION_MINOR=	1
diff --git a/editors/emacs20/buildlink3.mk b/editors/emacs20/buildlink3.mk
index 7c553d71002..3537a0bc00f 100644
--- a/editors/emacs20/buildlink3.mk
+++ b/editors/emacs20/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:03 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+=	emacs
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs
 
 .if ${APEL_BUILDLINK3_MK} == "+"
-.include "../../mk/emacs.mk"
-BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD.emacs20}
-BUILDLINK_PKGSRCDIR.emacs?=	${_EMACS_DEP.emacs20}
+.include "../../editors/emacs/modules.mk"
+BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD}
+BUILDLINK_PKGSRCDIR.emacs?=	${_EMACS_PKGDIR}
 .endif	# APEL_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/editors/emacs20/version.mk b/editors/emacs20/version.mk
new file mode 100644
index 00000000000..3a1335b0962
--- /dev/null
+++ b/editors/emacs20/version.mk
@@ -0,0 +1,9 @@
+# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+
+_EMACS_FLAVOR=	emacs
+_EMACS_REQD=	emacs>=20.7<21
+_EMACS_PKGDEP.base=
+_EMACS_PKGDEP.leim=	leim>=20.${EMACS_VERSION_MINOR}<21:../../editors/leim20
+
+_EMACS_VERSION_MAJOR=	20
+_EMACS_VERSION_MINOR=	7
diff --git a/editors/emacs21-nox11/buildlink3.mk b/editors/emacs21-nox11/buildlink3.mk
index 19c38716291..4d203b93838 100644
--- a/editors/emacs21-nox11/buildlink3.mk
+++ b/editors/emacs21-nox11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:03 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+=	emacs-nox11
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-nox11
 
 .if ${EMACS_NOX11_BUILDLINK3_MK} == "+"
-.include "../../mk/emacs.mk"
-BUILDLINK_API_DEPENDS.emacs-nox11+=	${_EMACS_REQD.emacs21nox}
-BUILDLINK_PKGSRCDIR.emacs-nox11?=	${_EMACS_DEP.emacs21nox}
+.include "../../editors/emacs/modules.mk"
+BUILDLINK_API_DEPENDS.emacs-nox11+=	${_EMACS_REQD}
+BUILDLINK_PKGSRCDIR.emacs-nox11?=	${_EMACS_PKGDIR}
 .endif	# EMACS_NOX11_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs-nox11=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/editors/emacs21-nox11/version.mk b/editors/emacs21-nox11/version.mk
new file mode 100644
index 00000000000..b76c9cd20b6
--- /dev/null
+++ b/editors/emacs21-nox11/version.mk
@@ -0,0 +1,9 @@
+# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+
+_EMACS_FLAVOR=	emacs
+_EMACS_REQD=	emacs-nox11>=21.2<22
+_EMACS_PKGDEP.base=
+_EMACS_PKGDEP.leim=	leim>=21.${EMACS_VERSION_MINOR}<22:../../editors/leim21
+
+_EMACS_VERSION_MAJOR=	21
+_EMACS_VERSION_MINOR=	4
diff --git a/editors/emacs21/buildlink3.mk b/editors/emacs21/buildlink3.mk
index 4b5a42b3d92..02b5e681ab4 100644
--- a/editors/emacs21/buildlink3.mk
+++ b/editors/emacs21/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:03 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+=	emacs
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs
 
 .if ${EMACS_BUILDLINK3_MK} == "+"
-.include "../../mk/emacs.mk"
-BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD.emacs21}
-BUILDLINK_PKGSRCDIR.emacs?=	${_EMACS_DEP.emacs21}
+.include "../../editors/emacs/modules.mk"
+BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD}
+BUILDLINK_PKGSRCDIR.emacs?=	${_EMACS_PKGDIR}
 .endif	# EMACS_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/editors/emacs21/version.mk b/editors/emacs21/version.mk
new file mode 100644
index 00000000000..5ffee21196e
--- /dev/null
+++ b/editors/emacs21/version.mk
@@ -0,0 +1,9 @@
+# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+
+_EMACS_FLAVOR=	emacs
+_EMACS_REQD=	emacs>=21<22
+_EMACS_PKGDEP.base=
+_EMACS_PKGDEP.leim=	leim>=21.${EMACS_VERSION_MINOR}<22:../../editors/leim21
+
+_EMACS_VERSION_MAJOR=	21
+_EMACS_VERSION_MINOR=	4
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index 7af8caa902e..9c36af1543c 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/08/18 00:55:48 epg Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/11 09:31:56 uebayasi Exp $
 
 DISTNAME=	gnuserv-3.12.7
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -22,5 +22,5 @@ post-install:
 		${INSTALL_DATA} $${FILE} $${FILE}c ${EMACS_LISPPREFIX};		\
 	done
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/jde/Makefile b/editors/jde/Makefile
index 06997387fd9..93e95c7226e 100644
--- a/editors/jde/Makefile
+++ b/editors/jde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/05/26 02:13:18 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 DISTNAME=	jde-2.3.2
@@ -24,7 +24,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/lisp
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 # XEmacs has its own JDE package
 EMACS_VERSIONS_ACCEPTED=emacs21		# XXX Won't compile with emacs20...
diff --git a/editors/leim21/Makefile b/editors/leim21/Makefile
index 6cfa05d1d37..7e05c730143 100644
--- a/editors/leim21/Makefile
+++ b/editors/leim21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/10/29 13:41:29 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2008/10/11 09:31:56 uebayasi Exp $
 
 DISTNAME=	leim-${VERSION}
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -36,5 +36,5 @@ post-extract:
 post-install:
 	@${CHOWN} -R ${ROOT_USER} ${PREFIX}/share/emacs/${VERSION}/leim
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/matlab-mode/Makefile b/editors/matlab-mode/Makefile
index 725dc39718a..789c14ad947 100644
--- a/editors/matlab-mode/Makefile
+++ b/editors/matlab-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/03/03 18:25:52 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 DISTNAME=		matlab.el
@@ -20,7 +20,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		${BASEPKGNAME}
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 .if ${EMACS_FLAVOR} == "emacs"
 EMACS=	emacs
diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile
index a11478b728b..714bc8aad5d 100644
--- a/editors/mule-ucs/Makefile
+++ b/editors/mule-ucs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/03 18:25:52 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:56 uebayasi Exp $
 
 DISTNAME=	Mule-UCS-0.84
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -11,6 +11,10 @@ MAINTAINER=	uebayasi@NetBSD.org
 COMMENT=	Another encoding conversion mechanism for Emacs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS=	${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs \
+			${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs/big5conv \
+			${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs/jisx0213 \
+			${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs/reldata
 
 # Mule 4.1 feature required by Mule-UCS was added to 20.7nb1.
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
@@ -27,20 +31,16 @@ do-build:
 	${EMACS_BIN} -q --no-site-file -batch -l x0213-comp.el
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs
 	cd ${WRKSRC}/lisp && \
 	for f in ChangeLog README* *.txt *.el *.elc *.txt; do \
 		${INSTALL_DATA} $$f ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs; \
 	done
-	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/big5conv
 	${INSTALL_DATA} ${WRKSRC}/lisp/big5conv/* \
 	    ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/big5conv; \
-	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/jisx0213
 	${INSTALL_DATA} ${WRKSRC}/lisp/jisx0213/* \
 	    ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/jisx0213; \
-	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/reldata
 	${INSTALL_DATA} ${WRKSRC}/lisp/reldata/* \
 	    ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/reldata
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/mule-ucs/buildlink3.mk b/editors/mule-ucs/buildlink3.mk
index 7c994a4bdb2..1fad14e30e7 100644
--- a/editors/mule-ucs/buildlink3.mk
+++ b/editors/mule-ucs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -9,7 +9,7 @@ MULE_UCS_BUILDLINK3_MK:=	${MULE_UCS_BUILDLINK3_MK}+
 # incorporated Unicode support.
 #
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} < 22
 
 .if ${BUILDLINK_DEPTH} == "+"
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 04b9c4ceaf4..a52521badf7 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/03/03 18:25:53 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 DISTNAME=	speedbar-0.14beta4
@@ -13,7 +13,7 @@ COMMENT=	Directory and code browser for emacs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 PKGSRC_MAKE_ENV+=	EMACS=${EMACS}
 
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 4beb2e9cb47..edb81e2a1f2 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:00 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:56 uebayasi Exp $
 
 DISTNAME=	tamago-4.0.6
 PKGNAME=	${EMACS_PKGNAME_PREFIX}tamago-20020909
@@ -10,12 +10,15 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www.m17n.org/tamago/
 COMMENT=	CJK characters inputting system for emacs + leim
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
+MAKE_FLAGS+=	prefix=${DESTDIR:Q}${PREFIX}
 # XXX please someone adjust paths and PLIST for XEmacs...
 EMACS_VERSIONS_ACCEPTED= emacs22 emacs22nox emacs21 emacs21nox emacs20
 EMACS_MODULES+=	leim
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 PLIST_VARS+=	jisx0213
 
diff --git a/editors/xemacs-current-nox11/buildlink3.mk b/editors/xemacs-current-nox11/buildlink3.mk
index cd67f26c2fc..45e76f5fc57 100644
--- a/editors/xemacs-current-nox11/buildlink3.mk
+++ b/editors/xemacs-current-nox11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/11/12 01:48:48 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+=	xemacs-nox11
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs-nox11
 
 .if ${XEMACS_NOX11_BUILDLINK3_MK} == "+"
-.include "../../mk/emacs.mk"
-BUILDLINK_API_DEPENDS.xemacs-nox11+=	${_EMACS_REQD.xemacs215nox}
-BUILDLINK_PKGSRCDIR.xemacs-nox11?=	${_EMACS_DEP.xemacs215nox}
+.include "../../editors/emacs/modules.mk"
+BUILDLINK_API_DEPENDS.xemacs-nox11+=	${_EMACS_REQD}
+BUILDLINK_PKGSRCDIR.xemacs-nox11?=	${_EMACS_PKGDIR}
 .endif	# XEMACS_NOX11_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.xemacs-nox11=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/editors/xemacs-current-nox11/version.mk b/editors/xemacs-current-nox11/version.mk
new file mode 100644
index 00000000000..d04c4a73cf8
--- /dev/null
+++ b/editors/xemacs-current-nox11/version.mk
@@ -0,0 +1,9 @@
+# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+
+_EMACS_FLAVOR=	xemacs
+_EMACS_REQD=	xemacs-nox11>=21.5<21.6
+_EMACS_PKGDEP.base=	xemacs-packages>=1.15:../../editors/xemacs-packages
+_EMACS_PKGDEP.leim=
+
+_EMACS_VERSION_MAJOR=	21
+_EMACS_VERSION_MINOR=	5
diff --git a/editors/xemacs-current/buildlink3.mk b/editors/xemacs-current/buildlink3.mk
index 1f9fc69dd84..86aa1539510 100644
--- a/editors/xemacs-current/buildlink3.mk
+++ b/editors/xemacs-current/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:03 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+=	xemacs
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs
 
 .if ${XEMACS_BUILDLINK3_MK} == "+"
-.include "../../mk/emacs.mk"
-BUILDLINK_API_DEPENDS.xemacs+=	${_EMACS_REQD.xemacs215}
-BUILDLINK_PKGSRCDIR.xemacs?=	${_EMACS_DEP.xemacs215}
+.include "../../editors/emacs/modules.mk"
+BUILDLINK_API_DEPENDS.xemacs+=	${_EMACS_REQD}
+BUILDLINK_PKGSRCDIR.xemacs?=	${_EMACS_PKGDIR}
 .endif	# XEMACS_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.xemacs=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/editors/xemacs-current/version.mk b/editors/xemacs-current/version.mk
new file mode 100644
index 00000000000..7cf4c17dd67
--- /dev/null
+++ b/editors/xemacs-current/version.mk
@@ -0,0 +1,9 @@
+# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+
+_EMACS_FLAVOR=	xemacs
+_EMACS_REQD=	xemacs>=21.5<21.6
+_EMACS_PKGDEP.base=	xemacs-packages>=1.15:../../editors/xemacs-packages
+_EMACS_PKGDEP.leim=
+
+_EMACS_VERSION_MAJOR=	21
+_EMACS_VERSION_MINOR=	5
diff --git a/editors/xemacs-nox11/buildlink3.mk b/editors/xemacs-nox11/buildlink3.mk
index 43c189326cc..45e76f5fc57 100644
--- a/editors/xemacs-nox11/buildlink3.mk
+++ b/editors/xemacs-nox11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:04 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+=	xemacs-nox11
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs-nox11
 
 .if ${XEMACS_NOX11_BUILDLINK3_MK} == "+"
-.include "../../mk/emacs.mk"
-BUILDLINK_API_DEPENDS.xemacs-nox11+=	${_EMACS_REQD.xemacs214nox}
-BUILDLINK_PKGSRCDIR.xemacs-nox11?=	${_EMACS_DEP.xemacs214nox}
+.include "../../editors/emacs/modules.mk"
+BUILDLINK_API_DEPENDS.xemacs-nox11+=	${_EMACS_REQD}
+BUILDLINK_PKGSRCDIR.xemacs-nox11?=	${_EMACS_PKGDIR}
 .endif	# XEMACS_NOX11_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.xemacs-nox11=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/editors/xemacs-nox11/version.mk b/editors/xemacs-nox11/version.mk
new file mode 100644
index 00000000000..a04844f5c74
--- /dev/null
+++ b/editors/xemacs-nox11/version.mk
@@ -0,0 +1,9 @@
+# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+
+_EMACS_FLAVOR=	xemacs
+_EMACS_REQD=	xemacs-nox11>=21.4<21.5
+_EMACS_PKGDEP.base=	xemacs-packages>=1.15:../../editors/xemacs-packages
+_EMACS_PKGDEP.leim=
+
+_EMACS_VERSION_MAJOR=	21
+_EMACS_VERSION_MINOR=	4
diff --git a/editors/xemacs/buildlink3.mk b/editors/xemacs/buildlink3.mk
index cc22efb5845..86aa1539510 100644
--- a/editors/xemacs/buildlink3.mk
+++ b/editors/xemacs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:04 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+=	xemacs
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs
 
 .if ${XEMACS_BUILDLINK3_MK} == "+"
-.include "../../mk/emacs.mk"
-BUILDLINK_API_DEPENDS.xemacs+=	${_EMACS_REQD.xemacs214}
-BUILDLINK_PKGSRCDIR.xemacs?=	${_EMACS_DEP.xemacs214}
+.include "../../editors/emacs/modules.mk"
+BUILDLINK_API_DEPENDS.xemacs+=	${_EMACS_REQD}
+BUILDLINK_PKGSRCDIR.xemacs?=	${_EMACS_PKGDIR}
 .endif	# XEMACS_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.xemacs=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/editors/xemacs/version.mk b/editors/xemacs/version.mk
new file mode 100644
index 00000000000..7538edd6862
--- /dev/null
+++ b/editors/xemacs/version.mk
@@ -0,0 +1,9 @@
+# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+
+_EMACS_FLAVOR=	xemacs
+_EMACS_REQD=	xemacs>=21.4<21.5
+_EMACS_PKGDEP.base=	xemacs-packages>=1.15:../../editors/xemacs-packages
+_EMACS_PKGDEP.leim=
+
+_EMACS_VERSION_MAJOR=	21
+_EMACS_VERSION_MINOR=	4