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.

62 files changed, 372 insertions, 820 deletions

diff --git a/lang/Cg-compiler/buildlink3.mk b/lang/Cg-compiler/buildlink3.mk
index 9ef13d7d3cc..4bc9d0fb071 100644
--- a/lang/Cg-compiler/buildlink3.mk
+++ b/lang/Cg-compiler/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CG_COMPILER_BUILDLINK3_MK:=	${CG_COMPILER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Cg-compiler
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Cg-compiler
-.endif
+.if !defined(CG_COMPILER_BUILDLINK3_MK)
+CG_COMPILER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NCg-compiler}
-BUILDLINK_PACKAGES+=	Cg-compiler
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Cg-compiler
-
-.if !empty(CG_COMPILER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Cg-compiler+=		Cg-compiler>=1.2.1
 BUILDLINK_ABI_DEPENDS.Cg-compiler?=	Cg-compiler>=1.3beta2nb1
 BUILDLINK_PKGSRCDIR.Cg-compiler?=	../../lang/Cg-compiler
-.endif	# CG_COMPILER_BUILDLINK3_MK
+.endif # CG_COMPILER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Cg-compiler
diff --git a/lang/camlp5/buildlink3.mk b/lang/camlp5/buildlink3.mk
index 9412fd22c16..0b07a55826d 100644
--- a/lang/camlp5/buildlink3.mk
+++ b/lang/camlp5/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/12/01 12:56:04 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:48 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CAMLP5_BUILDLINK3_MK:=	${CAMLP5_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	camlp5
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	camlp5
-.endif
+.if !defined(CAMLP5_BUILDLINK3_MK)
+CAMLP5_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncamlp5}
-BUILDLINK_PACKAGES+=	camlp5
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}camlp5
-
-.if ${CAMLP5_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.camlp5+=	camlp5>=5.01
 BUILDLINK_PKGSRCDIR.camlp5?=	../../lang/camlp5
-.endif	# CAMLP5_BUILDLINK3_MK
 
 .include "../../lang/ocaml/buildlink3.mk"
+.endif # CAMLP5_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-camlp5
diff --git a/lang/cdl3/buildlink3.mk b/lang/cdl3/buildlink3.mk
index 4f304ac132a..36a6010933b 100644
--- a/lang/cdl3/buildlink3.mk
+++ b/lang/cdl3/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CDL3_BUILDLINK3_MK:=	${CDL3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cdl3
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cdl3
-.endif
+.if !defined(CDL3_BUILDLINK3_MK)
+CDL3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdl3}
-BUILDLINK_PACKAGES+=	cdl3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdl3
-
-.if !empty(CDL3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cdl3+=	cdl3>=1.2.5
 BUILDLINK_ABI_DEPENDS.cdl3?=	cdl3>=1.2.5nb1
 BUILDLINK_PKGSRCDIR.cdl3?=	../../lang/cdl3
-.endif	# CDL3_BUILDLINK3_MK
+.endif # CDL3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cdl3
diff --git a/lang/ecl/buildlink3.mk b/lang/ecl/buildlink3.mk
index dbc0f5460c7..d034ac8cad2 100644
--- a/lang/ecl/buildlink3.mk
+++ b/lang/ecl/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/12/19 23:12:46 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ECL_BUILDLINK3_MK:=	${ECL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ecl
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ecl
-.endif
+.if !defined(ECL_BUILDLINK3_MK)
+ECL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Necl}
-BUILDLINK_PACKAGES+=	ecl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ecl
-
-.if ${ECL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ecl+=	ecl>=0.9.12
 BUILDLINK_PKGSRCDIR.ecl?=	../../lang/ecl
-.endif	# ECL_BUILDLINK3_MK
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
+.endif # ECL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ecl
diff --git a/lang/eieio/buildlink3.mk b/lang/eieio/buildlink3.mk
index adf70be4a7d..d72d0999cdf 100644
--- a/lang/eieio/buildlink3.mk
+++ b/lang/eieio/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:18 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:48 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EIEIO_BUILDLINK3_MK:=	${EIEIO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	eieio
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	eieio
-.endif
+.if !defined(EIEIO_BUILDLINK3_MK)
+EIEIO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Neieio}
-BUILDLINK_PACKAGES+=	eieio
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eieio
-
-.if ${EIEIO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.eieio+=	${EMACS_PKGNAME_PREFIX}eieio>=0.17
 BUILDLINK_PKGSRCDIR.eieio?=	../../lang/eieio
-.endif	# EIEIO_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.eieio=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # EIEIO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-eieio
diff --git a/lang/elk/buildlink3.mk b/lang/elk/buildlink3.mk
index 4db32edac0c..00488ab7b6f 100644
--- a/lang/elk/buildlink3.mk
+++ b/lang/elk/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ELK_BUILDLINK3_MK:=	${ELK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	elk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	elk
-.endif
+.if !defined(ELK_BUILDLINK3_MK)
+ELK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nelk}
-BUILDLINK_PACKAGES+=	elk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}elk
-
-.if !empty(ELK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.elk+=	elk>=3.99.6
 BUILDLINK_PKGSRCDIR.elk?=	../../lang/elk
-.endif	# ELK_BUILDLINK3_MK
+.endif # ELK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-elk
diff --git a/lang/embryo/buildlink3.mk b/lang/embryo/buildlink3.mk
index 85c15c365c4..409f039ea9e 100644
--- a/lang/embryo/buildlink3.mk
+++ b/lang/embryo/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/26 07:54:20 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EMBRYO_BUILDLINK3_MK:=	${EMBRYO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	embryo
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	embryo
-.endif
+.if !defined(EMBRYO_BUILDLINK3_MK)
+EMBRYO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nembryo}
-BUILDLINK_PACKAGES+=	embryo
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}embryo
-
-.if ${EMBRYO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.embryo+=	embryo>=0.9.5.050
 BUILDLINK_PKGSRCDIR.embryo?=	../../lang/embryo
-.endif	# EMBRYO_BUILDLINK3_MK
+.endif # EMBRYO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-embryo
diff --git a/lang/erlang/buildlink3.mk b/lang/erlang/buildlink3.mk
index dd14d070c7c..b38c8f69e0d 100644
--- a/lang/erlang/buildlink3.mk
+++ b/lang/erlang/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/07/28 06:28:38 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ERLANG_BUILDLINK3_MK:=	${ERLANG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	erlang
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	erlang
-.endif
+.if !defined(ERLANG_BUILDLINK3_MK)
+ERLANG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nerlang}
-BUILDLINK_PACKAGES+=	erlang
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}erlang
-
-.if ${ERLANG_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.erlang+=	erlang>=10.1
 BUILDLINK_ABI_DEPENDS.erlang?=	erlang>=10.1.9nb1
 BUILDLINK_PKGSRCDIR.erlang?=	../../lang/erlang
-.endif	# ERLANG_BUILDLINK3_MK
+.endif # ERLANG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-erlang
diff --git a/lang/ezm3/buildlink3.mk b/lang/ezm3/buildlink3.mk
index 22e90187876..0c050044411 100644
--- a/lang/ezm3/buildlink3.mk
+++ b/lang/ezm3/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EZM3_BUILDLINK3_MK:=	${EZM3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ezm3
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ezm3
-.endif
+.if !defined(EZM3_BUILDLINK3_MK)
+EZM3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nezm3}
-BUILDLINK_PACKAGES+=	ezm3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ezm3
-
-.if !empty(EZM3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ezm3+=	ezm3>=1.1nb1
 BUILDLINK_DEPMETHOD.ezm3?=	build
 BUILDLINK_ABI_DEPENDS.ezm3?=	ezm3>=1.2nb1
 BUILDLINK_PKGSRCDIR.ezm3?=	../../lang/ezm3
-.endif	# EZM3_BUILDLINK3_MK
 
 BUILDLINK_PASSTHRU_DIRS+=	${PREFIX}/ezm3
+.endif # EZM3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ezm3
diff --git a/lang/f2c/buildlink3.mk b/lang/f2c/buildlink3.mk
index dfcb7516bcd..06911d5efc2 100644
--- a/lang/f2c/buildlink3.mk
+++ b/lang/f2c/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-F2C_BUILDLINK3_MK:=	${F2C_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	f2c
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	f2c
-.endif
+.if !defined(F2C_BUILDLINK3_MK)
+F2C_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nf2c}
-BUILDLINK_PACKAGES+=	f2c
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}f2c
-
-.if !empty(F2C_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.f2c+=		f2c>=20001205nb3
 BUILDLINK_ABI_DEPENDS.f2c+=	f2c>=20001205nb8
 BUILDLINK_PKGSRCDIR.f2c?=	../../lang/f2c
-.endif	# F2C_BUILDLINK3_MK
 
 # The f2c-f77 script takes some environment variables to override hardcoded
 # values for the compiler and C preprocessor.
@@ -24,5 +16,6 @@ CONFIGURE_ENV+=         CC_f2c=${CC:Q}
 CONFIGURE_ENV+=         CPP=${CPP:Q}
 MAKE_ENV+=              CC_f2c=${CC:Q}
 MAKE_ENV+=              CPP=${CPP:Q}
+.endif # F2C_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-f2c
diff --git a/lang/g95/buildlink3.mk b/lang/g95/buildlink3.mk
index 2f1807c4771..a00befa2b14 100644
--- a/lang/g95/buildlink3.mk
+++ b/lang/g95/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/06/04 13:12:20 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-G95_BUILDLINK3_MK:=	${G95_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	g95
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	g95
-.endif
+.if !defined(G95_BUILDLINK3_MK)
+G95_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ng95}
-BUILDLINK_PACKAGES+=	g95
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}g95
-
-.if ${G95_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.g95+=	g95>=0.91
 BUILDLINK_PKGSRCDIR.g95?=	../../lang/g95
-.endif	# G95_BUILDLINK3_MK
+.endif # G95_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-g95
diff --git a/lang/gambc/buildlink3.mk b/lang/gambc/buildlink3.mk
index b1dcd440b42..c6d65e84781 100644
--- a/lang/gambc/buildlink3.mk
+++ b/lang/gambc/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/28 04:14:31 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:49 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GAMBC_BUILDLINK3_MK:=	${GAMBC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gambc
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gambc
-.endif
+.if !defined(GAMBC_BUILDLINK3_MK)
+GAMBC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngambc}
-BUILDLINK_PACKAGES+=	gambc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gambc
-
-.if ${GAMBC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gambc+=	gambc>=4.2.6
 BUILDLINK_PKGSRCDIR.gambc?=	../../lang/gambc
-.endif	# GAMBC_BUILDLINK3_MK
 
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # GAMBC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gambc
diff --git a/lang/gauche/buildlink3.mk b/lang/gauche/buildlink3.mk
index 696d7322d1f..8353fac66e7 100644
--- a/lang/gauche/buildlink3.mk
+++ b/lang/gauche/buildlink3.mk
@@ -1,22 +1,15 @@
-# $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:49 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GAUCHE_BUILDLINK3_MK:=	${GAUCHE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Gauche
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Gauche
-.endif
+.if !defined(GAUCHE_BUILDLINK3_MK)
+GAUCHE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGauche}
-BUILDLINK_PACKAGES+=	Gauche
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Gauche
-
-.if !empty(GAUCHE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Gauche+=	Gauche>=0.8.1
 BUILDLINK_PKGSRCDIR.Gauche?=	../../lang/gauche
-.endif	# GAUCHE_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # GAUCHE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Gauche
diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk
index 3a2e758a6be..1d11cca8471 100644
--- a/lang/gcc/buildlink3.mk
+++ b/lang/gcc/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:36 joerg Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GCC_BUILDLINK3_MK:=	${GCC_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:49 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc
-.endif
+BUILDLINK_TREE+=	gcc
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc}
-BUILDLINK_PACKAGES+=	gcc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc
+.if !defined(GCC_BUILDLINK3_MK)
+GCC_BUILDLINK3_MK:=
 
-.if !empty(GCC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gcc+=		gcc>=${_GCC_REQD}
 BUILDLINK_ABI_DEPENDS.gcc?=	gcc>=2.95.3nb7
 BUILDLINK_PKGSRCDIR.gcc?=	../../lang/gcc
@@ -27,6 +20,6 @@ BUILDLINK_DEPMETHOD.gcc+=	full
 .  else
 BUILDLINK_DEPMETHOD.gcc?=	build
 .  endif
-.endif	# GCC_BUILDLINK3_MK
+.endif # GCC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gcc
diff --git a/lang/gcc3-ada/buildlink3.mk b/lang/gcc3-ada/buildlink3.mk
index fe4e38f188c..b96b0014c46 100644
--- a/lang/gcc3-ada/buildlink3.mk
+++ b/lang/gcc3-ada/buildlink3.mk
@@ -1,18 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/01/17 03:11:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:49 joerg Exp $
 
-BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
-GCC3_ADA_BUILDLINK3_MK:=  ${GCC3_ADA_BUILDLINK3_MK}+
 BUILDLINK_PREFIX.gcc3-ada:=${LOCALBASE}/gcc3
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=     gcc3-ada
-.endif
+BUILDLINK_TREE+=	gcc3-ada
 
-BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:Ngcc3-ada}
-BUILDLINK_PACKAGES+=    gcc3-ada
-BUILDLINK_ORDER:=    ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-ada
+.if !defined(GCC3_ADA_BUILDLINK3_MK)
+GCC3_ADA_BUILDLINK3_MK:=
 
-.if !empty(GCC3_ADA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gcc3-ada+=      gcc3-ada>=3.3.3
 BUILDLINK_ABI_DEPENDS.gcc3-ada?=    gcc3-ada>=3.3.5nb1
 BUILDLINK_PKGSRCDIR.gcc3-ada?=    ../../lang/gcc3-ada
@@ -23,7 +17,6 @@ BUILDLINK_LIBDIRS.gcc3-ada+=       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3
 BUILDLINK_LIBDIRS.gcc3-ada+=       ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-ada}\///}/adalib
 BUILDLINK_INCDIRS.gcc3-ada+=       include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-ada}\///}/adainclude
 .  endif
-.endif  # GCC3_ADA_BUILDLINK3_MK
 
 BUILDLINK_PKGSRCDIR.gcc3-ada?=     ../../lang/gcc3-ada
 BUILDLINK_FILES_CMD.gcc3-ada=	(cd  ${BUILDLINK_PREFIX.gcc3-ada} && \
@@ -34,5 +27,6 @@ BUILDLINK_DEPMETHOD.gcc3-ada?=	build
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.endif # GCC3_ADA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gcc3-ada
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index 40b5bf179d0..7575c05169b 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GCC3_CXX_BUILDLINK3_MK:=	${GCC3_CXX_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3-cxx
-.endif
+BUILDLINK_TREE+=	gcc3-cxx
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-cxx}
-BUILDLINK_PACKAGES+=	gcc3-cxx
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-cxx
+.if !defined(GCC3_CXX_BUILDLINK3_MK)
+GCC3_CXX_BUILDLINK3_MK:=
 
-.if !empty(GCC3_CXX_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
@@ -31,6 +24,6 @@ BUILDLINK_DEPMETHOD.gcc3-cxx+=	full
 .  else
 BUILDLINK_DEPMETHOD.gcc3-cxx?=	build
 .  endif
-.endif	# GCC3_CXX_BUILDLINK3_MK
+.endif # GCC3_CXX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gcc3-cxx
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 5a249882c38..75c692fd73a 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/02/15 14:35:16 rillig Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GCC3_C_BUILDLINK3_MK:=	${GCC3_C_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3-c
-.endif
+BUILDLINK_TREE+=	gcc3-c
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-c}
-BUILDLINK_PACKAGES+=	gcc3-c
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-c
+.if !defined(GCC3_C_BUILDLINK3_MK)
+GCC3_C_BUILDLINK3_MK:=
 
-.if !empty(GCC3_C_BUILDLINK3_MK:M+)
 .  include "../../mk/bsd.prefs.mk"
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 #
@@ -42,6 +35,6 @@ BUILDLINK_DEPMETHOD.gcc3-c+=	full
 .  else
 BUILDLINK_DEPMETHOD.gcc3-c?=	build
 .  endif
-.endif	# GCC3_C_BUILDLINK3_MK
+.endif # GCC3_C_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gcc3-c
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index ef4979caa52..6279d84a8c1 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GCC3_F77_BUILDLINK3_MK:=	${GCC3_F77_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3-f77
-.endif
+BUILDLINK_TREE+=	gcc3-f77
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-f77}
-BUILDLINK_PACKAGES+=	gcc3-f77
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-f77
+.if !defined(GCC3_F77_BUILDLINK3_MK)
+GCC3_F77_BUILDLINK3_MK:=
 
-.if !empty(GCC3_F77_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
@@ -31,6 +24,6 @@ BUILDLINK_DEPMETHOD.gcc3-f77+=	full
 .  else
 BUILDLINK_DEPMETHOD.gcc3-f77?=	build
 .  endif
-.endif	# GCC3_F77_BUILDLINK3_MK
+.endif # GCC3_F77_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gcc3-f77
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index 941ea380bfd..f8e5ca5933f 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GCC3_JAVA_BUILDLINK3_MK:=	${GCC3_JAVA_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3-java
-.endif
+BUILDLINK_TREE+=	gcc3-java
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-java}
-BUILDLINK_PACKAGES+=	gcc3-java
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-java
+.if !defined(GCC3_JAVA_BUILDLINK3_MK)
+GCC3_JAVA_BUILDLINK3_MK:=
 
-.if !empty(GCC3_JAVA_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
@@ -31,6 +24,6 @@ BUILDLINK_DEPMETHOD.gcc3-java+=	full
 .  else
 BUILDLINK_DEPMETHOD.gcc3-java?=	build
 .  endif
-.endif	# GCC3_JAVA_BUILDLINK3_MK
+.endif # GCC3_JAVA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gcc3-java
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index 64ed5f7b571..12ed022bbf1 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GCC3_OBJC_BUILDLINK3_MK:=	${GCC3_OBJC_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3-objc
-.endif
+BUILDLINK_TREE+=	gcc3-objc
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-objc}
-BUILDLINK_PACKAGES+=	gcc3-objc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-objc
+.if !defined(GCC3_OBJC_BUILDLINK3_MK)
+GCC3_OBJC_BUILDLINK3_MK:=
 
-.if !empty(GCC3_OBJC_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
@@ -31,6 +24,6 @@ BUILDLINK_DEPMETHOD.gcc3-objc+=	full
 .  else
 BUILDLINK_DEPMETHOD.gcc3-objc?=	build
 .  endif
-.endif	# GCC3_OBJC_BUILDLINK3_MK
+.endif # GCC3_OBJC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gcc3-objc
diff --git a/lang/gcc34-ada/buildlink3.mk b/lang/gcc34-ada/buildlink3.mk
index 4e7668799c6..1f7694a401e 100644
--- a/lang/gcc34-ada/buildlink3.mk
+++ b/lang/gcc34-ada/buildlink3.mk
@@ -1,18 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/01/17 03:11:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:49 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GCCADA_BUILDLINK3_MK:=	${GCCADA_BUILDLINK3_MK}+
 BUILDLINK_PREFIX.gcc34-ada:=${LOCALBASE}/gcc34-ada
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc34-ada
-.endif
+BUILDLINK_TREE+=	gcc34-ada
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc34-ada}
-BUILDLINK_PACKAGES+=	gcc34-ada
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc34-ada
+.if !defined(GCCADA_BUILDLINK3_MK)
+GCCADA_BUILDLINK3_MK:=
 
-.if !empty(GCCADA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gcc34-ada+=	gcc34-ada>=3.4.1nb4
 BUILDLINK_ABI_DEPENDS.gcc34-ada?=	gcc34-ada>=3.4.4nb1
 BUILDLINK_PKGSRCDIR.gcc34-ada?=	../../lang/gcc34-ada
@@ -25,7 +19,6 @@ BUILDLINK_LIBDIRS.gcc34-ada+=	${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34-ada}\//
 BUILDLINK_INCDIRS.gcc34-ada+=	include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34-ada}\///}/adainclude
 .     endif
 .  endif
-.endif  # GCCADA_BUILDLINK3_MK
 
 BUILDLINK_FILES_CMD.gcc34-ada=	(cd  ${BUILDLINK_PREFIX.gcc34-ada} && \
 	${FIND} bin libexec lib \( -type file -o -type link \) -print)
@@ -40,5 +33,6 @@ BUILDLINK_DEPMETHOD.gcc34-ada?=	build
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.endif # GCCADA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gcc34-ada
diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk
index edd84d7ee65..d60dde242b9 100644
--- a/lang/gcc34/buildlink3.mk
+++ b/lang/gcc34/buildlink3.mk
@@ -1,18 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/07/28 09:48:48 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:49 joerg Exp $
 
-BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
-GCC34_BUILDLINK3_MK:=  ${GCC34_BUILDLINK3_MK}+
 BUILDLINK_PREFIX.gcc34:=${LOCALBASE}/gcc34
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=     gcc34
-.endif
+BUILDLINK_TREE+=	gcc34
 
-BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:Ngcc34}
-BUILDLINK_PACKAGES+=    gcc34
-BUILDLINK_ORDER:=    ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc34
+.if !defined(GCC34_BUILDLINK3_MK)
+GCC34_BUILDLINK3_MK:=
 
-.if !empty(GCC34_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gcc34+=	gcc34>=${_GCC_REQD}
 BUILDLINK_ABI_DEPENDS.gcc34?=	gcc34>=3.4.5nb1
 BUILDLINK_PKGSRCDIR.gcc34?=	../../lang/gcc34
@@ -31,7 +25,6 @@ BUILDLINK_LIBDIRS.gcc34+=	${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/adali
 BUILDLINK_INCDIRS.gcc34+=	include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/include
 .    endif
 .  endif
-.endif  # GCC34_BUILDLINK3_MK
 
 BUILDLINK_FILES_CMD.gcc34=	\
 	(cd  ${BUILDLINK_PREFIX.gcc34} &&	\
@@ -45,8 +38,8 @@ BUILDLINK_DEPMETHOD.gcc34+=	full
 BUILDLINK_DEPMETHOD.gcc34?=	build
 .  endif
 
-
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # GCC34_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gcc34
diff --git a/lang/ghc/buildlink3.mk b/lang/ghc/buildlink3.mk
index e491a06f560..71608b33e54 100644
--- a/lang/ghc/buildlink3.mk
+++ b/lang/ghc/buildlink3.mk
@@ -1,27 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/07/20 00:26:52 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:50 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GHC_BUILDLINK3_MK:=	${GHC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ghc
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ghc
-.endif
+.if !defined(GHC_BUILDLINK3_MK)
+GHC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nghc}
-BUILDLINK_PACKAGES+=	ghc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ghc
-
-.if !empty(GHC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ghc+=	ghc>=6.8.3
 BUILDLINK_ABI_DEPENDS.ghc?=	ghc>=6.8.3
 BUILDLINK_PKGSRCDIR.ghc?=	../../lang/ghc
 
 BUILDLINK_DEPMETHOD.ghc?=	build
-.endif	# GHC_BUILDLINK3_MK
 
 .include "../../devel/readline/buildlink3.mk"
+.endif # GHC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ghc
 
 # We include gmp/buildlink3.mk here so that "gmp" is registered as a
 # direct dependency for any package that includes this buildlink3.mk
diff --git a/lang/guile/buildlink3.mk b/lang/guile/buildlink3.mk
index 8766aaa0c44..3c1d9137c1e 100644
--- a/lang/guile/buildlink3.mk
+++ b/lang/guile/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/06/12 03:02:34 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:50 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GUILE_BUILDLINK3_MK:=	${GUILE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	guile
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	guile
-.endif
+.if !defined(GUILE_BUILDLINK3_MK)
+GUILE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile}
-BUILDLINK_PACKAGES+=	guile
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile
-
-.if !empty(GUILE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.guile+=	guile>=1.8.1
 BUILDLINK_ABI_DEPENDS.guile+=	guile>=1.8.1
 BUILDLINK_PKGSRCDIR.guile?=	../../lang/guile
-.endif	# GUILE_BUILDLINK3_MK
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # GUILE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-guile
diff --git a/lang/guile16/buildlink3.mk b/lang/guile16/buildlink3.mk
index 6b7f7fa3a06..bf64c9f8150 100644
--- a/lang/guile16/buildlink3.mk
+++ b/lang/guile16/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/06/04 23:38:39 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:50 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GUILE16_BUILDLINK3_MK:=	${GUILE16_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	guile16
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	guile16
-.endif
+.if !defined(GUILE16_BUILDLINK3_MK)
+GUILE16_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile16}
-BUILDLINK_PACKAGES+=	guile16
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile16
-
-.if !empty(GUILE16_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.guile16+=	guile16>=1.6.8
 BUILDLINK_ABI_DEPENDS.guile16+=	guile16>=1.6.8
 BUILDLINK_PKGSRCDIR.guile16?=	../../lang/guile16
@@ -21,11 +14,11 @@ BUILDLINK_FILES.guile16+=	guile/1.6/bin/*
 BUILDLINK_FNAME_TRANSFORM.guile16+=	-e s,/guile/1.6/bin/,/bin/,
 
 GUILE16_SUBDIR=                 guile/1.6
-.endif	# GUILE16_BUILDLINK3_MK
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # GUILE16_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-guile16
diff --git a/lang/hugs/buildlink3.mk b/lang/hugs/buildlink3.mk
index db123c3da3b..8ac9c3fb232 100644
--- a/lang/hugs/buildlink3.mk
+++ b/lang/hugs/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/05 21:04:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:50 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-HUGS98_BUILDLINK3_MK:=	${HUGS98_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	hugs98
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	hugs98
-.endif
+.if !defined(HUGS98_BUILDLINK3_MK)
+HUGS98_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhugs98}
-BUILDLINK_PACKAGES+=	hugs98
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hugs98
-
-.if ${HUGS98_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.hugs98+=	hugs98>=200609
 BUILDLINK_PKGSRCDIR.hugs98?=	../../lang/hugs
-.endif	# HUGS98_BUILDLINK3_MK
+.endif # HUGS98_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-hugs98
diff --git a/lang/jdk/buildlink3.mk b/lang/jdk/buildlink3.mk
index 95204f03a7a..3cecc7943ca 100644
--- a/lang/jdk/buildlink3.mk
+++ b/lang/jdk/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:50 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-JDK_BUILDLINK3_MK:=	${JDK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	jdk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	jdk
-.endif
+.if !defined(JDK_BUILDLINK3_MK)
+JDK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njdk}
-BUILDLINK_PACKAGES+=	jdk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jdk
-
-.if !empty(JDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.jdk+=	jdk>=1.1.8
 BUILDLINK_PKGSRCDIR.jdk?=	../../lang/jdk
 BUILDLINK_JAVA_PREFIX.jdk=	${PREFIX}/java/jdk-1.1.8
@@ -21,6 +14,6 @@ BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_JAVA_PREFIX.jdk}
 BUILDLINK_CPPFLAGS.jdk= \
 	-I${BUILDLINK_JAVA_PREFIX.jdk}/include				\
 	-I${BUILDLINK_JAVA_PREFIX.jdk}/include/netbsd
-.endif	# JDK_BUILDLINK3_MK
+.endif # JDK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-jdk
diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk
index 3f3f6526be2..4e5bdd2d807 100644
--- a/lang/kaffe/buildlink3.mk
+++ b/lang/kaffe/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:50 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-KAFFE_BUILDLINK3_MK:=	${KAFFE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kaffe
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	kaffe
-.endif
+.if !defined(KAFFE_BUILDLINK3_MK)
+KAFFE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkaffe}
-BUILDLINK_PACKAGES+=	kaffe
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kaffe
-
-.if !empty(KAFFE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kaffe+=	kaffe>=1.1.7
 BUILDLINK_ABI_DEPENDS.kaffe?=	kaffe>=1.1.7
 BUILDLINK_PKGSRCDIR.kaffe?=	../../lang/kaffe
 BUILDLINK_JAVA_PREFIX.kaffe=	${PREFIX}/java/kaffe
-.endif	# KAFFE_BUILDLINK3_MK
 
 BUILDLINK_CPPFLAGS.kaffe= \
 	-I${BUILDLINK_JAVA_PREFIX.kaffe}/include			\
 	-I${BUILDLINK_JAVA_PREFIX.kaffe}/include/kaffe
+.endif # KAFFE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kaffe
diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk
index cd46d9c859f..f9da494e83d 100644
--- a/lang/librep/buildlink3.mk
+++ b/lang/librep/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:50 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBREP_BUILDLINK3_MK:=	${LIBREP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	librep
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	librep
-.endif
+.if !defined(LIBREP_BUILDLINK3_MK)
+LIBREP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrep}
-BUILDLINK_PACKAGES+=	librep
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librep
-
-.if !empty(LIBREP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.librep+=	librep>=0.17
 BUILDLINK_ABI_DEPENDS.librep+=	librep>=0.17nb2
 BUILDLINK_PKGSRCDIR.librep?=	../../lang/librep
 MAKE_FLAGS+=			rep_LIBTOOL=${LIBTOOL:Q}
-.endif	# LIBREP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
+.endif # LIBREP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-librep
diff --git a/lang/libtcl-nothread/buildlink3.mk b/lang/libtcl-nothread/buildlink3.mk
index ed866198c0a..523ac22dc51 100644
--- a/lang/libtcl-nothread/buildlink3.mk
+++ b/lang/libtcl-nothread/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/21 14:27:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:50 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TCLNT_BUILDLINK3_MK:=	${TCLNT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tclnt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tclnt
-.endif
+.if !defined(TCLNT_BUILDLINK3_MK)
+TCLNT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntclnt}
-BUILDLINK_PACKAGES+=	tclnt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tclnt
-
-.if !empty(TCLNT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tclnt+=	libtcl-nothread>=8.4.6
 BUILDLINK_ABI_DEPENDS.tclnt+=	libtcl-nothread>=8.4.6nb1
 BUILDLINK_PKGSRCDIR.tclnt?=	../../lang/libtcl-nothread
@@ -27,9 +20,8 @@ BUILDLINK_TRANSFORM+=	l:tcl8.4:tcl84-nothread
 TCLCONFIG_SH?=		${BUILDLINK_PREFIX.tcl}/lib/tclConfig-nothread.sh
 PKGSRC_MAKE_ENV+=	_TCL_NOTHREAD=yes
 
-.endif	# TCLNT_BUILDLINK3_MK
-
 _TCL_NOTHREAD=		yes
 .include "../../lang/tcl/buildlink3.mk"
+.endif # TCLNT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tclnt
diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk
index f546c70d009..74e43bf9fec 100644
--- a/lang/lua/buildlink3.mk
+++ b/lang/lua/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/02/27 18:59:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:50 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LUA_BUILDLINK3_MK:=	${LUA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	lua
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	lua
-.endif
+.if !defined(LUA_BUILDLINK3_MK)
+LUA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlua}
-BUILDLINK_PACKAGES+=	lua
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lua
-
-.if !empty(LUA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lua+=	lua>=5.1.1
 BUILDLINK_PKGSRCDIR.lua?=	../../lang/lua
-.endif	# LUA_BUILDLINK3_MK
 
 .include "../../devel/readline/buildlink3.mk"
+.endif # LUA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-lua
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index 21a5f2f70b3..15ad2b43c33 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.30 2009/03/06 14:28:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:50 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mono
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	mono
-.endif
+.if !defined(MONO_BUILDLINK3_MK)
+MONO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmono}
-BUILDLINK_PACKAGES+=	mono
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono
-
-.if ${MONO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mono+=	mono>=2.2
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 ALL_ENV+=			MONO_SHARED_DIR=${WRKDIR:Q}
-.endif	# MONO_BUILDLINK3_MK
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/mono\/gac$$/ \
 				{ print "@comment in mono: " $$0; next; }
@@ -24,5 +16,6 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/mono$$/ \
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
+.endif # MONO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mono
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index 25bbe97e927..a853e9295e1 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,18 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.21 2008/01/23 20:42:25 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OCAML_BUILDLINK3_MK:=	${OCAML_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ocaml
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ocaml
-.endif
+.if !defined(OCAML_BUILDLINK3_MK)
+OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nocaml}
-BUILDLINK_PACKAGES+=		ocaml
-
-BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ocaml
-
-.if !empty(OCAML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
 BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=3.09.1nb2
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
@@ -48,7 +40,6 @@ ocaml-wrappers:
 		${LN} -s ${BUILDLINK_PREFIX.ocaml}/bin/"$$w"		\
 		         ${BUILDLINK_DIR}/bin/"$$w";			\
 	done
+.endif # OCAML_BUILDLINK3_MK
 
-.endif	# OCAML_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ocaml
diff --git a/lang/ossp-js/buildlink3.mk b/lang/ossp-js/buildlink3.mk
index 40728daae74..22c712c2b88 100644
--- a/lang/ossp-js/buildlink3.mk
+++ b/lang/ossp-js/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/02/06 10:10:45 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OSSP_JS_BUILDLINK3_MK:=	${OSSP_JS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ossp-js
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ossp-js
-.endif
+.if !defined(OSSP_JS_BUILDLINK3_MK)
+OSSP_JS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nossp-js}
-BUILDLINK_PACKAGES+=	ossp-js
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ossp-js
-
-.if ${OSSP_JS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ossp-js+=	ossp-js>=1.6.20070208nb1
 BUILDLINK_PKGSRCDIR.ossp-js?=	../../lang/ossp-js
 .  include "../../lang/ossp-js/libm.mk"
-.endif	# OSSP_JS_BUILDLINK3_MK
 
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # OSSP_JS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ossp-js
diff --git a/lang/parrot/buildlink3.mk b/lang/parrot/buildlink3.mk
index cf607df773f..40cef7b4e8e 100644
--- a/lang/parrot/buildlink3.mk
+++ b/lang/parrot/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PARROT_BUILDLINK3_MK:=	${PARROT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	parrot
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	parrot
-.endif
+.if !defined(PARROT_BUILDLINK3_MK)
+PARROT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nparrot}
-BUILDLINK_PACKAGES+=	parrot
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}parrot
-
-.if !empty(PARROT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.parrot+=		parrot>=0.4.0
 BUILDLINK_ABI_DEPENDS.parrot?=		parrot>=0.4.1nb1
 BUILDLINK_PKGSRCDIR.parrot?=		../../lang/parrot
-.endif	# PARROT_BUILDLINK3_MK
 
 .include "../../textproc/icu/buildlink3.mk"
+.endif # PARROT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-parrot
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index de805a61507..c6da4cd12af 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.43 2008/10/19 19:10:42 he Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2009/03/20 19:24:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	perl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	perl
-.endif
+.if !defined(PERL5_BUILDLINK3_MK)
+PERL5_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nperl}
-BUILDLINK_PACKAGES+=	perl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}perl
-
-.if !empty(PERL5_BUILDLINK3_MK:M+)
 .include "../../mk/bsd.fast.prefs.mk"
 PERL5_REQD+=			5.10.0
 .for _perl5_ver_ in ${PERL5_REQD}
@@ -43,6 +36,6 @@ BUILDLINK_FILES.perl=							\
 	${PERL5_SUB_INSTALLARCHLIB}/CORE/*				\
 	${PERL5_SUB_INSTALLARCHLIB}/auto/DynaLoader/DynaLoader.a
 .  endif
-.endif  # PERL5_BUILDLINK3_MK
+.endif # PERL5_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-perl
diff --git a/lang/php5/buildlink3.mk b/lang/php5/buildlink3.mk
index fb49fa411ea..6afda984906 100644
--- a/lang/php5/buildlink3.mk
+++ b/lang/php5/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PHP_BUILDLINK3_MK:=	${PHP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	php
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	php
-.endif
+.if !defined(PHP_BUILDLINK3_MK)
+PHP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nphp}
-BUILDLINK_PACKAGES+=	php
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}php
-
-.if !empty(PHP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.php+=		php>=5.1.2
 BUILDLINK_ABI_DEPENDS.php+=	php>=5.1.2
 BUILDLINK_PKGSRCDIR.php?=	../../lang/php5
-.endif	# PHP_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # PHP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-php
diff --git a/lang/pnet/buildlink3.mk b/lang/pnet/buildlink3.mk
index e3edfb32e5f..255979c552f 100644
--- a/lang/pnet/buildlink3.mk
+++ b/lang/pnet/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/02/18 16:39:43 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PNET_BUILDLINK3_MK:=	${PNET_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pnet
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pnet
-.endif
+.if !defined(PNET_BUILDLINK3_MK)
+PNET_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npnet}
-BUILDLINK_PACKAGES+=	pnet
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pnet
-
-.if !empty(PNET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pnet+=	pnet>=0.8.0
 BUILDLINK_PKGSRCDIR.pnet?=	../../lang/pnet
-.endif	# PNET_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
+.endif # PNET_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pnet
diff --git a/lang/pnetC/buildlink3.mk b/lang/pnetC/buildlink3.mk
index 781322303a9..1369abc06d9 100644
--- a/lang/pnetC/buildlink3.mk
+++ b/lang/pnetC/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PNETC_BUILDLINK3_MK:=	${PNETC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pnetC
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pnetC
-.endif
+.if !defined(PNETC_BUILDLINK3_MK)
+PNETC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NpnetC}
-BUILDLINK_PACKAGES+=	pnetC
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pnetC
-
-.if !empty(PNETC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pnetC+=	pnetC>=0.6.4
 BUILDLINK_ABI_DEPENDS.pnetC?=	pnetC>=0.6.6nb2
 BUILDLINK_PKGSRCDIR.pnetC?=	../../lang/pnetC
-.endif	# PNETC_BUILDLINK3_MK
 
 .include "../../lang/pnet/buildlink3.mk"
+.endif # PNETC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pnetC
diff --git a/lang/pnetlib/buildlink3.mk b/lang/pnetlib/buildlink3.mk
index a235df4cf12..43293e74596 100644
--- a/lang/pnetlib/buildlink3.mk
+++ b/lang/pnetlib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PNETLIB_BUILDLINK3_MK:=	${PNETLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pnetlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pnetlib
-.endif
+.if !defined(PNETLIB_BUILDLINK3_MK)
+PNETLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npnetlib}
-BUILDLINK_PACKAGES+=	pnetlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pnetlib
-
-.if !empty(PNETLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pnetlib+=	pnetlib>=0.6.4
 BUILDLINK_ABI_DEPENDS.pnetlib+=	pnetlib>=0.6.6nb2
 BUILDLINK_PKGSRCDIR.pnetlib?=	../../lang/pnetlib
-.endif	# PNETLIB_BUILDLINK3_MK
 
 .include "../../lang/pnet/buildlink3.mk"
+.endif # PNETLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pnetlib
diff --git a/lang/python23/buildlink3.mk b/lang/python23/buildlink3.mk
index a20117d9183..99dfd1b6864 100644
--- a/lang/python23/buildlink3.mk
+++ b/lang/python23/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/01/23 03:05:53 dsainty Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:51 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PYTHON23_BUILDLINK3_MK:=	${PYTHON23_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	python23
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	python23
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython23}
-BUILDLINK_PACKAGES+=	python23
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python23
+.if !defined(PYTHON23_BUILDLINK3_MK)
+PYTHON23_BUILDLINK3_MK:=
 
-.if !empty(PYTHON23_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.python23+=	python23>=2.3
 BUILDLINK_ABI_DEPENDS.python23?=	python23>=2.3.5nb6
 BUILDLINK_PKGSRCDIR.python23?=	../../lang/python23
@@ -23,10 +16,9 @@ BUILDLINK_DEPMETHOD.python23?=	${BUILDLINK_DEPMETHOD.python}
 BUILDLINK_INCDIRS.python23+=	include/python2.3
 BUILDLINK_LIBDIRS.python23+=	lib/python2.3/config
 BUILDLINK_TRANSFORM+=		l:python:python2.3
+.endif # PYTHON23_BUILDLINK3_MK
 
-.endif	# PYTHON23_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-python23
 
 .include "../../mk/bsd.fast.prefs.mk"
 .if ${OPSYS} != "IRIX"
diff --git a/lang/python24/buildlink3.mk b/lang/python24/buildlink3.mk
index bd4e7e762fb..fd8067573dd 100644
--- a/lang/python24/buildlink3.mk
+++ b/lang/python24/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/01/23 03:05:53 dsainty Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:51 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PYTHON24_BUILDLINK3_MK:=	${PYTHON24_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	python24
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	python24
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython24}
-BUILDLINK_PACKAGES+=	python24
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python24
+.if !defined(PYTHON24_BUILDLINK3_MK)
+PYTHON24_BUILDLINK3_MK:=
 
-.if !empty(PYTHON24_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.python24+=	python24>=2.4
 BUILDLINK_ABI_DEPENDS.python24?=	python24>=2.4.2nb4
 BUILDLINK_PKGSRCDIR.python24?=	../../lang/python24
@@ -23,10 +16,9 @@ BUILDLINK_DEPMETHOD.python24?=	${BUILDLINK_DEPMETHOD.python}
 BUILDLINK_INCDIRS.python24+=	include/python2.4
 BUILDLINK_LIBDIRS.python24+=	lib/python2.4/config
 BUILDLINK_TRANSFORM+=		l:python:python2.4
+.endif # PYTHON24_BUILDLINK3_MK
 
-.endif	# PYTHON24_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-python24
 
 .include "../../mk/bsd.fast.prefs.mk"
 .if ${OPSYS} != "IRIX"
diff --git a/lang/python25/buildlink3.mk b/lang/python25/buildlink3.mk
index 34c92fd4a6b..046af0b6d14 100644
--- a/lang/python25/buildlink3.mk
+++ b/lang/python25/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/01/23 03:05:53 dsainty Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PYTHON25_BUILDLINK3_MK:=	${PYTHON25_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	python25
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	python25
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython25}
-BUILDLINK_PACKAGES+=	python25
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python25
+.if !defined(PYTHON25_BUILDLINK3_MK)
+PYTHON25_BUILDLINK3_MK:=
 
-.if !empty(PYTHON25_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.python25+=	python25>=2.5
 BUILDLINK_ABI_DEPENDS.python25+=	python25>=2.5.2
 BUILDLINK_PKGSRCDIR.python25?=		../../lang/python25
@@ -24,8 +17,6 @@ BUILDLINK_INCDIRS.python25+=	include/python2.5
 BUILDLINK_LIBDIRS.python25+=	lib/python2.5/config
 BUILDLINK_TRANSFORM+=		l:python:python2.5
 
-.endif	# PYTHON25_BUILDLINK3_MK
-
 .include "../../mk/bsd.fast.prefs.mk"
 .if ${OPSYS} != "IRIX"
 .  include "../../mk/bdb.buildlink3.mk"
@@ -34,5 +25,6 @@ BUILDLINK_TRANSFORM+=		l:python:python2.5
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # PYTHON25_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-python25
diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk
index 1a11fd04caf..c9426dc097f 100644
--- a/lang/ruby/buildlink3.mk
+++ b/lang/ruby/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:56 jlam Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-RUBY_BUILDLINK3_MK:=	${RUBY_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:52 joerg Exp $
 
 .if !defined(_RUBYVERSION_MK)
 .include "../../lang/ruby/rubyversion.mk"
 .endif
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	${RUBY_BASE}
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${RUBY_BASE}}
-BUILDLINK_PACKAGES+=	${RUBY_BASE}
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${RUBY_BASE}
+BUILDLINK_TREE+=	${RUBY_BASE}
 
-.if !empty(RUBY_BUILDLINK3_MK:M+)
+.if !defined(RUBY_BUILDLINK3_MK)
+RUBY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_REQD}
 BUILDLINK_ABI_DEPENDS.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_VERSION}
@@ -31,7 +23,6 @@ buildlink-bin-ruby:
 	if ${TEST} -f $$f; then \
 		${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \
 	fi
+.endif # RUBY_BUILDLINK3_MK
 
-.endif	# RUBY_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-${RUBY_BASE}
diff --git a/lang/see/buildlink3.mk b/lang/see/buildlink3.mk
index 84439fbee5c..5e16b8eae4b 100644
--- a/lang/see/buildlink3.mk
+++ b/lang/see/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/11/06 07:50:56 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:52 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SEE_BUILDLINK3_MK:=	${SEE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	see
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	see
-.endif
+.if !defined(SEE_BUILDLINK3_MK)
+SEE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsee}
-BUILDLINK_PACKAGES+=	see
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}see
-
-.if ${SEE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.see+=	see>=3.0.1376
 BUILDLINK_PKGSRCDIR.see?=	../../lang/see
-.endif	# SEE_BUILDLINK3_MK
 
 .include "../../devel/readline/buildlink3.mk"
+.endif # SEE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-see
diff --git a/lang/sigscheme/buildlink3.mk b/lang/sigscheme/buildlink3.mk
index d024dcede92..82fb86f40c6 100644
--- a/lang/sigscheme/buildlink3.mk
+++ b/lang/sigscheme/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/29 13:11:14 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SIGSCHEME_BUILDLINK3_MK:=	${SIGSCHEME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sigscheme
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	sigscheme
-.endif
+.if !defined(SIGSCHEME_BUILDLINK3_MK)
+SIGSCHEME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsigscheme}
-BUILDLINK_PACKAGES+=	sigscheme
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sigscheme
-
-.if ${SIGSCHEME_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.sigscheme+=	sigscheme>=0.8.0
 BUILDLINK_PKGSRCDIR.sigscheme?=	../../lang/sigscheme
-.endif	# SIGSCHEME_BUILDLINK3_MK
 
 .include "../../devel/libgcroots/buildlink3.mk"
+.endif # SIGSCHEME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sigscheme
diff --git a/lang/spidermonkey/buildlink3.mk b/lang/spidermonkey/buildlink3.mk
index e4b4d86a02d..07ef71bcd74 100644
--- a/lang/spidermonkey/buildlink3.mk
+++ b/lang/spidermonkey/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/12/12 21:52:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SPIDERMONKEY_BUILDLINK3_MK:=	${SPIDERMONKEY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	spidermonkey
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	spidermonkey
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspidermonkey}
-BUILDLINK_PACKAGES+=	spidermonkey
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}spidermonkey
+.if !defined(SPIDERMONKEY_BUILDLINK3_MK)
+SPIDERMONKEY_BUILDLINK3_MK:=
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(SPIDERMONKEY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.spidermonkey+=	spidermonkey>=1.5
 .if ${OPSYS} == "Darwin"
 BUILDLINK_ABI_DEPENDS.spidermonkey?=	spidermonkey>=1.5nb6
@@ -21,9 +14,9 @@ BUILDLINK_ABI_DEPENDS.spidermonkey?=	spidermonkey>=1.5nb6
 BUILDLINK_ABI_DEPENDS.spidermonkey?=	spidermonkey>=1.5nb8
 .endif
 BUILDLINK_PKGSRCDIR.spidermonkey?=	../../lang/spidermonkey
-.endif	# SPIDERMONKEY_BUILDLINK3_MK
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/nspr/buildlink3.mk"
+.endif # SPIDERMONKEY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-spidermonkey
diff --git a/lang/sun-jdk14/buildlink3.mk b/lang/sun-jdk14/buildlink3.mk
index 326c14660d9..46ed1d51dc9 100644
--- a/lang/sun-jdk14/buildlink3.mk
+++ b/lang/sun-jdk14/buildlink3.mk
@@ -1,17 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SUN_JDK14_BUILDLINK3_MK:=	${SUN_JDK14_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sun-jdk14
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sun-jdk14
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jdk14}
-BUILDLINK_PACKAGES+=	sun-jdk14
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk14
-
-.if !empty(SUN_JDK14_BUILDLINK3_MK:M+)
+.if !defined(SUN_JDK14_BUILDLINK3_MK)
+SUN_JDK14_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sun-jdk14+=	sun-jdk14-[0-9]*
 BUILDLINK_ABI_DEPENDS.sun-jdk14?=	sun-jdk14>=2.11
@@ -25,7 +17,6 @@ BUILDLINK_CPPFLAGS.sun-jdk14+=						\
 	-I${BUILDLINK_JAVA_PREFIX.sun-jre14}/include/linux
 
 .include "../../lang/sun-jre14/buildlink3.mk"
+.endif # SUN_JDK14_BUILDLINK3_MK
 
-.endif	# SUN_JDK14_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sun-jdk14
diff --git a/lang/sun-jdk15/buildlink3.mk b/lang/sun-jdk15/buildlink3.mk
index a496d4bf7b8..f60ceab0294 100644
--- a/lang/sun-jdk15/buildlink3.mk
+++ b/lang/sun-jdk15/buildlink3.mk
@@ -1,17 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SUN_JDK15_BUILDLINK3_MK:=	${SUN_JDK15_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sun-jdk15
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sun-jdk15
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jdk15}
-BUILDLINK_PACKAGES+=	sun-jdk15
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk15
-
-.if !empty(SUN_JDK15_BUILDLINK3_MK:M+)
+.if !defined(SUN_JDK15_BUILDLINK3_MK)
+SUN_JDK15_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sun-jdk15+=	sun-jdk15-[0-9]*
 BUILDLINK_ABI_DEPENDS.sun-jdk15?=	sun-jdk15>=5.0.6nb1
@@ -25,7 +17,6 @@ BUILDLINK_CPPFLAGS.sun-jdk15=						\
 	-I${BUILDLINK_JAVA_PREFIX.sun-jre15}/include/linux
 
 .include "../../lang/sun-jre15/buildlink3.mk"
+.endif # SUN_JDK15_BUILDLINK3_MK
 
-.endif	# SUN_JDK15_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sun-jdk15
diff --git a/lang/sun-jdk6/buildlink3.mk b/lang/sun-jdk6/buildlink3.mk
index f2ee33cb0e3..e64214c82d9 100644
--- a/lang/sun-jdk6/buildlink3.mk
+++ b/lang/sun-jdk6/buildlink3.mk
@@ -1,17 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/01/20 02:31:48 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SUN_JDK6_BUILDLINK3_MK:=	${SUN_JDK6_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sun-jdk6
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sun-jdk6
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jdk6}
-BUILDLINK_PACKAGES+=	sun-jdk6
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk6
-
-.if !empty(SUN_JDK6_BUILDLINK3_MK:M+)
+.if !defined(SUN_JDK6_BUILDLINK3_MK)
+SUN_JDK6_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sun-jdk6+=	sun-jdk6-[0-9]*
 BUILDLINK_ABI_DEPENDS.sun-jdk6?=	sun-jdk6>=6.0.4
@@ -25,7 +17,6 @@ BUILDLINK_CPPFLAGS.sun-jdk6=						\
 	-I${BUILDLINK_JAVA_PREFIX.sun-jre6}/include/linux
 
 .include "../../lang/sun-jre6/buildlink3.mk"
+.endif # SUN_JDK6_BUILDLINK3_MK
 
-.endif	# SUN_JDK6_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sun-jdk6
diff --git a/lang/sun-jre14/buildlink3.mk b/lang/sun-jre14/buildlink3.mk
index f064b3004af..b45bdf3967d 100644
--- a/lang/sun-jre14/buildlink3.mk
+++ b/lang/sun-jre14/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SUN_JRE14_BUILDLINK3_MK:=	${SUN_JRE14_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sun-jre14
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sun-jre14
-.endif
+.if !defined(SUN_JRE14_BUILDLINK3_MK)
+SUN_JRE14_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre14}
-BUILDLINK_PACKAGES+=	sun-jre14
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre14
-
-.if !empty(SUN_JRE14_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sun-jre14+=		sun-jre14-[0-9]*
 BUILDLINK_ABI_DEPENDS.sun-jre14?=	sun-jre14>=2.11
 BUILDLINK_PKGSRCDIR.sun-jre14?=		../../lang/sun-jre14
 BUILDLINK_JAVA_PREFIX.sun-jre14=	${PREFIX}/java/sun-1.4
-.endif	# SUN_JRE14_BUILDLINK3_MK
 
 UNLIMIT_RESOURCES+=	datasize	# Must be at least 131204
+.endif # SUN_JRE14_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sun-jre14
diff --git a/lang/sun-jre15/buildlink3.mk b/lang/sun-jre15/buildlink3.mk
index 54cf2355153..006edeb441e 100644
--- a/lang/sun-jre15/buildlink3.mk
+++ b/lang/sun-jre15/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SUN_JRE15_BUILDLINK3_MK:=	${SUN_JRE15_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sun-jre15
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sun-jre15
-.endif
+.if !defined(SUN_JRE15_BUILDLINK3_MK)
+SUN_JRE15_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre15}
-BUILDLINK_PACKAGES+=	sun-jre15
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre15
-
-.if !empty(SUN_JRE15_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sun-jre15+=		sun-jre15-[0-9]*
 BUILDLINK_ABI_DEPENDS.sun-jre15?=		sun-jre15>=5.0.6nb2
 BUILDLINK_PKGSRCDIR.sun-jre15?=		../../lang/sun-jre15
 BUILDLINK_JAVA_PREFIX.sun-jre15=	${PREFIX}/java/sun-1.5
 
 UNLIMIT_RESOURCES+=	datasize	# Must be at least 131204
-.endif	# SUN_JRE15_BUILDLINK3_MK
+.endif # SUN_JRE15_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sun-jre15
diff --git a/lang/sun-jre6/buildlink3.mk b/lang/sun-jre6/buildlink3.mk
index 0c0431965d2..18b3d4e6946 100644
--- a/lang/sun-jre6/buildlink3.mk
+++ b/lang/sun-jre6/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/01/20 09:21:35 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SUN_JRE6_BUILDLINK3_MK:=	${SUN_JRE6_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sun-jre6
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sun-jre6
-.endif
+.if !defined(SUN_JRE6_BUILDLINK3_MK)
+SUN_JRE6_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre6}
-BUILDLINK_PACKAGES+=	sun-jre6
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre6
-
-.if !empty(SUN_JRE6_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sun-jre6+=		sun-jre6-[0-9]*
 BUILDLINK_ABI_DEPENDS.sun-jre6?=		sun-jre6>=6.0.4
 BUILDLINK_PKGSRCDIR.sun-jre6?=		../../lang/sun-jre6
 BUILDLINK_JAVA_PREFIX.sun-jre6=	${PREFIX}/java/sun-6
 
 UNLIMIT_RESOURCES+=	datasize	# Must be at least 131204
-.endif	# SUN_JRE6_BUILDLINK3_MK
+.endif # SUN_JRE6_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sun-jre6
diff --git a/lang/swi-prolog-lite/buildlink3.mk b/lang/swi-prolog-lite/buildlink3.mk
index aa9e87ddba8..1e5235e5889 100644
--- a/lang/swi-prolog-lite/buildlink3.mk
+++ b/lang/swi-prolog-lite/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SWI_PROLOG_LITE_BUILDLINK3_MK:=	${SWI_PROLOG_LITE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	swi-prolog-lite
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	swi-prolog-lite
-.endif
+.if !defined(SWI_PROLOG_LITE_BUILDLINK3_MK)
+SWI_PROLOG_LITE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswi-prolog-lite}
-BUILDLINK_PACKAGES+=	swi-prolog-lite
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}swi-prolog-lite
-
-.if !empty(SWI_PROLOG_LITE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.swi-prolog-lite+=	swi-prolog-lite>=5.2.9
 BUILDLINK_PKGSRCDIR.swi-prolog-lite?=	../../lang/swi-prolog-lite
-.endif	# SWI_PROLOG_LITE_BUILDLINK3_MK
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.endif # SWI_PROLOG_LITE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-swi-prolog-lite
diff --git a/lang/tcl-expect/buildlink3.mk b/lang/tcl-expect/buildlink3.mk
index e81a6e5763c..055a643f845 100644
--- a/lang/tcl-expect/buildlink3.mk
+++ b/lang/tcl-expect/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TCL_EXPECT_BUILDLINK3_MK:=	${TCL_EXPECT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcl-expect
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcl-expect
-.endif
+.if !defined(TCL_EXPECT_BUILDLINK3_MK)
+TCL_EXPECT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-expect}
-BUILDLINK_PACKAGES+=	tcl-expect
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-expect
-
-.if !empty(TCL_EXPECT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-expect+=	tcl-expect>=5.38.0nb1
 BUILDLINK_ABI_DEPENDS.tcl-expect+=	tcl-expect>=5.38.0nb2
 BUILDLINK_PKGSRCDIR.tcl-expect?=	../../lang/tcl-expect
-.endif	# TCL_EXPECT_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
+.endif # TCL_EXPECT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcl-expect
diff --git a/lang/tcl-itcl-current/buildlink3.mk b/lang/tcl-itcl-current/buildlink3.mk
index 228ceaa26c5..377a5a6d21f 100644
--- a/lang/tcl-itcl-current/buildlink3.mk
+++ b/lang/tcl-itcl-current/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:53 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-TCL_ITCL_CURRENT_BUILDLINK3_MK:=	${TCL_ITCL_CURRENT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcl-itcl-current
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcl-itcl-current
-.endif
+.if !defined(TCL_ITCL_CURRENT_BUILDLINK3_MK)
+TCL_ITCL_CURRENT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-itcl-current}
-BUILDLINK_PACKAGES+=	tcl-itcl-current
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-itcl-current
-
-.if !empty(TCL_ITCL_CURRENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-itcl-current+=		tcl-itcl-current>=20040920
 BUILDLINK_ABI_DEPENDS.tcl-itcl-current?=	tcl-itcl-current>=20040920nb4
 BUILDLINK_PKGSRCDIR.tcl-itcl-current?=		../../lang/tcl-itcl-current
@@ -19,9 +12,8 @@ BUILDLINK_PKGSRCDIR.tcl-itcl-current?=		../../lang/tcl-itcl-current
 BUILDLINK_TRANSFORM+=	l:itcl:itcl33
 BUILDLINK_TRANSFORM+=	l:itk:itk33
 
-.endif	# TCL_ITCL_CURRENT_BUILDLINK3_MK
-
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
+.endif # TCL_ITCL_CURRENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcl-itcl-current
diff --git a/lang/tcl-itcl/buildlink3.mk b/lang/tcl-itcl/buildlink3.mk
index c9dbd15a77a..bdbb411965e 100644
--- a/lang/tcl-itcl/buildlink3.mk
+++ b/lang/tcl-itcl/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TCL_ITCL_BUILDLINK3_MK:=	${TCL_ITCL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcl-itcl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcl-itcl
-.endif
+.if !defined(TCL_ITCL_BUILDLINK3_MK)
+TCL_ITCL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-itcl}
-BUILDLINK_PACKAGES+=	tcl-itcl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-itcl
-
-.if !empty(TCL_ITCL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-itcl+=	tcl-itcl>=3.2.1
 BUILDLINK_ABI_DEPENDS.tcl-itcl?=	tcl-itcl>=3.2.1nb1
 BUILDLINK_PKGSRCDIR.tcl-itcl?=	../../lang/tcl-itcl
-.endif	# TCL_ITCL_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
+.endif # TCL_ITCL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcl-itcl
diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk
index d2fd87ea170..f9385ec3b85 100644
--- a/lang/tcl-otcl/buildlink3.mk
+++ b/lang/tcl-otcl/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TCL_OTCL_BUILDLINK3_MK:=	${TCL_OTCL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcl-otcl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcl-otcl
-.endif
+.if !defined(TCL_OTCL_BUILDLINK3_MK)
+TCL_OTCL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-otcl}
-BUILDLINK_PACKAGES+=	tcl-otcl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-otcl
-
-.if !empty(TCL_OTCL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-otcl+=	tcl-otcl>=1.8
 BUILDLINK_ABI_DEPENDS.tcl-otcl?=	tcl-otcl>=1.11nb1
 BUILDLINK_PKGSRCDIR.tcl-otcl?=	../../lang/tcl-otcl
-.endif	# TCL_OTCL_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
+.endif # TCL_OTCL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcl-otcl
diff --git a/lang/tcl-tclX/buildlink3.mk b/lang/tcl-tclX/buildlink3.mk
index a8a6d783ba0..41c2d5be2bb 100644
--- a/lang/tcl-tclX/buildlink3.mk
+++ b/lang/tcl-tclX/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TCL_TCLX_BUILDLINK3_MK:=	${TCL_TCLX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcl-tclX
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcl-tclX
-.endif
+.if !defined(TCL_TCLX_BUILDLINK3_MK)
+TCL_TCLX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-tclX}
-BUILDLINK_PACKAGES+=	tcl-tclX
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-tclX
-
-.if !empty(TCL_TCLX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-tclX+=	tcl-tclX>=8.3.5
 BUILDLINK_ABI_DEPENDS.tcl-tclX?=	tcl-tclX>=8.3.5nb3
 BUILDLINK_PKGSRCDIR.tcl-tclX?=	../../lang/tcl-tclX
-.endif	# TCL_TCLX_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
+.endif # TCL_TCLX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcl-tclX
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index 4c1be953873..5d68998fd61 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcl
-.endif
+.if !defined(TCL_BUILDLINK3_MK)
+TCL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl}
-BUILDLINK_PACKAGES+=	tcl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl
-
-.if !empty(TCL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl+=	tcl>=8.4.6nb1
 BUILDLINK_ABI_DEPENDS.tcl+=	tcl>=8.4.7nb1
 BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
@@ -28,8 +21,8 @@ TCLCONFIG_SH?=		${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/tcl$$/ \
 				{ print "@comment in tcl: " $$0; next; }
-.endif	# TCL_BUILDLINK3_MK
 
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # TCL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcl
diff --git a/lang/tcl83/buildlink3.mk b/lang/tcl83/buildlink3.mk
index eb09fd86271..8fa5e27e5fc 100644
--- a/lang/tcl83/buildlink3.mk
+++ b/lang/tcl83/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.6 2007/05/21 09:56:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcl
-.endif
+.if !defined(TCL_BUILDLINK3_MK)
+TCL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl}
-BUILDLINK_PACKAGES+=	tcl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl
-
-.if !empty(TCL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl+=		tcl>=8.3.4<8.4
 BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl83
 
@@ -23,7 +16,6 @@ BUILDLINK_FILES.tcl=	bin/tclsh*
 BUILDLINK_TRANSFORM+=	l:tcl:tcl83
 
 TCLCONFIG_SH?=		${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
+.endif # TCL_BUILDLINK3_MK
 
-.endif	# TCL_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcl
diff --git a/lang/vala/buildlink3.mk b/lang/vala/buildlink3.mk
index 11d1f921977..9c1a25b23ec 100644
--- a/lang/vala/buildlink3.mk
+++ b/lang/vala/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/05 21:56:29 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-VALA_BUILDLINK3_MK:=	${VALA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	vala
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	vala
-.endif
+.if !defined(VALA_BUILDLINK3_MK)
+VALA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvala}
-BUILDLINK_PACKAGES+=	vala
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vala
-
-.if ${VALA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.vala+=	vala>=0.5.7
 BUILDLINK_PKGSRCDIR.vala?=	../../lang/vala
-.endif	# VALA_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.endif # VALA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-vala