[pkgsrc/trunk]: pkgsrc/editors/emacs Note conflict against the elisp-manual p...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7204a1909086
branches:  trunk
changeset: 530006:7204a1909086
user:      markd <markd%pkgsrc.org@localhost>
date:      Fri Jun 15 01:39:32 2007 +0000

description:
Note conflict against the elisp-manual package.  That manual has been
incorporated into latest emacs.  PR pkg/36492

diffstat:

 editors/emacs/Makefile.common |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r 2be52b0cc37a -r 7204a1909086 editors/emacs/Makefile.common
--- a/editors/emacs/Makefile.common     Fri Jun 15 01:18:52 2007 +0000
+++ b/editors/emacs/Makefile.common     Fri Jun 15 01:39:32 2007 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.14 2007/06/11 13:57:15 markd Exp $
+# $NetBSD: Makefile.common,v 1.15 2007/06/15 01:39:32 markd Exp $
 
 MASTER_SITES=  ${MASTER_SITE_GNU:=emacs/}
 MAINTAINER=    markd%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnu.org/software/emacs/emacs.html
 
 CONFLICTS=     mule-[0-9]*
+CONFLICTS+=    elisp-manual-[0-9]*
 
 USE_TOOLS+=            gmake perl:run
 GNU_CONFIGURE=         yes