Make Canna* packages use the buildlink framework. It will fix the

build problem reported by Yasushi Oshima on tech-pkg-ja@jp.NetBSD.org.

6 files changed, 57 insertions, 13 deletions

diff --git a/devel/nbitools/buildlink3.mk b/devel/nbitools/buildlink3.mk
new file mode 100644
index 00000000000..b3ef29f4b96
--- /dev/null
+++ b/devel/nbitools/buildlink3.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/05 19:09:22 minskim Exp $
+#
+# This Makefile fragment is included by packages that use nbitools.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+NBITOOLS_BUILDLINK3_MK:=	${NBITOOLS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	nbitools
+.endif
+
+.if !empty(NBITOOLS_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			nbitools
+BUILDLINK_DEPENDS.nbitools+=		nbitools>=6.3
+BUILDLINK_PKGSRCDIR.nbitools?=		../../devel/nbitools
+BUILDLINK_DEPMETHOD.nbitools?=		build
+
+BUILDLINK_FILES.nbitools+=	lib/itools/X11/config/*
+
+XMKMF_CMD=	${BUILDLINK_PREFIX.nbitools}/libexec/itools/xmkmf
+
+.endif # NBITOOLS_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/inputmethod/canna-canuum/Makefile b/inputmethod/canna-canuum/Makefile
index a94c328ee6b..93a8092b550 100644
--- a/inputmethod/canna-canuum/Makefile
+++ b/inputmethod/canna-canuum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/09/23 15:06:58 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/05 19:09:22 minskim Exp $
 #
 .include "../../inputmethod/canna/Makefile.common"
 
@@ -6,7 +6,7 @@ CANNA_MODULE=	canuum
 
 MAINTAINER=	oishi@ims.ac.jp
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
 do-configure:
@@ -33,6 +33,6 @@ post-install:
 	@${INSTALL_MAN} ${WRKSRC}/canuum/canuum.jmn \
 		${PREFIX}/man/ja_JP.EUC/man1/canuum.1
 
-.include "../../devel/nbitools/buildlink2.mk"
-.include "../../inputmethod/canna-lib/buildlink2.mk"
+.include "../../devel/nbitools/buildlink3.mk"
+.include "../../inputmethod/canna-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/canna-lib/buildlink3.mk b/inputmethod/canna-lib/buildlink3.mk
new file mode 100644
index 00000000000..c841002ee8d
--- /dev/null
+++ b/inputmethod/canna-lib/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/05 19:09:22 minskim Exp $
+#
+# This Makefile fragment is included by packages that use Canna-lib.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+CANNA_LIB_BUILDLINK3_MK:=	${CANNA_LIB_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	Canna-lib
+.endif
+
+.if !empty(CANNA_LIB_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			Canna-lib
+BUILDLINK_DEPENDS.Canna-lib+=		Canna-lib>=3.6pl3
+BUILDLINK_PKGSRCDIR.Canna-lib?=		../../inputmethod/canna-lib
+
+.endif # CANNA_LIB_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile
index 01395cceb10..5aeebe72230 100644
--- a/inputmethod/canna-server/Makefile
+++ b/inputmethod/canna-server/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/09/23 15:14:55 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/05 19:09:22 minskim Exp $
 #
 .include "../canna/Makefile.common"
 
 CANNA_MODULE=	server
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 INSTALL_TARGET=	instserver
 
 USE_PKGINSTALL=	YES
@@ -38,7 +38,7 @@ do-configure:
 post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/canna ${PREFIX}/etc/rc.d/canna
 
-.include "../../devel/nbitools/buildlink2.mk"
-.include "../../inputmethod/canna-lib/buildlink2.mk"
+.include "../../devel/nbitools/buildlink3.mk"
+.include "../../inputmethod/canna-lib/buildlink3.mk"
 
 .include "../canna/Makefile.include"
diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common
index ee72a9bab5b..652f6e7b84a 100644
--- a/inputmethod/canna/Makefile.common
+++ b/inputmethod/canna/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2003/09/23 15:06:57 uebayasi Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/03/05 19:09:22 minskim Exp $
 #
 # Canna common makefile.
 #
@@ -16,8 +16,7 @@ FILESDIR=	${.CURDIR}/../canna/files
 DISTINFO_FILE=	${.CURDIR}/../canna/distinfo
 PATCHDIR=	${.CURDIR}/../canna/patches
 
-# To be done.
-#USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 .include "../canna/Makefile.version"
 
diff --git a/inputmethod/canna/Makefile.include b/inputmethod/canna/Makefile.include
index e52f96aff52..c039eccab9f 100644
--- a/inputmethod/canna/Makefile.include
+++ b/inputmethod/canna/Makefile.include
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.include,v 1.1 2003/05/31 07:24:39 uebayasi Exp $
+# $NetBSD: Makefile.include,v 1.2 2004/03/05 19:09:22 minskim Exp $
 #
 
-.include "../../devel/nbitools/nbitools.mk"
+.include "../../devel/nbitools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"