From 6c068e0f5563bf28deaf5f6373853079506fc135 Mon Sep 17 00:00:00 2001 From: MANTANI Nobutaka Date: Sat, 2 Jun 2007 04:17:41 +0000 Subject: Add emacs-22.* to CONFLICTS. PR: ports/111814 Submitted by: NIIMI Satoshi Approved by: NAKAJI Hiroyuki (maintainer) --- japanese/emacs-emcws/Makefile | 2 +- japanese/emacs20-emcws/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'japanese') diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index a6b6fc65137d..fcf03052d3d7 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -28,7 +28,7 @@ COMMENT= Emacs + Canna + Wnn + Sj3 BUILD_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs -CONFLICTS= emacs-19.* emacs-20.* \ +CONFLICTS= emacs-19.* emacs-20.* emacs-22.* \ ja-emcws-20.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* 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]* -- cgit v1.2.3