summaryrefslogtreecommitdiff
path: root/editors/xemacs21-mule
diff options
context:
space:
mode:
authorAndrey Slusar <anray@FreeBSD.org>2005-12-16 08:13:42 +0000
committerAndrey Slusar <anray@FreeBSD.org>2005-12-16 08:13:42 +0000
commitb99c747646df6e52799ce415ac1405bcbdd6459c (patch)
treeaa79721188882025a0ff7a20ed3748786599a303 /editors/xemacs21-mule
parenteditors/emacs20 was changed not to conflict with other emacsen. (diff)
editors/emacs20 was changed not to conflict with other emacsen.
PR: ports/90480 Submitted by: NIIMI Satoshi <sa2c@sa2c.net> Approved by: sem(mentor)
Diffstat (limited to 'editors/xemacs21-mule')
-rw-r--r--editors/xemacs21-mule/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 428cdd89e492..8310890ac58b 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -27,7 +27,7 @@ DIST_SUBDIR= xemacs
MAINTAINER?= anray@FreeBSD.org
COMMENT?= XEmacs(stable version) text editor with mule(Only the executables)
-CONFLICTS= emacs-[0-9]* \
+CONFLICTS= emacs-19.* emacs-21.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-devel-mule-[0-9]*