Simply and speed up buildlink3.mk files and processing.

This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.

81 files changed, 486 insertions, 1053 deletions

diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index a9856301a4d..eea88f735fb 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SDL_MIXER_BUILDLINK3_MK:=	${SDL_MIXER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	SDL_mixer
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	SDL_mixer
-.endif
+.if !defined(SDL_MIXER_BUILDLINK3_MK)
+SDL_MIXER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_mixer}
-BUILDLINK_PACKAGES+=	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
 BUILDLINK_ABI_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.6nb5
 BUILDLINK_PKGSRCDIR.SDL_mixer?=	../../audio/SDL_mixer
 BUILDLINK_INCDIRS.SDL_mixer?=	include/SDL
-.endif	# SDL_MIXER_BUILDLINK3_MK
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/smpeg/buildlink3.mk"
+.endif # SDL_MIXER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-SDL_mixer
diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk
index 449e6dc3553..ab0229b6f22 100644
--- a/audio/SDL_sound/buildlink3.mk
+++ b/audio/SDL_sound/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/11/08 21:13:27 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SDL_SOUND_BUILDLINK3_MK:=	${SDL_SOUND_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	SDL_sound
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	SDL_sound
-.endif
+.if !defined(SDL_SOUND_BUILDLINK3_MK)
+SDL_SOUND_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_sound}
-BUILDLINK_PACKAGES+=	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.3
 BUILDLINK_ABI_DEPENDS.SDL_sound?=	SDL_sound>=1.0.3nb1
 BUILDLINK_PKGSRCDIR.SDL_sound?=	../../audio/SDL_sound
-.endif	# SDL_SOUND_BUILDLINK3_MK
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.endif # SDL_SOUND_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-SDL_sound
diff --git a/audio/adplug/buildlink3.mk b/audio/adplug/buildlink3.mk
index 566c4817e81..107f6f5b408 100644
--- a/audio/adplug/buildlink3.mk
+++ b/audio/adplug/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/10 16:02:26 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ADPLUG_BUILDLINK3_MK:=	${ADPLUG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	adplug
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	adplug
-.endif
+.if !defined(ADPLUG_BUILDLINK3_MK)
+ADPLUG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nadplug}
-BUILDLINK_PACKAGES+=	adplug
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}adplug
-
-.if ${ADPLUG_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.adplug+=	adplug>=2.1
 BUILDLINK_PKGSRCDIR.adplug?=	../../audio/adplug
-.endif	# ADPLUG_BUILDLINK3_MK
 
 .include "../../devel/libbinio/buildlink3.mk"
+.endif # ADPLUG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-adplug
diff --git a/audio/akode/buildlink3.mk b/audio/akode/buildlink3.mk
index c14ba4558bd..a6596e2f78d 100644
--- a/audio/akode/buildlink3.mk
+++ b/audio/akode/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/02/27 16:31:27 hasso Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:52 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-AKODE_BUILDLINK3_MK:=	${AKODE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	akode
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	akode
-.endif
+.if !defined(AKODE_BUILDLINK3_MK)
+AKODE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nakode}
-BUILDLINK_PACKAGES+=	akode
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}akode
-
-.if !empty(AKODE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.akode+=	akode>=2.0.2
 BUILDLINK_PKGSRCDIR.akode?=	../../audio/akode
-.endif	# AKODE_BUILDLINK3_MK
 
 .include "../../devel/libltdl/buildlink3.mk"
+.endif # AKODE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-akode
diff --git a/audio/alsa-lib/buildlink3.mk b/audio/alsa-lib/buildlink3.mk
index cb3abffa933..4a154213126 100644
--- a/audio/alsa-lib/buildlink3.mk
+++ b/audio/alsa-lib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/01/28 05:38:53 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-ALSA_LIB_BUILDLINK3_MK:=	${ALSA_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	alsa-lib
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	alsa-lib
-.endif
+.if !defined(ALSA_LIB_BUILDLINK3_MK)
+ALSA_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nalsa-lib}
-BUILDLINK_PACKAGES+=	alsa-lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}alsa-lib
-
-.if ${ALSA_LIB_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.alsa-lib+=	alsa-lib>=1.0.18
 BUILDLINK_PKGSRCDIR.alsa-lib?=	../../audio/alsa-lib
-.endif	# ALSA_LIB_BUILDLINK3_MK
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # ALSA_LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-alsa-lib
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
index 604d9239ad2..c6cba9012ed 100644
--- a/audio/arts/buildlink3.mk
+++ b/audio/arts/buildlink3.mk
@@ -1,24 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.19 2008/02/20 09:43:11 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:23:52 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ARTS_BUILDLINK3_MK:=	${ARTS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	arts
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	arts
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Narts}
-BUILDLINK_PACKAGES+=	arts
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}arts
+.if !defined(ARTS_BUILDLINK3_MK)
+ARTS_BUILDLINK3_MK:=
 
-.if !empty(ARTS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.arts+=	arts>=1.1.4nb1
 BUILDLINK_ABI_DEPENDS.arts+=	arts>=1.5.8nb1
 BUILDLINK_PKGSRCDIR.arts?=	../../audio/arts
 
 PRINT_PLIST_AWK+=	/^@dirrm include\/arts$$/ \
 				{ print "@comment in arts: " $$0; next; }
-.endif	# ARTS_BUILDLINK3_MK
 
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
@@ -42,5 +34,6 @@ pkgbase := arts
 .if !empty(PKG_BUILD_OPTIONS.arts:Mjack)
 .include "../../audio/jack/buildlink3.mk"
 .endif
+.endif # ARTS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-arts
diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk
index 2a6aa9b64fc..156a1e918ee 100644
--- a/audio/audacious/buildlink3.mk
+++ b/audio/audacious/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/11/10 11:35:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-AUDACIOUS_BUILDLINK3_MK:=	${AUDACIOUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	audacious
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	audacious
-.endif
+.if !defined(AUDACIOUS_BUILDLINK3_MK)
+AUDACIOUS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naudacious}
-BUILDLINK_PACKAGES+=	audacious
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}audacious
-
-.if ${AUDACIOUS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.audacious+=	audacious>=1.5.0
 BUILDLINK_PKGSRCDIR.audacious?=	../../audio/audacious
 BUILDLINK_DEPMETHOD.audacious?=	build
-.endif	# AUDACIOUS_BUILDLINK3_MK
 
 PRINT_PLIST_AWK+=       /^@dirrm share\/audacious\/images$$/ \
                                 { print "@comment in audacious: " $$0; next; }
@@ -33,5 +25,6 @@ PRINT_PLIST_AWK+=       /^@dirrm share\/audacious$$/ \
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
+.endif # AUDACIOUS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-audacious
diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk
index 447eaf317be..449fc06c94c 100644
--- a/audio/bmp/buildlink3.mk
+++ b/audio/bmp/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:52 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BMP_BUILDLINK3_MK:=	${BMP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	bmp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	bmp
-.endif
+.if !defined(BMP_BUILDLINK3_MK)
+BMP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbmp}
-BUILDLINK_PACKAGES+=	bmp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bmp
-
-.if !empty(BMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.bmp+=	bmp>=0.9.7rc2nb3
 BUILDLINK_ABI_DEPENDS.bmp?=	bmp>=0.9.7nb5
 BUILDLINK_PKGSRCDIR.bmp?=	../../audio/bmp
@@ -22,10 +15,10 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/bmp\/Output$$/ \
 			{ print "@comment in bmp: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm lib\/bmp\/Visualization$$/ \
 			{ print "@comment in bmp: " $$0; next; }
-.endif	# BMP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # BMP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-bmp
diff --git a/audio/cddb-bundle/buildlink3.mk b/audio/cddb-bundle/buildlink3.mk
index 8203ee17cfa..9ea643348b2 100644
--- a/audio/cddb-bundle/buildlink3.mk
+++ b/audio/cddb-bundle/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CDDB_BUNDLE_BUILDLINK3_MK:=	${CDDB_BUNDLE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cddb-bundle
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cddb-bundle
-.endif
+.if !defined(CDDB_BUNDLE_BUILDLINK3_MK)
+CDDB_BUNDLE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncddb-bundle}
-BUILDLINK_PACKAGES+=	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
 BUILDLINK_ABI_DEPENDS.cddb-bundle?=	cddb-bundle>=0.2nb1
 BUILDLINK_PKGSRCDIR.cddb-bundle?=	../../audio/cddb-bundle
-.endif	# CDDB_BUNDLE_BUILDLINK3_MK
 
 .include "../../devel/gnustep-make/buildlink3.mk"
+.endif # CDDB_BUNDLE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cddb-bundle
diff --git a/audio/cdparanoia/buildlink3.mk b/audio/cdparanoia/buildlink3.mk
index 927ef6084b5..adc7f8274e0 100644
--- a/audio/cdparanoia/buildlink3.mk
+++ b/audio/cdparanoia/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CDPARANOIA_BUILDLINK3_MK:=	${CDPARANOIA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cdparanoia
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cdparanoia
-.endif
+.if !defined(CDPARANOIA_BUILDLINK3_MK)
+CDPARANOIA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdparanoia}
-BUILDLINK_PACKAGES+=	cdparanoia
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdparanoia
-
-.if !empty(CDPARANOIA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cdparanoia+=		cdparanoia>=3.0
 BUILDLINK_ABI_DEPENDS.cdparanoia?=	cdparanoia>=3.0.9.8nb5
 BUILDLINK_PKGSRCDIR.cdparanoia?=	../../audio/cdparanoia
-.endif	# CDPARANOIA_BUILDLINK3_MK
+.endif # CDPARANOIA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cdparanoia
diff --git a/audio/cdplayer/buildlink3.mk b/audio/cdplayer/buildlink3.mk
index cdfafc7f18e..577a33330f4 100644
--- a/audio/cdplayer/buildlink3.mk
+++ b/audio/cdplayer/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CDPLAYER_BUILDLINK3_MK:=	${CDPLAYER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cdplayer
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cdplayer
-.endif
+.if !defined(CDPLAYER_BUILDLINK3_MK)
+CDPLAYER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdplayer}
-BUILDLINK_PACKAGES+=	cdplayer
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdplayer
-
-.if !empty(CDPLAYER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cdplayer+=	cdplayer>=0.4.2
 BUILDLINK_ABI_DEPENDS.cdplayer?=	cdplayer>=0.4.2nb3
 BUILDLINK_PKGSRCDIR.cdplayer?=	../../audio/cdplayer
-.endif	# CDPLAYER_BUILDLINK3_MK
 
 .include "../../audio/libcdaudio/buildlink3.mk"
 .include "../../audio/cddb-bundle/buildlink3.mk"
+.endif # CDPLAYER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cdplayer
diff --git a/audio/celt/buildlink3.mk b/audio/celt/buildlink3.mk
index bd610c5d6ba..42fb3679a00 100644
--- a/audio/celt/buildlink3.mk
+++ b/audio/celt/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/03 00:44:49 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:52 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CELT_BUILDLINK3_MK:=	${CELT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	celt
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	celt
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncelt}
-BUILDLINK_PACKAGES+=	celt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}celt
+.if !defined(CELT_BUILDLINK3_MK)
+CELT_BUILDLINK3_MK:=
 
-.if ${CELT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.celt+=	celt>=0.5.0
 BUILDLINK_PKGSRCDIR.celt?=	../../audio/celt
 pkgbase:= celt
 .  include "../../mk/pkg-build-options.mk"
-.endif	# CELT_BUILDLINK3_MK
 
 .if !empty(PKG_BUILD_OPTIONS.celt:Mogg)
 .  include "../../multimedia/libogg/buildlink3.mk"
 .endif
+.endif # CELT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-celt
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
index 75502e6f91c..cb7c2f3891c 100644
--- a/audio/esound/buildlink3.mk
+++ b/audio/esound/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ESOUND_BUILDLINK3_MK:=	${ESOUND_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	esound
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	esound
-.endif
+.if !defined(ESOUND_BUILDLINK3_MK)
+ESOUND_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nesound}
-BUILDLINK_PACKAGES+=	esound
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}esound
-
-.if !empty(ESOUND_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.18
 BUILDLINK_ABI_DEPENDS.esound+=	esound>=0.2.35nb1
 BUILDLINK_PKGSRCDIR.esound?=	../../audio/esound
-.endif	# ESOUND_BUILDLINK3_MK
 
 .include "../../audio/libaudiofile/buildlink3.mk"
+.endif # ESOUND_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-esound
diff --git a/audio/espeak/buildlink3.mk b/audio/espeak/buildlink3.mk
index 721c13b5293..0ba440490a5 100644
--- a/audio/espeak/buildlink3.mk
+++ b/audio/espeak/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/07/17 19:18:44 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ESPEAK_BUILDLINK3_MK:=	${ESPEAK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	espeak
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	espeak
-.endif
+.if !defined(ESPEAK_BUILDLINK3_MK)
+ESPEAK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nespeak}
-BUILDLINK_PACKAGES+=	espeak
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}espeak
-
-.if ${ESPEAK_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.espeak+=	espeak>=1.26
 BUILDLINK_PKGSRCDIR.espeak?=	../../audio/espeak
-.endif	# ESPEAK_BUILDLINK3_MK
 
 .include "../../audio/portaudio/buildlink3.mk"
+.endif # ESPEAK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-espeak
diff --git a/audio/faac/buildlink3.mk b/audio/faac/buildlink3.mk
index 808b0d36a49..7cb5ac290da 100644
--- a/audio/faac/buildlink3.mk
+++ b/audio/faac/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FAAC_BUILDLINK3_MK:=	${FAAC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	faac
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	faac
-.endif
+.if !defined(FAAC_BUILDLINK3_MK)
+FAAC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfaac}
-BUILDLINK_PACKAGES+=	faac
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faac
-
-.if !empty(FAAC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.faac+=	faac>=1.24
 BUILDLINK_ABI_DEPENDS.faac+=	faac>=1.24nb1
 BUILDLINK_PKGSRCDIR.faac?=	../../audio/faac
-.endif	# FAAC_BUILDLINK3_MK
+.endif # FAAC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-faac
diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk
index 46ec83c1dde..288ccf2785e 100644
--- a/audio/faad2/buildlink3.mk
+++ b/audio/faad2/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/02/25 16:12:34 sborrill Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FAAD2_BUILDLINK3_MK:=	${FAAD2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	faad2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	faad2
-.endif
+.if !defined(FAAD2_BUILDLINK3_MK)
+FAAD2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfaad2}
-BUILDLINK_PACKAGES+=	faad2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faad2
-
-.if !empty(FAAD2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.faad2+=	faad2>=2.6.1
 BUILDLINK_ABI_DEPENDS.faad2?=	faad2>=2.6.1
 BUILDLINK_PKGSRCDIR.faad2?=	../../audio/faad2
 BUILDLINK_INCDIRS.faad2?=	include/faad2
-.endif	# FAAD2_BUILDLINK3_MK
+.endif # FAAD2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-faad2
diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk
index 9a54d136e9b..401dfbff0de 100644
--- a/audio/flac/buildlink3.mk
+++ b/audio/flac/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/01/07 15:01:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FLAC_BUILDLINK3_MK:=	${FLAC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	flac
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	flac
-.endif
+.if !defined(FLAC_BUILDLINK3_MK)
+FLAC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nflac}
-BUILDLINK_PACKAGES+=	flac
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flac
-
-.if !empty(FLAC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.flac+=	flac>=1.1.0nb1
 BUILDLINK_ABI_DEPENDS.flac+=	flac>=1.1.3nb1
 BUILDLINK_PKGSRCDIR.flac?=	../../audio/flac
-.endif	# FLAC_BUILDLINK3_MK
 
 .include "../../multimedia/libogg/buildlink3.mk"
+.endif # FLAC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-flac
diff --git a/audio/fluidsynth/buildlink3.mk b/audio/fluidsynth/buildlink3.mk
index e998aaae83c..1c5cabede4f 100644
--- a/audio/fluidsynth/buildlink3.mk
+++ b/audio/fluidsynth/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FLUIDSYNTH_BUILDLINK3_MK:=	${FLUIDSYNTH_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fluidsynth
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	fluidsynth
-.endif
+.if !defined(FLUIDSYNTH_BUILDLINK3_MK)
+FLUIDSYNTH_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfluidsynth}
-BUILDLINK_PACKAGES+=	fluidsynth
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fluidsynth
-
-.if !empty(FLUIDSYNTH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fluidsynth+=		fluidsynth>=1.0.5
 BUILDLINK_PKGSRCDIR.fluidsynth?=	../../audio/fluidsynth
-.endif	# FLUIDSYNTH_BUILDLINK3_MK
 
 .include "../../devel/readline/buildlink3.mk"
+.endif # FLUIDSYNTH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fluidsynth
diff --git a/audio/freealut/buildlink3.mk b/audio/freealut/buildlink3.mk
index a8a641fde3f..1222c539a37 100644
--- a/audio/freealut/buildlink3.mk
+++ b/audio/freealut/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/07/13 14:50:17 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FREEALUT_BUILDLINK3_MK:=	${FREEALUT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	freealut
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	freealut
-.endif
+.if !defined(FREEALUT_BUILDLINK3_MK)
+FREEALUT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreealut}
-BUILDLINK_PACKAGES+=	freealut
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freealut
-
-.if ${FREEALUT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.freealut+=	freealut>=1.1.0
 BUILDLINK_PKGSRCDIR.freealut?=	../../audio/freealut
-.endif	# FREEALUT_BUILDLINK3_MK
 
 .include "../../audio/openal/buildlink3.mk"
+.endif # FREEALUT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-freealut
diff --git a/audio/gnome-speech/buildlink3.mk b/audio/gnome-speech/buildlink3.mk
index 8cf40439e4b..284a6fb3d03 100644
--- a/audio/gnome-speech/buildlink3.mk
+++ b/audio/gnome-speech/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_SPEECH_BUILDLINK3_MK:=	${GNOME_SPEECH_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-speech
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-speech
-.endif
+.if !defined(GNOME_SPEECH_BUILDLINK3_MK)
+GNOME_SPEECH_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-speech}
-BUILDLINK_PACKAGES+=	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
 BUILDLINK_ABI_DEPENDS.gnome-speech+=	gnome-speech>=0.3.9nb2
 BUILDLINK_PKGSRCDIR.gnome-speech?=	../../audio/gnome-speech
-.endif	# GNOME_SPEECH_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
+.endif # GNOME_SPEECH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-speech
diff --git a/audio/goom/buildlink3.mk b/audio/goom/buildlink3.mk
index 9f81f7b3640..526ba9cff34 100644
--- a/audio/goom/buildlink3.mk
+++ b/audio/goom/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GOOM_BUILDLINK3_MK:=	${GOOM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	goom
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	goom
-.endif
+.if !defined(GOOM_BUILDLINK3_MK)
+GOOM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngoom}
-BUILDLINK_PACKAGES+=	goom
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}goom
-
-.if !empty(GOOM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.goom+=	goom>=2004.0
 BUILDLINK_PKGSRCDIR.goom?=	../../audio/goom
-.endif	# GOOM_BUILDLINK3_MK
+.endif # GOOM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-goom
diff --git a/audio/gsm/buildlink3.mk b/audio/gsm/buildlink3.mk
index 5b9617ecf33..cc8e2438c2f 100644
--- a/audio/gsm/buildlink3.mk
+++ b/audio/gsm/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/02/03 06:09:09 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GSM_BUILDLINK3_MK:=	${GSM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gsm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gsm
-.endif
+.if !defined(GSM_BUILDLINK3_MK)
+GSM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngsm}
-BUILDLINK_PACKAGES+=	gsm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsm
-
-.if !empty(GSM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gsm+=		gsm>=1.0.10
 BUILDLINK_ABI_DEPENDS.gsm+=	gsm>=1.0.12
 BUILDLINK_PKGSRCDIR.gsm?=	../../audio/gsm
-.endif	# GSM_BUILDLINK3_MK
+.endif # GSM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gsm
diff --git a/audio/id3lib/buildlink3.mk b/audio/id3lib/buildlink3.mk
index d503d49248f..a97612d1361 100644
--- a/audio/id3lib/buildlink3.mk
+++ b/audio/id3lib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:53 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ID3LIB_BUILDLINK3_MK:=	${ID3LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	id3lib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	id3lib
-.endif
+.if !defined(ID3LIB_BUILDLINK3_MK)
+ID3LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nid3lib}
-BUILDLINK_PACKAGES+=	id3lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}id3lib
-
-.if !empty(ID3LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.id3lib+=	id3lib>=3.8.3
 BUILDLINK_ABI_DEPENDS.id3lib+=	id3lib>=3.8.3nb1
 BUILDLINK_PKGSRCDIR.id3lib?=	../../audio/id3lib
-.endif	# ID3LIB_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
+.endif # ID3LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-id3lib
diff --git a/audio/jack/buildlink3.mk b/audio/jack/buildlink3.mk
index b54cdb5ffa0..8eba2f00239 100644
--- a/audio/jack/buildlink3.mk
+++ b/audio/jack/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/11/16 11:22:55 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:23:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-JACK_BUILDLINK3_MK:=	${JACK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	jack
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	jack
-.endif
+.if !defined(JACK_BUILDLINK3_MK)
+JACK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njack}
-BUILDLINK_PACKAGES+=	jack
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jack
-
-.if ${JACK_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.jack+=	jack>=0.110.0
 BUILDLINK_PKGSRCDIR.jack?=	../../audio/jack
-.endif	# JACK_BUILDLINK3_MK
 
 .include "../../audio/libsamplerate/buildlink3.mk"
 # for DLOPEN_REQUIRE_PTHREADS
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # JACK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-jack
diff --git a/audio/ladspa/buildlink3.mk b/audio/ladspa/buildlink3.mk
index 472fbbcc470..9a43b09998e 100644
--- a/audio/ladspa/buildlink3.mk
+++ b/audio/ladspa/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/08/08 15:19:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LADSPA_BUILDLINK3_MK:=	${LADSPA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ladspa
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ladspa
-.endif
+.if !defined(LADSPA_BUILDLINK3_MK)
+LADSPA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nladspa}
-BUILDLINK_PACKAGES+=	ladspa
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ladspa
-
-.if ${LADSPA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ladspa+=	ladspa>=1.12
 BUILDLINK_ABI_DEPENDS.ladspa?=	ladspa>=1.12nb1
 BUILDLINK_PKGSRCDIR.ladspa?=	../../audio/ladspa
-.endif	# LADSPA_BUILDLINK3_MK
+.endif # LADSPA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ladspa
diff --git a/audio/lame/buildlink3.mk b/audio/lame/buildlink3.mk
index fa64eb83990..24d5f0a6a11 100644
--- a/audio/lame/buildlink3.mk
+++ b/audio/lame/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LAME_BUILDLINK3_MK:=	${LAME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	lame
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	lame
-.endif
+.if !defined(LAME_BUILDLINK3_MK)
+LAME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlame}
-BUILDLINK_PACKAGES+=	lame
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lame
-
-.if !empty(LAME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lame+=	lame>=3.93.1nb2
 BUILDLINK_ABI_DEPENDS.lame+=	lame>=3.96.1nb4
 BUILDLINK_PKGSRCDIR.lame?=	../../audio/lame
-.endif	# LAME_BUILDLINK3_MK
+.endif # LAME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-lame
diff --git a/audio/liba52/buildlink3.mk b/audio/liba52/buildlink3.mk
index cddd09dde9a..afd3c39afe8 100644
--- a/audio/liba52/buildlink3.mk
+++ b/audio/liba52/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBA52_BUILDLINK3_MK:=	${LIBA52_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	liba52
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	liba52
-.endif
+.if !defined(LIBA52_BUILDLINK3_MK)
+LIBA52_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliba52}
-BUILDLINK_PACKAGES+=	liba52
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liba52
-
-.if !empty(LIBA52_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.liba52+=	liba52>=0.7.4
 BUILDLINK_ABI_DEPENDS.liba52+=	liba52>=0.7.4nb3
 BUILDLINK_PKGSRCDIR.liba52?=	../../audio/liba52
-.endif	# LIBA52_BUILDLINK3_MK
+.endif # LIBA52_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-liba52
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index 396f640f511..e80b516641e 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/12/12 21:52:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBAO_BUILDLINK3_MK:=	${LIBAO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libao
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libao
-.endif
+.if !defined(LIBAO_BUILDLINK3_MK)
+LIBAO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibao}
-BUILDLINK_PACKAGES+=	libao
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libao
-
-.if !empty(LIBAO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.4
 BUILDLINK_ABI_DEPENDS.libao+=	libao>=0.8.6nb3
 BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
@@ -30,9 +23,9 @@ _LIBAO_DEFAULT_PLUGIN=
 DEPENDS+=	libao-[a-z]*-[0-9]*:../../audio/libao-${_LIBAO_DEFAULT_PLUGIN}
 .    endif
 .  endif
-.endif	# LIBAO_BUILDLINK3_MK
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/ao\/plugins-2$$/ \
 				{ print "@comment in libao: " $$0; next }
+.endif # LIBAO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libao
diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
index 9608fca635d..38dcbfa51fc 100644
--- a/audio/libaudiofile/buildlink3.mk
+++ b/audio/libaudiofile/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:23:54 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-AUDIOFILE_BUILDLINK3_MK:=	${AUDIOFILE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	audiofile
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	audiofile
-.endif
+.if !defined(AUDIOFILE_BUILDLINK3_MK)
+AUDIOFILE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naudiofile}
-BUILDLINK_PACKAGES+=	audiofile
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}audiofile
-
-.if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.audiofile+=	libaudiofile>=0.2.1
 BUILDLINK_ABI_DEPENDS.audiofile+=	libaudiofile>=0.2.6nb1
 BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
-.endif	# AUDIOFILE_BUILDLINK3_MK
+.endif # AUDIOFILE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-audiofile
diff --git a/audio/libcanberra/buildlink3.mk b/audio/libcanberra/buildlink3.mk
index a440d641e36..075d88d94f6 100644
--- a/audio/libcanberra/buildlink3.mk
+++ b/audio/libcanberra/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/16 15:17:47 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:54 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBCANBERRA_BUILDLINK3_MK:=	${LIBCANBERRA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libcanberra
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libcanberra
-.endif
+.if !defined(LIBCANBERRA_BUILDLINK3_MK)
+LIBCANBERRA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcanberra}
-BUILDLINK_PACKAGES+=	libcanberra
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcanberra
-
-.if ${LIBCANBERRA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libcanberra+=	libcanberra>=0.10
 BUILDLINK_PKGSRCDIR.libcanberra?=	../../audio/libcanberra
-.endif	# LIBCANBERRA_BUILDLINK3_MK
 
 #.include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.endif # LIBCANBERRA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libcanberra
diff --git a/audio/libcdaudio/buildlink3.mk b/audio/libcdaudio/buildlink3.mk
index 51263903c30..29152389783 100644
--- a/audio/libcdaudio/buildlink3.mk
+++ b/audio/libcdaudio/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:54 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBCDAUDIO_BUILDLINK3_MK:=	${LIBCDAUDIO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libcdaudio
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libcdaudio
-.endif
+.if !defined(LIBCDAUDIO_BUILDLINK3_MK)
+LIBCDAUDIO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcdaudio}
-BUILDLINK_PACKAGES+=	libcdaudio
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcdaudio
-
-.if !empty(LIBCDAUDIO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcdaudio+=		libcdaudio>=0.99.4nb1
 BUILDLINK_ABI_DEPENDS.libcdaudio+=	libcdaudio>=0.99.12nb1
 BUILDLINK_PKGSRCDIR.libcdaudio?=	../../audio/libcdaudio
-.endif	# LIBCDAUDIO_BUILDLINK3_MK
+.endif # LIBCDAUDIO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libcdaudio
diff --git a/audio/libcddb/buildlink3.mk b/audio/libcddb/buildlink3.mk
index 0a22ff05766..71013734348 100644
--- a/audio/libcddb/buildlink3.mk
+++ b/audio/libcddb/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/01/24 12:13:21 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBCDDB_BUILDLINK3_MK:=	${LIBCDDB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libcddb
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libcddb
-.endif
+.if !defined(LIBCDDB_BUILDLINK3_MK)
+LIBCDDB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcddb}
-BUILDLINK_PACKAGES+=	libcddb
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcddb
-
-.if !empty(LIBCDDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcddb+=	libcddb>=0.9.4
 BUILDLINK_ABI_DEPENDS.libcddb+=	libcddb>=0.9.5nb1
 BUILDLINK_PKGSRCDIR.libcddb?=	../../audio/libcddb
-.endif	# LIBCDDB_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
+.endif # LIBCDDB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libcddb
diff --git a/audio/libdca/buildlink3.mk b/audio/libdca/buildlink3.mk
index caa92c2801f..64ea8845e27 100644
--- a/audio/libdca/buildlink3.mk
+++ b/audio/libdca/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/09/08 08:38:10 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBDCA_BUILDLINK3_MK:=	${LIBDCA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdca
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libdca
-.endif
+.if !defined(LIBDCA_BUILDLINK3_MK)
+LIBDCA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdca}
-BUILDLINK_PACKAGES+=	libdca
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdca
-
-.if ${LIBDCA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libdca+=	libdca>=0.0.5
 BUILDLINK_PKGSRCDIR.libdca?=	../../audio/libdca
-.endif	# LIBDCA_BUILDLINK3_MK
+.endif # LIBDCA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdca
diff --git a/audio/libdiscid/buildlink3.mk b/audio/libdiscid/buildlink3.mk
index 69c6df8db8d..15814bc80ca 100644
--- a/audio/libdiscid/buildlink3.mk
+++ b/audio/libdiscid/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/10/13 02:31:56 epg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDISCID_BUILDLINK3_MK:=	${LIBDISCID_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdiscid
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libdiscid
-.endif
+.if !defined(LIBDISCID_BUILDLINK3_MK)
+LIBDISCID_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdiscid}
-BUILDLINK_PACKAGES+=	libdiscid
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdiscid
-
-.if ${LIBDISCID_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libdiscid+=	libdiscid>=0.1.0
 BUILDLINK_PKGSRCDIR.libdiscid?=	../../audio/libdiscid
-.endif	# LIBDISCID_BUILDLINK3_MK
+.endif # LIBDISCID_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdiscid
diff --git a/audio/libgpod/buildlink3.mk b/audio/libgpod/buildlink3.mk
index 89da26c9bd3..611de1f9dde 100644
--- a/audio/libgpod/buildlink3.mk
+++ b/audio/libgpod/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/09/06 22:55:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:55 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBGPOD_BUILDLINK3_MK:=	${LIBGPOD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgpod
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libgpod
-.endif
+.if !defined(LIBGPOD_BUILDLINK3_MK)
+LIBGPOD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgpod}
-BUILDLINK_PACKAGES+=	libgpod
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgpod
-
-.if ${LIBGPOD_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libgpod+=	libgpod>=0.3.2
 BUILDLINK_PKGSRCDIR.libgpod?=	../../audio/libgpod
-.endif	# LIBGPOD_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBGPOD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgpod
diff --git a/audio/libhydrogen/buildlink3.mk b/audio/libhydrogen/buildlink3.mk
index aafb26f1eb9..3d72e56b9e5 100644
--- a/audio/libhydrogen/buildlink3.mk
+++ b/audio/libhydrogen/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBHYDROGEN_BUILDLINK3_MK:=	${LIBHYDROGEN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libhydrogen
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libhydrogen
-.endif
+.if !defined(LIBHYDROGEN_BUILDLINK3_MK)
+LIBHYDROGEN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibhydrogen}
-BUILDLINK_PACKAGES+=	libhydrogen
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libhydrogen
-
-.if !empty(LIBHYDROGEN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libhydrogen+=		libhydrogen>=0.8.0
 BUILDLINK_ABI_DEPENDS.libhydrogen+=	libhydrogen>=0.8.0nb2
 BUILDLINK_PKGSRCDIR.libhydrogen?=	../../audio/libhydrogen
-.endif	# LIBHYDROGEN_BUILDLINK3_MK
 
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # LIBHYDROGEN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libhydrogen
diff --git a/audio/libid3tag/buildlink3.mk b/audio/libid3tag/buildlink3.mk
index b2286c3fa36..a5190de8066 100644
--- a/audio/libid3tag/buildlink3.mk
+++ b/audio/libid3tag/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBID3TAG_BUILDLINK3_MK:=	${LIBID3TAG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libid3tag
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libid3tag
-.endif
+.if !defined(LIBID3TAG_BUILDLINK3_MK)
+LIBID3TAG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibid3tag}
-BUILDLINK_PACKAGES+=	libid3tag
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libid3tag
-
-.if !empty(LIBID3TAG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libid3tag+=	libid3tag>=0.15.0b
 BUILDLINK_ABI_DEPENDS.libid3tag+=	libid3tag>=0.15.1bnb1
 BUILDLINK_PKGSRCDIR.libid3tag?=	../../audio/libid3tag
-.endif	# LIBID3TAG_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
+.endif # LIBID3TAG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libid3tag
diff --git a/audio/libmad/buildlink3.mk b/audio/libmad/buildlink3.mk
index 83cae9d3c02..40452bf2089 100644
--- a/audio/libmad/buildlink3.mk
+++ b/audio/libmad/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMAD_BUILDLINK3_MK:=		${LIBMAD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmad
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmad
-.endif
+.if !defined(LIBMAD_BUILDLINK3_MK)
+LIBMAD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmad}
-BUILDLINK_PACKAGES+=	libmad
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmad
-
-.if !empty(LIBMAD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmad+=	libmad>=0.15.0b
 BUILDLINK_ABI_DEPENDS.libmad+=	libmad>=0.15.1bnb1
 BUILDLINK_PKGSRCDIR.libmad?=	../../audio/libmad
-.endif	# LIBMAD_BUILDLINK3_MK
+.endif # LIBMAD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmad
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index 92bf7deb36c..eeca4b63719 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.15 2007/05/30 08:54:28 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:23:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMIKMOD_BUILDLINK3_MK:=	${LIBMIKMOD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmikmod
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmikmod
-.endif
+.if !defined(LIBMIKMOD_BUILDLINK3_MK)
+LIBMIKMOD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmikmod}
-BUILDLINK_PACKAGES+=	libmikmod
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmikmod
-
-.if ${LIBMIKMOD_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmikmod+=	libmikmod>=3.1.9
 BUILDLINK_ABI_DEPENDS.libmikmod+=	libmikmod>=3.1.11.1nb2
 BUILDLINK_PKGSRCDIR.libmikmod?=	../../audio/libmikmod
@@ -25,6 +18,6 @@ pkgbase := libmikmod
   empty(OPSYS:MNetBSD) && empty(OPSYS:MLinux)
 .    include "../../audio/esound/buildlink3.mk"
 .  endif
-.endif	# LIBMIKMOD_BUILDLINK3_MK
+.endif # LIBMIKMOD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmikmod
diff --git a/audio/libmodplug/buildlink3.mk b/audio/libmodplug/buildlink3.mk
index 839de556fe1..cf68ff6ec74 100644
--- a/audio/libmodplug/buildlink3.mk
+++ b/audio/libmodplug/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMODPLUG_BUILDLINK3_MK:=	${LIBMODPLUG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmodplug
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmodplug
-.endif
+.if !defined(LIBMODPLUG_BUILDLINK3_MK)
+LIBMODPLUG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmodplug}
-BUILDLINK_PACKAGES+=	libmodplug
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmodplug
-
-.if !empty(LIBMODPLUG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmodplug+=		libmodplug>=0.7
 BUILDLINK_ABI_DEPENDS.libmodplug+=	libmodplug>=0.7nb1
 BUILDLINK_PKGSRCDIR.libmodplug?=	../../audio/libmodplug
-.endif	# LIBMODPLUG_BUILDLINK3_MK
+.endif # LIBMODPLUG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmodplug
diff --git a/audio/libmp3splt/buildlink3.mk b/audio/libmp3splt/buildlink3.mk
index 1b19113d44f..a9c6e1afa51 100644
--- a/audio/libmp3splt/buildlink3.mk
+++ b/audio/libmp3splt/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/02/12 22:52:49 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMP3SPLT_BUILDLINK3_MK:=	${LIBMP3SPLT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmp3splt
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmp3splt
-.endif
+.if !defined(LIBMP3SPLT_BUILDLINK3_MK)
+LIBMP3SPLT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmp3splt}
-BUILDLINK_PACKAGES+=	libmp3splt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmp3splt
-
-.if ${LIBMP3SPLT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmp3splt+=	libmp3splt>=0.5.1
 BUILDLINK_PKGSRCDIR.libmp3splt?=	../../audio/libmp3splt
-.endif	# LIBMP3SPLT_BUILDLINK3_MK
 ###
 ### XXX libmad and libvorbis are needed only for headers.
 ###
@@ -26,5 +18,6 @@ BUILDLINK_DEPMETHOD.libvorbis?= build
 
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.endif # LIBMP3SPLT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmp3splt
diff --git a/audio/libmpcdec/buildlink3.mk b/audio/libmpcdec/buildlink3.mk
index 96632cfc4eb..61deb31e910 100644
--- a/audio/libmpcdec/buildlink3.mk
+++ b/audio/libmpcdec/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/07/25 13:59:39 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMPCDEC_BUILDLINK3_MK:=	${LIBMPCDEC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmpcdec
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmpcdec
-.endif
+.if !defined(LIBMPCDEC_BUILDLINK3_MK)
+LIBMPCDEC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpcdec}
-BUILDLINK_PACKAGES+=	libmpcdec
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpcdec
-
-.if ${LIBMPCDEC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmpcdec+=	libmpcdec>=1.2.4
 BUILDLINK_ABI_DEPENDS.libmpcdec+=	libmpcdec>=1.2.6
 BUILDLINK_PKGSRCDIR.libmpcdec?=	../../audio/libmpcdec
-.endif	# LIBMPCDEC_BUILDLINK3_MK
+.endif # LIBMPCDEC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmpcdec
diff --git a/audio/libmpd/buildlink3.mk b/audio/libmpd/buildlink3.mk
index d0f9b4796e7..eca89011fc3 100644
--- a/audio/libmpd/buildlink3.mk
+++ b/audio/libmpd/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:55 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBMPD_BUILDLINK3_MK:=	${LIBMPD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmpd
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmpd
-.endif
+.if !defined(LIBMPD_BUILDLINK3_MK)
+LIBMPD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpd}
-BUILDLINK_PACKAGES+=	libmpd
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpd
-
-.if !empty(LIBMPD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmpd+=	libmpd>=0.12.0
 BUILDLINK_PKGSRCDIR.libmpd?=	../../audio/libmpd
-.endif	# LIBMPD_BUILDLINK3_MK
+.endif # LIBMPD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmpd
diff --git a/audio/libmpg123/buildlink3.mk b/audio/libmpg123/buildlink3.mk
index 7b97c4916a5..18d3f02091d 100644
--- a/audio/libmpg123/buildlink3.mk
+++ b/audio/libmpg123/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/15 01:58:53 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:56 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBMPG123_BUILDLINK3_MK:=	${LIBMPG123_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmpg123
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmpg123
-.endif
+.if !defined(LIBMPG123_BUILDLINK3_MK)
+LIBMPG123_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpg123}
-BUILDLINK_PACKAGES+=	libmpg123
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpg123
-
-.if ${LIBMPG123_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmpg123+=	libmpg123>=0.7.0
 BUILDLINK_PKGSRCDIR.libmpg123?=	../../audio/libmpg123
-.endif	# LIBMPG123_BUILDLINK3_MK
+.endif # LIBMPG123_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmpg123
diff --git a/audio/libmusepack/buildlink3.mk b/audio/libmusepack/buildlink3.mk
index 4bdcbd55108..249433a29ed 100644
--- a/audio/libmusepack/buildlink3.mk
+++ b/audio/libmusepack/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/02/01 10:21:57 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:56 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMUSEPACK_BUILDLINK3_MK:=	${LIBMUSEPACK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmusepack
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmusepack
-.endif
+.if !defined(LIBMUSEPACK_BUILDLINK3_MK)
+LIBMUSEPACK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmusepack}
-BUILDLINK_PACKAGES+=	libmusepack
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmusepack
-
-.if !empty(LIBMUSEPACK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmusepack+=		libmusepack>=1.0.3
 BUILDLINK_PKGSRCDIR.libmusepack?=	../../audio/libmusepack
-.endif	# LIBMUSEPACK_BUILDLINK3_MK
+.endif # LIBMUSEPACK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmusepack
diff --git a/audio/libmusicbrainz/buildlink3.mk b/audio/libmusicbrainz/buildlink3.mk
index ec8818948fa..81f678317e9 100644
--- a/audio/libmusicbrainz/buildlink3.mk
+++ b/audio/libmusicbrainz/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/01/18 05:06:20 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:56 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMUSICBRAINZ_BUILDLINK3_MK:=	${LIBMUSICBRAINZ_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmusicbrainz
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmusicbrainz
-.endif
+.if !defined(LIBMUSICBRAINZ_BUILDLINK3_MK)
+LIBMUSICBRAINZ_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmusicbrainz}
-BUILDLINK_PACKAGES+=	libmusicbrainz
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmusicbrainz
-
-.if ${LIBMUSICBRAINZ_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmusicbrainz+=	libmusicbrainz>=3.0.0
 BUILDLINK_ABI_DEPENDS.libmusicbrainz?=	libmusicbrainz>=3.0.0nb1
 BUILDLINK_PKGSRCDIR.libmusicbrainz?=	../../audio/libmusicbrainz
-.endif	# LIBMUSICBRAINZ_BUILDLINK3_MK
 
 .include "../../www/neon/buildlink3.mk"
+.endif # LIBMUSICBRAINZ_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmusicbrainz
diff --git a/audio/libofa/buildlink3.mk b/audio/libofa/buildlink3.mk
index 3a412d2246f..f27bab2b870 100644
--- a/audio/libofa/buildlink3.mk
+++ b/audio/libofa/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/07/12 13:12:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:56 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBOFA_BUILDLINK3_MK:=	${LIBOFA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libofa
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libofa
-.endif
+.if !defined(LIBOFA_BUILDLINK3_MK)
+LIBOFA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibofa}
-BUILDLINK_PACKAGES+=	libofa
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libofa
-
-.if ${LIBOFA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libofa+=	libofa>=0.9.3
 BUILDLINK_PKGSRCDIR.libofa?=	../../audio/libofa
-.endif	# LIBOFA_BUILDLINK3_MK
 
 .include "../../math/fftw/buildlink3.mk"
+.endif # LIBOFA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libofa
diff --git a/audio/libopenspc/buildlink3.mk b/audio/libopenspc/buildlink3.mk
index 98870e1b298..275b2f5f24c 100644
--- a/audio/libopenspc/buildlink3.mk
+++ b/audio/libopenspc/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/01/26 16:44:00 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:56 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBOPENSPC_BUILDLINK3_MK:=	${LIBOPENSPC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libopenspc
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libopenspc
-.endif
+.if !defined(LIBOPENSPC_BUILDLINK3_MK)
+LIBOPENSPC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibopenspc}
-BUILDLINK_PACKAGES+=	libopenspc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libopenspc
-
-.if ${LIBOPENSPC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libopenspc+=	libopenspc>=0.3.99.20050926
 BUILDLINK_PKGSRCDIR.libopenspc?=	../../audio/libopenspc
-.endif	# LIBOPENSPC_BUILDLINK3_MK
+.endif # LIBOPENSPC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libopenspc
diff --git a/audio/libsamplerate/buildlink3.mk b/audio/libsamplerate/buildlink3.mk
index da9ae2fbada..21ac640fa85 100644
--- a/audio/libsamplerate/buildlink3.mk
+++ b/audio/libsamplerate/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/01/07 12:25:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:56 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSAMPLERATE_BUILDLINK3_MK:=	${LIBSAMPLERATE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsamplerate
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libsamplerate
-.endif
+.if !defined(LIBSAMPLERATE_BUILDLINK3_MK)
+LIBSAMPLERATE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsamplerate}
-BUILDLINK_PACKAGES+=	libsamplerate
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsamplerate
-
-.if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsamplerate+=	libsamplerate>=0.0.13nb1
 BUILDLINK_ABI_DEPENDS.libsamplerate+=	libsamplerate>=0.1.2nb3
 BUILDLINK_PKGSRCDIR.libsamplerate?=	../../audio/libsamplerate
-.endif	# LIBSAMPLERATE_BUILDLINK3_MK
 
 .include "../../audio/libsndfile/buildlink3.mk"
+.endif # LIBSAMPLERATE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsamplerate
diff --git a/audio/libshout/buildlink3.mk b/audio/libshout/buildlink3.mk
index f199b9c4dc5..eff46004f7e 100644
--- a/audio/libshout/buildlink3.mk
+++ b/audio/libshout/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:56 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSHOUT_BUILDLINK3_MK:=	${LIBSHOUT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libshout
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libshout
-.endif
+.if !defined(LIBSHOUT_BUILDLINK3_MK)
+LIBSHOUT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibshout}
-BUILDLINK_PACKAGES+=	libshout
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libshout
-
-.if !empty(LIBSHOUT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libshout+=	libshout>=2.0
 BUILDLINK_ABI_DEPENDS.libshout+=libshout>=2.0nb1
 BUILDLINK_PKGSRCDIR.libshout?=	../../audio/libshout
-.endif	# LIBSHOUT_BUILDLINK3_MK
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # LIBSHOUT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libshout
diff --git a/audio/libsidplay/buildlink3.mk b/audio/libsidplay/buildlink3.mk
index c4ae2a838f7..25b55cc0d5c 100644
--- a/audio/libsidplay/buildlink3.mk
+++ b/audio/libsidplay/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:56 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSIDPLAY_BUILDLINK3_MK:=	${LIBSIDPLAY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsidplay
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libsidplay
-.endif
+.if !defined(LIBSIDPLAY_BUILDLINK3_MK)
+LIBSIDPLAY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsidplay}
-BUILDLINK_PACKAGES+=	libsidplay
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsidplay
-
-.if !empty(LIBSIDPLAY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsidplay+=		libsidplay>=1.36.38
 BUILDLINK_ABI_DEPENDS.libsidplay+=	libsidplay>=1.36.59nb2
 BUILDLINK_PKGSRCDIR.libsidplay?=	../../audio/libsidplay
-.endif	# LIBSIDPLAY_BUILDLINK3_MK
+.endif # LIBSIDPLAY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsidplay
diff --git a/audio/libsidplay2/buildlink3.mk b/audio/libsidplay2/buildlink3.mk
index b4b744de157..8cf787d987b 100644
--- a/audio/libsidplay2/buildlink3.mk
+++ b/audio/libsidplay2/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:23:56 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSIDPLAY2_BUILDLINK3_MK:=	${LIBSIDPLAY2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsidplay2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libsidplay2
-.endif
+.if !defined(LIBSIDPLAY2_BUILDLINK3_MK)
+LIBSIDPLAY2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsidplay2}
-BUILDLINK_PACKAGES+=	libsidplay2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsidplay2
-
-.if !empty(LIBSIDPLAY2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsidplay2+=	libsidplay2>=2.0.9
 BUILDLINK_PKGSRCDIR.libsidplay2?=	../../audio/libsidplay2
-.endif	# LIBSIDPLAY2_BUILDLINK3_MK
+.endif # LIBSIDPLAY2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsidplay2
diff --git a/audio/libsndfile/buildlink3.mk b/audio/libsndfile/buildlink3.mk
index 076b2ff37cd..025ba5d3e15 100644
--- a/audio/libsndfile/buildlink3.mk
+++ b/audio/libsndfile/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/02/21 13:20:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:57 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSNDFILE_BUILDLINK3_MK:=	${LIBSNDFILE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsndfile
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libsndfile
-.endif
+.if !defined(LIBSNDFILE_BUILDLINK3_MK)
+LIBSNDFILE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsndfile}
-BUILDLINK_PACKAGES+=	libsndfile
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsndfile
-
-.if !empty(LIBSNDFILE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsndfile+=	libsndfile>=1.0.0
 BUILDLINK_ABI_DEPENDS.libsndfile+=	libsndfile>=1.0.18
 BUILDLINK_PKGSRCDIR.libsndfile?=	../../audio/libsndfile
-.endif	# LIBSNDFILE_BUILDLINK3_MK
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
+.endif # LIBSNDFILE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsndfile
diff --git a/audio/libspiff/buildlink3.mk b/audio/libspiff/buildlink3.mk
index fc7a4937772..84d879a6e33 100644
--- a/audio/libspiff/buildlink3.mk
+++ b/audio/libspiff/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/10/31 22:36:28 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:57 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSPIFF_BUILDLINK3_MK:=	${LIBSPIFF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libspiff
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libspiff
-.endif
+.if !defined(LIBSPIFF_BUILDLINK3_MK)
+LIBSPIFF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibspiff}
-BUILDLINK_PACKAGES+=	libspiff
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspiff
-
-.if ${LIBSPIFF_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libspiff+=	libspiff>=1.0.0
 BUILDLINK_PKGSRCDIR.libspiff?=	../../audio/libspiff
-.endif	# LIBSPIFF_BUILDLINK3_MK
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/uriparser/buildlink3.mk"
+.endif # LIBSPIFF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libspiff
diff --git a/audio/libtunepimp/buildlink3.mk b/audio/libtunepimp/buildlink3.mk
index fee84df6438..6aea6842240 100644
--- a/audio/libtunepimp/buildlink3.mk
+++ b/audio/libtunepimp/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.9 2008/01/18 05:06:20 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:57 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBTUNEPIMP_BUILDLINK3_MK:=	${LIBTUNEPIMP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtunepimp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libtunepimp
-.endif
+.if !defined(LIBTUNEPIMP_BUILDLINK3_MK)
+LIBTUNEPIMP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtunepimp}
-BUILDLINK_PACKAGES+=	libtunepimp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtunepimp
-
-.if ${LIBTUNEPIMP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libtunepimp+=	libtunepimp>=0.5.0
 BUILDLINK_ABI_DEPENDS.libtunepimp?=	libtunepimp>=0.5.3nb4
 BUILDLINK_PKGSRCDIR.libtunepimp?=	../../audio/libtunepimp
-.endif	# LIBTUNEPIMP_BUILDLINK3_MK
 
 .include "../../audio/musicbrainz/buildlink3.mk"
 .include "../../audio/libofa/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.endif # LIBTUNEPIMP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtunepimp
diff --git a/audio/libvisual/buildlink3.mk b/audio/libvisual/buildlink3.mk
index e01f038bf09..602079a9d3b 100644
--- a/audio/libvisual/buildlink3.mk
+++ b/audio/libvisual/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/12/29 16:11:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:57 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBVISUAL_BUILDLINK3_MK:=	${LIBVISUAL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libvisual
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libvisual
-.endif
+.if !defined(LIBVISUAL_BUILDLINK3_MK)
+LIBVISUAL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvisual}
-BUILDLINK_PACKAGES+=	libvisual
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvisual
-
-.if !empty(LIBVISUAL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libvisual+=	libvisual>=0.4.0
 BUILDLINK_PKGSRCDIR.libvisual?=		../../audio/libvisual
-.endif	# LIBVISUAL_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # LIBVISUAL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libvisual
diff --git a/audio/libvisual0.2/buildlink3.mk b/audio/libvisual0.2/buildlink3.mk
index c172676b10e..a204ffca4b4 100644
--- a/audio/libvisual0.2/buildlink3.mk
+++ b/audio/libvisual0.2/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:57 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBVISUAL0.2_BUILDLINK3_MK:=	${LIBVISUAL0.2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libvisual0.2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libvisual0.2
-.endif
+.if !defined(LIBVISUAL0.2_BUILDLINK3_MK)
+LIBVISUAL0.2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvisual0.2}
-BUILDLINK_PACKAGES+=	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
 BUILDLINK_PKGSRCDIR.libvisual0.2?=	../../audio/libvisual0.2
-.endif	# LIBVISUAL0.2_BUILDLINK3_MK
+.endif # LIBVISUAL0.2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libvisual0.2
diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk
index 80f9836c473..3430e9d13e7 100644
--- a/audio/libvorbis/buildlink3.mk
+++ b/audio/libvorbis/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:57 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBVORBIS_BUILDLINK3_MK:=	${LIBVORBIS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libvorbis
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libvorbis
-.endif
+.if !defined(LIBVORBIS_BUILDLINK3_MK)
+LIBVORBIS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvorbis}
-BUILDLINK_PACKAGES+=	libvorbis
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvorbis
-
-.if !empty(LIBVORBIS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libvorbis+=	libvorbis>=1.0.1
 BUILDLINK_ABI_DEPENDS.libvorbis+=	libvorbis>=1.1.0nb1
 BUILDLINK_PKGSRCDIR.libvorbis?=	../../audio/libvorbis
-.endif	# LIBVORBIS_BUILDLINK3_MK
 
 .include "../../multimedia/libogg/buildlink3.mk"
+.endif # LIBVORBIS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libvorbis
diff --git a/audio/mac/buildlink3.mk b/audio/mac/buildlink3.mk
index e05e481e315..039beb6102e 100644
--- a/audio/mac/buildlink3.mk
+++ b/audio/mac/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/02/09 21:20:01 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:57 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MAC_BUILDLINK3_MK:=	${MAC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mac
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	mac
-.endif
+.if !defined(MAC_BUILDLINK3_MK)
+MAC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmac}
-BUILDLINK_PACKAGES+=	mac
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mac
-
-.if ${MAC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mac+=	mac>=3.99u4b5
 BUILDLINK_PKGSRCDIR.mac?=	../../audio/mac
-.endif	# MAC_BUILDLINK3_MK
+.endif # MAC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mac
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
index b45c617f7cb..7be5641d894 100644
--- a/audio/musicbrainz/buildlink3.mk
+++ b/audio/musicbrainz/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:23:58 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MUSICBRAINZ_BUILDLINK3_MK:=	${MUSICBRAINZ_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	musicbrainz
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	musicbrainz
-.endif
+.if !defined(MUSICBRAINZ_BUILDLINK3_MK)
+MUSICBRAINZ_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmusicbrainz}
-BUILDLINK_PACKAGES+=	musicbrainz
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}musicbrainz
-
-.if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.musicbrainz+=		musicbrainz>=2.0.2
 BUILDLINK_ABI_DEPENDS.musicbrainz+=	musicbrainz>=2.1.2nb2
 BUILDLINK_PKGSRCDIR.musicbrainz?=	../../audio/musicbrainz
-.endif	# MUSICBRAINZ_BUILDLINK3_MK
 
 .include "../../textproc/expat/buildlink3.mk"
+.endif # MUSICBRAINZ_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-musicbrainz
diff --git a/audio/nas/buildlink3.mk b/audio/nas/buildlink3.mk
index 75533db0d59..0a529b49841 100644
--- a/audio/nas/buildlink3.mk
+++ b/audio/nas/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/12 17:21:52 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:58 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NAS_BUILDLINK3_MK:=	${NAS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	nas
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	nas
-.endif
+.if !defined(NAS_BUILDLINK3_MK)
+NAS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnas}
-BUILDLINK_PACKAGES+=	nas
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nas
-
-.if !empty(NAS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.nas+=	nas>=1.4.2
 BUILDLINK_ABI_DEPENDS.nas+=	nas>=1.7bnb2
 BUILDLINK_PKGSRCDIR.nas?=	../../audio/nas
-.endif	# NAS_BUILDLINK3_MK
+.endif # NAS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-nas
diff --git a/audio/openal/buildlink3.mk b/audio/openal/buildlink3.mk
index 7544145a4c5..bfd43de5a60 100644
--- a/audio/openal/buildlink3.mk
+++ b/audio/openal/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/01/03 07:03:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:58 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENAL_BUILDLINK3_MK:=	${OPENAL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openal
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openal
-.endif
+.if !defined(OPENAL_BUILDLINK3_MK)
+OPENAL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenal}
-BUILDLINK_PACKAGES+=	openal
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openal
-
-.if !empty(OPENAL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openal+=	openal>=0.0.8
 BUILDLINK_PKGSRCDIR.openal?=	../../audio/openal
-.endif	# OPENAL_BUILDLINK3_MK
+.endif # OPENAL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openal
diff --git a/audio/portaudio-devel/buildlink3.mk b/audio/portaudio-devel/buildlink3.mk
index 3f022c50421..a22d05422ca 100644
--- a/audio/portaudio-devel/buildlink3.mk
+++ b/audio/portaudio-devel/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:58 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PORTAUDIO_DEVEL_BUILDLINK3_MK:=	${PORTAUDIO_DEVEL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	portaudio-devel
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	portaudio-devel
-.endif
+.if !defined(PORTAUDIO_DEVEL_BUILDLINK3_MK)
+PORTAUDIO_DEVEL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nportaudio-devel}
-BUILDLINK_PACKAGES+=	portaudio-devel
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}portaudio-devel
-
-.if ${PORTAUDIO_DEVEL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.portaudio-devel+=	portaudio-devel>=20060521
 BUILDLINK_PKGSRCDIR.portaudio-devel?=	../../audio/portaudio-devel
 BUILDLINK_INCDIRS.portaudio-devel?=	include/portaudio2
 BUILDLINK_LIBDIRS.portaudio-devel?=	lib/portaudio2
 BUILDLINK_CPPFLAGS.portaudio-devel?=	-I${BUILDLINK_PREFIX.portaudio-devel}/include/portaudio2
-.endif	# PORTAUDIO_DEVEL_BUILDLINK3_MK
+.endif # PORTAUDIO_DEVEL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-portaudio-devel
diff --git a/audio/portaudio/buildlink3.mk b/audio/portaudio/buildlink3.mk
index 5cba1b3d5ce..bcaa900b434 100644
--- a/audio/portaudio/buildlink3.mk
+++ b/audio/portaudio/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:58 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PORTAUDIO_BUILDLINK3_MK:=	${PORTAUDIO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	portaudio
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	portaudio
-.endif
+.if !defined(PORTAUDIO_BUILDLINK3_MK)
+PORTAUDIO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nportaudio}
-BUILDLINK_PACKAGES+=	portaudio
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}portaudio
-
-.if !empty(PORTAUDIO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.portaudio+=	portaudio>=18.1
 BUILDLINK_ABI_DEPENDS.portaudio?=	portaudio>=18.1nb2
 BUILDLINK_PKGSRCDIR.portaudio?=	../../audio/portaudio
-.endif	# PORTAUDIO_BUILDLINK3_MK
+.endif # PORTAUDIO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-portaudio
diff --git a/audio/pulseaudio/buildlink3.mk b/audio/pulseaudio/buildlink3.mk
index 4ad9fd2620d..c171b7457d3 100644
--- a/audio/pulseaudio/buildlink3.mk
+++ b/audio/pulseaudio/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/01/03 19:34:02 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:58 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PULSEAUDIO_BUILDLINK3_MK:=	${PULSEAUDIO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pulseaudio
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	pulseaudio
-.endif
+.if !defined(PULSEAUDIO_BUILDLINK3_MK)
+PULSEAUDIO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npulseaudio}
-BUILDLINK_PACKAGES+=	pulseaudio
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pulseaudio
-
-.if ${PULSEAUDIO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.pulseaudio+=	pulseaudio>=0.9.13
 BUILDLINK_PKGSRCDIR.pulseaudio?=	../../audio/pulseaudio
-.endif	# PULSEAUDIO_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.endif # PULSEAUDIO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pulseaudio
diff --git a/audio/py-mpd/buildlink3.mk b/audio/py-mpd/buildlink3.mk
index bf4fa38693a..5893655139c 100644
--- a/audio/py-mpd/buildlink3.mk
+++ b/audio/py-mpd/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:58 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_MPD_BUILDLINK3_MK:=	${PY_MPD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-mpd
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-mpd
-.endif
+.if !defined(PY_MPD_BUILDLINK3_MK)
+PY_MPD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-mpd}
-BUILDLINK_PACKAGES+=	py-mpd
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-mpd
-
-.if ${PY_MPD_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-mpd+=	${PYPKGPREFIX}-mpd>=0.2.0
 BUILDLINK_PKGSRCDIR.py-mpd?=	../../audio/py-mpd
-.endif	# PY_MPD_BUILDLINK3_MK
+.endif # PY_MPD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-mpd
diff --git a/audio/py-mutagen/buildlink3.mk b/audio/py-mutagen/buildlink3.mk
index 7ef36ed4fe4..986b0442b81 100644
--- a/audio/py-mutagen/buildlink3.mk
+++ b/audio/py-mutagen/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 17:30:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:58 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_MUTAGEN_BUILDLINK3_MK:=	${PY_MUTAGEN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-mutagen
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-mutagen
-.endif
+.if !defined(PY_MUTAGEN_BUILDLINK3_MK)
+PY_MUTAGEN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-mutagen}
-BUILDLINK_PACKAGES+=	py-mutagen
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-mutagen
-
-.if ${PY_MUTAGEN_BUILDLINK3_MK} == "+"
 .  include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-mutagen+=	${PYPKGPREFIX}-mutagen>=1.9
 BUILDLINK_PKGSRCDIR.py-mutagen?=	../../audio/py-mutagen
-.endif	# PY_MUTAGEN_BUILDLINK3_MK
+.endif # PY_MUTAGEN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-mutagen
diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk
index 110603cc383..afa969149a1 100644
--- a/audio/py-ogg/buildlink3.mk
+++ b/audio/py-ogg/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 17:30:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:23:58 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PYOGG_BUILDLINK3_MK:=	${PYOGG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pyogg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pyogg
-.endif
+.if !defined(PYOGG_BUILDLINK3_MK)
+PYOGG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyogg}
-BUILDLINK_PACKAGES+=	pyogg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyogg
-
-.if !empty(PYOGG_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyogg+=	${PYPKGPREFIX}-ogg>=1.3
 BUILDLINK_ABI_DEPENDS.pyogg?=	${PYPKGPREFIX}-ogg>=1.3nb2
 BUILDLINK_PKGSRCDIR.pyogg?=	../../audio/py-ogg
-.endif	# PYOGG_BUILDLINK3_MK
 
 .include "../../multimedia/libogg/buildlink3.mk"
+.endif # PYOGG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pyogg
diff --git a/audio/rplay/buildlink3.mk b/audio/rplay/buildlink3.mk
index dc915123f8e..3a3732c838e 100644
--- a/audio/rplay/buildlink3.mk
+++ b/audio/rplay/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/02/03 06:11:12 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:59 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-RPLAY_BUILDLINK3_MK:=	${RPLAY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	rplay
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	rplay
-.endif
+.if !defined(RPLAY_BUILDLINK3_MK)
+RPLAY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrplay}
-BUILDLINK_PACKAGES+=	rplay
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rplay
-
-.if !empty(RPLAY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rplay+=	rplay>=3.3.2nb1
 BUILDLINK_ABI_DEPENDS.rplay+=	rplay>=3.3.2nb5
 BUILDLINK_PKGSRCDIR.rplay?=	../../audio/rplay
-.endif	# RPLAY_BUILDLINK3_MK
 
 .include "../../audio/gsm/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/rx/buildlink3.mk"
+.endif # RPLAY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-rplay
diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk
index 4d86d272087..2047dd930e8 100644
--- a/audio/speex/buildlink3.mk
+++ b/audio/speex/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/11/08 21:06:46 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:23:59 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SPEEX_BUILDLINK3_MK:=	${SPEEX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	speex
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	speex
-.endif
+.if !defined(SPEEX_BUILDLINK3_MK)
+SPEEX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspeex}
-BUILDLINK_PACKAGES+=	speex
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}speex
-
-.if !empty(SPEEX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.speex+=	speex>=1.2rc1
 BUILDLINK_PKGSRCDIR.speex?=	../../audio/speex
-.endif	# SPEEX_BUILDLINK3_MK
 
 .include "../../multimedia/libogg/buildlink3.mk"
+.endif # SPEEX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-speex
diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk
index bd9fa79fd77..1f300b383f5 100644
--- a/audio/streamtuner/buildlink3.mk
+++ b/audio/streamtuner/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:06:21 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:59 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-STREAMTUNER_BUILDLINK3_MK:=	${STREAMTUNER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	streamtuner
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	streamtuner
-.endif
+.if !defined(STREAMTUNER_BUILDLINK3_MK)
+STREAMTUNER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nstreamtuner}
-BUILDLINK_PACKAGES+=	streamtuner
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}streamtuner
-
-.if !empty(STREAMTUNER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.streamtuner+=		streamtuner>=0.99
 BUILDLINK_ABI_DEPENDS.streamtuner?=	streamtuner>=0.99.99nb7
 BUILDLINK_PKGSRCDIR.streamtuner?=	../../audio/streamtuner
-.endif	# STREAMTUNER_BUILDLINK3_MK
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # STREAMTUNER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-streamtuner
diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk
index 87b97587176..18f2aab5db4 100644
--- a/audio/sweep/buildlink3.mk
+++ b/audio/sweep/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/11/08 21:13:27 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:59 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SWEEP_BUILDLINK3_MK:=	${SWEEP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sweep
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sweep
-.endif
+.if !defined(SWEEP_BUILDLINK3_MK)
+SWEEP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsweep}
-BUILDLINK_PACKAGES+=	sweep
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sweep
-
-.if !empty(SWEEP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sweep+=	sweep>=0.8.2nb6
 BUILDLINK_ABI_DEPENDS.sweep+=	sweep>=0.9.3nb1
 BUILDLINK_PKGSRCDIR.sweep?=	../../audio/sweep
-.endif	# SWEEP_BUILDLINK3_MK
 
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
@@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.sweep?=	../../audio/sweep
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # SWEEP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sweep
diff --git a/audio/taglib/buildlink3.mk b/audio/taglib/buildlink3.mk
index 9f9231dca59..1fdba870748 100644
--- a/audio/taglib/buildlink3.mk
+++ b/audio/taglib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:59 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TAGLIB_BUILDLINK3_MK:=	${TAGLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	taglib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	taglib
-.endif
+.if !defined(TAGLIB_BUILDLINK3_MK)
+TAGLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntaglib}
-BUILDLINK_PACKAGES+=	taglib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}taglib
-
-.if !empty(TAGLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.0
 BUILDLINK_ABI_DEPENDS.taglib+=	taglib>=1.3
 BUILDLINK_PKGSRCDIR.taglib?=	../../audio/taglib
-.endif	# TAGLIB_BUILDLINK3_MK
+.endif # TAGLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-taglib
diff --git a/audio/tremor/buildlink3.mk b/audio/tremor/buildlink3.mk
index dbd49bb8143..84c19214874 100644
--- a/audio/tremor/buildlink3.mk
+++ b/audio/tremor/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:59 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TREMOR_BUILDLINK3_MK:=	${TREMOR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tremor
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tremor
-.endif
+.if !defined(TREMOR_BUILDLINK3_MK)
+TREMOR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntremor}
-BUILDLINK_PACKAGES+=	tremor
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tremor
-
-.if !empty(TREMOR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tremor+=	tremor>=1.0.2
 BUILDLINK_ABI_DEPENDS.tremor+=	tremor>=1.0.2nb5
 BUILDLINK_PKGSRCDIR.tremor?=	../../audio/tremor
-.endif	# TREMOR_BUILDLINK3_MK
+.endif # TREMOR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tremor
diff --git a/audio/twolame/buildlink3.mk b/audio/twolame/buildlink3.mk
index fb16554aa06..4cbae6fb336 100644
--- a/audio/twolame/buildlink3.mk
+++ b/audio/twolame/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.4 2007/01/07 12:25:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:23:59 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TWOLAME_BUILDLINK3_MK:=	${TWOLAME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	twolame
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	twolame
-.endif
+.if !defined(TWOLAME_BUILDLINK3_MK)
+TWOLAME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntwolame}
-BUILDLINK_PACKAGES+=	twolame
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}twolame
-
-.if ${TWOLAME_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.twolame+=	twolame>=0.3.7
 BUILDLINK_ABI_DEPENDS.twolame?=	twolame>=0.3.7nb1
 BUILDLINK_PKGSRCDIR.twolame?=	../../audio/twolame
-.endif	# TWOLAME_BUILDLINK3_MK
 
 .include "../../audio/libsndfile/buildlink3.mk"
+.endif # TWOLAME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-twolame
diff --git a/audio/wavpack/buildlink3.mk b/audio/wavpack/buildlink3.mk
index ba66fc9f78e..ba76f99ba0d 100644
--- a/audio/wavpack/buildlink3.mk
+++ b/audio/wavpack/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/05/09 23:43:05 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:59 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WAVPACK_BUILDLINK3_MK:=	${WAVPACK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	wavpack
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	wavpack
-.endif
+.if !defined(WAVPACK_BUILDLINK3_MK)
+WAVPACK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwavpack}
-BUILDLINK_PACKAGES+=	wavpack
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wavpack
-
-.if ${WAVPACK_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.wavpack+=	wavpack>=4.41.0
 BUILDLINK_PKGSRCDIR.wavpack?=	../../audio/wavpack
-.endif	# WAVPACK_BUILDLINK3_MK
+.endif # WAVPACK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-wavpack
diff --git a/audio/wsoundserver/buildlink3.mk b/audio/wsoundserver/buildlink3.mk
index 436dae90b8b..d2243962e7a 100644
--- a/audio/wsoundserver/buildlink3.mk
+++ b/audio/wsoundserver/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:59 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-WSOUNDSERVER_BUILDLINK3_MK:=	${WSOUNDSERVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	wsoundserver
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	wsoundserver
-.endif
+.if !defined(WSOUNDSERVER_BUILDLINK3_MK)
+WSOUNDSERVER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwsoundserver}
-BUILDLINK_PACKAGES+=	wsoundserver
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wsoundserver
-
-.if !empty(WSOUNDSERVER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb4
 BUILDLINK_ABI_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb8
 BUILDLINK_PKGSRCDIR.wsoundserver?=	../../audio/wsoundserver
-.endif	# WSOUNDSERVER_BUILDLINK3_MK
 
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../devel/libdockapp/buildlink3.mk"
 .include "../../devel/libproplist/buildlink3.mk"
 .include "../../wm/windowmaker/buildlink3.mk"
+.endif # WSOUNDSERVER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-wsoundserver
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index 5506bce7cce..e7713b39ec9 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.22 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:23:59 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_MIXER_BUILDLINK3_MK:=	${XFCE4_MIXER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-mixer
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-mixer
-.endif
+.if !defined(XFCE4_MIXER_BUILDLINK3_MK)
+XFCE4_MIXER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mixer}
-BUILDLINK_PACKAGES+=	xfce4-mixer
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mixer
-
-.if ${XFCE4_MIXER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-mixer?=	../../audio/xfce4-mixer
-.endif	# XFCE4_MIXER_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_MIXER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-mixer
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
index 935d2c5f373..6e73f3052a5 100644
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/10/30 08:15:18 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:00 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:=	${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-xmms-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-xmms-plugin
-.endif
+.if !defined(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK)
+XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-xmms-plugin}
-BUILDLINK_PACKAGES+=	xfce4-xmms-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xmms-plugin
-
-.if ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.5.1
 BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?=	../../audio/xfce4-xmms-plugin
-.endif	# XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-xmms-plugin
diff --git a/audio/xmms-meta-input/buildlink3.mk b/audio/xmms-meta-input/buildlink3.mk
index 3128cecd78e..eff8bd8cef4 100644
--- a/audio/xmms-meta-input/buildlink3.mk
+++ b/audio/xmms-meta-input/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:00 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XMMS_META_INPUT_BUILDLINK3_MK:=	${XMMS_META_INPUT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xmms-meta-input
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xmms-meta-input
-.endif
+.if !defined(XMMS_META_INPUT_BUILDLINK3_MK)
+XMMS_META_INPUT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxmms-meta-input}
-BUILDLINK_PACKAGES+=	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
 BUILDLINK_ABI_DEPENDS.xmms-meta-input?=	xmms-meta-input>=0.4nb2
 BUILDLINK_PKGSRCDIR.xmms-meta-input?=	../../audio/xmms-meta-input
-.endif	# XMMS_META_INPUT_BUILDLINK3_MK
 
 .include "../../audio/xmms/buildlink3.mk"
+.endif # XMMS_META_INPUT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xmms-meta-input
diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk
index 1179f05cc39..e8f7c16dd73 100644
--- a/audio/xmms/buildlink3.mk
+++ b/audio/xmms/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/16 23:03:20 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:00 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XMMS_BUILDLINK3_MK:=	${XMMS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xmms
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xmms
-.endif
+.if !defined(XMMS_BUILDLINK3_MK)
+XMMS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxmms}
-BUILDLINK_PACKAGES+=	xmms
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmms
-
-.if !empty(XMMS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xmms+=	xmms>=1.2.7nb10
 BUILDLINK_ABI_DEPENDS.xmms?=	xmms>=1.2.10nb6
 BUILDLINK_PKGSRCDIR.xmms?=	../../audio/xmms
-.endif	# XMMS_BUILDLINK3_MK
 
 PTHREAD_OPTS+=	require
 
@@ -26,5 +18,6 @@ PTHREAD_OPTS+=	require
 .include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
+.endif # XMMS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xmms