Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

7 files changed, 28 insertions, 8 deletions

diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index 60b77e9ec86..803ddcfa785 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 18:40:05 jlam Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
 
 DISTNAME=	kakasi-2.3.4
@@ -9,11 +9,11 @@ MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://kakasi.namazu.org/
 COMMENT=	Kanji-Kana Simple Inverter, language filter for Japanese
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/ja_JP.EUC/man1
diff --git a/textproc/kakasi/PLIST b/textproc/kakasi/PLIST
index e15c7e739c8..a3fc3bf2bfe 100644
--- a/textproc/kakasi/PLIST
+++ b/textproc/kakasi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 18:40:05 jlam Exp $
 bin/atoc_conv
 bin/kakasi
 bin/kakasi-config
diff --git a/textproc/kakasi/buildlink.mk b/textproc/kakasi/buildlink.mk
index 1d75a6d3f9c..962f35efb0b 100644
--- a/textproc/kakasi/buildlink.mk
+++ b/textproc/kakasi/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 18:40:05 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kakasi.
 #
diff --git a/textproc/kakasi/buildlink2.mk b/textproc/kakasi/buildlink2.mk
new file mode 100644
index 00000000000..7daea228a7e
--- /dev/null
+++ b/textproc/kakasi/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:06 jlam Exp $
+
+.if !defined(KAKASI_BUILDLINK2_MK)
+KAKASI_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		kakasi
+BUILDLINK_DEPENDS.kakasi?=	kakasi>=2.3.0
+BUILDLINK_PKGSRCDIR.kakasi?=	../../textproc/kakasi
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.kakasi=kakasi
+BUILDLINK_PREFIX.kakasi_DEFAULT=	${LOCALBASE}
+
+BUILDLINK_FILES.kakasi=		include/libkakasi.h
+BUILDLINK_FILES.kakasi+=	lib/libkakasi.*
+
+BUILDLINK_TARGETS+=	kakasi-buildlink
+
+kakasi-buildlink: _BUILDLINK_USE
+
+.endif	# KAKASI_BUILDLINK2_MK
diff --git a/textproc/kakasi/distinfo b/textproc/kakasi/distinfo
index 2fcdf44e6cf..bc455481dd9 100644
--- a/textproc/kakasi/distinfo
+++ b/textproc/kakasi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 18:40:06 jlam Exp $
 
 SHA1 (kakasi-2.3.4.tar.gz) = ab95a226f301955d2e8ae0d347afbb567e25fbe7
 Size (kakasi-2.3.4.tar.gz) = 1099258 bytes
diff --git a/textproc/kakasi/patches/patch-aa b/textproc/kakasi/patches/patch-aa
index d420c48f349..9597437ff37 100644
--- a/textproc/kakasi/patches/patch-aa
+++ b/textproc/kakasi/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 18:40:06 jlam Exp $
 
 --- lib/libkakasi.c.orig	Sun Sep  2 20:43:21 2001
 +++ lib/libkakasi.c
diff --git a/textproc/kakasi/patches/patch-ab b/textproc/kakasi/patches/patch-ab
index 368d9488c6f..2c65ffb7672 100644
--- a/textproc/kakasi/patches/patch-ab
+++ b/textproc/kakasi/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 18:40:06 jlam Exp $
 
 --- lib/libkakasi.h.orig	Mon Aug 27 11:11:56 2001
 +++ lib/libkakasi.h