summaryrefslogtreecommitdiff
path: root/editors/xemacs-current
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2008-10-11 09:31:54 +0000
committeruebayasi <uebayasi@pkgsrc.org>2008-10-11 09:31:54 +0000
commitb887f5681b4a4a2ce89af874eb1f9c822306ac8d (patch)
tree28f89f081daec07805c1f982f0bc63a420c005ba /editors/xemacs-current
parent5382ccf1d8130e9becd9b52c424e302b2acaf056 (diff)
downloadpkgsrc-b887f5681b4a4a2ce89af874eb1f9c822306ac8d.tar.gz
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.
Diffstat (limited to 'editors/xemacs-current')
-rw-r--r--editors/xemacs-current/buildlink3.mk8
-rw-r--r--editors/xemacs-current/version.mk9
2 files changed, 13 insertions, 4 deletions
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