summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorAndrey Slusar <anray@FreeBSD.org>2005-12-16 08:12:37 +0000
committerAndrey Slusar <anray@FreeBSD.org>2005-12-16 08:12:37 +0000
commit40a71ad3db0b0886f101ab5422d053c33523f831 (patch)
treee721ab03b0e1e4c8a649395d6de0eb269502bdb5 /editors
parenteditors/emacs20 was changed not to conflict with other emacsen. (diff)
editors/emacs20 was changed not to conflict with other emacsen.
PR: ports/90479 Submitted by: NIIMI Satoshi <sa2c@sa2c.net> Approved by: sem(mentor)
Notes
Notes: svn path=/head/; revision=151295
Diffstat (limited to 'editors')
-rw-r--r--editors/xemacs-devel-mule/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 356dd0635159..6d84165f9240 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -28,7 +28,7 @@ DIST_SUBDIR= xemacs
MAINTAINER= anray@FreeBSD.org
COMMENT?= XEmacs(beta 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-mule-[0-9]*