Adjust various pathnames to use newly reimported packages from the japanese

category.
This is part of the japanese category retirement.

11 files changed, 23 insertions, 23 deletions

diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 7ff77260cd5..82ca16d2ff3 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/04/05 23:44:41 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/05/31 15:19:55 seb Exp $
 
 DISTNAME=	mule-2.3
 CATEGORIES=	editors
@@ -13,10 +13,10 @@ CONFLICTS=	emacs-[0-9]*
 .include "../../mk/bsd.prefs.mk"
 
 .if !defined(USE_WNN4) || ${USE_WNN4} == YES
-DEPENDS+=	ja-FreeWnn-lib-1.10:../../japanese/freewnn-lib
+DEPENDS+=	ja-FreeWnn-lib-1.10:../../inputmethod/ja-freewnn-lib
 .endif
 .if !defined(USE_CANNA) || ${USE_CANNA} == YES
-DEPENDS+=	Canna-lib>=3.5.2:../../japanese/canna-lib
+DEPENDS+=	Canna-lib>=3.5.2:../../inputmethod/canna-lib
 .endif
 
 WRKSRC=		${WRKDIR}/mule
diff --git a/editors/ng/Makefile b/editors/ng/Makefile
index 800d6339130..b73e194a501 100644
--- a/editors/ng/Makefile
+++ b/editors/ng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/04/14 15:10:04 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/05/31 15:19:56 seb Exp $
 
 DISTNAME=	ng-1.4.3
 CATEGORIES=     editors japanese
@@ -15,7 +15,7 @@ USE_CANNA=	YES
 .endif
 
 .if ${USE_CANNA} == "YES"
-DEPENDS=	Canna-lib>=3.5.2:../../japanese/canna-lib
+DEPENDS=	Canna-lib>=3.5.2:../../inputmethod/canna-lib
 USE_X11=	YES
 .endif
 
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 82b99fc141e..fe85094a94d 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/04/14 15:13:59 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/05/31 15:19:56 seb Exp $
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
 
 DISTNAME=	nvi-1.79
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=--enable-multibyte --program-prefix=n
 PATCH_FUZZ_FACTOR=	-F1
 
 .if !defined(USE_CANNA) || ${USE_CANNA} == YES
-DEPENDS+=	Canna-lib>=3.5.2:../../japanese/canna-lib
+DEPENDS+=	Canna-lib>=3.5.2:../../inputmethod/canna-lib
 USE_X11=	YES
 CONFIGURE_ARGS+=--enable-canna=${X11PREFIX}
 CANNA_OPT.euc-jp=canna cannactrl cannakey=
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index bedc31db56f..6b3cc074df3 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/05/20 16:46:29 cjep Exp $
+# $NetBSD: Makefile,v 1.8 2002/05/31 15:19:57 seb Exp $
 
 DISTNAME=	xemacs-21.5.5
 CATEGORIES=	editors
@@ -57,7 +57,7 @@ WITH_XFACE=	--with-xface=no
 
 .if defined(EMACS_CANNA) && ${EMACS_CANNA} == YES
 WITH_CANNA=	--with-canna=yes
-DEPENDS+=	Canna-lib-3*:../../japanese/canna-lib
+DEPENDS+=	Canna-lib-3*:../../inputmethod/canna-lib
 .else
 WITH_CANNA=	--with-canna=no
 .endif
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index b3e39235e82..e2ef4963778 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2002/04/05 18:39:18 magick Exp $
+# $NetBSD: Makefile,v 1.48 2002/05/31 15:19:57 seb Exp $
 
 DISTNAME=	xemacs-21.1.14
 PKGREVISION=	2
@@ -59,7 +59,7 @@ WITH_XFACE=	--with-xface=no
 
 .if defined(EMACS_CANNA) && ${EMACS_CANNA} == YES
 WITH_CANNA=	--with-canna=yes
