summaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2007-08-04 08:07:46 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2007-08-04 08:07:46 +0000
commit6ab6e653a8f8f4daecdbeb2546ac3cee9e937f56 (patch)
treeb159327c7e6331dad5abb6de5afb9cbebb4d43b0 /japanese
parentAdd migemo-emacs22, Japanese incremental search tool for emacs. (diff)
Add CONFLICTS for ja-migemo-emacs22.
Update email address in pkg-descr.
Notes
Notes: svn path=/head/; revision=197057
Diffstat (limited to 'japanese')
-rw-r--r--japanese/migemo-emacs21/Makefile2
-rw-r--r--japanese/migemo-emacs21/pkg-descr2
2 files changed, 3 insertions, 1 deletions
diff --git a/japanese/migemo-emacs21/Makefile b/japanese/migemo-emacs21/Makefile
index e60296693099..7d469363123c 100644
--- a/japanese/migemo-emacs21/Makefile
+++ b/japanese/migemo-emacs21/Makefile
@@ -18,6 +18,8 @@ BUILD_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORT
RUN_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel \
migemo:${PORTSDIR}/japanese/migemo
+CONFLICTS= ja-migemo-emacs22-[0-9]*
+
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --with-emacs=${EMACS_CMD}
ALL_TARGET= migemo.elc
diff --git a/japanese/migemo-emacs21/pkg-descr b/japanese/migemo-emacs21/pkg-descr
index a62fc3603cc2..b6a3e69c7a8a 100644
--- a/japanese/migemo-emacs21/pkg-descr
+++ b/japanese/migemo-emacs21/pkg-descr
@@ -8,4 +8,4 @@ To use Migemo, you must set following elisp to your own .emacs file.
WWW: http://migemo.namazu.org/
--
-MANTANI Nobutaka <nobutaka@nobutaka.com>
+MANTANI Nobutaka <nobutaka@FreeBSD.org>