From 331ffdeb8a7d96b647b18652d47b91736e057575 Mon Sep 17 00:00:00 2001
From: seb <seb>
Date: Fri, 31 May 2002 15:19:55 +0000
Subject: Adjust various pathnames to use newly reimported packages from the
 japanese category. This is part of the japanese category retirement.

---
 editors/mule/Makefile           | 6 +++---
 editors/ng/Makefile             | 4 ++--
 editors/nvi-m17n/Makefile       | 4 ++--
 editors/xemacs-current/Makefile | 4 ++--
 editors/xemacs/Makefile         | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'editors')

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
-- 
cgit v1.2.3