summaryrefslogtreecommitdiff
path: root/editors/xemacs-devel
diff options
context:
space:
mode:
authorAndrey Slusar <anray@FreeBSD.org>2005-12-16 08:49:02 +0000
committerAndrey Slusar <anray@FreeBSD.org>2005-12-16 08:49:02 +0000
commit60b105ccfaceec05abe66af3c11ff97bea039a53 (patch)
tree703a325dcf9ea171b21370cd446ddc2d91e9bf7d /editors/xemacs-devel
parenteditors/emacs20 was changed not to conflict with other emacsen. (diff)
editors/emacs20 does not conflict with other emacsen anymore.
PR: ports/90478 Submitted by: NIIMI Satoshi <sa2c@sa2c.net> Approved by: sem(mentor)
Notes
Notes: svn path=/head/; revision=151297
Diffstat (limited to 'editors/xemacs-devel')
-rw-r--r--editors/xemacs-devel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 7c1bf0bc95ec..ab54ac54b63d 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR= xemacs
MAINTAINER= ports@FreeBSD.org
COMMENT= This port tracks the development (GAMMA) version of the XEmacs text editor
-CONFLICTS= emacs-[0-9]* \
+CONFLICTS= emacs-19.* emacs-21.* \
xemacs-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*