summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorjlam <jlam>2002-08-25 19:21:43 +0000
committerjlam <jlam>2002-08-25 19:21:43 +0000
commit3d80364aa7d569b8fa9e6f1069f1c94550179218 (patch)
treec69c41be2f3b44bedceeee7e348c2ae58c476c6a /inputmethod
parent3bff324aa681cfea59a4a20f4bdd9520a4707593 (diff)
downloadpkgsrc-3d80364aa7d569b8fa9e6f1069f1c94550179218.tar.gz
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/canna-lib/Makefile2
-rw-r--r--inputmethod/canna-lib/PLIST2
-rw-r--r--inputmethod/canna-lib/buildlink.mk2
-rw-r--r--inputmethod/canna-lib/buildlink2.mk25
-rw-r--r--inputmethod/canna-lib/distinfo2
-rw-r--r--inputmethod/canna-lib/files/canna2
-rw-r--r--inputmethod/canna-lib/patches/patch-aa2
-rw-r--r--inputmethod/canna-lib/patches/patch-ab2
-rw-r--r--inputmethod/canna-lib/patches/patch-ac2
-rw-r--r--inputmethod/canna-lib/patches/patch-ad2
-rw-r--r--inputmethod/canna-lib/patches/patch-ae2
-rw-r--r--inputmethod/canna-lib/patches/patch-af2
-rw-r--r--inputmethod/ja-freewnn-lib/Makefile2
-rw-r--r--inputmethod/ja-freewnn-lib/Makefile.common2
-rw-r--r--inputmethod/ja-freewnn-lib/PLIST2
-rw-r--r--inputmethod/ja-freewnn-lib/buildlink.mk2
-rw-r--r--inputmethod/ja-freewnn-lib/buildlink2.mk29
-rw-r--r--inputmethod/ja-freewnn-lib/distinfo2
-rw-r--r--inputmethod/ja-freewnn-lib/files/ja_freewnn2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-aa2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ab2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ac2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ad2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ae2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-af2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ag2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ah2
-rw-r--r--inputmethod/libtabe/Makefile2
-rw-r--r--inputmethod/libtabe/PLIST2
-rw-r--r--inputmethod/libtabe/buildlink.mk2
-rw-r--r--inputmethod/libtabe/buildlink2.mk21
-rw-r--r--inputmethod/libtabe/distinfo2
-rw-r--r--inputmethod/libtabe/patches/patch-aa2
-rw-r--r--inputmethod/sj3-lib/Makefile2
-rw-r--r--inputmethod/sj3-lib/PLIST2
-rw-r--r--inputmethod/sj3-lib/buildlink.mk2
-rw-r--r--inputmethod/sj3-lib/buildlink2.mk19
-rw-r--r--inputmethod/sj3-lib/distinfo2
-rw-r--r--inputmethod/sj3-lib/patches/patch-aa2
-rw-r--r--inputmethod/sj3-lib/patches/patch-ab2
-rw-r--r--inputmethod/sj3-lib/patches/patch-ac2
-rw-r--r--inputmethod/sj3-lib/patches/patch-ad2
-rw-r--r--inputmethod/sj3-lib/patches/patch-ae2
-rw-r--r--inputmethod/sj3-lib/patches/patch-af2
-rw-r--r--inputmethod/sj3-lib/patches/patch-ag2
45 files changed, 135 insertions, 41 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
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
diff --git a/inputmethod/libtabe/Makefile b/inputmethod/libtabe/Makefile
index ca51ca55d9b..8b753a503a0 100644
--- a/inputmethod/libtabe/Makefile
+++ b/inputmethod/libtabe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/04 08:31:10 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 19:22:59 jlam Exp $
#
DISTNAME= libtabe-0.2.5
diff --git a/inputmethod/libtabe/PLIST b/inputmethod/libtabe/PLIST
index b120a0c1046..98ffcb37bee 100644
--- a/inputmethod/libtabe/PLIST
+++ b/inputmethod/libtabe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/04 08:31:10 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:22:59 jlam Exp $
bin/tsiadd
bin/tsidel
bin/tsidump
diff --git a/inputmethod/libtabe/buildlink.mk b/inputmethod/libtabe/buildlink.mk
index 47d4f93e5bc..4c43c4c5aac 100644
--- a/inputmethod/libtabe/buildlink.mk
+++ b/inputmethod/libtabe/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/06/04 16:12:04 cjep Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:59 jlam Exp $
#
# This Makefile fragment is included by packages that use libtabe.
#
diff --git a/inputmethod/libtabe/buildlink2.mk b/inputmethod/libtabe/buildlink2.mk
new file mode 100644
index 00000000000..75532c90075
--- /dev/null
+++ b/inputmethod/libtabe/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:59 jlam Exp $
+
+.if !defined(LIBTABE_BUILDLINK2_MK)
+LIBTABE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libtabe
+BUILDLINK_DEPENDS.libtabe?= libtabe>=0.2.5
+BUILDLINK_PKGSRCDIR.libtabe?= ../../inputmethod/libtabe
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libtabe=libtabe
+BUILDLINK_PREFIX.libtabe_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libtabe= include/bims.h
+BUILDLINK_FILES.libtabe+= include/tabe.h
+BUILDLINK_FILES.libtabe+= lib/libbims.*
+BUILDLINK_FILES.libtabe+= lib/libtabe.*
+
+BUILDLINK_TARGETS+= libtabe-buildlink
+
+libtabe-buildlink: _BUILDLINK_USE
+
+.endif # LIBTABE_BUILDLINK2_MK
diff --git a/inputmethod/libtabe/distinfo b/inputmethod/libtabe/distinfo
index e101c3f74fd..dd636fd0c7b 100644
--- a/inputmethod/libtabe/distinfo
+++ b/inputmethod/libtabe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/04 08:31:10 uebayasi Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 19:22:59 jlam Exp $
SHA1 (libtabe-0.2.5.tar.gz) = 487f3b34fa6e560c4baad5ac37af509f2850bc82
Size (libtabe-0.2.5.tar.gz) = 1615825 bytes
diff --git a/inputmethod/libtabe/patches/patch-aa b/inputmethod/libtabe/patches/patch-aa
index 929701f77bc..a2167627fc4 100644
--- a/inputmethod/libtabe/patches/patch-aa
+++ b/inputmethod/libtabe/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/04 08:31:11 uebayasi Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:22:59 jlam Exp $
--- configure.orig Tue Dec 4 23:05:00 2001
+++ configure Fri Dec 7 23:17:32 2001
diff --git a/inputmethod/sj3-lib/Makefile b/inputmethod/sj3-lib/Makefile
index d7d782eee35..41440d6e483 100644
--- a/inputmethod/sj3-lib/Makefile
+++ b/inputmethod/sj3-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/10 10:21:25 sakamoto Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 19:23:00 jlam Exp $
# FreeBSD Id: Makefile,v 1.9 1998/11/28 05:08:27 asami Exp $
DISTNAME= sj3-2.0.1.20
diff --git a/inputmethod/sj3-lib/PLIST b/inputmethod/sj3-lib/PLIST
index ccf66d2a1cf..7eba911f0b8 100644
--- a/inputmethod/sj3-lib/PLIST
+++ b/inputmethod/sj3-lib/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/10 10:21:25 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 19:23:00 jlam Exp $
include/sj3lib.h
lib/libsj3lib.a
diff --git a/inputmethod/sj3-lib/buildlink.mk b/inputmethod/sj3-lib/buildlink.mk
index f7724f79aff..e85d7896202 100644
--- a/inputmethod/sj3-lib/buildlink.mk
+++ b/inputmethod/sj3-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/06/10 10:21:25 sakamoto Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:23:00 jlam Exp $
#
# This Makefile fragment is included by packages that use sj3.
#
diff --git a/inputmethod/sj3-lib/buildlink2.mk b/inputmethod/sj3-lib/buildlink2.mk
new file mode 100644
index 00000000000..5585a1e630f
--- /dev/null
+++ b/inputmethod/sj3-lib/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:00 jlam Exp $
+
+.if !defined(SJ3_BUILDLINK2_MK)
+SJ3_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= sj3-lib
+BUILDLINK_DEPENDS.sj3?= sj3-lib>=2.0.1.20nb1
+BUILDLINK_PKGSRCDIR.sj3?= ../../inputmethod/sj3-lib
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.sj3=sj3-lib
+BUILDLINK_PREFIX.sj3_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.sj3= include/sj3lib.h
+BUILDLINK_FILES.sj3+= lib/libsj3lib.a
+
+BUILDLINK_TARGETS+= sj3-buildlink
+
+sj3-buildlink: _BUILDLINK_USE
+
+.endif # SJ3_BUILDLINK2_MK
diff --git a/inputmethod/sj3-lib/distinfo b/inputmethod/sj3-lib/distinfo
index 236f55c3819..fc2a6878755 100644
--- a/inputmethod/sj3-lib/distinfo
+++ b/inputmethod/sj3-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/06/10 10:21:25 sakamoto Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 19:23:00 jlam Exp $
SHA1 (sj3-2.0.1.20.tar.gz) = b1cae59065ebc9caf5e198143ceb9558c932f259
Size (sj3-2.0.1.20.tar.gz) = 584065 bytes
diff --git a/inputmethod/sj3-lib/patches/patch-aa b/inputmethod/sj3-lib/patches/patch-aa
index 2aa679cf098..0df186640be 100644
--- a/inputmethod/sj3-lib/patches/patch-aa
+++ b/inputmethod/sj3-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/25 19:23:01 jlam Exp $
diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms ./doc/doc/sj3lib.ms
*** ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms Fri Jun 3 17:00:49 1994
diff --git a/inputmethod/sj3-lib/patches/patch-ab b/inputmethod/sj3-lib/patches/patch-ab
index 12bf413f114..6c976890d62 100644
--- a/inputmethod/sj3-lib/patches/patch-ab
+++ b/inputmethod/sj3-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- include/Const.h.orig Thu Jan 23 12:20:52 1997
+++ include/Const.h Wed Dec 8 10:33:54 1999
diff --git a/inputmethod/sj3-lib/patches/patch-ac b/inputmethod/sj3-lib/patches/patch-ac
index 0e18e8002d9..3357d7d607c 100644
--- a/inputmethod/sj3-lib/patches/patch-ac
+++ b/inputmethod/sj3-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- dict/dict/Imakefile.~1~ Thu Jan 23 20:20:51 1997
+++ dict/dict/Imakefile Tue Aug 18 10:51:14 1998
diff --git a/inputmethod/sj3-lib/patches/patch-ad b/inputmethod/sj3-lib/patches/patch-ad
index 80ab4563265..4f0bef831da 100644
--- a/inputmethod/sj3-lib/patches/patch-ad
+++ b/inputmethod/sj3-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- sj3.tmpl.orig Thu Jan 23 20:20:58 1997
+++ sj3.tmpl Fri Jul 30 20:27:08 1999
diff --git a/inputmethod/sj3-lib/patches/patch-ae b/inputmethod/sj3-lib/patches/patch-ae
index 1e6ece5eebb..4ab7f251130 100644
--- a/inputmethod/sj3-lib/patches/patch-ae
+++ b/inputmethod/sj3-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- include/Paths.h.in.orig Thu Jan 23 20:20:57 1997
+++ include/Paths.h.in Tue Aug 18 11:29:00 1998
diff --git a/inputmethod/sj3-lib/patches/patch-af b/inputmethod/sj3-lib/patches/patch-af
index 63be34b9ba5..d7fa53c12da 100644
--- a/inputmethod/sj3-lib/patches/patch-af
+++ b/inputmethod/sj3-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-af,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- server/main.c.orig Mon Mar 23 19:48:03 1998
+++ server/main.c Mon Aug 2 19:26:45 1999
diff --git a/inputmethod/sj3-lib/patches/patch-ag b/inputmethod/sj3-lib/patches/patch-ag
index f91171ba3b0..eeb7cfb89ce 100644
--- a/inputmethod/sj3-lib/patches/patch-ag
+++ b/inputmethod/sj3-lib/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-ag,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- server/setup.c.orig Mon May 7 12:15:08 2001
+++ server/setup.c Mon May 7 12:50:19 2001