aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranray <anray@FreeBSD.org>2005-12-16 16:13:42 +0800
committeranray <anray@FreeBSD.org>2005-12-16 16:13:42 +0800
commitb6e375f10b4ddb3d617c7c2864bed7d26aa54701 (patch)
tree096c901a11b62f02f1a03f358fe8576d7508e4a2
parent9d1ebee6b97ebe63b221534f1f87708b1de281c8 (diff)
downloadfreebsd-ports-gnome-b6e375f10b4ddb3d617c7c2864bed7d26aa54701.tar.gz
freebsd-ports-gnome-b6e375f10b4ddb3d617c7c2864bed7d26aa54701.tar.zst
freebsd-ports-gnome-b6e375f10b4ddb3d617c7c2864bed7d26aa54701.zip
editors/emacs20 was changed not to conflict with other emacsen.
PR: ports/90480 Submitted by: NIIMI Satoshi <sa2c@sa2c.net> Approved by: sem(mentor)
-rw-r--r--editors/xemacs21-mule/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 428cdd89e492..8310890ac58b 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]*