diff options
| author | uebayasi <uebayasi@pkgsrc.org> | 2008-10-11 09:31:54 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@pkgsrc.org> | 2008-10-11 09:31:54 +0000 |
| commit | 34004f51e031966e3fbd210678c5083e196bf3e6 (patch) | |
| tree | 28f89f081daec07805c1f982f0bc63a420c005ba /editors/emacs20 | |
| parent | 6bcc8c586e8d598300da44f38c8ec67a571ea234 (diff) | |
| download | pkgsrc-34004f51e031966e3fbd210678c5083e196bf3e6.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/emacs20')
| -rw-r--r-- | editors/emacs20/buildlink3.mk | 8 | ||||
| -rw-r--r-- | editors/emacs20/version.mk | 9 |
2 files changed, 13 insertions, 4 deletions
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 |