aboutsummaryrefslogtreecommitdiffstats
path: root/editors/xemacs-devel/Makefile
diff options
context:
space:
mode:
authoranray <anray@FreeBSD.org>2005-12-16 16:49:02 +0800
committeranray <anray@FreeBSD.org>2005-12-16 16:49:02 +0800
commitaaa58eb3fcf25fe6916247fa62686e39e68d424f (patch)
treea45a043141530336eb87855b87fb05d836417354 /editors/xemacs-devel/Makefile
parentb6e375f10b4ddb3d617c7c2864bed7d26aa54701 (diff)
downloadfreebsd-ports-gnome-aaa58eb3fcf25fe6916247fa62686e39e68d424f.tar.gz
freebsd-ports-gnome-aaa58eb3fcf25fe6916247fa62686e39e68d424f.tar.zst
freebsd-ports-gnome-aaa58eb3fcf25fe6916247fa62686e39e68d424f.zip
editors/emacs20 does not conflict with other emacsen anymore.
PR: ports/90478 Submitted by: NIIMI Satoshi <sa2c@sa2c.net> Approved by: sem(mentor)
Diffstat (limited to 'editors/xemacs-devel/Makefile')
-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]*