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.
author: joerg <joerg> 2009-03-20 19:23:50 +0000
committer: joerg <joerg> 2009-03-20 19:23:50 +0000
commit: 405c61d80251d8e80401aed2264d4bede218cb22 (patch)
tree: 647e974495c5d41703d41ca2e71c9b6063b9153a /x11
parent: f0f715d4dd4a290c5c6ae716c774f59caf5aa61c (diff)
download: pkgsrc-405c61d80251d8e80401aed2264d4bede218cb22.tar.gz
172 files changed, 1027 insertions, 2233 deletions
diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk
index 77f2c5f58ac..dfa2cfce754 100644
--- a/x11/Xaw-Xpm/buildlink3.mk
+++ b/x11/Xaw-Xpm/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/12/13 03:20:41 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XAW_XPM_BUILDLINK3_MK:=	${XAW_XPM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Xaw-Xpm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Xaw-Xpm
-.endif
+.if !defined(XAW_XPM_BUILDLINK3_MK)
+XAW_XPM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXaw-Xpm}
-BUILDLINK_PACKAGES+=	Xaw-Xpm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xaw-Xpm
-
-.if !empty(XAW_XPM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xaw-Xpm+=	Xaw-Xpm>=1.1
 BUILDLINK_ABI_DEPENDS.Xaw-Xpm?=	Xaw-Xpm>=1.1nb2
 BUILDLINK_PKGSRCDIR.Xaw-Xpm?=	../../x11/Xaw-Xpm
@@ -33,9 +26,8 @@ LIBXAW?=	-L${BUILDLINK_PREFIX.Xaw-Xpm}/lib			\
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXpm}/lib	\
 		-lXaw3d -lXpm
 
-.endif	# XAW_XPM_BUILDLINK3_MK
-
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.endif # XAW_XPM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Xaw-Xpm
diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk
index 5f38ad345b2..c42d3667702 100644
--- a/x11/Xaw3d/buildlink3.mk
+++ b/x11/Xaw3d/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/02/08 00:08:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XAW3D_BUILDLINK3_MK:=	${XAW3D_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Xaw3d
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Xaw3d
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXaw3d}
-BUILDLINK_PACKAGES+=	Xaw3d
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xaw3d
+.if !defined(XAW3D_BUILDLINK3_MK)
+XAW3D_BUILDLINK3_MK:=
 
