summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2007-06-30 05:13:24 +0000
committerjoerg <joerg>2007-06-30 05:13:24 +0000
commita732de606cd0996186216b33dd4892bc24770c41 (patch)
tree889f26100438ba2c014e8309e9ae56d87cf0c320
parent56a7e8641a1f7d12bbb0a1340cbc33a25081d8fd (diff)
downloadpkgsrc-a732de606cd0996186216b33dd4892bc24770c41.tar.gz
Don't use open-ended dependencies for emacs20 and emacs21 to avoid
the wrong version from being picked up by pkg_add or bin-install. OK uebayasi@
-rw-r--r--mk/emacs.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/emacs.mk b/mk/emacs.mk
index 2246f90baec..ba19e62b0dd 100644
--- a/mk/emacs.mk
+++ b/mk/emacs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emacs.mk,v 1.40 2007/06/30 05:04:41 uebayasi Exp $
+# $NetBSD: emacs.mk,v 1.41 2007/06/30 05:13:24 joerg Exp $
#
# This Makefile fragment handles Emacs Lisp Packages (== ELPs).
#
@@ -198,13 +198,13 @@ _EMACS_VERSIONS_ALL= \
_EMACS_VERSIONS_ACCEPTED_DEFAULT= ${_EMACS_VERSIONS_ALL}
_EMACS_VERSION_DEFAULT.emacs= emacs21
_EMACS_VERSION_DEFAULT.xemacs= xemacs214
-_EMACS_REQD.emacs20= emacs>=20.7
-_EMACS_REQD.emacs21= emacs>=21.2
-_EMACS_REQD.emacs21nox= emacs-nox11>=21.2
+_EMACS_REQD.emacs20= emacs>=20.7<21
+_EMACS_REQD.emacs21= emacs>=21.2<22
+_EMACS_REQD.emacs21nox= emacs-nox11>=21.2<22
_EMACS_REQD.emacs22= emacs>=22
_EMACS_REQD.emacs22nox= emacs-nox11>=22
-_EMACS_REQD.xemacs214= xemacs>=21.4
-_EMACS_REQD.xemacs215= xemacs>=21.5
+_EMACS_REQD.xemacs214= xemacs>=21.4<22
+_EMACS_REQD.xemacs215= xemacs>=21.5<22
_EMACS_DEP.emacs20= ../../editors/emacs20
_EMACS_DEP.emacs21= ../../editors/emacs21
_EMACS_DEP.emacs21nox= ../../editors/emacs21-nox11