From b6e375f10b4ddb3d617c7c2864bed7d26aa54701 Mon Sep 17 00:00:00 2001 From: anray Date: Fri, 16 Dec 2005 08:13:42 +0000 Subject: editors/emacs20 was changed not to conflict with other emacsen. PR: ports/90480 Submitted by: NIIMI Satoshi Approved by: sem(mentor) --- editors/xemacs21-mule/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'editors/xemacs21-mule/Makefile') diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile index 428cdd8..8310890 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]* -- cgit v1.1