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

47 files changed, 94 insertions, 94 deletions

diff --git a/net/GeoIP/buildlink3.mk b/net/GeoIP/buildlink3.mk
index 048a24c4ae0..c7edfc62a11 100644
--- a/net/GeoIP/buildlink3.mk
+++ b/net/GeoIP/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:02 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GEOIP_BUILDLINK3_MK:=	${GEOIP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	GeoIP
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGeoIP}
 BUILDLINK_PACKAGES+=	GeoIP
-BUILDLINK_ORDER+=	GeoIP
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GeoIP
 
 .if !empty(GEOIP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GeoIP+=	GeoIP>=1.3.1
diff --git a/net/ORBit/buildlink3.mk b/net/ORBit/buildlink3.mk
index d5dfcbfc602..f8e1b664837 100644
--- a/net/ORBit/buildlink3.mk
+++ b/net/ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:02 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ORBIT_BUILDLINK3_MK:=	${ORBIT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ORBit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NORBit}
 BUILDLINK_PACKAGES+=	ORBit
-BUILDLINK_ORDER+=	ORBit
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ORBit
 
 .if !empty(ORBIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ORBit+=	ORBit>=0.5.15nb5
diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk
index c2b7119738d..6be97415007 100644
--- a/net/ORBit2/buildlink3.mk
+++ b/net/ORBit2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:02 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ORBIT2_BUILDLINK3_MK:=	${ORBIT2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ORBit2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NORBit2}
 BUILDLINK_PACKAGES+=	ORBit2
-BUILDLINK_ORDER+=	ORBit2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ORBit2
 
 .if !empty(ORBIT2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ORBit2+=	ORBit2>=2.12.0
diff --git a/net/SDL_net/buildlink3.mk b/net/SDL_net/buildlink3.mk
index e000742acb6..192ba042822 100644
--- a/net/SDL_net/buildlink3.mk
+++ b/net/SDL_net/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_NET_BUILDLINK3_MK:=	${SDL_NET_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	SDL_net
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_net}
 BUILDLINK_PACKAGES+=	SDL_net
-BUILDLINK_ORDER+=	SDL_net
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_net
 
 .if !empty(SDL_NET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb1
diff --git a/net/adns/buildlink3.mk b/net/adns/buildlink3.mk
index 1c7cb67f10b..2eddc2a2cef 100644
--- a/net/adns/buildlink3.mk
+++ b/net/adns/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ADNS_BUILDLINK3_MK:=	${ADNS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	adns
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nadns}
 BUILDLINK_PACKAGES+=	adns
-BUILDLINK_ORDER+=	adns
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}adns
 
 .if !empty(ADNS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.adns+=	adns>=1.0
diff --git a/net/bind9/buildlink3.mk b/net/bind9/buildlink3.mk
index 23f3ddf8904..1d1222dbc5f 100644
--- a/net/bind9/buildlink3.mk
+++ b/net/bind9/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BIND_BUILDLINK3_MK:=	${BIND_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	bind
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbind}
 BUILDLINK_PACKAGES+=	bind
-BUILDLINK_ORDER+=	bind
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bind
 
 .if !empty(BIND_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.bind+=	bind>=9.2.2
diff --git a/net/boinc3-libs/buildlink3.mk b/net/boinc3-libs/buildlink3.mk
index 0fd93d73682..8b7f7b9761b 100644
--- a/net/boinc3-libs/buildlink3.mk
+++ b/net/boinc3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOINC_LIBS_BUILDLINK3_MK:=	${BOINC_LIBS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	boinclibs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboinclibs}
 BUILDLINK_PACKAGES+=	boinclibs
-BUILDLINK_ORDER+=	boinclibs
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boinclibs
 
 .if !empty(BOINC_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.boinclibs+=	boinc3-libs>=3.19.20040714
diff --git a/net/dante/buildlink3.mk b/net/dante/buildlink3.mk
index dac936c3cce..c3497541170 100644
--- a/net/dante/buildlink3.mk
+++ b/net/dante/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DANTE_BUILDLINK3_MK:=	${DANTE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	dante
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndante}
 BUILDLINK_PACKAGES+=	dante
-BUILDLINK_ORDER+=	dante
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dante
 
 .if !empty(DANTE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dante+=	dante>=1.1.13
diff --git a/net/freewais-sf/buildlink3.mk b/net/freewais-sf/buildlink3.mk
index 19616bfba88..e146b6d8ab8 100644
--- a/net/freewais-sf/buildlink3.mk
+++ b/net/freewais-sf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREEWAIS_SF_BUILDLINK3_MK:=	${FREEWAIS_SF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	freewais-sf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreewais-sf}
 BUILDLINK_PACKAGES+=	freewais-sf
-BUILDLINK_ORDER+=	freewais-sf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freewais-sf
 
 .if !empty(FREEWAIS_SF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.freewais-sf+=	freewais-sf>=2.2.12
diff --git a/net/gift/buildlink3.mk b/net/gift/buildlink3.mk
index b3850afdb82..dc145bf5cc9 100644
--- a/net/gift/buildlink3.mk
+++ b/net/gift/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIFT_BUILDLINK3_MK:=	${GIFT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gift
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngift}
 BUILDLINK_PACKAGES+=	gift
-BUILDLINK_ORDER+=	gift
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gift
 
 .if !empty(GIFT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gift+=	gift>=0.11.6
diff --git a/net/gnet/buildlink3.mk b/net/gnet/buildlink3.mk
index b54f0165ed8..405514de3be 100644
--- a/net/gnet/buildlink3.mk
+++ b/net/gnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNET_BUILDLINK3_MK:=	${GNET_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gnet
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnet}
 BUILDLINK_PACKAGES+=	gnet
-BUILDLINK_ORDER+=	gnet
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnet
 
 .if !empty(GNET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnet+=	gnet>=2.0.3nb1
diff --git a/net/gnet1/buildlink3.mk b/net/gnet1/buildlink3.mk
index 40d84165976..c8a485ac1ba 100644
--- a/net/gnet1/buildlink3.mk
+++ b/net/gnet1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNET1_BUILDLINK3_MK:=	${GNET1_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gnet1
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnet1}
 BUILDLINK_PACKAGES+=	gnet1
-BUILDLINK_ORDER+=	gnet1
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnet1
 
 .if !empty(GNET1_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnet1+=	gnet1>=1.1.8nb2
diff --git a/net/hesiod/buildlink3.mk b/net/hesiod/buildlink3.mk
index 03848c71138..93cc6b416b1 100644
--- a/net/hesiod/buildlink3.mk
+++ b/net/hesiod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HESIOD_BUILDLINK3_MK:=	${HESIOD_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	hesiod
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhesiod}
 BUILDLINK_PACKAGES+=	hesiod
-BUILDLINK_ORDER+=	hesiod
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hesiod
 
 .if !empty(HESIOD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.hesiod+=	hesiod>=3.0.2
diff --git a/net/howl/buildlink3.mk b/net/howl/buildlink3.mk
index cab4c8b544e..ad053395c05 100644
--- a/net/howl/buildlink3.mk
+++ b/net/howl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 HOWL_BUILDLINK3_MK:=		${HOWL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=		howl
 
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nhowl}
 BUILDLINK_PACKAGES+=		howl
-BUILDLINK_ORDER+=		howl
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}howl
 
 .if !empty(HOWL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.howl+=	howl>=0.9.5
diff --git a/net/kdenetwork3/buildlink3.mk b/net/kdenetwork3/buildlink3.mk
index f443745d233..b6b5a49909a 100644
--- a/net/kdenetwork3/buildlink3.mk
+++ b/net/kdenetwork3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 KDENETWORK_BUILDLINK3_MK:=	${KDENETWORK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	kdenetwork
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdenetwork}
 BUILDLINK_PACKAGES+=	kdenetwork
-BUILDLINK_ORDER+=	kdenetwork
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdenetwork
 
 .if !empty(KDENETWORK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdenetwork+=	kdenetwork>=3.5.0nb1
diff --git a/net/libIDL/buildlink3.mk b/net/libIDL/buildlink3.mk
index ace870ff893..ab0ee88b361 100644
--- a/net/libIDL/buildlink3.mk
+++ b/net/libIDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBIDL_BUILDLINK3_MK:=	${LIBIDL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libIDL
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibIDL}
 BUILDLINK_PACKAGES+=	libIDL
-BUILDLINK_ORDER+=	libIDL
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libIDL
 
 .if !empty(LIBIDL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libIDL+=	libIDL>=0.8.3nb1
diff --git a/net/libares/buildlink3.mk b/net/libares/buildlink3.mk
index 301cbb93197..e96d2cc7414 100644
--- a/net/libares/buildlink3.mk
+++ b/net/libares/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBARES_BUILDLINK3_MK:=	${LIBARES_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libares
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibares}
 BUILDLINK_PACKAGES+=	libares
-BUILDLINK_ORDER+=	libares
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libares
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/libcares/buildlink3.mk b/net/libcares/buildlink3.mk
index 1b6d53e18cc..149d6c33ca2 100644
--- a/net/libcares/buildlink3.mk
+++ b/net/libcares/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCARES_BUILDLINK3_MK:=	${LIBCARES_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libcares
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcares}
 BUILDLINK_PACKAGES+=	libcares
-BUILDLINK_ORDER+=	libcares
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcares
 
 .if !empty(LIBCARES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcares+=	libcares>=1.3.0
diff --git a/net/libdnet/buildlink3.mk b/net/libdnet/buildlink3.mk
index fa516eb4e10..2fd291e8cbd 100644
--- a/net/libdnet/buildlink3.mk
+++ b/net/libdnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBDNET_BUILDLINK3_MK:=	${LIBDNET_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libdnet
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdnet}
 BUILDLINK_PACKAGES+=	libdnet
-BUILDLINK_ORDER+=	libdnet
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdnet
 
 .if !empty(LIBDNET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdnet+=	libdnet>=1.7
diff --git a/net/liblive/buildlink3.mk b/net/liblive/buildlink3.mk
index ca727fefff3..3c4228a53fe 100644
--- a/net/liblive/buildlink3.mk
+++ b/net/liblive/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBLIVE_BUILDLINK3_MK:=	${LIBLIVE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	liblive
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliblive}
 BUILDLINK_PACKAGES+=	liblive
-BUILDLINK_ORDER+=	liblive
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblive
 
 .if !empty(LIBLIVE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.liblive+=	liblive>=2003.04.04
diff --git a/net/libnids/buildlink3.mk b/net/libnids/buildlink3.mk
index 7e5b8b17f3c..9fab1433bf4 100644
--- a/net/libnids/buildlink3.mk
+++ b/net/libnids/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBNIDS_BUILDLINK3_MK:=	${LIBNIDS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libnids
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnids}
 BUILDLINK_PACKAGES+=	libnids
-BUILDLINK_ORDER+=	libnids
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnids
 
 .if !empty(LIBNIDS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libnids+=	libnids>=1.18
diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk
index d38c009e740..733671991c8 100644
--- a/net/libpcap/buildlink3.mk
+++ b/net/libpcap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBPCAP_BUILDLINK3_MK:=	${LIBPCAP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	libpcap
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpcap}
 BUILDLINK_PACKAGES+=	libpcap
-BUILDLINK_ORDER+=	libpcap
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpcap
 
 .if !empty(LIBPCAP_BUILDLINK3_MK:M+)
 # XXX?
diff --git a/net/libradius/buildlink3.mk b/net/libradius/buildlink3.mk
index d55d08ba95b..9155095c141 100644
--- a/net/libradius/buildlink3.mk
+++ b/net/libradius/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRADIUS_LINUX_BUILDLINK3_MK:=	${LIBRADIUS_LINUX_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	libradius
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibradius}
 BUILDLINK_PACKAGES+=	libradius
-BUILDLINK_ORDER+=	libradius
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libradius
 
 .if !empty(LIBRADIUS_LINUX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libradius+=	libradius>=20040827
diff --git a/net/libsoup-devel/buildlink3.mk b/net/libsoup-devel/buildlink3.mk
index 3a2d376bfc4..ab8d841010f 100644
--- a/net/libsoup-devel/buildlink3.mk
+++ b/net/libsoup-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSOUP_DEVEL_BUILDLINK3_MK:=	${LIBSOUP_DEVEL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libsoup-devel
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsoup-devel}
 BUILDLINK_PACKAGES+=	libsoup-devel
-BUILDLINK_ORDER+=	libsoup-devel
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsoup-devel
 
 .if !empty(LIBSOUP_DEVEL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.0
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
index 3b340c492ec..3ad49b7b99c 100644
--- a/net/libsoup/buildlink3.mk
+++ b/net/libsoup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBSOUP_BUILDLINK3_MK:=	${LIBSOUP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libsoup
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsoup}
 BUILDLINK_PACKAGES+=	libsoup
-BUILDLINK_ORDER+=	libsoup
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsoup
 
 .if !empty(LIBSOUP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsoup+=	libsoup>=1.99.28nb3
diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk
index 083ba916b71..dd47d3f21bf 100644
--- a/net/libtorrent/buildlink3.mk
+++ b/net/libtorrent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBTORRENT_BUILDLINK3_MK:=	${LIBTORRENT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libtorrent
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtorrent}
 BUILDLINK_PACKAGES+=	libtorrent
-BUILDLINK_ORDER+=	libtorrent
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtorrent
 
 .if !empty(LIBTORRENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtorrent+=		libtorrent>=0.8.0
diff --git a/net/linc/buildlink3.mk b/net/linc/buildlink3.mk
index 6e2319ce4db..8c39232ec9f 100644
--- a/net/linc/buildlink3.mk
+++ b/net/linc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LINC_BUILDLINK3_MK:=	${LINC_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	linc
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlinc}
 BUILDLINK_PACKAGES+=	linc
-BUILDLINK_ORDER+=	linc
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}linc
 
 .if !empty(LINC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.linc+=	linc>=1.1.1
diff --git a/net/mDNSResponder/buildlink3.mk b/net/mDNSResponder/buildlink3.mk
index 77a6f941d77..a6ae10c699d 100644
--- a/net/mDNSResponder/buildlink3.mk
+++ b/net/mDNSResponder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MDNSRESPONDER_BUILDLINK3_MK:=	${MDNSRESPONDER_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	mDNSResponder
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NmDNSResponder}
 BUILDLINK_PACKAGES+=	mDNSResponder
-BUILDLINK_ORDER+=	mDNSResponder
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mDNSResponder
 
 .if !empty(MDNSRESPONDER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mDNSResponder+=	mDNSResponder>=98
diff --git a/net/net-snmp/buildlink3.mk b/net/net-snmp/buildlink3.mk
index bf92661e39d..e4f17aaccf8 100644
--- a/net/net-snmp/buildlink3.mk
+++ b/net/net-snmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NET_SNMP_BUILDLINK3_MK:=	${NET_SNMP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	net-snmp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnet-snmp}
 BUILDLINK_PACKAGES+=	net-snmp
-BUILDLINK_ORDER+=	net-snmp
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}net-snmp
 
 .if !empty(NET_SNMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.net-snmp+=	net-snmp>=5.0.9nb3
diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk
index 494be553617..9486e547ada 100644
--- a/net/netatalk/buildlink3.mk
+++ b/net/netatalk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	netatalk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetatalk}
 BUILDLINK_PACKAGES+=	netatalk
-BUILDLINK_ORDER+=	netatalk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netatalk
 
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.netatalk+=	netatalk>=2.0.3nb2
diff --git a/net/netatalk1/buildlink3.mk b/net/netatalk1/buildlink3.mk
index 45bc36e74ae..1a7a8f7bd3d 100644
--- a/net/netatalk1/buildlink3.mk
+++ b/net/netatalk1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	netatalk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGESNnetatalk}
 BUILDLINK_PACKAGES+=	netatalk
-BUILDLINK_ORDER+=	netatalk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netatalk
 
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.netatalk+=	netatalk>=1.6.2
diff --git a/net/netbsd-tap/buildlink3.mk b/net/netbsd-tap/buildlink3.mk
index b0b4a303f79..d2a0be058f0 100644
--- a/net/netbsd-tap/buildlink3.mk
+++ b/net/netbsd-tap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETBSD_TAP_BUILDLINK3_MK:=	${NETBSD_TAP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	netbsd-tap
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetbsd-tap}
 BUILDLINK_PACKAGES+=	netbsd-tap
-BUILDLINK_ORDER+=	netbsd-tap
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netbsd-tap
 
 .if !empty(NETBSD_TAP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.netbsd-tap+=	netbsd-tap>=20050120
diff --git a/net/openh323/buildlink3.mk b/net/openh323/buildlink3.mk
index 1ce52848cff..eb6649a28ae 100644
--- a/net/openh323/buildlink3.mk
+++ b/net/openh323/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENH323_BUILDLINK3_MK:=	${OPENH323_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	openh323
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenh323}
 BUILDLINK_PACKAGES+=	openh323
-BUILDLINK_ORDER+=	openh323
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openh323
 
 .if !empty(OPENH323_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openh323+=	openh323>=1.15.1
diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk
index 031beaa7ff1..cedc1aa6003 100644
--- a/net/openslp/buildlink3.mk
+++ b/net/openslp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSLP_BUILDLINK3_MK:=	${OPENSLP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	openslp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenslp}
 BUILDLINK_PACKAGES+=	openslp
-BUILDLINK_ORDER+=	openslp
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openslp
 
 .if !empty(OPENSLP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openslp+=	openslp>=1.0.1
diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk
index f7f1a6c462c..e48e0bc040d 100644
--- a/net/py-ORBit/buildlink3.mk
+++ b/net/py-ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_ORBIT_BUILDLINK3_MK:=	${PY_ORBIT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	pyorbit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyorbit}
 BUILDLINK_PACKAGES+=	pyorbit
-BUILDLINK_ORDER+=	pyorbit
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyorbit
 
 .if !empty(PY_ORBIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.0nb1
diff --git a/net/py-libdnet/buildlink3.mk b/net/py-libdnet/buildlink3.mk
index fc148d89c7b..e823246b0e4 100644
--- a/net/py-libdnet/buildlink3.mk
+++ b/net/py-libdnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYLIBDNET_BUILDLINK3_MK:=	${PYLIBDNET_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pylibdnet
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npylibdnet}
 BUILDLINK_PACKAGES+=	pylibdnet
-BUILDLINK_ORDER+=	pylibdnet
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pylibdnet
 
 .if !empty(PYLIBDNET_BUILDLINK3_MK:M+)
 
diff --git a/net/py-libpcap/buildlink3.mk b/net/py-libpcap/buildlink3.mk
index 4a67514ee2e..5f31b69c8b3 100644
--- a/net/py-libpcap/buildlink3.mk
+++ b/net/py-libpcap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYLIBPCAP_BUILDLINK3_MK:=	${PYLIBPCAP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pylibpcap
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npylibpcap}
 BUILDLINK_PACKAGES+=	pylibpcap
-BUILDLINK_ORDER+=	pylibpcap
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pylibpcap
 
 .if !empty(PYLIBPCAP_BUILDLINK3_MK:M+)
 
diff --git a/net/py-soappy/buildlink3.mk b/net/py-soappy/buildlink3.mk
index 803f9a88f10..1e9b1941453 100644
--- a/net/py-soappy/buildlink3.mk
+++ b/net/py-soappy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_SOAPPY_BUILDLINK3_MK:=	${PY_SOAPPY_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	py-SOAPpy
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-SOAPpy}
 BUILDLINK_PACKAGES+=	py-SOAPpy
-BUILDLINK_ORDER+=	py-SOAPpy
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-SOAPpy
 
 .if !empty(PY_SOAPPY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.py-SOAPpy+=	${PYPKGPREFIX}-SOAPpy>=0.11.4
diff --git a/net/samba/buildlink3.mk b/net/samba/buildlink3.mk
index 0d3c3e82d00..040e3e7be7d 100644
--- a/net/samba/buildlink3.mk
+++ b/net/samba/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SAMBA_BUILDLINK3_MK:=	${SAMBA_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	samba
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsamba}
 BUILDLINK_PACKAGES+=	samba
-BUILDLINK_ORDER+=	samba
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}samba
 
 .if !empty(SAMBA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.samba+=	samba>=3.0.7
diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk
index fc46bbdc00f..f7b38874b52 100644
--- a/net/socks4/buildlink3.mk
+++ b/net/socks4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOCKS4_BUILDLINK3_MK:=	${SOCKS4_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	socks4
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsocks4}
 BUILDLINK_PACKAGES+=	socks4
-BUILDLINK_ORDER+=	socks4
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}socks4
 
 .if !empty(SOCKS4_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.socks4+=	socks4>=2.2
diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk
index 7a833094bb1..10ece1c263f 100644
--- a/net/socks5/buildlink3.mk
+++ b/net/socks5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOCKS5_BUILDLINK3_MK:=	${SOCKS5_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	socks5
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsocks5}
 BUILDLINK_PACKAGES+=	socks5
-BUILDLINK_ORDER+=	socks5
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}socks5
 
 .if !empty(SOCKS5_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.socks5+=	socks5>=1.0.2
diff --git a/net/soup/buildlink3.mk b/net/soup/buildlink3.mk
index deace9b7ff7..464eb4cab4e 100644
--- a/net/soup/buildlink3.mk
+++ b/net/soup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOUP_BUILDLINK3_MK:=	${SOUP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	soup
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsoup}
 BUILDLINK_PACKAGES+=	soup
-BUILDLINK_ORDER+=	soup
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}soup
 
 .if !empty(SOUP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.soup?=                soup>=0.7.11nb3
diff --git a/net/spread/buildlink3.mk b/net/spread/buildlink3.mk
index 88c8024e076..bc27e3d1fd7 100644
--- a/net/spread/buildlink3.mk
+++ b/net/spread/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPREAD_BUILDLINK3_MK:=	${SPREAD_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	spread
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspread}
 BUILDLINK_PACKAGES+=	spread
-BUILDLINK_ORDER+=	spread
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}spread
 
 .if !empty(SPREAD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.spread+=	spread>=3.17.1
diff --git a/net/tcl-scotty/buildlink3.mk b/net/tcl-scotty/buildlink3.mk
index 062d7bcc6eb..d18ecfc8e71 100644
--- a/net/tcl-scotty/buildlink3.mk
+++ b/net/tcl-scotty/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_SCOTTY_BUILDLINK3_MK:=	${TCL_SCOTTY_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tcl-scotty
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-scotty}
 BUILDLINK_PACKAGES+=	tcl-scotty
-BUILDLINK_ORDER+=	tcl-scotty
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-scotty
 
 .if !empty(TCL_SCOTTY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-scotty+=	tcl-scotty>=2.1.11
diff --git a/net/whoson/buildlink3.mk b/net/whoson/buildlink3.mk
index 48527a654cd..ec54d5743ea 100644
--- a/net/whoson/buildlink3.mk
+++ b/net/whoson/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WHOSON_BUILDLINK3_MK:=	${WHOSON_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	whoson
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwhoson}
 BUILDLINK_PACKAGES+=	whoson
-BUILDLINK_ORDER+=	whoson
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}whoson
 
 .if !empty(WHOSON_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.whoson+=	whoson>=2.03
diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk
index 20392e558d7..3cadbbce547 100644
--- a/net/xfce4-wavelan-plugin/buildlink3.mk
+++ b/net/xfce4-wavelan-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-wavelan-plugin
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wavelan-plugin}
 BUILDLINK_PACKAGES+=	xfce4-wavelan-plugin
-BUILDLINK_ORDER+=	xfce4-wavelan-plugin
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wavelan-plugin
 
 .if !empty(XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.4.1nb1
diff --git a/net/yaz/buildlink3.mk b/net/yaz/buildlink3.mk
index 0f1bf3197c2..87169a62e61 100644
--- a/net/yaz/buildlink3.mk
+++ b/net/yaz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 YAZ_BUILDLINK3_MK:=	${YAZ_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	yaz
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nyaz}
 BUILDLINK_PACKAGES+=	yaz
-BUILDLINK_ORDER+=	yaz
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}yaz
 
 .if !empty(YAZ_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.yaz+=	yaz>=2.0