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
author: jlam <jlam@pkgsrc.org> 2006-07-08 23:10:35 +0000
committer: jlam <jlam@pkgsrc.org> 2006-07-08 23:10:35 +0000
commit: c16221a4db5db247e9ecea04d817821955982042 (patch)
tree: 04459b5ed42b41d60b93766832b84b0beb86ba13 /devel
parent: c25fbde9c94a010e0b2c953766743f818b86c9ea (diff)
download: pkgsrc-c16221a4db5db247e9ecea04d817821955982042.tar.gz
171 files changed, 342 insertions, 342 deletions
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index 341da33ce78..69ca7bc8375 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCONF_BUILDLINK3_MK:=	${GCONF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	GConf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf}
 BUILDLINK_PACKAGES+=	GConf
-BUILDLINK_ORDER+=	GConf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf
 
 .if !empty(GCONF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=1.0.9nb7
diff --git a/devel/GConf2-ui/buildlink3.mk b/devel/GConf2-ui/buildlink3.mk
index 9f506b85214..ae507239746 100644
--- a/devel/GConf2-ui/buildlink3.mk
+++ b/devel/GConf2-ui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCONF2_UI_BUILDLINK3_MK:=	${GCONF2_UI_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	GConf2-ui
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf2-ui}
 BUILDLINK_PACKAGES+=	GConf2-ui
-BUILDLINK_ORDER+=	GConf2-ui
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf2-ui
 
 .if !empty(GCONF2_UI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GConf2-ui+=	GConf2-ui>=2.8.0.1
diff --git a/devel/GConf2/buildlink3.mk b/devel/GConf2/buildlink3.mk
index 5e14f9877f4..059684fe47e 100644
--- a/devel/GConf2/buildlink3.mk
+++ b/devel/GConf2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCONF2_BUILDLINK3_MK:=	${GCONF2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	GConf2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf2}
 BUILDLINK_PACKAGES+=	GConf2
-BUILDLINK_ORDER+=	GConf2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf2
 
 .if !empty(GCONF2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.8.0.1
diff --git a/devel/Renaissance/buildlink3.mk b/devel/Renaissance/buildlink3.mk
index 41c664c6f98..00879e446e1 100644
--- a/devel/Renaissance/buildlink3.mk
+++ b/devel/Renaissance/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 RENAISSANCE_BUILDLINK3_MK:=	${RENAISSANCE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	Renaissance
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NRenaissance}
 BUILDLINK_PACKAGES+=	Renaissance
-BUILDLINK_ORDER+=	Renaissance
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Renaissance
 
 .if !empty(RENAISSANCE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Renaissance+=		Renaissance>=0.7.0
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 8808fb318ac..d8013955e1d 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_BUILDLINK3_MK:=	${SDL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	SDL
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL}
 BUILDLINK_PACKAGES+=	SDL
-BUILDLINK_ORDER+=	SDL
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL
 
 .if !empty(SDL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL+=	SDL>=1.2.5nb5
diff --git a/devel/SDL_gfx/buildlink3.mk b/devel/SDL_gfx/buildlink3.mk
index 9f1eb3aa877..77db09d75e7 100644
--- a/devel/SDL_gfx/buildlink3.mk
+++ b/devel/SDL_gfx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_GFX_BUILDLINK3_MK:=	${SDL_GFX_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	SDL_gfx
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_gfx}
 BUILDLINK_PACKAGES+=	SDL_gfx
-BUILDLINK_ORDER+=	SDL_gfx
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_gfx
 
 .if !empty(SDL_GFX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_gfx+=	SDL_gfx>=2.0.3nb2
diff --git a/devel/SDL_ttf/buildlink3.mk b/devel/SDL_ttf/buildlink3.mk
index 9d6f684e611..1ce36a501cd 100644
--- a/devel/SDL_ttf/buildlink3.mk
+++ b/devel/SDL_ttf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_TTF_BUILDLINK3_MK:=	${SDL_TTF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	SDL_ttf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_ttf}
 BUILDLINK_PACKAGES+=	SDL_ttf
-BUILDLINK_ORDER+=	SDL_ttf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_ttf
 
 .if !empty(SDL_TTF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_ttf+=	SDL_ttf>=2.0.3nb3
diff --git a/devel/SDLmm/buildlink3.mk b/devel/SDLmm/buildlink3.mk
index d8510049afd..64be2d51edc 100644
--- a/devel/SDLmm/buildlink3.mk
+++ b/devel/SDLmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDLMM_BUILDLINK3_MK:=	${SDLMM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	SDLmm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDLmm}
 BUILDLINK_PACKAGES+=	SDLmm
-BUILDLINK_ORDER+=	SDLmm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDLmm
 
 .if !empty(SDLMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDLmm+=	SDLmm>=0.1.8nb1
diff --git a/devel/allegro/buildlink3.mk b/devel/allegro/buildlink3.mk
index 620f500eb79..0f4e4542849 100644
--- a/devel/allegro/buildlink3.mk
+++ b/devel/allegro/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ALLEGRO_BUILDLINK3_MK:=	${ALLEGRO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	allegro
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nallegro}
 BUILDLINK_PACKAGES+=	allegro
-BUILDLINK_ORDER+=	allegro
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}allegro
 
 .if !empty(ALLEGRO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.allegro+=	allegro>=4.1.13
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index ba2f058c1f4..c4c9c1ce5b7 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	apr
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napr}
 BUILDLINK_PACKAGES+=	apr
-BUILDLINK_ORDER+=	apr
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr
 
 .if !empty(APR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.apr+=	apr>=0.9.5.2.0.51nb1
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
index c9ef27f5902..50f86fb0c29 100644
--- a/devel/at-spi/buildlink3.mk
+++ b/devel/at-spi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AT_SPI_BUILDLINK3_MK:=	${AT_SPI_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	at-spi
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nat-spi}
 BUILDLINK_PACKAGES+=	at-spi
-BUILDLINK_ORDER+=	at-spi
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}at-spi
 
 .if !empty(AT_SPI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.at-spi+=	at-spi>=1.6.0
diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk
index 753335b6853..a19b50db4b5 100644
--- a/devel/atk/buildlink3.mk
+++ b/devel/atk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ATK_BUILDLINK3_MK:=	${ATK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	atk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Natk}
 BUILDLINK_PACKAGES+=	atk
-BUILDLINK_ORDER+=	atk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}atk
 
 .if !empty(ATK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.atk+=		atk>=1.11.4
diff --git a/devel/bglibs/buildlink3.mk b/devel/bglibs/buildlink3.mk
index 2634039a236..a6a095a24a3 100644
--- a/devel/bglibs/buildlink3.mk
+++ b/devel/bglibs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BGLIBS_BUILDLINK3_MK:=	${BGLIBS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	bglibs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbglibs}
 BUILDLINK_PACKAGES+=	bglibs
-BUILDLINK_ORDER+=	bglibs
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bglibs
 
 .if !empty(BGLIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.bglibs+=	bglibs>=1.040
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index f53fe79b7fe..5c8b51845d8 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	binutils
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbinutils}
 BUILDLINK_PACKAGES+=	binutils
-BUILDLINK_ORDER+=	binutils
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}binutils
 
 .if !empty(BINUTILS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.binutils+=		binutils>=2.15.0
diff --git a/devel/blib/buildlink3.mk b/devel/blib/buildlink3.mk
index a3901d5bd02..02999c5860b 100644
--- a/devel/blib/buildlink3.mk
+++ b/devel/blib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BLIB_BUILDLINK3_MK:=	${BLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	blib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblib}
 BUILDLINK_PACKAGES+=	blib
-BUILDLINK_ORDER+=	blib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}blib
 
 .if !empty(BLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.blib+=	blib>=1.0.2nb1
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index b21d1cbd3e1..5fb59c84368 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOEHM_GC_BUILDLINK3_MK:=	${BOEHM_GC_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	boehm-gc
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboehm-gc}
 BUILDLINK_PACKAGES+=	boehm-gc
-BUILDLINK_ORDER+=	boehm-gc
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boehm-gc
 
 .if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.boehm-gc+=	boehm-gc>=6.3nb1
diff --git a/devel/bonobo/buildlink3.mk b/devel/bonobo/buildlink3.mk
index aacb699f9bb..464a60d41b2 100644
--- a/devel/bonobo/buildlink3.mk
+++ b/devel/bonobo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BONOBO_BUILDLINK3_MK:=	${BONOBO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	bonobo
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbonobo}
 BUILDLINK_PACKAGES+=	bonobo
-BUILDLINK_ORDER+=	bonobo
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bonobo
 
 .if !empty(BONOBO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.bonobo+=	bonobo>=1.0.18nb7
diff --git a/devel/boost-build/buildlink3.mk b/devel/boost-build/buildlink3.mk
index 810a3d4acdc..ae6403bd24e 100644
--- a/devel/boost-build/buildlink3.mk
+++ b/devel/boost-build/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOOST_BUILD_BUILDLINK3_MK:=	${BOOST_BUILD_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	boost-build
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboost-build}
 BUILDLINK_PACKAGES+=	boost-build
-BUILDLINK_ORDER+=	boost-build
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-build
 
 .if !empty(BOOST_BUILD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.boost-build+=		boost-build-1.33.*
diff --git a/devel/boost-headers/buildlink3.mk b/devel/boost-headers/buildlink3.mk
index 4ceaf27551e..e62dfbe5ecf 100644
--- a/devel/boost-headers/buildlink3.mk
+++ b/devel/boost-headers/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOOST_HEADERS_BUILDLINK3_MK:=	${BOOST_HEADERS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	boost-headers
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboost-headers}
 BUILDLINK_PACKAGES+=	boost-headers
-BUILDLINK_ORDER+=	boost-headers
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-headers
 
 .if !empty(BOOST_HEADERS_BUILDLINK3_MK:M+)
 # Use a dependency pattern that guarantees the proper ABI.
diff --git a/devel/boost-libs/buildlink3.mk b/devel/boost-libs/buildlink3.mk
index 7ff1be65b53..e92f5ea06fe 100644
--- a/devel/boost-libs/buildlink3.mk
+++ b/devel/boost-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOOST_LIBS_BUILDLINK3_MK:=	${BOOST_LIBS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	boost-libs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboost-libs}
 BUILDLINK_PACKAGES+=	boost-libs
-BUILDLINK_ORDER+=	boost-libs
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-libs
 
 .if !empty(BOOST_LIBS_BUILDLINK3_MK:M+)
 # Use a dependency pattern that guarantees the proper ABI.
diff --git a/devel/boost-python/buildlink3.mk b/devel/boost-python/buildlink3.mk
index 0a1a06393af..a264a65ba97 100644
--- a/devel/boost-python/buildlink3.mk
+++ b/devel/boost-python/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOOST_PYTHON_BUILDLINK3_MK:=	${BOOST_PYTHON_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	boost-python
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboost-python}
 BUILDLINK_PACKAGES+=	boost-python
-BUILDLINK_ORDER+=	boost-python
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-python
 
 .if !empty(BOOST_PYTHON_BUILDLINK3_MK:M+)
 # Use a dependency pattern that guarantees the proper ABI.
diff --git a/devel/buddy/buildlink3.mk b/devel/buddy/buildlink3.mk
index 9ce659c9f80..6d452c341cb 100644
--- a/devel/buddy/buildlink3.mk
+++ b/devel/buddy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BUDDY_BUILDLINK3_MK:=	${BUDDY_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	buddy
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbuddy}
 BUILDLINK_PACKAGES+=	buddy
-BUILDLINK_ORDER+=	buddy
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}buddy
 
 .if !empty(BUDDY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.buddy+=	buddy>=2.4
diff --git a/devel/buildtool/buildlink3.mk b/devel/buildtool/buildlink3.mk
index 7a248ee9607..906e2fcbafe 100644
--- a/devel/buildtool/buildlink3.mk
+++ b/devel/buildtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BUILDTOOL_BUILDLINK3_MK:=	${BUILDTOOL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	buildtool
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbuildtool}
 BUILDLINK_PACKAGES+=	buildtool
-BUILDLINK_ORDER+=	buildtool
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}buildtool
 
 .if !empty(BUILDTOOL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.buildtool+=	buildtool>=0.16
diff --git a/devel/cdk/buildlink3.mk b/devel/cdk/buildlink3.mk
index 340b4126381..022c81c2c01 100644
--- a/devel/cdk/buildlink3.mk
+++ b/devel/cdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CDK_BUILDLINK3_MK:=	${CDK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	cdk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdk}
 BUILDLINK_PACKAGES+=	cdk
-BUILDLINK_ORDER+=	cdk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdk
 
 .if !empty(CDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cdk+=		cdk>=4.9.9nb1
diff --git a/devel/chmlib/buildlink3.mk b/devel/chmlib/buildlink3.mk
index deeddaa95a9..3f3e874faa6 100644
--- a/devel/chmlib/buildlink3.mk
+++ b/devel/chmlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CHMLIB_BUILDLINK3_MK:=	${CHMLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	chmlib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nchmlib}
 BUILDLINK_PACKAGES+=	chmlib
-BUILDLINK_ORDER+=	chmlib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}chmlib
 
 .if !empty(CHMLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.chmlib+=	chmlib>=0.31
diff --git a/devel/cppunit/buildlink3.mk b/devel/cppunit/buildlink3.mk
index b82e802b424..154fe302925 100644
--- a/devel/cppunit/buildlink3.mk
+++ b/devel/cppunit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CPPUNIT_BUILDLINK3_MK:=	${CPPUNIT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	cppunit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncppunit}
 BUILDLINK_PACKAGES+=	cppunit
-BUILDLINK_ORDER+=	cppunit
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cppunit
 
 .if !empty(CPPUNIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cppunit+=	cppunit>=1.10.2
diff --git a/devel/darts/buildlink3.mk b/devel/darts/buildlink3.mk
index cd933602cd6..d20f06f281d 100644
--- a/devel/darts/buildlink3.mk
+++ b/devel/darts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPMETHOD.darts?=	build
 
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	darts
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndarts}
 BUILDLINK_PACKAGES+=	darts
-BUILDLINK_ORDER+=	darts
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}darts
 
 .if !empty(DARTS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.darts+=	darts>=0.2
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index 3f9988d1624..f47f3aeddbf 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DEVIL_BUILDLINK3_MK:=	${DEVIL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	devIL
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NdevIL}
 BUILDLINK_PACKAGES+=	devIL
-BUILDLINK_ORDER+=	devIL
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}devIL
 
 .if !empty(DEVIL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.devIL+=	devIL>=1.6.6nb1
diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk
index ef1ea2e9a23..9d31a1fe69b 100644
--- a/devel/dlcompat/buildlink3.mk
+++ b/devel/dlcompat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 DLCOMPAT_BUILDLINK3_MK:=	${DLCOMPAT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	dlcompat
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndlcompat}
 BUILDLINK_PACKAGES+=	dlcompat
-BUILDLINK_ORDER+=	dlcompat
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dlcompat
 
 .if !empty(DLCOMPAT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dlcompat+=	dlcompat>=20030629
diff --git a/devel/dmalloc/buildlink3.mk b/devel/dmalloc/buildlink3.mk
index 3274962a923..c5b34c02e38 100644
--- a/devel/dmalloc/buildlink3.mk
+++ b/devel/dmalloc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DMALLOC_BUILDLINK3_MK:=	${DMALLOC_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	dmalloc
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndmalloc}
 BUILDLINK_PACKAGES+=	dmalloc
-BUILDLINK_ORDER+=	dmalloc
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dmalloc
 
 .if !empty(DMALLOC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dmalloc+=	dmalloc>=4.8.2nb2
diff --git a/devel/edcommon/buildlink3.mk b/devel/edcommon/buildlink3.mk
index 01ae37e5567..78d538a7e63 100644
--- a/devel/edcommon/buildlink3.mk
+++ b/devel/edcommon/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 EDCOMMON_BUILDLINK3_MK:=	${EDCOMMON_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	edcommon
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nedcommon}
 BUILDLINK_PACKAGES+=	edcommon
-BUILDLINK_ORDER+=	edcommon
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}edcommon
 
 .if !empty(EDCOMMON_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.edcommon+=	edcommon>=32
diff --git a/devel/eel2/buildlink3.mk b/devel/eel2/buildlink3.mk
index 5839d76cde2..72e743047d6 100644
--- a/devel/eel2/buildlink3.mk
+++ b/devel/eel2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EEL2_BUILDLINK3_MK:=	${EEL2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	eel2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Neel2}
 BUILDLINK_PACKAGES+=	eel2
-BUILDLINK_ORDER+=	eel2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eel2
 
 .if !empty(EEL2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.eel2+=	eel2>=2.10.0
diff --git a/devel/eet/buildlink3.mk b/devel/eet/buildlink3.mk
index edb51817cad..126549cc65b 100644
--- a/devel/eet/buildlink3.mk
+++ b/devel/eet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EET_BUILDLINK3_MK:=	${EET_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	eet
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Neet}
 BUILDLINK_PACKAGES+=	eet
-BUILDLINK_ORDER+=	eet
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eet
 
 .if !empty(EET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.eet+=	eet>=0.9.9
diff --git a/devel/ffcall/buildlink3.mk b/devel/ffcall/buildlink3.mk
index 7fc705d0dc9..df03752e345 100644
--- a/devel/ffcall/buildlink3.mk
+++ b/devel/ffcall/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FFCALL_BUILDLINK3_MK:=	${FFCALL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ffcall
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nffcall}
 BUILDLINK_PACKAGES+=	ffcall
-BUILDLINK_ORDER+=	ffcall
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ffcall
 
 .if !empty(FFCALL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ffcall+=	ffcall>=1.9
diff --git a/devel/flex/buildlink3.mk b/devel/flex/buildlink3.mk
index 8aec47a402f..1a93889e987 100644
--- a/devel/flex/buildlink3.mk
+++ b/devel/flex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:42 jlam Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+=	flex
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nflex}
 BUILDLINK_PACKAGES+=	flex
-BUILDLINK_ORDER+=	flex
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flex
 
 .if !empty(FLEX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.flex+=	flex>=2.5.4a
diff --git a/devel/florist/buildlink3.mk b/devel/florist/buildlink3.mk
index 84aa7369fa2..8ccd09f5be5 100644
--- a/devel/florist/buildlink3.mk
+++ b/devel/florist/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FLORIST_BUILDLINK3_MK:=	${FLORIST_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	florist
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nflorist}
 BUILDLINK_PACKAGES+=	florist
-BUILDLINK_ORDER+=	florist
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}florist
 
 .if !empty(FLORIST_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.florist+=	florist>=3.15p
diff --git a/devel/g-wrap/buildlink3.mk b/devel/g-wrap/buildlink3.mk
index 1f79eb25574..9f88a134480 100644
--- a/devel/g-wrap/buildlink3.mk
+++ b/devel/g-wrap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 G_WRAP_BUILDLINK3_MK:=	${G_WRAP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	g-wrap
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ng-wrap}
 BUILDLINK_PACKAGES+=	g-wrap
-BUILDLINK_ORDER+=	g-wrap
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}g-wrap
 
 .if !empty(G_WRAP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.g-wrap+=	g-wrap>=1.9.5
diff --git a/devel/g-wrap1/buildlink3.mk b/devel/g-wrap1/buildlink3.mk
index 6a99138301b..e12971d60ff 100644
--- a/devel/g-wrap1/buildlink3.mk
+++ b/devel/g-wrap1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 G_WRAP_BUILDLINK3_MK:=	${G_WRAP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	g-wrap
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ng-wrap}
 BUILDLINK_PACKAGES+=	g-wrap
-BUILDLINK_ORDER+=	g-wrap
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}g-wrap
 
 .if !empty(G_WRAP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.g-wrap+=	g-wrap>=1.3.4nb6
diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk
index d81f2e5faa3..179c8df54ba 100644
--- a/devel/gail/buildlink3.mk
+++ b/devel/gail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAIL_BUILDLINK3_MK:=	${GAIL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gail
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngail}
 BUILDLINK_PACKAGES+=	gail
-BUILDLINK_ORDER+=	gail
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gail
 
 .if !empty(GAIL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gail+=	gail>=1.8.0
diff --git a/devel/gal/buildlink3.mk b/devel/gal/buildlink3.mk
index 238aba198f6..334ae319671 100644
--- a/devel/gal/buildlink3.mk
+++ b/devel/gal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAL_BUILDLINK3_MK:=	${GAL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gal
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngal}
 BUILDLINK_PACKAGES+=	gal
-BUILDLINK_ORDER+=	gal
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gal
 
 .if !empty(GAL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gal+=	gal>=0.22nb6
diff --git a/devel/gconfmm/buildlink3.mk b/devel/gconfmm/buildlink3.mk
index fd3d8fee812..d544bdc8ef2 100644
--- a/devel/gconfmm/buildlink3.mk
+++ b/devel/gconfmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCONFMM_BUILDLINK3_MK:=	${GCONFMM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gconfmm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngconfmm}
 BUILDLINK_PACKAGES+=	gconfmm
-BUILDLINK_ORDER+=	gconfmm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gconfmm
 
 .if !empty(GCONFMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gconfmm+=	gconfmm>=2.10.0
diff --git a/devel/gdbada/buildlink3.mk b/devel/gdbada/buildlink3.mk
index 8bb479c44c3..8416c4bfba8 100644
--- a/devel/gdbada/buildlink3.mk
+++ b/devel/gdbada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GDBADA_BUILDLINK3_MK:=	${GDBADA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ngdbada} gdbada
 
 .if !empty(GDBADA_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		gdbada
-BUILDLINK_ORDER+=		gdbada
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdbada
 BUILDLINK_API_DEPENDS.gdbada+=	gdbada>=5.3
 BUILDLINK_ABI_DEPENDS.gdbada+=	gdbada>=6.3nb1
 BUILDLINK_PKGSRCDIR.gdbada?=	../../devel/gdbada
diff --git a/devel/gettext-asprintf/buildlink3.mk b/devel/gettext-asprintf/buildlink3.mk
index f4987b0a70e..2c6af8003d0 100644
--- a/devel/gettext-asprintf/buildlink3.mk
+++ b/devel/gettext-asprintf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GETTEXT_ASPRINTF_BUILDLINK3_MK:=	${GETTEXT_ASPRINTF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gettext-asprintf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngettext-asprintf}
 BUILDLINK_PACKAGES+=	gettext-asprintf
-BUILDLINK_ORDER+=	gettext-asprintf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gettext-asprintf
 
 .if !empty(GETTEXT_ASPRINTF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gettext-asprintf+=	gettext-asprintf>=0.14.5
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index d4ece1824b5..d75ac314809 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gettext
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngettext}
 BUILDLINK_PACKAGES+=	gettext
-BUILDLINK_ORDER+=	gettext
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gettext
 
 .if !empty(GETTEXT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.14.5
diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk
index 2f365143836..8a4ba7ab75a 100644
--- a/devel/giblib/buildlink3.mk
+++ b/devel/giblib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIBLIB_BUILDLINK3_MK:=	${GIBLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	giblib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngiblib}
 BUILDLINK_PACKAGES+=	giblib
-BUILDLINK_ORDER+=	giblib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}giblib
 
 .if !empty(GIBLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.giblib+=	giblib>=1.2.3nb3
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 6089fa8ce1e..89d64ce635d 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB_BUILDLINK3_MK:=	${GLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	glib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglib}
 BUILDLINK_PACKAGES+=	glib
-BUILDLINK_ORDER+=	glib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glib
 
 .if !empty(GLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glib+=	glib>=1.2.10nb5
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index 37735850581..6b96c8cc832 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB2_BUILDLINK3_MK:=	${GLIB2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	glib2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglib2}
 BUILDLINK_PACKAGES+=	glib2
-BUILDLINK_ORDER+=	glib2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glib2
 
 .if !empty(GLIB2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0
diff --git a/devel/glibmm/buildlink3.mk b/devel/glibmm/buildlink3.mk
index 0841aaa3487..12246bf95ee 100644
--- a/devel/glibmm/buildlink3.mk
+++ b/devel/glibmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIBMM_BUILDLINK3_MK:=	${GLIBMM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	glibmm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglibmm}
 BUILDLINK_PACKAGES+=	glibmm
-BUILDLINK_ORDER+=	glibmm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glibmm
 
 .if !empty(GLIBMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glibmm+=	glibmm>=2.6.1
diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk
index f683b0c8b9d..d4e5c5e9eda 100644
--- a/devel/gmp/buildlink3.mk
+++ b/devel/gmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GMP_BUILDLINK3_MK:=	${GMP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gmp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngmp}
 BUILDLINK_PACKAGES+=	gmp
-BUILDLINK_ORDER+=	gmp
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gmp
 
 .if !empty(GMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gmp+=		gmp>=4.1.2
diff --git a/devel/gnustep-base/buildlink3.mk b/devel/gnustep-base/buildlink3.mk
index bb002febbb0..32f16c80f78 100644
--- a/devel/gnustep-base/buildlink3.mk
+++ b/devel/gnustep-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_BASE_BUILDLINK3_MK:=	${GNUSTEP_BASE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gnustep-base
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-base}
 BUILDLINK_PACKAGES+=	gnustep-base
-BUILDLINK_ORDER+=	gnustep-base
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-base
 
 .if !empty(GNUSTEP_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-base+=	gnustep-base>=1.9.1
diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk
index 9a8cd14f9d5..e8167714f47 100644
--- a/devel/gnustep-make/buildlink3.mk
+++ b/devel/gnustep-make/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_MAKE_BUILDLINK3_MK:=	${GNUSTEP_MAKE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gnustep-make
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-make}
 BUILDLINK_PACKAGES+=	gnustep-make
-BUILDLINK_ORDER+=	gnustep-make
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-make
 
 .if !empty(GNUSTEP_MAKE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=1.9.1
diff --git a/devel/gnustep-objc-lf2/buildlink3.mk b/devel/gnustep-objc-lf2/buildlink3.mk
index 0aed147c76f..2e79c31565a 100644
--- a/devel/gnustep-objc-lf2/buildlink3.mk
+++ b/devel/gnustep-objc-lf2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNUSTEP_OBJC_LF2_BUILDLINK3_MK:=	${GNUSTEP_OBJC_LF2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gnustep-objc-lf2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-objc-lf2}
 BUILDLINK_PACKAGES+=	gnustep-objc-lf2
-BUILDLINK_ORDER+=	gnustep-objc-lf2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-objc-lf2
 
 .if !empty(GNUSTEP_OBJC_LF2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-objc-lf2+=	gnustep-objc-lf2>=2.95.3.88
diff --git a/devel/gnustep-objc/buildlink3.mk b/devel/gnustep-objc/buildlink3.mk
index 8d6975c2f3c..0e36dde5b8c 100644
--- a/devel/gnustep-objc/buildlink3.mk
+++ b/devel/gnustep-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_OBJC_BUILDLINK3_MK:=	${GNUSTEP_OBJC_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gnustep-objc
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-objc}
 BUILDLINK_PACKAGES+=	gnustep-objc
-BUILDLINK_ORDER+=	gnustep-objc
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-objc
 
 .if !empty(GNUSTEP_OBJC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-objc+=	gnustep-objc>=1.3.0
diff --git a/devel/gob2/buildlink3.mk b/devel/gob2/buildlink3.mk
index 9c648d05269..76955a12420 100644
--- a/devel/gob2/buildlink3.mk
+++ b/devel/gob2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GOB2_BUILDLINK3_MK:=	${GOB2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gob2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngob2}
 BUILDLINK_PACKAGES+=	gob2
-BUILDLINK_ORDER+=	gob2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gob2
 
 .if !empty(GOB2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gob2+=	gob2>=2.0.10
diff --git a/devel/gperf/buildlink3.mk b/devel/gperf/buildlink3.mk
index 9f29728756c..066fa00205e 100644
--- a/devel/gperf/buildlink3.mk
+++ b/devel/gperf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GPERF_BUILDLINK3_MK:=	${GPERF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gperf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngperf}
 BUILDLINK_PACKAGES+=	gperf
-BUILDLINK_ORDER+=	gperf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gperf
 
 .if !empty(GPERF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gperf+=	gperf>=3.0.1
diff --git a/devel/gtl/buildlink3.mk b/devel/gtl/buildlink3.mk
index 8a3e2982a0d..07613fad7e3 100644
--- a/devel/gtl/buildlink3.mk
+++ b/devel/gtl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTL_BUILDLINK3_MK:=	${GTL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gtl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtl}
 BUILDLINK_PACKAGES+=	gtl
-BUILDLINK_ORDER+=	gtl
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtl
 
 .if !empty(GTL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtl+=		gtl>=1.2.0
diff --git a/devel/guile-gtk/buildlink3.mk b/devel/guile-gtk/buildlink3.mk
index 3b9b47c31c9..8238b9a3ae6 100644
--- a/devel/guile-gtk/buildlink3.mk
+++ b/devel/guile-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GUILE_GTK_BUILDLINK3_MK:=	${GUILE_GTK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	guile-gtk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile-gtk}
 BUILDLINK_PACKAGES+=	guile-gtk
-BUILDLINK_ORDER+=	guile-gtk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile-gtk
 
 .if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.guile-gtk+=	guile-gtk>=0.40
diff --git a/devel/guile14-gtk/buildlink3.mk b/devel/guile14-gtk/buildlink3.mk
index 78321563556..033d0a96901 100644
--- a/devel/guile14-gtk/buildlink3.mk
+++ b/devel/guile14-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GUILE_GTK_BUILDLINK3_MK:=	${GUILE_GTK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	guile-gtk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile-gtk}
 BUILDLINK_PACKAGES+=	guile-gtk
-BUILDLINK_ORDER+=	guile-gtk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile-gtk
 
 .if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.guile-gtk+=	guile-gtk>=0.19nb4
diff --git a/devel/hdf/buildlink3.mk b/devel/hdf/buildlink3.mk
index ee0b8abf285..24f465aaffd 100644
--- a/devel/hdf/buildlink3.mk
+++ b/devel/hdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HDF_BUILDLINK3_MK:=	${HDF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	hdf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhdf}
 BUILDLINK_PACKAGES+=	hdf
-BUILDLINK_ORDER+=	hdf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hdf
 
 .if !empty(HDF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.hdf+=	hdf>=4.1r5
diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk
index 1215937dbdf..de1301b2030 100644
--- a/devel/hdf5/buildlink3.mk
+++ b/devel/hdf5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HDF5_BUILDLINK3_MK:=	${HDF5_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	hdf5
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhdf5}
 BUILDLINK_PACKAGES+=	hdf5
-BUILDLINK_ORDER+=	hdf5
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hdf5
 
 .if !empty(HDF5_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.hdf5+=	hdf5>=1.6.2
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index 487ea8f051f..a82b2ac1b44 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDESDK_BUILDLINK3_MK:=	${KDESDK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	kdesdk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdesdk}
 BUILDLINK_PACKAGES+=	kdesdk
-BUILDLINK_ORDER+=	kdesdk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdesdk
 
 .if !empty(KDESDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdesdk+=	kdesdk>=3.5.0nb1
diff --git a/devel/ldapsdk/buildlink3.mk b/devel/ldapsdk/buildlink3.mk
index 592fb83bbd9..267f46c1ac1 100644
--- a/devel/ldapsdk/buildlink3.mk
+++ b/devel/ldapsdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LDAPSDK_BUILDLINK3_MK:=	${LDAPSDK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ldapsdk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nldapsdk}
 BUILDLINK_PACKAGES+=	ldapsdk
-BUILDLINK_ORDER+=	ldapsdk
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ldapsdk
 
 .if !empty(LDAPSDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ldapsdk+=	ldapsdk>=12311998
diff --git a/devel/libFoundation/buildlink3.mk b/devel/libFoundation/buildlink3.mk
index f44e799bfea..ae2648c51ea 100644
--- a/devel/libFoundation/buildlink3.mk
+++ b/devel/libFoundation/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBFOUNDATION_BUILDLINK3_MK:=	${LIBFOUNDATION_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libFoundation
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibFoundation}
 BUILDLINK_PACKAGES+=	libFoundation
-BUILDLINK_ORDER+=	libFoundation
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libFoundation
 
 .if !empty(LIBFOUNDATION_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libFoundation+=	libFoundation>=1.0.72.107nb1
diff --git a/devel/libargparse/buildlink3.mk b/devel/libargparse/buildlink3.mk
index 05947c26035..58c3f8d1c02 100644
--- a/devel/libargparse/buildlink3.mk
+++ b/devel/libargparse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBARGPARSE_BUILDLINK3_MK:=	${LIBARGPARSE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libargparse
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibargparse}
 BUILDLINK_PACKAGES+=	libargparse
-BUILDLINK_ORDER+=	libargparse
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libargparse
 
 .if !empty(LIBARGPARSE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libargparse+=	libargparse>=0.1.0000
diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk
index a2599713b36..b8765e00ee4 100644
--- a/devel/libast/buildlink3.mk
+++ b/devel/libast/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAST_BUILDLINK3_MK:=	${LIBAST_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libast
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibast}
 BUILDLINK_PACKAGES+=	libast
-BUILDLINK_ORDER+=	libast
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libast
 
 .if !empty(LIBAST_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libast+=	libast>=0.5nb5
diff --git a/devel/libaura/buildlink3.mk b/devel/libaura/buildlink3.mk
index 83a25e1071a..9c716e4fa66 100644
--- a/devel/libaura/buildlink3.mk
+++ b/devel/libaura/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAURA_BUILDLINK3_MK:=	${LIBAURA_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libaura
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibaura}
 BUILDLINK_PACKAGES+=	libaura
-BUILDLINK_ORDER+=	libaura
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libaura
 
 .if !empty(LIBAURA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libaura+=	libaura>=3.1
diff --git a/devel/libbegemot/buildlink3.mk b/devel/libbegemot/buildlink3.mk
index ee2ee3f7965..255e6dc6fb9 100644
--- a/devel/libbegemot/buildlink3.mk
+++ b/devel/libbegemot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBEGEMOT_BUILDLINK3_MK:=	${LIBBEGEMOT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libbegemot
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibbegemot}
 BUILDLINK_PACKAGES+=	libbegemot
-BUILDLINK_ORDER+=	libbegemot
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbegemot
 
 .if !empty(LIBBEGEMOT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libbegemot+=	libbegemot>=1.9nb1
diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk
index cab10ad9381..351bf5e66ad 100644
--- a/devel/libbonobo/buildlink3.mk
+++ b/devel/libbonobo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBONOBO_BUILDLINK3_MK:=	${LIBBONOBO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libbonobo
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibbonobo}
 BUILDLINK_PACKAGES+=	libbonobo
-BUILDLINK_ORDER+=	libbonobo
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbonobo
 
 .if !empty(LIBBONOBO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libbonobo+=	libbonobo>=2.8.0
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index 1a577948491..46578eb00eb 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:43 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBONOBOUI_BUILDLINK3_MK:=	${LIBBONOBOUI_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libbonoboui
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibbonoboui}
 BUILDLINK_PACKAGES+=	libbonoboui
-BUILDLINK_ORDER+=	libbonoboui
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbonoboui
 
 .if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libbonoboui+=		libbonoboui>=2.8.0
diff --git a/devel/libcfg+/buildlink3.mk b/devel/libcfg+/buildlink3.mk
index 8cc0c635091..e0f5aee7b56 100644
--- a/devel/libcfg+/buildlink3.mk
+++ b/devel/libcfg+/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBCFG_BUILDLINK3_MK:=	${LIBCFG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libcfg
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcfg}
 BUILDLINK_PACKAGES+=	libcfg
-BUILDLINK_ORDER+=	libcfg
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcfg
 
 .if !empty(LIBCFG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcfg+=	libcfg+>=0.6.2nb1
diff --git a/devel/libdfui/buildlink3.mk b/devel/libdfui/buildlink3.mk
index 6abed5dec24..5d3df15ee26 100644
--- a/devel/libdfui/buildlink3.mk
+++ b/devel/libdfui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBDFUI_BUILDLINK3_MK:=	${LIBDFUI_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libdfui
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdfui}
 BUILDLINK_PACKAGES+=	libdfui
-BUILDLINK_ORDER+=	libdfui
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdfui
 
 .if !empty(LIBDFUI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdfui+=	libdfui>=4.1
diff --git a/devel/libdnsres/buildlink3.mk b/devel/libdnsres/buildlink3.mk
index 411e9df3093..58d64fd221d 100644
--- a/devel/libdnsres/buildlink3.mk
+++ b/devel/libdnsres/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDNSRES_BUILDLINK3_MK:=	${LIBDNSRES_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libdnsres
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdnsres}
 BUILDLINK_PACKAGES+=	libdnsres
-BUILDLINK_ORDER+=	libdnsres
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdnsres
 
 .if !empty(LIBDNSRES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdnsres+=	libdnsres>=0.1a
diff --git a/devel/libdockapp/buildlink3.mk b/devel/libdockapp/buildlink3.mk
index 5ea915c4548..5ac959c836f 100644
--- a/devel/libdockapp/buildlink3.mk
+++ b/devel/libdockapp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDOCKAPP_BUILDLINK3_MK:=	${LIBDOCKAPP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libdockapp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdockapp}
 BUILDLINK_PACKAGES+=	libdockapp
-BUILDLINK_ORDER+=	libdockapp
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdockapp
 
 .if !empty(LIBDOCKAPP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdockapp+=		libdockapp>=0.4.0
diff --git a/devel/libebml/buildlink3.mk b/devel/libebml/buildlink3.mk
index 7566d7ccff8..5c9e66f81e7 100644
--- a/devel/libebml/buildlink3.mk
+++ b/devel/libebml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libebml.
 #
@@ -14,7 +14,7 @@ BUILDLINK_DEPENDS+=	libebml
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibebml}
 BUILDLINK_PACKAGES+=	libebml
-BUILDLINK_ORDER+=	libebml
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libebml
 
 .if !empty(LIBEBML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libebml+=	libebml>=0.7.6
diff --git a/devel/libelf/buildlink3.mk b/devel/libelf/buildlink3.mk
index b96c4a58e38..07789d00795 100644
--- a/devel/libelf/buildlink3.mk
+++ b/devel/libelf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBELF_BUILDLINK3_MK:=	${LIBELF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libelf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibelf}
 BUILDLINK_PACKAGES+=	libelf
-BUILDLINK_ORDER+=	libelf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libelf
 
 .if !empty(LIBELF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libelf+=	libelf>=0.8.5
diff --git a/devel/libetm/buildlink3.mk b/devel/libetm/buildlink3.mk
index 7725f7db349..2a7efa27792 100644
--- a/devel/libetm/buildlink3.mk
+++ b/devel/libetm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBETM_BUILDLINK3_MK:=	${LIBETM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libetm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibetm}
 BUILDLINK_PACKAGES+=	libetm
-BUILDLINK_ORDER+=	libetm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libetm
 
 .if !empty(LIBETM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libetm+=	libetm>=1.09
diff --git a/devel/libevent/buildlink3.mk b/devel/libevent/buildlink3.mk
index 71ae65eea8b..b27a412cbd6 100644
--- a/devel/libevent/buildlink3.mk
+++ b/devel/libevent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBEVENT_BUILDLINK3_MK:=	${LIBEVENT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libevent
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibevent}
 BUILDLINK_PACKAGES+=	libevent
-BUILDLINK_ORDER+=	libevent
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libevent
 
 .if !empty(LIBEVENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=0.6
diff --git a/devel/libextractor/buildlink3.mk b/devel/libextractor/buildlink3.mk
index 00c35fae77e..f6a57ef2f68 100644
--- a/devel/libextractor/buildlink3.mk
+++ b/devel/libextractor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBEXTRACTOR_BUILDLINK3_MK:=	${LIBEXTRACTOR_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libextractor
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibextractor}
 BUILDLINK_PACKAGES+=	libextractor
-BUILDLINK_ORDER+=	libextractor
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libextractor
 
 .if !empty(LIBEXTRACTOR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libextractor+=	libextractor>=0.3.10
diff --git a/devel/libffi/buildlink3.mk b/devel/libffi/buildlink3.mk
index 826bf822efb..2dbe2f065de 100644
--- a/devel/libffi/buildlink3.mk
+++ b/devel/libffi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBFFI_BUILDLINK3_MK:=	${LIBFFI_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libffi
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibffi}
 BUILDLINK_PACKAGES+=	libffi
-BUILDLINK_ORDER+=	libffi
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libffi
 
 .if !empty(LIBFFI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libffi+=	libffi>=1.20
diff --git a/devel/libgail-gnome/buildlink3.mk b/devel/libgail-gnome/buildlink3.mk
index 19af7ec37b3..3cd7c464400 100644
--- a/devel/libgail-gnome/buildlink3.mk
+++ b/devel/libgail-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGAIL_GNOME_BUILDLINK3_MK:=	${LIBGAIL_GNOME_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libgail-gnome
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgail-gnome}
 BUILDLINK_PACKAGES+=	libgail-gnome
-BUILDLINK_ORDER+=	libgail-gnome
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgail-gnome
 
 .if !empty(LIBGAIL_GNOME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgail-gnome+=	libgail-gnome>=1.1.1nb2
diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk
index 9794d8d4599..aeb84d5edce 100644
--- a/devel/libgetopt/buildlink3.mk
+++ b/devel/libgetopt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGETOPT_BUILDLINK3_MK:=	${LIBGETOPT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	getopt
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngetopt}
 BUILDLINK_PACKAGES+=	getopt
-BUILDLINK_ORDER+=	getopt
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}getopt
 
 .if !empty(LIBGETOPT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.getopt+=	libgetopt>=1.3
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
index 83c3a420c8d..4eb57783429 100644
--- a/devel/libglade/buildlink3.mk
+++ b/devel/libglade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGLADE_BUILDLINK3_MK:=	${LIBGLADE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libglade
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibglade}
 BUILDLINK_PACKAGES+=	libglade
-BUILDLINK_ORDER+=	libglade
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libglade
 
 .if !empty(LIBGLADE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libglade+=	libglade>=0.17nb5
diff --git a/devel/libglade2/buildlink3.mk b/devel/libglade2/buildlink3.mk
index 1a52bfd5365..60a5b76aa84 100644
--- a/devel/libglade2/buildlink3.mk
+++ b/devel/libglade2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGLADE2_BUILDLINK3_MK:=	${LIBGLADE2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libglade2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibglade2}
 BUILDLINK_PACKAGES+=	libglade2
-BUILDLINK_ORDER+=	libglade2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libglade2
 
 .if !empty(LIBGLADE2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.3.6
diff --git a/devel/libglademm/buildlink3.mk b/devel/libglademm/buildlink3.mk
index ef1edd7b089..3dca726436b 100644
--- a/devel/libglademm/buildlink3.mk
+++ b/devel/libglademm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGLADEMM_BUILDLINK3_MK:=	${LIBGLADEMM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libglademm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibglademm}
 BUILDLINK_PACKAGES+=	libglademm
-BUILDLINK_ORDER+=	libglademm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libglademm
 
 .if !empty(LIBGLADEMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libglademm+=	libglademm>=2.6.0
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index d215aedcb64..e026e7b3741 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOME_BUILDLINK3_MK:=	${LIBGNOME_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libgnome
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnome}
 BUILDLINK_PACKAGES+=	libgnome
-BUILDLINK_ORDER+=	libgnome
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnome
 
 .if !empty(LIBGNOME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.8.0
diff --git a/devel/libgnomemm/buildlink3.mk b/devel/libgnomemm/buildlink3.mk
index 628891a95d9..4b509580180 100644
--- a/devel/libgnomemm/buildlink3.mk
+++ b/devel/libgnomemm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEMM_BUILDLINK3_MK:=	${LIBGNOMEMM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libgnomemm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomemm}
 BUILDLINK_PACKAGES+=	libgnomemm
-BUILDLINK_ORDER+=	libgnomemm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomemm
 
 .if !empty(LIBGNOMEMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomemm+=	libgnomemm>=2.10.0
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index 37216c03f33..fba1700e80e 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEUI_BUILDLINK3_MK:=	${LIBGNOMEUI_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libgnomeui
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeui}
 BUILDLINK_PACKAGES+=	libgnomeui
-BUILDLINK_ORDER+=	libgnomeui
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomeui
 
 .if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.8.0
diff --git a/devel/libgnomeuimm/buildlink3.mk b/devel/libgnomeuimm/buildlink3.mk
index b15d5bc21ac..4993658a451 100644
--- a/devel/libgnomeuimm/buildlink3.mk
+++ b/devel/libgnomeuimm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEUIMM_BUILDLINK3_MK:=	${LIBGNOMEUIMM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libgnomeuimm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeuimm}
 BUILDLINK_PACKAGES+=	libgnomeuimm
-BUILDLINK_ORDER+=	libgnomeuimm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomeuimm
 
 .if !empty(LIBGNOMEUIMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomeuimm+=	libgnomeuimm>=2.10.0
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
index 4ff89ed3809..deaa19ad1cc 100644
--- a/devel/libgphoto2/buildlink3.mk
+++ b/devel/libgphoto2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGPHOTO2_BUILDLINK3_MK:=	${LIBGPHOTO2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libgphoto2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgphoto2}
 BUILDLINK_PACKAGES+=	libgphoto2
-BUILDLINK_ORDER+=	libgphoto2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgphoto2
 
 .if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgphoto2+=		libgphoto2>=2.1.2
diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk
index b598a80796b..24af3b18944 100644
--- a/devel/libgsf/buildlink3.mk
+++ b/devel/libgsf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGSF_BUILDLINK3_MK:=	${LIBGSF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libgsf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgsf}
 BUILDLINK_PACKAGES+=	libgsf
-BUILDLINK_ORDER+=	libgsf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgsf
 
 .if !empty(LIBGSF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.13.3
diff --git a/devel/libhfs/buildlink3.mk b/devel/libhfs/buildlink3.mk
index 2f65f297303..dd341c75ff2 100644
--- a/devel/libhfs/buildlink3.mk
+++ b/devel/libhfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBHFS_BUILDLINK3_MK:=	${LIBHFS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libhfs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibhfs}
 BUILDLINK_PACKAGES+=	libhfs
-BUILDLINK_ORDER+=	libhfs
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libhfs
 
 .if !empty(LIBHFS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libhfs+=	libhfs>=3.2.6nb1
diff --git a/devel/libiberty/buildlink3.mk b/devel/libiberty/buildlink3.mk
index 0021b9b4ccb..5d1e9436d30 100644
--- a/devel/libiberty/buildlink3.mk
+++ b/devel/libiberty/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBIBERTY_BUILDLINK3_MK:=	${LIBIBERTY_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libiberty
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibiberty}
 BUILDLINK_PACKAGES+=	libiberty
-BUILDLINK_ORDER+=	libiberty
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libiberty
 
 .if !empty(LIBIBERTY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libiberty+=	libiberty>=1.0nb1
diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk
index e74162277b3..6bd073817a7 100644
--- a/devel/libidn/buildlink3.mk
+++ b/devel/libidn/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBIDN_BUILDLINK3_MK:=	${LIBIDN_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libidn
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibidn}
 BUILDLINK_PACKAGES+=	libidn
-BUILDLINK_ORDER+=	libidn
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libidn
 
 .if !empty(LIBIDN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libidn+=	libidn>=0.4.6
diff --git a/devel/libinstaller/buildlink3.mk b/devel/libinstaller/buildlink3.mk
index 87a0e904d33..f19b4462986 100644
--- a/devel/libinstaller/buildlink3.mk
+++ b/devel/libinstaller/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBINSTALLER_BUILDLINK3_MK:=	${LIBINSTALLER_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libinstaller
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibinstaller}
 BUILDLINK_PACKAGES+=	libinstaller
-BUILDLINK_ORDER+=	libinstaller
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libinstaller
 
 .if !empty(LIBINSTALLER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libinstaller+=	libinstaller>=5.1
diff --git a/devel/libjit/buildlink3.mk b/devel/libjit/buildlink3.mk
index b85d8a23a07..4fbc9e9b2a6 100644
--- a/devel/libjit/buildlink3.mk
+++ b/devel/libjit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBJIT_BUILDLINK3_MK:=	${LIBJIT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libjit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibjit}
 BUILDLINK_PACKAGES+=	libjit
-BUILDLINK_ORDER+=	libjit
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libjit
 
 .if !empty(LIBJIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libjit+=	libjit>=0.0.2
diff --git a/devel/libltdl/buildlink3.mk b/devel/libltdl/buildlink3.mk
index ac3646a9a20..c9b86d9f421 100644
--- a/devel/libltdl/buildlink3.mk
+++ b/devel/libltdl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBLTDL_BUILDLINK3_MK:=	${LIBLTDL_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_DEPENDS+=	libltdl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibltdl}
 BUILDLINK_PACKAGES+=	libltdl
-BUILDLINK_ORDER+=	libltdl
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libltdl
 
 .if !empty(LIBLTDL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libltdl+=	libltdl>=1.5.10
diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk
index 69fc93967fe..3ad725bbb68 100644
--- a/devel/libmatchbox/buildlink3.mk
+++ b/devel/libmatchbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMATCHBOX_BUILDLINK3_MK:=	${LIBMATCHBOX_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmatchbox
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmatchbox}
 BUILDLINK_PACKAGES+=	libmatchbox
-BUILDLINK_ORDER+=	libmatchbox
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmatchbox
 
 .if !empty(LIBMATCHBOX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmatchbox+=	libmatchbox>=1.4
diff --git a/devel/libmemcache/buildlink3.mk b/devel/libmemcache/buildlink3.mk
index f0a9983a750..91813d9e331 100644
--- a/devel/libmemcache/buildlink3.mk
+++ b/devel/libmemcache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMEMCACHE_BUILDLINK3_MK:=	${LIBMEMCACHE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmemcache
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmemcache}
 BUILDLINK_PACKAGES+=	libmemcache
-BUILDLINK_ORDER+=	libmemcache
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmemcache
 
 .if !empty(LIBMEMCACHE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmemcache+=	libmemcache>=1.4.0beta5
diff --git a/devel/libmemmgr/buildlink3.mk b/devel/libmemmgr/buildlink3.mk
index eec1a8de4fc..769b9e0755a 100644
--- a/devel/libmemmgr/buildlink3.mk
+++ b/devel/libmemmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMEMMGR_BUILDLINK3_MK:=	${LIBMEMMGR_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmemmgr
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmemmgr}
 BUILDLINK_PACKAGES+=	libmemmgr
-BUILDLINK_ORDER+=	libmemmgr
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmemmgr
 
 .if !empty(LIBMEMMGR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmemmgr+=	libmemmgr>=1.04
diff --git a/devel/libmimedir/buildlink3.mk b/devel/libmimedir/buildlink3.mk
index 112bbe7cef3..fba9624a7c0 100644
--- a/devel/libmimedir/buildlink3.mk
+++ b/devel/libmimedir/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMIMEDIR_BUILDLINK3_MK:=	${LIBMIMEDIR_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmimedir
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmimedir}
 BUILDLINK_PACKAGES+=	libmimedir
-BUILDLINK_ORDER+=	libmimedir
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmimedir
 
 .if !empty(LIBMIMEDIR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmimedir+=	libmimedir>=0.4nb1
diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk
index d094057f6a8..1f41088b03e 100644
--- a/devel/libmm/buildlink3.mk
+++ b/devel/libmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBMM_BUILDLINK3_MK:=	${LIBMM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmm}
 BUILDLINK_PACKAGES+=	libmm
-BUILDLINK_ORDER+=	libmm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmm
 
 .if !empty(LIBMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmm+=	libmm>=1.2.1
diff --git a/devel/libnet/buildlink3.mk b/devel/libnet/buildlink3.mk
index 6b330bb2692..dc5367a899e 100644
--- a/devel/libnet/buildlink3.mk
+++ b/devel/libnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBNET_BUILDLINK3_MK:=	${LIBNET_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libnet
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnet}
 BUILDLINK_PACKAGES+=	libnet
-BUILDLINK_ORDER+=	libnet
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnet
 
 .if !empty(LIBNET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libnet+=	libnet>=1.0.1bnb3
diff --git a/devel/libnet11/buildlink3.mk b/devel/libnet11/buildlink3.mk
index 6463bcf8f9f..6cad8c9a494 100644
--- a/devel/libnet11/buildlink3.mk
+++ b/devel/libnet11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBNET_BUILDLINK3_MK:=	${LIBNET_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libnet
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnet}
 BUILDLINK_PACKAGES+=	libnet
-BUILDLINK_ORDER+=	libnet
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnet
 
 .if !empty(LIBNET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libnet+=	libnet>=1.1.2.1
diff --git a/devel/libntlm/buildlink3.mk b/devel/libntlm/buildlink3.mk
index 2ad84792a7a..ca35458007f 100644
--- a/devel/libntlm/buildlink3.mk
+++ b/devel/libntlm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBNTLM_BUILDLINK3_MK:=	${LIBNTLM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libntlm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibntlm}
 BUILDLINK_PACKAGES+=	libntlm
-BUILDLINK_ORDER+=	libntlm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libntlm
 
 .if !empty(LIBNTLM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libntlm+=	libntlm>=0.3.2
diff --git a/devel/liboil/buildlink3.mk b/devel/liboil/buildlink3.mk
index 3b6c74e6431..b91ad9c15e0 100644
--- a/devel/liboil/buildlink3.mk
+++ b/devel/liboil/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBOIL_BUILDLINK3_MK:=	${LIBOIL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	liboil
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliboil}
 BUILDLINK_PACKAGES+=	liboil
-BUILDLINK_ORDER+=	liboil
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liboil
 
 .if !empty(LIBOIL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.liboil+=	liboil>=0.3.6
diff --git a/devel/libole2/buildlink3.mk b/devel/libole2/buildlink3.mk
index 3ca41a1e246..be4ad4146bf 100644
--- a/devel/libole2/buildlink3.mk
+++ b/devel/libole2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBOLE2_BUILDLINK3_MK:=	${LIBOLE2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libole2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibole2}
 BUILDLINK_PACKAGES+=	libole2
-BUILDLINK_ORDER+=	libole2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libole2
 
 .if !empty(LIBOLE2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libole2+=	libole2>=0.2.4nb1
diff --git a/devel/liboop/buildlink3.mk b/devel/liboop/buildlink3.mk
index 15b8c6dc80d..e8e52fbd782 100644
--- a/devel/liboop/buildlink3.mk
+++ b/devel/liboop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBOOP_BUILDLINK3_MK:=	${LIBOOP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	liboop
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliboop}
 BUILDLINK_PACKAGES+=	liboop
-BUILDLINK_ORDER+=	liboop
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liboop
 
 .if !empty(LIBOOP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.liboop+=	liboop>=0.9
diff --git a/devel/libosip/buildlink3.mk b/devel/libosip/buildlink3.mk
index c66f4d86816..c66306216c2 100644
--- a/devel/libosip/buildlink3.mk
+++ b/devel/libosip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBOSIP2_BUILDLINK3_MK:=	${LIBOSIP2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libosip2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibosip2}
 BUILDLINK_PACKAGES+=	libosip2
-BUILDLINK_ORDER+=	libosip2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libosip2
 
 .if !empty(LIBOSIP2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libosip2+=	libosip2>=2.2.0
diff --git a/devel/libportlib/buildlink3.mk b/devel/libportlib/buildlink3.mk
index bf6f7de422c..6075ed16115 100644
--- a/devel/libportlib/buildlink3.mk
+++ b/devel/libportlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPORTLIB_BUILDLINK3_MK:=	${LIBPORTLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libportlib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibportlib}
 BUILDLINK_PACKAGES+=	libportlib
-BUILDLINK_ORDER+=	libportlib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libportlib
 
 .if !empty(LIBPORTLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libportlib+=	libportlib>=1.01
diff --git a/devel/libproplist/buildlink3.mk b/devel/libproplist/buildlink3.mk
index 737113b5da2..d7ec63d44b8 100644
--- a/devel/libproplist/buildlink3.mk
+++ b/devel/libproplist/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPROPLIST_BUILDLINK3_MK:=	${LIBPROPLIST_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libproplist
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibproplist}
 BUILDLINK_PACKAGES+=	libproplist
-BUILDLINK_ORDER+=	libproplist
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libproplist
 
 .if !empty(LIBPROPLIST_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libproplist+=		libproplist>=0.10.1
diff --git a/devel/librfuncs/buildlink3.mk b/devel/librfuncs/buildlink3.mk
index 8d3fdd9d11b..b5f20af2662 100644
--- a/devel/librfuncs/buildlink3.mk
+++ b/devel/librfuncs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRFUNCS_BUILDLINK3_MK:=	${LIBRFUNCS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	librfuncs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrfuncs}
 BUILDLINK_PACKAGES+=	librfuncs
-BUILDLINK_ORDER+=	librfuncs
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librfuncs
 
 .if !empty(LIBRFUNCS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.librfuncs+=	librfuncs>=1.0.4
diff --git a/devel/librsync/buildlink3.mk b/devel/librsync/buildlink3.mk
index 69fb3d71ba8..94400a1a11b 100644
--- a/devel/librsync/buildlink3.mk
+++ b/devel/librsync/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRSYNC_BUILDLINK3_MK:=	${LIBRSYNC_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	librsync
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsync}
 BUILDLINK_PACKAGES+=	librsync
-BUILDLINK_ORDER+=	librsync
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librsync
 
 .if !empty(LIBRSYNC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6nb2
diff --git a/devel/libscsi/buildlink3.mk b/devel/libscsi/buildlink3.mk
index 0aa8300993c..85d9778e03a 100644
--- a/devel/libscsi/buildlink3.mk
+++ b/devel/libscsi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBSCSI_BUILDLINK3_MK:=	${LIBSCSI_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libscsi
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibscsi}
 BUILDLINK_PACKAGES+=	libscsi
-BUILDLINK_ORDER+=	libscsi
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libscsi
 
 .if !empty(LIBSCSI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libscsi+=	libscsi>=1.6
diff --git a/devel/libsexy/buildlink3.mk b/devel/libsexy/buildlink3.mk
index 6909634c1a6..46683e67d25 100644
--- a/devel/libsexy/buildlink3.mk
+++ b/devel/libsexy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBSEXY_BUILDLINK3_MK:=	${LIBSEXY_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libsexy
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsexy}
 BUILDLINK_PACKAGES+=	libsexy
-BUILDLINK_ORDER+=	libsexy
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsexy
 
 .if !empty(LIBSEXY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsexy+=	libsexy>=0.1.8
diff --git a/devel/libsigc++/buildlink3.mk b/devel/libsigc++/buildlink3.mk
index d52f4e1e331..4084afd5a3a 100644
--- a/devel/libsigc++/buildlink3.mk
+++ b/devel/libsigc++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIGC++_BUILDLINK3_MK:=	${LIBSIGC++_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libsigcxx
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsigcxx}
 BUILDLINK_PACKAGES+=	libsigcxx
-BUILDLINK_ORDER+=	libsigcxx
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigcxx
 
 .if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsigcxx+=	libsigc++>=1.2.3nb1
diff --git a/devel/libsigc++2/buildlink3.mk b/devel/libsigc++2/buildlink3.mk
index 648372a123e..974bc3c3dfd 100644
--- a/devel/libsigc++2/buildlink3.mk
+++ b/devel/libsigc++2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIGC++_BUILDLINK3_MK:=	${LIBSIGC++_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libsigcxx
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsigcxx}
 BUILDLINK_PACKAGES+=	libsigcxx
-BUILDLINK_ORDER+=	libsigcxx
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigcxx
 
 .if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsigcxx+=	libsigc++2>=2.0.3
diff --git a/devel/libsigsegv/buildlink3.mk b/devel/libsigsegv/buildlink3.mk
index c8fe2b7e58e..78dc1eceae9 100644
--- a/devel/libsigsegv/buildlink3.mk
+++ b/devel/libsigsegv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIGSEGV_BUILDLINK3_MK:=	${LIBSIGSEGV_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libsigsegv
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsigsegv}
 BUILDLINK_PACKAGES+=	libsigsegv
-BUILDLINK_ORDER+=	libsigsegv
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigsegv
 
 .if !empty(LIBSIGSEGV_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsigsegv+=	libsigsegv>=2.2
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index f79bb4cfddf..ab820a8cb19 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSLANG_BUILDLINK3_MK:=	${LIBSLANG_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	libslang
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibslang}
 BUILDLINK_PACKAGES+=	libslang
-BUILDLINK_ORDER+=	libslang
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang
 
 .if !empty(LIBSLANG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libslang+=	libslang>=1.4.9nb1
diff --git a/devel/libstatgrab/buildlink3.mk b/devel/libstatgrab/buildlink3.mk
index 7315a0205ab..c8182b234b5 100644
--- a/devel/libstatgrab/buildlink3.mk
+++ b/devel/libstatgrab/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSTATGRAB_BUILDLINK3_MK:=	${LIBSTATGRAB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libstatgrab
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibstatgrab}
 BUILDLINK_PACKAGES+=	libstatgrab
-BUILDLINK_ORDER+=	libstatgrab
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libstatgrab
 
 .if !empty(LIBSTATGRAB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libstatgrab+=	libstatgrab>=0.10
diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk
index f67e9410478..9bdab64a5d5 100644
--- a/devel/libstroke/buildlink3.mk
+++ b/devel/libstroke/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSTROKE_BUILDLINK3_MK:=	${LIBSTROKE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libstroke
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibstroke}
 BUILDLINK_PACKAGES+=	libstroke
-BUILDLINK_ORDER+=	libstroke
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libstroke
 
 .if !empty(LIBSTROKE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libstroke+=	libstroke>=0.5.1
diff --git a/devel/libtar/buildlink3.mk b/devel/libtar/buildlink3.mk
index da341117c49..aeef02e96bc 100644
--- a/devel/libtar/buildlink3.mk
+++ b/devel/libtar/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBTAR_BUILDLINK3_MK:=	${LIBTAR_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libtar
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtar}
 BUILDLINK_PACKAGES+=	libtar
-BUILDLINK_ORDER+=	libtar
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtar
 
 .if !empty(LIBTAR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtar+=	libtar>=1.2.11
diff --git a/devel/libtecla/buildlink3.mk b/devel/libtecla/buildlink3.mk
index 6decaf95d3f..ce732b0612f 100644
--- a/devel/libtecla/buildlink3.mk
+++ b/devel/libtecla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBTECLA_BUILDLINK3_MK:=	${LIBTECLA_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libtecla
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtecla}
 BUILDLINK_PACKAGES+=	libtecla
-BUILDLINK_ORDER+=	libtecla
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtecla
 
 .if !empty(LIBTECLA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtecla+=	libtecla>=1.5.0
diff --git a/devel/libts/buildlink3.mk b/devel/libts/buildlink3.mk
index b08e07a4800..0f0282d4653 100644
--- a/devel/libts/buildlink3.mk
+++ b/devel/libts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPMETHOD.libts?=	build
 
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	libts
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibts}
 BUILDLINK_PACKAGES+=	libts
-BUILDLINK_ORDER+=	libts
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libts
 
 .if !empty(LIBTS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libts+=	libts>=1.08
diff --git a/devel/libusb/buildlink3.mk b/devel/libusb/buildlink3.mk
index 3b4f17f5f08..1ae02f3a66c 100644
--- a/devel/libusb/buildlink3.mk
+++ b/devel/libusb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBUSB_BUILDLINK3_MK:=	${LIBUSB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libusb
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibusb}
 BUILDLINK_PACKAGES+=	libusb
-BUILDLINK_ORDER+=	libusb
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libusb
 
 .if !empty(LIBUSB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libusb+=	libusb>=0.1.7
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index 71d4ffd6a30..be647812dad 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWNCK_BUILDLINK3_MK:=	${LIBWNCK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libwnck
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwnck}
 BUILDLINK_PACKAGES+=	libwnck
-BUILDLINK_ORDER+=	libwnck
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwnck
 
 .if !empty(LIBWNCK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libwnck+=	libwnck>=2.10.0
diff --git a/devel/lwp/buildlink3.mk b/devel/lwp/buildlink3.mk
index c022a79960f..ee2340f1bd1 100644
--- a/devel/lwp/buildlink3.mk
+++ b/devel/lwp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LWP_BUILDLINK3_MK:=	${LWP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	lwp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlwp}
 BUILDLINK_PACKAGES+=	lwp
-BUILDLINK_ORDER+=	lwp
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lwp
 
 .if !empty(LWP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lwp+=	lwp>=1.6
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index 181284b629e..739354a9169 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ncurses
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nncurses}
 BUILDLINK_PACKAGES+=	ncurses
-BUILDLINK_ORDER+=	ncurses
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ncurses
 
 .if !empty(NCURSES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ncurses+=	ncurses>=5.3nb1
diff --git a/devel/netcdf/buildlink3.mk b/devel/netcdf/buildlink3.mk
index c5562439399..abf97c90b8e 100644
--- a/devel/netcdf/buildlink3.mk
+++ b/devel/netcdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NETCDF_BUILDLINK3_MK:=	${NETCDF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	netcdf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetcdf}
 BUILDLINK_PACKAGES+=	netcdf
-BUILDLINK_ORDER+=	netcdf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netcdf
 
 .if !empty(NETCDF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.netcdf+=	netcdf>=3.5
diff --git a/devel/newt/buildlink3.mk b/devel/newt/buildlink3.mk
index be0a897e2e1..14c3c3aa7b9 100644
--- a/devel/newt/buildlink3.mk
+++ b/devel/newt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NEWT_BUILDLINK3_MK:=	${NEWT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	newt
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnewt}
 BUILDLINK_PACKAGES+=	newt
-BUILDLINK_ORDER+=	newt
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}newt
 
 .if !empty(NEWT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.newt+=	newt>=0.51.6
diff --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk
index 6d7c997dd04..ab2c42f02d4 100644
--- a/devel/nspr/buildlink3.mk
+++ b/devel/nspr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NSPR_BUILDLINK3_MK:=	${NSPR_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	nspr
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnspr}
 BUILDLINK_PACKAGES+=	nspr
-BUILDLINK_ORDER+=	nspr
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nspr
 
 .if !empty(NSPR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.4.1nb1
diff --git a/devel/nss/buildlink3.mk b/devel/nss/buildlink3.mk
index c404045bb40..6977353f3c7 100644
--- a/devel/nss/buildlink3.mk
+++ b/devel/nss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NSS_BUILDLINK3_MK:=	${NSS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	nss
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnss}
 BUILDLINK_PACKAGES+=	nss
-BUILDLINK_ORDER+=	nss
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nss
 
 .if !empty(NSS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.nss+=		nss>=3.9.2nb1
diff --git a/devel/oaf/buildlink3.mk b/devel/oaf/buildlink3.mk
index 650b9aeae51..b29794fd4ee 100644
--- a/devel/oaf/buildlink3.mk
+++ b/devel/oaf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OAF_BUILDLINK3_MK:=	${OAF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	oaf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Noaf}
 BUILDLINK_PACKAGES+=	oaf
-BUILDLINK_ORDER+=	oaf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}oaf
 
 .if !empty(OAF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.oaf+=		oaf>=0.6.10nb4
diff --git a/devel/ode/buildlink3.mk b/devel/ode/buildlink3.mk
index c477d9582d1..74ec76956ef 100644
--- a/devel/ode/buildlink3.mk
+++ b/devel/ode/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ODE_BUILDLINK3_MK:=	${ODE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ode
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Node}
 BUILDLINK_PACKAGES+=	ode
-BUILDLINK_ORDER+=	ode
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ode
 
 .if !empty(ODE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ode+=		ode>=0.5nb2
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index 41819227d12..e8b15f2626a 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OGRE_BUILDLINK3_MK:=	${OGRE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ogre
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nogre}
 BUILDLINK_PACKAGES+=	ogre
-BUILDLINK_ORDER+=	ogre
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ogre
 
 .if !empty(OGRE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ogre+=	ogre>=0.12.1nb1
diff --git a/devel/p5-glib2/buildlink3.mk b/devel/p5-glib2/buildlink3.mk
index 975ec2ac2a4..9298fa24960 100644
--- a/devel/p5-glib2/buildlink3.mk
+++ b/devel/p5-glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 P5_GLIB2_BUILDLINK3_MK:=	${P5_GLIB2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	p5-glib2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-glib2}
 BUILDLINK_PACKAGES+=	p5-glib2
-BUILDLINK_ORDER+=	p5-glib2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-glib2
 
 .if !empty(P5_GLIB2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.p5-glib2+=	p5-glib2>=1.103
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 9cde473b941..5446e85865a 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pango
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npango}
 BUILDLINK_PACKAGES+=	pango
-BUILDLINK_ORDER+=	pango
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pango
 
 .if !empty(PANGO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.6.0
diff --git a/devel/pccts/buildlink3.mk b/devel/pccts/buildlink3.mk
index 432b2111b45..b830b86c5be 100644
--- a/devel/pccts/buildlink3.mk
+++ b/devel/pccts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PCCTS_BUILDLINK3_MK:=	${PCCTS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pccts
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npccts}
 BUILDLINK_PACKAGES+=	pccts
-BUILDLINK_ORDER+=	pccts
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pccts
 
 .if !empty(PCCTS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pccts+=	pccts>=1.33.22
diff --git a/devel/pcre++/buildlink3.mk b/devel/pcre++/buildlink3.mk
index 9600d8cd6d4..c85054e1198 100644
--- a/devel/pcre++/buildlink3.mk
+++ b/devel/pcre++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PCRE++_BUILDLINK3_MK:=	${PCRE++_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pcrexx
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npcrexx}
 BUILDLINK_PACKAGES+=	pcrexx
-BUILDLINK_ORDER+=	pcrexx
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pcrexx
 
 .if !empty(PCRE++_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pcrexx+=	pcre++>=0.9.5
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index 6b6dbe489ab..2988ef8639f 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PCRE_BUILDLINK3_MK:=	${PCRE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pcre
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npcre}
 BUILDLINK_PACKAGES+=	pcre
-BUILDLINK_ORDER+=	pcre
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pcre
 
 .if !empty(PCRE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pcre+=	pcre>=3.4nb1
diff --git a/devel/physfs/buildlink3.mk b/devel/physfs/buildlink3.mk
index 84bff66862b..2377555519e 100644
--- a/devel/physfs/buildlink3.mk
+++ b/devel/physfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PHYSFS_BUILDLINK3_MK:=	${PHYSFS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	physfs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nphysfs}
 BUILDLINK_PACKAGES+=	physfs
-BUILDLINK_ORDER+=	physfs
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}physfs
 
 .if !empty(PHYSFS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.physfs+=	physfs>=1.0.0
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index e81c05e4c45..7e8ab9c6aac 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 POPT_BUILDLINK3_MK:=	${POPT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	popt
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npopt}
 BUILDLINK_PACKAGES+=	popt
-BUILDLINK_ORDER+=	popt
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}popt
 
 .if !empty(POPT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.popt+=	popt>=1.7nb3
diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk
index 495f2543e20..875330ca58b 100644
--- a/devel/pth/buildlink3.mk
+++ b/devel/pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PTH_BUILDLINK3_MK:=	${PTH_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pth
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npth}
 BUILDLINK_PACKAGES+=	pth
-BUILDLINK_ORDER+=	pth
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pth
 
 .if !empty(PTH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pth+=		pth>=2.0.0
diff --git a/devel/pthread-sem/buildlink3.mk b/devel/pthread-sem/buildlink3.mk
index 80266aba967..ef558cd2c81 100644
--- a/devel/pthread-sem/buildlink3.mk
+++ b/devel/pthread-sem/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PTHREAD_SEM_BUILDLINK3_MK:=	${PTHREAD_SEM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pthread-sem
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npthread-sem}
 BUILDLINK_PACKAGES+=	pthread-sem
-BUILDLINK_ORDER+=	pthread-sem
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pthread-sem
 
 .if !empty(PTHREAD_SEM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pthread-sem+=		pthread-sem>=1.0
diff --git a/devel/pthread-stublib/buildlink3.mk b/devel/pthread-stublib/buildlink3.mk
index 1b3561ee33e..d9950b84f13 100644
--- a/devel/pthread-stublib/buildlink3.mk
+++ b/devel/pthread-stublib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:47 jlam Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.10.
 # XXX After this file has been verified as correct, the comment lines
@@ -19,7 +19,7 @@ BUILDLINK_DEPENDS+=	pthread-stublib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npthread-stublib}
 BUILDLINK_PACKAGES+=	pthread-stublib
-BUILDLINK_ORDER+=	pthread-stublib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pthread-stublib
 
 .if !empty(PTHREAD_STUBLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pthread-stublib+=	pthread-stublib>=1.0
diff --git a/devel/pwlib/buildlink3.mk b/devel/pwlib/buildlink3.mk
index a66012a0d4b..e2176adf6e9 100644
--- a/devel/pwlib/buildlink3.mk
+++ b/devel/pwlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PWLIB_BUILDLINK3_MK:=	${PWLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pwlib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npwlib}
 BUILDLINK_PACKAGES+=	pwlib
-BUILDLINK_ORDER+=	pwlib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pwlib
 
 .if !empty(PWLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pwlib+=	pwlib>=1.8.3nb1
diff --git a/devel/py-curses/buildlink3.mk b/devel/py-curses/buildlink3.mk
index e15fe4ef65b..d11764cb2de 100644
--- a/devel/py-curses/buildlink3.mk
+++ b/devel/py-curses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_CURSES_BUILDLINK3_MK:=	${PY_CURSES_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pycurses
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npycurses}
 BUILDLINK_PACKAGES+=	pycurses
-BUILDLINK_ORDER+=	pycurses
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycurses
 
 .if !empty(PY_CURSES_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
diff --git a/devel/py-cursespanel/buildlink3.mk b/devel/py-cursespanel/buildlink3.mk
index 881e318b551..d4b0bc897d1 100644
--- a/devel/py-cursespanel/buildlink3.mk
+++ b/devel/py-cursespanel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PY_CURSESPANEL_BUILDLINK3_MK:=	${PY_CURSESPANEL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	pycursespanel
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npycursespanel}
 BUILDLINK_PACKAGES+=	pycursespanel
-BUILDLINK_ORDER+=	pycursespanel
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycursespanel
 
 .if !empty(PY_CURSESPANEL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pycursespanel+=	${PYPKGPREFIX}-cursespanel-[0-9]*
diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk
index 5ac4574bce7..6483680801b 100644
--- a/devel/py-game/buildlink3.mk
+++ b/devel/py-game/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GAME_BUILDLINK3_MK:=	${PY_GAME_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	${PYPKGPREFIX}-game
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-game}
 BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-game
-BUILDLINK_ORDER+=	${PYPKGPREFIX}-game
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${PYPKGPREFIX}-game
 
 .if !empty(PY_GAME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+=	${PYPKGPREFIX}-game>=1.6
diff --git a/devel/py-gobject-shared/buildlink3.mk b/devel/py-gobject-shared/buildlink3.mk
index 024c7657776..3fda7328f5b 100644
--- a/devel/py-gobject-shared/buildlink3.mk
+++ b/devel/py-gobject-shared/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:47 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PY_GOBJECT_SHARED_BUILDLINK3_MK:=	${PY_GOBJECT_SHARED_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	py-gobject-shared
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-gobject-shared}
 BUILDLINK_PACKAGES+=	py-gobject-shared
-BUILDLINK_ORDER+=	py-gobject-shared
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gobject-shared
 
 .if ${PY_GOBJECT_SHARED_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.py-gobject-shared+=	py-gobject-shared>=2.10.1
diff --git a/devel/py-gobject/buildlink3.mk b/devel/py-gobject/buildlink3.mk
index a14d2b5164d..19391d7587e 100644
--- a/devel/py-gobject/buildlink3.mk
+++ b/devel/py-gobject/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_GOBJECT_BUILDLINK3_MK:=	${PY_GOBJECT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	pygobject
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygobject}
 BUILDLINK_PACKAGES+=	pygobject
-BUILDLINK_ORDER+=	pygobject
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygobject
 
 .if !empty(PY_GOBJECT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pygobject+=	${PYPKGPREFIX}-gobject>=2.10.1nb1
diff --git a/devel/py-readline/buildlink3.mk b/devel/py-readline/buildlink3.mk
index 096f109e737..4d4a701586e 100644
--- a/devel/py-readline/buildlink3.mk
+++ b/devel/py-readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYREADLINE_BUILDLINK3_MK:=	${PYREADLINE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pyreadline
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyreadline}
 BUILDLINK_PACKAGES+=	pyreadline
-BUILDLINK_ORDER+=	pyreadline
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyreadline
 
 .if !empty(PYREADLINE_BUILDLINK3_MK:M+)
 
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index c4810b8245d..7f83bb9c9ee 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 READLINE_BUILDLINK3_MK:=	${READLINE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	readline
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nreadline}
 BUILDLINK_PACKAGES+=	readline
-BUILDLINK_ORDER+=	readline
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}readline
 
 .if !empty(READLINE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.readline+=		readline>=2.2
diff --git a/devel/rpc2/buildlink3.mk b/devel/rpc2/buildlink3.mk
index ca960d658fa..98aa4e340de 100644
--- a/devel/rpc2/buildlink3.mk
+++ b/devel/rpc2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RPC2_BUILDLINK3_MK:=	${RPC2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	rpc2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrpc2}
 BUILDLINK_PACKAGES+=	rpc2
-BUILDLINK_ORDER+=	rpc2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rpc2
 
 .if !empty(RPC2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rpc2+=	rpc2>=1.10
diff --git a/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk
index e7ed5176879..10e3c733f5d 100644
--- a/devel/ruby-gnome2-pango/buildlink3.mk
+++ b/devel/ruby-gnome2-pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 RUBY_GNOME2_PANGO_BUILDLINK3_MK:=	${RUBY_GNOME2_PANGO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ruby-gnome2-pango
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nruby-gnome2-pango}
 BUILDLINK_PACKAGES+=	ruby-gnome2-pango
-BUILDLINK_ORDER+=	ruby-gnome2-pango
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ruby-gnome2-pango
 
 .if !empty(RUBY_GNOME2_PANGO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ruby-gnome2-pango+=	ruby-gnome2-pango>=0.14.1
diff --git a/devel/rudiments/buildlink3.mk b/devel/rudiments/buildlink3.mk
index b9848b35a26..f9424831395 100644
--- a/devel/rudiments/buildlink3.mk
+++ b/devel/rudiments/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rudiments.
 #
@@ -14,7 +14,7 @@ BUILDLINK_DEPENDS+=	rudiments
 
 .if !empty(RUDIMENTS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			rudiments
-BUILDLINK_ORDER+=			rudiments
+BUILDLINK_ORDER:=			${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rudiments
 BUILDLINK_API_DEPENDS.rudiments+=		rudiments>=0.25.1
 BUILDLINK_ABI_DEPENDS.rudiments+=	rudiments>=0.28.2nb1
 BUILDLINK_PKGSRCDIR.rudiments?=		../../devel/rudiments
diff --git a/devel/rvm/buildlink3.mk b/devel/rvm/buildlink3.mk
index 41215ec0d66..a1a2a67fcd0 100644
--- a/devel/rvm/buildlink3.mk
+++ b/devel/rvm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RVM_BUILDLINK3_MK:=	${RVM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	rvm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrvm}
 BUILDLINK_PACKAGES+=	rvm
-BUILDLINK_ORDER+=	rvm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rvm
 
 .if !empty(RVM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rvm+=	rvm>=1.3
diff --git a/devel/rx/buildlink3.mk b/devel/rx/buildlink3.mk
index a3276f721a4..855568a16cd 100644
--- a/devel/rx/buildlink3.mk
+++ b/devel/rx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RX_BUILDLINK3_MK:=	${RX_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	rx
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrx}
 BUILDLINK_PACKAGES+=	rx
-BUILDLINK_ORDER+=	rx
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rx
 
 .if !empty(RX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rx+=		rx>=1.5
diff --git a/devel/sgb/buildlink3.mk b/devel/sgb/buildlink3.mk
index 35c7ca41971..2070338bf9d 100644
--- a/devel/sgb/buildlink3.mk
+++ b/devel/sgb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SGB_BUILDLINK3_MK:=	${SGB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	sgb
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsgb}
 BUILDLINK_PACKAGES+=	sgb
-BUILDLINK_ORDER+=	sgb
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sgb
 
 .if !empty(SGB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sgb+=	sgb>=0pre20050409
diff --git a/devel/silc-toolkit/buildlink3.mk b/devel/silc-toolkit/buildlink3.mk
index 1bac9539b65..d42200f017b 100644
--- a/devel/silc-toolkit/buildlink3.mk
+++ b/devel/silc-toolkit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
 #
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+=	silc-toolkit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsilc-toolkit}
 BUILDLINK_PACKAGES+=	silc-toolkit
-BUILDLINK_ORDER+=	silc-toolkit
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}silc-toolkit
 
 .if !empty(SILC_TOOLKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.silc-toolkit+=	silc-toolkit>=0.9.12
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index 1b1b61e7352..075eb48c2d7 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUBVERSION_BASE_BUILDLINK3_MK:=	${SUBVERSION_BASE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_DEPENDS+=	subversion-base
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsubversion-base}
 BUILDLINK_PACKAGES+=	subversion-base
-BUILDLINK_ORDER+=	subversion-base
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}subversion-base
 
 .if !empty(SUBVERSION_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.subversion-base+=	subversion-base>=1.0.0
diff --git a/devel/swig/buildlink3.mk b/devel/swig/buildlink3.mk
index f01d25beee6..afb0f98c4b5 100644
--- a/devel/swig/buildlink3.mk
+++ b/devel/swig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SWIG_BUILDLINK3_MK:=	${SWIG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	swig
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswig}
 BUILDLINK_PACKAGES+=	swig
-BUILDLINK_ORDER+=	swig
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}swig
 
 .if !empty(SWIG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.swig+=	swig>=1.3.24
diff --git a/devel/syncdir/buildlink3.mk b/devel/syncdir/buildlink3.mk
index bee3cada932..e0837abbe49 100644
--- a/devel/syncdir/buildlink3.mk
+++ b/devel/syncdir/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SYNCDIR_BUILDLINK3_MK:=		${SYNCDIR_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=		syncdir
 
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nsyncdir}
 BUILDLINK_PACKAGES+=		syncdir
-BUILDLINK_ORDER+=		syncdir
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}syncdir
 
 .if !empty(SYNCDIR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.syncdir+=	syncdir>=1.0
diff --git a/devel/sysexits/buildlink3.mk b/devel/sysexits/buildlink3.mk
index c725c817c1b..b134fb3a3c7 100644
--- a/devel/sysexits/buildlink3.mk
+++ b/devel/sysexits/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SYSEXITS_BUILDLINK3_MK:=	${SYSEXITS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	sysexits
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsysexits}
 BUILDLINK_PACKAGES+=	sysexits
-BUILDLINK_ORDER+=	sysexits
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sysexits
 
 .if !empty(SYSEXITS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sysexits+=	sysexits>=1.1
diff --git a/devel/tcl-tclcl/buildlink3.mk b/devel/tcl-tclcl/buildlink3.mk
index 4c912f39019..a522ca2fc23 100644
--- a/devel/tcl-tclcl/buildlink3.mk
+++ b/devel/tcl-tclcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_TCLCL_BUILDLINK3_MK:=	${TCL_TCLCL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tcl-tclcl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-tclcl}
 BUILDLINK_PACKAGES+=	tcl-tclcl
-BUILDLINK_ORDER+=	tcl-tclcl
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-tclcl
 
 .if !empty(TCL_TCLCL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-tclcl+=	tcl-tclcl>=1.15
diff --git a/devel/teem/buildlink3.mk b/devel/teem/buildlink3.mk
index 308a3fb85e9..4cdd1e597e0 100644
--- a/devel/teem/buildlink3.mk
+++ b/devel/teem/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TEEM_BUILDLINK3_MK:=	${TEEM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	teem
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nteem}
 BUILDLINK_PACKAGES+=	teem
-BUILDLINK_ORDER+=	teem
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}teem
 
 .if !empty(TEEM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.teem+=		teem>=1.8.0
diff --git a/devel/tre/buildlink3.mk b/devel/tre/buildlink3.mk
index d1ff742120d..9b5f759329d 100644
--- a/devel/tre/buildlink3.mk
+++ b/devel/tre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TRE_BUILDLINK3_MK:=	${TRE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tre
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntre}
 BUILDLINK_PACKAGES+=	tre
-BUILDLINK_ORDER+=	tre
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tre
 
 .if !empty(TRE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tre+=		tre>=0.7.2
diff --git a/devel/ucl/buildlink3.mk b/devel/ucl/buildlink3.mk
index c06546fdaba..efb66907425 100644
--- a/devel/ucl/buildlink3.mk
+++ b/devel/ucl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 UCL_BUILDLINK3_MK:=	${UCL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ucl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nucl}
 BUILDLINK_PACKAGES+=	ucl
-BUILDLINK_ORDER+=	ucl
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ucl
 
 .if !empty(UCL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ucl+=	ucl>=1.02
diff --git a/devel/vanessa_adt/buildlink3.mk b/devel/vanessa_adt/buildlink3.mk
index dd8fee43046..ec83f9cf4e0 100644
--- a/devel/vanessa_adt/buildlink3.mk
+++ b/devel/vanessa_adt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
 #
 # This file was created automatically using createbuildlink-3.5.
 
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	vanessa_adt
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvanessa_adt}
 BUILDLINK_PACKAGES+=	vanessa_adt
-BUILDLINK_ORDER+=	vanessa_adt
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vanessa_adt
 
 .if !empty(VANESSA_ADT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.vanessa_adt+=	vanessa_adt>=0.0.6
diff --git a/devel/vanessa_logger/buildlink3.mk b/devel/vanessa_logger/buildlink3.mk
index dce8d5151c3..4e5b566e6a8 100644
--- a/devel/vanessa_logger/buildlink3.mk
+++ b/devel/vanessa_logger/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
 #
 # This file was created automatically using createbuildlink-3.5.
 
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	vanessa_logger
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvanessa_logger}
 BUILDLINK_PACKAGES+=	vanessa_logger
-BUILDLINK_ORDER+=	vanessa_logger
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vanessa_logger
 
 .if !empty(VANESSA_LOGGER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.vanessa_logger+=	vanessa_logger>=0.0.7
diff --git a/devel/vanessa_socket/buildlink3.mk b/devel/vanessa_socket/buildlink3.mk
index cc974a4100b..82535019437 100644
--- a/devel/vanessa_socket/buildlink3.mk
+++ b/devel/vanessa_socket/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:48 jlam Exp $
 #
 # This file was created automatically using createbuildlink-3.5.
 
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	vanessa_socket
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvanessa_socket}
 BUILDLINK_PACKAGES+=	vanessa_socket
-BUILDLINK_ORDER+=	vanessa_socket
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vanessa_socket
 
 .if !empty(VANESSA_SOCKET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.vanessa_socket+=	vanessa_socket>=0.0.7nb2
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index 232d2dbcb79..6c0867d04f5 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/07/08 22:39:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 23:10:49 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	zlib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nzlib}
 BUILDLINK_PACKAGES+=	zlib
-BUILDLINK_ORDER+=	zlib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}zlib
 
 .if !empty(ZLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.1.4nb1
author	jlam <jlam@pkgsrc.org>	2006-07-08 23:10:35 +0000
committer	jlam <jlam@pkgsrc.org>	2006-07-08 23:10:35 +0000
commit	c16221a4db5db247e9ecea04d817821955982042 (patch)
tree	04459b5ed42b41d60b93766832b84b0beb86ba13 /devel
parent	c25fbde9c94a010e0b2c953766743f818b86c9ea (diff)
download	pkgsrc-c16221a4db5db247e9ecea04d817821955982042.tar.gz