From efb93b17bd48d49105d00f52887445a53f7cd60b Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 25 Aug 2002 19:21:43 +0000
Subject: Merge changes in packages from the buildlink2 branch that have
 buildlink2.mk files back into the main trunk.

---
 inputmethod/libtabe/Makefile         |  2 +-
 inputmethod/libtabe/PLIST            |  2 +-
 inputmethod/libtabe/buildlink.mk     |  2 +-
 inputmethod/libtabe/buildlink2.mk    | 21 +++++++++++++++++++++
 inputmethod/libtabe/distinfo         |  2 +-
 inputmethod/libtabe/patches/patch-aa |  2 +-
 6 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 inputmethod/libtabe/buildlink2.mk

(limited to 'inputmethod/libtabe')

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
-- 
cgit v1.2.3