aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish@FreeBSD.org>2010-07-28 12:26:55 +0000
committerAshish SHUKLA <ashish@FreeBSD.org>2010-07-28 12:26:55 +0000
commit1a9d3421c57e8756112835d4e401c5b297ad55c1 (patch)
treef01947f6823b3bb1d51db9f25f5f41d7a6fc9318 /editors
parent8ce865b2190bcfdbca050d088e0c7322587e8931 (diff)
Notes
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs22/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 6b0b16d44491..2a538e092c6b 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
png.6:${PORTSDIR}/graphics/png
.endif
-CONFLICTS= emacs-19.* emacs-21.* \
+CONFLICTS= emacs-19.* emacs-21.* emacs-23.* emacs-24.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*