Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

15 files changed, 43 insertions, 14 deletions

diff --git a/inputmethod/ja-freewnn-lib/Makefile b/inputmethod/ja-freewnn-lib/Makefile
index a5cda3ab4bc..c726e208651 100644
--- a/inputmethod/ja-freewnn-lib/Makefile
+++ b/inputmethod/ja-freewnn-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/10 10:03:33 sakamoto Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 19:22:56 jlam Exp $
 #
 
 PKGNAME=	ja-FreeWnn-lib-1.10
diff --git a/inputmethod/ja-freewnn-lib/Makefile.common b/inputmethod/ja-freewnn-lib/Makefile.common
index 289633f9c37..e544ee6896b 100644
--- a/inputmethod/ja-freewnn-lib/Makefile.common
+++ b/inputmethod/ja-freewnn-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2002/06/10 10:03:33 sakamoto Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/08/25 19:22:56 jlam Exp $
 #
 
 DISTNAME=	FreeWnn-1.10
diff --git a/inputmethod/ja-freewnn-lib/PLIST b/inputmethod/ja-freewnn-lib/PLIST
index d7bfe5d3256..493056815bc 100644
--- a/inputmethod/ja-freewnn-lib/PLIST
+++ b/inputmethod/ja-freewnn-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/20 08:55:50 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:56 jlam Exp $
 include/wnn/commonhd.h
 include/wnn/config.h
 include/wnn/cplib.h
diff --git a/inputmethod/ja-freewnn-lib/buildlink.mk b/inputmethod/ja-freewnn-lib/buildlink.mk
index 2c1dcef53ac..3a9eb3f178e 100644
--- a/inputmethod/ja-freewnn-lib/buildlink.mk
+++ b/inputmethod/ja-freewnn-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/06/10 10:03:33 sakamoto Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:22:57 jlam Exp $
 #
 # This Makefile fragment is included by packages that use FreeWnn.
 #
diff --git a/inputmethod/ja-freewnn-lib/buildlink2.mk b/inputmethod/ja-freewnn-lib/buildlink2.mk
new file mode 100644
index 00000000000..a40f98ca680
--- /dev/null
+++ b/inputmethod/ja-freewnn-lib/buildlink2.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:57 jlam Exp $
+
+.if !defined(JA_FREEWNN_BUILDLINK2_MK)
+JA_FREEWNN_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			ja-freewnn
+BUILDLINK_DEPENDS.ja-freewnn?=		ja-FreeWnn-lib>=1.10
+BUILDLINK_PKGSRCDIR.ja-freewnn?=	../../inputmethod/ja-freewnn-lib
+BUILDLINK_DEPMETHOD.ja-freewnn?=	build
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.ja-freewnn=ja-FreeWnn-lib
+BUILDLINK_PREFIX.ja-freewnn_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.ja-freewnn=		include/wnn/commonhd.h
+BUILDLINK_FILES.ja-freewnn+=		include/wnn/config.h
+BUILDLINK_FILES.ja-freewnn+=		include/wnn/cplib.h
+BUILDLINK_FILES.ja-freewnn+=		include/wnn/jlib.h
+BUILDLINK_FILES.ja-freewnn+=		include/wnn/jllib.h
+BUILDLINK_FILES.ja-freewnn+=		include/wnn/jslib.h
+BUILDLINK_FILES.ja-freewnn+=		include/wnn/msg.h
+BUILDLINK_FILES.ja-freewnn+=		include/wnn/rk_spclval.h
+BUILDLINK_FILES.ja-freewnn+=		include/wnn/wnnerror.h
+BUILDLINK_FILES.ja-freewnn+=		lib/libjd.a
+BUILDLINK_FILES.ja-freewnn+=		lib/libwnn.a
+
+BUILDLINK_TARGETS+=	ja-freewnn-buildlink
+
+ja-freewnn-buildlink: _BUILDLINK_USE
+
+.endif	# JA_FREEWNN_BUILDLINK2_MK
diff --git a/inputmethod/ja-freewnn-lib/distinfo b/inputmethod/ja-freewnn-lib/distinfo
index 75572f269cf..1e6cd0349ea 100644
--- a/inputmethod/ja-freewnn-lib/distinfo
+++ b/inputmethod/ja-freewnn-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/06/20 08:55:50 sakamoto Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:22:57 jlam Exp $
 
 SHA1 (freewnn/FreeWnn-1.10.tar.gz) = 66a0640d4632d82b7012c4aa2239bc1d69d45034
 Size (freewnn/FreeWnn-1.10.tar.gz) = 3468613 bytes
