diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2007-06-02 12:17:41 +0800 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2007-06-02 12:17:41 +0800 |
| commit | c2291bfd18a7be017f46c2585a61c6e07bb7c5ef (patch) | |
| tree | d09cbe4db48434c2ecbf60b9c921abeeb520bf80 | |
| parent | 768b53ae23d4daa1f139d5350144330a6598a274 (diff) | |
| download | freebsd-ports-graphics-c2291bfd18a7be017f46c2585a61c6e07bb7c5ef.tar.gz freebsd-ports-graphics-c2291bfd18a7be017f46c2585a61c6e07bb7c5ef.tar.zst freebsd-ports-graphics-c2291bfd18a7be017f46c2585a61c6e07bb7c5ef.zip | |
Add emacs-22.* to CONFLICTS.
PR: ports/111814
Submitted by: NIIMI Satoshi <sa2c@sa2c.net>
Approved by: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (maintainer)
| -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 a6b6fc65137..fcf03052d3d 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 8dd1d5c73da..b99dab663fd 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]* |