summaryrefslogtreecommitdiff
path: root/mk/emacs.mk
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2002-11-27 09:13:47 +0000
committeruebayasi <uebayasi@pkgsrc.org>2002-11-27 09:13:47 +0000
commit09bd111644cf4041acd04b8ce5568d123b26d265 (patch)
tree0c21aa8d056eb54951d51e0fec4b3311f0dc4ff4 /mk/emacs.mk
parent779b38ccbb3fc5844fbf1f895a8c9e1ba82b8d1e (diff)
downloadpkgsrc-09bd111644cf4041acd04b8ce5568d123b26d265.tar.gz
* EMACS_VERSION_ACCEPTED -> EMACS_VERSIONS_ACCEPTED
* Set CONFLICTS appropriately so that Emacs version and XEmacs version of a package can't be installed at once.
Diffstat (limited to 'mk/emacs.mk')
-rw-r--r--mk/emacs.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/emacs.mk b/mk/emacs.mk
index 605a7e0b314..638eca9a9b5 100644
--- a/mk/emacs.mk
+++ b/mk/emacs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emacs.mk,v 1.6 2002/11/14 03:56:53 wiz Exp $
+# $NetBSD: emacs.mk,v 1.7 2002/11/27 09:13:47 uebayasi Exp $
#
# A Makefile fragment for Emacs Lisp packages.
#
@@ -43,7 +43,7 @@ BUILDLINK_DEPENDS.xemacs215?= xemacs>=21.5
BUILDLINK_DEPENDS.leim20?= leim>=20.7
BUILDLINK_DEPENDS.leim21?= leim>=21.2
-.for v in ${EMACS_VERSION_ACCEPTED}
+.for v in ${EMACS_VERSIONS_ACCEPTED}
_EMACS_VERSION_${v}_OK= yes
.endfor
@@ -150,12 +150,14 @@ EMACS_BIN= ${PREFIX}/bin/emacs
EMACS_PKG_VERSION= ${_EMACS_VERSION_EMACS_FULL:C|^.*-||}
EMACS_LISPPREFIX= ${PREFIX}/share/emacs/site-lisp
PKGNAME_PREFIX=
+CONFLICTS+= xemacs-${PKGBASE}-*
.else
EMACS_BIN= ${PREFIX}/bin/xemacs
EMACS_PKG_VERSION= ${_EMACS_VERSION_XEMACS_FULL:C|^.*-||}
EMACS_LISPPREFIX= ${PREFIX}/lib/xemacs/site-packages/lisp
PKGNAME_PREFIX= xemacs-
PKGNAME= ${PKGNAME_PREFIX}${DISTNAME}
+CONFLICTS+= ${PKGBASE:C|^xemacs-||}-*
.endif
# strip out nb?
EMACS_VERSION=${EMACS_PKG_VERSION:C|nb[0-9]*$||}