Change the format of BUILDLINK_ORDER to contain depth information as well,

and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.

For example, "make show-buildlink3" in fonts/Xft2 displays:

	zlib
	fontconfig
	    iconv
	    zlib
	    freetype2
	    expat
	freetype2
	Xrender
	    renderproto

62 files changed, 124 insertions, 124 deletions

diff --git a/lang/Cg-compiler/buildlink3.mk b/lang/Cg-compiler/buildlink3.mk
index 7b4637f54dd..9ef13d7d3cc 100644
--- a/lang/Cg-compiler/buildlink3.mk
+++ b/lang/Cg-compiler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:21 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CG_COMPILER_BUILDLINK3_MK:=	${CG_COMPILER_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	Cg-compiler
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NCg-compiler}
 BUILDLINK_PACKAGES+=	Cg-compiler
-BUILDLINK_ORDER+=	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
diff --git a/lang/blackdown-jdk13/buildlink3.mk b/lang/blackdown-jdk13/buildlink3.mk
index eb3a6628a36..f8b1f4d1214 100644
--- a/lang/blackdown-jdk13/buildlink3.mk
+++ b/lang/blackdown-jdk13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BLACKDOWN_JDK13_BUILDLINK3_MK:=	${BLACKDOWN_JDK13_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	blackdown-jdk13
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblackdown-jdk13}
 BUILDLINK_PACKAGES+=	blackdown-jdk13
-BUILDLINK_ORDER+=	blackdown-jdk13
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}blackdown-jdk13
 
 .if !empty(BLACKDOWN_JDK13_BUILDLINK3_MK:M+)
 
diff --git a/lang/blackdown-jre13/buildlink3.mk b/lang/blackdown-jre13/buildlink3.mk
index c23ff47e577..37348bd735a 100644
--- a/lang/blackdown-jre13/buildlink3.mk
+++ b/lang/blackdown-jre13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BLACKDOWN_JRE13_BUILDLINK3_MK:=	${BLACKDOWN_JRE13_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	blackdown-jre13
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblackdown-jre13}
 BUILDLINK_PACKAGES+=	blackdown-jre13
-BUILDLINK_ORDER+=	blackdown-jre13
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}blackdown-jre13
 
 .if !empty(BLACKDOWN_JRE13_BUILDLINK3_MK:M+)
 
diff --git a/lang/cdl3/buildlink3.mk b/lang/cdl3/buildlink3.mk
index 0c9f03c1fdc..4f304ac132a 100644
--- a/lang/cdl3/buildlink3.mk
+++ b/lang/cdl3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CDL3_BUILDLINK3_MK:=	${CDL3_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	cdl3
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdl3}
 BUILDLINK_PACKAGES+=	cdl3
