[pkgsrc/trunk]: pkgsrc Make Canna* packages use the buildlink framework. It ...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0a605f29777
branches:  trunk
changeset: 470047:d0a605f29777
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Fri Mar 05 19:09:22 2004 +0000

description:
Make Canna* packages use the buildlink framework.  It will fix the
build problem reported by Yasushi Oshima on tech-pkg-ja%jp.NetBSD.org@localhost.

diffstat:

 devel/nbitools/buildlink3.mk        |  25 +++++++++++++++++++++++++
 inputmethod/canna-canuum/Makefile   |   8 ++++----
 inputmethod/canna-lib/buildlink3.mk |  20 ++++++++++++++++++++
 inputmethod/canna-server/Makefile   |   8 ++++----
 inputmethod/canna/Makefile.common   |   5 ++---
 inputmethod/canna/Makefile.include  |   4 ++--
 6 files changed, 57 insertions(+), 13 deletions(-)

diffs (136 lines):

diff -r 58f2f2ffbaec -r d0a605f29777 devel/nbitools/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nbitools/buildlink3.mk      Fri Mar 05 19:09:22 2004 +0000
@@ -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 -r 58f2f2ffbaec -r d0a605f29777 inputmethod/canna-canuum/Makefile
--- a/inputmethod/canna-canuum/Makefile Fri Mar 05 19:04:30 2004 +0000
+++ b/inputmethod/canna-canuum/Makefile Fri Mar 05 19:09:22 2004 +0000
@@ -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 @@
 
 MAINTAINER=    oishi%ims.ac.jp@localhost
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 MAKE_ARGS+=    PREFIX=${PREFIX}
 
 do-configure:
@@ -33,6 +33,6 @@
        @${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 -r 58f2f2ffbaec -r d0a605f29777 inputmethod/canna-lib/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/canna-lib/buildlink3.mk       Fri Mar 05 19:09:22 2004 +0000
@@ -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 -r 58f2f2ffbaec -r d0a605f29777 inputmethod/canna-server/Makefile
--- a/inputmethod/canna-server/Makefile Fri Mar 05 19:04:30 2004 +0000
+++ b/inputmethod/canna-server/Makefile Fri Mar 05 19:09:22 2004 +0000
@@ -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 @@
 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 -r 58f2f2ffbaec -r d0a605f29777 inputmethod/canna/Makefile.common
--- a/inputmethod/canna/Makefile.common Fri Mar 05 19:04:30 2004 +0000
+++ b/inputmethod/canna/Makefile.common Fri Mar 05 19:09:22 2004 +0000
@@ -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 @@
 DISTINFO_FILE= ${.CURDIR}/../canna/distinfo
 PATCHDIR=      ${.CURDIR}/../canna/patches
 
-# To be done.
-#USE_BUILDLINK2=       # defined
+USE_BUILDLINK3=        # defined
 
 .include "../canna/Makefile.version"
 
diff -r 58f2f2ffbaec -r d0a605f29777 inputmethod/canna/Makefile.include
--- a/inputmethod/canna/Makefile.include        Fri Mar 05 19:04:30 2004 +0000
+++ b/inputmethod/canna/Makefile.include        Fri Mar 05 19:09:22 2004 +0000
@@ -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"