diff --git a/inputmethod/ja-freewnn-lib/files/ja_freewnn b/inputmethod/ja-freewnn-lib/files/ja_freewnn
index 5a18d42b898..f366934f0bf 100644
--- a/inputmethod/ja-freewnn-lib/files/ja_freewnn
+++ b/inputmethod/ja-freewnn-lib/files/ja_freewnn
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ja_freewnn,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+# $NetBSD: ja_freewnn,v 1.3 2002/08/25 19:22:57 jlam Exp $
 #
 # PROVIDE: freewnn
 # REQUIRE: DAEMON
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-aa b/inputmethod/ja-freewnn-lib/patches/patch-aa
index 9532a4477c7..7112da6d6f4 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-aa
+++ b/inputmethod/ja-freewnn-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/06/20 08:55:51 sakamoto Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:57 jlam Exp $
 
 --- Wnn/Makefile.in.orig	Tue Mar 23 21:10:52 1999
 +++ Wnn/Makefile.in	Mon May 20 03:04:12 2002
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ab b/inputmethod/ja-freewnn-lib/patches/patch-ab
index 4e6e14ef891..1195996f40a 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ab
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/25 19:22:57 jlam Exp $
 
 --- cWnn/Makefile.in.orig	Tue Mar 23 21:13:41 1999
 +++ cWnn/Makefile.in	Mon May 20 03:07:33 2002
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ac b/inputmethod/ja-freewnn-lib/patches/patch-ac
index d57db9e35bf..9bd6e88f9db 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ac
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 19:22:58 jlam Exp $
 
 --- kWnn/Makefile.in.orig	Tue Mar 23 21:14:47 1999
 +++ kWnn/Makefile.in	Mon May 20 03:07:57 2002
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ad b/inputmethod/ja-freewnn-lib/patches/patch-ad
index e273844e30e..350c48a86b8 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ad
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/25 19:22:58 jlam Exp $
 
 --- configure.in.orig	Tue Apr  6 12:12:19 1999
 +++ configure.in
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ae b/inputmethod/ja-freewnn-lib/patches/patch-ae
index 22ab7ab95db..56736b5f9f0 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ae
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 19:22:58 jlam Exp $
 
 --- configure.orig	Tue Apr  6 12:12:18 1999
 +++ configure
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-af b/inputmethod/ja-freewnn-lib/patches/patch-af
index e15da02256b..7e64c973036 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-af
+++ b/inputmethod/ja-freewnn-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-af,v 1.3 2002/08/25 19:22:58 jlam Exp $
 
 --- ./Makefile.in.orig	Tue Mar 23 21:10:39 1999
 +++ ./Makefile.in	Thu Sep  2 14:57:48 1999
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ag b/inputmethod/ja-freewnn-lib/patches/patch-ag
index 69702a67fc3..269ea7d2ae1 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ag
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-ag,v 1.3 2002/08/25 19:22:58 jlam Exp $
 
 --- Wnn/jlib/js.c.orig	Mon May 17 12:04:45 1999
 +++ Wnn/jlib/js.c	Wed Sep 22 18:37:26 1999
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ah b/inputmethod/ja-freewnn-lib/patches/patch-ah
index db230295e0a..fe66e5d936f 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ah
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2002/06/20 08:55:51 sakamoto Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/25 19:22:58 jlam Exp $
 
 --- Wnn/jd/Makefile.in.orig	Tue Mar 23 21:11:01 1999
 +++ Wnn/jd/Makefile.in