From aaa58eb3fcf25fe6916247fa62686e39e68d424f Mon Sep 17 00:00:00 2001 From: anray Date: Fri, 16 Dec 2005 08:49:02 +0000 Subject: editors/emacs20 does not conflict with other emacsen anymore. PR: ports/90478 Submitted by: NIIMI Satoshi Approved by: sem(mentor) --- editors/xemacs-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'editors/xemacs-devel/Makefile') 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]* -- cgit