From b96889b1354fc2db619e890c37d47726128607e1 Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi>
Date: Sat, 11 Oct 2008 09:31:54 +0000
Subject: 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.
---
 editors/xemacs-nox11/buildlink3.mk | 8 ++++----
 editors/xemacs-nox11/version.mk    | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 editors/xemacs-nox11/version.mk

(limited to 'editors/xemacs-nox11')

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
-- 
cgit v1.2.3