summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/xemacs/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 0c3f2e0787a6..1254b3ae0a8a 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= xemacs
MAINTAINER?= ports@FreeBSD.org
COMMENT?= This port tracks the stable version of the XEmacs text editor
-CONFLICTS= emacs-[0-9]* \
+CONFLICTS= emacs-19.* emacs-21.* \
xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*