[pkgsrc/trunk]: pkgsrc/lang/elisp-manual Note conflict with emacs22 which now...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd2fdd6f1a5a
branches:  trunk
changeset: 530007:cd2fdd6f1a5a
user:      markd <markd%pkgsrc.org@localhost>
date:      Fri Jun 15 01:44:21 2007 +0000

description:
Note conflict with emacs22 which now has the manual bundled.
PR pkg/36492.

diffstat:

 lang/elisp-manual/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 7204a1909086 -r cd2fdd6f1a5a lang/elisp-manual/Makefile
--- a/lang/elisp-manual/Makefile        Fri Jun 15 01:39:32 2007 +0000
+++ b/lang/elisp-manual/Makefile        Fri Jun 15 01:44:21 2007 +0000
@@ -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 @@
 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