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