-BUILDLINK_ORDER+=	cdl3
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdl3
 
 .if !empty(CDL3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cdl3+=	cdl3>=1.2.5
diff --git a/lang/elk/buildlink3.mk b/lang/elk/buildlink3.mk
index d84694bfffa..4db32edac0c 100644
--- a/lang/elk/buildlink3.mk
+++ b/lang/elk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ELK_BUILDLINK3_MK:=	${ELK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	elk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nelk}
 BUILDLINK_PACKAGES+=	elk
-BUILDLINK_ORDER+=	elk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}elk
 
 .if !empty(ELK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.elk+=	elk>=3.99.6
diff --git a/lang/erlang/buildlink3.mk b/lang/erlang/buildlink3.mk
index b863c2b2f08..550132a890e 100644
--- a/lang/erlang/buildlink3.mk
+++ b/lang/erlang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 ERLANG_BUILDLINK3_MK:=		${ERLANG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=		erlang
 
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nerlang}
 BUILDLINK_PACKAGES+=		erlang
-BUILDLINK_ORDER+=		erlang
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}erlang
 
 .if !empty(ERLANG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.erlang+=	erlang>=10.1
diff --git a/lang/ezm3/buildlink3.mk b/lang/ezm3/buildlink3.mk
index fbf767dcfb4..22e90187876 100644
--- a/lang/ezm3/buildlink3.mk
+++ b/lang/ezm3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EZM3_BUILDLINK3_MK:=	${EZM3_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ezm3
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nezm3}
 BUILDLINK_PACKAGES+=	ezm3
-BUILDLINK_ORDER+=	ezm3
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ezm3
 
 .if !empty(EZM3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ezm3+=	ezm3>=1.1nb1
diff --git a/lang/f2c/buildlink3.mk b/lang/f2c/buildlink3.mk
index b0769588e6a..dfcb7516bcd 100644
--- a/lang/f2c/buildlink3.mk
+++ b/lang/f2c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 F2C_BUILDLINK3_MK:=	${F2C_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	f2c
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nf2c}
 BUILDLINK_PACKAGES+=	f2c
-BUILDLINK_ORDER+=	f2c
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}f2c
 
 .if !empty(F2C_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.f2c+=		f2c>=20001205nb3
diff --git a/lang/gauche/buildlink3.mk b/lang/gauche/buildlink3.mk
index 1c17064ce0d..696d7322d1f 100644
--- a/lang/gauche/buildlink3.mk
+++ b/lang/gauche/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAUCHE_BUILDLINK3_MK:=	${GAUCHE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	Gauche
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGauche}
 BUILDLINK_PACKAGES+=	Gauche
-BUILDLINK_ORDER+=	Gauche
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Gauche
 
 .if !empty(GAUCHE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Gauche+=	Gauche>=0.8.1
diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk
index dd0115f89ec..febf3729e07 100644
--- a/lang/gcc/buildlink3.mk
+++ b/lang/gcc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC_BUILDLINK3_MK:=	${GCC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	gcc
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc}
 BUILDLINK_PACKAGES+=	gcc
-BUILDLINK_ORDER+=	gcc
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc
 
 .if !empty(GCC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gcc+=		gcc>=${_GCC_REQD}
diff --git a/lang/gcc3-ada/buildlink3.mk b/lang/gcc3-ada/buildlink3.mk
index e36b6bb1003..d733024b36d 100644
--- a/lang/gcc3-ada/buildlink3.mk
+++ b/lang/gcc3-ada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
 GCC3_ADA_BUILDLINK3_MK:=  ${GCC3_ADA_BUILDLINK3_MK}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+=     gcc3-ada
 
 BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:Ngcc3-ada}
 BUILDLINK_PACKAGES+=    gcc3-ada
-BUILDLINK_ORDER+=    gcc3-ada
+BUILDLINK_ORDER:=    ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-ada
 
 .if !empty(GCC3_ADA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gcc3-ada+=      gcc3-ada>=3.3.3
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index e9dd2134f6d..30a60db8f8a 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_CXX_BUILDLINK3_MK:=	${GCC3_CXX_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	gcc3-cxx
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-cxx}
 BUILDLINK_PACKAGES+=	gcc3-cxx
-BUILDLINK_ORDER+=	gcc3-cxx
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-cxx
 
 .if !empty(GCC3_CXX_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 5406b899cc8..321a68a1cdb 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3_C_BUILDLINK3_MK:=	${GCC3_C_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	gcc3-c
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-c}
 BUILDLINK_PACKAGES+=	gcc3-c
-BUILDLINK_ORDER+=	gcc3-c
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-c
 
 .if !empty(GCC3_C_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index 6148c8ced4c..5ca6387dbf3 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_F77_BUILDLINK3_MK:=	${GCC3_F77_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	gcc3-f77
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-f77}
 BUILDLINK_PACKAGES+=	gcc3-f77
-BUILDLINK_ORDER+=	gcc3-f77
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-f77
 
 .if !empty(GCC3_F77_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index 3d779e87144..99a1e4308b7 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_JAVA_BUILDLINK3_MK:=	${GCC3_JAVA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	gcc3-java
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-java}
 BUILDLINK_PACKAGES+=	gcc3-java
-BUILDLINK_ORDER+=	gcc3-java
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-java
 
 .if !empty(GCC3_JAVA_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index 03066d04f98..4badf45713c 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_OBJC_BUILDLINK3_MK:=	${GCC3_OBJC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	gcc3-objc
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-objc}
 BUILDLINK_PACKAGES+=	gcc3-objc
-BUILDLINK_ORDER+=	gcc3-objc
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-objc
 
 .if !empty(GCC3_OBJC_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
diff --git a/lang/gcc34-ada/buildlink3.mk b/lang/gcc34-ada/buildlink3.mk
index e0c4dec91f8..7d8d03a6ab4 100644
--- a/lang/gcc34-ada/buildlink3.mk
+++ b/lang/gcc34-ada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCCADA_BUILDLINK3_MK:=	${GCCADA_BUILDLINK3_MK}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+=	gcc34-ada
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc34-ada}
 BUILDLINK_PACKAGES+=	gcc34-ada
-BUILDLINK_ORDER+=	gcc34-ada
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc34-ada
 
 .if !empty(GCCADA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gcc34-ada+=	gcc34-ada>=3.4.1nb4
diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk
index 6faa3989875..d955254f31e 100644
--- a/lang/gcc34/buildlink3.mk
+++ b/lang/gcc34/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:54 jlam Exp $
 
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
 GCC34_BUILDLINK3_MK:=  ${GCC34_BUILDLINK3_MK}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+=     gcc34
 
 BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:Ngcc34}
 BUILDLINK_PACKAGES+=    gcc34
-BUILDLINK_ORDER+=    gcc34
+BUILDLINK_ORDER:=    ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc34
 
 .if !empty(GCC34_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gcc34+=	gcc34>=${_GCC_REQD}
diff --git a/lang/ghc/buildlink3.mk b/lang/ghc/buildlink3.mk
index 56d7c3f23dd..05da58109e7 100644
--- a/lang/ghc/buildlink3.mk
+++ b/lang/ghc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GHC_BUILDLINK3_MK:=	${GHC_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ghc
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nghc}
 BUILDLINK_PACKAGES+=	ghc
-BUILDLINK_ORDER+=	ghc
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ghc
 
 .if !empty(GHC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ghc+=		ghc>=6.2.1nb1
diff --git a/lang/guile/buildlink3.mk b/lang/guile/buildlink3.mk
index cb2452623ae..0dc2de9724b 100644
--- a/lang/guile/buildlink3.mk
+++ b/lang/guile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GUILE_BUILDLINK3_MK:=	${GUILE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	guile
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile}
 BUILDLINK_PACKAGES+=	guile
-BUILDLINK_ORDER+=	guile
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile
 
 .if !empty(GUILE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.guile+=	guile>=1.6.3nb1
diff --git a/lang/guile14/buildlink3.mk b/lang/guile14/buildlink3.mk
index af969ebbd0b..6e9dd591532 100644
--- a/lang/guile14/buildlink3.mk
+++ b/lang/guile14/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GUILE14_BUILDLINK3_MK:=	${GUILE14_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	guile14
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile14}
 BUILDLINK_PACKAGES+=	guile14
-BUILDLINK_ORDER+=	guile14
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile14
 
 .if !empty(GUILE14_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.guile14+=	guile14>=1.4.1nb4
diff --git a/lang/jdk/buildlink3.mk b/lang/jdk/buildlink3.mk
index 4fd481eff3f..95204f03a7a 100644
--- a/lang/jdk/buildlink3.mk
+++ b/lang/jdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JDK_BUILDLINK3_MK:=	${JDK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	jdk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njdk}
 BUILDLINK_PACKAGES+=	jdk
-BUILDLINK_ORDER+=	jdk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jdk
 
 .if !empty(JDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.jdk+=	jdk>=1.1.8
diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk
index 0ee07907050..3f3f6526be2 100644
--- a/lang/kaffe/buildlink3.mk
+++ b/lang/kaffe/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KAFFE_BUILDLINK3_MK:=	${KAFFE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	kaffe
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkaffe}
 BUILDLINK_PACKAGES+=	kaffe
-BUILDLINK_ORDER+=	kaffe
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kaffe
 
 .if !empty(KAFFE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kaffe+=	kaffe>=1.1.7
diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk
index d5451f3ae5c..cd46d9c859f 100644
--- a/lang/librep/buildlink3.mk
+++ b/lang/librep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBREP_BUILDLINK3_MK:=	${LIBREP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	librep
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrep}
 BUILDLINK_PACKAGES+=	librep
-BUILDLINK_ORDER+=	librep
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librep
 
 .if !empty(LIBREP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.librep+=	librep>=0.17
diff --git a/lang/libtcl-nothread/buildlink3.mk b/lang/libtcl-nothread/buildlink3.mk
index 13aeecca1a8..1557c1c5baf 100644
--- a/lang/libtcl-nothread/buildlink3.mk
+++ b/lang/libtcl-nothread/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCLNT_BUILDLINK3_MK:=	${TCLNT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tclnt
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntclnt}
 BUILDLINK_PACKAGES+=	tclnt
-BUILDLINK_ORDER+=	tclnt
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tclnt
 
 .if !empty(TCLNT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tclnt+=	libtcl-nothread>=8.4.6
diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk
index 22f7db6bcb0..1d320df78d6 100644
--- a/lang/lua/buildlink3.mk
+++ b/lang/lua/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LUA_BUILDLINK3_MK:=	${LUA_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	lua
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlua}
 BUILDLINK_PACKAGES+=	lua
-BUILDLINK_ORDER+=	lua
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lua
 
 .if !empty(LUA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lua+=	lua>=5.0.2
diff --git a/lang/lua4/buildlink3.mk b/lang/lua4/buildlink3.mk
index 3dfcc34d6ab..1dc34b0ae84 100644
--- a/lang/lua4/buildlink3.mk
+++ b/lang/lua4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LUA4_BUILDLINK3_MK:=	${LUA4_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	lua4
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlua4}
 BUILDLINK_PACKAGES+=	lua4
-BUILDLINK_ORDER+=	lua4
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lua4
 
 .if !empty(LUA4_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lua4+=	lua4>=4.0.1
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index f04756f57ae..9a755bc1772 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	mono
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmono}
 BUILDLINK_PACKAGES+=	mono
-BUILDLINK_ORDER+=	mono
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono
 
 .if !empty(MONO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mono+=	mono>=1.1.12.1
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index 1ca58df2a64..33dfccbc204 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OCAML_BUILDLINK3_MK:=	${OCAML_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ocaml
 
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nocaml}
 BUILDLINK_PACKAGES+=		ocaml
-BUILDLINK_ORDER+=		ocaml
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ocaml
 
 .if !empty(OCAML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
diff --git a/lang/parrot/buildlink3.mk b/lang/parrot/buildlink3.mk
index 261737cf21c..cf607df773f 100644
--- a/lang/parrot/buildlink3.mk
+++ b/lang/parrot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PARROT_BUILDLINK3_MK:=	${PARROT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	parrot
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nparrot}
 BUILDLINK_PACKAGES+=	parrot
-BUILDLINK_ORDER+=	parrot
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}parrot
 
 .if !empty(PARROT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.parrot+=		parrot>=0.4.0
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index d5820442836..5a3485d819f 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	perl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nperl}
 BUILDLINK_PACKAGES+=	perl
-BUILDLINK_ORDER+=	perl
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}perl
 
 .if !empty(PERL5_BUILDLINK3_MK:M+)
 .include "../../mk/bsd.prefs.mk"
diff --git a/lang/php5/buildlink3.mk b/lang/php5/buildlink3.mk
index 7a42774678f..fb49fa411ea 100644
--- a/lang/php5/buildlink3.mk
+++ b/lang/php5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PHP_BUILDLINK3_MK:=	${PHP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	php
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nphp}
 BUILDLINK_PACKAGES+=	php
-BUILDLINK_ORDER+=	php
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}php
 
 .if !empty(PHP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.php+=		php>=5.1.2
diff --git a/lang/pnet/buildlink3.mk b/lang/pnet/buildlink3.mk
index 0e0e06172a6..b4918d7a68e 100644
--- a/lang/pnet/buildlink3.mk
+++ b/lang/pnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNET_BUILDLINK3_MK:=	${PNET_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pnet
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npnet}
 BUILDLINK_PACKAGES+=	pnet
-BUILDLINK_ORDER+=	pnet
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pnet
 
 .if !empty(PNET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pnet+=	pnet>=0.6.4
diff --git a/lang/pnetC/buildlink3.mk b/lang/pnetC/buildlink3.mk
index f16b489e3d9..781322303a9 100644
--- a/lang/pnetC/buildlink3.mk
+++ b/lang/pnetC/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNETC_BUILDLINK3_MK:=	${PNETC_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pnetC
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NpnetC}
 BUILDLINK_PACKAGES+=	pnetC
-BUILDLINK_ORDER+=	pnetC
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pnetC
 
 .if !empty(PNETC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pnetC+=	pnetC>=0.6.4
diff --git a/lang/pnetlib/buildlink3.mk b/lang/pnetlib/buildlink3.mk
index 1426572e1e8..a235df4cf12 100644
--- a/lang/pnetlib/buildlink3.mk
+++ b/lang/pnetlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNETLIB_BUILDLINK3_MK:=	${PNETLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pnetlib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npnetlib}
 BUILDLINK_PACKAGES+=	pnetlib
-BUILDLINK_ORDER+=	pnetlib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pnetlib
 
 .if !empty(PNETLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pnetlib+=	pnetlib>=0.6.4
diff --git a/lang/py-extclass/buildlink3.mk b/lang/py-extclass/buildlink3.mk
index e27c28b6ce0..0e1afa390a2 100644
--- a/lang/py-extclass/buildlink3.mk
+++ b/lang/py-extclass/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYEXTCLASS_BUILDLINK3_MK:=	${PYEXTCLASS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pyextclass
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyextclass}
 BUILDLINK_PACKAGES+=	pyextclass
-BUILDLINK_ORDER+=	pyextclass
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyextclass
 
 .if !empty(PYEXTCLASS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pyextclass+=		py-extclass>=2.2.2nb1
diff --git a/lang/python15/buildlink3.mk b/lang/python15/buildlink3.mk
index 074cd2a398c..cb2edecfe0a 100644
--- a/lang/python15/buildlink3.mk
+++ b/lang/python15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON15_BUILDLINK3_MK:=	${PYTHON15_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	python15
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython15}
 BUILDLINK_PACKAGES+=	python15
-BUILDLINK_ORDER+=	python15
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python15
 
 .if !empty(PYTHON15_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.python15+=	python15>=1.5
diff --git a/lang/python20/buildlink3.mk b/lang/python20/buildlink3.mk
index d0d88eeed55..33a4c4ca71b 100644
--- a/lang/python20/buildlink3.mk
+++ b/lang/python20/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON20_BUILDLINK3_MK:=	${PYTHON20_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	python20
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython20}
 BUILDLINK_PACKAGES+=	python20
-BUILDLINK_ORDER+=	python20
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python20
 
 .if !empty(PYTHON20_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.python20+=	python20>=2.0
diff --git a/lang/python21/buildlink3.mk b/lang/python21/buildlink3.mk
index 6471d182c4e..745387dff18 100644
--- a/lang/python21/buildlink3.mk
+++ b/lang/python21/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON21_BUILDLINK3_MK:=	${PYTHON21_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	python21
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython21}
 BUILDLINK_PACKAGES+=	python21
-BUILDLINK_ORDER+=	python21
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python21
 
 .if !empty(PYTHON21_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.python21+=	python21>=2.1
diff --git a/lang/python22/buildlink3.mk b/lang/python22/buildlink3.mk
index 395956b7b34..8a9e1dab7cf 100644
--- a/lang/python22/buildlink3.mk
+++ b/lang/python22/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON22_BUILDLINK3_MK:=	${PYTHON22_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	python22
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython22}
 BUILDLINK_PACKAGES+=	python22
-BUILDLINK_ORDER+=	python22
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python22
 
 .if !empty(PYTHON22_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.python22+=	python22>=2.2
diff --git a/lang/python23-nth/buildlink3.mk b/lang/python23-nth/buildlink3.mk
index 1a2c71a1940..64f82736028 100644
--- a/lang/python23-nth/buildlink3.mk
+++ b/lang/python23-nth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON23_NTH_BUILDLINK3_MK:=	${PYTHON23_NTH_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	python23-nth
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython23-nth}
 BUILDLINK_PACKAGES+=	python23-nth
-BUILDLINK_ORDER+=	python23-nth
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python23-nth
 
 .if !empty(PYTHON23_NTH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.python23-nth+=	python23-nth>=2.3.4
diff --git a/lang/python23/buildlink3.mk b/lang/python23/buildlink3.mk
index c325c918d1b..466378648a5 100644
--- a/lang/python23/buildlink3.mk
+++ b/lang/python23/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:55 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON23_BUILDLINK3_MK:=	${PYTHON23_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	python23
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython23}
 BUILDLINK_PACKAGES+=	python23
-BUILDLINK_ORDER+=	python23
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python23
 
 .if !empty(PYTHON23_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.python23+=	python23>=2.3
diff --git a/lang/python24/buildlink3.mk b/lang/python24/buildlink3.mk
index 6bba9eb12fc..3d2687930cb 100644
--- a/lang/python24/buildlink3.mk
+++ b/lang/python24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON24_BUILDLINK3_MK:=	${PYTHON24_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	python24
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython24}
 BUILDLINK_PACKAGES+=	python24
-BUILDLINK_ORDER+=	python24
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python24
 
 .if !empty(PYTHON24_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.python24+=	python24>=2.4
diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk
index f9629a8debf..1a11fd04caf 100644
--- a/lang/ruby/buildlink3.mk
+++ b/lang/ruby/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RUBY_BUILDLINK3_MK:=	${RUBY_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_DEPENDS+=	${RUBY_BASE}
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${RUBY_BASE}}
 BUILDLINK_PACKAGES+=	${RUBY_BASE}
-BUILDLINK_ORDER+=	${RUBY_BASE}
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${RUBY_BASE}
 
 .if !empty(RUBY_BUILDLINK3_MK:M+)
 
diff --git a/lang/scsl-jdk15/buildlink3.mk b/lang/scsl-jdk15/buildlink3.mk
index d7e9aabf862..6cdbb07ebf8 100644
--- a/lang/scsl-jdk15/buildlink3.mk
+++ b/lang/scsl-jdk15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SCSL_JDK15_BUILDLINK3_MK:=	${SCSL_JDK15_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	scsl-jdk15
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nscsl-jdk15}
 BUILDLINK_PACKAGES+=	scsl-jdk15
-BUILDLINK_ORDER+=	scsl-jdk15
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}scsl-jdk15
 
 .if !empty(SCSL_JDK15_BUILDLINK3_MK:M+)
 
diff --git a/lang/scsl-jre15/buildlink3.mk b/lang/scsl-jre15/buildlink3.mk
index e18ef53db9a..6d269928d99 100644
--- a/lang/scsl-jre15/buildlink3.mk
+++ b/lang/scsl-jre15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SCSL_JRE15_BUILDLINK3_MK:=	${SCSL_JRE15_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	scsl-jre15
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nscsl-jre15}
 BUILDLINK_PACKAGES+=	scsl-jre15
-BUILDLINK_ORDER+=	scsl-jre15
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}scsl-jre15
 
 .if !empty(SCSL_JRE15_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.scsl-jre15+=		scsl-jre15-[0-9]*
diff --git a/lang/spidermonkey/buildlink3.mk b/lang/spidermonkey/buildlink3.mk
index 4b7b3317d60..e9dd6c7503d 100644
--- a/lang/spidermonkey/buildlink3.mk
+++ b/lang/spidermonkey/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SPIDERMONKEY_BUILDLINK3_MK:=	${SPIDERMONKEY_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	spidermonkey
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspidermonkey}
 BUILDLINK_PACKAGES+=	spidermonkey
-BUILDLINK_ORDER+=	spidermonkey
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}spidermonkey
 
 .if !empty(SPIDERMONKEY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.spidermonkey+=	spidermonkey>=1.5
diff --git a/lang/sun-jdk13/buildlink3.mk b/lang/sun-jdk13/buildlink3.mk
index c424fa364b9..195f0cb330e 100644
--- a/lang/sun-jdk13/buildlink3.mk
+++ b/lang/sun-jdk13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JDK13_BUILDLINK3_MK:=	${SUN_JDK13_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	sun-jdk13
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jdk13}
 BUILDLINK_PACKAGES+=	sun-jdk13
-BUILDLINK_ORDER+=	sun-jdk13
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk13
 
 .if !empty(SUN_JDK13_BUILDLINK3_MK:M+)
 
diff --git a/lang/sun-jdk14/buildlink3.mk b/lang/sun-jdk14/buildlink3.mk
index 20d66d5ae84..326c14660d9 100644
--- a/lang/sun-jdk14/buildlink3.mk
+++ b/lang/sun-jdk14/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JDK14_BUILDLINK3_MK:=	${SUN_JDK14_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	sun-jdk14
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jdk14}
 BUILDLINK_PACKAGES+=	sun-jdk14
-BUILDLINK_ORDER+=	sun-jdk14
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk14
 
 .if !empty(SUN_JDK14_BUILDLINK3_MK:M+)
 
diff --git a/lang/sun-jdk15/buildlink3.mk b/lang/sun-jdk15/buildlink3.mk
index 84a303c613e..a496d4bf7b8 100644
--- a/lang/sun-jdk15/buildlink3.mk
+++ b/lang/sun-jdk15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JDK15_BUILDLINK3_MK:=	${SUN_JDK15_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	sun-jdk15
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jdk15}
 BUILDLINK_PACKAGES+=	sun-jdk15
-BUILDLINK_ORDER+=	sun-jdk15
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk15
 
 .if !empty(SUN_JDK15_BUILDLINK3_MK:M+)
 
diff --git a/lang/sun-jre13/buildlink3.mk b/lang/sun-jre13/buildlink3.mk
index e932470443f..e7c17d10145 100644
--- a/lang/sun-jre13/buildlink3.mk
+++ b/lang/sun-jre13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JRE13_BUILDLINK3_MK:=	${SUN_JRE13_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	sun-jre13
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre13}
 BUILDLINK_PACKAGES+=	sun-jre13
-BUILDLINK_ORDER+=	sun-jre13
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre13
 
 .if !empty(SUN_JRE13_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sun-jre13+=		sun-jre13-[0-9]*
diff --git a/lang/sun-jre14/buildlink3.mk b/lang/sun-jre14/buildlink3.mk
index f8cc27a7ac3..f064b3004af 100644
--- a/lang/sun-jre14/buildlink3.mk
+++ b/lang/sun-jre14/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JRE14_BUILDLINK3_MK:=	${SUN_JRE14_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	sun-jre14
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre14}
 BUILDLINK_PACKAGES+=	sun-jre14
-BUILDLINK_ORDER+=	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]*
diff --git a/lang/sun-jre15/buildlink3.mk b/lang/sun-jre15/buildlink3.mk
index b1d43e98e8c..54cf2355153 100644
--- a/lang/sun-jre15/buildlink3.mk
+++ b/lang/sun-jre15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JRE15_BUILDLINK3_MK:=	${SUN_JRE15_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	sun-jre15
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre15}
 BUILDLINK_PACKAGES+=	sun-jre15
-BUILDLINK_ORDER+=	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]*
diff --git a/lang/swi-prolog-lite/buildlink3.mk b/lang/swi-prolog-lite/buildlink3.mk
index 400122452a9..aa9e87ddba8 100644
--- a/lang/swi-prolog-lite/buildlink3.mk
+++ b/lang/swi-prolog-lite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SWI_PROLOG_LITE_BUILDLINK3_MK:=	${SWI_PROLOG_LITE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	swi-prolog-lite
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswi-prolog-lite}
 BUILDLINK_PACKAGES+=	swi-prolog-lite
-BUILDLINK_ORDER+=	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
diff --git a/lang/tcl-expect/buildlink3.mk b/lang/tcl-expect/buildlink3.mk
index 82853eede33..e81a6e5763c 100644
--- a/lang/tcl-expect/buildlink3.mk
+++ b/lang/tcl-expect/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_EXPECT_BUILDLINK3_MK:=	${TCL_EXPECT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tcl-expect
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-expect}
 BUILDLINK_PACKAGES+=	tcl-expect
-BUILDLINK_ORDER+=	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
diff --git a/lang/tcl-itcl-current/buildlink3.mk b/lang/tcl-itcl-current/buildlink3.mk
index afe03e5c423..228ceaa26c5 100644
--- a/lang/tcl-itcl-current/buildlink3.mk
+++ b/lang/tcl-itcl-current/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 TCL_ITCL_CURRENT_BUILDLINK3_MK:=	${TCL_ITCL_CURRENT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tcl-itcl-current
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-itcl-current}
 BUILDLINK_PACKAGES+=	tcl-itcl-current
-BUILDLINK_ORDER+=	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
diff --git a/lang/tcl-itcl/buildlink3.mk b/lang/tcl-itcl/buildlink3.mk
index 3463403949f..c9dbd15a77a 100644
--- a/lang/tcl-itcl/buildlink3.mk
+++ b/lang/tcl-itcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_ITCL_BUILDLINK3_MK:=	${TCL_ITCL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tcl-itcl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-itcl}
 BUILDLINK_PACKAGES+=	tcl-itcl
-BUILDLINK_ORDER+=	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
diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk
index 51f54462d16..d2fd87ea170 100644
--- a/lang/tcl-otcl/buildlink3.mk
+++ b/lang/tcl-otcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_OTCL_BUILDLINK3_MK:=	${TCL_OTCL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tcl-otcl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-otcl}
 BUILDLINK_PACKAGES+=	tcl-otcl
-BUILDLINK_ORDER+=	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
diff --git a/lang/tcl-tclX/buildlink3.mk b/lang/tcl-tclX/buildlink3.mk
index 3e536b7daea..a8a6d783ba0 100644
--- a/lang/tcl-tclX/buildlink3.mk
+++ b/lang/tcl-tclX/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_TCLX_BUILDLINK3_MK:=	${TCL_TCLX_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tcl-tclX
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-tclX}
 BUILDLINK_PACKAGES+=	tcl-tclX
-BUILDLINK_ORDER+=	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
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index 7d372661445..4c1be953873 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tcl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl}
 BUILDLINK_PACKAGES+=	tcl
-BUILDLINK_ORDER+=	tcl
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl
 
 .if !empty(TCL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl+=	tcl>=8.4.6nb1
diff --git a/lang/tcl83/buildlink3.mk b/lang/tcl83/buildlink3.mk
index f2ca0b7583b..fa907524a07 100644
--- a/lang/tcl83/buildlink3.mk
+++ b/lang/tcl83/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:25 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tcl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl}
 BUILDLINK_PACKAGES+=	tcl
-BUILDLINK_ORDER+=	tcl
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl
 
 .if !empty(TCL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl+=		tcl-8.3.4*
diff --git a/lang/win32-jdk/buildlink3.mk b/lang/win32-jdk/buildlink3.mk
index 52a9155bda4..ca2eca474a7 100644
--- a/lang/win32-jdk/buildlink3.mk
+++ b/lang/win32-jdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:25 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WIN32_JDK_BUILDLINK3_MK:=	${WIN32_JRE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	win32-jdk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwin32-jdk}
 BUILDLINK_PACKAGES+=	win32-jdk
-BUILDLINK_ORDER+=	win32-jdk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}win32-jdk
 
 .if !empty(WIN32_JDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.win32-jdk+=	win32-jre>=0.1