Give canna-lib (and canna-server) a nice dewey pkg-version, and fix

all depends to use it.

8 files changed, 17 insertions, 17 deletions

diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 3d8b8d93c69..7ff77260cd5 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/04/04 16:09:51 uebayasi Exp $
+# $NetBSD: Makefile,v 1.10 2002/04/05 23:44:41 wiz Exp $
 
 DISTNAME=	mule-2.3
 CATEGORIES=	editors
@@ -16,7 +16,7 @@ CONFLICTS=	emacs-[0-9]*
 DEPENDS+=	ja-FreeWnn-lib-1.10:../../japanese/freewnn-lib
 .endif
 .if !defined(USE_CANNA) || ${USE_CANNA} == YES
-DEPENDS+=	Canna-lib>=3.5b2:../../japanese/canna-lib
+DEPENDS+=	Canna-lib>=3.5.2:../../japanese/canna-lib
 .endif
 
 WRKSRC=		${WRKDIR}/mule
diff --git a/editors/ng/Makefile b/editors/ng/Makefile
index 5d1b0f97aa8..2dce4baa062 100644
--- a/editors/ng/Makefile
+++ b/editors/ng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/04/04 16:09:52 uebayasi Exp $
+# $NetBSD: Makefile,v 1.8 2002/04/05 23:44:41 wiz 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.5b2:../../japanese/canna-lib
+DEPENDS=	Canna-lib>=3.5.2:../../japanese/canna-lib
 .endif
 
 WRKSRC=         ${WRKDIR}/ng
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 911ed78629b..f26817762db 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/04/04 16:09:53 uebayasi Exp $
+# $NetBSD: Makefile,v 1.15 2002/04/05 23:44:41 wiz 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.5b2:../../japanese/canna-lib
+DEPENDS+=	Canna-lib>=3.5.2:../../japanese/canna-lib
 CONFIGURE_ARGS+=--enable-canna=${LOCALBASE}
 CANNA_OPT.euc-jp=canna cannactrl cannakey=
 CANNA_OPT.sjis=${CANNA_OPT.euc-jp}
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 3efcd3f0700..b130f8fbbd1 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/04/05 12:40:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2002/04/05 23:44:40 wiz Exp $
 #
 
 DISTNAME=	Canna35b2
-PKGNAME=	Canna-lib-3.5b2
+PKGNAME=	Canna-lib-3.5.2
 PKGREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna35/
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index c86070f7a53..d37ea10157c 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2002/02/28 13:26:03 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2002/04/05 23:44:39 wiz Exp $
 
 DISTNAME=	Canna35b2
-PKGNAME=	Canna-server-3.5b2
+PKGNAME=	Canna-server-3.5.2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna35/
 
@@ -14,7 +14,7 @@ MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://www.nec.co.jp/japanese/product/computer/soft/canna/
 COMMENT=	Kana-Kanji conversion system (server)
 
-DEPENDS+=	Canna-lib-3.5b2:../../japanese/canna-lib
+DEPENDS+=	Canna-lib>=3.5.2:../../japanese/canna-lib
 
 FILESDIR=	${.CURDIR}/../../japanese/canna-lib/files
 PATCHDIR=	${.CURDIR}/../../japanese/canna-lib/patches
diff --git a/japanese/canuum/Makefile b/japanese/canuum/Makefile
index 8ed13626054..ed221f7c5d6 100644
--- a/japanese/canuum/Makefile
+++ b/japanese/canuum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/04/04 16:09:54 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2002/04/05 23:44:40 wiz Exp $
 #
 
 DISTNAME=	canuum-1.0
@@ -11,7 +11,7 @@ MAINTAINER=	oishi@ims.ac.jp
 HOMEPAGE=	http://www.nec.co.jp/japanese/product/computer/soft/canna/
 COMMENT=	Japanese input tty frontend for Canna using uum
 
-DEPENDS=	Canna-lib>=3.5b2:../../japanese/canna-lib
+DEPENDS=	Canna-lib>=3.5.2:../../japanese/canna-lib
 
 MANLANG=	ja
 MAN1=		canuum.1
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 1e62f941bae..8f5835655d7 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 15:25:20 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/04/05 23:44:41 wiz Exp $
 # FreeBSD Id: Makefile,v 1.4 1999/06/06 13:19:49 taoka Exp $
 
 DISTNAME=	kinput2-v3
@@ -22,7 +22,7 @@ IGNORE=	${PKGNAME} is ignored. because USE_CANNA,USE_WNN4,USE_WNN6,USE_SJ3 are "
 .endif
 
 .if !defined(USE_CANNA) || ${USE_CANNA} == YES
-DEPENDS+=	Canna-lib-3.5b2:../../japanese/canna-lib
+DEPENDS+=	Canna-lib>=3.5.2:../../japanese/canna-lib
 KINPUT2_DEF+=	-DUseCanna -Dport_CANNASRC=${LOCALBASE}/include \
 		-Dport_CANNALIB="${LDFLAGS} -lcanna16"
 .endif
diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index 0f839ccc40f..91774b1f8f1 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/04/04 16:09:54 uebayasi Exp $
+# $NetBSD: Makefile,v 1.9 2002/04/05 23:44:40 wiz 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.5b2:../../japanese/canna-lib
+DEPENDS+=	Canna-lib>=3.5.2:../../japanese/canna-lib
 CONFIGURE_ARGS+=--with-canna=${LOCALBASE}
 
 do-install: