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

63 files changed, 127 insertions, 127 deletions

diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index 4cc791b31ef..a9856301a4d 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_MIXER_BUILDLINK3_MK:=	${SDL_MIXER_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	SDL_mixer
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_mixer}
 BUILDLINK_PACKAGES+=	SDL_mixer
-BUILDLINK_ORDER+=	SDL_mixer
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_mixer
 
 .if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb2
diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk
index 91e0c371ae3..4c665cb003b 100644
--- a/audio/SDL_sound/buildlink3.mk
+++ b/audio/SDL_sound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_SOUND_BUILDLINK3_MK:=	${SDL_SOUND_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	SDL_sound
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_sound}
 BUILDLINK_PACKAGES+=	SDL_sound
-BUILDLINK_ORDER+=	SDL_sound
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_sound
 
 .if !empty(SDL_SOUND_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_sound+=	SDL_sound>=1.0.1
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
index 84c666452a3..27810e0571e 100644
--- a/audio/arts/buildlink3.mk
+++ b/audio/arts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ARTS_BUILDLINK3_MK:=	${ARTS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	arts
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Narts}
 BUILDLINK_PACKAGES+=	arts
-BUILDLINK_ORDER+=	arts
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}arts
 
 .if !empty(ARTS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.arts+=	arts>=1.1.4nb1
diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk
index e1912f214bd..447eaf317be 100644
--- a/audio/bmp/buildlink3.mk
+++ b/audio/bmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BMP_BUILDLINK3_MK:=	${BMP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	bmp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbmp}
 BUILDLINK_PACKAGES+=	bmp
-BUILDLINK_ORDER+=	bmp
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bmp
 
 .if !empty(BMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.bmp+=	bmp>=0.9.7rc2nb3
diff --git a/audio/cddb-bundle/buildlink3.mk b/audio/cddb-bundle/buildlink3.mk
index e964b7281d7..8203ee17cfa 100644
--- a/audio/cddb-bundle/buildlink3.mk
+++ b/audio/cddb-bundle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CDDB_BUNDLE_BUILDLINK3_MK:=	${CDDB_BUNDLE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	cddb-bundle
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncddb-bundle}
 BUILDLINK_PACKAGES+=	cddb-bundle
-BUILDLINK_ORDER+=	cddb-bundle
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cddb-bundle
 
 .if !empty(CDDB_BUNDLE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cddb-bundle+=	cddb-bundle>=0.2
diff --git a/audio/cdparanoia/buildlink3.mk b/audio/cdparanoia/buildlink3.mk
index 2a683fa1a8f..927ef6084b5 100644
--- a/audio/cdparanoia/buildlink3.mk
+++ b/audio/cdparanoia/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CDPARANOIA_BUILDLINK3_MK:=	${CDPARANOIA_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	cdparanoia
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdparanoia}
 BUILDLINK_PACKAGES+=	cdparanoia
-BUILDLINK_ORDER+=	cdparanoia
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdparanoia
 
 .if !empty(CDPARANOIA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cdparanoia+=		cdparanoia>=3.0
diff --git a/audio/cdplayer/buildlink3.mk b/audio/cdplayer/buildlink3.mk
index ee801669202..cdfafc7f18e 100644
--- a/audio/cdplayer/buildlink3.mk
+++ b/audio/cdplayer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CDPLAYER_BUILDLINK3_MK:=	${CDPLAYER_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	cdplayer
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdplayer}
 BUILDLINK_PACKAGES+=	cdplayer
-BUILDLINK_ORDER+=	cdplayer
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdplayer
 
 .if !empty(CDPLAYER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cdplayer+=	cdplayer>=0.4.2
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
index d20d5acd965..75502e6f91c 100644
--- a/audio/esound/buildlink3.mk
+++ b/audio/esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ESOUND_BUILDLINK3_MK:=	${ESOUND_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	esound
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nesound}
 BUILDLINK_PACKAGES+=	esound
-BUILDLINK_ORDER+=	esound
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}esound
 
 .if !empty(ESOUND_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.18
diff --git a/audio/faac/buildlink3.mk b/audio/faac/buildlink3.mk
index dbbdf74b200..808b0d36a49 100644
--- a/audio/faac/buildlink3.mk
+++ b/audio/faac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FAAC_BUILDLINK3_MK:=	${FAAC_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	faac
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfaac}
 BUILDLINK_PACKAGES+=	faac
-BUILDLINK_ORDER+=	faac
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faac
 
 .if !empty(FAAC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.faac+=	faac>=1.24
diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk
index d0375e1285a..277959f6ee9 100644
--- a/audio/faad2/buildlink3.mk
+++ b/audio/faad2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FAAD2_BUILDLINK3_MK:=	${FAAD2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	faad2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfaad2}
 BUILDLINK_PACKAGES+=	faad2
-BUILDLINK_ORDER+=	faad2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faad2
 
 .if !empty(FAAD2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.faad2+=	faad2>=2.0nb3
diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk
index 253b30204cb..570473a7875 100644
--- a/audio/flac/buildlink3.mk
+++ b/audio/flac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FLAC_BUILDLINK3_MK:=	${FLAC_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	flac
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nflac}
 BUILDLINK_PACKAGES+=	flac
-BUILDLINK_ORDER+=	flac
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flac
 
 .if !empty(FLAC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.flac+=	flac>=1.1.0nb1
diff --git a/audio/fluidsynth/buildlink3.mk b/audio/fluidsynth/buildlink3.mk
index 862736f77df..e998aaae83c 100644
--- a/audio/fluidsynth/buildlink3.mk
+++ b/audio/fluidsynth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FLUIDSYNTH_BUILDLINK3_MK:=	${FLUIDSYNTH_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	fluidsynth
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfluidsynth}
 BUILDLINK_PACKAGES+=	fluidsynth
-BUILDLINK_ORDER+=	fluidsynth
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fluidsynth
 
 .if !empty(FLUIDSYNTH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fluidsynth+=		fluidsynth>=1.0.5
diff --git a/audio/gnome-speech/buildlink3.mk b/audio/gnome-speech/buildlink3.mk
index 96bf14b8611..8cf40439e4b 100644
--- a/audio/gnome-speech/buildlink3.mk
+++ b/audio/gnome-speech/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_SPEECH_BUILDLINK3_MK:=	${GNOME_SPEECH_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gnome-speech
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-speech}
 BUILDLINK_PACKAGES+=	gnome-speech
-BUILDLINK_ORDER+=	gnome-speech
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-speech
 
 .if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-speech+=	gnome-speech>=0.3.2
diff --git a/audio/goom/buildlink3.mk b/audio/goom/buildlink3.mk
index 751c609ee60..9f81f7b3640 100644
--- a/audio/goom/buildlink3.mk
+++ b/audio/goom/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GOOM_BUILDLINK3_MK:=	${GOOM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	goom
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngoom}
 BUILDLINK_PACKAGES+=	goom
-BUILDLINK_ORDER+=	goom
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}goom
 
 .if !empty(GOOM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.goom+=	goom>=2004.0
diff --git a/audio/gsm/buildlink3.mk b/audio/gsm/buildlink3.mk
index bdf18e63ef8..2835bce3c75 100644
--- a/audio/gsm/buildlink3.mk
+++ b/audio/gsm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GSM_BUILDLINK3_MK:=	${GSM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gsm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngsm}
 BUILDLINK_PACKAGES+=	gsm
-BUILDLINK_ORDER+=	gsm
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsm
 
 .if !empty(GSM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gsm+=		gsm>=1.0.10
diff --git a/audio/gst-plugins0.8-artsd/buildlink3.mk b/audio/gst-plugins0.8-artsd/buildlink3.mk
index 75d41c35821..80940e1d3a0 100644
--- a/audio/gst-plugins0.8-artsd/buildlink3.mk
+++ b/audio/gst-plugins0.8-artsd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:38:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:=	${GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gst-plugins0.8-artsd
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.8-artsd}
 BUILDLINK_PACKAGES+=	gst-plugins0.8-artsd
-BUILDLINK_ORDER+=	gst-plugins0.8-artsd
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.8-artsd
 
 .if !empty(GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gst-plugins0.8-artsd+=	gst-plugins0.8-artsd>=0.8.11
diff --git a/audio/gst-plugins0.8-esound/buildlink3.mk b/audio/gst-plugins0.8-esound/buildlink3.mk
index 82a2aac96b1..7a168fc9e46 100644
--- a/audio/gst-plugins0.8-esound/buildlink3.mk
+++ b/audio/gst-plugins0.8-esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:=	${GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gst-plugins0.8-esound
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.8-esound}
 BUILDLINK_PACKAGES+=	gst-plugins0.8-esound
-BUILDLINK_ORDER+=	gst-plugins0.8-esound
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.8-esound
 
 .if !empty(GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gst-plugins0.8-esound+=	gst-plugins0.8-esound>=0.8.11
diff --git a/audio/gst-plugins0.8-mad/buildlink3.mk b/audio/gst-plugins0.8-mad/buildlink3.mk
index 17e2373c6d5..f98d7b4ecb8 100644
--- a/audio/gst-plugins0.8-mad/buildlink3.mk
+++ b/audio/gst-plugins0.8-mad/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_MAD_BUILDLINK3_MK:=	${GST_PLUGINS0.8_MAD_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gst-plugins0.8-mad
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.8-mad}
 BUILDLINK_PACKAGES+=	gst-plugins0.8-mad
-BUILDLINK_ORDER+=	gst-plugins0.8-mad
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.8-mad
 
 .if !empty(GST_PLUGINS0.8_MAD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gst-plugins0.8-mad+=	gst-plugins0.8-mad>=0.8.11
diff --git a/audio/id3lib/buildlink3.mk b/audio/id3lib/buildlink3.mk
index 3b96abc5b4c..d503d49248f 100644
--- a/audio/id3lib/buildlink3.mk
+++ b/audio/id3lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ID3LIB_BUILDLINK3_MK:=	${ID3LIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	id3lib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nid3lib}
 BUILDLINK_PACKAGES+=	id3lib
-BUILDLINK_ORDER+=	id3lib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}id3lib
 
 .if !empty(ID3LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.id3lib+=	id3lib>=3.8.3
diff --git a/audio/jack/buildlink3.mk b/audio/jack/buildlink3.mk
index a359f5d12d7..025cac90a2d 100644
--- a/audio/jack/buildlink3.mk
+++ b/audio/jack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:36 jlam Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+=	jack
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njack}
 BUILDLINK_PACKAGES+=	jack
-BUILDLINK_ORDER+=	jack
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jack
 
 .if !empty(JACK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.jack=	jack>=0.100.0
diff --git a/audio/ladspa/buildlink3.mk b/audio/ladspa/buildlink3.mk
index 884b0e182b0..a0efb23f406 100644
--- a/audio/ladspa/buildlink3.mk
+++ b/audio/ladspa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LADSPA_BUILDLINK3_MK:=	${LADSPA_BUILDLINK3_MK}+
@@ -9,11 +9,11 @@ BUILDLINK_DEPENDS+=	ladspa
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nladspa}
 BUILDLINK_PACKAGES+=	ladspa
-BUILDLINK_ORDER+=	ladspa
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ladspa
 
 .if !empty(LADSPA_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			ladspa
-BUILDLINK_ORDER+=			ladspa
+BUILDLINK_ORDER:=			${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ladspa
 BUILDLINK_API_DEPENDS.ladspa+=		ladspa>=1.12
 BUILDLINK_ABI_DEPENDS.ladspa?=		ladspa>=1.12nb1
 BUILDLINK_PKGSRCDIR.ladspa?=		../../audio/ladspa
diff --git a/audio/lame/buildlink3.mk b/audio/lame/buildlink3.mk
index 6b6fb4bdaed..fa64eb83990 100644
--- a/audio/lame/buildlink3.mk
+++ b/audio/lame/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LAME_BUILDLINK3_MK:=	${LAME_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	lame
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlame}
 BUILDLINK_PACKAGES+=	lame
-BUILDLINK_ORDER+=	lame
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lame
 
 .if !empty(LAME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lame+=	lame>=3.93.1nb2
diff --git a/audio/liba52/buildlink3.mk b/audio/liba52/buildlink3.mk
index ebf4e942613..cddd09dde9a 100644
--- a/audio/liba52/buildlink3.mk
+++ b/audio/liba52/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBA52_BUILDLINK3_MK:=	${LIBA52_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	liba52
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliba52}
 BUILDLINK_PACKAGES+=	liba52
-BUILDLINK_ORDER+=	liba52
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liba52
 
 .if !empty(LIBA52_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.liba52+=	liba52>=0.7.4
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index ed6122f28ed..eb07ca282e0 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAO_BUILDLINK3_MK:=	${LIBAO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libao
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibao}
 BUILDLINK_PACKAGES+=	libao
-BUILDLINK_ORDER+=	libao
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libao
 
 .if !empty(LIBAO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.4
diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
index 27a5e6db981..9608fca635d 100644
--- a/audio/libaudiofile/buildlink3.mk
+++ b/audio/libaudiofile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AUDIOFILE_BUILDLINK3_MK:=	${AUDIOFILE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	audiofile
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naudiofile}
 BUILDLINK_PACKAGES+=	audiofile
-BUILDLINK_ORDER+=	audiofile
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}audiofile
 
 .if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.audiofile+=	libaudiofile>=0.2.1
diff --git a/audio/libcdaudio/buildlink3.mk b/audio/libcdaudio/buildlink3.mk
index 1869e39cf50..51263903c30 100644
--- a/audio/libcdaudio/buildlink3.mk
+++ b/audio/libcdaudio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCDAUDIO_BUILDLINK3_MK:=	${LIBCDAUDIO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libcdaudio
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcdaudio}
 BUILDLINK_PACKAGES+=	libcdaudio
-BUILDLINK_ORDER+=	libcdaudio
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcdaudio
 
 .if !empty(LIBCDAUDIO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcdaudio+=		libcdaudio>=0.99.4nb1
diff --git a/audio/libcddb/buildlink3.mk b/audio/libcddb/buildlink3.mk
index 0ab3a37641e..44470525499 100644
--- a/audio/libcddb/buildlink3.mk
+++ b/audio/libcddb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBCDDB_BUILDLINK3_MK:=	${LIBCDDB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libcddb
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcddb}
 BUILDLINK_PACKAGES+=	libcddb
-BUILDLINK_ORDER+=	libcddb
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcddb
 
 .if !empty(LIBCDDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcddb+=	libcddb>=0.9.4
diff --git a/audio/libdca/buildlink3.mk b/audio/libdca/buildlink3.mk
index 830fa1e4bec..79a57516120 100644
--- a/audio/libdca/buildlink3.mk
+++ b/audio/libdca/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:36 jlam Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+=	libdca
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdca}
 BUILDLINK_PACKAGES+=	libdca
-BUILDLINK_ORDER+=	libdca
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdca
 
 .if !empty(LIBDTS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdca+=	libdca>=0.0.2
diff --git a/audio/libhydrogen/buildlink3.mk b/audio/libhydrogen/buildlink3.mk
index 266250fbff3..aafb26f1eb9 100644
--- a/audio/libhydrogen/buildlink3.mk
+++ b/audio/libhydrogen/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBHYDROGEN_BUILDLINK3_MK:=	${LIBHYDROGEN_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libhydrogen
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibhydrogen}
 BUILDLINK_PACKAGES+=	libhydrogen
-BUILDLINK_ORDER+=	libhydrogen
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libhydrogen
 
 .if !empty(LIBHYDROGEN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libhydrogen+=		libhydrogen>=0.8.0
diff --git a/audio/libid3tag/buildlink3.mk b/audio/libid3tag/buildlink3.mk
index c4270210908..b2286c3fa36 100644
--- a/audio/libid3tag/buildlink3.mk
+++ b/audio/libid3tag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBID3TAG_BUILDLINK3_MK:=	${LIBID3TAG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libid3tag
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibid3tag}
 BUILDLINK_PACKAGES+=	libid3tag
-BUILDLINK_ORDER+=	libid3tag
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libid3tag
 
 .if !empty(LIBID3TAG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libid3tag+=	libid3tag>=0.15.0b
diff --git a/audio/libmad/buildlink3.mk b/audio/libmad/buildlink3.mk
index 522a48ba758..83cae9d3c02 100644
--- a/audio/libmad/buildlink3.mk
+++ b/audio/libmad/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMAD_BUILDLINK3_MK:=		${LIBMAD_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmad
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmad}
 BUILDLINK_PACKAGES+=	libmad
-BUILDLINK_ORDER+=	libmad
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmad
 
 .if !empty(LIBMAD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmad+=	libmad>=0.15.0b
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index 8b0a932c5b5..c4a2ec4945c 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMIKMOD_BUILDLINK3_MK:=	${LIBMIKMOD_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmikmod
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmikmod}
 BUILDLINK_PACKAGES+=	libmikmod
-BUILDLINK_ORDER+=	libmikmod
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmikmod
 
 .if ${LIBMIKMOD_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmikmod+=	libmikmod>=3.1.9
diff --git a/audio/libmodplug/buildlink3.mk b/audio/libmodplug/buildlink3.mk
index d56d8c909a8..839de556fe1 100644
--- a/audio/libmodplug/buildlink3.mk
+++ b/audio/libmodplug/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMODPLUG_BUILDLINK3_MK:=	${LIBMODPLUG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmodplug
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmodplug}
 BUILDLINK_PACKAGES+=	libmodplug
-BUILDLINK_ORDER+=	libmodplug
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmodplug
 
 .if !empty(LIBMODPLUG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmodplug+=		libmodplug>=0.7
diff --git a/audio/libmpd/buildlink3.mk b/audio/libmpd/buildlink3.mk
index 01ae1677e20..d0f9b4796e7 100644
--- a/audio/libmpd/buildlink3.mk
+++ b/audio/libmpd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBMPD_BUILDLINK3_MK:=	${LIBMPD_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmpd
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpd}
 BUILDLINK_PACKAGES+=	libmpd
-BUILDLINK_ORDER+=	libmpd
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpd
 
 .if !empty(LIBMPD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmpd+=	libmpd>=0.12.0
diff --git a/audio/libmusepack/buildlink3.mk b/audio/libmusepack/buildlink3.mk
index 16a7bf20deb..501d6b66830 100644
--- a/audio/libmusepack/buildlink3.mk
+++ b/audio/libmusepack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMUSEPACK_BUILDLINK3_MK:=	${LIBMUSEPACK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmusepack
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmusepack}
 BUILDLINK_PACKAGES+=	libmusepack
-BUILDLINK_ORDER+=	libmusepack
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmusepack
 
 .if !empty(LIBMUSEPACK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmusepack+=		libmusepack>=1.0.3
diff --git a/audio/libopendaap/buildlink3.mk b/audio/libopendaap/buildlink3.mk
index 2a8472e2bd0..b04f5ad4fc5 100644
--- a/audio/libopendaap/buildlink3.mk
+++ b/audio/libopendaap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBOPENDAAP_BUILDLINK3_MK:=	${LIBOPENDAAP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libopendaap
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibopendaap}
 BUILDLINK_PACKAGES+=	libopendaap
-BUILDLINK_ORDER+=	libopendaap
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libopendaap
 
 .if !empty(LIBOPENDAAP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libopendaap+=	libopendaap>=0.2.1
diff --git a/audio/libsamplerate/buildlink3.mk b/audio/libsamplerate/buildlink3.mk
index 42bedd89883..669649df571 100644
--- a/audio/libsamplerate/buildlink3.mk
+++ b/audio/libsamplerate/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSAMPLERATE_BUILDLINK3_MK:=	${LIBSAMPLERATE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libsamplerate
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsamplerate}
 BUILDLINK_PACKAGES+=	libsamplerate
-BUILDLINK_ORDER+=	libsamplerate
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsamplerate
 
 .if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsamplerate+=	libsamplerate>=0.0.13nb1
diff --git a/audio/libshout/buildlink3.mk b/audio/libshout/buildlink3.mk
index 7a7b92d8d93..f199b9c4dc5 100644
--- a/audio/libshout/buildlink3.mk
+++ b/audio/libshout/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSHOUT_BUILDLINK3_MK:=	${LIBSHOUT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libshout
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibshout}
 BUILDLINK_PACKAGES+=	libshout
-BUILDLINK_ORDER+=	libshout
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libshout
 
 .if !empty(LIBSHOUT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libshout+=	libshout>=2.0
diff --git a/audio/libsidplay/buildlink3.mk b/audio/libsidplay/buildlink3.mk
index 13cd2f9e60a..c4ae2a838f7 100644
--- a/audio/libsidplay/buildlink3.mk
+++ b/audio/libsidplay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIDPLAY_BUILDLINK3_MK:=	${LIBSIDPLAY_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libsidplay
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsidplay}
 BUILDLINK_PACKAGES+=	libsidplay
-BUILDLINK_ORDER+=	libsidplay
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsidplay
 
 .if !empty(LIBSIDPLAY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsidplay+=		libsidplay>=1.36.38
diff --git a/audio/libsidplay2/buildlink3.mk b/audio/libsidplay2/buildlink3.mk
index e66244ada70..b4b744de157 100644
--- a/audio/libsidplay2/buildlink3.mk
+++ b/audio/libsidplay2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIDPLAY2_BUILDLINK3_MK:=	${LIBSIDPLAY2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libsidplay2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsidplay2}
 BUILDLINK_PACKAGES+=	libsidplay2
-BUILDLINK_ORDER+=	libsidplay2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsidplay2
 
 .if !empty(LIBSIDPLAY2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsidplay2+=	libsidplay2>=2.0.9
diff --git a/audio/libsndfile/buildlink3.mk b/audio/libsndfile/buildlink3.mk
index 8be33563e44..92dff66254b 100644
--- a/audio/libsndfile/buildlink3.mk
+++ b/audio/libsndfile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSNDFILE_BUILDLINK3_MK:=	${LIBSNDFILE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libsndfile
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsndfile}
 BUILDLINK_PACKAGES+=	libsndfile
-BUILDLINK_ORDER+=	libsndfile
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsndfile
 
 .if !empty(LIBSNDFILE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsndfile+=		libsndfile>=1.0.0
diff --git a/audio/libtunepimp/buildlink3.mk b/audio/libtunepimp/buildlink3.mk
index c85ef436350..3fe506def9e 100644
--- a/audio/libtunepimp/buildlink3.mk
+++ b/audio/libtunepimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBTUNEPIMP_BUILDLINK3_MK:=	${LIBTUNEPIMP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libtunepimp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtunepimp}
 BUILDLINK_PACKAGES+=	libtunepimp
-BUILDLINK_ORDER+=	libtunepimp
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtunepimp
 
 .if !empty(LIBTUNEPIMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtunepimp+=	libtunepimp>=0.4.2
diff --git a/audio/libvisual/buildlink3.mk b/audio/libvisual/buildlink3.mk
index 3bf2ec3f6e3..eac96854e7d 100644
--- a/audio/libvisual/buildlink3.mk
+++ b/audio/libvisual/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBVISUAL_BUILDLINK3_MK:=	${LIBVISUAL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libvisual
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvisual}
 BUILDLINK_PACKAGES+=	libvisual
-BUILDLINK_ORDER+=	libvisual
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvisual
 
 .if !empty(LIBVISUAL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libvisual+=	libvisual>=0.4.0
diff --git a/audio/libvisual0.2/buildlink3.mk b/audio/libvisual0.2/buildlink3.mk
index f8b5c248cee..c172676b10e 100644
--- a/audio/libvisual0.2/buildlink3.mk
+++ b/audio/libvisual0.2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBVISUAL0.2_BUILDLINK3_MK:=	${LIBVISUAL0.2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libvisual0.2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvisual0.2}
 BUILDLINK_PACKAGES+=	libvisual0.2
-BUILDLINK_ORDER+=	libvisual0.2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvisual0.2
 
 .if ${LIBVISUAL0.2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libvisual0.2+=	libvisual0.2>=0.2.0
diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk
index e9e1e4d9e69..80f9836c473 100644
--- a/audio/libvorbis/buildlink3.mk
+++ b/audio/libvorbis/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBVORBIS_BUILDLINK3_MK:=	${LIBVORBIS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libvorbis
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvorbis}
 BUILDLINK_PACKAGES+=	libvorbis
-BUILDLINK_ORDER+=	libvorbis
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvorbis
 
 .if !empty(LIBVORBIS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libvorbis+=	libvorbis>=1.0.1
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
index ae31fa3ac33..b45c617f7cb 100644
--- a/audio/musicbrainz/buildlink3.mk
+++ b/audio/musicbrainz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MUSICBRAINZ_BUILDLINK3_MK:=	${MUSICBRAINZ_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	musicbrainz
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmusicbrainz}
 BUILDLINK_PACKAGES+=	musicbrainz
-BUILDLINK_ORDER+=	musicbrainz
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}musicbrainz
 
 .if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.musicbrainz+=		musicbrainz>=2.0.2
diff --git a/audio/nas/buildlink3.mk b/audio/nas/buildlink3.mk
index f519a984627..a4b8a481f06 100644
--- a/audio/nas/buildlink3.mk
+++ b/audio/nas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NAS_BUILDLINK3_MK:=	${NAS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	nas
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnas}
 BUILDLINK_PACKAGES+=	nas
-BUILDLINK_ORDER+=	nas
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nas
 
 .if !empty(NAS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.nas+=		nas>=1.4.2
diff --git a/audio/openal/buildlink3.mk b/audio/openal/buildlink3.mk
index fc3db1fdb26..8e205d62cd7 100644
--- a/audio/openal/buildlink3.mk
+++ b/audio/openal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENAL_BUILDLINK3_MK:=	${OPENAL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	openal
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenal}
 BUILDLINK_PACKAGES+=	openal
-BUILDLINK_ORDER+=	openal
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openal
 
 .if !empty(OPENAL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openal+=	openal>=20030125nb1
diff --git a/audio/portaudio-devel/buildlink3.mk b/audio/portaudio-devel/buildlink3.mk
index 868b6e0b771..3f022c50421 100644
--- a/audio/portaudio-devel/buildlink3.mk
+++ b/audio/portaudio-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PORTAUDIO_DEVEL_BUILDLINK3_MK:=	${PORTAUDIO_DEVEL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	portaudio-devel
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nportaudio-devel}
 BUILDLINK_PACKAGES+=	portaudio-devel
-BUILDLINK_ORDER+=	portaudio-devel
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}portaudio-devel
 
 .if ${PORTAUDIO_DEVEL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.portaudio-devel+=	portaudio-devel>=20060521
diff --git a/audio/portaudio/buildlink3.mk b/audio/portaudio/buildlink3.mk
index dceeb7fcaac..5cba1b3d5ce 100644
--- a/audio/portaudio/buildlink3.mk
+++ b/audio/portaudio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PORTAUDIO_BUILDLINK3_MK:=	${PORTAUDIO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	portaudio
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nportaudio}
 BUILDLINK_PACKAGES+=	portaudio
-BUILDLINK_ORDER+=	portaudio
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}portaudio
 
 .if !empty(PORTAUDIO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.portaudio+=	portaudio>=18.1
diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk
index 00b27cfe50b..85aea411101 100644
--- a/audio/py-ogg/buildlink3.mk
+++ b/audio/py-ogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_OGG_BUILDLINK3_MK:=	${PY_OGG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pyogg
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyogg}
 BUILDLINK_PACKAGES+=	pyogg
-BUILDLINK_ORDER+=	pyogg
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyogg
 
 .if !empty(PY_OGG_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
diff --git a/audio/rplay/buildlink3.mk b/audio/rplay/buildlink3.mk
index 7c74facaec5..3140e76be74 100644
--- a/audio/rplay/buildlink3.mk
+++ b/audio/rplay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RPLAY_BUILDLINK3_MK:=	${RPLAY_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	rplay
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrplay}
 BUILDLINK_PACKAGES+=	rplay
-BUILDLINK_ORDER+=	rplay
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rplay
 
 .if !empty(RPLAY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rplay+=	rplay>=3.3.2nb1
diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk
index 7cd8cba81b0..6d0775f05b7 100644
--- a/audio/speex/buildlink3.mk
+++ b/audio/speex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPEEX_BUILDLINK3_MK:=	${SPEEX_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	speex
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspeex}
 BUILDLINK_PACKAGES+=	speex
-BUILDLINK_ORDER+=	speex
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}speex
 
 .if !empty(SPEEX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.speex+=	speex>=1.0.4
diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk
index b459908c6d2..495195ea1a0 100644
--- a/audio/streamtuner/buildlink3.mk
+++ b/audio/streamtuner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 STREAMTUNER_BUILDLINK3_MK:=	${STREAMTUNER_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	streamtuner
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nstreamtuner}
 BUILDLINK_PACKAGES+=	streamtuner
-BUILDLINK_ORDER+=	streamtuner
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}streamtuner
 
 .if !empty(STREAMTUNER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.streamtuner+=		streamtuner>=0.99
diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk
index a367b81b370..7d1c9fb6b57 100644
--- a/audio/sweep/buildlink3.mk
+++ b/audio/sweep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SWEEP_BUILDLINK3_MK:=	${SWEEP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	sweep
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsweep}
 BUILDLINK_PACKAGES+=	sweep
-BUILDLINK_ORDER+=	sweep
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sweep
 
 .if !empty(SWEEP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sweep+=	sweep>=0.8.2nb6
diff --git a/audio/taglib/buildlink3.mk b/audio/taglib/buildlink3.mk
index ae07703bde7..9f9231dca59 100644
--- a/audio/taglib/buildlink3.mk
+++ b/audio/taglib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TAGLIB_BUILDLINK3_MK:=	${TAGLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	taglib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntaglib}
 BUILDLINK_PACKAGES+=	taglib
-BUILDLINK_ORDER+=	taglib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}taglib
 
 .if !empty(TAGLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.0
diff --git a/audio/tremor/buildlink3.mk b/audio/tremor/buildlink3.mk
index c808a850d54..dbd49bb8143 100644
--- a/audio/tremor/buildlink3.mk
+++ b/audio/tremor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TREMOR_BUILDLINK3_MK:=	${TREMOR_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tremor
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntremor}
 BUILDLINK_PACKAGES+=	tremor
-BUILDLINK_ORDER+=	tremor
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tremor
 
 .if !empty(TREMOR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tremor+=	tremor>=1.0.2
diff --git a/audio/twolame/buildlink3.mk b/audio/twolame/buildlink3.mk
index b3cc9187bf8..58d117c5724 100644
--- a/audio/twolame/buildlink3.mk
+++ b/audio/twolame/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TWOLAME_BUILDLINK3_MK:=	${TWOLAME_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	twolame
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntwolame}
 BUILDLINK_PACKAGES+=	twolame
-BUILDLINK_ORDER+=	twolame
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}twolame
 
 .if ${TWOLAME_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.twolame+=	twolame>=0.3.7
diff --git a/audio/wsoundserver/buildlink3.mk b/audio/wsoundserver/buildlink3.mk
index d89d98ef596..436dae90b8b 100644
--- a/audio/wsoundserver/buildlink3.mk
+++ b/audio/wsoundserver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WSOUNDSERVER_BUILDLINK3_MK:=	${WSOUNDSERVER_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	wsoundserver
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwsoundserver}
 BUILDLINK_PACKAGES+=	wsoundserver
-BUILDLINK_ORDER+=	wsoundserver
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wsoundserver
 
 .if !empty(WSOUNDSERVER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb4
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index 8edf626fdc9..08e54c12b4f 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 22:39:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:10:38 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_MIXER_BUILDLINK3_MK:=	${XFCE4_MIXER_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-mixer
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mixer}
 BUILDLINK_PACKAGES+=	xfce4-mixer
-BUILDLINK_ORDER+=	xfce4-mixer
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mixer
 
 .if !empty(XFCE4_MIXER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.2.3
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
index 36da67921c3..b4a13c77f65 100644
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:38 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:=	${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-xmms-plugin
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-xmms-plugin}
 BUILDLINK_PACKAGES+=	xfce4-xmms-plugin
-BUILDLINK_ORDER+=	xfce4-xmms-plugin
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xmms-plugin
 
 .if !empty(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.3.1
diff --git a/audio/xmms-meta-input/buildlink3.mk b/audio/xmms-meta-input/buildlink3.mk
index 5dbe8549934..3128cecd78e 100644
--- a/audio/xmms-meta-input/buildlink3.mk
+++ b/audio/xmms-meta-input/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:38 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XMMS_META_INPUT_BUILDLINK3_MK:=	${XMMS_META_INPUT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	xmms-meta-input
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxmms-meta-input}
 BUILDLINK_PACKAGES+=	xmms-meta-input
-BUILDLINK_ORDER+=	xmms-meta-input
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmms-meta-input
 
 .if !empty(XMMS_META_INPUT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xmms-meta-input+=	xmms-meta-input>=0.4
diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk
index 7bd9747227c..492521104f8 100644
--- a/audio/xmms/buildlink3.mk
+++ b/audio/xmms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XMMS_BUILDLINK3_MK:=	${XMMS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	xmms
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxmms}
 BUILDLINK_PACKAGES+=	xmms
-BUILDLINK_ORDER+=	xmms
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmms
 
 .if !empty(XMMS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xmms+=	xmms>=1.2.7nb10