summaryrefslogtreecommitdiff
path: root/editors/emacs22
diff options
context:
space:
mode:
Diffstat (limited to 'editors/emacs22')
-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]*