summaryrefslogtreecommitdiff
path: root/editors/emacs
diff options
context:
space:
mode:
authormarkd <markd>2007-06-15 01:39:32 +0000
committermarkd <markd>2007-06-15 01:39:32 +0000
commit5d8cebd7a131f173bf3a3d631e4b6093bbdc6f05 (patch)
treead5ba93de5a2f52dd60b5fdca62be3e3fe56ceba /editors/emacs
parentf93e4362194d6aee5339db2eed0610b2f33c1ef8 (diff)
downloadpkgsrc-5d8cebd7a131f173bf3a3d631e4b6093bbdc6f05.tar.gz
Note conflict against the elisp-manual package. That manual has been
incorporated into latest emacs. PR pkg/36492
Diffstat (limited to 'editors/emacs')
-rw-r--r--editors/emacs/Makefile.common3
1 files changed, 2 insertions, 1 deletions
diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common
index 16b676d5ca7..702f14428d7 100644
--- a/editors/emacs/Makefile.common
+++ b/editors/emacs/Makefile.common
@@ -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
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