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.

47 files changed, 282 insertions, 613 deletions

diff --git a/multimedia/bsdav/buildlink3.mk b/multimedia/bsdav/buildlink3.mk
index d5627f277d4..3752a7d2d70 100644
--- a/multimedia/bsdav/buildlink3.mk
+++ b/multimedia/bsdav/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/30 19:21:08 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BSDAV_BUILDLINK3_MK:=	${BSDAV_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	bsdav
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	bsdav
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbsdav}
-BUILDLINK_PACKAGES+=	bsdav
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bsdav
+.if !defined(BSDAV_BUILDLINK3_MK)
+BSDAV_BUILDLINK3_MK:=
 
-.if ${BSDAV_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.bsdav+=	bsdav>=1.4
 BUILDLINK_PKGSRCDIR.bsdav?=	../../multimedia/bsdav
 BUILDLINK_LDADD.bsdav=		-lbsdav
@@ -20,10 +13,10 @@ LIBBSDAV?= ${BUILDLINK_LDADD.bsdav}
 
 pkgbase := bsdav
 .  include "../../mk/pkg-build-options.mk"
-.endif	# BSDAV_BUILDLINK3_MK
 
 .if !empty(PKG_BUILD_OPTIONS.bsdav:Mx11)
 .  include "../../x11/libXv/buildlink3.mk"
 .endif
+.endif # BSDAV_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-bsdav
diff --git a/multimedia/clutter-gst/buildlink3.mk b/multimedia/clutter-gst/buildlink3.mk
index 6f6870ef7c7..6ddfeaac176 100644
--- a/multimedia/clutter-gst/buildlink3.mk
+++ b/multimedia/clutter-gst/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/14 11:10:01 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CLUTTER_GST_BUILDLINK3_MK:=	${CLUTTER_GST_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	clutter-gst
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	clutter-gst
-.endif
+.if !defined(CLUTTER_GST_BUILDLINK3_MK)
+CLUTTER_GST_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclutter-gst}
-BUILDLINK_PACKAGES+=	clutter-gst
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clutter-gst
-
-.if ${CLUTTER_GST_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.clutter-gst+=	clutter-gst>=0.8.0
 BUILDLINK_PKGSRCDIR.clutter-gst?=	../../multimedia/clutter-gst
-.endif	# CLUTTER_GST_BUILDLINK3_MK
 
 .include "../../graphics/clutter/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.endif # CLUTTER_GST_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-clutter-gst
diff --git a/multimedia/dirac/buildlink3.mk b/multimedia/dirac/buildlink3.mk
index bef1733237c..880645ecc1f 100644
--- a/multimedia/dirac/buildlink3.mk
+++ b/multimedia/dirac/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:02 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DIRAC_BUILDLINK3_MK:=	${DIRAC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	dirac
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	dirac
-.endif
+.if !defined(DIRAC_BUILDLINK3_MK)
+DIRAC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndirac}
-BUILDLINK_PACKAGES+=	dirac
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dirac
-
-.if !empty(DIRAC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dirac+=	dirac>=0.2.0
 BUILDLINK_PKGSRCDIR.dirac?=	../../multimedia/dirac
 BUILDLINK_DEPMETHOD.dirac?=	build
-.endif	# DIRAC_BUILDLINK3_MK
-
+.endif # DIRAC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-dirac
diff --git a/multimedia/ffmpeg/buildlink3.mk b/multimedia/ffmpeg/buildlink3.mk
index d65e9e4c001..8e106327c32 100644
--- a/multimedia/ffmpeg/buildlink3.mk
+++ b/multimedia/ffmpeg/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/12/18 17:28:16 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:02 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FFMPEG_BUILDLINK3_MK:=	${FFMPEG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ffmpeg
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ffmpeg
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nffmpeg}
-BUILDLINK_PACKAGES+=	ffmpeg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ffmpeg
+.if !defined(FFMPEG_BUILDLINK3_MK)
+FFMPEG_BUILDLINK3_MK:=
 
-.if ${FFMPEG_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=20080727
 BUILDLINK_ABI_DEPENDS.ffmpeg?=	ffmpeg>=20080727nb6
 BUILDLINK_PKGSRCDIR.ffmpeg?=	../../multimedia/ffmpeg
@@ -19,8 +12,6 @@ BUILDLINK_PKGSRCDIR.ffmpeg?=	../../multimedia/ffmpeg
 pkgbase := ffmpeg
 .  include "../../mk/pkg-build-options.mk"
 
-.endif	# FFMPEG_BUILDLINK3_MK
-
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.ffmpeg:Msdl)
@@ -48,5 +39,6 @@ pkgbase := ffmpeg
 .endif
 
 .include "../../devel/libgetopt/buildlink3.mk"
+.endif # FFMPEG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ffmpeg
diff --git a/multimedia/gnome-media/buildlink3.mk b/multimedia/gnome-media/buildlink3.mk
index e26783e0ad9..969f7734cb2 100644
--- a/multimedia/gnome-media/buildlink3.mk
+++ b/multimedia/gnome-media/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/03/06 14:53:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:02 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_MEDIA_BUILDLINK3_MK:=	${GNOME_MEDIA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-media
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-media
-.endif
+.if !defined(GNOME_MEDIA_BUILDLINK3_MK)
+GNOME_MEDIA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-media}
-BUILDLINK_PACKAGES+=	gnome-media
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-media
-
-.if !empty(GNOME_MEDIA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-media+=		gnome-media>=2.12.0nb1
 BUILDLINK_ABI_DEPENDS.gnome-media?=	gnome-media>=2.20.1nb2
 BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome-media
-.endif	# GNOME_MEDIA_BUILDLINK3_MK
 
 .include "../../devel/GConf-ui/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GNOME_MEDIA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-media
diff --git a/multimedia/gpac/buildlink3.mk b/multimedia/gpac/buildlink3.mk
index d402d8bc35f..b13c207410a 100644
--- a/multimedia/gpac/buildlink3.mk
+++ b/multimedia/gpac/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/23 14:54:23 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GPAC_BUILDLINK3_MK:=	${GPAC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gpac
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gpac
-.endif
+.if !defined(GPAC_BUILDLINK3_MK)
+GPAC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngpac}
-BUILDLINK_PACKAGES+=	gpac
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gpac
-
-.if ${GPAC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gpac+=	gpac>=0.4.5
 BUILDLINK_PKGSRCDIR.gpac?=	../../multimedia/gpac
-.endif	# GPAC_BUILDLINK3_MK
+.endif # GPAC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gpac
diff --git a/multimedia/gst-plugins0.10-bad/buildlink3.mk b/multimedia/gst-plugins0.10-bad/buildlink3.mk
index a410345c436..dba6174a859 100644
--- a/multimedia/gst-plugins0.10-bad/buildlink3.mk
+++ b/multimedia/gst-plugins0.10-bad/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:02 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GST_PLUGINS0.10_BAD_BUILDLINK3_MK:=	${GST_PLUGINS0.10_BAD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gst-plugins0.10-bad
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gst-plugins0.10-bad
-.endif
+.if !defined(GST_PLUGINS0.10_BAD_BUILDLINK3_MK)
+GST_PLUGINS0.10_BAD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.10-bad}
-BUILDLINK_PACKAGES+=	gst-plugins0.10-bad
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.10-bad
-
-.if !empty(GST_PLUGINS0.10_BAD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gst-plugins0.10-bad+=	gst-plugins0.10-bad>=0.10.3
 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-bad?=	gst-plugins0.10-bad>=0.10.3
 BUILDLINK_PKGSRCDIR.gst-plugins0.10-bad?= ../../multimedia/gst-plugins0.10-bad
-.endif	# GST_PLUGINS0.10_BAD_BUILDLINK3_MK
 
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.endif # GST_PLUGINS0.10_BAD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gst-plugins0.10-bad
diff --git a/multimedia/gst-plugins0.10-base/buildlink3.mk b/multimedia/gst-plugins0.10-base/buildlink3.mk
index 3e9277f91e3..3efbae37e70 100644
--- a/multimedia/gst-plugins0.10-base/buildlink3.mk
+++ b/multimedia/gst-plugins0.10-base/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:02 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GST_PLUGINS0.10_BASE_BUILDLINK3_MK:=	${GST_PLUGINS0.10_BASE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gst-plugins0.10-base
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gst-plugins0.10-base
-.endif
+.if !defined(GST_PLUGINS0.10_BASE_BUILDLINK3_MK)
+GST_PLUGINS0.10_BASE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.10-base}
-BUILDLINK_PACKAGES+=	gst-plugins0.10-base
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.10-base
-
-.if !empty(GST_PLUGINS0.10_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.1
 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-base?=	gst-plugins0.10-base>=0.10.2nb1
 BUILDLINK_PKGSRCDIR.gst-plugins0.10-base?=	../../multimedia/gst-plugins0.10-base
-.endif	# GST_PLUGINS0.10_BASE_BUILDLINK3_MK
 
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.endif # GST_PLUGINS0.10_BASE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gst-plugins0.10-base
diff --git a/multimedia/gst-plugins0.10-gnonlin/buildlink3.mk b/multimedia/gst-plugins0.10-gnonlin/buildlink3.mk
index 10ea9712dad..35c08ce6344 100644
--- a/multimedia/gst-plugins0.10-gnonlin/buildlink3.mk
+++ b/multimedia/gst-plugins0.10-gnonlin/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/08 21:42:26 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GST_GNONLIN_BUILDLINK3_MK:=	${GST_GNONLIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gst-gnonlin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gst-gnonlin
-.endif
+.if !defined(GST_GNONLIN_BUILDLINK3_MK)
+GST_GNONLIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-gnonlin}
-BUILDLINK_PACKAGES+=	gst-gnonlin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-gnonlin
-
-.if ${GST_GNONLIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gst-gnonlin+=	gst-gnonlin>=0.10.6
 BUILDLINK_PKGSRCDIR.gst-gnonlin?=	../../multimedia/gst-plugins0.10-gnonlin
-.endif	# GST_GNONLIN_BUILDLINK3_MK
+.endif # GST_GNONLIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gst-gnonlin
diff --git a/multimedia/gst-plugins0.10-good/buildlink3.mk b/multimedia/gst-plugins0.10-good/buildlink3.mk
index 5172a4c7cec..8d882f7c473 100644
--- a/multimedia/gst-plugins0.10-good/buildlink3.mk
+++ b/multimedia/gst-plugins0.10-good/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:02 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:=	${GST_PLUGINS0.10_GOOD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gst-plugins0.10-good
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gst-plugins0.10-good
-.endif
+.if !defined(GST_PLUGINS0.10_GOOD_BUILDLINK3_MK)
+GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.10-good}
-BUILDLINK_PACKAGES+=	gst-plugins0.10-good
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.10-good
-
-.if !empty(GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gst-plugins0.10-good+=	gst-plugins0.10-good>=0.10.1
 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-good?=	gst-plugins0.10-good>=0.10.1nb1
 BUILDLINK_PKGSRCDIR.gst-plugins0.10-good?=	../../multimedia/gst-plugins0.10-good
-.endif	# GST_PLUGINS0.10_GOOD_BUILDLINK3_MK
 
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.endif # GST_PLUGINS0.10_GOOD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gst-plugins0.10-good
diff --git a/multimedia/gst-plugins0.10-ugly/buildlink3.mk b/multimedia/gst-plugins0.10-ugly/buildlink3.mk
index 53581113e29..e12759c4d1e 100644
--- a/multimedia/gst-plugins0.10-ugly/buildlink3.mk
+++ b/multimedia/gst-plugins0.10-ugly/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:03 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GST_PLUGINS0.10_UGLY_BUILDLINK3_MK:=	${GST_PLUGINS0.10_UGLY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gst-plugins0.10-ugly
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gst-plugins0.10-ugly
-.endif
+.if !defined(GST_PLUGINS0.10_UGLY_BUILDLINK3_MK)
+GST_PLUGINS0.10_UGLY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.10-ugly}
-BUILDLINK_PACKAGES+=	gst-plugins0.10-ugly
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.10-ugly
-
-.if !empty(GST_PLUGINS0.10_UGLY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gst-plugins0.10-ugly+=	gst-plugins0.10-ugly>=0.10.3
 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-ugly?=	gst-plugins0.10-ugly>=0.10.3
 BUILDLINK_PKGSRCDIR.gst-plugins0.10-ugly?=	../../multimedia/gst-plugins0.10-ugly
-.endif	# GST_PLUGINS0.10_UGLY_BUILDLINK3_MK
 
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.endif # GST_PLUGINS0.10_UGLY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gst-plugins0.10-ugly
diff --git a/multimedia/gstreamer0.10/buildlink3.mk b/multimedia/gstreamer0.10/buildlink3.mk
index e9a9d36eb3e..daa241bac45 100644
--- a/multimedia/gstreamer0.10/buildlink3.mk
+++ b/multimedia/gstreamer0.10/buildlink3.mk
@@ -1,24 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/05/31 08:34:52 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:03 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GSTREAMER0.10_BUILDLINK3_MK:=	${GSTREAMER0.10_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gstreamer0.10
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gstreamer0.10
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngstreamer0.10}
-BUILDLINK_PACKAGES+=	gstreamer0.10
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gstreamer0.10
+.if !defined(GSTREAMER0.10_BUILDLINK3_MK)
+GSTREAMER0.10_BUILDLINK3_MK:=
 
-.if !empty(GSTREAMER0.10_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gstreamer0.10+=	gstreamer0.10>=0.10.1
 BUILDLINK_ABI_DEPENDS.gstreamer0.10?=	gstreamer0.10>=0.10.2nb1
 BUILDLINK_PKGSRCDIR.gstreamer0.10?=	../../multimedia/gstreamer0.10
 
 PRINT_PLIST_AWK+=	/^@dirrm (include|lib)\/gstreamer-0.10(\/gst)?$$/ \
 			    { print "@comment in gstreamer0.10: " $$0; next; }
-.endif	# GSTREAMER0.10_BUILDLINK3_MK
 
 pkgbase := gstreamer0.10
 .include "../../mk/pkg-build-options.mk"
@@ -29,5 +21,6 @@ pkgbase := gstreamer0.10
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # GSTREAMER0.10_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gstreamer0.10
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
index c34822c8d4e..8d33ef30057 100644
--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.25 2008/01/18 05:08:38 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:25:03 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-KDEMULTIMEDIA_BUILDLINK3_MK:=	${KDEMULTIMEDIA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kdemultimedia
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	kdemultimedia
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdemultimedia}
-BUILDLINK_PACKAGES+=	kdemultimedia
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdemultimedia
+.if !defined(KDEMULTIMEDIA_BUILDLINK3_MK)
+KDEMULTIMEDIA_BUILDLINK3_MK:=
 
-.if !empty(KDEMULTIMEDIA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdemultimedia+=	kdemultimedia>=3.5.0nb2
 BUILDLINK_ABI_DEPENDS.kdemultimedia?=	kdemultimedia>=3.5.8nb3
 BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
-.endif	# KDEMULTIMEDIA_BUILDLINK3_MK
 
 .include "../../audio/arts/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
@@ -28,5 +20,6 @@ BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
+.endif # KDEMULTIMEDIA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kdemultimedia
diff --git a/multimedia/libassetml/buildlink3.mk b/multimedia/libassetml/buildlink3.mk
index 3cc771e946f..30519f32e69 100644
--- a/multimedia/libassetml/buildlink3.mk
+++ b/multimedia/libassetml/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:03 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBASSETML_BUILDLINK3_MK:=	${LIBASSETML_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libassetml
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libassetml
-.endif
+.if !defined(LIBASSETML_BUILDLINK3_MK)
+LIBASSETML_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibassetml}
-BUILDLINK_PACKAGES+=	libassetml
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libassetml
-
-.if !empty(LIBASSETML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libassetml+=	libassetml>=1.2.1
 BUILDLINK_ABI_DEPENDS.libassetml?=	libassetml>=1.2.1nb1
 BUILDLINK_PKGSRCDIR.libassetml?=	../../multimedia/libassetml
-.endif	# LIBASSETML_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBASSETML_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libassetml
diff --git a/multimedia/libdv/buildlink3.mk b/multimedia/libdv/buildlink3.mk
index 7cdc76ab588..fb876d3a429 100644
--- a/multimedia/libdv/buildlink3.mk
+++ b/multimedia/libdv/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:03 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBDV_BUILDLINK3_MK:=	${LIBDV_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdv
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdv
-.endif
+.if !defined(LIBDV_BUILDLINK3_MK)
+LIBDV_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdv}
-BUILDLINK_PACKAGES+=	libdv
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdv
-
-.if !empty(LIBDV_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdv+=	libdv>=0.102
 BUILDLINK_ABI_DEPENDS.libdv+=	libdv>=0.104nb2
 BUILDLINK_PKGSRCDIR.libdv?=	../../multimedia/libdv
-.endif	# LIBDV_BUILDLINK3_MK
+.endif # LIBDV_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdv
diff --git a/multimedia/libdvbpsi/buildlink3.mk b/multimedia/libdvbpsi/buildlink3.mk
index fa05515f018..8b275ee2faa 100644
--- a/multimedia/libdvbpsi/buildlink3.mk
+++ b/multimedia/libdvbpsi/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/02/27 22:38:16 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:03 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDVBPSI_BUILDLINK3_MK:=	${LIBDVBPSI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdvbpsi
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdvbpsi
-.endif
+.if !defined(LIBDVBPSI_BUILDLINK3_MK)
+LIBDVBPSI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvbpsi}
-BUILDLINK_PACKAGES+=	libdvbpsi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvbpsi
-
-.if !empty(LIBDVBPSI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdvbpsi+=	libdvbpsi>=0.1.3
 BUILDLINK_ABI_DEPENDS.libdvbpsi+=	libdvbpsi>=0.1.6
 BUILDLINK_PKGSRCDIR.libdvbpsi?=	../../multimedia/libdvbpsi
-.endif	# LIBDVBPSI_BUILDLINK3_MK
+.endif # LIBDVBPSI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdvbpsi
diff --git a/multimedia/libdvdcss/buildlink3.mk b/multimedia/libdvdcss/buildlink3.mk
index 548a5198bcf..4416e93ff09 100644
--- a/multimedia/libdvdcss/buildlink3.mk
+++ b/multimedia/libdvdcss/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:03 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDVDCSS_BUILDLINK3_MK:=	${LIBDVDCSS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdvdcss
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdvdcss
-.endif
+.if !defined(LIBDVDCSS_BUILDLINK3_MK)
+LIBDVDCSS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdcss}
-BUILDLINK_PACKAGES+=	libdvdcss
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvdcss
-
-.if !empty(LIBDVDCSS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdvdcss+=	libdvdcss>=1.2.4
 BUILDLINK_ABI_DEPENDS.libdvdcss+=	libdvdcss>=1.2.8nb1
 BUILDLINK_PKGSRCDIR.libdvdcss?=	../../multimedia/libdvdcss
-.endif	# LIBDVDCSS_BUILDLINK3_MK
+.endif # LIBDVDCSS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdvdcss
diff --git a/multimedia/libdvdnav/buildlink3.mk b/multimedia/libdvdnav/buildlink3.mk
index dd9d2add40e..91bb06583ba 100644
--- a/multimedia/libdvdnav/buildlink3.mk
+++ b/multimedia/libdvdnav/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/01/14 22:36:11 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:03 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDVDNAV_BUILDLINK3_MK:=	${LIBDVDNAV_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdvdnav
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdvdnav
-.endif
+.if !defined(LIBDVDNAV_BUILDLINK3_MK)
+LIBDVDNAV_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdnav}
-BUILDLINK_PACKAGES+=	libdvdnav
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvdnav
-
-.if !empty(LIBDVDNAV_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdvdnav+=	libdvdnav>=4.1.3
 BUILDLINK_ABI_DEPENDS.libdvdnav+=	libdvdnav>=4.1.3
 BUILDLINK_PKGSRCDIR.libdvdnav?=	../../multimedia/libdvdnav
-.endif	# LIBDVDNAV_BUILDLINK3_MK
 
 .include "../../multimedia/libdvdread/buildlink3.mk"
+.endif # LIBDVDNAV_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdvdnav
diff --git a/multimedia/libdvdplay/buildlink3.mk b/multimedia/libdvdplay/buildlink3.mk
index 68f4471f4a2..202cc926564 100644
--- a/multimedia/libdvdplay/buildlink3.mk
+++ b/multimedia/libdvdplay/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:03 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDVDPLAY_BUILDLINK3_MK:=	${LIBDVDPLAY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdvdplay
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdvdplay
-.endif
+.if !defined(LIBDVDPLAY_BUILDLINK3_MK)
+LIBDVDPLAY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdplay}
-BUILDLINK_PACKAGES+=	libdvdplay
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvdplay
-
-.if !empty(LIBDVDPLAY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdvdplay+=		libdvdplay>=1.0.1
 BUILDLINK_ABI_DEPENDS.libdvdplay+=	libdvdplay>=1.0.1nb3
 BUILDLINK_PKGSRCDIR.libdvdplay?=	../../multimedia/libdvdplay
-.endif	# LIBDVDPLAY_BUILDLINK3_MK
 
 .include "../../multimedia/libdvdread/buildlink3.mk"
+.endif # LIBDVDPLAY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdvdplay
diff --git a/multimedia/libdvdread/buildlink3.mk b/multimedia/libdvdread/buildlink3.mk
index c171a436657..8be064eb411 100644
--- a/multimedia/libdvdread/buildlink3.mk
+++ b/multimedia/libdvdread/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/01/14 22:28:05 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:04 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDVDREAD_BUILDLINK3_MK:=	${LIBDVDREAD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdvdread
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdvdread
-.endif
+.if !defined(LIBDVDREAD_BUILDLINK3_MK)
+LIBDVDREAD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdread}
-BUILDLINK_PACKAGES+=	libdvdread
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvdread
-
-.if !empty(LIBDVDREAD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdvdread+=	libdvdread>=4.1.3
 BUILDLINK_ABI_DEPENDS.libdvdread+=	libdvdread>=4.1.3
 BUILDLINK_PKGSRCDIR.libdvdread?=	../../multimedia/libdvdread
-.endif	# LIBDVDREAD_BUILDLINK3_MK
+.endif # LIBDVDREAD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdvdread
diff --git a/multimedia/libflash/buildlink3.mk b/multimedia/libflash/buildlink3.mk
index 6a89dac49e4..588a0210c73 100644
--- a/multimedia/libflash/buildlink3.mk
+++ b/multimedia/libflash/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:04 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBFLASH_BUILDLINK3_MK:=	${LIBFLASH_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libflash
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libflash
-.endif
+.if !defined(LIBFLASH_BUILDLINK3_MK)
+LIBFLASH_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibflash}
-BUILDLINK_PACKAGES+=	libflash
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libflash
-
-.if !empty(LIBFLASH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libflash+=	libflash>=0.4.10nb4
 BUILDLINK_ABI_DEPENDS.libflash+=	libflash>=0.4.10nb6
 BUILDLINK_PKGSRCDIR.libflash?=	../../multimedia/libflash
-.endif	# LIBFLASH_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.endif # LIBFLASH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libflash
diff --git a/multimedia/libmatroska/buildlink3.mk b/multimedia/libmatroska/buildlink3.mk
index 265945676ce..ea581ac6e37 100644
--- a/multimedia/libmatroska/buildlink3.mk
+++ b/multimedia/libmatroska/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/11/14 18:27:48 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:04 joerg Exp $
 #
 # This Makefile fragment is included by packages that use libmatroska.
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMATROSKA_BUILDLINK3_MK:=	${LIBMATROSKA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmatroska
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmatroska
-.endif
+.if !defined(LIBMATROSKA_BUILDLINK3_MK)
+LIBMATROSKA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmatroska}
-BUILDLINK_PACKAGES+=	libmatroska
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmatroska
-
-.if !empty(LIBMATROSKA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmatroska+=	libmatroska>=0.8.0
 BUILDLINK_ABI_DEPENDS.libmatroska?=	libmatroska>=0.8.0nb1
 BUILDLINK_PKGSRCDIR.libmatroska?=	../../multimedia/libmatroska
-.endif	# LIBMATROSKA_BUILDLINK3_MK
 
 .include "../../devel/libebml/buildlink3.mk"
+.endif # LIBMATROSKA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmatroska
diff --git a/multimedia/libmp4v2/buildlink3.mk b/multimedia/libmp4v2/buildlink3.mk
index 0d726e27f28..3015f25d3d3 100644
--- a/multimedia/libmp4v2/buildlink3.mk
+++ b/multimedia/libmp4v2/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:04 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMP4V2_BUILDLINK3_MK:=	${LIBMP4V2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmp4v2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmp4v2
-.endif
+.if !defined(LIBMP4V2_BUILDLINK3_MK)
+LIBMP4V2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmp4v2}
-BUILDLINK_PACKAGES+=	libmp4v2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmp4v2
-
-.if ${LIBMP4V2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmp4v2+=	libmp4v2>=1.5.0.1
 BUILDLINK_PKGSRCDIR.libmp4v2?=	../../multimedia/libmp4v2
-.endif	# LIBMP4V2_BUILDLINK3_MK
+.endif # LIBMP4V2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmp4v2
diff --git a/multimedia/libmpeg2/buildlink3.mk b/multimedia/libmpeg2/buildlink3.mk
index 75eea0f9dcb..48a15dd84ce 100644
--- a/multimedia/libmpeg2/buildlink3.mk
+++ b/multimedia/libmpeg2/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/02/22 17:43:51 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:04 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMPEG2_BUILDLINK3_MK:=	${LIBMPEG2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmpeg2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmpeg2
-.endif
+.if !defined(LIBMPEG2_BUILDLINK3_MK)
+LIBMPEG2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpeg2}
-BUILDLINK_PACKAGES+=	libmpeg2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpeg2
-
-.if !empty(LIBMPEG2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmpeg2+=	libmpeg2>=0.4.0
 BUILDLINK_ABI_DEPENDS.libmpeg2+=	libmpeg2>=0.4.0bnb5
 BUILDLINK_PKGSRCDIR.libmpeg2?=	../../multimedia/libmpeg2
-.endif	# LIBMPEG2_BUILDLINK3_MK
+.endif # LIBMPEG2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmpeg2
diff --git a/multimedia/libmpeg3/buildlink3.mk b/multimedia/libmpeg3/buildlink3.mk
index 88b4c29aefd..b65ac02c671 100644
--- a/multimedia/libmpeg3/buildlink3.mk
+++ b/multimedia/libmpeg3/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/02/20 09:56:44 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:04 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMPEG3_BUILDLINK3_MK:=	${LIBMPEG3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmpeg3
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmpeg3
-.endif
+.if !defined(LIBMPEG3_BUILDLINK3_MK)
+LIBMPEG3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpeg3}
-BUILDLINK_PACKAGES+=	libmpeg3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpeg3
-
-.if !empty(LIBMPEG3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmpeg3+=	libmpeg3>=1.3nb4
 BUILDLINK_ABI_DEPENDS.libmpeg3?=	libmpeg3>=1.3nb6
 BUILDLINK_PKGSRCDIR.libmpeg3?=		../../multimedia/libmpeg3
-.endif	# LIBMPEG3_BUILDLINK3_MK
 
 .include "../../mk/pthread.buildlink3.mk"
+.endif # LIBMPEG3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmpeg3
diff --git a/multimedia/libnms/buildlink3.mk b/multimedia/libnms/buildlink3.mk
index e48de50a760..f08184649d3 100644
--- a/multimedia/libnms/buildlink3.mk
+++ b/multimedia/libnms/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/10 16:27:14 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:04 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBNMS_BUILDLINK3_MK:=	${LIBNMS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libnms
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libnms
-.endif
+.if !defined(LIBNMS_BUILDLINK3_MK)
+LIBNMS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnms}
-BUILDLINK_PACKAGES+=	libnms
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnms
-
-.if ${LIBNMS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libnms+=	libnms>=0.6.0
 BUILDLINK_PKGSRCDIR.libnms?=	../../multimedia/libnms
-.endif	# LIBNMS_BUILDLINK3_MK
+.endif # LIBNMS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libnms
diff --git a/multimedia/libogg/buildlink3.mk b/multimedia/libogg/buildlink3.mk
index b50c4eb78ac..78946c7307f 100644
--- a/multimedia/libogg/buildlink3.mk
+++ b/multimedia/libogg/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:04 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBOGG_BUILDLINK3_MK:=	${LIBOGG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libogg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libogg
-.endif
+.if !defined(LIBOGG_BUILDLINK3_MK)
+LIBOGG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibogg}
-BUILDLINK_PACKAGES+=	libogg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libogg
-
-.if !empty(LIBOGG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libogg+=	libogg>=1.1
 BUILDLINK_ABI_DEPENDS.libogg+=	libogg>=1.1.2nb1
 BUILDLINK_PKGSRCDIR.libogg?=	../../multimedia/libogg
-.endif	# LIBOGG_BUILDLINK3_MK
+.endif # LIBOGG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libogg
diff --git a/multimedia/libtheora/buildlink3.mk b/multimedia/libtheora/buildlink3.mk
index a3eb6675c97..47b194b643d 100644
--- a/multimedia/libtheora/buildlink3.mk
+++ b/multimedia/libtheora/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:04 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBTHEORA_BUILDLINK3_MK:=	${LIBTHEORA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtheora
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libtheora
-.endif
+.if !defined(LIBTHEORA_BUILDLINK3_MK)
+LIBTHEORA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtheora}
-BUILDLINK_PACKAGES+=	libtheora
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtheora
-
-.if !empty(LIBTHEORA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtheora+=	libtheora>=1.0alpha3
 BUILDLINK_ABI_DEPENDS.libtheora+=	libtheora>=1.0alpha3nb1
 BUILDLINK_PKGSRCDIR.libtheora?=	../../multimedia/libtheora
-.endif	# LIBTHEORA_BUILDLINK3_MK
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
+.endif # LIBTHEORA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtheora
diff --git a/multimedia/ming/buildlink3.mk b/multimedia/ming/buildlink3.mk
index 093452f68a7..d4932b8adfd 100644
--- a/multimedia/ming/buildlink3.mk
+++ b/multimedia/ming/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/09/13 15:53:51 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:04 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MING_BUILDLINK3_MK:=	${MING_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ming
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ming
-.endif
+.if !defined(MING_BUILDLINK3_MK)
+MING_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nming}
-BUILDLINK_PACKAGES+=	ming
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ming
-
-.if !empty(MING_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ming+=	ming>=0.3.0
 BUILDLINK_PKGSRCDIR.ming?=	../../multimedia/ming
-.endif	# MING_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.endif # MING_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ming
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
index 0ec271666ec..06f3d574377 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,23 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/05/30 08:54:30 rillig Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MJPEGTOOLS_BUILDLINK3_MK:=	${MJPEGTOOLS_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:05 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mjpegtools
-.endif
+BUILDLINK_TREE+=	mjpegtools
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmjpegtools}
-BUILDLINK_PACKAGES+=	mjpegtools
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mjpegtools
+.if !defined(MJPEGTOOLS_BUILDLINK3_MK)
+MJPEGTOOLS_BUILDLINK3_MK:=
 
-.if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mjpegtools+=		mjpegtools>=1.8.0
 BUILDLINK_ABI_DEPENDS.mjpegtools?=	mjpegtools>=1.8.0nb5
 BUILDLINK_PKGSRCDIR.mjpegtools?=	../../multimedia/mjpegtools
-.endif	# MJPEGTOOLS_BUILDLINK3_MK
 
 .include "../../audio/lame/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
@@ -29,5 +21,6 @@ pkgbase := mjpegtools
 .if !empty(PKG_BUILD_OPTIONS.mjpegtools:Mdv)
 .  include "../../multimedia/libdv/buildlink3.mk"
 .endif
+.endif # MJPEGTOOLS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mjpegtools
diff --git a/multimedia/mpeg-lib/buildlink3.mk b/multimedia/mpeg-lib/buildlink3.mk
index 04c2457df0b..a0664139693 100644
--- a/multimedia/mpeg-lib/buildlink3.mk
+++ b/multimedia/mpeg-lib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MPEG_BUILDLINK3_MK:=	${MPEG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mpeg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mpeg
-.endif
+.if !defined(MPEG_BUILDLINK3_MK)
+MPEG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmpeg}
-BUILDLINK_PACKAGES+=	mpeg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mpeg
-
-.if !empty(MPEG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mpeg+=	mpeg>=1.3.1
 BUILDLINK_ABI_DEPENDS.mpeg+=	mpeg>=1.3.1nb1
 BUILDLINK_PKGSRCDIR.mpeg?=	../../multimedia/mpeg-lib
-.endif	# MPEG_BUILDLINK3_MK
+.endif # MPEG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mpeg
diff --git a/multimedia/mpeg4ip/buildlink3.mk b/multimedia/mpeg4ip/buildlink3.mk
index ebd06793071..2bd454e91c2 100644
--- a/multimedia/mpeg4ip/buildlink3.mk
+++ b/multimedia/mpeg4ip/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MPEG4IP_BUILDLINK3_MK:=	${MPEG4IP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mpeg4ip
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mpeg4ip
-.endif
+.if !defined(MPEG4IP_BUILDLINK3_MK)
+MPEG4IP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmpeg4ip}
-BUILDLINK_PACKAGES+=	mpeg4ip
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mpeg4ip
-
-.if !empty(MPEG4IP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mpeg4ip+=	mpeg4ip>=1.4.1
 BUILDLINK_PKGSRCDIR.mpeg4ip?=	../../multimedia/mpeg4ip
-.endif	# MPEG4IP_BUILDLINK3_MK
+.endif # MPEG4IP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mpeg4ip
diff --git a/multimedia/ogle/buildlink3.mk b/multimedia/ogle/buildlink3.mk
index a39a90bd232..fb9c238502c 100644
--- a/multimedia/ogle/buildlink3.mk
+++ b/multimedia/ogle/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OGLE_BUILDLINK3_MK:=	${OGLE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ogle
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ogle
-.endif
+.if !defined(OGLE_BUILDLINK3_MK)
+OGLE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nogle}
-BUILDLINK_PACKAGES+=	ogle
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ogle
-
-.if !empty(OGLE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ogle+=	ogle>=0.9.2
 BUILDLINK_ABI_DEPENDS.ogle+=	ogle>=0.9.2nb3
 BUILDLINK_PKGSRCDIR.ogle?=	../../multimedia/ogle
-.endif	# OGLE_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # OGLE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ogle
diff --git a/multimedia/openquicktime/buildlink3.mk b/multimedia/openquicktime/buildlink3.mk
index b55568b5258..b9a85733dd7 100644
--- a/multimedia/openquicktime/buildlink3.mk
+++ b/multimedia/openquicktime/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:05 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-OPENQUICKTIME_BUILDLINK3_MK:=	${OPENQUICKTIME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openquicktime
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openquicktime
-.endif
+.if !defined(OPENQUICKTIME_BUILDLINK3_MK)
+OPENQUICKTIME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenquicktime}
-BUILDLINK_PACKAGES+=	openquicktime
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openquicktime
-
-.if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openquicktime+=	openquicktime>=1.0nb2
 BUILDLINK_ABI_DEPENDS.openquicktime?=	openquicktime>=1.0nb4
 BUILDLINK_PKGSRCDIR.openquicktime?=	../../multimedia/openquicktime
-.endif	# OPENQUICKTIME_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.endif # OPENQUICKTIME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openquicktime
diff --git a/multimedia/p5-GStreamer/buildlink3.mk b/multimedia/p5-GStreamer/buildlink3.mk
index 06c47db3c9a..b33fd6e4326 100644
--- a/multimedia/p5-GStreamer/buildlink3.mk
+++ b/multimedia/p5-GStreamer/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/11/06 14:21:10 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:05 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-P5_GSTREAMER_BUILDLINK3_MK:=	${P5_GSTREAMER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	p5-GStreamer
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	p5-GStreamer
-.endif
+.if !defined(P5_GSTREAMER_BUILDLINK3_MK)
+P5_GSTREAMER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-GStreamer}
-BUILDLINK_PACKAGES+=	p5-GStreamer
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-GStreamer
-
-.if ${P5_GSTREAMER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.p5-GStreamer+=	p5-GStreamer>=0.11
 BUILDLINK_PKGSRCDIR.p5-GStreamer?=	../../multimedia/p5-GStreamer
-.endif	# P5_GSTREAMER_BUILDLINK3_MK
 
 .include "../../devel/p5-glib2/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.endif # P5_GSTREAMER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-p5-GStreamer
diff --git a/multimedia/phonon/buildlink3.mk b/multimedia/phonon/buildlink3.mk
index a267667f1d8..b6c362864e5 100644
--- a/multimedia/phonon/buildlink3.mk
+++ b/multimedia/phonon/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/03 10:59:46 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PHONON_BUILDLINK3_MK:=	${PHONON_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	phonon
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	phonon
-.endif
+.if !defined(PHONON_BUILDLINK3_MK)
+PHONON_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nphonon}
-BUILDLINK_PACKAGES+=	phonon
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}phonon
-
-.if ${PHONON_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.phonon+=	phonon>=4.1.83
 BUILDLINK_PKGSRCDIR.phonon?=	../../multimedia/phonon
-.endif	# PHONON_BUILDLINK3_MK
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-qdbus/buildlink3.mk"
+.endif # PHONON_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-phonon
diff --git a/multimedia/py-gstreamer0.10/buildlink3.mk b/multimedia/py-gstreamer0.10/buildlink3.mk
index 5aaaf06c607..a587468a7b1 100644
--- a/multimedia/py-gstreamer0.10/buildlink3.mk
+++ b/multimedia/py-gstreamer0.10/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/01/05 11:04:42 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:05 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GST_PYTHON_BUILDLINK3_MK:=	${GST_PYTHON_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gst-python
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gst-python
-.endif
+.if !defined(GST_PYTHON_BUILDLINK3_MK)
+GST_PYTHON_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-python}
-BUILDLINK_PACKAGES+=	gst-python
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-python
-
-.if ${GST_PYTHON_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gst-python+=	gst-python>=0.10.5
 BUILDLINK_PKGSRCDIR.gst-python?=	../../multimedia/py-gstreamer0.10
-.endif	# GST_PYTHON_BUILDLINK3_MK
+.endif # GST_PYTHON_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gst-python
diff --git a/multimedia/smpeg/buildlink3.mk b/multimedia/smpeg/buildlink3.mk
index 7783abb9c4c..abc9c0ce2f7 100644
--- a/multimedia/smpeg/buildlink3.mk
+++ b/multimedia/smpeg/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/19 15:31:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SMPEG_BUILDLINK3_MK:=	${SMPEG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	smpeg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	smpeg
-.endif
+.if !defined(SMPEG_BUILDLINK3_MK)
+SMPEG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsmpeg}
-BUILDLINK_PACKAGES+=	smpeg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}smpeg
-
-.if !empty(SMPEG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
 BUILDLINK_ABI_DEPENDS.smpeg+=	smpeg>=0.4.4nb13
 BUILDLINK_PKGSRCDIR.smpeg?=	../../multimedia/smpeg
-.endif	# SMPEG_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # SMPEG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-smpeg
diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
index 7aa9eb52cca..66b11763f09 100644
--- a/multimedia/swfdec/buildlink3.mk
+++ b/multimedia/swfdec/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/10/31 12:44:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	swfdec
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	swfdec
-.endif
+.if !defined(SWFDEC_BUILDLINK3_MK)
+SWFDEC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswfdec}
-BUILDLINK_PACKAGES+=	swfdec
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}swfdec
-
-.if ${SWFDEC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.swfdec+=	swfdec>=0.8.2
 BUILDLINK_PKGSRCDIR.swfdec?=	../../multimedia/swfdec
-.endif	# SWFDEC_BUILDLINK3_MK
 
 .include "../../devel/liboil/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.swfdec?=	../../multimedia/swfdec
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # SWFDEC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-swfdec
diff --git a/multimedia/totem-pl-parser/buildlink3.mk b/multimedia/totem-pl-parser/buildlink3.mk
index 6c69d7557f1..38c6ee20867 100644
--- a/multimedia/totem-pl-parser/buildlink3.mk
+++ b/multimedia/totem-pl-parser/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/09/06 20:54:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:06 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TOTEM_PL_PARSER_BUILDLINK3_MK:=	${TOTEM_PL_PARSER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	totem-pl-parser
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	totem-pl-parser
-.endif
+.if !defined(TOTEM_PL_PARSER_BUILDLINK3_MK)
+TOTEM_PL_PARSER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntotem-pl-parser}
-BUILDLINK_PACKAGES+=	totem-pl-parser
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}totem-pl-parser
-
-.if ${TOTEM_PL_PARSER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.totem-pl-parser+=	totem-pl-parser>=2.22.1
 BUILDLINK_ABI_DEPENDS.totem-pl-parser?=	totem-pl-parser>=2.22.3nb1
 BUILDLINK_PKGSRCDIR.totem-pl-parser?=	../../multimedia/totem-pl-parser
-.endif	# TOTEM_PL_PARSER_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
+.endif # TOTEM_PL_PARSER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-totem-pl-parser
diff --git a/multimedia/totem/buildlink3.mk b/multimedia/totem/buildlink3.mk
index 5bf69c6494d..7292f853a60 100644
--- a/multimedia/totem/buildlink3.mk
+++ b/multimedia/totem/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/03/07 07:07:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:06 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TOTEM_BUILDLINK3_MK:=	${TOTEM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	totem
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	totem
-.endif
+.if !defined(TOTEM_BUILDLINK3_MK)
+TOTEM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntotem}
-BUILDLINK_PACKAGES+=	totem
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}totem
-
-.if !empty(TOTEM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.totem+=	{totem,totem-xine}>=1.4.0
 BUILDLINK_ABI_DEPENDS.totem+=	{totem,totem-xine}>=2.20.3nb2
 BUILDLINK_PKGSRCDIR.totem?=	../../multimedia/totem
-.endif	# TOTEM_BUILDLINK3_MK
 
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # TOTEM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-totem
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index c70695fb444..f977873b88d 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.23 2008/12/18 17:28:16 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:25:06 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-VLC_BUILDLINK3_MK:=	${VLC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	vlc
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	vlc
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvlc}
-BUILDLINK_PACKAGES+=	vlc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vlc
+.if !defined(VLC_BUILDLINK3_MK)
+VLC_BUILDLINK3_MK:=
 
-.if ${VLC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.vlc+=	vlc>=0.8.6d
 BUILDLINK_ABI_DEPENDS.vlc?=	vlc>=0.9.8anb1
 BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
-.endif	# VLC_BUILDLINK3_MK
 
 pkgbase:= vlc
 .include "../../mk/pkg-build-options.mk"
@@ -50,5 +42,6 @@ pkgbase:= vlc
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
+.endif # VLC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-vlc
diff --git a/multimedia/vlc08/buildlink3.mk b/multimedia/vlc08/buildlink3.mk
index 95345d0d697..c08fe6a5b77 100644
--- a/multimedia/vlc08/buildlink3.mk
+++ b/multimedia/vlc08/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/12/18 17:28:16 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:06 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-VLC08_BUILDLINK3_MK:=	${VLC08_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	vlc08
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	vlc08
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvlc08}
-BUILDLINK_PACKAGES+=	vlc08
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vlc08
+.if !defined(VLC08_BUILDLINK3_MK)
+VLC08_BUILDLINK3_MK:=
 
-.if ${VLC08_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.vlc08+=	vlc08>=0.8.6d
 BUILDLINK_ABI_DEPENDS.vlc08?=	vlc08>=0.8.6inb1
 BUILDLINK_PKGSRCDIR.vlc08?=	../../multimedia/vlc08
-.endif	# VLC08_BUILDLINK3_MK
 
 pkgbase:= vlc08
 .include "../../mk/pkg-build-options.mk"
@@ -50,5 +42,6 @@ pkgbase:= vlc08
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
+.endif # VLC08_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-vlc08
diff --git a/multimedia/x264-devel/buildlink3.mk b/multimedia/x264-devel/buildlink3.mk
index 69da8b30aab..c46d9cc9493 100644
--- a/multimedia/x264-devel/buildlink3.mk
+++ b/multimedia/x264-devel/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/12/18 17:19:06 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:06 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-X264_DEVEL_BUILDLINK3_MK:=	${X264_DEVEL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	x264-devel
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	x264-devel
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nx264-devel}
-BUILDLINK_PACKAGES+=	x264-devel
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x264-devel
+.if !defined(X264_DEVEL_BUILDLINK3_MK)
+X264_DEVEL_BUILDLINK3_MK:=
 
-.if !empty(X264_DEVEL_BUILDLINK3_MK:M+)
 ###
 ### NOTE: When changing BUILDLINK_A[BP]I_DEPENDS.x264-devel, please record
 ###	  the value of X264_BUILD in x264.h along with the appropriate
@@ -24,10 +17,10 @@ BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20081217 # X264_BUILD 65
 BUILDLINK_PKGSRCDIR.x264-devel?=	../../multimedia/x264-devel
 pkgbase:= x264-devel
 .  include "../../mk/pkg-build-options.mk"
-.endif	# X264_DEVEL_BUILDLINK3_MK
 
 .if !empty(PKG_BUILD_OPTIONS.x264-devel:Mthreads)
 .  include "../../mk/pthread.buildlink3.mk"
 .endif
+.endif # X264_DEVEL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-x264-devel
diff --git a/multimedia/xfce4-mpc-plugin/buildlink3.mk b/multimedia/xfce4-mpc-plugin/buildlink3.mk
index 53da150c0b6..ee5b6264f73 100644
--- a/multimedia/xfce4-mpc-plugin/buildlink3.mk
+++ b/multimedia/xfce4-mpc-plugin/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/12/05 07:49:16 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:06 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_MPC_PLUGIN_BUILDLINK3_MK:=	${XFCE4_MPC_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-mpc-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-mpc-plugin
-.endif
+.if !defined(XFCE4_MPC_PLUGIN_BUILDLINK3_MK)
+XFCE4_MPC_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mpc-plugin}
-BUILDLINK_PACKAGES+=	xfce4-mpc-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mpc-plugin
-
-.if ${XFCE4_MPC_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-mpc-plugin+=	xfce4-mpc-plugin>=0.3.2
 BUILDLINK_PKGSRCDIR.xfce4-mpc-plugin?=	../../multimedia/xfce4-mpc-plugin
-.endif	# XFCE4_MPC_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_MPC_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-mpc-plugin
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index 5a22263fcd1..7abffb03110 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.21 2007/02/07 20:04:00 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:06 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XINE_LIB_BUILDLINK3_MK:=	${XINE_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xine-lib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xine-lib
-.endif
+.if !defined(XINE_LIB_BUILDLINK3_MK)
+XINE_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxine-lib}
-BUILDLINK_PACKAGES+=	xine-lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xine-lib
-
-.if !empty(XINE_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xine-lib+=	xine-lib>=1rc3c
 BUILDLINK_ABI_DEPENDS.xine-lib+=xine-lib>=1.0.3a
 BUILDLINK_ABI_DEPENDS.xine-lib?=	xine-lib>=1.1.3nb1
 BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
-.endif	# XINE_LIB_BUILDLINK3_MK
+.endif # XINE_LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xine-lib
diff --git a/multimedia/xvidcore/buildlink3.mk b/multimedia/xvidcore/buildlink3.mk
index 7c36401226f..87064a7d66c 100644
--- a/multimedia/xvidcore/buildlink3.mk
+++ b/multimedia/xvidcore/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:06 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XVIDCORE_BUILDLINK3_MK:=	${XVIDCORE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xvidcore
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xvidcore
-.endif
+.if !defined(XVIDCORE_BUILDLINK3_MK)
+XVIDCORE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxvidcore}
-BUILDLINK_PACKAGES+=	xvidcore
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xvidcore
-
-.if !empty(XVIDCORE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xvidcore+=	xvidcore>=1.0.0
 BUILDLINK_ABI_DEPENDS.xvidcore?=	xvidcore>=1.1.0nb1
 BUILDLINK_PKGSRCDIR.xvidcore?=	../../multimedia/xvidcore
-.endif	# XVIDCORE_BUILDLINK3_MK
+.endif # XVIDCORE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xvidcore