aboutsummaryrefslogtreecommitdiff
path: root/editors/emacs-devel
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-devel
parentdf98d075e9ccbd205c856fc1d628e6ccb8f21655 (diff)
Notes
Diffstat (limited to 'editors/emacs-devel')
-rw-r--r--editors/emacs-devel/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 194a59692e6b..25568db31378 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -16,8 +16,8 @@ COMMENT= GNU editing macros
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
- xemacs-[0-9]* xemacs-devel-[0-9]* \
+CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs23-* \
+ emacs24-* xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
emacs-nox11-[0-9]*