summaryrefslogtreecommitdiff
path: root/japanese/emacs20-emcws
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2007-06-02 04:17:41 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2007-06-02 04:17:41 +0000
commit6c068e0f5563bf28deaf5f6373853079506fc135 (patch)
treebb39218e2781c920499d78cb210bd35336df4241 /japanese/emacs20-emcws
parentEnable bktr by default with WITHOUT_BKTR to disable it. (diff)
Add emacs-22.* to CONFLICTS.
PR: ports/111814 Submitted by: NIIMI Satoshi <sa2c@sa2c.net> Approved by: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (maintainer)
Notes
Notes: svn path=/head/; revision=192567
Diffstat (limited to 'japanese/emacs20-emcws')
-rw-r--r--japanese/emacs20-emcws/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index 8dd1d5c73da2..b99dab663fdb 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -25,7 +25,7 @@ COMMENT= Emacs + Canna + Wnn + Sj3
BUILD_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
-CONFLICTS= emacs-19.* emacs-21.* \
+CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \
ja-emcws-21.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*