Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

12 files changed, 36 insertions, 11 deletions

diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile
index 6034561fd95..0914c84c1e0 100644
--- a/inputmethod/canna-lib/Makefile
+++ b/inputmethod/canna-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/21 02:43:45 grant Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 19:22:55 jlam Exp $
 #
 
 DISTNAME=	Canna35b2
diff --git a/inputmethod/canna-lib/PLIST b/inputmethod/canna-lib/PLIST
index f0cc1a8f36e..7ca1aada58d 100644
--- a/inputmethod/canna-lib/PLIST
+++ b/inputmethod/canna-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/19 14:50:06 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:55 jlam Exp $
 include/canna/RK.h
 include/canna/jrkanji.h
 include/canna/keydef.h
diff --git a/inputmethod/canna-lib/buildlink.mk b/inputmethod/canna-lib/buildlink.mk
index af39a4ddfb2..3e4d6c67eb9 100644
--- a/inputmethod/canna-lib/buildlink.mk
+++ b/inputmethod/canna-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/06/10 09:47:26 sakamoto Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:22:55 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Canna.
 #
diff --git a/inputmethod/canna-lib/buildlink2.mk b/inputmethod/canna-lib/buildlink2.mk
new file mode 100644
index 00000000000..e2c72bc3bc7
--- /dev/null
+++ b/inputmethod/canna-lib/buildlink2.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:55 jlam Exp $
+
+.if !defined(CANNA_BUILDLINK2_MK)
+CANNA_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		canna
+BUILDLINK_DEPENDS.canna?=	Canna-lib>=3.5.2
+BUILDLINK_PKGSRCDIR.canna?=	../../inputmethod/canna-lib
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.canna=canna-lib
+BUILDLINK_PREFIX.canna_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.canna=		include/canna/RK.h
+BUILDLINK_FILES.canna+=		include/canna/jrkanji.h
+BUILDLINK_FILES.canna+=		include/canna/keydef.h
+BUILDLINK_FILES.canna+=		include/canna/mfdef.h
+BUILDLINK_FILES.canna+=		lib/libRKC.*
+BUILDLINK_FILES.canna+=		lib/libRKC16.*
+BUILDLINK_FILES.canna+=		lib/libcanna.*
+BUILDLINK_FILES.canna+=		lib/libcanna16.*
+
+BUILDLINK_TARGETS+=	canna-buildlink
+
+canna-buildlink: _BUILDLINK_USE
+
+.endif	# CANNA_BUILDLINK2_MK
diff --git a/inputmethod/canna-lib/distinfo b/inputmethod/canna-lib/distinfo
index 5ca3994463d..10f618fe040 100644
--- a/inputmethod/canna-lib/distinfo
+++ b/inputmethod/canna-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/06/10 09:47:26 sakamoto Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 19:22:55 jlam Exp $
 
 SHA1 (Uum4.109.tar.gz) = 9d57fa67fc321c0b1101970b02154b5d6e42e88e
 Size (Uum4.109.tar.gz) = 43738 bytes
diff --git a/inputmethod/canna-lib/files/canna b/inputmethod/canna-lib/files/canna
index 85805426efa..217450b09bf 100644
--- a/inputmethod/canna-lib/files/canna
+++ b/inputmethod/canna-lib/files/canna
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: canna,v 1.3 2002/08/07 07:43:32 jlam Exp $
+# $NetBSD: canna,v 1.4 2002/08/25 19:22:55 jlam Exp $
 #
 # PROVIDE: canna
 # REQUIRE: DAEMON
diff --git a/inputmethod/canna-lib/patches/patch-aa b/inputmethod/canna-lib/patches/patch-aa
index dfa2a82db89..0bac4477838 100644
--- a/inputmethod/canna-lib/patches/patch-aa
+++ b/inputmethod/canna-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/25 19:22:55 jlam Exp $
 
 --- Canna.conf-	Fri Dec  1 00:31:14 2000
 +++ Canna.conf	Fri Dec  1 00:31:36 2000
diff --git a/inputmethod/canna-lib/patches/patch-ab b/inputmethod/canna-lib/patches/patch-ab
index c1d037928cd..db67743b3e6 100644
--- a/inputmethod/canna-lib/patches/patch-ab
+++ b/inputmethod/canna-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/25 19:22:56 jlam Exp $
 
 --- ./Imakefile.orig	Wed Nov 27 16:01:34 1996
 +++ ./Imakefile	Fri Jul 30 19:17:44 1999
diff --git a/inputmethod/canna-lib/patches/patch-ac b/inputmethod/canna-lib/patches/patch-ac
index b2f546f1675..80fab924b54 100644
--- a/inputmethod/canna-lib/patches/patch-ac
+++ b/inputmethod/canna-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 19:22:56 jlam Exp $
 
 --- dic/phono/Imakefile.orig	Wed Nov 27 16:15:14 1996
 +++ dic/phono/Imakefile	Fri Jul 30 19:57:02 1999
diff --git a/inputmethod/canna-lib/patches/patch-ad b/inputmethod/canna-lib/patches/patch-ad
index bff1761c507..d626848cd63 100644
--- a/inputmethod/canna-lib/patches/patch-ad
+++ b/inputmethod/canna-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/25 19:22:56 jlam Exp $
 --- server/misc.c~	Fri Jul 29 12:03:54 1994
 +++ server/misc.c	Fri Jun 30 10:16:39 2000
 @@ -788,12 +788,19 @@
diff --git a/inputmethod/canna-lib/patches/patch-ae b/inputmethod/canna-lib/patches/patch-ae
index edb2e80708e..5763ca872b0 100644
--- a/inputmethod/canna-lib/patches/patch-ae
+++ b/inputmethod/canna-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 19:22:56 jlam Exp $
 
 PATCH_SITES+=	http://apps.v6.linux.or.jp/pub/Linux/IPv6-2/canna/
 PATCHFILES+=	Canna35b2-v6-20000602.diff.gz
diff --git a/inputmethod/canna-lib/patches/patch-af b/inputmethod/canna-lib/patches/patch-af
index e2aa18a8be7..2318a3f6d58 100644
--- a/inputmethod/canna-lib/patches/patch-af
+++ b/inputmethod/canna-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-af,v 1.3 2002/08/25 19:22:56 jlam Exp $
 
 --- lib/RKC/convert.c.orig	Wed May 22 22:02:57 1996
 +++ lib/RKC/convert.c