summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2007-06-15 01:44:21 +0000
committermarkd <markd@pkgsrc.org>2007-06-15 01:44:21 +0000
commitc9ee131092eee5d7e82857130a29fe1a2fb428dc (patch)
tree2a6ea62ab7a2bacf1c509dc3a6383107dff7e850 /lang
parent2be26b3ef457593561e0e8b63577d802a93cf2c5 (diff)
downloadpkgsrc-c9ee131092eee5d7e82857130a29fe1a2fb428dc.tar.gz
Note conflict with emacs22 which now has the manual bundled.
PR pkg/36492.
Diffstat (limited to 'lang')
-rw-r--r--lang/elisp-manual/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile
index 47cc75441f2..663ae252696 100644
--- a/lang/elisp-manual/Makefile
+++ b/lang/elisp-manual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/06/15 01:18:52 obache Exp $
+# $NetBSD: Makefile,v 1.14 2007/06/15 01:44:21 markd Exp $
DISTNAME= elisp-manual-21-2.8
CATEGORIES= lang
@@ -8,6 +8,8 @@ MAINTAINER= uebayasi@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
COMMENT= The Emacs Lisp Reference Manual for GNU Emacs Version 21.2
+CONFLICTS= {emacs,emacs-nox11}>=22.1
+
GNU_CONFIGURE= YES
INFO_FILES= # PLIST