Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

12 files changed, 30 insertions, 11 deletions

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