-.if !empty(XAW3D_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xaw3d+=	Xaw3d>=1.5
 BUILDLINK_ABI_DEPENDS.Xaw3d?=	Xaw3d>=1.5Enb1
 BUILDLINK_PKGSRCDIR.Xaw3d?=	../../x11/Xaw3d
@@ -29,12 +22,12 @@ buildlink-Xaw3d-inc-hack: buildlink-directories
 		${MKDIR} ${BUILDLINK_DIR}/include/X11 && \
 		${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw
 .endif
-.endif	# XAW3D_BUILDLINK3_MK
 
 .include "../../x11/libXmu/buildlink3.mk"
 
 LIBXAW?=	-L${BUILDLINK_PREFIX.Xaw3d}/lib				\
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw3d}/lib	\
 		-lXaw3d
+.endif # XAW3D_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Xaw3d
diff --git a/x11/Xbae/buildlink3.mk b/x11/Xbae/buildlink3.mk
index 77865ce48e1..539623a4ffe 100644
--- a/x11/Xbae/buildlink3.mk
+++ b/x11/Xbae/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XBAE_BUILDLINK3_MK:=	${XBAE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Xbae
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Xbae
-.endif
+.if !defined(XBAE_BUILDLINK3_MK)
+XBAE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXbae}
-BUILDLINK_PACKAGES+=	Xbae
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xbae
-
-.if !empty(XBAE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xbae+=	Xbae>=4.8.4
 BUILDLINK_ABI_DEPENDS.Xbae+=	Xbae>=4.51.01nb2
 BUILDLINK_PKGSRCDIR.Xbae?=	../../x11/Xbae
-.endif	# XBAE_BUILDLINK3_MK
 
 .include "../../mk/motif.buildlink3.mk"
+.endif # XBAE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Xbae
diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
index 5cc83b00570..7e310da356e 100644
--- a/x11/Xcomposite/buildlink3.mk
+++ b/x11/Xcomposite/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/01/07 13:59:35 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:39 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XCOMPOSITE_BUILDLINK3_MK:=	${XCOMPOSITE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Xcomposite
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Xcomposite
-.endif
+.if !defined(XCOMPOSITE_BUILDLINK3_MK)
+XCOMPOSITE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXcomposite}
-BUILDLINK_PACKAGES+=	Xcomposite
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xcomposite
-
-.if !empty(XCOMPOSITE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xcomposite+=		Xcomposite>=1.0.1
 BUILDLINK_ABI_DEPENDS.Xcomposite?=	Xcomposite>=1.0.1nb2
 BUILDLINK_PKGSRCDIR.Xcomposite?=	../../x11/Xcomposite
-.endif	# XCOMPOSITE_BUILDLINK3_MK
 
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
 .include "../../x11/fixesproto/buildlink3.mk"
+.endif # XCOMPOSITE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Xcomposite
diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk
index 986ac3d0f84..fb3b06412d6 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/01/07 13:59:35 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:39 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XFIXES_BUILDLINK3_MK:=	${XFIXES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Xfixes
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Xfixes
-.endif
+.if !defined(XFIXES_BUILDLINK3_MK)
+XFIXES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXfixes}
-BUILDLINK_PACKAGES+=	Xfixes
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xfixes
-
-.if !empty(XFIXES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xfixes+=	Xfixes>=2.0.0
 BUILDLINK_ABI_DEPENDS.Xfixes+=	Xfixes>=2.0.1nb2
 BUILDLINK_PKGSRCDIR.Xfixes?=	../../x11/Xfixes
-.endif	# XFIXES_BUILDLINK3_MK
 
 .include "../../mk/x11.buildlink3.mk"
 .include "../../x11/fixesproto/buildlink3.mk"
+.endif # XFIXES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Xfixes
diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk
index df92bd0fd35..ddf83c65a1c 100644
--- a/x11/XmHTML/buildlink3.mk
+++ b/x11/XmHTML/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XMHTML_BUILDLINK3_MK:=	${XMHTML_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	XmHTML
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	XmHTML
-.endif
+.if !defined(XMHTML_BUILDLINK3_MK)
+XMHTML_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXmHTML}
-BUILDLINK_PACKAGES+=	XmHTML
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}XmHTML
-
-.if !empty(XMHTML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb2
 BUILDLINK_ABI_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb6
 BUILDLINK_PKGSRCDIR.XmHTML?=	../../x11/XmHTML
-.endif	# XMHTML_BUILDLINK3_MK
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.endif # XMHTML_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-XmHTML
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index 4be6da2fdf5..dfca28c50ca 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.44 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.45 2009/03/20 19:25:39 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Xrender
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Xrender
-.endif
+.if !defined(XRENDER_BUILDLINK3_MK)
+XRENDER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXrender}
-BUILDLINK_PACKAGES+=	Xrender
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xrender
-
-.if !empty(XRENDER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.2
 BUILDLINK_ABI_DEPENDS.Xrender+=	Xrender>=0.9.0nb1
 BUILDLINK_PKGSRCDIR.Xrender?=	../../x11/Xrender
-.endif	# XRENDER_BUILDLINK3_MK
 
 .include "../../mk/x11.buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
+.endif # XRENDER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Xrender
diff --git a/x11/bigreqsproto/buildlink3.mk b/x11/bigreqsproto/buildlink3.mk
index 96895eb837c..cb32497067e 100644
--- a/x11/bigreqsproto/buildlink3.mk
+++ b/x11/bigreqsproto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 17:38:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:39 joerg Exp $
 
 BUILDLINK_DEPMETHOD.bigreqsproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BIGREQSPROTO_BUILDLINK3_MK:=	${BIGREQSPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	bigreqsproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	bigreqsproto
-.endif
+.if !defined(BIGREQSPROTO_BUILDLINK3_MK)
+BIGREQSPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbigreqsproto}
-BUILDLINK_PACKAGES+=	bigreqsproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bigreqsproto
-
-.if ${BIGREQSPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.bigreqsproto+=	bigreqsproto>=1.0
 BUILDLINK_PKGSRCDIR.bigreqsproto?=	../../x11/bigreqsproto
-.endif	# BIGREQSPROTO_BUILDLINK3_MK
+.endif # BIGREQSPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-bigreqsproto
diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk
index 7b46252c08d..28ec2128976 100644
--- a/x11/blt/buildlink3.mk
+++ b/x11/blt/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BLT_BUILDLINK3_MK:=	${BLT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	blt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	blt
-.endif
+.if !defined(BLT_BUILDLINK3_MK)
+BLT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblt}
-BUILDLINK_PACKAGES+=	blt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}blt
-
-.if !empty(BLT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.blt+=		blt>=2.4z
 BUILDLINK_ABI_DEPENDS.blt?=	blt>=2.4znb2
 BUILDLINK_PKGSRCDIR.blt?=	../../x11/blt
-.endif	# BLT_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
+.endif # BLT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-blt
diff --git a/x11/compositeproto/buildlink3.mk b/x11/compositeproto/buildlink3.mk
index 77e7f7e7179..1079642ae88 100644
--- a/x11/compositeproto/buildlink3.mk
+++ b/x11/compositeproto/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:39 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_DEPMETHOD.compositeproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-COMPOSITEPROTO_BUILDLINK3_MK:=	${COMPOSITEPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	compositeproto
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	compositeproto
-.endif
+.if !defined(COMPOSITEPROTO_BUILDLINK3_MK)
+COMPOSITEPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncompositeproto}
-BUILDLINK_PACKAGES+=	compositeproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compositeproto
-
-.if !empty(COMPOSITEPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.compositeproto+=	compositeproto>=0.3.1
 BUILDLINK_PKGSRCDIR.compositeproto?=	../../x11/compositeproto
-.endif	# COMPOSITEPROTO_BUILDLINK3_MK
 
 .include "../../x11/fixesproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # COMPOSITEPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-compositeproto
diff --git a/x11/damageproto/buildlink3.mk b/x11/damageproto/buildlink3.mk
index f5f213384f5..1d6a0fad8e4 100644
--- a/x11/damageproto/buildlink3.mk
+++ b/x11/damageproto/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/01/18 17:30:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:39 joerg Exp $
 
 BUILDLINK_DEPMETHOD.damageproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-DAMAGEPROTO_BUILDLINK3_MK:=	${DAMAGEPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	damageproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	damageproto
-.endif
+.if !defined(DAMAGEPROTO_BUILDLINK3_MK)
+DAMAGEPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndamageproto}
-BUILDLINK_PACKAGES+=	damageproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}damageproto
-
-.if ${DAMAGEPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.damageproto+=	damageproto>=1.1.0
 BUILDLINK_PKGSRCDIR.damageproto?=	../../x11/damageproto
-.endif	# DAMAGEPROTO_BUILDLINK3_MK
 
 .include "../../x11/xproto/buildlink3.mk"
 .include "../../x11/fixesproto/buildlink3.mk"
+.endif # DAMAGEPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-damageproto
diff --git a/x11/efltk/buildlink3.mk b/x11/efltk/buildlink3.mk
index adeeeddbf9b..3b763b0e72f 100644
--- a/x11/efltk/buildlink3.mk
+++ b/x11/efltk/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/01/13 18:35:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EFLTK_BUILDLINK3_MK:=	${EFLTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	efltk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	efltk
-.endif
+.if !defined(EFLTK_BUILDLINK3_MK)
+EFLTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nefltk}
-BUILDLINK_PACKAGES+=	efltk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}efltk
-
-.if !empty(EFLTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.efltk+=	efltk>=2.0.5nb1
 BUILDLINK_ABI_DEPENDS.efltk?=	efltk>=2.0.5nb7
 BUILDLINK_PKGSRCDIR.efltk?=	../../x11/efltk
-.endif	# EFLTK_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.endif # EFLTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-efltk
diff --git a/x11/evieext/buildlink3.mk b/x11/evieext/buildlink3.mk
index a7fa1b914d5..cb77f292167 100644
--- a/x11/evieext/buildlink3.mk
+++ b/x11/evieext/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 21:47:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:40 joerg Exp $
 
 BUILDLINK_DEPMETHOD.evieext?=	build
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EVIEEXT_BUILDLINK3_MK:=	${EVIEEXT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	evieext
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	evieext
-.endif
+.if !defined(EVIEEXT_BUILDLINK3_MK)
+EVIEEXT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nevieext}
-BUILDLINK_PACKAGES+=	evieext
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evieext
-
-.if ${EVIEEXT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.evieext+=	evieext>=1.0.2
 BUILDLINK_PKGSRCDIR.evieext?=	../../x11/evieext
-.endif	# EVIEEXT_BUILDLINK3_MK
+.endif # EVIEEXT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-evieext
diff --git a/x11/fixesproto/buildlink3.mk b/x11/fixesproto/buildlink3.mk
index da7b2bc8cd1..f196d4432ef 100644
--- a/x11/fixesproto/buildlink3.mk
+++ b/x11/fixesproto/buildlink3.mk
@@ -1,27 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/01/07 13:59:36 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:40 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_DEPMETHOD.fixesproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FIXESPROTO_BUILDLINK3_MK:=	${FIXESPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fixesproto
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	fixesproto
-.endif
+.if !defined(FIXESPROTO_BUILDLINK3_MK)
+FIXESPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfixesproto}
-BUILDLINK_PACKAGES+=	fixesproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fixesproto
-
-.if !empty(FIXESPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fixesproto+=	fixesproto>=3.0.0
 BUILDLINK_PKGSRCDIR.fixesproto?=	../../x11/fixesproto
-.endif	# FIXESPROTO_BUILDLINK3_MK
 
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # FIXESPROTO_BUILDLINK3_MK
 
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fixesproto
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index b7d419490b1..336b2b728c7 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/01/02 12:42:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:40 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FLTK_BUILDLINK3_MK:=	${FLTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fltk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	fltk
-.endif
+.if !defined(FLTK_BUILDLINK3_MK)
+FLTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfltk}
-BUILDLINK_PACKAGES+=	fltk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fltk
-
-.if !empty(FLTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.1.5rc1
 BUILDLINK_ABI_DEPENDS.fltk+=	fltk>=1.1.7nb1
 BUILDLINK_PKGSRCDIR.fltk?=	../../x11/fltk
 BUILDLINK_FILES.fltk+=		include/Fl/*
-.endif	# FLTK_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.endif # FLTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fltk
diff --git a/x11/fltk2/buildlink3.mk b/x11/fltk2/buildlink3.mk
index cd5cecf0323..0188a322dab 100644
--- a/x11/fltk2/buildlink3.mk
+++ b/x11/fltk2/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/14 12:06:49 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:40 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FLTK2_BUILDLINK3_MK:=	${FLTK2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fltk2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	fltk2
-.endif
+.if !defined(FLTK2_BUILDLINK3_MK)
+FLTK2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfltk2}
-BUILDLINK_PACKAGES+=	fltk2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fltk2
-
-.if ${FLTK2_BUILDLINK3_MK} == "+"
 BUILDLINK_DEPMETHOD.fltk2?=	build
 BUILDLINK_API_DEPENDS.fltk2+=	fltk2>=2.0pre6129
 BUILDLINK_PKGSRCDIR.fltk2?=	../../x11/fltk2
-.endif	# FLTK2_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
@@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.fltk2?=	../../x11/fltk2
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
+.endif # FLTK2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fltk2
diff --git a/x11/fontcacheproto/buildlink3.mk b/x11/fontcacheproto/buildlink3.mk
index 5aea8836caa..abb438e5221 100644
--- a/x11/fontcacheproto/buildlink3.mk
+++ b/x11/fontcacheproto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 19:54:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:40 joerg Exp $
 
 BUILDLINK_DEPMETHOD.fontcacheproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FONTCACHEPROTO_BUILDLINK3_MK:=	${FONTCACHEPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fontcacheproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	fontcacheproto
-.endif
+.if !defined(FONTCACHEPROTO_BUILDLINK3_MK)
+FONTCACHEPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfontcacheproto}
-BUILDLINK_PACKAGES+=	fontcacheproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fontcacheproto
-
-.if ${FONTCACHEPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.fontcacheproto+=	fontcacheproto>=0.1
 BUILDLINK_PKGSRCDIR.fontcacheproto?=	../../x11/fontcacheproto
-.endif	# FONTCACHEPROTO_BUILDLINK3_MK
+.endif # FONTCACHEPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fontcacheproto
diff --git a/x11/fontsproto/buildlink3.mk b/x11/fontsproto/buildlink3.mk
index a78cd400235..86cbf8cf9fc 100644
--- a/x11/fontsproto/buildlink3.mk
+++ b/x11/fontsproto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/03 17:19:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:40 joerg Exp $
 
 BUILDLINK_DEPMETHOD.fontsproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FONTSPROTO_BUILDLINK3_MK:=	${FONTSPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fontsproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	fontsproto
-.endif
+.if !defined(FONTSPROTO_BUILDLINK3_MK)
+FONTSPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfontsproto}
-BUILDLINK_PACKAGES+=	fontsproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fontsproto
-
-.if ${FONTSPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.fontsproto+=	fontsproto>=2.0
 BUILDLINK_PKGSRCDIR.fontsproto?=	../../x11/fontsproto
-.endif	# FONTSPROTO_BUILDLINK3_MK
+.endif # FONTSPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fontsproto
diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk
index 5e09105f3aa..69add363d83 100644
--- a/x11/fox/buildlink3.mk
+++ b/x11/fox/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/04/13 05:45:36 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:40 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FOX_BUILDLINK3_MK:=	${FOX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fox
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	fox
-.endif
+.if !defined(FOX_BUILDLINK3_MK)
+FOX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfox}
-BUILDLINK_PACKAGES+=	fox
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fox
-
-.if !empty(FOX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fox+=	fox>=1.6.25
 BUILDLINK_PKGSRCDIR.fox?=	../../x11/fox
 BUILDLINK_INCDIRS.fox?=		include/fox-1.6
-.endif	# FOX_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
@@ -28,5 +20,6 @@ BUILDLINK_INCDIRS.fox?=		include/fox-1.6
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
+.endif # FOX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fox
diff --git a/x11/glproto/buildlink3.mk b/x11/glproto/buildlink3.mk
index 1d4c49442f9..17da6cf1fa3 100644
--- a/x11/glproto/buildlink3.mk
+++ b/x11/glproto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 13:30:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:40 joerg Exp $
 
 BUILDLINK_DEPMETHOD.glproto?=	build
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLPROTO_BUILDLINK3_MK:=	${GLPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	glproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	glproto
-.endif
+.if !defined(GLPROTO_BUILDLINK3_MK)
+GLPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglproto}
-BUILDLINK_PACKAGES+=	glproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glproto
-
-.if ${GLPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.glproto+=	glproto>=1.4.6
 BUILDLINK_PKGSRCDIR.glproto?=	../../x11/glproto
-.endif	# GLPROTO_BUILDLINK3_MK
+.endif # GLPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-glproto
diff --git a/x11/gnome-control-center/buildlink3.mk b/x11/gnome-control-center/buildlink3.mk
index a241ee05b32..348b6749824 100644
--- a/x11/gnome-control-center/buildlink3.mk
+++ b/x11/gnome-control-center/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:40 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GNOME_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME_CONTROL_CENTER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-control-center
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gnome-control-center
-.endif
+.if !defined(GNOME_CONTROL_CENTER_BUILDLINK3_MK)
+GNOME_CONTROL_CENTER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-control-center}
-BUILDLINK_PACKAGES+=	gnome-control-center
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-control-center
-
-.if ${GNOME_CONTROL_CENTER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gnome-control-center+=	gnome-control-center>=2.20.0.1
 BUILDLINK_ABI_DEPENDS.gnome-control-center?=	gnome-control-center>=2.22.2.1nb1
 BUILDLINK_PKGSRCDIR.gnome-control-center?=	../../x11/gnome-control-center
-.endif	# GNOME_CONTROL_CENTER_BUILDLINK3_MK
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
@@ -27,5 +19,6 @@ BUILDLINK_PKGSRCDIR.gnome-control-center?=	../../x11/gnome-control-center
 .include "../../wm/metacity/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
+.endif # GNOME_CONTROL_CENTER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-control-center
diff --git a/x11/gnome-desktop-sharp/buildlink3.mk b/x11/gnome-desktop-sharp/buildlink3.mk
index 617d953cd27..362fa87e425 100644
--- a/x11/gnome-desktop-sharp/buildlink3.mk
+++ b/x11/gnome-desktop-sharp/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/10/24 20:59:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:41 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GNOME_DESKTOP_SHARP_BUILDLINK3_MK:=	${GNOME_DESKTOP_SHARP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-desktop-sharp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gnome-desktop-sharp
-.endif
+.if !defined(GNOME_DESKTOP_SHARP_BUILDLINK3_MK)
+GNOME_DESKTOP_SHARP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-desktop-sharp}
-BUILDLINK_PACKAGES+=	gnome-desktop-sharp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-desktop-sharp
-
-.if ${GNOME_DESKTOP_SHARP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gnome-desktop-sharp+=	gnome-desktop-sharp>=2.24.0
 BUILDLINK_PKGSRCDIR.gnome-desktop-sharp?=	../../x11/gnome-desktop-sharp
-.endif	# GNOME_DESKTOP_SHARP_BUILDLINK3_MK
 
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
@@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.gnome-desktop-sharp?=	../../x11/gnome-desktop-sharp
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../x11/gtksourceview2/buildlink3.mk"
 .include "../../x11/vte/buildlink3.mk"
+.endif # GNOME_DESKTOP_SHARP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-desktop-sharp
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 29c54a5926a..41f31b97a88 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.27 2009/03/16 12:35:59 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:25:40 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-desktop
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-desktop
-.endif
+.if !defined(GNOME_DESKTOP_BUILDLINK3_MK)
+GNOME_DESKTOP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-desktop}
-BUILDLINK_PACKAGES+=	gnome-desktop
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-desktop
-
-.if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-desktop+=	gnome-desktop>=2.25.3
 BUILDLINK_ABI_DEPENDS.gnome-desktop?=	gnome-desktop>=2.25.1
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
-.endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
+.endif # GNOME_DESKTOP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-desktop
diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk
index 91edfdbb128..9dffb4e56f8 100644
--- a/x11/gnome-mag/buildlink3.mk
+++ b/x11/gnome-mag/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:41 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_MAG_BUILDLINK3_MK:=	${GNOME_MAG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-mag
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-mag
-.endif
+.if !defined(GNOME_MAG_BUILDLINK3_MK)
+GNOME_MAG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-mag}
-BUILDLINK_PACKAGES+=	gnome-mag
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-mag
-
-.if !empty(GNOME_MAG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-mag+=	gnome-mag>=0.12.0
 BUILDLINK_ABI_DEPENDS.gnome-mag?=	gnome-mag>=0.12.4nb1
 BUILDLINK_PKGSRCDIR.gnome-mag?=	../../x11/gnome-mag
-.endif	# GNOME_MAG_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GNOME_MAG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-mag
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index dec75ce98f5..e6fef7e81aa 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.29 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2009/03/20 19:25:41 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_PANEL_BUILDLINK3_MK:=	${GNOME_PANEL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-panel
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-panel
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-panel}
-BUILDLINK_PACKAGES+=	gnome-panel
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-panel
+.if !defined(GNOME_PANEL_BUILDLINK3_MK)
+GNOME_PANEL_BUILDLINK3_MK:=
 
-.if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-panel+=		gnome-panel>=2.12.1nb3
 BUILDLINK_ABI_DEPENDS.gnome-panel?=	gnome-panel>=2.22.2nb1
 BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
@@ -21,7 +14,6 @@ pkgbase:= gnome-panel
 .if !empty(PKG_BUILD_OPTIONS.gnome-panel:Mevolution)
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .endif
-.endif	# GNOME_PANEL_BUILDLINK3_MK
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -37,5 +29,6 @@ pkgbase:= gnome-panel
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif # GNOME_PANEL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-panel
diff --git a/x11/gnome-sharp/buildlink3.mk b/x11/gnome-sharp/buildlink3.mk
index 98cefef5b4f..5ddacba99a9 100644
--- a/x11/gnome-sharp/buildlink3.mk
+++ b/x11/gnome-sharp/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/10/24 20:51:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:41 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_SHARP_BUILDLINK3_MK:=	${GNOME_SHARP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-sharp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gnome-sharp
-.endif
+.if !defined(GNOME_SHARP_BUILDLINK3_MK)
+GNOME_SHARP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-sharp}
-BUILDLINK_PACKAGES+=	gnome-sharp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-sharp
-
-.if ${GNOME_SHARP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gnome-sharp+=	gnome-sharp>=2.24.0
 BUILDLINK_PKGSRCDIR.gnome-sharp?=	../../x11/gnome-sharp
-.endif	# GNOME_SHARP_BUILDLINK3_MK
 
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.gnome-sharp?=	../../x11/gnome-sharp
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
+.endif # GNOME_SHARP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-sharp
diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk
index e440b935a4c..1f47ebbae53 100644
--- a/x11/gnustep-back/buildlink3.mk
+++ b/x11/gnustep-back/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/01/18 05:09:55 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:41 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNUSTEP_BACK_BUILDLINK3_MK:=	${GNUSTEP_BACK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnustep-back
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnustep-back
-.endif
+.if !defined(GNUSTEP_BACK_BUILDLINK3_MK)
+GNUSTEP_BACK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-back}
-BUILDLINK_PACKAGES+=	gnustep-back
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-back
-
-.if !empty(GNUSTEP_BACK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-back+=	gnustep-back>=0.9.2
 BUILDLINK_ABI_DEPENDS.gnustep-back+=	gnustep-back>=0.12.0nb1
 BUILDLINK_PKGSRCDIR.gnustep-back?=	../../x11/gnustep-back
-.endif	# GNUSTEP_BACK_BUILDLINK3_MK
 
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/gnustep-gui/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.endif # GNUSTEP_BACK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnustep-back
diff --git a/x11/gnustep-gui/buildlink3.mk b/x11/gnustep-gui/buildlink3.mk
index 7c0ec96763a..58d47b749df 100644
--- a/x11/gnustep-gui/buildlink3.mk
+++ b/x11/gnustep-gui/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:09:55 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:41 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNUSTEP_GUI_BUILDLINK3_MK:=	${GNUSTEP_GUI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnustep-gui
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnustep-gui
-.endif
+.if !defined(GNUSTEP_GUI_BUILDLINK3_MK)
+GNUSTEP_GUI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-gui}
-BUILDLINK_PACKAGES+=	gnustep-gui
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-gui
-
-.if !empty(GNUSTEP_GUI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-gui+=	gnustep-gui>=0.9.2
 BUILDLINK_ABI_DEPENDS.gnustep-gui+=	gnustep-gui>=0.12.0nb1
 BUILDLINK_PKGSRCDIR.gnustep-gui?=	../../x11/gnustep-gui
@@ -41,13 +34,12 @@ PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/PostSc
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Services\/GSspell.service$$/ { next; }
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Services\/GSspell.service\/Resources$$/ { next; }
 
-.endif	# GNUSTEP_GUI_BUILDLINK3_MK
-
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../devel/gnustep-base/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.endif # GNUSTEP_GUI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnustep-gui
diff --git a/x11/gnustep-preferences/buildlink3.mk b/x11/gnustep-preferences/buildlink3.mk
index ec219c8f21c..70262cf29ef 100644
--- a/x11/gnustep-preferences/buildlink3.mk
+++ b/x11/gnustep-preferences/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/12/28 07:56:38 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:41 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GNUSTEP_PREFERENCES_BUILDLINK3_MK:=	${GNUSTEP_PREFERENCES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnustep-preferences
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnustep-preferences
-.endif
+.if !defined(GNUSTEP_PREFERENCES_BUILDLINK3_MK)
+GNUSTEP_PREFERENCES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-preferences}
-BUILDLINK_PACKAGES+=	gnustep-preferences
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-preferences
-
-.if !empty(GNUSTEP_PREFERENCES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-preferences+=	gnustep-preferences>=1.2.0
 BUILDLINK_ABI_DEPENDS.gnustep-preferences+=	gnustep-preferences>=1.2.0nb16
 BUILDLINK_PKGSRCDIR.gnustep-preferences?=	../../x11/gnustep-preferences
-.endif	# GNUSTEP_PREFERENCES_BUILDLINK3_MK
 
 .include "../../x11/gnustep-back/buildlink3.mk"
+.endif # GNUSTEP_PREFERENCES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnustep-preferences
diff --git a/x11/gtk+extra/buildlink3.mk b/x11/gtk+extra/buildlink3.mk
index 6d03dd5a9db..0afefae249b 100644
--- a/x11/gtk+extra/buildlink3.mk
+++ b/x11/gtk+extra/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/19 16:20:52 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:41 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTK_EXTRA_BUILDLINK3_MK:=	${GTK+EXTRA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtk+extra
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtk+extra
-.endif
+.if !defined(GTK_EXTRA_BUILDLINK3_MK)
+GTK_EXTRA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk+extra}
-BUILDLINK_PACKAGES+=	gtk+extra
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk+extra
-
-.if !empty(GTK_EXTRA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk+extra+=	gtk+extra>=0.99.17nb2
 BUILDLINK_ABI_DEPENDS.gtk+extra?=	gtk+extra>=0.99.17nb5
 BUILDLINK_PKGSRCDIR.gtk+extra?=	../../x11/gtk+extra
-.endif	# GTK_EXTRA_BUILDLINK3_MK
 
 .include "../../x11/gtk/buildlink3.mk"
+.endif # GTK_EXTRA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtk+extra
diff --git a/x11/gtk-sharp/buildlink3.mk b/x11/gtk-sharp/buildlink3.mk
index 669730a68f7..28092ee0b8c 100644
--- a/x11/gtk-sharp/buildlink3.mk
+++ b/x11/gtk-sharp/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/06 14:28:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:41 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTK_SHARP_BUILDLINK3_MK:=	${GTK_SHARP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtk-sharp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gtk-sharp
-.endif
+.if !defined(GTK_SHARP_BUILDLINK3_MK)
+GTK_SHARP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk-sharp}
-BUILDLINK_PACKAGES+=	gtk-sharp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk-sharp
-
-.if ${GTK_SHARP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gtk-sharp+=	gtk-sharp>=2.12.1
 BUILDLINK_PKGSRCDIR.gtk-sharp?=		../../x11/gtk-sharp
-.endif	# GTK_SHARP_BUILDLINK3_MK
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/gapi-2.0$$/ \
 				{ print "@comment in gtk-sharp: " $$0; next; }
@@ -22,5 +14,6 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/mono\/gtk-sharp-2.0$$/ \
 				{ print "@comment in gtk-sharp: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-sharp-2.0$$/ \
 				{ print "@comment in gtk-sharp: " $$0; next; }
+.endif # GTK_SHARP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtk-sharp
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index 1121a5d658b..7b17d6fa28d 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/01/02 11:26:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:41 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtk
-.endif
+.if !defined(GTK_BUILDLINK3_MK)
+GTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk}
-BUILDLINK_PACKAGES+=	gtk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk
-
-.if !empty(GTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk+=		gtk+>=1.2.10
 BUILDLINK_ABI_DEPENDS.gtk+=	gtk+>=1.2.10nb9
 BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
-.endif	# GTK_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
+.endif # GTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtk
diff --git a/x11/gtk2+extra/buildlink3.mk b/x11/gtk2+extra/buildlink3.mk
index 85b697cf99a..97c029d7253 100644
--- a/x11/gtk2+extra/buildlink3.mk
+++ b/x11/gtk2+extra/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/19 16:20:52 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTK2_EXTRA_BUILDLINK3_MK:=	${GTK2+EXTRA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtk2+extra
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtk2+extra
-.endif
+.if !defined(GTK2_EXTRA_BUILDLINK3_MK)
+GTK2_EXTRA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2+extra}
-BUILDLINK_PACKAGES+=	gtk2+extra
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk2+extra
-
-.if !empty(GTK2_EXTRA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk2+extra+=	gtk2+extra>=2.1.1
 BUILDLINK_ABI_DEPENDS.gtk2+extra?=	gtk2+extra>=2.1.1nb3
 BUILDLINK_PKGSRCDIR.gtk2+extra?=	../../x11/gtk2+extra
-.endif	# GTK2_EXTRA_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GTK2_EXTRA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtk2+extra
diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk
index 9b9d2c9875d..d598db0acc9 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTK2_ENGINES_BUILDLINK3_MK:=	${GTK2_ENGINES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtk2-engines
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtk2-engines
-.endif
+.if !defined(GTK2_ENGINES_BUILDLINK3_MK)
+GTK2_ENGINES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2-engines}
-BUILDLINK_PACKAGES+=	gtk2-engines
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk2-engines
-
-.if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk2-engines+=	gtk2-engines>=2.6.0
 BUILDLINK_ABI_DEPENDS.gtk2-engines?=	gtk2-engines>=2.6.8nb1
 BUILDLINK_PKGSRCDIR.gtk2-engines?=	../../x11/gtk2-engines
-.endif	# GTK2_ENGINES_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GTK2_ENGINES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtk2-engines
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 96ef70ad066..2d75994aa87 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.39 2008/09/11 09:34:04 dsainty Exp $
+# $NetBSD: buildlink3.mk,v 1.40 2009/03/20 19:25:42 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GTK2_BUILDLINK3_MK:=	${GTK2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtk2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtk2
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2}
-BUILDLINK_PACKAGES+=	gtk2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk2
+.if !defined(GTK2_BUILDLINK3_MK)
+GTK2_BUILDLINK3_MK:=
 
-.if !empty(GTK2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
 BUILDLINK_ABI_DEPENDS.gtk2+=	gtk2+>=2.8.17nb1
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
@@ -22,7 +15,6 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0\/(engines|filesystems|immodules|loaders|
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0\/2.10.0$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0\/2.10.0\/(engines|filesystems|immodules|loaders|modules|printbackends)$$/ \
 				{ print "@comment in gtk2: " $$0; next; }
-.endif	# GTK2_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -49,5 +41,6 @@ pkgbase := gtk2
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.endif # GTK2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtk2
diff --git a/x11/gtkglarea/buildlink3.mk b/x11/gtkglarea/buildlink3.mk
index ca5356a3899..19bf04eb8b7 100644
--- a/x11/gtkglarea/buildlink3.mk
+++ b/x11/gtkglarea/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTKGLAREA_BUILDLINK3_MK:=	${GTKGLAREA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtkglarea
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtkglarea
-.endif
+.if !defined(GTKGLAREA_BUILDLINK3_MK)
+GTKGLAREA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkglarea}
-BUILDLINK_PACKAGES+=	gtkglarea
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkglarea
-
-.if !empty(GTKGLAREA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkglarea+=	gtkglarea>=1.2.2nb3
 BUILDLINK_ABI_DEPENDS.gtkglarea?=	gtkglarea>=1.2.3nb2
 BUILDLINK_PKGSRCDIR.gtkglarea?=	../../x11/gtkglarea
-.endif	# GTKGLAREA_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.endif # GTKGLAREA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtkglarea
diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk
index d77ff4efa2e..34b95f16e05 100644
--- a/x11/gtkmm/buildlink3.mk
+++ b/x11/gtkmm/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/10/16 21:34:08 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:42 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GTKMM_BUILDLINK3_MK:=	${GTKMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtkmm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtkmm
-.endif
+.if !defined(GTKMM_BUILDLINK3_MK)
+GTKMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkmm}
-BUILDLINK_PACKAGES+=	gtkmm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkmm
-
-.if !empty(GTKMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.6.3
 BUILDLINK_ABI_DEPENDS.gtkmm+=	gtkmm>=2.14.1
 BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtkmm
-.endif	# GTKMM_BUILDLINK3_MK
 
 .include "../../devel/pangomm/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GTKMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtkmm
diff --git a/x11/gtksourceview-sharp2/buildlink3.mk b/x11/gtksourceview-sharp2/buildlink3.mk
index ed9b4a257e2..488fa18e914 100644
--- a/x11/gtksourceview-sharp2/buildlink3.mk
+++ b/x11/gtksourceview-sharp2/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/17 22:44:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:42 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK:=	${GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtksourceview-sharp2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gtksourceview-sharp2
-.endif
+.if !defined(GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK)
+GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtksourceview-sharp2}
-BUILDLINK_PACKAGES+=	gtksourceview-sharp2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtksourceview-sharp2
-
-.if ${GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gtksourceview-sharp2+=	gtksourceview-sharp2>=0.10
 BUILDLINK_PKGSRCDIR.gtksourceview-sharp2?=	../../x11/gtksourceview-sharp2
-.endif	# GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK
+.endif # GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtksourceview-sharp2
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
index 8e4890e8891..a71106e667e 100644
--- a/x11/gtksourceview/buildlink3.mk
+++ b/x11/gtksourceview/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/02/20 11:28:19 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTKSOURCEVIEW_BUILDLINK3_MK:=	${GTKSOURCEVIEW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtksourceview
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gtksourceview
-.endif
+.if !defined(GTKSOURCEVIEW_BUILDLINK3_MK)
+GTKSOURCEVIEW_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtksourceview}
-BUILDLINK_PACKAGES+=	gtksourceview
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtksourceview
-
-.if ${GTKSOURCEVIEW_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gtksourceview+=	gtksourceview>=1.8.5
 BUILDLINK_PKGSRCDIR.gtksourceview?=	../../x11/gtksourceview
-.endif	# GTKSOURCEVIEW_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.gtksourceview?=	../../x11/gtksourceview
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GTKSOURCEVIEW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtksourceview
diff --git a/x11/gtksourceview2/buildlink3.mk b/x11/gtksourceview2/buildlink3.mk
index 3541203c4b4..bb822ee46e8 100644
--- a/x11/gtksourceview2/buildlink3.mk
+++ b/x11/gtksourceview2/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/02/22 08:15:47 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTKSOURCEVIEW2_BUILDLINK3_MK:=	${GTKSOURCEVIEW2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtksourceview2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gtksourceview2
-.endif
+.if !defined(GTKSOURCEVIEW2_BUILDLINK3_MK)
+GTKSOURCEVIEW2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtksourceview2}
-BUILDLINK_PACKAGES+=	gtksourceview2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtksourceview2
-
-.if ${GTKSOURCEVIEW2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gtksourceview2+=	gtksourceview2>=2.0.2
 BUILDLINK_PKGSRCDIR.gtksourceview2?=	../../x11/gtksourceview2
-.endif	# GTKSOURCEVIEW2_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GTKSOURCEVIEW2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtksourceview2
diff --git a/x11/inputproto/buildlink3.mk b/x11/inputproto/buildlink3.mk
index bd7b226bf06..43565b97d9d 100644
--- a/x11/inputproto/buildlink3.mk
+++ b/x11/inputproto/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/07/30 09:56:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-INPUTPROTO_BUILDLINK3_MK:=	${INPUTPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	inputproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	inputproto
-.endif
+.if !defined(INPUTPROTO_BUILDLINK3_MK)
+INPUTPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ninputproto}
-BUILDLINK_PACKAGES+=	inputproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}inputproto
-
-.if ${INPUTPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.inputproto+=	inputproto>=1.4
 BUILDLINK_PKGSRCDIR.inputproto?=	../../x11/inputproto
 BUILDLINK_DEPMETHOD.inputproto?=	build
-.endif	# INPUTPROTO_BUILDLINK3_MK
+.endif # INPUTPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-inputproto
diff --git a/x11/kbproto/buildlink3.mk b/x11/kbproto/buildlink3.mk
index c9f0d927c9a..293d83f0b93 100644
--- a/x11/kbproto/buildlink3.mk
+++ b/x11/kbproto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 18:08:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:42 joerg Exp $
 
 BUILDLINK_DEPMETHOD.kbproto?=	build
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-KBPROTO_BUILDLINK3_MK:=	${KBPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kbproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	kbproto
-.endif
+.if !defined(KBPROTO_BUILDLINK3_MK)
+KBPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkbproto}
-BUILDLINK_PACKAGES+=	kbproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kbproto
-
-.if ${KBPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.kbproto+=	kbproto>=1.0.2
 BUILDLINK_PKGSRCDIR.kbproto?=	../../x11/kbproto
-.endif	# KBPROTO_BUILDLINK3_MK
+.endif # KBPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kbproto
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index 53157ffb688..a5e77c8ffe1 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.27 2008/01/18 05:10:05 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:25:42 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kdebase
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	kdebase
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdebase}
-BUILDLINK_PACKAGES+=	kdebase
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdebase
+.if !defined(KDEBASE_BUILDLINK3_MK)
+KDEBASE_BUILDLINK3_MK:=
 
-.if !empty(KDEBASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdebase+=	kdebase>=3.5.0nb2
 BUILDLINK_ABI_DEPENDS.kdebase?=	kdebase>=3.5.8nb5
 BUILDLINK_PKGSRCDIR.kdebase?=	../../x11/kdebase3
-.endif	# KDEBASE_BUILDLINK3_MK
 
 pkgbase := kdebase
 .include "../../mk/pkg-build-options.mk"
@@ -35,5 +27,6 @@ BUILDLINK_API_DEPENDS.Xrandr+=      Xrandr>=1.0
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
+.endif # KDEBASE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kdebase
diff --git a/x11/kdebindings-ruby/buildlink3.mk b/x11/kdebindings-ruby/buildlink3.mk
index 4fab64808f0..73346097cdf 100644
--- a/x11/kdebindings-ruby/buildlink3.mk
+++ b/x11/kdebindings-ruby/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/01/18 05:10:05 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:43 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-KDEBINDINGS_RUBY_BUILDLINK3_MK:=	${KDEBINDINGS_RUBY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kdebindings-ruby
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	kdebindings-ruby
-.endif
+.if !defined(KDEBINDINGS_RUBY_BUILDLINK3_MK)
+KDEBINDINGS_RUBY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdebindings-ruby}
-BUILDLINK_PACKAGES+=	kdebindings-ruby
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdebindings-ruby
-
-.if ${KDEBINDINGS_RUBY_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.kdebindings-ruby+=	kdebindings-ruby>=3.5.5
 BUILDLINK_ABI_DEPENDS.kdebindings-ruby?=	kdebindings-ruby>=3.5.8nb2
 BUILDLINK_PKGSRCDIR.kdebindings-ruby?=	../../x11/kdebindings-ruby
-.endif	# KDEBINDINGS_RUBY_BUILDLINK3_MK
 
 .include "../../lang/ruby/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
+.endif # KDEBINDINGS_RUBY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kdebindings-ruby
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index 81f999e4db7..7aba15b0f52 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,23 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.29 2008/01/18 05:10:06 tnn Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-KDELIBS_BUILDLINK3_MK:=	${KDELIBS_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.30 2009/03/20 19:25:43 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	kdelibs
-.endif
+BUILDLINK_TREE+=	kdelibs
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdelibs}
-BUILDLINK_PACKAGES+=	kdelibs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdelibs
+.if !defined(KDELIBS_BUILDLINK3_MK)
+KDELIBS_BUILDLINK3_MK:=
 
-.if !empty(KDELIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs>=3.5.6
 BUILDLINK_ABI_DEPENDS.kdelibs?=	kdelibs>=3.5.8nb5
 BUILDLINK_PKGSRCDIR.kdelibs?=	../../x11/kdelibs3
-.endif	# KDELIBS_BUILDLINK3_MK
 
 pkgbase := kdelibs
 .include "../../mk/pkg-build-options.mk"
@@ -43,5 +35,6 @@ pkgbase := kdelibs
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
+.endif # KDELIBS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kdelibs
diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk
index 0d0ae4c6af0..c857cbc746a 100644
--- a/x11/lablgtk/buildlink3.mk
+++ b/x11/lablgtk/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/09/21 13:00:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:43 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LABLGTK_BUILDLINK3_MK:=	${LABLGTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	lablgtk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	lablgtk
-.endif
+.if !defined(LABLGTK_BUILDLINK3_MK)
+LABLGTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlablgtk}
-BUILDLINK_PACKAGES+=	lablgtk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lablgtk
-
-.if !empty(LABLGTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lablgtk+=	lablgtk>=2.6.0nb3
 BUILDLINK_ABI_DEPENDS.lablgtk?=	lablgtk>=2.6.0nb5
 BUILDLINK_PKGSRCDIR.lablgtk?=	../../x11/lablgtk
-.endif	# LABLGTK_BUILDLINK3_MK
+.endif # LABLGTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-lablgtk
diff --git a/x11/lablgtk1/buildlink3.mk b/x11/lablgtk1/buildlink3.mk
index 80f4beafd8c..451e999b505 100644
--- a/x11/lablgtk1/buildlink3.mk
+++ b/x11/lablgtk1/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/09/21 13:00:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:43 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LABLGTK1_BUILDLINK3_MK:=	${LABLGTK1_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	lablgtk1
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	lablgtk1
-.endif
+.if !defined(LABLGTK1_BUILDLINK3_MK)
+LABLGTK1_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlablgtk1}
-BUILDLINK_PACKAGES+=	lablgtk1
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lablgtk1
-
-.if !empty(LABLGTK1_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lablgtk1+=	lablgtk1>=1.2.5nb3
 BUILDLINK_ABI_DEPENDS.lablgtk1?=	lablgtk1>=1.2.7nb2
 BUILDLINK_PKGSRCDIR.lablgtk1?=		../../x11/lablgtk1
-.endif	# LABLGTK1_BUILDLINK3_MK
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
+.endif # LABLGTK1_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-lablgtk1
diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk
index 268be1310f9..d3423eaf01e 100644
--- a/x11/lesstif/buildlink3.mk
+++ b/x11/lesstif/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.17 2008/05/24 15:01:38 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:43 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LESSTIF_BUILDLINK3_MK:=	${LESSTIF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	lesstif
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	lesstif
-.endif
+.if !defined(LESSTIF_BUILDLINK3_MK)
+LESSTIF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlesstif}
-BUILDLINK_PACKAGES+=	lesstif
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lesstif
-
-.if !empty(LESSTIF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lesstif+=	lesstif>=0.95.0nb1
 BUILDLINK_PKGSRCDIR.lesstif?=	../../x11/lesstif
-.endif	# LESSTIF_BUILDLINK3_MK
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/printproto/buildlink3.mk"
+.endif # LESSTIF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-lesstif
diff --git a/x11/libFS/buildlink3.mk b/x11/libFS/buildlink3.mk
index d2fd474cf80..b1e216d0fd3 100644
--- a/x11/libFS/buildlink3.mk
+++ b/x11/libFS/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/03 17:24:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:43 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBFS_BUILDLINK3_MK:=	${LIBFS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libFS
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libFS
-.endif
+.if !defined(LIBFS_BUILDLINK3_MK)
+LIBFS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibFS}
-BUILDLINK_PACKAGES+=	libFS
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libFS
-
-.if ${LIBFS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libFS+=	libFS>=1.0.0
 BUILDLINK_PKGSRCDIR.libFS?=	../../x11/libFS
-.endif	# LIBFS_BUILDLINK3_MK
 
 .include "../../x11/fontsproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBFS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libFS
diff --git a/x11/libICE/buildlink3.mk b/x11/libICE/buildlink3.mk
index fc6c2117007..0b18af51f5a 100644
--- a/x11/libICE/buildlink3.mk
+++ b/x11/libICE/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2007/12/17 13:27:28 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:43 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,22 +6,15 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBICE_BUILDLINK3_MK:=	${LIBICE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libICE
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libICE
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibICE}
-BUILDLINK_PACKAGES+=	libICE
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libICE
+.if !defined(LIBICE_BUILDLINK3_MK)
+LIBICE_BUILDLINK3_MK:=
 
-.if ${LIBICE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libICE+=	libICE>=0.99.1
 BUILDLINK_PKGSRCDIR.libICE?=	../../x11/libICE
-.endif	# LIBICE_BUILDLINK3_MK
+.endif # LIBICE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libICE
 
 .endif
diff --git a/x11/libSM/buildlink3.mk b/x11/libSM/buildlink3.mk
index 4900e1ff751..e0c06795326 100644
--- a/x11/libSM/buildlink3.mk
+++ b/x11/libSM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/12/17 14:24:06 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:43 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,24 +6,17 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBSM_BUILDLINK3_MK:=	${LIBSM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libSM
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libSM
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibSM}
-BUILDLINK_PACKAGES+=	libSM
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libSM
+.if !defined(LIBSM_BUILDLINK3_MK)
+LIBSM_BUILDLINK3_MK:=
 
-.if ${LIBSM_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libSM+=	libSM>=0.99.2
 BUILDLINK_PKGSRCDIR.libSM?=	../../x11/libSM
-.endif	# LIBSM_BUILDLINK3_MK
 
 .include "../../x11/libICE/buildlink3.mk"
+.endif # LIBSM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libSM
 
 .endif
diff --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk
index 4f1848035d1..7fabade9f01 100644
--- a/x11/libX11/buildlink3.mk
+++ b/x11/libX11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2007/12/15 15:21:53 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:43 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,31 +6,24 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBX11_BUILDLINK3_MK:=	${LIBX11_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libX11
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libX11
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibX11}
-BUILDLINK_PACKAGES+=	libX11
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libX11
+.if !defined(LIBX11_BUILDLINK3_MK)
+LIBX11_BUILDLINK3_MK:=
 
-.if ${LIBX11_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.1
 BUILDLINK_ABI_DEPENDS.libX11+=	libX11>=0.99
 BUILDLINK_PKGSRCDIR.libX11?=	../../x11/libX11
 
 X11_LDFLAGS+=	${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
 X11_LDFLAGS+=	-L${BUILDLINK_PREFIX.libX11}/lib
-.endif	# LIBX11_BUILDLINK3_MK
 
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBX11_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libX11
 
 .endif
diff --git a/x11/libXScrnSaver/buildlink3.mk b/x11/libXScrnSaver/buildlink3.mk
index 4e990d9f568..15ddc4c21fc 100644
--- a/x11/libXScrnSaver/buildlink3.mk
+++ b/x11/libXScrnSaver/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:43 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXSCRNSAVER_BUILDLINK3_MK:=	${LIBXSCRNSAVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXScrnSaver
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXScrnSaver
-.endif
+.if !defined(LIBXSCRNSAVER_BUILDLINK3_MK)
+LIBXSCRNSAVER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXScrnSaver}
-BUILDLINK_PACKAGES+=	libXScrnSaver
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXScrnSaver
-
-.if ${LIBXSCRNSAVER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXScrnSaver+=	libXScrnSaver>=1.1.2
 BUILDLINK_PKGSRCDIR.libXScrnSaver?=	../../x11/libXScrnSaver
-.endif	# LIBXSCRNSAVER_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/scrnsaverproto/buildlink3.mk"
+.endif # LIBXSCRNSAVER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXScrnSaver
diff --git a/x11/libXTrap/buildlink3.mk b/x11/libXTrap/buildlink3.mk
index d1c6fa027df..e5d72a0e219 100644
--- a/x11/libXTrap/buildlink3.mk
+++ b/x11/libXTrap/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 20:58:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXTRAP_BUILDLINK3_MK:=	${LIBXTRAP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXTrap
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXTrap
-.endif
+.if !defined(LIBXTRAP_BUILDLINK3_MK)
+LIBXTRAP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXTrap}
-BUILDLINK_PACKAGES+=	libXTrap
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXTrap
-
-.if ${LIBXTRAP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXTrap+=	libXTrap>=1.0.0
 BUILDLINK_PKGSRCDIR.libXTrap?=	../../x11/libXTrap
-.endif	# LIBXTRAP_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.endif # LIBXTRAP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXTrap
diff --git a/x11/libXau/buildlink3.mk b/x11/libXau/buildlink3.mk
index 8e745b21349..c477be048dd 100644
--- a/x11/libXau/buildlink3.mk
+++ b/x11/libXau/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/11/25 00:09:19 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:44 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXAU_BUILDLINK3_MK:=	${LIBXAU_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXau
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXau
-.endif
+.if !defined(LIBXAU_BUILDLINK3_MK)
+LIBXAU_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXau}
-BUILDLINK_PACKAGES+=	libXau
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXau
-
-.if ${LIBXAU_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXau+=	libXau>=1.0
 BUILDLINK_PKGSRCDIR.libXau?=	../../x11/libXau
-.endif	# LIBXAU_BUILDLINK3_MK
 
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXAU_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXau
diff --git a/x11/libXaw/buildlink3.mk b/x11/libXaw/buildlink3.mk
index 294c80461b4..d543bd002a5 100644
--- a/x11/libXaw/buildlink3.mk
+++ b/x11/libXaw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/11/10 17:21:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:44 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,22 +6,14 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXAW_BUILDLINK3_MK:=	${LIBXAW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXaw
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXaw
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXaw}
-BUILDLINK_PACKAGES+=	libXaw
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXaw
+.if !defined(LIBXAW_BUILDLINK3_MK)
+LIBXAW_BUILDLINK3_MK:=
 
-.if ${LIBXAW_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXaw+=	libXaw>=1.0.5
 BUILDLINK_PKGSRCDIR.libXaw?=	../../x11/libXaw
 BUILDLINK_TRANSFORM+=		l:Xaw:Xaw7
-.endif	# LIBXAW_BUILDLINK3_MK
 
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
@@ -32,7 +24,8 @@ BUILDLINK_TRANSFORM+=		l:Xaw:Xaw7
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXAW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXaw
 
 .endif
diff --git a/x11/libXcomposite/buildlink3.mk b/x11/libXcomposite/buildlink3.mk
index afbada7ca60..debc91da2a8 100644
--- a/x11/libXcomposite/buildlink3.mk
+++ b/x11/libXcomposite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/12/15 20:16:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,28 +6,21 @@
 .include "../../x11/Xcomposite/buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXCOMPOSITE_BUILDLINK3_MK:=	${LIBXCOMPOSITE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXcomposite
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXcomposite
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXcomposite}
-BUILDLINK_PACKAGES+=	libXcomposite
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXcomposite
+.if !defined(LIBXCOMPOSITE_BUILDLINK3_MK)
+LIBXCOMPOSITE_BUILDLINK3_MK:=
 
-.if ${LIBXCOMPOSITE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXcomposite+=	libXcomposite>=0.3.1
 BUILDLINK_PKGSRCDIR.libXcomposite?=	../../x11/libXcomposite
-.endif	# LIBXCOMPOSITE_BUILDLINK3_MK
 
 .include "../../x11/compositeproto/buildlink3.mk"
 .include "../../x11/fixesproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
+.endif # LIBXCOMPOSITE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXcomposite
 
 .endif
diff --git a/x11/libXcursor/buildlink3.mk b/x11/libXcursor/buildlink3.mk
index 2d5dbbe662c..8f306f4d4f4 100644
--- a/x11/libXcursor/buildlink3.mk
+++ b/x11/libXcursor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,27 +6,20 @@
 .include "../../x11/xcursor/buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXCURSOR_BUILDLINK3_MK:=	${LIBXCURSOR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXcursor
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXcursor
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXcursor}
-BUILDLINK_PACKAGES+=	libXcursor
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXcursor
+.if !defined(LIBXCURSOR_BUILDLINK3_MK)
+LIBXCURSOR_BUILDLINK3_MK:=
 
-.if ${LIBXCURSOR_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXcursor+=	libXcursor>=1.1.1
 BUILDLINK_PKGSRCDIR.libXcursor?=	../../x11/libXcursor
-.endif	# LIBXCURSOR_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXCURSOR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXcursor
 
 .endif
diff --git a/x11/libXdamage/buildlink3.mk b/x11/libXdamage/buildlink3.mk
index 24feddda819..e7f2f9aea9e 100644
--- a/x11/libXdamage/buildlink3.mk
+++ b/x11/libXdamage/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:44 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXDAMAGE_BUILDLINK3_MK:=	${LIBXDAMAGE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXdamage
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXdamage
-.endif
+.if !defined(LIBXDAMAGE_BUILDLINK3_MK)
+LIBXDAMAGE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXdamage}
-BUILDLINK_PACKAGES+=	libXdamage
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXdamage
-
-.if ${LIBXDAMAGE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXdamage+=	libXdamage>=1.0.3
 BUILDLINK_PKGSRCDIR.libXdamage?=	../../x11/libXdamage
-.endif	# LIBXDAMAGE_BUILDLINK3_MK
 
 .include "../../x11/damageproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXDAMAGE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXdamage
diff --git a/x11/libXdmcp/buildlink3.mk b/x11/libXdmcp/buildlink3.mk
index 689600f7eaf..193fb39eddb 100644
--- a/x11/libXdmcp/buildlink3.mk
+++ b/x11/libXdmcp/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 17:59:48 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXDMCP_BUILDLINK3_MK:=	${LIBXDMCP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXdmcp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXdmcp
-.endif
+.if !defined(LIBXDMCP_BUILDLINK3_MK)
+LIBXDMCP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXdmcp}
-BUILDLINK_PACKAGES+=	libXdmcp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXdmcp
-
-.if ${LIBXDMCP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXdmcp+=	libXdmcp>=0.99
 BUILDLINK_PKGSRCDIR.libXdmcp?=	../../x11/libXdmcp
-.endif	# LIBXDMCP_BUILDLINK3_MK
+.endif # LIBXDMCP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXdmcp
diff --git a/x11/libXevie/buildlink3.mk b/x11/libXevie/buildlink3.mk
index 0aee158e886..9b25712c3ab 100644
--- a/x11/libXevie/buildlink3.mk
+++ b/x11/libXevie/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 21:50:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXEVIE_BUILDLINK3_MK:=	${LIBXEVIE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXevie
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXevie
-.endif
+.if !defined(LIBXEVIE_BUILDLINK3_MK)
+LIBXEVIE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXevie}
-BUILDLINK_PACKAGES+=	libXevie
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXevie
-
-.if ${LIBXEVIE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXevie+=	libXevie>=1.0.2
 BUILDLINK_PKGSRCDIR.libXevie?=	../../x11/libXevie
-.endif	# LIBXEVIE_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXEVIE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXevie
diff --git a/x11/libXext/buildlink3.mk b/x11/libXext/buildlink3.mk
index 1537467a023..5eb51446f49 100644
--- a/x11/libXext/buildlink3.mk
+++ b/x11/libXext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2007/12/16 23:38:12 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:44 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,26 +6,19 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXEXT_BUILDLINK3_MK:=	${LIBXEXT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXext
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXext
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXext}
-BUILDLINK_PACKAGES+=	libXext
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXext
+.if !defined(LIBXEXT_BUILDLINK3_MK)
+LIBXEXT_BUILDLINK3_MK:=
 
-.if ${LIBXEXT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXext+=	libXext>=0.99.0
 BUILDLINK_PKGSRCDIR.libXext?=	../../x11/libXext
-.endif	# LIBXEXT_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 # XXX don't include xextproto/bl3 here; packages checking for xext.pc must
 # include it theirselfes
+.endif # LIBXEXT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXext
 
 .endif
diff --git a/x11/libXfixes/buildlink3.mk b/x11/libXfixes/buildlink3.mk
index 9f1781996e7..80a1ec29f84 100644
--- a/x11/libXfixes/buildlink3.mk
+++ b/x11/libXfixes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,25 +6,18 @@
 .include "../../x11/Xfixes/buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXFIXES_BUILDLINK3_MK:=	${LIBXFIXES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXfixes
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXfixes
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXfixes}
-BUILDLINK_PACKAGES+=	libXfixes
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXfixes
+.if !defined(LIBXFIXES_BUILDLINK3_MK)
+LIBXFIXES_BUILDLINK3_MK:=
 
-.if ${LIBXFIXES_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXfixes+=	libXfixes>=4.0.1
 BUILDLINK_PKGSRCDIR.libXfixes?=	../../x11/libXfixes
-.endif	# LIBXFIXES_BUILDLINK3_MK
 
 .include "../../x11/fixesproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif # LIBXFIXES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXfixes
 
 .endif
diff --git a/x11/libXfont/buildlink3.mk b/x11/libXfont/buildlink3.mk
index 101219ae571..6deb013d17b 100644
--- a/x11/libXfont/buildlink3.mk
+++ b/x11/libXfont/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 21:45:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:45 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXFONT_BUILDLINK3_MK:=	${LIBXFONT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXfont
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXfont
-.endif
+.if !defined(LIBXFONT_BUILDLINK3_MK)
+LIBXFONT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXfont}
-BUILDLINK_PACKAGES+=	libXfont
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXfont
-
-.if ${LIBXFONT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXfont+=	libXfont>=1.2.0
 BUILDLINK_PKGSRCDIR.libXfont?=	../../x11/libXfont
-.endif	# LIBXFONT_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/libfontenc/buildlink3.mk"
 .include "../../x11/fontsproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXFONT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXfont
diff --git a/x11/libXft/buildlink3.mk b/x11/libXft/buildlink3.mk
index 8c07492659b..00c07ae249b 100644
--- a/x11/libXft/buildlink3.mk
+++ b/x11/libXft/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/07/15 13:24:35 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:45 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,28 +6,21 @@
 .include "../../fonts/Xft2/buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXFT_BUILDLINK3_MK:=	${LIBXFT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXft
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXft
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXft}
-BUILDLINK_PACKAGES+=	libXft
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXft
+.if !defined(LIBXFT_BUILDLINK3_MK)
+LIBXFT_BUILDLINK3_MK:=
 
-.if ${LIBXFT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXft+=	libXft>=2.1.10
 BUILDLINK_PKGSRCDIR.libXft?=	../../x11/libXft
-.endif	# LIBXFT_BUILDLINK3_MK
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXFT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXft
 
 .endif
diff --git a/x11/libXi/buildlink3.mk b/x11/libXi/buildlink3.mk
index 9914fa29b1f..a2a243cc3f7 100644
--- a/x11/libXi/buildlink3.mk
+++ b/x11/libXi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/01/23 21:15:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,27 +6,20 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXI_BUILDLINK3_MK:=	${LIBXI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXi
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXi
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXi}
-BUILDLINK_PACKAGES+=	libXi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXi
+.if !defined(LIBXI_BUILDLINK3_MK)
+LIBXI_BUILDLINK3_MK:=
 
-.if ${LIBXI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXi+=	libXi>=1.0.0
 BUILDLINK_PKGSRCDIR.libXi?=	../../x11/libXi
-.endif	# LIBXI_BUILDLINK3_MK
 
 .include "../../x11/inputproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXi
 
 .endif
diff --git a/x11/libXinerama/buildlink3.mk b/x11/libXinerama/buildlink3.mk
index 684a3522575..ce5eb45375d 100644
--- a/x11/libXinerama/buildlink3.mk
+++ b/x11/libXinerama/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/12/16 23:08:05 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,27 +6,20 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXINERAMA_BUILDLINK3_MK:=	${LIBXINERAMA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXinerama
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXinerama
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXinerama}
-BUILDLINK_PACKAGES+=	libXinerama
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXinerama
+.if !defined(LIBXINERAMA_BUILDLINK3_MK)
+LIBXINERAMA_BUILDLINK3_MK:=
 
-.if ${LIBXINERAMA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXinerama+=	libXinerama>=1.0.1
 BUILDLINK_PKGSRCDIR.libXinerama?=	../../x11/libXinerama
-.endif	# LIBXINERAMA_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xineramaproto/buildlink3.mk"
+.endif # LIBXINERAMA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXinerama
 
 .endif
diff --git a/x11/libXmu/buildlink3.mk b/x11/libXmu/buildlink3.mk
index db32c0eaf8f..2a3b7eaaf3a 100644
--- a/x11/libXmu/buildlink3.mk
+++ b/x11/libXmu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/12/16 19:04:28 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,27 +6,20 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXMU_BUILDLINK3_MK:=	${LIBXMU_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXmu
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXmu
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXmu}
-BUILDLINK_PACKAGES+=	libXmu
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXmu
+.if !defined(LIBXMU_BUILDLINK3_MK)
+LIBXMU_BUILDLINK3_MK:=
 
-.if ${LIBXMU_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXmu+=	libXmu>=1.0.0
 BUILDLINK_PKGSRCDIR.libXmu?=	../../x11/libXmu
-.endif	# LIBXMU_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXMU_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXmu
 
 .endif
diff --git a/x11/libXp/buildlink3.mk b/x11/libXp/buildlink3.mk
index 2cb29a82011..40900e94fbe 100644
--- a/x11/libXp/buildlink3.mk
+++ b/x11/libXp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/06 11:33:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:45 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,26 +6,19 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXP_BUILDLINK3_MK:=	${LIBXP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXp
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXp}
-BUILDLINK_PACKAGES+=	libXp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXp
+.if !defined(LIBXP_BUILDLINK3_MK)
+LIBXP_BUILDLINK3_MK:=
 
-.if ${LIBXP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXp+=	libXp>=1.0.0
 BUILDLINK_PKGSRCDIR.libXp?=	../../x11/libXp
-.endif	# LIBXP_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/printproto/buildlink3.mk"
+.endif # LIBXP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXp
 
 .endif
diff --git a/x11/libXpm/buildlink3.mk b/x11/libXpm/buildlink3.mk
index 7bbae188573..7e7d1a9d70b 100644
--- a/x11/libXpm/buildlink3.mk
+++ b/x11/libXpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,25 +8,18 @@
 BUILDLINK_PREFIX.libXpm=	${BUILDLINK_PREFIX.xpm}
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXPM_BUILDLINK3_MK:=	${LIBXPM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXpm
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXpm
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXpm}
-BUILDLINK_PACKAGES+=	libXpm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXpm
+.if !defined(LIBXPM_BUILDLINK3_MK)
+LIBXPM_BUILDLINK3_MK:=
 
-.if ${LIBXPM_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXpm+=	libXpm>=3.5.4.2
 BUILDLINK_PKGSRCDIR.libXpm?=	../../x11/libXpm
-.endif	# LIBXPM_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXPM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXpm
 
 .endif
diff --git a/x11/libXprintUtil/buildlink3.mk b/x11/libXprintUtil/buildlink3.mk
index 2ca9e88ca3d..d610cc24d69 100644
--- a/x11/libXprintUtil/buildlink3.mk
+++ b/x11/libXprintUtil/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/12 15:05:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:45 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXPRINTUTIL_BUILDLINK3_MK:=	${LIBXPRINTUTIL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXprintUtil
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXprintUtil
-.endif
+.if !defined(LIBXPRINTUTIL_BUILDLINK3_MK)
+LIBXPRINTUTIL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXprintUtil}
-BUILDLINK_PACKAGES+=	libXprintUtil
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXprintUtil
-
-.if ${LIBXPRINTUTIL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXprintUtil+=	libXprintUtil>=1.0.1
 BUILDLINK_PKGSRCDIR.libXprintUtil?=	../../x11/libXprintUtil
-.endif	# LIBXPRINTUTIL_BUILDLINK3_MK
 
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.endif # LIBXPRINTUTIL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXprintUtil
diff --git a/x11/libXrandr/buildlink3.mk b/x11/libXrandr/buildlink3.mk
index 6218168ebd5..d7b959e5b1c 100644
--- a/x11/libXrandr/buildlink3.mk
+++ b/x11/libXrandr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/03/03 12:31:09 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:45 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,27 +6,20 @@
 .include "../../x11/liboldXrandr/buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXRANDR_BUILDLINK3_MK:=	${LIBXRANDR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXrandr
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXrandr
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXrandr}
-BUILDLINK_PACKAGES+=	libXrandr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXrandr
+.if !defined(LIBXRANDR_BUILDLINK3_MK)
+LIBXRANDR_BUILDLINK3_MK:=
 
-.if ${LIBXRANDR_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXrandr+=	libXrandr>=1.1.2
 BUILDLINK_PKGSRCDIR.libXrandr?=	../../x11/libXrandr
-.endif	# LIBXRANDR_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
+.endif # LIBXRANDR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXrandr
 
 .endif
diff --git a/x11/libXrender/buildlink3.mk b/x11/libXrender/buildlink3.mk
index 981a7444d5f..3bf41d30937 100644
--- a/x11/libXrender/buildlink3.mk
+++ b/x11/libXrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/12/16 19:38:25 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,25 +6,18 @@
 .include "../../x11/Xrender/buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXRENDER_BUILDLINK3_MK:=	${LIBXRENDER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXrender
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXrender
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXrender}
-BUILDLINK_PACKAGES+=	libXrender
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXrender
+.if !defined(LIBXRENDER_BUILDLINK3_MK)
+LIBXRENDER_BUILDLINK3_MK:=
 
-.if ${LIBXRENDER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXrender+=	libXrender>=0.9.2
 BUILDLINK_PKGSRCDIR.libXrender?=	../../x11/libXrender
-.endif	# LIBXRENDER_BUILDLINK3_MK
 
 .include "../../x11/renderproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif # LIBXRENDER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXrender
 
 .endif
diff --git a/x11/libXres/buildlink3.mk b/x11/libXres/buildlink3.mk
index c2dfd269147..43afeba8866 100644
--- a/x11/libXres/buildlink3.mk
+++ b/x11/libXres/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXRES_BUILDLINK3_MK:=	${LIBXRES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXres
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXres
-.endif
+.if !defined(LIBXRES_BUILDLINK3_MK)
+LIBXRES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXres}
-BUILDLINK_PACKAGES+=	libXres
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXres
-
-.if ${LIBXRES_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXres+=	libXres>=1.0.0
 BUILDLINK_PKGSRCDIR.libXres?=	../../x11/libXres
-.endif	# LIBXRES_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXRES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXres
diff --git a/x11/libXt/buildlink3.mk b/x11/libXt/buildlink3.mk
index 80a3e96e2d5..be9ffc63396 100644
--- a/x11/libXt/buildlink3.mk
+++ b/x11/libXt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2007/12/17 15:02:26 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:46 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,26 +6,19 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXT_BUILDLINK3_MK:=	${LIBXT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXt
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXt
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXt}
-BUILDLINK_PACKAGES+=	libXt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXt
+.if !defined(LIBXT_BUILDLINK3_MK)
+LIBXT_BUILDLINK3_MK:=
 
-.if ${LIBXT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXt+=	libXt>=1.0.0
 BUILDLINK_PKGSRCDIR.libXt?=	../../x11/libXt
-.endif	# LIBXT_BUILDLINK3_MK
 
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXt
 
 .endif
diff --git a/x11/libXtst/buildlink3.mk b/x11/libXtst/buildlink3.mk
index 9ce27c56382..db95b4a6486 100644
--- a/x11/libXtst/buildlink3.mk
+++ b/x11/libXtst/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/12/04 04:16:41 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:46 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXTST_BUILDLINK3_MK:=	${LIBXTST_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXtst
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXtst
-.endif
+.if !defined(LIBXTST_BUILDLINK3_MK)
+LIBXTST_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXtst}
-BUILDLINK_PACKAGES+=	libXtst
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXtst
-
-.if ${LIBXTST_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXtst+=	libXtst>=1.0.1
 BUILDLINK_PKGSRCDIR.libXtst?=	../../x11/libXtst
-.endif	# LIBXTST_BUILDLINK3_MK
 
 .include "../../x11/recordproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.endif # LIBXTST_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXtst
diff --git a/x11/libXv/buildlink3.mk b/x11/libXv/buildlink3.mk
index 50a0ddf5c4e..febfeb6aab3 100644
--- a/x11/libXv/buildlink3.mk
+++ b/x11/libXv/buildlink3.mk
@@ -1,27 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/10/29 21:14:01 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:46 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXV_BUILDLINK3_MK:=	${LIBXV_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXv
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXv
-.endif
+.if !defined(LIBXV_BUILDLINK3_MK)
+LIBXV_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXv}
-BUILDLINK_PACKAGES+=	libXv
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXv
-
-.if ${LIBXV_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXv+=	libXv>=1.0.1
 BUILDLINK_PKGSRCDIR.libXv?=	../../x11/libXv
-.endif	# LIBXV_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXV_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXv
diff --git a/x11/libXvMC/buildlink3.mk b/x11/libXvMC/buildlink3.mk
index 23177536105..244f454b685 100644
--- a/x11/libXvMC/buildlink3.mk
+++ b/x11/libXvMC/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/07/22 03:21:38 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,27 +6,20 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBXVMC_BUILDLINK3_MK:=	${LIBXVMC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXvMC
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXvMC
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXvMC}
-BUILDLINK_PACKAGES+=	libXvMC
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXvMC
+.if !defined(LIBXVMC_BUILDLINK3_MK)
+LIBXVMC_BUILDLINK3_MK:=
 
-.if ${LIBXVMC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXvMC+=	libXvMC>=1.0.2
 BUILDLINK_PKGSRCDIR.libXvMC?=	../../x11/libXvMC
-.endif	# LIBXVMC_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
+.endif # LIBXVMC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXvMC
 
 .endif
diff --git a/x11/libXxf86dga/buildlink3.mk b/x11/libXxf86dga/buildlink3.mk
index 19ba974dbb5..a4db95885da 100644
--- a/x11/libXxf86dga/buildlink3.mk
+++ b/x11/libXxf86dga/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/12/27 12:24:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:46 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,26 +6,19 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXXF86DGA_BUILDLINK3_MK:=	${LIBXXF86DGA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXxf86dga
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXxf86dga
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXxf86dga}
-BUILDLINK_PACKAGES+=	libXxf86dga
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXxf86dga
+.if !defined(LIBXXF86DGA_BUILDLINK3_MK)
+LIBXXF86DGA_BUILDLINK3_MK:=
 
-.if ${LIBXXF86DGA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXxf86dga+=	libXxf86dga>=1.0.1
 BUILDLINK_PKGSRCDIR.libXxf86dga?=	../../x11/libXxf86dga
-.endif	# LIBXXF86DGA_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xf86dgaproto/buildlink3.mk"
+.endif # LIBXXF86DGA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXxf86dga
 
 .endif
diff --git a/x11/libXxf86misc/buildlink3.mk b/x11/libXxf86misc/buildlink3.mk
index f1a490a5e6b..3aeea0aedbc 100644
--- a/x11/libXxf86misc/buildlink3.mk
+++ b/x11/libXxf86misc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/01/10 17:09:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,26 +6,19 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXXF86MISC_BUILDLINK3_MK:=	${LIBXXF86MISC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXxf86misc
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXxf86misc
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXxf86misc}
-BUILDLINK_PACKAGES+=	libXxf86misc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXxf86misc
+.if !defined(LIBXXF86MISC_BUILDLINK3_MK)
+LIBXXF86MISC_BUILDLINK3_MK:=
 
-.if ${LIBXXF86MISC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXxf86misc+=	libXxf86misc>=1.0.0
 BUILDLINK_PKGSRCDIR.libXxf86misc?=	../../x11/libXxf86misc
-.endif	# LIBXXF86MISC_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xf86miscproto/buildlink3.mk"
+.endif # LIBXXF86MISC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXxf86misc
 
 .endif
diff --git a/x11/libXxf86vm/buildlink3.mk b/x11/libXxf86vm/buildlink3.mk
index 40e2c0ad945..c81146c005c 100644
--- a/x11/libXxf86vm/buildlink3.mk
+++ b/x11/libXxf86vm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 21:31:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,26 +6,19 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXXF86VM_BUILDLINK3_MK:=	${LIBXXF86VM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libXxf86vm
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libXxf86vm
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibXxf86vm}
-BUILDLINK_PACKAGES+=	libXxf86vm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXxf86vm
+.if !defined(LIBXXF86VM_BUILDLINK3_MK)
+LIBXXF86VM_BUILDLINK3_MK:=
 
-.if ${LIBXXF86VM_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXxf86vm+=	libXxf86vm>=1.0.1
 BUILDLINK_PKGSRCDIR.libXxf86vm?=	../../x11/libXxf86vm
-.endif	# LIBXXF86VM_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.endif # LIBXXF86VM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libXxf86vm
 
 .endif
diff --git a/x11/libdrm/buildlink3.mk b/x11/libdrm/buildlink3.mk
index f01bdfc92a1..8009f398777 100644
--- a/x11/libdrm/buildlink3.mk
+++ b/x11/libdrm/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/07/16 06:41:17 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:46 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBDRM_BUILDLINK3_MK:=	${LIBDRM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdrm
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libdrm
-.endif
+.if !defined(LIBDRM_BUILDLINK3_MK)
+LIBDRM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdrm}
-BUILDLINK_PACKAGES+=	libdrm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdrm
-
-.if ${LIBDRM_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.3.0
 ###
 ### XXX Explicitly required by (at least) Mesa 7.1, which is nearing release.
@@ -20,8 +13,8 @@ BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.3.0
 ###	and a recursive dependency bump performed.
 ###	[bjs 20080714]
 ###
-#BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.3.1	
+#BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.3.1
 BUILDLINK_PKGSRCDIR.libdrm?=	../../x11/libdrm
-.endif	# LIBDRM_BUILDLINK3_MK
+.endif # LIBDRM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdrm
diff --git a/x11/libgnomekbd/buildlink3.mk b/x11/libgnomekbd/buildlink3.mk
index 67bfaed9976..949d6911147 100644
--- a/x11/libgnomekbd/buildlink3.mk
+++ b/x11/libgnomekbd/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/11/15 09:59:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGNOMEKBD_BUILDLINK3_MK:=	${LIBGNOMEKBD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgnomekbd
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libgnomekbd
-.endif
+.if !defined(LIBGNOMEKBD_BUILDLINK3_MK)
+LIBGNOMEKBD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomekbd}
-BUILDLINK_PACKAGES+=	libgnomekbd
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomekbd
-
-.if ${LIBGNOMEKBD_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libgnomekbd+=	libgnomekbd>=2.18.0
 BUILDLINK_PKGSRCDIR.libgnomekbd?=	../../x11/libgnomekbd
-.endif	# LIBGNOMEKBD_BUILDLINK3_MK
 
 .include "../../x11/libxklavier/buildlink3.mk"
+.endif # LIBGNOMEKBD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgnomekbd
diff --git a/x11/liblbxutil/buildlink3.mk b/x11/liblbxutil/buildlink3.mk
index 336e1d23048..979a041880f 100644
--- a/x11/liblbxutil/buildlink3.mk
+++ b/x11/liblbxutil/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 15:27:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:46 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBLBXUTIL_BUILDLINK3_MK:=	${LIBLBXUTIL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	liblbxutil
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	liblbxutil
-.endif
+.if !defined(LIBLBXUTIL_BUILDLINK3_MK)
+LIBLBXUTIL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliblbxutil}
-BUILDLINK_PACKAGES+=	liblbxutil
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblbxutil
-
-.if ${LIBLBXUTIL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.liblbxutil+=	liblbxutil>=1.0.0
 BUILDLINK_PKGSRCDIR.liblbxutil?=	../../x11/liblbxutil
-.endif	# LIBLBXUTIL_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
+.endif # LIBLBXUTIL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-liblbxutil
diff --git a/x11/liboldXrandr/buildlink3.mk b/x11/liboldXrandr/buildlink3.mk
index 18c3b51b6f0..b73ea11e6bd 100644
--- a/x11/liboldXrandr/buildlink3.mk
+++ b/x11/liboldXrandr/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/05/30 16:00:51 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:47 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XRANDR_BUILDLINK3_MK:=	${XRANDR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Xrandr
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Xrandr
-.endif
+.if !defined(XRANDR_BUILDLINK3_MK)
+XRANDR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXrandr}
-BUILDLINK_PACKAGES+=	Xrandr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xrandr
-
-.if !empty(XRANDR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=0.99
 BUILDLINK_ABI_DEPENDS.Xrandr+=	Xrandr>=1.0.2nb3
 BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/liboldXrandr
-.endif	# XRANDR_BUILDLINK3_MK
 
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
+.endif # XRANDR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Xrandr
diff --git a/x11/libunique/buildlink3.mk b/x11/libunique/buildlink3.mk
index e3fdd437f01..e718ddd1ae8 100644
--- a/x11/libunique/buildlink3.mk
+++ b/x11/libunique/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/18 00:32:14 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBUNIQUE_BUILDLINK3_MK:=	${LIBUNIQUE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libunique
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libunique
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibunique}
-BUILDLINK_PACKAGES+=	libunique
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libunique
+.if !defined(LIBUNIQUE_BUILDLINK3_MK)
+LIBUNIQUE_BUILDLINK3_MK:=
 
-.if ${LIBUNIQUE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libunique+=	libunique>=1.0.4
 BUILDLINK_PKGSRCDIR.libunique?=	../../x11/libunique
-.endif	# LIBUNIQUE_BUILDLINK3_MK
 
 pkgbase := libunique
 .include "../../mk/pkg-build-options.mk"
@@ -24,5 +16,6 @@ pkgbase := libunique
 .endif
 
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBUNIQUE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libunique
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 1bca887fbbc..26eed6a989c 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.24 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:25:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXFCE4GUI_BUILDLINK3_MK:=	${LIBXFCE4GUI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libxfce4gui
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libxfce4gui
-.endif
+.if !defined(LIBXFCE4GUI_BUILDLINK3_MK)
+LIBXFCE4GUI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4gui}
-BUILDLINK_PACKAGES+=	libxfce4gui
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4gui
-
-.if ${LIBXFCE4GUI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libxfce4gui+=	libxfce4gui>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
-.endif	# LIBXFCE4GUI_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # LIBXFCE4GUI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libxfce4gui
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index e35af5f7967..cb1e5ff0ae4 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.22 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:25:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXFCE4MCS_BUILDLINK3_MK:=	${LIBXFCE4MCS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libxfce4mcs
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libxfce4mcs
-.endif
+.if !defined(LIBXFCE4MCS_BUILDLINK3_MK)
+LIBXFCE4MCS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4mcs}
-BUILDLINK_PACKAGES+=	libxfce4mcs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4mcs
-
-.if ${LIBXFCE4MCS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libxfce4mcs+=	libxfce4mcs>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.libxfce4mcs?=	../../x11/libxfce4mcs
-.endif	# LIBXFCE4MCS_BUILDLINK3_MK
 
 .include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # LIBXFCE4MCS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libxfce4mcs
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index 272d58b5d24..48a2df1c78c 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.21 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXFCE4UTIL_BUILDLINK3_MK:=	${LIBXFCE4UTIL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libxfce4util
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libxfce4util
-.endif
+.if !defined(LIBXFCE4UTIL_BUILDLINK3_MK)
+LIBXFCE4UTIL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4util}
-BUILDLINK_PACKAGES+=	libxfce4util
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4util
-
-.if ${LIBXFCE4UTIL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libxfce4util+=	libxfce4util>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.libxfce4util?=	../../x11/libxfce4util
-.endif	# LIBXFCE4UTIL_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 # LIBXFCE4UTIL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libxfce4util
diff --git a/x11/libxkbfile/buildlink3.mk b/x11/libxkbfile/buildlink3.mk
index 945d7ddc941..67ae09f6c3b 100644
--- a/x11/libxkbfile/buildlink3.mk
+++ b/x11/libxkbfile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2007/01/11 09:22:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:47 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,25 +6,18 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXKBFILE_BUILDLINK3_MK:=	${LIBXKBFILE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libxkbfile
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libxkbfile
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxkbfile}
-BUILDLINK_PACKAGES+=	libxkbfile
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxkbfile
+.if !defined(LIBXKBFILE_BUILDLINK3_MK)
+LIBXKBFILE_BUILDLINK3_MK:=
 
-.if ${LIBXKBFILE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libxkbfile+=	libxkbfile>=0.99.1
 BUILDLINK_PKGSRCDIR.libxkbfile?=	../../x11/libxkbfile
-.endif	# LIBXKBFILE_BUILDLINK3_MK
 
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif # LIBXKBFILE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libxkbfile
 
 .endif
diff --git a/x11/libxkbui/buildlink3.mk b/x11/libxkbui/buildlink3.mk
index 6af007a9694..cd35a7e4c41 100644
--- a/x11/libxkbui/buildlink3.mk
+++ b/x11/libxkbui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/11/23 14:34:34 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:47 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,25 +6,18 @@
 .include "../../mk/x11.buildlink3.mk"
 .else
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXKBUI_BUILDLINK3_MK:=	${LIBXKBUI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libxkbui
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libxkbui
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxkbui}
-BUILDLINK_PACKAGES+=	libxkbui
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxkbui
+.if !defined(LIBXKBUI_BUILDLINK3_MK)
+LIBXKBUI_BUILDLINK3_MK:=
 
-.if ${LIBXKBUI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libxkbui+=	libxkbui>=1.0.2
 BUILDLINK_PKGSRCDIR.libxkbui?=	../../x11/libxkbui
-.endif	# LIBXKBUI_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
+.endif # LIBXKBUI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libxkbui
 
 .endif
diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk
index d8d86a2b122..2f3fdd69a2b 100644
--- a/x11/libxklavier/buildlink3.mk
+++ b/x11/libxklavier/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/01/15 19:26:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:47 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBXKLAVIER_BUILDLINK3_MK:=	${LIBXKLAVIER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libxklavier
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libxklavier
-.endif
+.if !defined(LIBXKLAVIER_BUILDLINK3_MK)
+LIBXKLAVIER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxklavier}
-BUILDLINK_PACKAGES+=	libxklavier
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxklavier
-
-.if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=3.0
 BUILDLINK_PKGSRCDIR.libxklavier?=	../../x11/libxklavier
-.endif	# LIBXKLAVIER_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
+.endif # LIBXKLAVIER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libxklavier
diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk
index 346543bf537..b9309873cfd 100644
--- a/x11/modular-xorg-server/buildlink3.mk
+++ b/x11/modular-xorg-server/buildlink3.mk
@@ -1,22 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/09/18 20:56:01 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:47 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-MODULAR_XORG_SERVER_BUILDLINK3_MK:=	${MODULAR_XORG_SERVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	modular-xorg-server
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	modular-xorg-server
-.endif
+.if !defined(MODULAR_XORG_SERVER_BUILDLINK3_MK)
+MODULAR_XORG_SERVER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmodular-xorg-server}
-BUILDLINK_PACKAGES+=	modular-xorg-server
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}modular-xorg-server
-
-.if ${MODULAR_XORG_SERVER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.modular-xorg-server+=	modular-xorg-server>=1.4.2
 BUILDLINK_PKGSRCDIR.modular-xorg-server?=	../../x11/modular-xorg-server
 
-.endif	# MODULAR_XORG_SERVER_BUILDLINK3_MK
-
 .include "../../x11/pixman/buildlink3.mk"
 
 .include "../../x11/compositeproto/buildlink3.mk"
@@ -28,5 +19,6 @@ BUILDLINK_PKGSRCDIR.modular-xorg-server?=	../../x11/modular-xorg-server
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86driproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-modular-xorg-server
diff --git a/x11/mowitz/buildlink3.mk b/x11/mowitz/buildlink3.mk
index d82f06f4573..1dfc1ec57d2 100644
--- a/x11/mowitz/buildlink3.mk
+++ b/x11/mowitz/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.9 2008/01/09 19:00:25 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:47 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MOWITZ_BUILDLINK3_MK:=	${MOWITZ_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Mowitz
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Mowitz
-.endif
+.if !defined(MOWITZ_BUILDLINK3_MK)
+MOWITZ_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NMowitz}
-BUILDLINK_PACKAGES+=	Mowitz
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Mowitz
-
-.if !empty(MOWITZ_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Mowitz+=	Mowitz>=0.3.0
 BUILDLINK_PKGSRCDIR.Mowitz?=	../../x11/mowitz
-.endif	# MOWITZ_BUILDLINK3_MK
 
 .include "../../x11/libXpm/buildlink3.mk"
+.endif # MOWITZ_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Mowitz
diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk
index ef874276be6..1cfc5ac406f 100644
--- a/x11/neXtaw/buildlink3.mk
+++ b/x11/neXtaw/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/01/04 01:25:51 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NEXTAW_BUILDLINK3_MK:=	${NEXTAW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	neXtaw
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	neXtaw
-.endif
+.if !defined(NEXTAW_BUILDLINK3_MK)
+NEXTAW_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NneXtaw}
-BUILDLINK_PACKAGES+=	neXtaw
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}neXtaw
-
-.if !empty(NEXTAW_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.neXtaw+=	neXtaw>=0.15.1
 BUILDLINK_ABI_DEPENDS.neXtaw+=	neXtaw>=0.15.1nb2
 BUILDLINK_PKGSRCDIR.neXtaw?=	../../x11/neXtaw
@@ -32,10 +25,9 @@ LIBXAW?=	-L${BUILDLINK_PREFIX.neXtaw}/lib			\
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib	\
 		-lneXtaw
 
-.endif	# NEXTAW_BUILDLINK3_MK
-
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.endif # NEXTAW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-neXtaw
diff --git a/x11/nucleo/buildlink3.mk b/x11/nucleo/buildlink3.mk
index c9627d630a0..b785a931699 100644
--- a/x11/nucleo/buildlink3.mk
+++ b/x11/nucleo/buildlink3.mk
@@ -1,23 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/12/18 17:28:16 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NUCLEO_BUILDLINK3_MK:=	${NUCLEO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	nucleo
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	nucleo
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnucleo}
-BUILDLINK_PACKAGES+=	nucleo
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nucleo
+.if !defined(NUCLEO_BUILDLINK3_MK)
+NUCLEO_BUILDLINK3_MK:=
 
-.if ${NUCLEO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.nucleo+=	nucleo>=0.6
 BUILDLINK_ABI_DEPENDS.nucleo?=	nucleo>=0.7.1nb2
 BUILDLINK_PKGSRCDIR.nucleo?=	../../x11/nucleo
 pkgbase:=nucleo
 .  include "../../mk/pkg-build-options.mk"
-.endif	# NUCLEO_BUILDLINK3_MK
 
 .if !empty(PKG_BUILD_OPTIONS.nucleo:Mgnutls)
 .  include "../../security/gnutls/buildlink3.mk"
@@ -36,5 +28,6 @@ pkgbase:=nucleo
 .include "../../net/mDNSResponder/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
+.endif # NUCLEO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-nucleo
diff --git a/x11/ocaml-graphics/buildlink3.mk b/x11/ocaml-graphics/buildlink3.mk
index 72f45c876d2..8d516031da7 100644
--- a/x11/ocaml-graphics/buildlink3.mk
+++ b/x11/ocaml-graphics/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:48 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-OCAML_GRAPHICS_BUILDLINK3_MK:=	${OCAML_GRAPHICS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ocaml-graphics
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ocaml-graphics
-.endif
+.if !defined(OCAML_GRAPHICS_BUILDLINK3_MK)
+OCAML_GRAPHICS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nocaml-graphics}
-BUILDLINK_PACKAGES+=	ocaml-graphics
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ocaml-graphics
-
-.if !empty(OCAML_GRAPHICS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ocaml-graphics+=	ocaml-graphics>=3.08.2
 BUILDLINK_ABI_DEPENDS.ocaml-graphics?=	ocaml-graphics>=3.09.1
 BUILDLINK_PKGSRCDIR.ocaml-graphics?=	../../x11/ocaml-graphics
-.endif	# OCAML_GRAPHICS_BUILDLINK3_MK
 
 .include "../../lang/ocaml/buildlink3.mk"
+.endif # OCAML_GRAPHICS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ocaml-graphics
diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk
index 27e00af8a7a..586af7b683a 100644
--- a/x11/openmotif/buildlink3.mk
+++ b/x11/openmotif/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/07/17 09:02:54 dsainty Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:48 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-OPENMOTIF_BUILDLINK3_MK:=	${OPENMOTIF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openmotif
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openmotif
-.endif
+.if !defined(OPENMOTIF_BUILDLINK3_MK)
+OPENMOTIF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenmotif}
-BUILDLINK_PACKAGES+=	openmotif
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openmotif
-
-.if !empty(OPENMOTIF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openmotif+=	openmotif>=2.3.1
 BUILDLINK_ABI_DEPENDS.openmotif?=	openmotif>=2.3.1
 BUILDLINK_PKGSRCDIR.openmotif?=	../../x11/openmotif
-.endif	# OPENMOTIF_BUILDLINK3_MK
 
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
@@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.openmotif?=	../../x11/openmotif
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
+.endif # OPENMOTIF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openmotif
diff --git a/x11/p5-gtk2/buildlink3.mk b/x11/p5-gtk2/buildlink3.mk
index 32d6f076f0a..51cc80bfe2d 100644
--- a/x11/p5-gtk2/buildlink3.mk
+++ b/x11/p5-gtk2/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/10/12 18:55:15 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-P5_GTK2_BUILDLINK3_MK:=	${P5_GTK2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	p5-gtk2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	p5-gtk2
-.endif
+.if !defined(P5_GTK2_BUILDLINK3_MK)
+P5_GTK2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-gtk2}
-BUILDLINK_PACKAGES+=	p5-gtk2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-gtk2
-
-.if ${P5_GTK2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.p5-gtk2+=	p5-gtk2>=1.182
 BUILDLINK_PKGSRCDIR.p5-gtk2?=	../../x11/p5-gtk2
-.endif	# P5_GTK2_BUILDLINK3_MK
 
 .include "../../devel/p5-glib2/buildlink3.mk"
 .include "../../graphics/p5-cairo/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # P5_GTK2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-p5-gtk2
diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk
index 8e14c4c95f9..21a2012861b 100644
--- a/x11/paragui/buildlink3.mk
+++ b/x11/paragui/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PARAGUI_BUILDLINK3_MK:=	${PARAGUI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	paragui
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	paragui
-.endif
+.if !defined(PARAGUI_BUILDLINK3_MK)
+PARAGUI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nparagui}
-BUILDLINK_PACKAGES+=	paragui
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}paragui
-
-.if !empty(PARAGUI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.paragui+=	paragui>=1.0.4nb3
 BUILDLINK_ABI_DEPENDS.paragui+=	paragui>=1.0.4nb12
 BUILDLINK_PKGSRCDIR.paragui?=	../../x11/paragui
-.endif	# PARAGUI_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/physfs/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.endif # PARAGUI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-paragui
diff --git a/x11/pixman/buildlink3.mk b/x11/pixman/buildlink3.mk
index dc05a7b0ce8..5ecc055a089 100644
--- a/x11/pixman/buildlink3.mk
+++ b/x11/pixman/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PIXMAN_BUILDLINK3_MK:=	${PIXMAN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pixman
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	pixman
-.endif
+.if !defined(PIXMAN_BUILDLINK3_MK)
+PIXMAN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npixman}
-BUILDLINK_PACKAGES+=	pixman
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pixman
-
-.if ${PIXMAN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.pixman+=	pixman>=0.9.6
 BUILDLINK_PKGSRCDIR.pixman?=	../../x11/pixman
-.endif	# PIXMAN_BUILDLINK3_MK
+.endif # PIXMAN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pixman
diff --git a/x11/printproto/buildlink3.mk b/x11/printproto/buildlink3.mk
index ce43629541b..7da3a290870 100644
--- a/x11/printproto/buildlink3.mk
+++ b/x11/printproto/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 19:53:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:48 joerg Exp $
 
 BUILDLINK_DEPMETHOD.printproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PRINTPROTO_BUILDLINK3_MK:=	${PRINTPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	printproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	printproto
-.endif
+.if !defined(PRINTPROTO_BUILDLINK3_MK)
+PRINTPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nprintproto}
-BUILDLINK_PACKAGES+=	printproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}printproto
-
-.if ${PRINTPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.printproto+=	printproto>=1.0.3
 BUILDLINK_PKGSRCDIR.printproto?=	../../x11/printproto
-.endif	# PRINTPROTO_BUILDLINK3_MK
 
 .include "../../x11/xproto/buildlink3.mk"
+.endif # PRINTPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-printproto
diff --git a/x11/py-Pmw/buildlink3.mk b/x11/py-Pmw/buildlink3.mk
index abd918e22e1..e632d36ee18 100644
--- a/x11/py-Pmw/buildlink3.mk
+++ b/x11/py-Pmw/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:48 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_PMW_BUILDLINK3_MK:=	${PY_PMW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pypmw
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pypmw
-.endif
+.if !defined(PY_PMW_BUILDLINK3_MK)
+PY_PMW_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npypmw}
-BUILDLINK_PACKAGES+=	pypmw
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pypmw
-
-.if !empty(PY_PMW_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pypmw+=	${PYPKGPREFIX}-Pmw-[0-9]*
 BUILDLINK_ABI_DEPENDS.pypmw?=	${PYPKGPREFIX}-Pmw>=1.2nb1
 BUILDLINK_PKGSRCDIR.pypmw?=	../../x11/py-Pmw
-.endif	# PY_PMW_BUILDLINK3_MK
+.endif # PY_PMW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pypmw
diff --git a/x11/py-Tk/buildlink3.mk b/x11/py-Tk/buildlink3.mk
index 715edde4676..35ca1bc93f7 100644
--- a/x11/py-Tk/buildlink3.mk
+++ b/x11/py-Tk/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:48 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PYTK_BUILDLINK3_MK:=	${PYTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pytk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pytk
-.endif
+.if !defined(PYTK_BUILDLINK3_MK)
+PYTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npytk}
-BUILDLINK_PACKAGES+=	pytk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pytk
-
-.if !empty(PYTK_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pytk+=	${PYPKGPREFIX}-Tk-[0-9]*
 BUILDLINK_ABI_DEPENDS.pytk?=	${PYPKGPREFIX}-Tk>=0nb4
 BUILDLINK_PKGSRCDIR.pytk?=	../../x11/py-Tk
-.endif	# PYTK_BUILDLINK3_MK
 
 .include "../../x11/tk/buildlink3.mk"
+.endif # PYTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pytk
diff --git a/x11/py-Xlib/buildlink3.mk b/x11/py-Xlib/buildlink3.mk
index a3d422c5b6f..3d64c0eff64 100644
--- a/x11/py-Xlib/buildlink3.mk
+++ b/x11/py-Xlib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 17:30:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:48 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_XLIB_BUILDLINK3_MK:=	${PY_XLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-Xlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	py-Xlib
-.endif
+.if !defined(PY_XLIB_BUILDLINK3_MK)
+PY_XLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-Xlib}
-BUILDLINK_PACKAGES+=	py-Xlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-Xlib
-
-.if !empty(PY_XLIB_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-Xlib+=	${PYPKGPREFIX}-Xlib>=0.12
 BUILDLINK_ABI_DEPENDS.py-Xlib?=	${PYPKGPREFIX}-Xlib>=0.12nb1
 BUILDLINK_PKGSRCDIR.py-Xlib?=	../../x11/py-Xlib
-.endif	# PY_XLIB_BUILDLINK3_MK
+.endif # PY_XLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-Xlib
diff --git a/x11/py-gnome2-desktop/buildlink3.mk b/x11/py-gnome2-desktop/buildlink3.mk
index 408dc132cf5..ee1339e5a42 100644
--- a/x11/py-gnome2-desktop/buildlink3.mk
+++ b/x11/py-gnome2-desktop/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/04 09:33:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:49 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-PY_GNOME2_DESKTOP_BUILDLINK3_MK:=	${PY_GNOME2_DESKTOP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-gnome2-desktop
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-gnome2-desktop
-.endif
+.if !defined(PY_GNOME2_DESKTOP_BUILDLINK3_MK)
+PY_GNOME2_DESKTOP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-gnome2-desktop}
-BUILDLINK_PACKAGES+=	py-gnome2-desktop
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gnome2-desktop
-
-.if ${PY_GNOME2_DESKTOP_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-gnome2-desktop+=	${PYPKGPREFIX}-gnome2-desktop>=2.16.0
 BUILDLINK_PKGSRCDIR.py-gnome2-desktop?=		../../x11/py-gnome2-desktop
-.endif	# PY_GNOME2_DESKTOP_BUILDLINK3_MK
 
 .include "../../x11/py-gnome2/buildlink3.mk"
+.endif # PY_GNOME2_DESKTOP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-gnome2-desktop
diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk
index e63c487b105..082e873fef5 100644
--- a/x11/py-gnome2-extras/buildlink3.mk
+++ b/x11/py-gnome2-extras/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 17:30:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:49 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PYGNOME2EX_BUILDLINK3_MK:=	${PYGNOME2EX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pygnome2ex
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	pygnome2ex
-.endif
+.if !defined(PYGNOME2EX_BUILDLINK3_MK)
+PYGNOME2EX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome2ex}
-BUILDLINK_PACKAGES+=	pygnome2ex
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygnome2ex
-
-.if ${PYGNOME2EX_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
 BUILDLINK_ABI_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb7
 BUILDLINK_PKGSRCDIR.pygnome2ex?=	../../x11/py-gnome2-extras
-.endif	# PYGNOME2EX_BUILDLINK3_MK
 
 .include "../../x11/py-gnome2/buildlink3.mk"
+.endif # PYGNOME2EX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pygnome2ex
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index 4c78f6da090..26b5816d6ee 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.21 2008/01/05 20:45:59 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:49 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PYGNOME2_BUILDLINK3_MK:=	${PYGNOME2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pygnome2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pygnome2
-.endif
+.if !defined(PYGNOME2_BUILDLINK3_MK)
+PYGNOME2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome2}
-BUILDLINK_PACKAGES+=	pygnome2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygnome2
-
-.if !empty(PYGNOME2_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.10.0
 BUILDLINK_ABI_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.12.4
 BUILDLINK_PKGSRCDIR.pygnome2?=	../../x11/py-gnome2
-.endif	# PYGNOME2_BUILDLINK3_MK
 
 .include "../../net/py-ORBit/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
+.endif # PYGNOME2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pygnome2
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 199dfb02636..c77807373c9 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,27 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.22 2008/01/05 20:45:59 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:25:49 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PYGTK2_BUILDLINK3_MK:=	${PYGTK2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pygtk2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pygtk2
-.endif
+.if !defined(PYGTK2_BUILDLINK3_MK)
+PYGTK2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygtk2}
-BUILDLINK_PACKAGES+=	pygtk2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygtk2
-
-.if !empty(PYGTK2_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.4
 BUILDLINK_ABI_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.5nb1
 BUILDLINK_PKGSRCDIR.pygtk2?=	../../x11/py-gtk2
-.endif	# PYGTK2_BUILDLINK3_MK
 
 .include "../../devel/py-gobject/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # PYGTK2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pygtk2
diff --git a/x11/py-kiwi/buildlink3.mk b/x11/py-kiwi/buildlink3.mk
index 6e81714353c..cc6986cd6df 100644
--- a/x11/py-kiwi/buildlink3.mk
+++ b/x11/py-kiwi/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/06 18:13:58 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:49 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_KIWI_BUILDLINK3_MK:=		${PY_KIWI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-kiwi
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-kiwi
-.endif
+.if !defined(PY_KIWI_BUILDLINK3_MK)
+PY_KIWI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-kiwi}
-BUILDLINK_PACKAGES+=	py-kiwi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-kiwi
-
-.if ${PY_KIWI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.py-kiwi+=	${PYPKGPREFIX}-kiwi>=1.9.22
 BUILDLINK_PKGSRCDIR.py-kiwi?=	../../x11/py-kiwi
-.endif	# PY_KIWI_BUILDLINK3_MK
 
 .include "../../x11/py-gtk2/buildlink3.mk"
+.endif # PY_KIWI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-kiwi
diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk
index 93ce13793bc..1c94b089e01 100644
--- a/x11/py-qt3-base/buildlink3.mk
+++ b/x11/py-qt3-base/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:49 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-PYQT3_BASE_BUILDLINK3_MK:=	${PYQT3_BASE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pyqt3-base
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pyqt3-base
-.endif
+.if !defined(PYQT3_BASE_BUILDLINK3_MK)
+PYQT3_BASE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt3-base}
-BUILDLINK_PACKAGES+=	pyqt3-base
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyqt3-base
-
-.if !empty(PYQT3_BASE_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyqt3-base+=	${PYPKGPREFIX}-qt3-base>=3.11
@@ -19,10 +12,10 @@ BUILDLINK_ABI_DEPENDS.pyqt3-base?=	${PYPKGPREFIX}-qt3-base>=3.15.1nb3
 BUILDLINK_PKGSRCDIR.pyqt3-base?=	../../x11/py-qt3-base
 
 BUILDLINK_LIBDIRS.pyqt3-base+=	${PYSITELIB}
-.endif	# PYQT3_BASE_BUILDLINK3_MK
 
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+.endif # PYQT3_BASE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pyqt3-base
diff --git a/x11/py-qt3-modules/buildlink3.mk b/x11/py-qt3-modules/buildlink3.mk
index 51e6ba2275f..213c3d14078 100644
--- a/x11/py-qt3-modules/buildlink3.mk
+++ b/x11/py-qt3-modules/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:49 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-PYQT3_MOD_BUILDLINK3_MK:=	${PYQT3_MOD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pyqt3-mod
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pyqt3-mod
-.endif
+.if !defined(PYQT3_MOD_BUILDLINK3_MK)
+PYQT3_MOD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt3-mod}
-BUILDLINK_PACKAGES+=	pyqt3-mod
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyqt3-mod
-
-.if !empty(PYQT3_MOD_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.11
@@ -19,8 +12,8 @@ BUILDLINK_ABI_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.15.1nb3
 BUILDLINK_PKGSRCDIR.pyqt3-mod?=	../../x11/py-qt3-modules
 
 BUILDLINK_LIBDIRS.pyqt3-mod+=	${PYSITELIB}
-.endif	# PYQT3_MOD_BUILDLINK3_MK
 
 .include "../../x11/py-qt3-base/buildlink3.mk"
+.endif # PYQT3_MOD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pyqt3-mod
diff --git a/x11/py-qt4/buildlink3.mk b/x11/py-qt4/buildlink3.mk
index 953eee04824..ae6b30ddab9 100644
--- a/x11/py-qt4/buildlink3.mk
+++ b/x11/py-qt4/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:49 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_QT4_BUILDLINK3_MK:=		${PY_QT4_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-qt4
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-qt4
-.endif
+.if !defined(PY_QT4_BUILDLINK3_MK)
+PY_QT4_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-qt4}
-BUILDLINK_PACKAGES+=	py-qt4
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-qt4
-
-.if ${PY_QT4_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-qt4+=	${PYPKGPREFIX}-qt4>=4.4.4
 BUILDLINK_PKGSRCDIR.py-qt4?=	../../x11/py-qt4
-.endif	# PY_QT4_BUILDLINK3_MK
+.endif # PY_QT4_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-qt4
diff --git a/x11/py-sip/buildlink3.mk b/x11/py-sip/buildlink3.mk
index 665f6ad8420..aed7b88b0b4 100644
--- a/x11/py-sip/buildlink3.mk
+++ b/x11/py-sip/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:49 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_SIP_BUILDLINK3_MK:=	${PY_SIP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-sip
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-sip
-.endif
+.if !defined(PY_SIP_BUILDLINK3_MK)
+PY_SIP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-sip}
-BUILDLINK_PACKAGES+=	py-sip
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-sip
-
-.if ${PY_SIP_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-sip+=	${PYPKGPREFIX}-sip>=4.7.7
 BUILDLINK_PKGSRCDIR.py-sip?=	../../x11/py-sip
-.endif	# PY_SIP_BUILDLINK3_MK
+.endif # PY_SIP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-sip
diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk
index 968d52de47a..4618cb58971 100644
--- a/x11/py-wxWidgets/buildlink3.mk
+++ b/x11/py-wxWidgets/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 17:30:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:49 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-PY_WXWIDGETS_BUILDLINK3_MK:=	${PY_WXWIDGETS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	${PYPKGPREFIX}-wxWidgets
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	${PYPKGPREFIX}-wxWidgets
-.endif
+.if !defined(PY_WXWIDGETS_BUILDLINK3_MK)
+PY_WXWIDGETS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-wxWidgets}
-BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-wxWidgets
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${PYPKGPREFIX}-wxWidgets
-
-.if !empty(PY_WXWIDGETS_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0
@@ -19,7 +12,6 @@ BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?=	${PYPKGPREFIX}-wxWidgets>=2.6.1
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?=	../../x11/py-wxWidgets
 
 .include "../../x11/wxGTK26/buildlink3.mk"
+.endif # PY_WXWIDGETS_BUILDLINK3_MK
 
-.endif	# PY_WXWIDGETS_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-${PYPKGPREFIX}-wxWidgets
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index a57a380c8c3..4409a48043e 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,24 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.21 2007/01/15 16:19:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:50 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-QT3_LIBS_BUILDLINK3_MK:=	${QT3_LIBS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	qt3-libs
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	qt3-libs
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt3-libs}
-BUILDLINK_PACKAGES+=	qt3-libs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt3-libs
+.if !defined(QT3_LIBS_BUILDLINK3_MK)
+QT3_LIBS_BUILDLINK3_MK:=
 
-.if !empty(QT3_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.2.3
 BUILDLINK_ABI_DEPENDS.qt3-libs?=	qt3-libs>=3.3.6nb1
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 BUILDLINK_INCDIRS.qt3-libs+=	qt3/include
 BUILDLINK_LIBDIRS.qt3-libs+=	qt3/lib
-.endif	# QT3_LIBS_BUILDLINK3_MK
 
 QTDIR=	${BUILDLINK_PREFIX.qt3-libs}/qt3
 BUILDLINK_PASSTHRU_DIRS+=	${QTDIR}
@@ -52,5 +44,6 @@ MAKE_ENV+=		MOC="${QTDIR}/bin/moc"
 CONFIGURE_ENV+=		QTDIR=${QTDIR:Q}
 MAKE_ENV+=		QTDIR=${QTDIR:Q}
 .endif
+.endif # QT3_LIBS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qt3-libs
diff --git a/x11/qt3-qscintilla/buildlink3.mk b/x11/qt3-qscintilla/buildlink3.mk
index 05d0d55cfad..3f993f85c87 100644
--- a/x11/qt3-qscintilla/buildlink3.mk
+++ b/x11/qt3-qscintilla/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:50 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-QT3_QSCINTILLA_BUILDLINK3_MK:=	${QT3_QSCINTILLA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	qt3-qscintilla
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	qt3-qscintilla
-.endif
+.if !defined(QT3_QSCINTILLA_BUILDLINK3_MK)
+QT3_QSCINTILLA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt3-qscintilla}
-BUILDLINK_PACKAGES+=	qt3-qscintilla
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt3-qscintilla
-
-.if !empty(QT3_QSCINTILLA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.2
 BUILDLINK_ABI_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.6nb3
 BUILDLINK_PKGSRCDIR.qt3-qscintilla?=	../../x11/qt3-qscintilla
-.endif	# QT3_QSCINTILLA_BUILDLINK3_MK
 
 .include "../../x11/qt3-libs/buildlink3.mk"
+.endif # QT3_QSCINTILLA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qt3-qscintilla
diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk
index a1730cfef37..37706655a80 100644
--- a/x11/qt3-tools/buildlink3.mk
+++ b/x11/qt3-tools/buildlink3.mk
@@ -1,22 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:50 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-QT3_TOOLS_BUILDLINK3_MK:=	${QT3_TOOLS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	qt3-tools
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	qt3-tools
-.endif
+.if !defined(QT3_TOOLS_BUILDLINK3_MK)
+QT3_TOOLS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt3-tools}
-BUILDLINK_PACKAGES+=	qt3-tools
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt3-tools
-
-.if !empty(QT3_TOOLS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb3
 BUILDLINK_ABI_DEPENDS.qt3-tools+=	qt3-tools>=3.3.6nb1
 BUILDLINK_PKGSRCDIR.qt3-tools?=	../../x11/qt3-tools
 BUILDLINK_DEPMETHOD.qt3-tools?=	build
-.endif	# QT3_TOOLS_BUILDLINK3_MK
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 
@@ -31,5 +23,6 @@ MAKE_ENV+=		QMAKE="${QTDIR}/bin/qmake"
 # platforms (solaris for example)
 CONFIGURE_ENV+=		QMAKESPEC=${QTDIR}/mkspecs/netbsd-g++
 MAKE_ENV+=		QMAKESPEC=${QTDIR}/mkspecs/netbsd-g++
+.endif # QT3_TOOLS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qt3-tools
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index 747d0c60066..8bfafa0fee5 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,24 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/10/13 12:02:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:50 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-QT4_LIBS_BUILDLINK3_MK:=	${QT4_LIBS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	qt4-libs
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	qt4-libs
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt4-libs}
-BUILDLINK_PACKAGES+=	qt4-libs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt4-libs
+.if !defined(QT4_LIBS_BUILDLINK3_MK)
+QT4_LIBS_BUILDLINK3_MK:=
 
-.if !empty(QT4_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.1.0
 BUILDLINK_ABI_DEPENDS.qt4-libs+=	qt4-libs>=4.1.2nb1
 BUILDLINK_PKGSRCDIR.qt4-libs?=	../../x11/qt4-libs
 
 BUILDLINK_INCDIRS.qt4-libs+=	qt4/include
 BUILDLINK_LIBDIRS.qt4-libs+=	qt4/lib
-.endif	# QT4_LIBS_BUILDLINK3_MK
 
 QTDIR=	${BUILDLINK_PREFIX.qt4-libs}/qt4
 BUILDLINK_PASSTHRU_DIRS+=	${QTDIR}
@@ -50,5 +42,6 @@ MAKE_ENV+=		QTDIR=${QTDIR:Q}
 
 CONFIGURE_ENV+=		MOC="${QTDIR}/bin/moc"
 MAKE_ENV+=		MOC="${QTDIR}/bin/moc"
+.endif # QT4_LIBS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qt4-libs
diff --git a/x11/qt4-qdbus/buildlink3.mk b/x11/qt4-qdbus/buildlink3.mk
index 8f05a433e76..81f55f20252 100644
--- a/x11/qt4-qdbus/buildlink3.mk
+++ b/x11/qt4-qdbus/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/12/06 11:28:09 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:50 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-QT4_QDBUS_BUILDLINK3_MK:=	${QT4_QDBUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	qt4-qdbus
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	qt4-qdbus
-.endif
+.if !defined(QT4_QDBUS_BUILDLINK3_MK)
+QT4_QDBUS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt4-qdbus}
-BUILDLINK_PACKAGES+=	qt4-qdbus
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt4-qdbus
-
-.if ${QT4_QDBUS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.qt4-qdbus+=	qt4-qdbus>=4.3.2
 BUILDLINK_PKGSRCDIR.qt4-qdbus?=	../../x11/qt4-qdbus
-.endif	# QT4_QDBUS_BUILDLINK3_MK
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
+.endif # QT4_QDBUS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qt4-qdbus
diff --git a/x11/qt4-tools/buildlink3.mk b/x11/qt4-tools/buildlink3.mk
index b0429e3b35b..97d96ca60b7 100644
--- a/x11/qt4-tools/buildlink3.mk
+++ b/x11/qt4-tools/buildlink3.mk
@@ -1,22 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.9 2008/06/03 20:14:45 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:50 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-QT4_TOOLS_BUILDLINK3_MK:=	${QT4_TOOLS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	qt4-tools
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	qt4-tools
-.endif
+.if !defined(QT4_TOOLS_BUILDLINK3_MK)
+QT4_TOOLS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt4-tools}
-BUILDLINK_PACKAGES+=	qt4-tools
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt4-tools
-
-.if !empty(QT4_TOOLS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.1.0
 BUILDLINK_ABI_DEPENDS.qt4-tools+=	qt4-tools>=4.1.2nb1
 BUILDLINK_PKGSRCDIR.qt4-tools?=	../../x11/qt4-tools
 BUILDLINK_DEPMETHOD.qt4-tools?=	build
-.endif	# QT4_TOOLS_BUILDLINK3_MK
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 
@@ -31,5 +23,6 @@ MAKE_ENV+=		QMAKE="${QTDIR}/bin/qmake"
 # platforms (solaris for example)
 CONFIGURE_ENV+=		QMAKESPEC=${QTDIR}/mkspecs/netbsd-g++
 MAKE_ENV+=		QMAKESPEC=${QTDIR}/mkspecs/netbsd-g++
+.endif # QT4_TOOLS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qt4-tools
diff --git a/x11/randrproto/buildlink3.mk b/x11/randrproto/buildlink3.mk
index 564c27d2635..b0d5efc73a6 100644
--- a/x11/randrproto/buildlink3.mk
+++ b/x11/randrproto/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:50 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_DEPMETHOD.randrproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-RANDRPROTO_BUILDLINK3_MK:=	${RANDRPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	randrproto
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	randrproto
-.endif
+.if !defined(RANDRPROTO_BUILDLINK3_MK)
+RANDRPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrandrproto}
-BUILDLINK_PACKAGES+=	randrproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}randrproto
-
-.if !empty(RANDRPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.randrproto+=	randrproto>=1.2.0
 BUILDLINK_PKGSRCDIR.randrproto?=	../../x11/randrproto
-.endif	# RANDRPROTO_BUILDLINK3_MK
+.endif # RANDRPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-randrproto
diff --git a/x11/recordproto/buildlink3.mk b/x11/recordproto/buildlink3.mk
index 05d1d826e8f..9758d9f0b16 100644
--- a/x11/recordproto/buildlink3.mk
+++ b/x11/recordproto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/10/23 15:34:32 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:50 joerg Exp $
 
 BUILDLINK_DEPMETHOD.recordproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-RECORDPROTO_BUILDLINK3_MK:=	${RECORDPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	recordproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	recordproto
-.endif
+.if !defined(RECORDPROTO_BUILDLINK3_MK)
+RECORDPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrecordproto}
-BUILDLINK_PACKAGES+=	recordproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}recordproto
-
-.if ${RECORDPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.recordproto+=	recordproto>=1.13.1
 BUILDLINK_PKGSRCDIR.recordproto?=	../../x11/recordproto
-.endif	# RECORDPROTO_BUILDLINK3_MK
+.endif # RECORDPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-recordproto
diff --git a/x11/renderproto/buildlink3.mk b/x11/renderproto/buildlink3.mk
index fd0f11d85d2..3cb333cf1a0 100644
--- a/x11/renderproto/buildlink3.mk
+++ b/x11/renderproto/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/01/17 14:06:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:50 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-RENDERPROTO_BUILDLINK3_MK:=	${RENDERPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	renderproto
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	renderproto
-.endif
+.if !defined(RENDERPROTO_BUILDLINK3_MK)
+RENDERPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrenderproto}
-BUILDLINK_PACKAGES+=	renderproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}renderproto
-
-.if !empty(RENDERPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.renderproto+=	renderproto>=0.9.3nb1
 BUILDLINK_PKGSRCDIR.renderproto?=	../../x11/renderproto
 BUILDLINK_DEPMETHOD.renderproto?=	build
-.endif	# RENDERPROTO_BUILDLINK3_MK
+.endif # RENDERPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-renderproto
diff --git a/x11/resourceproto/buildlink3.mk b/x11/resourceproto/buildlink3.mk
index 563649fb2a5..78e1245aa74 100644
--- a/x11/resourceproto/buildlink3.mk
+++ b/x11/resourceproto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 22:03:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:50 joerg Exp $
 
 BUILDLINK_DEPMETHOD.resourceproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-RESOURCEPROTO_BUILDLINK3_MK:=	${RESOURCEPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	resourceproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	resourceproto
-.endif
+.if !defined(RESOURCEPROTO_BUILDLINK3_MK)
+RESOURCEPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nresourceproto}
-BUILDLINK_PACKAGES+=	resourceproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}resourceproto
-
-.if ${RESOURCEPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.resourceproto+=	resourceproto>=1.0.1
 BUILDLINK_PKGSRCDIR.resourceproto?=	../../x11/resourceproto
-.endif	# RESOURCEPROTO_BUILDLINK3_MK
+.endif # RESOURCEPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-resourceproto
diff --git a/x11/ruby-gnome2-gtk/buildlink3.mk b/x11/ruby-gnome2-gtk/buildlink3.mk
index 053c01ab2b5..d8d75ccbea7 100644
--- a/x11/ruby-gnome2-gtk/buildlink3.mk
+++ b/x11/ruby-gnome2-gtk/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/12/16 12:23:58 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:51 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-RUBY_GNOME2_GTK_BUILDLINK3_MK:=	${RUBY_GNOME2_GTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ruby-gnome2-gtk
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ruby-gnome2-gtk
-.endif
+.if !defined(RUBY_GNOME2_GTK_BUILDLINK3_MK)
+RUBY_GNOME2_GTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nruby-gnome2-gtk}
-BUILDLINK_PACKAGES+=	ruby-gnome2-gtk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ruby-gnome2-gtk
-
-.if ${RUBY_GNOME2_GTK_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ruby-gnome2-gtk+=	${RUBY_PKGPREFIX}-gnome2-gtk>=0.17.0
 BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk?=	../../x11/ruby-gnome2-gtk
-.endif	# RUBY_GNOME2_GTK_BUILDLINK3_MK
 
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # RUBY_GNOME2_GTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ruby-gnome2-gtk
diff --git a/x11/scrnsaverproto/buildlink3.mk b/x11/scrnsaverproto/buildlink3.mk
index 777af764267..bdb2d5cb941 100644
--- a/x11/scrnsaverproto/buildlink3.mk
+++ b/x11/scrnsaverproto/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 20:11:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:51 joerg Exp $
 
 BUILDLINK_DEPMETHOD.scrnsaverproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SCRNSAVERPROTO_BUILDLINK3_MK:=	${SCRNSAVERPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	scrnsaverproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	scrnsaverproto
-.endif
+.if !defined(SCRNSAVERPROTO_BUILDLINK3_MK)
+SCRNSAVERPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nscrnsaverproto}
-BUILDLINK_PACKAGES+=	scrnsaverproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}scrnsaverproto
-
-.if ${SCRNSAVERPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.scrnsaverproto+=	scrnsaverproto>=1.1.0
 BUILDLINK_PKGSRCDIR.scrnsaverproto?=	../../x11/scrnsaverproto
-.endif	# SCRNSAVERPROTO_BUILDLINK3_MK
 
 .include "../../x11/xproto/buildlink3.mk"
+.endif # SCRNSAVERPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-scrnsaverproto
diff --git a/x11/startup-notification/buildlink3.mk b/x11/startup-notification/buildlink3.mk
index 57ebce6b61a..cf17c51a19f 100644
--- a/x11/startup-notification/buildlink3.mk
+++ b/x11/startup-notification/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/17 16:28:36 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:51 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-STARTUP_NOTIFICATION_BUILDLINK3_MK:=	${STARTUP_NOTIFICATION_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	startup-notification
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	startup-notification
-.endif
+.if !defined(STARTUP_NOTIFICATION_BUILDLINK3_MK)
+STARTUP_NOTIFICATION_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nstartup-notification}
-BUILDLINK_PACKAGES+=	startup-notification
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}startup-notification
-
-.if !empty(STARTUP_NOTIFICATION_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.5
 BUILDLINK_ABI_DEPENDS.startup-notification+=	startup-notification>=0.8nb1
 BUILDLINK_PKGSRCDIR.startup-notification?=	../../x11/startup-notification
-.endif	# STARTUP_NOTIFICATION_BUILDLINK3_MK
 
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif # STARTUP_NOTIFICATION_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-startup-notification
diff --git a/x11/tk-BWidget/buildlink3.mk b/x11/tk-BWidget/buildlink3.mk
index 1ef5a87c43b..3a902f80e75 100644
--- a/x11/tk-BWidget/buildlink3.mk
+++ b/x11/tk-BWidget/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:51 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TK_BWIDGET_BUILDLINK3_MK:=	${TK_BWIDGET_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tk-BWidget
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tk-BWidget
-.endif
+.if !defined(TK_BWIDGET_BUILDLINK3_MK)
+TK_BWIDGET_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk-BWidget}
-BUILDLINK_PACKAGES+=	tk-BWidget
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tk-BWidget
-
-.if !empty(TK_BWIDGET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tk-BWidget+=	tk-BWidget>=1.7.0
 BUILDLINK_ABI_DEPENDS.tk-BWidget?=	tk-BWidget>=1.7.0nb1
 BUILDLINK_PKGSRCDIR.tk-BWidget?=	../../x11/tk-BWidget
-.endif	# TK_BWIDGET_BUILDLINK3_MK
+.endif # TK_BWIDGET_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tk-BWidget
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index ec956766e2c..6adfa0d6a14 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.22 2007/01/02 11:03:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:25:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tk
-.endif
+.if !defined(TK_BUILDLINK3_MK)
+TK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk}
-BUILDLINK_PACKAGES+=	tk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tk
-
-.if !empty(TK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tk+=	tk>=8.4.6nb1
 BUILDLINK_ABI_DEPENDS.tk+=	tk>=8.4.12nb1
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk
@@ -25,10 +18,10 @@ BUILDLINK_TRANSFORM+=	l:tk:tk84
 BUILDLINK_TRANSFORM+=	l:tk8.4:tk84
 
 TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
-.endif	# TK_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif # TK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tk
diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk
index 4bcfd0245f0..e2511a7ed2d 100644
--- a/x11/tk83/buildlink3.mk
+++ b/x11/tk83/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/01/11 16:18:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tk
-.endif
+.if !defined(TK_BUILDLINK3_MK)
+TK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk}
-BUILDLINK_PACKAGES+=	tk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tk
-
-.if !empty(TK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tk+=		tk-8.3.4*
 BUILDLINK_ABI_DEPENDS.tk?=	tk>=8.3.4nb2
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk83
@@ -22,11 +15,11 @@ BUILDLINK_FILES.tk=	bin/wish*
 # many Makefiles.
 #
 BUILDLINK_TRANSFORM+=	l:tk:tk83
-.endif	# TK_BUILDLINK3_MK
 
 TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
 .include "../../lang/tcl83/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif # TK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tk
diff --git a/x11/trapproto/buildlink3.mk b/x11/trapproto/buildlink3.mk
index a5b1777ed1e..7f437de05af 100644
--- a/x11/trapproto/buildlink3.mk
+++ b/x11/trapproto/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 22:38:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:51 joerg Exp $
 
 BUILDLINK_DEPMETHOD.trapproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TRAPPROTO_BUILDLINK3_MK:=	${TRAPPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	trapproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	trapproto
-.endif
+.if !defined(TRAPPROTO_BUILDLINK3_MK)
+TRAPPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntrapproto}
-BUILDLINK_PACKAGES+=	trapproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}trapproto
-
-.if ${TRAPPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.trapproto+=	trapproto>=3.4.3
 BUILDLINK_PKGSRCDIR.trapproto?=	../../x11/trapproto
-.endif	# TRAPPROTO_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.endif # TRAPPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-trapproto
diff --git a/x11/videoproto/buildlink3.mk b/x11/videoproto/buildlink3.mk
index 5c6f3d4338a..1fbfd536d2d 100644
--- a/x11/videoproto/buildlink3.mk
+++ b/x11/videoproto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 20:18:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:51 joerg Exp $
 
 BUILDLINK_DEPMETHOD.videoproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-VIDEOPROTO_BUILDLINK3_MK:=	${VIDEOPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	videoproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	videoproto
-.endif
+.if !defined(VIDEOPROTO_BUILDLINK3_MK)
+VIDEOPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvideoproto}
-BUILDLINK_PACKAGES+=	videoproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}videoproto
-
-.if ${VIDEOPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.videoproto+=	videoproto>=2.2.1
 BUILDLINK_PKGSRCDIR.videoproto?=	../../x11/videoproto
-.endif	# VIDEOPROTO_BUILDLINK3_MK
+.endif # VIDEOPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-videoproto
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index cae5b3ba12a..950b9802203 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/02/03 12:13:37 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:51 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-VTE_BUILDLINK3_MK:=	${VTE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	vte
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	vte
-.endif
+.if !defined(VTE_BUILDLINK3_MK)
+VTE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvte}
-BUILDLINK_PACKAGES+=	vte
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vte
-
-.if !empty(VTE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.vte+=	vte>=0.14.0
 BUILDLINK_ABI_DEPENDS.vte?=	vte>=0.17.4nb1
 BUILDLINK_PKGSRCDIR.vte?=	../../x11/vte
-.endif	# VTE_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
+.endif # VTE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-vte
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
index 7962efa40cb..12b289d11c3 100644
--- a/x11/wxGTK24/buildlink3.mk
+++ b/x11/wxGTK24/buildlink3.mk
@@ -1,23 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:38 joerg Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WXGTK24_BUILDLINK3_MK:=	${WXGTK24_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:51 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	wxGTK24
-.endif
+BUILDLINK_TREE+=	wxGTK24
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK24}
-BUILDLINK_PACKAGES+=	wxGTK24
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK24
+.if !defined(WXGTK24_BUILDLINK3_MK)
+WXGTK24_BUILDLINK3_MK:=
 
-.if !empty(WXGTK24_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wxGTK24+=	wxGTK24>=2.4.2
 BUILDLINK_ABI_DEPENDS.wxGTK24?=	wxGTK24>=2.4.2nb10
 BUILDLINK_PKGSRCDIR.wxGTK24?=	../../x11/wxGTK24
-.endif	# WXGTK24_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
@@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.wxGTK24?=	../../x11/wxGTK24
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # WXGTK24_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-wxGTK24
diff --git a/x11/wxGTK26-contrib/buildlink3.mk b/x11/wxGTK26-contrib/buildlink3.mk
index 1bb7ae18b39..da4df671563 100644
--- a/x11/wxGTK26-contrib/buildlink3.mk
+++ b/x11/wxGTK26-contrib/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/09/22 19:58:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-WXGTK_CONTRIB_BUILDLINK3_MK:=	${WXGTK_CONTRIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	wxGTK-contrib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	wxGTK-contrib
-.endif
+.if !defined(WXGTK_CONTRIB_BUILDLINK3_MK)
+WXGTK_CONTRIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK-contrib}
-BUILDLINK_PACKAGES+=	wxGTK-contrib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK-contrib
-
-.if !empty(WXGTK_CONTRIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0nb2
 BUILDLINK_ABI_DEPENDS.wxGTK-contrib?=	wxGTK-contrib>=2.6.3nb1
 BUILDLINK_PKGSRCDIR.wxGTK-contrib?=	../../x11/wxGTK26-contrib
@@ -23,7 +16,6 @@ BUILDLINK_PKGSRCDIR.wxGTK-contrib?=	../../x11/wxGTK26-contrib
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/wxGTK26/buildlink3.mk"
+.endif # WXGTK_CONTRIB_BUILDLINK3_MK
 
-.endif	# WXGTK_CONTRIB_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-wxGTK-contrib
diff --git a/x11/wxGTK26/buildlink3.mk b/x11/wxGTK26/buildlink3.mk
index 259f2dc7111..4aed2f0bde6 100644
--- a/x11/wxGTK26/buildlink3.mk
+++ b/x11/wxGTK26/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/09/22 19:58:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WXGTK_BUILDLINK3_MK:=	${WXGTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	wxGTK
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	wxGTK
-.endif
+.if !defined(WXGTK_BUILDLINK3_MK)
+WXGTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK}
-BUILDLINK_PACKAGES+=	wxGTK
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK
-
-.if !empty(WXGTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wxGTK+=	wxGTK>=2.6.0nb2
 BUILDLINK_ABI_DEPENDS.wxGTK+=	wxGTK>=2.6.3nb1
 BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK26
-.endif	# WXGTK_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK26
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # WXGTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-wxGTK
diff --git a/x11/wxGTK28-contrib/buildlink3.mk b/x11/wxGTK28-contrib/buildlink3.mk
index 61e8a3f0f55..eb1f3cc4b28 100644
--- a/x11/wxGTK28-contrib/buildlink3.mk
+++ b/x11/wxGTK28-contrib/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/12 11:15:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:52 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-WXGTK28_CONTRIB_BUILDLINK3_MK:=	${WXGTK28_CONTRIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	wxGTK28-contrib
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	wxGTK28-contrib
-.endif
+.if !defined(WXGTK28_CONTRIB_BUILDLINK3_MK)
+WXGTK28_CONTRIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK28-contrib}
-BUILDLINK_PACKAGES+=	wxGTK28-contrib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK28-contrib
-
-.if ${WXGTK28_CONTRIB_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.wxGTK28-contrib+=	wxGTK28-contrib>=2.8.8
 BUILDLINK_PKGSRCDIR.wxGTK28-contrib?=	../../x11/wxGTK28-contrib
-.endif	# WXGTK28_CONTRIB_BUILDLINK3_MK
 
 .include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.wxGTK28-contrib?=	../../x11/wxGTK28-contrib
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
+.endif # WXGTK28_CONTRIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-wxGTK28-contrib
diff --git a/x11/wxGTK28/buildlink3.mk b/x11/wxGTK28/buildlink3.mk
index 8b7785c3648..1e02782d367 100644
--- a/x11/wxGTK28/buildlink3.mk
+++ b/x11/wxGTK28/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/19 15:26:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WXGTK28_BUILDLINK3_MK:=	${WXGTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	wxGTK28
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	wxGTK28
-.endif
+.if !defined(WXGTK28_BUILDLINK3_MK)
+WXGTK28_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK28}
-BUILDLINK_PACKAGES+=	wxGTK28
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK28
-
-.if ${WXGTK28_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.wxGTK28+=	wxGTK28>=2.8.8
 BUILDLINK_PKGSRCDIR.wxGTK28?=	../../x11/wxGTK28
-.endif	# WXGTK28_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
@@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.wxGTK28?=	../../x11/wxGTK28
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
+.endif # WXGTK28_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-wxGTK28
diff --git a/x11/xbitmaps/buildlink3.mk b/x11/xbitmaps/buildlink3.mk
index b733d67db5a..42d8809d2d4 100644
--- a/x11/xbitmaps/buildlink3.mk
+++ b/x11/xbitmaps/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/06 10:29:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,22 +8,15 @@
 
 BUILDLINK_DEPMETHOD.xbitmaps?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XBITMAPS_BUILDLINK3_MK:=	${XBITMAPS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xbitmaps
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xbitmaps
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxbitmaps}
-BUILDLINK_PACKAGES+=	xbitmaps
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xbitmaps
+.if !defined(XBITMAPS_BUILDLINK3_MK)
+XBITMAPS_BUILDLINK3_MK:=
 
-.if ${XBITMAPS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xbitmaps+=	xbitmaps>=1.0
 BUILDLINK_PKGSRCDIR.xbitmaps?=	../../x11/xbitmaps
-.endif	# XBITMAPS_BUILDLINK3_MK
+.endif # XBITMAPS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xbitmaps
 
 .endif
diff --git a/x11/xcmiscproto/buildlink3.mk b/x11/xcmiscproto/buildlink3.mk
index 3437d44f999..f3643de095f 100644
--- a/x11/xcmiscproto/buildlink3.mk
+++ b/x11/xcmiscproto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 17:50:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:52 joerg Exp $
 
 BUILDLINK_DEPMETHOD.xcmiscproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XCMISCPROTO_BUILDLINK3_MK:=	${XCMISCPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xcmiscproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xcmiscproto
-.endif
+.if !defined(XCMISCPROTO_BUILDLINK3_MK)
+XCMISCPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxcmiscproto}
-BUILDLINK_PACKAGES+=	xcmiscproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xcmiscproto
-
-.if ${XCMISCPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xcmiscproto+=	xcmiscproto>=1.1
 BUILDLINK_PKGSRCDIR.xcmiscproto?=	../../x11/xcmiscproto
-.endif	# XCMISCPROTO_BUILDLINK3_MK
+.endif # XCMISCPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xcmiscproto
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index 3c621417abc..05df8befb68 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.23 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:25:52 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XCURSOR_BUILDLINK3_MK:=	${XCURSOR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xcursor
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xcursor
-.endif
+.if !defined(XCURSOR_BUILDLINK3_MK)
+XCURSOR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxcursor}
-BUILDLINK_PACKAGES+=	xcursor
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xcursor
-
-.if !empty(XCURSOR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xcursor+=	xcursor>=1.0
 BUILDLINK_ABI_DEPENDS.xcursor+=	xcursor>=1.1.2nb1
 BUILDLINK_PKGSRCDIR.xcursor?=	../../x11/xcursor
-.endif	# XCURSOR_BUILDLINK3_MK
 
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
+.endif # XCURSOR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xcursor
diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk
index d7f190b458c..0e9077c2620 100644
--- a/x11/xcursor/builtin.mk
+++ b/x11/xcursor/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.14 2009/03/20 19:25:52 joerg Exp $
 
 BUILTIN_PKG:=	xcursor
 
@@ -86,9 +86,7 @@ CHECK_BUILTIN.xcursor?=	no
 BUILDLINK_API_DEPENDS.xcursor+=	xcursor>=1.1.1
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .    for _mkfile_ in buildlink3.mk builtin.mk
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 .      sinclude "../../x11/Xfixes/${_mkfile_}"
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
 .    endfor
 .  endif
 
diff --git a/x11/xextproto/buildlink3.mk b/x11/xextproto/buildlink3.mk
index cb685af331b..ba3eb799fdd 100644
--- a/x11/xextproto/buildlink3.mk
+++ b/x11/xextproto/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:52 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_DEPMETHOD.xextproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XEXTPROTO_BUILDLINK3_MK:=	${XEXTPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xextproto
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xextproto
-.endif
+.if !defined(XEXTPROTO_BUILDLINK3_MK)
+XEXTPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxextproto}
-BUILDLINK_PACKAGES+=	xextproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xextproto
-
-.if !empty(XEXTPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.0
 BUILDLINK_PKGSRCDIR.xextproto?=	../../x11/xextproto
-.endif	# XEXTPROTO_BUILDLINK3_MK
 
 .include "../../x11/inputproto/buildlink3.mk"
+.endif # XEXTPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xextproto
diff --git a/x11/xf86bigfontproto/buildlink3.mk b/x11/xf86bigfontproto/buildlink3.mk
index 2549bb339f4..a366b50fbdd 100644
--- a/x11/xf86bigfontproto/buildlink3.mk
+++ b/x11/xf86bigfontproto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 17:53:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:52 joerg Exp $
 
 BUILDLINK_DEPMETHOD.xf86bigfontproto?=	build
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XF86BIGFONTPROTO_BUILDLINK3_MK:=	${XF86BIGFONTPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xf86bigfontproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xf86bigfontproto
-.endif
+.if !defined(XF86BIGFONTPROTO_BUILDLINK3_MK)
+XF86BIGFONTPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxf86bigfontproto}
-BUILDLINK_PACKAGES+=	xf86bigfontproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xf86bigfontproto
-
-.if ${XF86BIGFONTPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xf86bigfontproto+=	xf86bigfontproto>=1.1
 BUILDLINK_PKGSRCDIR.xf86bigfontproto?=	../../x11/xf86bigfontproto
-.endif	# XF86BIGFONTPROTO_BUILDLINK3_MK
+.endif # XF86BIGFONTPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xf86bigfontproto
diff --git a/x11/xf86dgaproto/buildlink3.mk b/x11/xf86dgaproto/buildlink3.mk
index 8f958a09fc6..d2ce1e4ef10 100644
--- a/x11/xf86dgaproto/buildlink3.mk
+++ b/x11/xf86dgaproto/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/01/15 23:27:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $
 
 BUILDLINK_DEPMETHOD.xf86dgaproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XF86DGAPROTO_BUILDLINK3_MK:=	${XF86DGAPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xf86dgaproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xf86dgaproto
-.endif
+.if !defined(XF86DGAPROTO_BUILDLINK3_MK)
+XF86DGAPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxf86dgaproto}
-BUILDLINK_PACKAGES+=	xf86dgaproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xf86dgaproto
-
-.if ${XF86DGAPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xf86dgaproto+=	xf86dgaproto>=2.0.3
 BUILDLINK_PKGSRCDIR.xf86dgaproto?=	../../x11/xf86dgaproto
-.endif	# XF86DGAPROTO_BUILDLINK3_MK
 
 .include "../../x11/xproto/buildlink3.mk"
+.endif # XF86DGAPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xf86dgaproto
diff --git a/x11/xf86driproto/buildlink3.mk b/x11/xf86driproto/buildlink3.mk
index 9ab3c961cd5..3e1c709ca22 100644
--- a/x11/xf86driproto/buildlink3.mk
+++ b/x11/xf86driproto/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 15:52:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:53 joerg Exp $
 
 BUILDLINK_DEPMETHOD.xf86driproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XF86DRIPROTO_BUILDLINK3_MK:=	${XF86DRIPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xf86driproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xf86driproto
-.endif
+.if !defined(XF86DRIPROTO_BUILDLINK3_MK)
+XF86DRIPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxf86driproto}
-BUILDLINK_PACKAGES+=	xf86driproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xf86driproto
-
-.if ${XF86DRIPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xf86driproto+=	xf86driproto>=2.0.3
 BUILDLINK_PKGSRCDIR.xf86driproto?=	../../x11/xf86driproto
-.endif	# XF86DRIPROTO_BUILDLINK3_MK
 
 .include "../../x11/glproto/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
+.endif # XF86DRIPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xf86driproto
diff --git a/x11/xf86miscproto/buildlink3.mk b/x11/xf86miscproto/buildlink3.mk
index cad8a8b4fc9..4cf6abdfa3a 100644
--- a/x11/xf86miscproto/buildlink3.mk
+++ b/x11/xf86miscproto/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 14:53:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:53 joerg Exp $
 
 BUILDLINK_DEPMETHOD.xf86miscproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XF86MISCPROTO_BUILDLINK3_MK:=	${XF86MISCPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xf86miscproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xf86miscproto
-.endif
+.if !defined(XF86MISCPROTO_BUILDLINK3_MK)
+XF86MISCPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxf86miscproto}
-BUILDLINK_PACKAGES+=	xf86miscproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xf86miscproto
-
-.if ${XF86MISCPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xf86miscproto+=	xf86miscproto>=0.9.2
 BUILDLINK_PKGSRCDIR.xf86miscproto?=	../../x11/xf86miscproto
-.endif	# XF86MISCPROTO_BUILDLINK3_MK
 
 .include "../../x11/xproto/buildlink3.mk"
+.endif # XF86MISCPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xf86miscproto
diff --git a/x11/xf86vidmodeproto/buildlink3.mk b/x11/xf86vidmodeproto/buildlink3.mk
index a6ad006257b..d05d4895662 100644
--- a/x11/xf86vidmodeproto/buildlink3.mk
+++ b/x11/xf86vidmodeproto/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 15:01:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:53 joerg Exp $
 
 BUILDLINK_DEPMETHOD.xf86vidmodeproto?=	build
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XF86VIDMODEPROTO_BUILDLINK3_MK:=	${XF86VIDMODEPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xf86vidmodeproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xf86vidmodeproto
-.endif
+.if !defined(XF86VIDMODEPROTO_BUILDLINK3_MK)
+XF86VIDMODEPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxf86vidmodeproto}
-BUILDLINK_PACKAGES+=	xf86vidmodeproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xf86vidmodeproto
-
-.if ${XF86VIDMODEPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xf86vidmodeproto+=	xf86vidmodeproto>=2.2.1
 BUILDLINK_PKGSRCDIR.xf86vidmodeproto?=	../../x11/xf86vidmodeproto
-.endif	# XF86VIDMODEPROTO_BUILDLINK3_MK
 
 .include "../../x11/xproto/buildlink3.mk"
+.endif # XF86VIDMODEPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xf86vidmodeproto
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index 5a57784c3ed..9fdc575f2e3 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:21 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:53 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-clipman-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-clipman-plugin
-.endif
+.if !defined(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK)
+XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-clipman-plugin}
-BUILDLINK_PACKAGES+=	xfce4-clipman-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-clipman-plugin
-
-.if ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.8.0
 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?=	../../x11/xfce4-clipman-plugin
-.endif	# XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-clipman-plugin
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index e1dad667c0f..25ed08b1646 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.23 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:25:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_DESKTOP_BUILDLINK3_MK:=	${XFCE4_DESKTOP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-desktop
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-desktop
-.endif
+.if !defined(XFCE4_DESKTOP_BUILDLINK3_MK)
+XFCE4_DESKTOP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-desktop}
-BUILDLINK_PACKAGES+=	xfce4-desktop
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-desktop
-
-.if ${XFCE4_DESKTOP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-desktop?=	../../x11/xfce4-desktop
-.endif	# XFCE4_DESKTOP_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.xfce4-desktop?=	../../x11/xfce4-desktop
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_DESKTOP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-desktop
diff --git a/x11/xfce4-exo/buildlink3.mk b/x11/xfce4-exo/buildlink3.mk
index 624b9d63c42..139345502f2 100644
--- a/x11/xfce4-exo/buildlink3.mk
+++ b/x11/xfce4-exo/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/12/09 10:33:36 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_EXO_BUILDLINK3_MK:=	${XFCE4_EXO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-exo
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-exo
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-exo}
-BUILDLINK_PACKAGES+=	xfce4-exo
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-exo
+.if !defined(XFCE4_EXO_BUILDLINK3_MK)
+XFCE4_EXO_BUILDLINK3_MK:=
 
-.if ${XFCE4_EXO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-exo+=	xfce4-exo>=0.3.4
 BUILDLINK_PKGSRCDIR.xfce4-exo?=	../../x11/xfce4-exo
-.endif	# XFCE4_EXO_BUILDLINK3_MK
 
 pkgbase := xfce4-exo
 .include "../../mk/pkg-build-options.mk"
@@ -27,5 +19,6 @@ pkgbase := xfce4-exo
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_EXO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-exo
diff --git a/x11/xfce4-eyes-plugin/buildlink3.mk b/x11/xfce4-eyes-plugin/buildlink3.mk
index 15afbecc142..ed0db5d33d6 100644
--- a/x11/xfce4-eyes-plugin/buildlink3.mk
+++ b/x11/xfce4-eyes-plugin/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:53 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_EYES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_EYES_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-eyes-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-eyes-plugin
-.endif
+.if !defined(XFCE4_EYES_PLUGIN_BUILDLINK3_MK)
+XFCE4_EYES_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-eyes-plugin}
-BUILDLINK_PACKAGES+=	xfce4-eyes-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-eyes-plugin
-
-.if ${XFCE4_EYES_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-eyes-plugin+=	xfce4-eyes-plugin>=4.4.0
 BUILDLINK_PKGSRCDIR.xfce4-eyes-plugin?=	../../x11/xfce4-eyes-plugin
-.endif	# XFCE4_EYES_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_EYES_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-eyes-plugin
diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk
index 4dc46e9ea87..73a6570fb54 100644
--- a/x11/xfce4-gtk2-engine/buildlink3.mk
+++ b/x11/xfce4-gtk2-engine/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/12/18 16:43:28 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:53 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_GTK2_ENGINE_BUILDLINK3_MK:=	${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-gtk2-engine
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-gtk2-engine
-.endif
+.if !defined(XFCE4_GTK2_ENGINE_BUILDLINK3_MK)
+XFCE4_GTK2_ENGINE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-gtk2-engine}
-BUILDLINK_PACKAGES+=	xfce4-gtk2-engine
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-gtk2-engine
-
-.if ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.4.3
 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?=	../../x11/xfce4-gtk2-engine
-.endif	# XFCE4_GTK2_ENGINE_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-gtk2-engine
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index ecd8704ad4c..a84b867874c 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.21 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:53 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_MCS_MANAGER_BUILDLINK3_MK:=	${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-mcs-manager
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-mcs-manager
-.endif
+.if !defined(XFCE4_MCS_MANAGER_BUILDLINK3_MK)
+XFCE4_MCS_MANAGER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-manager}
-BUILDLINK_PACKAGES+=	xfce4-mcs-manager
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mcs-manager
-
-.if ${XFCE4_MCS_MANAGER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?=	../../x11/xfce4-mcs-manager
-.endif	# XFCE4_MCS_MANAGER_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/libxfce4mcs/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-mcs-manager
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index 6d43f2aa6b4..427b1d6037f 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.21 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:53 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_MCS_PLUGINS_BUILDLINK3_MK:=	${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-mcs-plugins
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-mcs-plugins
-.endif
+.if !defined(XFCE4_MCS_PLUGINS_BUILDLINK3_MK)
+XFCE4_MCS_PLUGINS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-plugins}
-BUILDLINK_PACKAGES+=	xfce4-mcs-plugins
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mcs-plugins
-
-.if ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?=	../../x11/xfce4-mcs-plugins
-.endif	# XFCE4_MCS_PLUGINS_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-manager/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-mcs-plugins
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index 0a07678874f..74220dafe08 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/12/05 07:50:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:53 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-notes-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-notes-plugin
-.endif
+.if !defined(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK)
+XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-notes-plugin}
-BUILDLINK_PACKAGES+=	xfce4-notes-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-notes-plugin
-
-.if ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=1.6.0
 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?=	../../x11/xfce4-notes-plugin
-.endif	# XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-notes-plugin
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index 6e9e50c0ceb..8ddfe41ab56 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.22 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:25:54 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-panel
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-panel
-.endif
+.if !defined(XFCE4_PANEL_BUILDLINK3_MK)
+XFCE4_PANEL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-panel}
-BUILDLINK_PACKAGES+=	xfce4-panel
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-panel
-
-.if ${XFCE4_PANEL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
-.endif	# XFCE4_PANEL_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
@@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_PANEL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-panel
diff --git a/x11/xfce4-places-plugin/buildlink3.mk b/x11/xfce4-places-plugin/buildlink3.mk
index 48f20d41738..67e55a41891 100644
--- a/x11/xfce4-places-plugin/buildlink3.mk
+++ b/x11/xfce4-places-plugin/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/12/05 07:51:18 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:54 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_PLACES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_PLACES_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-places-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-places-plugin
-.endif
+.if !defined(XFCE4_PLACES_PLUGIN_BUILDLINK3_MK)
+XFCE4_PLACES_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-places-plugin}
-BUILDLINK_PACKAGES+=	xfce4-places-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-places-plugin
-
-.if ${XFCE4_PLACES_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-places-plugin+=	xfce4-places-plugin>=1.0.0
 BUILDLINK_PKGSRCDIR.xfce4-places-plugin?=	../../x11/xfce4-places-plugin
-.endif	# XFCE4_PLACES_PLUGIN_BUILDLINK3_MK
 
 .include "../../sysutils/xfce4-thunar/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
@@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.xfce4-places-plugin?=	../../x11/xfce4-places-plugin
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_PLACES_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-places-plugin
diff --git a/x11/xfce4-screenshooter-plugin/buildlink3.mk b/x11/xfce4-screenshooter-plugin/buildlink3.mk
index 485b0a908eb..5fbbe1f362a 100644
--- a/x11/xfce4-screenshooter-plugin/buildlink3.mk
+++ b/x11/xfce4-screenshooter-plugin/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:54 joerg Exp $
 
-BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
-XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK:=	${XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-screenshooter-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-screenshooter-plugin
-.endif
+.if !defined(XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK)
+XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-screenshooter-plugin}
-BUILDLINK_PACKAGES+=	xfce4-screenshooter-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-screenshooter-plugin
-
-.if ${XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-screenshooter-plugin+=	xfce4-screenshooter-plugin>=1.0.0
 BUILDLINK_PKGSRCDIR.xfce4-screenshooter-plugin?=	../../x11/xfce4-screenshooter-plugin
-.endif	# XFCE4_SCREENSHOOTER_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_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-screenshooter-plugin
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index 3e25914a363..36c20f9d023 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.18 2008/12/19 23:58:18 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:25:54 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_SESSION_BUILDLINK3_MK:=	${XFCE4_SESSION_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-session
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-session
-.endif
+.if !defined(XFCE4_SESSION_BUILDLINK3_MK)
+XFCE4_SESSION_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-session}
-BUILDLINK_PACKAGES+=	xfce4-session
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-session
-
-.if ${XFCE4_SESSION_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.4.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-session?=	../../x11/xfce4-session
-.endif	# XFCE4_SESSION_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_SESSION_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-session
diff --git a/x11/xfce4-terminal/buildlink3.mk b/x11/xfce4-terminal/buildlink3.mk
index 503745a4b89..55d532d5054 100644
--- a/x11/xfce4-terminal/buildlink3.mk
+++ b/x11/xfce4-terminal/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/12/18 16:46:30 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:54 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_TERMINAL_BUILDLINK3_MK:=	${XFCE4_TERMINAL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-terminal
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-terminal
-.endif
+.if !defined(XFCE4_TERMINAL_BUILDLINK3_MK)
+XFCE4_TERMINAL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-terminal}
-BUILDLINK_PACKAGES+=	xfce4-terminal
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-terminal
-
-.if ${XFCE4_TERMINAL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-terminal+=	xfce4-terminal>=0.2.8.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-terminal?=	../../x11/xfce4-terminal
-.endif	# XFCE4_TERMINAL_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-exo/buildlink3.mk"
 .include "../../x11/vte/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_TERMINAL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-terminal
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 48c1054af3d..deb39b06c9e 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.25 2008/12/18 16:46:30 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:25:54 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_UTILS_BUILDLINK3_MK:=	${XFCE4_UTILS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-utils
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-utils
-.endif
+.if !defined(XFCE4_UTILS_BUILDLINK3_MK)
+XFCE4_UTILS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-utils}
-BUILDLINK_PACKAGES+=	xfce4-utils
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-utils
-
-.if ${XFCE4_UTILS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-utils+=	xfce4-utils>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-utils?=	../../x11/xfce4-utils
-.endif	# XFCE4_UTILS_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_UTILS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-utils
diff --git a/x11/xforms/buildlink3.mk b/x11/xforms/buildlink3.mk
index df263f2a44e..b76de4cc6a1 100644
--- a/x11/xforms/buildlink3.mk
+++ b/x11/xforms/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XFORMS_BUILDLINK3_MK:=	${XFORMS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xforms
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xforms
-.endif
+.if !defined(XFORMS_BUILDLINK3_MK)
+XFORMS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxforms}
-BUILDLINK_PACKAGES+=	xforms
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xforms
-
-.if !empty(XFORMS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xforms+=	xforms>=1.0nb2
 BUILDLINK_ABI_DEPENDS.xforms+=	xforms>=1.0nb5
 BUILDLINK_PKGSRCDIR.xforms?=	../../x11/xforms
-.endif	# XFORMS_BUILDLINK3_MK
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.endif # XFORMS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xforms
diff --git a/x11/xineramaproto/buildlink3.mk b/x11/xineramaproto/buildlink3.mk
index 810f4830073..cc3e46073aa 100644
--- a/x11/xineramaproto/buildlink3.mk
+++ b/x11/xineramaproto/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 20:07:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:54 joerg Exp $
 
 BUILDLINK_DEPMETHOD.xineramaproto?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XINERAMAPROTO_BUILDLINK3_MK:=	${XINERAMAPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xineramaproto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xineramaproto
-.endif
+.if !defined(XINERAMAPROTO_BUILDLINK3_MK)
+XINERAMAPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxineramaproto}
-BUILDLINK_PACKAGES+=	xineramaproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xineramaproto
-
-.if ${XINERAMAPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xineramaproto+=	xineramaproto>=1.1.1
 BUILDLINK_PKGSRCDIR.xineramaproto?=	../../x11/xineramaproto
-.endif	# XINERAMAPROTO_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
+.endif # XINERAMAPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xineramaproto
diff --git a/x11/xlt/buildlink3.mk b/x11/xlt/buildlink3.mk
index 2e316a0d277..e18edef1ffe 100644
--- a/x11/xlt/buildlink3.mk
+++ b/x11/xlt/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/07/16 07:40:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XLT_BUILDLINK3_MK:=	${XLT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xlt
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xlt
-.endif
+.if !defined(XLT_BUILDLINK3_MK)
+XLT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxlt}
-BUILDLINK_PACKAGES+=	xlt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xlt
-
-.if ${XLT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xlt+=	xlt>=13.0.13
 BUILDLINK_PKGSRCDIR.xlt?=	../../x11/xlt
-.endif	# XLT_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.endif # XLT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xlt
diff --git a/x11/xosd/buildlink3.mk b/x11/xosd/buildlink3.mk
index 03148485848..28ca9a05126 100644
--- a/x11/xosd/buildlink3.mk
+++ b/x11/xosd/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XOSD_BUILDLINK3_MK:=	${XOSD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xosd
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xosd
-.endif
+.if !defined(XOSD_BUILDLINK3_MK)
+XOSD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxosd}
-BUILDLINK_PACKAGES+=	xosd
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xosd
-
-.if !empty(XOSD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xosd+=	xosd>=2.2.12
 BUILDLINK_ABI_DEPENDS.xosd+=	xosd>=2.2.12nb2
 BUILDLINK_PKGSRCDIR.xosd?=	../../x11/xosd
-.endif	# XOSD_BUILDLINK3_MK
+.endif # XOSD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xosd
diff --git a/x11/xproto/buildlink3.mk b/x11/xproto/buildlink3.mk
index f88a51bd4a4..3daa76dbc36 100644
--- a/x11/xproto/buildlink3.mk
+++ b/x11/xproto/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.9 2008/02/14 20:01:44 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:55 joerg Exp $
 #
 # This Makefile fragment is included by packages that use xproto.
 #
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XPROTO_BUILDLINK3_MK:=	${XPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xproto
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xproto
-.endif
+.if !defined(XPROTO_BUILDLINK3_MK)
+XPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxproto}
-BUILDLINK_PACKAGES+=	xproto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xproto
-
-.if !empty(XPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xproto?=		xproto>=7.0.9
 BUILDLINK_PKGSRCDIR.xproto?=		../../x11/xproto
 BUILDLINK_DEPMETHOD.xproto?=		build
 .endif # XPROTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xproto
diff --git a/x11/xproxymanagementprotocol/buildlink3.mk b/x11/xproxymanagementprotocol/buildlink3.mk
index 4aaa3f7a348..3c3d94ae37e 100644
--- a/x11/xproxymanagementprotocol/buildlink3.mk
+++ b/x11/xproxymanagementprotocol/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/10 13:47:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:55 joerg Exp $
 
 BUILDLINK_DEPMETHOD.xproxymanagementprotocol?=	build
 
-BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
-XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK:=	${XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xproxymanagementprotocol
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xproxymanagementprotocol
-.endif
+.if !defined(XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK)
+XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxproxymanagementprotocol}
-BUILDLINK_PACKAGES+=	xproxymanagementprotocol
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xproxymanagementprotocol
-
-.if ${XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xproxymanagementprotocol+=	xproxymanagementprotocol>=1.0.2
 BUILDLINK_PKGSRCDIR.xproxymanagementprotocol?=	../../x11/xproxymanagementprotocol
-.endif	# XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK
+.endif # XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xproxymanagementprotocol
diff --git a/x11/xscreensaver/buildlink3.mk b/x11/xscreensaver/buildlink3.mk
index f89a4bd7ff7..2840231ef05 100644
--- a/x11/xscreensaver/buildlink3.mk
+++ b/x11/xscreensaver/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XSCREENSAVER_BUILDLINK3_MK:=	${XSCREENSAVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xscreensaver
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xscreensaver
-.endif
+.if !defined(XSCREENSAVER_BUILDLINK3_MK)
+XSCREENSAVER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxscreensaver}
-BUILDLINK_PACKAGES+=	xscreensaver
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xscreensaver
-
-.if !empty(XSCREENSAVER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xscreensaver+=	xscreensaver>=4.14
 BUILDLINK_ABI_DEPENDS.xscreensaver?=	xscreensaver>=4.22nb3
 BUILDLINK_PKGSRCDIR.xscreensaver?=	../../x11/xscreensaver
-.endif	# XSCREENSAVER_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # XSCREENSAVER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xscreensaver
diff --git a/x11/xtrans/buildlink3.mk b/x11/xtrans/buildlink3.mk
index d3a2234a747..2297f84d626 100644
--- a/x11/xtrans/buildlink3.mk
+++ b/x11/xtrans/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/05 21:03:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:55 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XTRANS_BUILDLINK3_MK:=	${XTRANS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xtrans
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xtrans
-.endif
+.if !defined(XTRANS_BUILDLINK3_MK)
+XTRANS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxtrans}
-BUILDLINK_PACKAGES+=	xtrans
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xtrans
-
-.if ${XTRANS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xtrans?=		xtrans>=1.0.3
 BUILDLINK_PKGSRCDIR.xtrans?=		../../x11/xtrans
 BUILDLINK_DEPMETHOD.xtrans?=		build
-.endif	# XTRANS_BUILDLINK3_MK
+.endif # XTRANS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xtrans
diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk
index 5af97e6b220..79a300645a5 100644
--- a/x11/xview-lib/buildlink3.mk
+++ b/x11/xview-lib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/08/30 20:01:28 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XVIEW_LIB_BUILDLINK3_MK:=	${XVIEW_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xview-lib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xview-lib
-.endif
+.if !defined(XVIEW_LIB_BUILDLINK3_MK)
+XVIEW_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxview-lib}
-BUILDLINK_PACKAGES+=	xview-lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xview-lib
-
-.if !empty(XVIEW_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xview-lib+=	xview-lib>=3.2.1
 BUILDLINK_ABI_DEPENDS.xview-lib?=	xview-lib>=3.2.1nb7
 BUILDLINK_PKGSRCDIR.xview-lib?=	../../x11/xview-lib
-.endif	# XVIEW_LIB_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
+.endif # XVIEW_LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xview-lib
author	joerg <joerg>	2009-03-20 19:23:50 +0000
committer	joerg <joerg>	2009-03-20 19:23:50 +0000
commit	405c61d80251d8e80401aed2264d4bede218cb22 (patch)
tree	647e974495c5d41703d41ca2e71c9b6063b9153a /x11
parent	f0f715d4dd4a290c5c6ae716c774f59caf5aa61c (diff)
download	pkgsrc-405c61d80251d8e80401aed2264d4bede218cb22.tar.gz