-DEPENDS+=	Canna-lib-3*:../../japanese/canna-lib
+DEPENDS+=	Canna-lib-3*:../../inputmethod/canna-lib
 .else
 WITH_CANNA=	--with-canna=no
 .endif
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index e35ca897ad8..585cea09622 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/01/24 12:16:14 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/05/31 15:19:57 seb Exp $
 #
 
 DISTNAME=		xm71010s
@@ -11,7 +11,7 @@ MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		http://www.ipc-tokai.or.jp/~ytanaka/fm7/xm7.shtml
 COMMENT=		X11-based FM-7 emulator
 
-BUILD_DEPENDS+=		nkf-1.7:../../japanese/nkf
+BUILD_DEPENDS+=		nkf-1.7:../../converters/nkf
 
 WRKSRC=			${WRKDIR}/vm
 RESTRICTED=		source archive is not redistributable
diff --git a/games/sl/Makefile b/games/sl/Makefile
index 31c32b2b510..52a85ef3ae7 100644
--- a/games/sl/Makefile
+++ b/games/sl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2002/05/31 15:19:58 seb Exp $
 #
 
 DISTNAME=	sl
@@ -15,7 +15,7 @@ MAINTAINER=	minoura@netbsd.org
 HOMEPAGE=	http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/
 COMMENT=	Animated SL that runs across the terminal when you type `sl' instead of `ls'
 
-BUILD_DEPENDS=	nkf-1.7:../../japanese/nkf
+BUILD_DEPENDS=	nkf-1.7:../../converters/nkf
 
 post-build:
 	nkf -e ${WRKSRC}/sl.1 > ${WRKSRC}/sl.1.euc
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index fc2026ebbed..8e2376c92d3 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/03/13 17:37:12 fredb Exp $
+# $NetBSD: Makefile,v 1.30 2002/05/31 15:19:58 seb Exp $
 
 DISTNAME=		magicpoint-1.09a
 PKGREVISION=		1
@@ -47,5 +47,5 @@ post-install:
 .include "../../graphics/libungif/buildlink.mk"
 .include "../../graphics/mng/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
-.include "../../japanese/vflib-lib/buildlink.mk"
+.include "../../print/ja-vflib-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index 91774b1f8f1..2c04a79b68d 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/04/05 23:44:40 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/05/31 15:19:59 seb Exp $
 
 DISTNAME=	cue-snap-20010917
 PKGNAME=	cue-20010917
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--enable-ipv6
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 # require Canna, for now, cue assumes Japanese encoding anyways
-DEPENDS+=	Canna-lib>=3.5.2:../../japanese/canna-lib
+DEPENDS+=	Canna-lib>=3.5.2:../../inputmethod/canna-lib
 CONFIGURE_ARGS+=--with-canna=${LOCALBASE}
 
 do-install:
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index b2fe109f949..ac8dd764f2d 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2002/03/15 05:04:05 itohy Exp $
+# $NetBSD: Makefile.common,v 1.33 2002/05/31 15:19:59 seb Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
@@ -286,4 +286,4 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/MJ700V2C.FAQ ${DOCDIR}/${MJC_DRV}
 
 .include "../../graphics/png/buildlink.mk"
-.include "../../japanese/vflib-lib/buildlink.mk"
+.include "../../print/ja-vflib-lib/buildlink.mk"
diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index 08c0112e19d..67d6f9e61e8 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:53 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/05/31 15:20:00 seb Exp $
 #
 
 DISTNAME=	htmllint
@@ -11,7 +11,7 @@ MAINTAINER=	kei@netbsd.org
 HOMEPAGE=	http://openlab.ring.gr.jp/k16/htmllint/
 COMMENT=	Another HTML-Lint program
 
-DEPENDS+=	p5-Jcode>=0.68:../../japanese/p5-Jcode
+DEPENDS+=	p5-Jcode>=0.68:../../converters/p5-Jcode
 
 USE_PERL5=	# defined
 WRKSRC=		${WRKDIR}