summaryrefslogtreecommitdiff
path: root/editors/xemacs
diff options
context:
space:
mode:
authorAndrey Slusar <anray@FreeBSD.org>2005-12-16 08:10:54 +0000
committerAndrey Slusar <anray@FreeBSD.org>2005-12-16 08:10:54 +0000
commitad81f93101c2bcd33d48319d0fbc485d1aa2d9d0 (patch)
tree43b7c8a2cf93e98a88a09fda55dc2908c1cf332c /editors/xemacs
parenteditors/emacs20 was changed not to conflict with other emacsen. (diff)
editors/emacs20 was changed not to conflict with other emacsen.
PR: ports/90477 Submitted by: NIIMI Satoshi <sa2c@sa2c.net> Approved by: sem(mentor)
Notes
Notes: svn path=/head/; revision=151294
Diffstat (limited to 'editors/xemacs')
-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]*