aboutsummaryrefslogtreecommitdiff
path: root/editors/emacs
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish@FreeBSD.org>2014-01-03 10:55:40 +0000
committerAshish SHUKLA <ashish@FreeBSD.org>2014-01-03 10:55:40 +0000
commit73c6d4b8f69cc73639b4873d47ccc63e27160c99 (patch)
tree6c0185f8faf65ff3972d71af1eb053534befbd13 /editors/emacs
parentdf98d075e9ccbd205c856fc1d628e6ccb8f21655 (diff)
Notes
Diffstat (limited to 'editors/emacs')
-rw-r--r--editors/emacs/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 35a52cac9669..078a87db68c7 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -21,9 +21,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
MAKE_JOBS_SAFE= yes
-CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
+CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs23-* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
- xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
+ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
+ emacs-devel-*
EMACS_VER= 24.3
GNU_CONFIGURE= yes