Simply and speed up buildlink3.mk files and processing.

This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.

13 files changed, 78 insertions, 170 deletions

diff --git a/inputmethod/anthy/buildlink3.mk b/inputmethod/anthy/buildlink3.mk
index f3e08c96604..550d3164be7 100644
--- a/inputmethod/anthy/buildlink3.mk
+++ b/inputmethod/anthy/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2007/01/20 17:11:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:46 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ANTHY_BUILDLINK3_MK:=	${ANTHY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	anthy
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	anthy
-.endif
+.if !defined(ANTHY_BUILDLINK3_MK)
+ANTHY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nanthy}
-BUILDLINK_PACKAGES+=	anthy
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}anthy
-
-.if !empty(ANTHY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.anthy+=	anthy>=6300
 BUILDLINK_ABI_DEPENDS.anthy?=	anthy>=7900
 BUILDLINK_PKGSRCDIR.anthy?=	../../inputmethod/anthy
-.endif  # ANTHY_BUILDLINK3_MK
+.endif # ANTHY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-anthy
diff --git a/inputmethod/canna-lib/buildlink3.mk b/inputmethod/canna-lib/buildlink3.mk
index 53987a7e016..b840c1510e5 100644
--- a/inputmethod/canna-lib/buildlink3.mk
+++ b/inputmethod/canna-lib/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:46 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CANNA_LIB_BUILDLINK3_MK:=	${CANNA_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Canna-lib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Canna-lib
-.endif
+.if !defined(CANNA_LIB_BUILDLINK3_MK)
+CANNA_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NCanna-lib}
-BUILDLINK_PACKAGES+=	Canna-lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Canna-lib
-
-.if !empty(CANNA_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Canna-lib+=	Canna-lib>=3.6pl4
 BUILDLINK_PKGSRCDIR.Canna-lib?=	../../inputmethod/canna-lib
+.endif # CANNA_LIB_BUILDLINK3_MK
 
-.endif	# CANNA_LIB_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Canna-lib
diff --git a/inputmethod/ja-freewnn-lib/buildlink3.mk b/inputmethod/ja-freewnn-lib/buildlink3.mk
index 169178c6b31..74bec913f11 100644
--- a/inputmethod/ja-freewnn-lib/buildlink3.mk
+++ b/inputmethod/ja-freewnn-lib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:46 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-JA_FREEWNN_LIB_BUILDLINK3_MK:=	${JA_FREEWNN_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ja-FreeWnn-lib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ja-FreeWnn-lib
-.endif
+.if !defined(JA_FREEWNN_LIB_BUILDLINK3_MK)
+JA_FREEWNN_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nja-FreeWnn-lib}
-BUILDLINK_PACKAGES+=	ja-FreeWnn-lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ja-FreeWnn-lib
-
-.if !empty(JA_FREEWNN_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ja-FreeWnn-lib+=	ja-FreeWnn-lib>=1.10nb3
 BUILDLINK_PKGSRCDIR.ja-FreeWnn-lib?=	../../inputmethod/ja-freewnn-lib
 BUILDLINK_DEPMETHOD.ja-freewnn?=	build
-.endif	# JA_FREEWNN_LIB_BUILDLINK3_MK
+.endif # JA_FREEWNN_LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ja-FreeWnn-lib
diff --git a/inputmethod/libchewing/buildlink3.mk b/inputmethod/libchewing/buildlink3.mk
index 9cdff8f04b8..600a3763a6a 100644
--- a/inputmethod/libchewing/buildlink3.mk
+++ b/inputmethod/libchewing/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:46 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBCHEWING_BUILDLINK3_MK:=	${LIBCHEWING_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libchewing
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libchewing
-.endif
+.if !defined(LIBCHEWING_BUILDLINK3_MK)
+LIBCHEWING_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibchewing}
-BUILDLINK_PACKAGES+=	libchewing
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libchewing
-
-.if !empty(LIBCHEWING_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libchewing+=		libchewing>=0.2.7
 BUILDLINK_ABI_DEPENDS.libchewing+=	libchewing>=0.2.7
 BUILDLINK_PKGSRCDIR.libchewing?=	../../inputmethod/libchewing
-.endif	# LIBCHEWING_BUILDLINK3_MK
+.endif # LIBCHEWING_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libchewing
diff --git a/inputmethod/libhangul/buildlink3.mk b/inputmethod/libhangul/buildlink3.mk
index 4914eb36731..127beadcfe2 100644
--- a/inputmethod/libhangul/buildlink3.mk
+++ b/inputmethod/libhangul/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/05/09 17:29:39 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBHANGUL_BUILDLINK3_MK:=	${LIBHANGUL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libhangul
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libhangul
-.endif
+.if !defined(LIBHANGUL_BUILDLINK3_MK)
+LIBHANGUL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibhangul}
-BUILDLINK_PACKAGES+=	libhangul
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libhangul
-
-.if ${LIBHANGUL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libhangul+=	libhangul>=0.0.4
 BUILDLINK_PKGSRCDIR.libhangul?=	../../inputmethod/libhangul
-.endif	# LIBHANGUL_BUILDLINK3_MK
+.endif # LIBHANGUL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libhangul
diff --git a/inputmethod/libtabe/buildlink3.mk b/inputmethod/libtabe/buildlink3.mk
index f8d86c4b4e4..e45ecb8da32 100644
--- a/inputmethod/libtabe/buildlink3.mk
+++ b/inputmethod/libtabe/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:47 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBTABE_BUILDLINK3_MK:=	${LIBTABE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtabe
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libtabe
-.endif
+.if !defined(LIBTABE_BUILDLINK3_MK)
+LIBTABE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtabe}
-BUILDLINK_PACKAGES+=	libtabe
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtabe
-
-.if !empty(LIBTABE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtabe+=	libtabe>=0.2.5
 BUILDLINK_ABI_DEPENDS.libtabe+=	libtabe>=0.2.5nb2
 BUILDLINK_PKGSRCDIR.libtabe?=	../../inputmethod/libtabe
-.endif	# LIBTABE_BUILDLINK3_MK
 
 .include "../../databases/db3/buildlink3.mk"
+.endif # LIBTABE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtabe
diff --git a/inputmethod/m17n-im-config/buildlink3.mk b/inputmethod/m17n-im-config/buildlink3.mk
index 363e590b8e3..1065a7e43b2 100644
--- a/inputmethod/m17n-im-config/buildlink3.mk
+++ b/inputmethod/m17n-im-config/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/27 14:07:46 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-M17N_IM_CONFIG_BUILDLINK3_MK:=	${M17N_IM_CONFIG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	m17n-im-config
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	m17n-im-config
-.endif
+.if !defined(M17N_IM_CONFIG_BUILDLINK3_MK)
+M17N_IM_CONFIG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nm17n-im-config}
-BUILDLINK_PACKAGES+=	m17n-im-config
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}m17n-im-config
-
-.if ${M17N_IM_CONFIG_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.m17n-im-config+=	m17n-im-config>=0.9.0
 BUILDLINK_PKGSRCDIR.m17n-im-config?=	../../inputmethod/m17n-im-config
-.endif	# M17N_IM_CONFIG_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/m17n-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # M17N_IM_CONFIG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-m17n-im-config
diff --git a/inputmethod/prime/buildlink3.mk b/inputmethod/prime/buildlink3.mk
index 76f06acfe85..dbe8a1344b0 100644
--- a/inputmethod/prime/buildlink3.mk
+++ b/inputmethod/prime/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/02 02:49:45 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:47 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PRIME_BUILDLINK3_MK:=	${PRIME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	prime
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	prime
-.endif
+.if !defined(PRIME_BUILDLINK3_MK)
+PRIME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nprime}
-BUILDLINK_PACKAGES+=	prime
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}prime
-
-.if ${PRIME_BUILDLINK3_MK} == "+"
 .include "../../lang/ruby/rubyversion.mk"
 BUILDLINK_API_DEPENDS.prime+=	${RUBY_PKGPREFIX}-prime>=1.0.0.1
 BUILDLINK_PKGSRCDIR.prime?=	../../inputmethod/prime
-.endif	# PRIME_BUILDLINK3_MK
+.endif # PRIME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-prime
diff --git a/inputmethod/sj3-lib/buildlink3.mk b/inputmethod/sj3-lib/buildlink3.mk
index 5a89e9875e2..74b8f604442 100644
--- a/inputmethod/sj3-lib/buildlink3.mk
+++ b/inputmethod/sj3-lib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SJ3_LIB_BUILDLINK3_MK:=	${SJ3_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sj3-lib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sj3-lib
-.endif
+.if !defined(SJ3_LIB_BUILDLINK3_MK)
+SJ3_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsj3-lib}
-BUILDLINK_PACKAGES+=	sj3-lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sj3-lib
-
-.if !empty(SJ3_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sj3-lib+=	sj3-lib>=2.0.1.20nb1
 BUILDLINK_PKGSRCDIR.sj3-lib?=	../../inputmethod/sj3-lib
 BUILDLINK_DEPMETHOD.sj3-lib?=	build
-.endif	# SJ3_LIB_BUILDLINK3_MK
+.endif # SJ3_LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sj3-lib
diff --git a/inputmethod/tomoe-gtk/buildlink3.mk b/inputmethod/tomoe-gtk/buildlink3.mk
index 674eea578cc..9b59593ccee 100644
--- a/inputmethod/tomoe-gtk/buildlink3.mk
+++ b/inputmethod/tomoe-gtk/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/11/01 17:54:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TOMOE_GTK_BUILDLINK3_MK:=	${TOMOE_GTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tomoe-gtk
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	tomoe-gtk
-.endif
+.if !defined(TOMOE_GTK_BUILDLINK3_MK)
+TOMOE_GTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntomoe-gtk}
-BUILDLINK_PACKAGES+=	tomoe-gtk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tomoe-gtk
-
-.if ${TOMOE_GTK_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.tomoe-gtk+=	tomoe-gtk>=0.6.0
 BUILDLINK_PKGSRCDIR.tomoe-gtk?=	../../inputmethod/tomoe-gtk
-.endif	# TOMOE_GTK_BUILDLINK3_MK
 
 .include "../../inputmethod/tomoe/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # TOMOE_GTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tomoe-gtk
diff --git a/inputmethod/tomoe/buildlink3.mk b/inputmethod/tomoe/buildlink3.mk
index c1e01e2fcb1..02a425b9f72 100644
--- a/inputmethod/tomoe/buildlink3.mk
+++ b/inputmethod/tomoe/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/13 06:05:44 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:47 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TOMOE_BUILDLINK3_MK:=	${TOMOE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tomoe
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	tomoe
-.endif
+.if !defined(TOMOE_BUILDLINK3_MK)
+TOMOE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntomoe}
-BUILDLINK_PACKAGES+=	tomoe
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tomoe
-
-.if ${TOMOE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.tomoe+=	tomoe>=0.6.0
 BUILDLINK_PKGSRCDIR.tomoe?=	../../inputmethod/tomoe
-.endif	# TOMOE_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.endif # TOMOE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tomoe
diff --git a/inputmethod/uim/buildlink3.mk b/inputmethod/uim/buildlink3.mk
index 3ba1de07aae..6bc3112cc28 100644
--- a/inputmethod/uim/buildlink3.mk
+++ b/inputmethod/uim/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/06/08 13:01:48 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:47 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-UIM_BUILDLINK3_MK:=	${UIM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	uim
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	uim
-.endif
+.if !defined(UIM_BUILDLINK3_MK)
+UIM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nuim}
-BUILDLINK_PACKAGES+=	uim
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}uim
-
-.if !empty(UIM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.uim+=	uim>=1.5.1
 BUILDLINK_ABI_DEPENDS.uim?=	uim>=1.5.1
 BUILDLINK_PKGSRCDIR.uim?=	../../inputmethod/uim
-.endif  # UIM_BUILDLINK3_MK
 
 .include "../../devel/libgcroots/buildlink3.mk"
+.endif # UIM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-uim
diff --git a/inputmethod/unicon-im/buildlink3.mk b/inputmethod/unicon-im/buildlink3.mk
index cab6eba92f8..9af3e8400c3 100644
--- a/inputmethod/unicon-im/buildlink3.mk
+++ b/inputmethod/unicon-im/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-UNICON_IM_BUILDLINK3_MK:=	${UNICON_IM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	unicon-im
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	unicon-im
-.endif
+.if !defined(UNICON_IM_BUILDLINK3_MK)
+UNICON_IM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nunicon-im}
-BUILDLINK_PACKAGES+=	unicon-im
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}unicon-im
-
-.if !empty(UNICON_IM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.unicon-im+=	unicon-im>=1.2nb2
 BUILDLINK_ABI_DEPENDS.unicon-im+=	unicon-im>=1.2nb4
 BUILDLINK_PKGSRCDIR.unicon-im?=	../../inputmethod/unicon-im
-.endif	# UNICON_IM_BUILDLINK3_MK
 
 .include "../../devel/pth/buildlink3.mk"
+.endif # UNICON_IM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-unicon-im