diff options
-rw-r--r-- | devel/nbitools/Makefile | 6 | ||||
-rw-r--r-- | inputmethod/sj3-dict/Makefile | 8 | ||||
-rw-r--r-- | inputmethod/sj3-lib/Makefile | 8 | ||||
-rw-r--r-- | inputmethod/sj3-lib/buildlink3.mk | 21 | ||||
-rw-r--r-- | inputmethod/sj3-server-bin/Makefile | 10 |
5 files changed, 43 insertions, 10 deletions
diff --git a/devel/nbitools/Makefile b/devel/nbitools/Makefile index 2c7285ad986..0dd5054c7c6 100644 --- a/devel/nbitools/Makefile +++ b/devel/nbitools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/07/17 21:31:55 grant Exp $ +# $NetBSD: Makefile,v 1.3 2004/03/05 21:15:53 minskim Exp $ # DISTNAME= nbitools-R6.3 @@ -10,6 +10,10 @@ MAINTAINER= sakamoto@NetBSD.org HOMEPAGE= http://www.kitebird.com/imake-book/ COMMENT= imake and tools derived from NetBSD-current/xsrc +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= yes + ALL_TARGET= World MAKE_ENV+= GCCCMD=gcc diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile index dcbebb53bec..9a81269e3bd 100644 --- a/inputmethod/sj3-dict/Makefile +++ b/inputmethod/sj3-dict/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:43:43 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/03/05 21:23:00 minskim Exp $ # DISTNAME= sj3-2.0.1.20 @@ -17,6 +17,10 @@ FILESDIR= ${.CURDIR}/../sj3-lib/files DISTINFO_FILE= ${.CURDIR}/../sj3-lib/distinfo PATCHDIR= ${.CURDIR}/../sj3-lib/patches +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= yes + .include "../../mk/bsd.prefs.mk" NO_MTREE= YES @@ -53,7 +57,7 @@ post-build: do-install: @(cd ${WRKSRC}/dict/dict; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install) -.include "../../devel/nbitools/nbitools.mk" +.include "../../devel/nbitools/buildlink3.mk" .include "../../mk/bsd.pkg.mk" # Need to set this here _after_ bsd.pkg.mk diff --git a/inputmethod/sj3-lib/Makefile b/inputmethod/sj3-lib/Makefile index 026d860f7d6..d3ca5210f40 100644 --- a/inputmethod/sj3-lib/Makefile +++ b/inputmethod/sj3-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/17 21:43:44 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/03/05 21:23:00 minskim Exp $ # FreeBSD Id: Makefile,v 1.9 1998/11/28 05:08:27 asami Exp $ DISTNAME= sj3-2.0.1.20 @@ -11,7 +11,9 @@ MASTER_SITES= ftp://ftp.sony.co.jp/pub/unsupported/src/ \ MAINTAINER= tech-pkg-ja@jp.NetBSD.org COMMENT= Japanese input method (library) -USE_BUILDLINK2= YES +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= YES .include "../../mk/bsd.prefs.mk" @@ -25,5 +27,5 @@ pre-configure: do-configure: @(cd ${WRKSRC}; ${XMKMF_CMD}; ${MAKE} Makefiles) -.include "../../devel/nbitools/nbitools.mk" +.include "../../devel/nbitools/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/sj3-lib/buildlink3.mk b/inputmethod/sj3-lib/buildlink3.mk new file mode 100644 index 00000000000..99209eca2ca --- /dev/null +++ b/inputmethod/sj3-lib/buildlink3.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/03/05 21:23:00 minskim Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +SJ3_LIB_BUILDLINK3_MK:= ${SJ3_LIB_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= sj3-lib +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsj3-lib} +BUILDLINK_PACKAGES+= sj3-lib + +.if !empty(SJ3_LIB_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.sj3-lib+= sj3-lib>=2.0.1.20nb1 +BUILDLINK_PKGSRCDIR.sj3-lib?= ../../inputmethod/sj3-lib + +.include "../../devel/nbitools/buildlink3.mk" + +.endif # SJ3_LIB_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/inputmethod/sj3-server-bin/Makefile b/inputmethod/sj3-server-bin/Makefile index 62639e14440..70c8a901655 100644 --- a/inputmethod/sj3-server-bin/Makefile +++ b/inputmethod/sj3-server-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/03/02 17:49:51 minskim Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/05 21:23:00 minskim Exp $ # DISTNAME= sj3-2.0.1.20 @@ -14,7 +14,9 @@ COMMENT= Japanese input method (server binary) DISTINFO_FILE= ${.CURDIR}/../sj3-lib/distinfo PATCHDIR= ${.CURDIR}/../sj3-lib/patches -USE_BUILDLINK2= YES +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= YES USE_PKGINSTALL= YES .include "../../mk/bsd.prefs.mk" @@ -44,6 +46,6 @@ pre-configure: do-configure: @(cd ${WRKSRC}; ${XMKMF_CMD}; ${MAKE} Makefiles) -.include "../../devel/nbitools/nbitools.mk" -.include "../../inputmethod/sj3-lib/buildlink2.mk" +.include "../../devel/nbitools/buildlink3.mk" +.include "../../inputmethod/sj3-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |