summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2007-05-04 03:55:10 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2007-05-04 03:55:10 +0000
commitb68bfd31ae9df0c66283f279374ed7acb4f409dd (patch)
treede408eca363956d5bd99acbf2b7db96cfe0ed132
parentUpdate to 2.3.15. (diff)
Add emacs-22.* to CONFLICTS.
PR: ports/111814 Submitted by: NIIMI Satoshi <sa2c@sa2c.net> Approved by: anray (maintainer)
Notes
Notes: svn path=/head/; revision=191528
-rw-r--r--editors/xemacs-devel-mule/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index a82bfc7a1e22..4b350ffb2445 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -28,7 +28,7 @@ DIST_SUBDIR= xemacs
MAINTAINER?= anray@FreeBSD.org
COMMENT?= XEmacs(beta version) text editor with mule(Only the executables)
-CONFLICTS= emacs-19.* emacs-21.* \
+CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]*