6 files changed, 14 insertions, 13 deletions

diff --git a/japanese/cannadic/Makefile b/japanese/cannadic/Makefile
index 71ceba4a7920..5e56a0539bb5 100644
--- a/japanese/cannadic/Makefile
+++ b/japanese/cannadic/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	cannadic
 PORTVERSION=	0.95c
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://cannadic.oucrc.org/
 
 MAINTAINER=	toga@puyo.org
 COMMENT=	A canna dictionary containing a lot of words
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/cannaserver:${PORTSDIR}/japanese/Canna
-BUILD_DEPENDS=	crxdic:${PORTSDIR}/japanese/Canna
+RUN_DEPENDS=	${LOCALBASE}/sbin/cannaserver:${PORTSDIR}/japanese/canna-server
+BUILD_DEPENDS=	crxdic:${PORTSDIR}/japanese/canna-server
 
 ALL_TARGET=	maindic
 
diff --git a/japanese/elvis/Makefile b/japanese/elvis/Makefile
index 573e5ce7acc1..418289cc42e6 100644
--- a/japanese/elvis/Makefile
+++ b/japanese/elvis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elvis
 PORTVERSION=	1.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.cs.pdx.edu/pub/elvis/
 DISTNAME=	${PORTNAME}-1.8
@@ -19,7 +19,7 @@ PATCHFILES=	j${PORTNAME}1.8p4-j1.1.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A clone of vi/ex, the standard UNIX editor, with Japanese patch
 
-LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/canna-lib
 
 NO_WRKSUBDIR=	yes
 PATCH_DIST_STRIP=	-p1
diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index 46f997e205e9..e12727944529 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-canna
 PORTVERSION=	12.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -16,7 +16,7 @@ DISTNAME=	iiimf-src-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Canna language engine for IIIMF
 
-LIB_DEPENDS=	canna16.1:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS=	canna16.1:${PORTSDIR}/japanese/canna-lib
 RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server \
 		${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
 
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index c146001e0739..7532cf4004b1 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jvim
 PORTVERSION=	3.0.j2.1a
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.vim.org/pub/vim/unix/ \
@@ -52,7 +52,7 @@ FEPOPT=		-DJP_DEF=\"EEE\"
 #######
 .if defined(DIRECT_CANNA)
 INPUT_METHOD+=	direct_canna
-LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/canna-lib
 FEPOPT+=	-DCANNA
 FEPLIBS=	-lcanna
 FEPOBJS=	fepcanna.o
@@ -62,7 +62,7 @@ FEPOBJS=	fepcanna.o
 #######
 .if defined(CANNA)
 INPUT_METHOD+=	canna
-LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/canna-lib
 FEPLIBS+=	-lcanna
 .endif
 .if defined(FREEWNN)
@@ -89,7 +89,7 @@ INPUT_METHOD!=	${ECHO_CMD} ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g'
 FEPOPT+=	-DFEPCTRL
 .if !defined(DIRECT_CANNA)
 # For ONEW library
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libonew${INPUT_METHOD}.a:${PORTSDIR}/japanese/onew${INPUT_METHOD}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libonew${INPUT_METHOD}.a:${PORTSDIR}/japanese/onew
 FEPOPT+=	-DONEW
 # If we use ONEW libray, then -lonew-* needs appear
 # before the other libraries in ${FEPLIBS}.
diff --git a/japanese/ng/Makefile b/japanese/ng/Makefile
index 930ac75bd0e2..feb9aaca8450 100644
--- a/japanese/ng/Makefile
+++ b/japanese/ng/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ng
 PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese editors
 MASTER_SITES=	http://tomato.sakura.ne.jp/~amura/archives/ng/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -34,7 +34,7 @@ PLIST_FILES=	bin/ng
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_CANNA)
-LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/canna-lib
 
 CFLAGS+=	-I${LOCALBASE}/include -DCANNA
 LIBS+=		-L${LOCALBASE}/lib -lcanna
diff --git a/japanese/uim-canna/Makefile b/japanese/uim-canna/Makefile
index ad675e84c6e0..39bfd42abb4d 100644
--- a/japanese/uim-canna/Makefile
+++ b/japanese/uim-canna/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX=	-canna
 
 COMMENT=	Uim plugin using Canna input method
 
-LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna \
+LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/canna-lib \
 		uim.6:${PORTSDIR}/textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim