summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authoruebayasi <uebayasi>2008-10-11 09:31:54 +0000
committeruebayasi <uebayasi>2008-10-11 09:31:54 +0000
commitb96889b1354fc2db619e890c37d47726128607e1 (patch)
tree28f89f081daec07805c1f982f0bc63a420c005ba /math
parent82bb21f245fe7a2dee3f10a3aec11ffd03c27e07 (diff)
downloadpkgsrc-b96889b1354fc2db619e890c37d47726128607e1.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 'math')
-rw-r--r--math/calc/Makefile4
-rw-r--r--math/ess/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/math/calc/Makefile b/math/calc/Makefile
index 351c5bda247..0a125663be4 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/03/04 18:12:58 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2008/10/11 09:31:57 uebayasi Exp $
DISTNAME= calc-2.02f
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT= Advanced Calculator for GNU Emacs
PKG_DESTDIR_SUPPORT= user-destdir
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
MAKE_ENV+= EMACS=${EMACS_FLAVOR:Q}
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 51f94a08bc2..1c0eea1ed3a 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/04 18:12:59 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:57 uebayasi Exp $
DISTNAME= ess-5.3.4
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -45,5 +45,5 @@ do-install:
cd ${WRKSRC}/etc && ${INSTALL_SCRIPT} ess-sas-sh-command \
${DESTDIR}${EMACS_ETCPREFIX}/ess
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"