diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2007-06-02 04:17:41 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2007-06-02 04:17:41 +0000 |
| commit | 6c068e0f5563bf28deaf5f6373853079506fc135 (patch) | |
| tree | bb39218e2781c920499d78cb210bd35336df4241 /japanese | |
| parent | Enable 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')
| -rw-r--r-- | japanese/emacs-emcws/Makefile | 2 | ||||
| -rw-r--r-- | japanese/emacs20-emcws/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
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]* |