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@pkgsrc.org> 2009-03-20 19:23:50 +0000
committer: joerg <joerg@pkgsrc.org> 2009-03-20 19:23:50 +0000
commit: 2d1ba244e90207d03eef397a99aa4091baeec5b3 (patch)
tree: 647e974495c5d41703d41ca2e71c9b6063b9153a /devel
parent: 4bf0a20854ae9e07b7965977a713f2efee890976 (diff)
download: pkgsrc-2d1ba244e90207d03eef397a99aa4091baeec5b3.tar.gz
230 files changed, 1380 insertions, 3006 deletions
diff --git a/devel/GConf-ui/buildlink3.mk b/devel/GConf-ui/buildlink3.mk
index 1699abb1f6b..30019714c1c 100644
--- a/devel/GConf-ui/buildlink3.mk
+++ b/devel/GConf-ui/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/09/21 12:58:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:08 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GCONF_UI_BUILDLINK3_MK:=	${GCONF_UI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	GConf-ui
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	GConf-ui
-.endif
+.if !defined(GCONF_UI_BUILDLINK3_MK)
+GCONF_UI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf-ui}
-BUILDLINK_PACKAGES+=	GConf-ui
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf-ui
-
-.if !empty(GCONF_UI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GConf-ui+=	GConf-ui>=2.8.0.1
 BUILDLINK_ABI_DEPENDS.GConf-ui?=	GConf-ui>=2.14.0nb1
 BUILDLINK_PKGSRCDIR.GConf-ui?=	../../devel/GConf-ui
-.endif	# GCONF_UI_BUILDLINK3_MK
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GCONF_UI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-GConf-ui
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index bf2c088432b..0694ec2fad7 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/10/09 20:53:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:08 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GCONF_BUILDLINK3_MK:=	${GCONF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	GConf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	GConf
-.endif
+.if !defined(GCONF_BUILDLINK3_MK)
+GCONF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf}
-BUILDLINK_PACKAGES+=	GConf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf
-
-.if !empty(GCONF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.8.0.1
 BUILDLINK_ABI_DEPENDS.GConf?=	GConf>=2.12.1nb1
 BUILDLINK_PKGSRCDIR.GConf?=	../../devel/GConf
-.endif	# GCONF_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -25,7 +17,6 @@ BUILDLINK_PKGSRCDIR.GConf?=	../../devel/GConf
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/buildlink3.mk"
 
-.if !empty(GCONF_BUILDLINK3_MK:M+)
 BUILDLINK_TARGETS+=	GConf-buildlink-fake
 _GCONF_FAKE=		${BUILDLINK_DIR}/bin/gconftool-2
 
@@ -38,6 +29,6 @@ GConf-buildlink-fake:
 		${ECHO} "#!${SH}" > ${_GCONF_FAKE};			\
 		${CHMOD} +x ${_GCONF_FAKE};				\
 	fi
-.endif	# GCONF_BUILDLINK3_MK
+.endif # GCONF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-GConf
diff --git a/devel/Renaissance/buildlink3.mk b/devel/Renaissance/buildlink3.mk
index f2bf09f1b21..d8cf8d5df58 100644
--- a/devel/Renaissance/buildlink3.mk
+++ b/devel/Renaissance/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:14:31 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:08 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-RENAISSANCE_BUILDLINK3_MK:=	${RENAISSANCE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Renaissance
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Renaissance
-.endif
+.if !defined(RENAISSANCE_BUILDLINK3_MK)
+RENAISSANCE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NRenaissance}
-BUILDLINK_PACKAGES+=	Renaissance
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Renaissance
-
-.if !empty(RENAISSANCE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Renaissance+=		Renaissance>=0.7.0
 BUILDLINK_ABI_DEPENDS.Renaissance+=	Renaissance>=0.8.0nb7
 BUILDLINK_PKGSRCDIR.Renaissance?=	../../devel/Renaissance
-.endif	# RENAISSANCE_BUILDLINK3_MK
 
 .include "../../x11/gnustep-back/buildlink3.mk"
+.endif # RENAISSANCE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Renaissance
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 20dcac07386..508335a6099 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.29 2008/05/06 06:36:44 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2009/03/20 19:24:08 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SDL_BUILDLINK3_MK:=	${SDL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	SDL
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	SDL
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL}
-BUILDLINK_PACKAGES+=	SDL
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL
+.if !defined(SDL_BUILDLINK3_MK)
+SDL_BUILDLINK3_MK:=
 
-.if !empty(SDL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL+=	SDL>=1.2.5nb5
 BUILDLINK_ABI_DEPENDS.SDL+=	SDL>=1.2.10
 BUILDLINK_PKGSRCDIR.SDL?=	../../devel/SDL
-.endif	# SDL_BUILDLINK3_MK
 
 PTHREAD_OPTS+=	require
 
@@ -43,5 +35,6 @@ pkgbase := SDL
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.endif # SDL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-SDL
diff --git a/devel/SDL_Pango/buildlink3.mk b/devel/SDL_Pango/buildlink3.mk
index 9ea6170cca1..912732e3ea1 100644
--- a/devel/SDL_Pango/buildlink3.mk
+++ b/devel/SDL_Pango/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/01/28 20:15:57 heinz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:08 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SDL_PANGO_BUILDLINK3_MK:=	${SDL_PANGO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	SDL_Pango
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	SDL_Pango
-.endif
+.if !defined(SDL_PANGO_BUILDLINK3_MK)
+SDL_PANGO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_Pango}
-BUILDLINK_PACKAGES+=	SDL_Pango
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_Pango
-
-.if ${SDL_PANGO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.SDL_Pango+=	SDL_Pango>=0.1.2
 BUILDLINK_ABI_DEPENDS.SDL_Pango+=	SDL_Pango>=0.1.2
 BUILDLINK_PKGSRCDIR.SDL_Pango?=		../../devel/SDL_Pango
-.endif	# SDL_PANGO_BUILDLINK3_MK
 
 # Seems to be unnecessary, pkg-config does not show anything from SDL
 #.include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.endif # SDL_PANGO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-SDL_Pango
diff --git a/devel/SDL_gfx/buildlink3.mk b/devel/SDL_gfx/buildlink3.mk
index bbe219c9c4b..4f62d134dda 100644
--- a/devel/SDL_gfx/buildlink3.mk
+++ b/devel/SDL_gfx/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/01/07 12:06:35 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SDL_GFX_BUILDLINK3_MK:=	${SDL_GFX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	SDL_gfx
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	SDL_gfx
-.endif
+.if !defined(SDL_GFX_BUILDLINK3_MK)
+SDL_GFX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_gfx}
-BUILDLINK_PACKAGES+=	SDL_gfx
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_gfx
-
-.if !empty(SDL_GFX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_gfx+=	SDL_gfx>=2.0.3nb2
 BUILDLINK_ABI_DEPENDS.SDL_gfx+=	SDL_gfx>=2.0.15
 BUILDLINK_PKGSRCDIR.SDL_gfx?=	../../devel/SDL_gfx
-.endif	# SDL_GFX_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
+.endif # SDL_GFX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-SDL_gfx
diff --git a/devel/SDL_ttf/buildlink3.mk b/devel/SDL_ttf/buildlink3.mk
index 1ce36a501cd..7ce0d4b50c7 100644
--- a/devel/SDL_ttf/buildlink3.mk
+++ b/devel/SDL_ttf/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SDL_TTF_BUILDLINK3_MK:=	${SDL_TTF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	SDL_ttf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	SDL_ttf
-.endif
+.if !defined(SDL_TTF_BUILDLINK3_MK)
+SDL_TTF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_ttf}
-BUILDLINK_PACKAGES+=	SDL_ttf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_ttf
-
-.if !empty(SDL_TTF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_ttf+=	SDL_ttf>=2.0.3nb3
 BUILDLINK_ABI_DEPENDS.SDL_ttf?=	SDL_ttf>=2.0.8
 BUILDLINK_PKGSRCDIR.SDL_ttf?=	../../devel/SDL_ttf
-.endif	# SDL_TTF_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.endif # SDL_TTF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-SDL_ttf
diff --git a/devel/SDLmm/buildlink3.mk b/devel/SDLmm/buildlink3.mk
index 64be2d51edc..2b7d854b0ab 100644
--- a/devel/SDLmm/buildlink3.mk
+++ b/devel/SDLmm/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SDLMM_BUILDLINK3_MK:=	${SDLMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	SDLmm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	SDLmm
-.endif
+.if !defined(SDLMM_BUILDLINK3_MK)
+SDLMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDLmm}
-BUILDLINK_PACKAGES+=	SDLmm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDLmm
-
-.if !empty(SDLMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDLmm+=	SDLmm>=0.1.8nb1
 BUILDLINK_ABI_DEPENDS.SDLmm?=	SDLmm>=0.1.8nb6
 BUILDLINK_PKGSRCDIR.SDLmm?=	../../devel/SDLmm
-.endif	# SDLMM_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
+.endif # SDLMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-SDLmm
diff --git a/devel/allegro/buildlink3.mk b/devel/allegro/buildlink3.mk
index cb5481bbe11..ef0d3b7099c 100644
--- a/devel/allegro/buildlink3.mk
+++ b/devel/allegro/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/01/20 14:16:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ALLEGRO_BUILDLINK3_MK:=	${ALLEGRO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	allegro
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	allegro
-.endif
+.if !defined(ALLEGRO_BUILDLINK3_MK)
+ALLEGRO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nallegro}
-BUILDLINK_PACKAGES+=	allegro
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}allegro
-
-.if !empty(ALLEGRO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.allegro+=	allegro>=4.1.13
 BUILDLINK_ABI_DEPENDS.allegro?=	allegro>=4.2.0nb1
 BUILDLINK_PKGSRCDIR.allegro?=	../../devel/allegro
-.endif	# ALLEGRO_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
+.endif # ALLEGRO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-allegro
diff --git a/devel/apel/buildlink3.mk b/devel/apel/buildlink3.mk
index e55330412dd..01af086ea61 100644
--- a/devel/apel/buildlink3.mk
+++ b/devel/apel/buildlink3.mk
@@ -1,24 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:09 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-APEL_BUILDLINK3_MK:=	${APEL_BUILDLINK3_MK}+
-
 .include "../../editors/emacs/modules.mk"
 .if ${EMACS_FLAVOR} == "emacs"
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	apel
-.endif
+BUILDLINK_TREE+=	apel
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napel}
-BUILDLINK_PACKAGES+=	apel
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apel
+.if !defined(APEL_BUILDLINK3_MK)
+APEL_BUILDLINK3_MK:=
 
-.if ${APEL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.apel+=	${EMACS_PKGNAME_PREFIX}apel>=10
 BUILDLINK_PKGSRCDIR.apel?=	../../devel/apel
-.endif	# APEL_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.apel=	${EGREP} '.*\.el$$|.*\.elc$$'
 
@@ -28,5 +20,6 @@ BUILDLINK_CONTENTS_FILTER.apel=	${EGREP} '.*\.el$$|.*\.elc$$'
 EMACS_MODULES+=		base
 
 .endif
+.endif # APEL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-apel
diff --git a/devel/apr-util/buildlink3.mk b/devel/apr-util/buildlink3.mk
index e531b878e90..92039083541 100644
--- a/devel/apr-util/buildlink3.mk
+++ b/devel/apr-util/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/09/06 20:54:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:09 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-APR_UTIL_BUILDLINK3_MK:=	${APR_UTIL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	apr-util
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	apr-util
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napr-util}
-BUILDLINK_PACKAGES+=	apr-util
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr-util
+.if !defined(APR_UTIL_BUILDLINK3_MK)
+APR_UTIL_BUILDLINK3_MK:=
 
-.if !empty(APR_UTIL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.apr-util+=	apr-util>=1.2.8
 BUILDLINK_ABI_DEPENDS.apr-util?=	apr-util>=1.3.4
 BUILDLINK_PKGSRCDIR.apr-util?=	../../devel/apr-util
@@ -23,7 +16,6 @@ ${BUILDLINK_DIR}/bin/apu-config: buildlink-directories
 	${MKDIR} ${BUILDLINK_DIR}/bin && ${LN} -fs apu-1-config ${BUILDLINK_DIR}/bin/apu-config
 
 buildlink-apr-util-cookie: ${BUILDLINK_DIR}/bin/apu-config
-.endif	# APR_UTIL_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -42,5 +34,6 @@ pkgbase := apr-util
 .include "../../devel/apr/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # APR_UTIL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-apr-util
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index ee4e092a637..7da8b958260 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.31 2007/06/30 15:04:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2009/03/20 19:24:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	apr
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	apr
-.endif
+.if !defined(APR_BUILDLINK3_MK)
+APR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napr}
-BUILDLINK_PACKAGES+=	apr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr
-
-.if !empty(APR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.apr+=	apr>=1.2.8
 BUILDLINK_PKGSRCDIR.apr?=	../../devel/apr
 BUILDLINK_INCDIRS.apr?=		include/apr-1
@@ -23,7 +16,6 @@ ${BUILDLINK_DIR}/bin/apr-config: buildlink-directories
 	${MKDIR} ${BUILDLINK_DIR}/bin && ${LN} -fs apr-1-config ${BUILDLINK_DIR}/bin/apr-config
 
 buildlink-apr-cookie: ${BUILDLINK_DIR}/bin/apr-config
+.endif # APR_BUILDLINK3_MK
 
-.endif	# APR_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-apr
diff --git a/devel/apr0/buildlink3.mk b/devel/apr0/buildlink3.mk
index 5da5d7b872c..25f4ddd1c42 100644
--- a/devel/apr0/buildlink3.mk
+++ b/devel/apr0/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.9 2008/09/06 20:54:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	apr
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	apr
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napr}
-BUILDLINK_PACKAGES+=	apr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr
+.if !defined(APR_BUILDLINK3_MK)
+APR_BUILDLINK3_MK:=
 
-.if !empty(APR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.apr+=	apr-0.9.* apr>=0.9.5.2.0.51nb1
 BUILDLINK_ABI_DEPENDS.apr+=	apr>=0.9.17.2.0.63nb1
 BUILDLINK_PKGSRCDIR.apr?=	../../devel/apr0
@@ -23,8 +16,6 @@ BUILDLINK_FILES.apr+=	bin/apr-config
 BUILDLINK_FILES.apr+=	bin/apu-config
 BUILDLINK_FILES.apr+=	lib/*.exp
 
-.endif	# APR_BUILDLINK3_MK
-
 .include "../../mk/bsd.fast.prefs.mk"
 
 pkgbase := apr
@@ -41,5 +32,6 @@ pkgbase := apr
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # APR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-apr
diff --git a/devel/argp/buildlink3.mk b/devel/argp/buildlink3.mk
index bb98c7ef01c..045d0cee8fd 100644
--- a/devel/argp/buildlink3.mk
+++ b/devel/argp/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/03/24 16:57:41 agc Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:09 joerg Exp $
 # Packages that only install static libraries or headers should
 # include the following line:
 #
 # BUILDLINK_DEPMETHOD.argp?=	build
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ARGP_BUILDLINK3_MK:=	${ARGP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	argp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	argp
-.endif
+.if !defined(ARGP_BUILDLINK3_MK)
+ARGP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nargp}
-BUILDLINK_PACKAGES+=	argp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}argp
-
-.if ${ARGP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.argp+=	argp>=1.3
 BUILDLINK_PKGSRCDIR.argp?=	../../devel/argp
-.endif	# ARGP_BUILDLINK3_MK
+.endif # ARGP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-argp
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
index 7608c57db10..cf365d38838 100644
--- a/devel/at-spi/buildlink3.mk
+++ b/devel/at-spi/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/10/16 12:26:36 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-AT_SPI_BUILDLINK3_MK:=	${AT_SPI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	at-spi
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	at-spi
-.endif
+.if !defined(AT_SPI_BUILDLINK3_MK)
+AT_SPI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nat-spi}
-BUILDLINK_PACKAGES+=	at-spi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}at-spi
-
-.if !empty(AT_SPI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.at-spi+=	at-spi>=1.6.0
 BUILDLINK_ABI_DEPENDS.at-spi+=	at-spi>=1.7.7nb1
 BUILDLINK_PKGSRCDIR.at-spi?=	../../devel/at-spi
-.endif	# AT_SPI_BUILDLINK3_MK
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
+.endif # AT_SPI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-at-spi
diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk
index a19b50db4b5..ffd1cac3851 100644
--- a/devel/atk/buildlink3.mk
+++ b/devel/atk/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ATK_BUILDLINK3_MK:=	${ATK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	atk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	atk
-.endif
+.if !defined(ATK_BUILDLINK3_MK)
+ATK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Natk}
-BUILDLINK_PACKAGES+=	atk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}atk
-
-.if !empty(ATK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.atk+=		atk>=1.11.4
 BUILDLINK_ABI_DEPENDS.atk+=	atk>=1.11.4
 BUILDLINK_PKGSRCDIR.atk?=	../../devel/atk
-.endif	# ATK_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # ATK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-atk
diff --git a/devel/bglibs/buildlink3.mk b/devel/bglibs/buildlink3.mk
index e0250948f8a..3416de7bc23 100644
--- a/devel/bglibs/buildlink3.mk
+++ b/devel/bglibs/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/04/12 20:56:25 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:10 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BGLIBS_BUILDLINK3_MK:=	${BGLIBS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	bglibs
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	bglibs
-.endif
+.if !defined(BGLIBS_BUILDLINK3_MK)
+BGLIBS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbglibs}
-BUILDLINK_PACKAGES+=	bglibs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bglibs
-
-.if !empty(BGLIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.bglibs+=	bglibs>=1.104
 BUILDLINK_PKGSRCDIR.bglibs?=	../../devel/bglibs
-.endif	# BGLIBS_BUILDLINK3_MK
+.endif # BGLIBS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-bglibs
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index f75eb266995..2c09efc8722 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.22 2008/03/24 23:40:37 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:24:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	binutils
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	binutils
-.endif
+.if !defined(BINUTILS_BUILDLINK3_MK)
+BINUTILS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbinutils}
-BUILDLINK_PACKAGES+=	binutils
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}binutils
-
-.if ${BINUTILS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.binutils+=	binutils>=2.17
 BUILDLINK_PKGSRCDIR.binutils?=	../../devel/binutils
 BUILDLINK_DEPMETHOD.binutils?=	build
-.endif	# BINUTILS_BUILDLINK3_MK
+.endif # BINUTILS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-binutils
diff --git a/devel/blib/buildlink3.mk b/devel/blib/buildlink3.mk
index 02999c5860b..8e060ca7bb3 100644
--- a/devel/blib/buildlink3.mk
+++ b/devel/blib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:10 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BLIB_BUILDLINK3_MK:=	${BLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	blib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	blib
-.endif
+.if !defined(BLIB_BUILDLINK3_MK)
+BLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblib}
-BUILDLINK_PACKAGES+=	blib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}blib
-
-.if !empty(BLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.blib+=	blib>=1.0.2nb1
 BUILDLINK_ABI_DEPENDS.blib+=	blib>=1.0.2nb5
 BUILDLINK_PKGSRCDIR.blib?=	../../devel/blib
-.endif	# BLIB_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # BLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-blib
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index 5fb59c84368..6c35d41c545 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BOEHM_GC_BUILDLINK3_MK:=	${BOEHM_GC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	boehm-gc
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	boehm-gc
-.endif
+.if !defined(BOEHM_GC_BUILDLINK3_MK)
+BOEHM_GC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboehm-gc}
-BUILDLINK_PACKAGES+=	boehm-gc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boehm-gc
-
-.if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.boehm-gc+=	boehm-gc>=6.3nb1
 BUILDLINK_ABI_DEPENDS.boehm-gc+=	boehm-gc>=6.6nb1
 BUILDLINK_PKGSRCDIR.boehm-gc?=	../../devel/boehm-gc
-.endif	# BOEHM_GC_BUILDLINK3_MK
+.endif # BOEHM_GC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-boehm-gc
diff --git a/devel/boost-build/buildlink3.mk b/devel/boost-build/buildlink3.mk
index a2672d294cf..ba1121c1279 100644
--- a/devel/boost-build/buildlink3.mk
+++ b/devel/boost-build/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/03 08:57:57 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BOOST_BUILD_BUILDLINK3_MK:=	${BOOST_BUILD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	boost-build
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	boost-build
-.endif
+.if !defined(BOOST_BUILD_BUILDLINK3_MK)
+BOOST_BUILD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboost-build}
-BUILDLINK_PACKAGES+=	boost-build
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-build
-
-.if !empty(BOOST_BUILD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.boost-build+=		boost-build-1.38.*
 BUILDLINK_DEPMETHOD.boost-build?=	build
 BUILDLINK_PKGSRCDIR.boost-build?=	../../devel/boost-build
-.endif	# BOOST_BUILD_BUILDLINK3_MK
+.endif # BOOST_BUILD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-boost-build
diff --git a/devel/boost-headers/buildlink3.mk b/devel/boost-headers/buildlink3.mk
index d98b5906886..df189614119 100644
--- a/devel/boost-headers/buildlink3.mk
+++ b/devel/boost-headers/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/03 08:57:58 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BOOST_HEADERS_BUILDLINK3_MK:=	${BOOST_HEADERS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	boost-headers
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	boost-headers
-.endif
+.if !defined(BOOST_HEADERS_BUILDLINK3_MK)
+BOOST_HEADERS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboost-headers}
-BUILDLINK_PACKAGES+=	boost-headers
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-headers
-
-.if !empty(BOOST_HEADERS_BUILDLINK3_MK:M+)
 # Use a dependency pattern that guarantees the proper ABI.
 BUILDLINK_API_DEPENDS.boost-headers+=	boost-headers-1.38.*
 BUILDLINK_DEPMETHOD.boost-headers?=	build
 BUILDLINK_PKGSRCDIR.boost-headers?=	../../devel/boost-headers
-.endif	# BOOST_HEADERS_BUILDLINK3_MK
 
 PTHREAD_OPTS+=		require
 .include "../../mk/pthread.buildlink3.mk"
+.endif # BOOST_HEADERS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-boost-headers
diff --git a/devel/boost-jam/buildlink3.mk b/devel/boost-jam/buildlink3.mk
index 168fdc20c92..bddd9d8c342 100644
--- a/devel/boost-jam/buildlink3.mk
+++ b/devel/boost-jam/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/03 08:57:58 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BOOST_JAM_BUILDLINK3_MK:=	${BOOST_JAM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	boost-jam
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	boost-jam
-.endif
+.if !defined(BOOST_JAM_BUILDLINK3_MK)
+BOOST_JAM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboost-jam}
-BUILDLINK_PACKAGES+=	boost-jam
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-jam
-
-.if !empty(BOOST_JAM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.boost-jam+=		boost-jam-1.38.*
 BUILDLINK_DEPMETHOD.boost-jam?=	build
 BUILDLINK_PKGSRCDIR.boost-jam?=	../../devel/boost-jam
-.endif	# BOOST_JAM_BUILDLINK3_MK
+.endif # BOOST_JAM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-boost-jam
diff --git a/devel/boost-libs/buildlink3.mk b/devel/boost-libs/buildlink3.mk
index fbe185d65d6..89a1251fc84 100644
--- a/devel/boost-libs/buildlink3.mk
+++ b/devel/boost-libs/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/03 08:57:58 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BOOST_LIBS_BUILDLINK3_MK:=	${BOOST_LIBS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	boost-libs
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	boost-libs
-.endif
+.if !defined(BOOST_LIBS_BUILDLINK3_MK)
+BOOST_LIBS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboost-libs}
-BUILDLINK_PACKAGES+=	boost-libs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-libs
-
-.if !empty(BOOST_LIBS_BUILDLINK3_MK:M+)
 # Use a dependency pattern that guarantees the proper ABI.
 BUILDLINK_API_DEPENDS.boost-libs+=		boost-libs-1.38.*
 BUILDLINK_PKGSRCDIR.boost-libs?=	../../devel/boost-libs
-.endif	# BOOST_LIBS_BUILDLINK3_MK
 
 .include "../../devel/boost-headers/buildlink3.mk"
+.endif # BOOST_LIBS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-boost-libs
diff --git a/devel/boost-python/buildlink3.mk b/devel/boost-python/buildlink3.mk
index 395885bc33a..a26cbd02b16 100644
--- a/devel/boost-python/buildlink3.mk
+++ b/devel/boost-python/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/03/19 17:05:51 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BOOST_PYTHON_BUILDLINK3_MK:=	${BOOST_PYTHON_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	boost-python
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	boost-python
-.endif
+.if !defined(BOOST_PYTHON_BUILDLINK3_MK)
+BOOST_PYTHON_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboost-python}
-BUILDLINK_PACKAGES+=	boost-python
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-python
-
-.if !empty(BOOST_PYTHON_BUILDLINK3_MK:M+)
 # Use a dependency pattern that guarantees the proper ABI.
 BUILDLINK_API_DEPENDS.boost-python+=	boost-python-1.38.*
 BUILDLINK_ABI_DEPENDS.boost-python?=	boost-python>=1.38.*
 BUILDLINK_PKGSRCDIR.boost-python?=	../../devel/boost-python
-.endif	# BOOST_PYTHON_BUILDLINK3_MK
 
 .include "../../devel/boost-headers/buildlink3.mk"
+.endif # BOOST_PYTHON_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-boost-python
diff --git a/devel/buddy/buildlink3.mk b/devel/buddy/buildlink3.mk
index 6d452c341cb..01d4c886023 100644
--- a/devel/buddy/buildlink3.mk
+++ b/devel/buddy/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:10 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BUDDY_BUILDLINK3_MK:=	${BUDDY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	buddy
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	buddy
-.endif
+.if !defined(BUDDY_BUILDLINK3_MK)
+BUDDY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbuddy}
-BUILDLINK_PACKAGES+=	buddy
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}buddy
-
-.if !empty(BUDDY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.buddy+=	buddy>=2.4
 BUILDLINK_PKGSRCDIR.buddy?=	../../devel/buddy
-.endif	# BUDDY_BUILDLINK3_MK
+.endif # BUDDY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-buddy
diff --git a/devel/cdk/buildlink3.mk b/devel/cdk/buildlink3.mk
index 022c81c2c01..e40650c47b2 100644
--- a/devel/cdk/buildlink3.mk
+++ b/devel/cdk/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CDK_BUILDLINK3_MK:=	${CDK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cdk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cdk
-.endif
+.if !defined(CDK_BUILDLINK3_MK)
+CDK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdk}
-BUILDLINK_PACKAGES+=	cdk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdk
-
-.if !empty(CDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cdk+=		cdk>=4.9.9nb1
 BUILDLINK_ABI_DEPENDS.cdk+=	cdk>=4.9.9nb2
 BUILDLINK_PKGSRCDIR.cdk?=	../../devel/cdk
-.endif	# CDK_BUILDLINK3_MK
 
 USE_NCURSES=	yes
 
 .include "../../devel/ncurses/buildlink3.mk"
+.endif # CDK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cdk
diff --git a/devel/cfitsio/buildlink3.mk b/devel/cfitsio/buildlink3.mk
index 097cc8db586..d7d04cdc8b3 100644
--- a/devel/cfitsio/buildlink3.mk
+++ b/devel/cfitsio/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/12/29 10:13:12 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CFITSIO_BUILDLINK3_MK:=	${CFITSIO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cfitsio
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	cfitsio
-.endif
+.if !defined(CFITSIO_BUILDLINK3_MK)
+CFITSIO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncfitsio}
-BUILDLINK_PACKAGES+=	cfitsio
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cfitsio
-
-.if ${CFITSIO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.cfitsio+=	cfitsio>=3.100
 BUILDLINK_PKGSRCDIR.cfitsio?=	../../devel/cfitsio
-.endif	# CFITSIO_BUILDLINK3_MK
+.endif # CFITSIO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cfitsio
diff --git a/devel/check/buildlink3.mk b/devel/check/buildlink3.mk
index 60c5c3a3226..4b38ac09a99 100644
--- a/devel/check/buildlink3.mk
+++ b/devel/check/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/02/01 19:07:24 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CHECK_BUILDLINK3_MK:=	${CHECK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	check
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	check
-.endif
+.if !defined(CHECK_BUILDLINK3_MK)
+CHECK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncheck}
-BUILDLINK_PACKAGES+=	check
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}check
-
-.if ${CHECK_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.check+=	check>=0.9.5
 BUILDLINK_PKGSRCDIR.check?=	../../devel/check
-.endif	# CHECK_BUILDLINK3_MK
+.endif # CHECK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-check
diff --git a/devel/chmlib/buildlink3.mk b/devel/chmlib/buildlink3.mk
index 3f3e874faa6..e091e5271a3 100644
--- a/devel/chmlib/buildlink3.mk
+++ b/devel/chmlib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CHMLIB_BUILDLINK3_MK:=	${CHMLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	chmlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	chmlib
-.endif
+.if !defined(CHMLIB_BUILDLINK3_MK)
+CHMLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nchmlib}
-BUILDLINK_PACKAGES+=	chmlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}chmlib
-
-.if !empty(CHMLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.chmlib+=	chmlib>=0.31
 BUILDLINK_ABI_DEPENDS.chmlib+=	chmlib>=0.37.4nb2
 BUILDLINK_PKGSRCDIR.chmlib?=	../../devel/chmlib
-.endif	# CHMLIB_BUILDLINK3_MK
+.endif # CHMLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-chmlib
diff --git a/devel/cmake/buildlink3.mk b/devel/cmake/buildlink3.mk
index 985f1af01c7..39283ab9df3 100644
--- a/devel/cmake/buildlink3.mk
+++ b/devel/cmake/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/03/12 06:42:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CMAKE_BUILDLINK3_MK:=	${CMAKE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cmake
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	cmake
-.endif
+.if !defined(CMAKE_BUILDLINK3_MK)
+CMAKE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncmake}
-BUILDLINK_PACKAGES+=	cmake
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cmake
-
-.if ${CMAKE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.cmake+=	cmake>=2.4.6nb3
 BUILDLINK_PKGSRCDIR.cmake?=	../../devel/cmake
 BUILDLINK_DEPMETHOD.cmake?=	build
 BUILDLINK_FILES.cmake+=		share/cmake-*/include/*
-.endif	# CMAKE_BUILDLINK3_MK
+.endif # CMAKE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cmake
diff --git a/devel/compiz-bcop/buildlink3.mk b/devel/compiz-bcop/buildlink3.mk
index 4c21d15ca8c..306ac59ffe5 100644
--- a/devel/compiz-bcop/buildlink3.mk
+++ b/devel/compiz-bcop/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/05/14 16:40:20 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:11 joerg Exp $
 
 BUILDLINK_DEPMETHOD.compiz-bcop?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-COMPIZ_BCOP_BUILDLINK3_MK:=	${COMPIZ_BCOP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	compiz-bcop
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	compiz-bcop
-.endif
+.if !defined(COMPIZ_BCOP_BUILDLINK3_MK)
+COMPIZ_BCOP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncompiz-bcop}
-BUILDLINK_PACKAGES+=	compiz-bcop
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compiz-bcop
-
-.if ${COMPIZ_BCOP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.compiz-bcop+=	compiz-bcop>=0.6.0
 BUILDLINK_PKGSRCDIR.compiz-bcop?=	../../devel/compiz-bcop
-.endif	# COMPIZ_BCOP_BUILDLINK3_MK
+.endif # COMPIZ_BCOP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-compiz-bcop
diff --git a/devel/confuse/buildlink3.mk b/devel/confuse/buildlink3.mk
index 0cdb0dc11bc..612a26cf205 100644
--- a/devel/confuse/buildlink3.mk
+++ b/devel/confuse/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/03/02 03:18:25 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:11 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CONFUSE_BUILDLINK3_MK:=	${CONFUSE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	confuse
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	confuse
-.endif
+.if !defined(CONFUSE_BUILDLINK3_MK)
+CONFUSE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nconfuse}
-BUILDLINK_PACKAGES+=	confuse
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}confuse
-
-.if ${CONFUSE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.confuse+=	confuse>=2.5
 BUILDLINK_PKGSRCDIR.confuse?=	../../devel/confuse
-.endif	# CONFUSE_BUILDLINK3_MK
+.endif # CONFUSE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-confuse
diff --git a/devel/cppunit/buildlink3.mk b/devel/cppunit/buildlink3.mk
index 154fe302925..302b5594aba 100644
--- a/devel/cppunit/buildlink3.mk
+++ b/devel/cppunit/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CPPUNIT_BUILDLINK3_MK:=	${CPPUNIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cppunit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cppunit
-.endif
+.if !defined(CPPUNIT_BUILDLINK3_MK)
+CPPUNIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncppunit}
-BUILDLINK_PACKAGES+=	cppunit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cppunit
-
-.if !empty(CPPUNIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cppunit+=	cppunit>=1.10.2
 BUILDLINK_ABI_DEPENDS.cppunit?=	cppunit>=1.10.2nb5
 BUILDLINK_PKGSRCDIR.cppunit?=	../../devel/cppunit
 BUILDLINK_CPPFLAGS.cppunit+=	-I${BUILDLINK_PREFIX.cppunit}/include/cppunit
-.endif	# CPPUNIT_BUILDLINK3_MK
+.endif # CPPUNIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cppunit
diff --git a/devel/cunit/buildlink3.mk b/devel/cunit/buildlink3.mk
index 01edbb5a12f..669306571d5 100644
--- a/devel/cunit/buildlink3.mk
+++ b/devel/cunit/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/10 21:03:58 agc Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CUNIT_BUILDLINK3_MK:=	${CUNIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	CUnit
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	CUnit
-.endif
+.if !defined(CUNIT_BUILDLINK3_MK)
+CUNIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NCUnit}
-BUILDLINK_PACKAGES+=	CUnit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}CUnit
-
-.if ${CUNIT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.CUnit+=	CUnit>=2.1
 BUILDLINK_PKGSRCDIR.CUnit?=	../../devel/cunit
-.endif	# CUNIT_BUILDLINK3_MK
+.endif # CUNIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-CUnit
diff --git a/devel/darts/buildlink3.mk b/devel/darts/buildlink3.mk
index 9189b4ff97b..81b3196ae40 100644
--- a/devel/darts/buildlink3.mk
+++ b/devel/darts/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/08/03 15:21:56 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DARTS_BUILDLINK3_MK:=	${DARTS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	darts
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	darts
-.endif
+.if !defined(DARTS_BUILDLINK3_MK)
+DARTS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndarts}
-BUILDLINK_PACKAGES+=	darts
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}darts
-
-.if !empty(DARTS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.darts+=	darts>=0.32
 BUILDLINK_PKGSRCDIR.darts?=	../../devel/darts
 BUILDLINK_DEPMETHOD.darts?=	build
-.endif	# DARTS_BUILDLINK3_MK
+.endif # DARTS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-darts
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index 76eef3fbab8..2dac0a4f1f7 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DEVIL_BUILDLINK3_MK:=	${DEVIL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	devIL
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	devIL
-.endif
+.if !defined(DEVIL_BUILDLINK3_MK)
+DEVIL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NdevIL}
-BUILDLINK_PACKAGES+=	devIL
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}devIL
-
-.if !empty(DEVIL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.devIL+=	devIL>=1.6.6nb1
 BUILDLINK_ABI_DEPENDS.devIL+=	devIL>=1.6.6nb9
 BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
-.endif	# DEVIL_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.endif # DEVIL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-devIL
diff --git a/devel/devhelp/buildlink3.mk b/devel/devhelp/buildlink3.mk
index c36d569ee2f..fb245eb1061 100644
--- a/devel/devhelp/buildlink3.mk
+++ b/devel/devhelp/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:03:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DEVHELP_BUILDLINK3_MK:=	${DEVHELP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	devhelp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	devhelp
-.endif
+.if !defined(DEVHELP_BUILDLINK3_MK)
+DEVHELP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndevhelp}
-BUILDLINK_PACKAGES+=	devhelp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}devhelp
-
-.if ${DEVHELP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.devhelp+=	devhelp>=0.12nb1
 BUILDLINK_PKGSRCDIR.devhelp?=	../../devel/devhelp
-.endif	# DEVHELP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.devhelp?=	../../devel/devhelp
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # DEVHELP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-devhelp
diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk
index 63a1c5ef2e2..f7a9a710fae 100644
--- a/devel/dlcompat/buildlink3.mk
+++ b/devel/dlcompat/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/03/27 06:32:06 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:12 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-DLCOMPAT_BUILDLINK3_MK:=	${DLCOMPAT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	dlcompat
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	dlcompat
-.endif
+.if !defined(DLCOMPAT_BUILDLINK3_MK)
+DLCOMPAT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndlcompat}
-BUILDLINK_PACKAGES+=	dlcompat
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dlcompat
-
-.if !empty(DLCOMPAT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dlcompat+=	dlcompat>=20030629
 BUILDLINK_PKGSRCDIR.dlcompat?=	../../devel/dlcompat
 BUILDLINK_LDFLAGS.dlcompat+=	-ldl
-.endif  # DLCOMPAT_BUILDLINK3_MK
+.endif # DLCOMPAT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-dlcompat
diff --git a/devel/dmalloc/buildlink3.mk b/devel/dmalloc/buildlink3.mk
index c5b34c02e38..0df61390716 100644
--- a/devel/dmalloc/buildlink3.mk
+++ b/devel/dmalloc/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DMALLOC_BUILDLINK3_MK:=	${DMALLOC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	dmalloc
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	dmalloc
-.endif
+.if !defined(DMALLOC_BUILDLINK3_MK)
+DMALLOC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndmalloc}
-BUILDLINK_PACKAGES+=	dmalloc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dmalloc
-
-.if !empty(DMALLOC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dmalloc+=	dmalloc>=4.8.2nb2
 BUILDLINK_PKGSRCDIR.dmalloc?=	../../devel/dmalloc
 BUILDLINK_DEPMETHOD.dmalloc?=	build
-.endif	# DMALLOC_BUILDLINK3_MK
+.endif # DMALLOC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-dmalloc
diff --git a/devel/edcommon/buildlink3.mk b/devel/edcommon/buildlink3.mk
index 78d538a7e63..a0f828b2fe6 100644
--- a/devel/edcommon/buildlink3.mk
+++ b/devel/edcommon/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:12 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-EDCOMMON_BUILDLINK3_MK:=	${EDCOMMON_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	edcommon
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	edcommon
-.endif
+.if !defined(EDCOMMON_BUILDLINK3_MK)
+EDCOMMON_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nedcommon}
-BUILDLINK_PACKAGES+=	edcommon
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}edcommon
-
-.if !empty(EDCOMMON_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.edcommon+=	edcommon>=32
 BUILDLINK_ABI_DEPENDS.edcommon?=	edcommon>=32nb2
 BUILDLINK_PKGSRCDIR.edcommon?=	../../devel/edcommon
-.endif	# EDCOMMON_BUILDLINK3_MK
+.endif # EDCOMMON_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-edcommon
diff --git a/devel/eel/buildlink3.mk b/devel/eel/buildlink3.mk
index bf733997cb0..1b27d0a9008 100644
--- a/devel/eel/buildlink3.mk
+++ b/devel/eel/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/10/16 13:46:59 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EEL_BUILDLINK3_MK:=	${EEL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	eel
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	eel
-.endif
+.if !defined(EEL_BUILDLINK3_MK)
+EEL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Neel}
-BUILDLINK_PACKAGES+=	eel
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eel
-
-.if !empty(EEL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.eel+=	eel>=2.10.0
 BUILDLINK_ABI_DEPENDS.eel?=	eel>=2.20.0nb1
 BUILDLINK_PKGSRCDIR.eel?=	../../devel/eel
-.endif	# EEL_BUILDLINK3_MK
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -30,5 +22,6 @@ BUILDLINK_PKGSRCDIR.eel?=	../../devel/eel
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif # EEL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-eel
diff --git a/devel/eet/buildlink3.mk b/devel/eet/buildlink3.mk
index 555867a6eeb..a6f8538afc4 100644
--- a/devel/eet/buildlink3.mk
+++ b/devel/eet/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/06/22 01:21:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EET_BUILDLINK3_MK:=	${EET_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	eet
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	eet
-.endif
+.if !defined(EET_BUILDLINK3_MK)
+EET_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Neet}
-BUILDLINK_PACKAGES+=	eet
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eet
-
-.if ${EET_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.eet+=	eet>=1.0.1
 BUILDLINK_PKGSRCDIR.eet?=	../../devel/eet
-.endif	# EET_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.endif # EET_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-eet
diff --git a/devel/elib/buildlink3.mk b/devel/elib/buildlink3.mk
index 2f7151e1ed5..2b51b7d85d1 100644
--- a/devel/elib/buildlink3.mk
+++ b/devel/elib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:12 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ELIB_BUILDLINK3_MK:=	${ELIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	elib
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	elib
-.endif
+.if !defined(ELIB_BUILDLINK3_MK)
+ELIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nelib}
-BUILDLINK_PACKAGES+=	elib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}elib
-
-.if ${ELIB_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.elib+=	${EMACS_PKGNAME_PREFIX}elib>=1
 BUILDLINK_PKGSRCDIR.elib?=	../../devel/elib
-.endif	# ELIB_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.elib=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # ELIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-elib
diff --git a/devel/exempi/buildlink3.mk b/devel/exempi/buildlink3.mk
index 88fb9100652..accf417ef9a 100644
--- a/devel/exempi/buildlink3.mk
+++ b/devel/exempi/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/12 10:56:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EXEMPI_BUILDLINK3_MK:=	${EXEMPI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	exempi
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	exempi
-.endif
+.if !defined(EXEMPI_BUILDLINK3_MK)
+EXEMPI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nexempi}
-BUILDLINK_PACKAGES+=	exempi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}exempi
-
-.if ${EXEMPI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.exempi+=	exempi>=1.99.9
 BUILDLINK_PKGSRCDIR.exempi?=	../../devel/exempi
-.endif	# EXEMPI_BUILDLINK3_MK
 
 .include "../../textproc/expat/buildlink3.mk"
+.endif # EXEMPI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-exempi
diff --git a/devel/fann-devel/buildlink3.mk b/devel/fann-devel/buildlink3.mk
index aff62eaac09..d95a577fe62 100644
--- a/devel/fann-devel/buildlink3.mk
+++ b/devel/fann-devel/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/10/12 18:30:22 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FANN_BUILDLINK3_MK:=	${FANN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fann
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	fann
-.endif
+.if !defined(FANN_BUILDLINK3_MK)
+FANN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfann}
-BUILDLINK_PACKAGES+=	fann
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fann
-
-.if ${FANN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.fann+=	fann>=2.1.0.20061012
 BUILDLINK_PKGSRCDIR.fann?=	../../devel/fann-devel
-.endif	# FANN_BUILDLINK3_MK
+.endif # FANN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fann
diff --git a/devel/fann/buildlink3.mk b/devel/fann/buildlink3.mk
index 9ae2e97b297..c7f910f82de 100644
--- a/devel/fann/buildlink3.mk
+++ b/devel/fann/buildlink3.mk
@@ -1,18 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/10/05 14:55:21 gdt Exp $
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FANN_BUILDLINK3_MK:=	${FANN_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:12 joerg Exp $
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	fann
-.endif
+BUILDLINK_TREE+=	fann
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfann}
-BUILDLINK_PACKAGES+=	fann
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fann
+.if !defined(FANN_BUILDLINK3_MK)
+FANN_BUILDLINK3_MK:=
 
-.if ${FANN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.fann+=	fann>=2.0.0
 BUILDLINK_PKGSRCDIR.fann?=	../../devel/fann
-.endif	# FANN_BUILDLINK3_MK
+.endif # FANN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fann
diff --git a/devel/ffcall/buildlink3.mk b/devel/ffcall/buildlink3.mk
index df03752e345..18ffee8bb80 100644
--- a/devel/ffcall/buildlink3.mk
+++ b/devel/ffcall/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:13 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FFCALL_BUILDLINK3_MK:=	${FFCALL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ffcall
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ffcall
-.endif
+.if !defined(FFCALL_BUILDLINK3_MK)
+FFCALL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nffcall}
-BUILDLINK_PACKAGES+=	ffcall
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ffcall
-
-.if !empty(FFCALL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ffcall+=	ffcall>=1.9
 BUILDLINK_ABI_DEPENDS.ffcall+=	ffcall>=1.10nb1
 BUILDLINK_PKGSRCDIR.ffcall?=	../../devel/ffcall
-.endif	# FFCALL_BUILDLINK3_MK
+.endif # FFCALL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ffcall
diff --git a/devel/flex/buildlink3.mk b/devel/flex/buildlink3.mk
index 1a93889e987..517bf9c9602 100644
--- a/devel/flex/buildlink3.mk
+++ b/devel/flex/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:13 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FLEX_BUILDLINK3_MK:=	${FLEX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	flex
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	flex
-.endif
+.if !defined(FLEX_BUILDLINK3_MK)
+FLEX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nflex}
-BUILDLINK_PACKAGES+=	flex
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flex
-
-.if !empty(FLEX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.flex+=	flex>=2.5.4a
 BUILDLINK_PKGSRCDIR.flex?=	../../devel/flex
 BUILDLINK_DEPMETHOD.flex?=	build
-.endif	# FLEX_BUILDLINK3_MK
+.endif # FLEX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-flex
diff --git a/devel/flim/buildlink3.mk b/devel/flim/buildlink3.mk
index 66e99508363..63eabf22a0a 100644
--- a/devel/flim/buildlink3.mk
+++ b/devel/flim/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:13 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FLIM_BUILDLINK3_MK:=	${FLIM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	flim
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	flim
-.endif
+.if !defined(FLIM_BUILDLINK3_MK)
+FLIM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nflim}
-BUILDLINK_PACKAGES+=	flim
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flim
-
-.if ${FLIM_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.flim+=	${EMACS_PKGNAME_PREFIX}flim>=1.14
 BUILDLINK_PKGSRCDIR.flim?=	../../devel/flim
-.endif	# FLIM_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.flim=	${EGREP} '.*\.el$$|.*\.elc$$'
 
 .include "../../devel/apel/buildlink3.mk"
+.endif # FLIM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-flim
diff --git a/devel/florist/buildlink3.mk b/devel/florist/buildlink3.mk
index 8ccd09f5be5..d16cee6594e 100644
--- a/devel/florist/buildlink3.mk
+++ b/devel/florist/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:13 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FLORIST_BUILDLINK3_MK:=	${FLORIST_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	florist
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	florist
-.endif
+.if !defined(FLORIST_BUILDLINK3_MK)
+FLORIST_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nflorist}
-BUILDLINK_PACKAGES+=	florist
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}florist
-
-.if !empty(FLORIST_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.florist+=	florist>=3.15p
 BUILDLINK_ABI_DEPENDS.florist?=	florist>=3.15pnb2
 BUILDLINK_PKGSRCDIR.florist?=	../../devel/florist
-.endif	# FLORIST_BUILDLINK3_MK
+.endif # FLORIST_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-florist
diff --git a/devel/g-wrap/buildlink3.mk b/devel/g-wrap/buildlink3.mk
index e0c9932b9ff..aa3dc7ec0db 100644
--- a/devel/g-wrap/buildlink3.mk
+++ b/devel/g-wrap/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/02/21 02:09:00 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:13 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-G_WRAP_BUILDLINK3_MK:=	${G_WRAP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	g-wrap
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	g-wrap
-.endif
+.if !defined(G_WRAP_BUILDLINK3_MK)
+G_WRAP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ng-wrap}
-BUILDLINK_PACKAGES+=	g-wrap
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}g-wrap
-
-.if !empty(G_WRAP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.g-wrap+=	g-wrap>=1.9.5
 BUILDLINK_ABI_DEPENDS.g-wrap?=	g-wrap>=1.9.6nb1
 BUILDLINK_PKGSRCDIR.g-wrap?=	../../devel/g-wrap
-.endif	# G_WRAP_BUILDLINK3_MK
 
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
+.endif # G_WRAP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-g-wrap
diff --git a/devel/gconfmm/buildlink3.mk b/devel/gconfmm/buildlink3.mk
index e30757c6795..ee239dfa084 100644
--- a/devel/gconfmm/buildlink3.mk
+++ b/devel/gconfmm/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/09/21 13:03:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:13 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GCONFMM_BUILDLINK3_MK:=	${GCONFMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gconfmm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gconfmm
-.endif
+.if !defined(GCONFMM_BUILDLINK3_MK)
+GCONFMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngconfmm}
-BUILDLINK_PACKAGES+=	gconfmm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gconfmm
-
-.if !empty(GCONFMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gconfmm+=	gconfmm>=2.10.0
 BUILDLINK_ABI_DEPENDS.gconfmm+=	gconfmm>=2.14.0nb1
 BUILDLINK_PKGSRCDIR.gconfmm?=	../../devel/gconfmm
-.endif	# GCONFMM_BUILDLINK3_MK
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
+.endif # GCONFMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gconfmm
diff --git a/devel/gdbada/buildlink3.mk b/devel/gdbada/buildlink3.mk
index 8416c4bfba8..3663ff144b8 100644
--- a/devel/gdbada/buildlink3.mk
+++ b/devel/gdbada/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:13 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GDBADA_BUILDLINK3_MK:=	${GDBADA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gdbada
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gdbada
-.endif
+.if !defined(GDBADA_BUILDLINK3_MK)
+GDBADA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ngdbada} gdbada
-
-.if !empty(GDBADA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		gdbada
-BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdbada
 BUILDLINK_API_DEPENDS.gdbada+=	gdbada>=5.3
 BUILDLINK_ABI_DEPENDS.gdbada+=	gdbada>=6.3nb1
 BUILDLINK_PKGSRCDIR.gdbada?=	../../devel/gdbada
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.endif	# GDBADA_BUILDLINK3_MK
+.endif # GDBADA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gdbada
diff --git a/devel/gdl/buildlink3.mk b/devel/gdl/buildlink3.mk
index bdd5d4c515e..3afbb707fbd 100644
--- a/devel/gdl/buildlink3.mk
+++ b/devel/gdl/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:13 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GDL_BUILDLINK3_MK:=	${GDL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gdl
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gdl
-.endif
+.if !defined(GDL_BUILDLINK3_MK)
+GDL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdl}
-BUILDLINK_PACKAGES+=	gdl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdl
-
-.if ${GDL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gdl+=	gdl>=0.6.1
 BUILDLINK_ABI_DEPENDS.gdl?=	gdl>=0.7.7nb1
 BUILDLINK_PKGSRCDIR.gdl?=	../../devel/gdl
-.endif	# GDL_BUILDLINK3_MK
 
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GDL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gdl
diff --git a/devel/gettext-asprintf/buildlink3.mk b/devel/gettext-asprintf/buildlink3.mk
index 2c6af8003d0..d779902b975 100644
--- a/devel/gettext-asprintf/buildlink3.mk
+++ b/devel/gettext-asprintf/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:13 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GETTEXT_ASPRINTF_BUILDLINK3_MK:=	${GETTEXT_ASPRINTF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gettext-asprintf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gettext-asprintf
-.endif
+.if !defined(GETTEXT_ASPRINTF_BUILDLINK3_MK)
+GETTEXT_ASPRINTF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngettext-asprintf}
-BUILDLINK_PACKAGES+=	gettext-asprintf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gettext-asprintf
-
-.if !empty(GETTEXT_ASPRINTF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gettext-asprintf+=	gettext-asprintf>=0.14.5
 BUILDLINK_PKGSRCDIR.gettext-asprintf?=	../../devel/gettext-asprintf
-.endif	# GETTEXT_ASPRINTF_BUILDLINK3_MK
+.endif # GETTEXT_ASPRINTF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gettext-asprintf
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index c77c894ab1e..a8f231fe88f 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,23 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.30 2008/02/27 22:10:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:13 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gettext
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gettext
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngettext}
-BUILDLINK_PACKAGES+=	gettext
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gettext
+.if !defined(GETTEXT_BUILDLINK3_MK)
+GETTEXT_BUILDLINK3_MK:=
 
-.if !empty(GETTEXT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.14.5
 BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
 BUILDLINK_LIBNAME.gettext=	intl
 BUILDLINK_LDADD.gettext=	${BUILDLINK_LIBNAME.gettext:S/^/-l/:S/^-l$//}
 BUILDLINK_LDADD.gettext+=	${BUILDLINK_LDADD.iconv}
-.endif	# GETTEXT_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -44,5 +36,6 @@ USE_BUILTIN.iconv=	yes
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
+.endif # GETTEXT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gettext
diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk
index 8a4ba7ab75a..992efac86a7 100644
--- a/devel/giblib/buildlink3.mk
+++ b/devel/giblib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:14 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GIBLIB_BUILDLINK3_MK:=	${GIBLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	giblib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	giblib
-.endif
+.if !defined(GIBLIB_BUILDLINK3_MK)
+GIBLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngiblib}
-BUILDLINK_PACKAGES+=	giblib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}giblib
-
-.if !empty(GIBLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.giblib+=	giblib>=1.2.3nb3
 BUILDLINK_ABI_DEPENDS.giblib+=	giblib>=1.2.4nb4
 BUILDLINK_PKGSRCDIR.giblib?=	../../devel/giblib
-.endif	# GIBLIB_BUILDLINK3_MK
 
 .include "../../graphics/imlib2/buildlink3.mk"
+.endif # GIBLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-giblib
diff --git a/devel/glade3/buildlink3.mk b/devel/glade3/buildlink3.mk
index b1b64563dd7..e71e61c6101 100644
--- a/devel/glade3/buildlink3.mk
+++ b/devel/glade3/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/12/16 14:03:00 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:14 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLADE3_BUILDLINK3_MK:=	${GLADE3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	glade3
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	glade3
-.endif
+.if !defined(GLADE3_BUILDLINK3_MK)
+GLADE3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglade3}
-BUILDLINK_PACKAGES+=	glade3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glade3
-
-.if ${GLADE3_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.glade3+=	glade3>=3.4.0
 BUILDLINK_PKGSRCDIR.glade3?=	../../devel/glade3
-.endif	# GLADE3_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # GLADE3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-glade3
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 89d64ce635d..4638ec43737 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:14 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLIB_BUILDLINK3_MK:=	${GLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	glib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	glib
-.endif
+.if !defined(GLIB_BUILDLINK3_MK)
+GLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglib}
-BUILDLINK_PACKAGES+=	glib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glib
-
-.if !empty(GLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glib+=	glib>=1.2.10nb5
 BUILDLINK_ABI_DEPENDS.glib+=	glib>=1.2.10nb7
 BUILDLINK_PKGSRCDIR.glib?=	../../devel/glib
 
 PTHREAD_OPTS+=	require
-.endif	# GLIB_BUILDLINK3_MK
 
 .include "../../mk/pthread.buildlink3.mk"
+.endif # GLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-glib
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index c97deb68fac..84ee0147ce2 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/05/29 08:03:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:14 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLIB2_BUILDLINK3_MK:=	${GLIB2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	glib2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	glib2
-.endif
+.if !defined(GLIB2_BUILDLINK3_MK)
+GLIB2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglib2}
-BUILDLINK_PACKAGES+=	glib2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glib2
-
-.if !empty(GLIB2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0
 BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.14.3
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
@@ -19,11 +12,11 @@ BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gio$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gio\/modules$$/ \
 				{ print "@comment in glib2: " $$0; next; }
-.endif	# GLIB2_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # GLIB2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-glib2
diff --git a/devel/glibmm/buildlink3.mk b/devel/glibmm/buildlink3.mk
index 092bcd552f2..44e06c76f96 100644
--- a/devel/glibmm/buildlink3.mk
+++ b/devel/glibmm/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/09/21 13:03:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:14 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLIBMM_BUILDLINK3_MK:=	${GLIBMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	glibmm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	glibmm
-.endif
+.if !defined(GLIBMM_BUILDLINK3_MK)
+GLIBMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglibmm}
-BUILDLINK_PACKAGES+=	glibmm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glibmm
-
-.if !empty(GLIBMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glibmm+=	glibmm>=2.6.1
 BUILDLINK_ABI_DEPENDS.glibmm+=	glibmm>=2.8.3nb1
 BUILDLINK_PKGSRCDIR.glibmm?=	../../devel/glibmm
-.endif	# GLIBMM_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libsigc++/buildlink3.mk"
+.endif # GLIBMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-glibmm
diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk
index b7878b17f1c..f29e85a2af1 100644
--- a/devel/gmp/buildlink3.mk
+++ b/devel/gmp/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/12/09 03:38:16 jnemeth Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:14 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GMP_BUILDLINK3_MK:=	${GMP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gmp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gmp
-.endif
+.if !defined(GMP_BUILDLINK3_MK)
+GMP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngmp}
-BUILDLINK_PACKAGES+=	gmp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gmp
-
-.if !empty(GMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gmp+=		gmp>=4.2.1
 BUILDLINK_ABI_DEPENDS.gmp+=	gmp>=4.2.1
 BUILDLINK_PKGSRCDIR.gmp?=	../../devel/gmp
-.endif	# GMP_BUILDLINK3_MK
+.endif # GMP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gmp
diff --git a/devel/gnome-build/buildlink3.mk b/devel/gnome-build/buildlink3.mk
index 9f679daa620..b4ec2b4d4a6 100644
--- a/devel/gnome-build/buildlink3.mk
+++ b/devel/gnome-build/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:14 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_BUILD_BUILDLINK3_MK:=	${GNOME_BUILD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-build
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gnome-build
-.endif
+.if !defined(GNOME_BUILD_BUILDLINK3_MK)
+GNOME_BUILD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-build}
-BUILDLINK_PACKAGES+=	gnome-build
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-build
-
-.if ${GNOME_BUILD_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gnome-build+=	gnome-build>=0.1.3
 BUILDLINK_ABI_DEPENDS.gnome-build?=	gnome-build>=0.2.0nb1
 BUILDLINK_PKGSRCDIR.gnome-build?=	../../devel/gnome-build
-.endif	# GNOME_BUILD_BUILDLINK3_MK
 
 .include "../../devel/gdl/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.gnome-build?=	../../devel/gnome-build
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GNOME_BUILD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-build
diff --git a/devel/gnustep-base/buildlink3.mk b/devel/gnustep-base/buildlink3.mk
index 42ea1067841..0571c40321c 100644
--- a/devel/gnustep-base/buildlink3.mk
+++ b/devel/gnustep-base/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:14:33 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:14 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNUSTEP_BASE_BUILDLINK3_MK:=	${GNUSTEP_BASE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnustep-base
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnustep-base
-.endif
+.if !defined(GNUSTEP_BASE_BUILDLINK3_MK)
+GNUSTEP_BASE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-base}
-BUILDLINK_PACKAGES+=	gnustep-base
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-base
-
-.if !empty(GNUSTEP_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-base+=	gnustep-base>=1.9.1
 BUILDLINK_ABI_DEPENDS.gnustep-base+=	gnustep-base>=1.14.1nb1
 BUILDLINK_PKGSRCDIR.gnustep-base?=	../../devel/gnustep-base
@@ -53,13 +46,12 @@ PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Librar
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Libraries\/Resources\/gnustep-base\/NSTimeZones$$/ { next; }
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Libraries\/Resources\/gnustep-base\/NSTimeZones\/zones$$/ { next; }
 
-.endif	# GNUSTEP_BASE_BUILDLINK3_MK
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/ffcall/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/gnustep-make/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # GNUSTEP_BASE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnustep-base
diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk
index d38e02c2001..e36d2d05d2b 100644
--- a/devel/gnustep-make/buildlink3.mk
+++ b/devel/gnustep-make/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/11/25 14:42:02 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:14 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNUSTEP_MAKE_BUILDLINK3_MK:=	${GNUSTEP_MAKE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnustep-make
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnustep-make
-.endif
+.if !defined(GNUSTEP_MAKE_BUILDLINK3_MK)
+GNUSTEP_MAKE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-make}
-BUILDLINK_PACKAGES+=	gnustep-make
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-make
-
-.if !empty(GNUSTEP_MAKE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=2.0.2
 BUILDLINK_ABI_DEPENDS.gnustep-make?=	gnustep-make>=2.0.2
 BUILDLINK_PKGSRCDIR.gnustep-make?=	../../devel/gnustep-make
@@ -109,7 +102,6 @@ PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Tools$$/ { next
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Tools\/Java$$/ { next; }
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Tools\/Resources$$/ { next; }
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/share$$/ { next; }
+.endif # GNUSTEP_MAKE_BUILDLINK3_MK
 
-.endif	# GNUSTEP_MAKE_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnustep-make
diff --git a/devel/gnustep-objc-lf2/buildlink3.mk b/devel/gnustep-objc-lf2/buildlink3.mk
index de278980b07..d7164d8c845 100644
--- a/devel/gnustep-objc-lf2/buildlink3.mk
+++ b/devel/gnustep-objc-lf2/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/01/17 03:11:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:15 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GNUSTEP_OBJC_LF2_BUILDLINK3_MK:=	${GNUSTEP_OBJC_LF2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnustep-objc-lf2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnustep-objc-lf2
-.endif
+.if !defined(GNUSTEP_OBJC_LF2_BUILDLINK3_MK)
+GNUSTEP_OBJC_LF2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-objc-lf2}
-BUILDLINK_PACKAGES+=	gnustep-objc-lf2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-objc-lf2
-
-.if !empty(GNUSTEP_OBJC_LF2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-objc-lf2+=	gnustep-objc-lf2>=2.95.3.88
 BUILDLINK_ABI_DEPENDS.gnustep-objc-lf2?=	gnustep-objc-lf2>=2.95.3.88nb1
 BUILDLINK_PKGSRCDIR.gnustep-objc-lf2?=	../../devel/gnustep-objc-lf2
 BUILDLINK_FNAME_TRANSFORM.gnustep-objc-lf2?=	-e "s|Headers/objc_lf2/|Headers/objc/|g"
 BUILDLINK_TRANSFORM+=	l:objc:objc_lf2
-.endif	# GNUSTEP_OBJC_LF2_BUILDLINK3_MK
 
 .include "../../devel/gnustep-make/buildlink3.mk"
+.endif # GNUSTEP_OBJC_LF2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnustep-objc-lf2
diff --git a/devel/gnustep-objc/buildlink3.mk b/devel/gnustep-objc/buildlink3.mk
index 0e36dde5b8c..78628242f88 100644
--- a/devel/gnustep-objc/buildlink3.mk
+++ b/devel/gnustep-objc/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:14 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNUSTEP_OBJC_BUILDLINK3_MK:=	${GNUSTEP_OBJC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnustep-objc
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnustep-objc
-.endif
+.if !defined(GNUSTEP_OBJC_BUILDLINK3_MK)
+GNUSTEP_OBJC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-objc}
-BUILDLINK_PACKAGES+=	gnustep-objc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-objc
-
-.if !empty(GNUSTEP_OBJC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-objc+=	gnustep-objc>=1.3.0
 BUILDLINK_ABI_DEPENDS.gnustep-objc?=	gnustep-objc>=1.3.0nb1
 BUILDLINK_PKGSRCDIR.gnustep-objc?=	../../devel/gnustep-objc
-.endif	# GNUSTEP_OBJC_BUILDLINK3_MK
 
 .include "../../devel/gnustep-make/buildlink3.mk"
+.endif # GNUSTEP_OBJC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnustep-objc
diff --git a/devel/gob2/buildlink3.mk b/devel/gob2/buildlink3.mk
index 76955a12420..3d68b652526 100644
--- a/devel/gob2/buildlink3.mk
+++ b/devel/gob2/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:15 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GOB2_BUILDLINK3_MK:=	${GOB2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gob2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gob2
-.endif
+.if !defined(GOB2_BUILDLINK3_MK)
+GOB2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngob2}
-BUILDLINK_PACKAGES+=	gob2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gob2
-
-.if !empty(GOB2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gob2+=	gob2>=2.0.10
 BUILDLINK_ABI_DEPENDS.gob2?=	gob2>=2.0.12nb1
 BUILDLINK_PKGSRCDIR.gob2?=	../../devel/gob2
-.endif	# GOB2_BUILDLINK3_MK
 
 #.include "../../devel/glib2/buildlink3.mk"
+.endif # GOB2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gob2
diff --git a/devel/gperf/buildlink3.mk b/devel/gperf/buildlink3.mk
index f0d4af7f5ed..3d2aaed2cbf 100644
--- a/devel/gperf/buildlink3.mk
+++ b/devel/gperf/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/10/13 18:35:35 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:15 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GPERF_BUILDLINK3_MK:=	${GPERF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gperf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gperf
-.endif
+.if !defined(GPERF_BUILDLINK3_MK)
+GPERF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngperf}
-BUILDLINK_PACKAGES+=	gperf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gperf
-
-.if !empty(GPERF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gperf+=	gperf>=3.0.1
 BUILDLINK_PKGSRCDIR.gperf?=	../../devel/gperf
 BUILDLINK_DEPMETHOD.gperf?=	build
-.endif	# GPERF_BUILDLINK3_MK
+.endif # GPERF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gperf
diff --git a/devel/gtl/buildlink3.mk b/devel/gtl/buildlink3.mk
index 07613fad7e3..1defa18874c 100644
--- a/devel/gtl/buildlink3.mk
+++ b/devel/gtl/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:15 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GTL_BUILDLINK3_MK:=	${GTL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtl
-.endif
+.if !defined(GTL_BUILDLINK3_MK)
+GTL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtl}
-BUILDLINK_PACKAGES+=	gtl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtl
-
-.if !empty(GTL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtl+=		gtl>=1.2.0
 BUILDLINK_PKGSRCDIR.gtl?=	../../devel/gtl
-.endif	# GTL_BUILDLINK3_MK
+.endif # GTL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtl
diff --git a/devel/guile-gtk/buildlink3.mk b/devel/guile-gtk/buildlink3.mk
index 04a2b0d54ad..1606115c6c9 100644
--- a/devel/guile-gtk/buildlink3.mk
+++ b/devel/guile-gtk/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/08/27 11:43:11 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:15 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GUILE_GTK_BUILDLINK3_MK:=	${GUILE_GTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	guile-gtk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	guile-gtk
-.endif
+.if !defined(GUILE_GTK_BUILDLINK3_MK)
+GUILE_GTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile-gtk}
-BUILDLINK_PACKAGES+=	guile-gtk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile-gtk
-
-.if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.guile-gtk+=	guile-gtk>=0.4
 BUILDLINK_ABI_DEPENDS.guile-gtk?=	guile-gtk>=0.4
 BUILDLINK_PKGSRCDIR.guile-gtk?=	../../devel/guile-gtk
-.endif	# GUILE_GTK_BUILDLINK3_MK
 
 .include "../../lang/guile/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.endif # GUILE_GTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-guile-gtk
diff --git a/devel/guile16-gtk/buildlink3.mk b/devel/guile16-gtk/buildlink3.mk
index c9e4af60407..064261780e3 100644
--- a/devel/guile16-gtk/buildlink3.mk
+++ b/devel/guile16-gtk/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/06/18 00:38:58 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:15 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GUILE16_GTK_BUILDLINK3_MK:=	${GUILE16_GTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	guile16-gtk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	guile16-gtk
-.endif
+.if !defined(GUILE16_GTK_BUILDLINK3_MK)
+GUILE16_GTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile16-gtk}
-BUILDLINK_PACKAGES+=	guile16-gtk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile16-gtk
-
-.if !empty(GUILE16_GTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.guile16-gtk+=	guile16-gtk>=0.5
 BUILDLINK_ABI_DEPENDS.guile16-gtk?=	guile16-gtk>=0.5
 BUILDLINK_PKGSRCDIR.guile16-gtk?=	../../devel/guile16-gtk
-.endif	# GUILE16_GTK_BUILDLINK3_MK
 
 .include "../../lang/guile16/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.endif # GUILE16_GTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-guile16-gtk
diff --git a/devel/hdf/buildlink3.mk b/devel/hdf/buildlink3.mk
index 24f465aaffd..4515fef2eb0 100644
--- a/devel/hdf/buildlink3.mk
+++ b/devel/hdf/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:15 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-HDF_BUILDLINK3_MK:=	${HDF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	hdf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	hdf
-.endif
+.if !defined(HDF_BUILDLINK3_MK)
+HDF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhdf}
-BUILDLINK_PACKAGES+=	hdf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hdf
-
-.if !empty(HDF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.hdf+=	hdf>=4.1r5
 BUILDLINK_ABI_DEPENDS.hdf?=	hdf>=4.2r1nb1
 BUILDLINK_PKGSRCDIR.hdf?=	../../devel/hdf
-.endif	# HDF_BUILDLINK3_MK
+.endif # HDF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-hdf
diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk
index 35b55381cfd..f4e82230c19 100644
--- a/devel/hdf5/buildlink3.mk
+++ b/devel/hdf5/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/05/30 08:54:29 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:15 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-HDF5_BUILDLINK3_MK:=	${HDF5_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	hdf5
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	hdf5
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhdf5}
-BUILDLINK_PACKAGES+=	hdf5
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hdf5
+.if !defined(HDF5_BUILDLINK3_MK)
+HDF5_BUILDLINK3_MK:=
 
-.if !empty(HDF5_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.hdf5+=	hdf5>=1.6.2
 BUILDLINK_ABI_DEPENDS.hdf5+=	hdf5>=1.6.5nb1
 BUILDLINK_PKGSRCDIR.hdf5?=	../../devel/hdf5
-.endif	# HDF5_BUILDLINK3_MK
 
 pkgbase := hdf5
 .include "../../mk/pkg-build-options.mk"
@@ -25,5 +17,6 @@ pkgbase := hdf5
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
+.endif # HDF5_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-hdf5
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index cfdda78cced..4b801748075 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.18 2008/09/06 20:54:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:15 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-KDESDK_BUILDLINK3_MK:=	${KDESDK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kdesdk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	kdesdk
-.endif
+.if !defined(KDESDK_BUILDLINK3_MK)
+KDESDK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdesdk}
-BUILDLINK_PACKAGES+=	kdesdk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdesdk
-
-.if !empty(KDESDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdesdk+=	kdesdk>=3.5.0nb1
 BUILDLINK_ABI_DEPENDS.kdesdk?=	kdesdk>=3.5.10nb1
 BUILDLINK_PKGSRCDIR.kdesdk?=	../../devel/kdesdk3
-.endif	# KDESDK_BUILDLINK3_MK
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
+.endif # KDESDK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kdesdk
diff --git a/devel/ldapsdk/buildlink3.mk b/devel/ldapsdk/buildlink3.mk
index 267f46c1ac1..950240ee0cb 100644
--- a/devel/ldapsdk/buildlink3.mk
+++ b/devel/ldapsdk/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:15 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LDAPSDK_BUILDLINK3_MK:=	${LDAPSDK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ldapsdk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ldapsdk
-.endif
+.if !defined(LDAPSDK_BUILDLINK3_MK)
+LDAPSDK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nldapsdk}
-BUILDLINK_PACKAGES+=	ldapsdk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ldapsdk
-
-.if !empty(LDAPSDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ldapsdk+=	ldapsdk>=12311998
 BUILDLINK_ABI_DEPENDS.ldapsdk?=	ldapsdk>=12311998nb2
 BUILDLINK_PKGSRCDIR.ldapsdk?=	../../devel/ldapsdk
-.endif	# LDAPSDK_BUILDLINK3_MK
+.endif # LDAPSDK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ldapsdk
diff --git a/devel/libFoundation/buildlink3.mk b/devel/libFoundation/buildlink3.mk
index ae2648c51ea..06020e8f13f 100644
--- a/devel/libFoundation/buildlink3.mk
+++ b/devel/libFoundation/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:16 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBFOUNDATION_BUILDLINK3_MK:=	${LIBFOUNDATION_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libFoundation
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libFoundation
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibFoundation}
-BUILDLINK_PACKAGES+=	libFoundation
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libFoundation
+.if !defined(LIBFOUNDATION_BUILDLINK3_MK)
+LIBFOUNDATION_BUILDLINK3_MK:=
 
-.if !empty(LIBFOUNDATION_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libFoundation+=	libFoundation>=1.0.72.107nb1
 BUILDLINK_ABI_DEPENDS.libFoundation?=	libFoundation>=1.0.72.107nb2
 BUILDLINK_PKGSRCDIR.libFoundation?=	../../devel/libFoundation
@@ -68,8 +61,7 @@ MAKE_ENV+=		FOUNDATION_LIB=${FOUNDATION_LIB:Q}
 MAKE_ENV+=		ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q}
 .endif
 
-.endif	# LIBFOUNDATION_BUILDLINK3_MK
-
 .include "../../devel/gnustep-objc-lf2/buildlink3.mk"
+.endif # LIBFOUNDATION_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libFoundation
diff --git a/devel/libargparse/buildlink3.mk b/devel/libargparse/buildlink3.mk
index 58c3f8d1c02..166d595030c 100644
--- a/devel/libargparse/buildlink3.mk
+++ b/devel/libargparse/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:16 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBARGPARSE_BUILDLINK3_MK:=	${LIBARGPARSE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libargparse
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libargparse
-.endif
+.if !defined(LIBARGPARSE_BUILDLINK3_MK)
+LIBARGPARSE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibargparse}
-BUILDLINK_PACKAGES+=	libargparse
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libargparse
-
-.if !empty(LIBARGPARSE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libargparse+=	libargparse>=0.1.0000
 BUILDLINK_ABI_DEPENDS.libargparse+=	libargparse>=0.1.0000nb1
 BUILDLINK_PKGSRCDIR.libargparse?=	../../devel/libargparse
-.endif	# LIBARGPARSE_BUILDLINK3_MK
+.endif # LIBARGPARSE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libargparse
diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk
index 4ed9ca15e28..8b395def00b 100644
--- a/devel/libast/buildlink3.mk
+++ b/devel/libast/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/01/14 10:59:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:16 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBAST_BUILDLINK3_MK:=	${LIBAST_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libast
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libast
-.endif
+.if !defined(LIBAST_BUILDLINK3_MK)
+LIBAST_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibast}
-BUILDLINK_PACKAGES+=	libast
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libast
-
-.if !empty(LIBAST_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libast+=	libast>=0.5nb5
 BUILDLINK_ABI_DEPENDS.libast+=	libast>=0.6.1nb3
 BUILDLINK_PKGSRCDIR.libast?=	../../devel/libast
-.endif	# LIBAST_BUILDLINK3_MK
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif # LIBAST_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libast
diff --git a/devel/libatomic_ops/buildlink3.mk b/devel/libatomic_ops/buildlink3.mk
index 4f2f9db838a..c18bc3ac305 100644
--- a/devel/libatomic_ops/buildlink3.mk
+++ b/devel/libatomic_ops/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/12/22 02:48:56 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:16 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBATOMIC_OPS_BUILDLINK3_MK:=	${LIBATOMIC_OPS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libatomic_ops
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libatomic_ops
-.endif
+.if !defined(LIBATOMIC_OPS_BUILDLINK3_MK)
+LIBATOMIC_OPS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibatomic_ops}
-BUILDLINK_PACKAGES+=	libatomic_ops
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libatomic_ops
-
-.if ${LIBATOMIC_OPS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libatomic_ops+=	libatomic_ops>=20081024nb1
 BUILDLINK_PKGSRCDIR.libatomic_ops?=	../../devel/libatomic_ops
-.endif	# LIBATOMIC_OPS_BUILDLINK3_MK
+.endif # LIBATOMIC_OPS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libatomic_ops
diff --git a/devel/libbegemot/buildlink3.mk b/devel/libbegemot/buildlink3.mk
index 255e6dc6fb9..eb67d56e5ea 100644
--- a/devel/libbegemot/buildlink3.mk
+++ b/devel/libbegemot/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:16 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBBEGEMOT_BUILDLINK3_MK:=	${LIBBEGEMOT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libbegemot
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libbegemot
-.endif
+.if !defined(LIBBEGEMOT_BUILDLINK3_MK)
+LIBBEGEMOT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibbegemot}
-BUILDLINK_PACKAGES+=	libbegemot
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbegemot
-
-.if !empty(LIBBEGEMOT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libbegemot+=	libbegemot>=1.9nb1
 BUILDLINK_PKGSRCDIR.libbegemot?=	../../devel/libbegemot
-.endif	# LIBBEGEMOT_BUILDLINK3_MK
+.endif # LIBBEGEMOT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libbegemot
diff --git a/devel/libbinio/buildlink3.mk b/devel/libbinio/buildlink3.mk
index b46f1bc3fd3..3abdcf886f4 100644
--- a/devel/libbinio/buildlink3.mk
+++ b/devel/libbinio/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/06/19 16:30:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:16 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBBINIO_BUILDLINK3_MK:=	${LIBBINIO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libbinio
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libbinio
-.endif
+.if !defined(LIBBINIO_BUILDLINK3_MK)
+LIBBINIO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibbinio}
-BUILDLINK_PACKAGES+=	libbinio
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbinio
-
-.if ${LIBBINIO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libbinio+=	libbinio>=1.4
 BUILDLINK_PKGSRCDIR.libbinio?=		../../devel/libbinio
-.endif	# LIBBINIO_BUILDLINK3_MK
+.endif # LIBBINIO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libbinio
diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk
index 351bf5e66ad..134b5a7c9b3 100644
--- a/devel/libbonobo/buildlink3.mk
+++ b/devel/libbonobo/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:16 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBBONOBO_BUILDLINK3_MK:=	${LIBBONOBO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libbonobo
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libbonobo
-.endif
+.if !defined(LIBBONOBO_BUILDLINK3_MK)
+LIBBONOBO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibbonobo}
-BUILDLINK_PACKAGES+=	libbonobo
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbonobo
-
-.if !empty(LIBBONOBO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libbonobo+=	libbonobo>=2.8.0
 BUILDLINK_ABI_DEPENDS.libbonobo+=	libbonobo>=2.10.1nb2
 BUILDLINK_PKGSRCDIR.libbonobo?=	../../devel/libbonobo
@@ -24,12 +17,12 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/bonobo\/(monikers|servers)$$/ \
 				{ print "@comment in libbonobo: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm lib\/bonobo-2.0\/samples$$/ \
 				{ print "@comment in libbonobo: " $$0; next; }
-.endif	# LIBBONOBO_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBBONOBO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libbonobo
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index ca141048f18..4dff4edd1ad 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.20 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:24:16 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBBONOBOUI_BUILDLINK3_MK:=	${LIBBONOBOUI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libbonoboui
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libbonoboui
-.endif
+.if !defined(LIBBONOBOUI_BUILDLINK3_MK)
+LIBBONOBOUI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibbonoboui}
-BUILDLINK_PACKAGES+=	libbonoboui
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbonoboui
-
-.if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libbonoboui+=		libbonoboui>=2.8.0
 BUILDLINK_ABI_DEPENDS.libbonoboui+=	libbonoboui>=2.20.0nb2
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
-.endif	# LIBBONOBOUI_BUILDLINK3_MK
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBBONOBOUI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libbonoboui
diff --git a/devel/libcfg+/buildlink3.mk b/devel/libcfg+/buildlink3.mk
index 1babf344c1d..a1d45ad975a 100644
--- a/devel/libcfg+/buildlink3.mk
+++ b/devel/libcfg+/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/26 06:09:23 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:16 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBCFG_BUILDLINK3_MK:=	${LIBCFG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libcfg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libcfg
-.endif
+.if !defined(LIBCFG_BUILDLINK3_MK)
+LIBCFG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcfg}
-BUILDLINK_PACKAGES+=	libcfg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcfg
-
-.if !empty(LIBCFG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcfg+=	libcfg+>=0.6.2nb1
 BUILDLINK_ABI_DEPENDS.libcfg+=	libcfg+>=0.6.2nb3
 BUILDLINK_PKGSRCDIR.libcfg?=	../../devel/libcfg+
-.endif	# LIBCFG_BUILDLINK3_MK
+.endif # LIBCFG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libcfg
diff --git a/devel/libcompizconfig/buildlink3.mk b/devel/libcompizconfig/buildlink3.mk
index 6a333b6b466..c33cf9dc483 100644
--- a/devel/libcompizconfig/buildlink3.mk
+++ b/devel/libcompizconfig/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/05/12 10:38:01 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:16 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBCOMPIZCONFIG_BUILDLINK3_MK:=	${LIBCOMPIZCONFIG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libcompizconfig
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libcompizconfig
-.endif
+.if !defined(LIBCOMPIZCONFIG_BUILDLINK3_MK)
+LIBCOMPIZCONFIG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcompizconfig}
-BUILDLINK_PACKAGES+=	libcompizconfig
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcompizconfig
-
-.if !empty(LIBCOMPIZCONFIG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcompizconfig+=	libcompizconfig>=0.6.0
 BUILDLINK_ABI_DEPENDS.libcompizconfig?=	libcompizconfig>=0.6.0
 BUILDLINK_PKGSRCDIR.libcompizconfig?=	../../devel/libcompizconfig
-.endif	# LIBCOMPIZCONFIG_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBCOMPIZCONFIG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libcompizconfig
diff --git a/devel/libconfig/buildlink3.mk b/devel/libconfig/buildlink3.mk
index 2a029acc154..ad2081f38bc 100644
--- a/devel/libconfig/buildlink3.mk
+++ b/devel/libconfig/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/11/03 14:58:01 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:17 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBCONFIG_BUILDLINK3_MK:=	${LIBCONFIG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libconfig
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libconfig
-.endif
+.if !defined(LIBCONFIG_BUILDLINK3_MK)
+LIBCONFIG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibconfig}
-BUILDLINK_PACKAGES+=	libconfig
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libconfig
-
-.if ${LIBCONFIG_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libconfig+=	libconfig>=1.1.3
 BUILDLINK_PKGSRCDIR.libconfig?=		../../devel/libconfig
-.endif	# LIBCONFIG_BUILDLINK3_MK
+.endif # LIBCONFIG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libconfig
diff --git a/devel/libdaemon/buildlink3.mk b/devel/libdaemon/buildlink3.mk
index b73d2532942..d9e99e9debc 100644
--- a/devel/libdaemon/buildlink3.mk
+++ b/devel/libdaemon/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/20 17:24:48 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:17 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDAEMON_BUILDLINK3_MK:=	${LIBDAEMON_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdaemon
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libdaemon
-.endif
+.if !defined(LIBDAEMON_BUILDLINK3_MK)
+LIBDAEMON_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdaemon}
-BUILDLINK_PACKAGES+=	libdaemon
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdaemon
-
-.if ${LIBDAEMON_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libdaemon+=	libdaemon>=0.10
 BUILDLINK_PKGSRCDIR.libdaemon?=		../../devel/libdaemon
-.endif	# LIBDAEMON_BUILDLINK3_MK
+.endif # LIBDAEMON_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdaemon
diff --git a/devel/libdatrie/buildlink3.mk b/devel/libdatrie/buildlink3.mk
index 9f848002bb0..3b158b64154 100644
--- a/devel/libdatrie/buildlink3.mk
+++ b/devel/libdatrie/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/11 02:11:24 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:17 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDATRIE_BUILDLINK3_MK:=	${LIBDATRIE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdatrie
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libdatrie
-.endif
+.if !defined(LIBDATRIE_BUILDLINK3_MK)
+LIBDATRIE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdatrie}
-BUILDLINK_PACKAGES+=	libdatrie
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdatrie
-
-.if ${LIBDATRIE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libdatrie+=	libdatrie>=0.1.3
 BUILDLINK_PKGSRCDIR.libdatrie?=	../../devel/libdatrie
-.endif	# LIBDATRIE_BUILDLINK3_MK
+.endif # LIBDATRIE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdatrie
diff --git a/devel/libdnsres/buildlink3.mk b/devel/libdnsres/buildlink3.mk
index cd4e52daf68..9c2b9def89c 100644
--- a/devel/libdnsres/buildlink3.mk
+++ b/devel/libdnsres/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/04/22 18:06:09 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:17 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDNSRES_BUILDLINK3_MK:=	${LIBDNSRES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdnsres
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdnsres
-.endif
+.if !defined(LIBDNSRES_BUILDLINK3_MK)
+LIBDNSRES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdnsres}
-BUILDLINK_PACKAGES+=	libdnsres
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdnsres
-
-.if !empty(LIBDNSRES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdnsres+=	libdnsres>=0.1a
 BUILDLINK_ABI_DEPENDS.libdnsres?=	libdnsres>=0.1anb4
 BUILDLINK_PKGSRCDIR.libdnsres?=	../../devel/libdnsres
-.endif	# LIBDNSRES_BUILDLINK3_MK
+.endif # LIBDNSRES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdnsres
diff --git a/devel/libdockapp/buildlink3.mk b/devel/libdockapp/buildlink3.mk
index ee95f361e18..009dfbe1627 100644
--- a/devel/libdockapp/buildlink3.mk
+++ b/devel/libdockapp/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:17 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDOCKAPP_BUILDLINK3_MK:=	${LIBDOCKAPP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdockapp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdockapp
-.endif
+.if !defined(LIBDOCKAPP_BUILDLINK3_MK)
+LIBDOCKAPP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdockapp}
-BUILDLINK_PACKAGES+=	libdockapp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdockapp
-
-.if !empty(LIBDOCKAPP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdockapp+=		libdockapp>=0.4.0
 BUILDLINK_ABI_DEPENDS.libdockapp+=	libdockapp>=0.4.0nb2
 BUILDLINK_PKGSRCDIR.libdockapp?=	../../devel/libdockapp
-.endif	# LIBDOCKAPP_BUILDLINK3_MK
 
 .include "../../x11/libXpm/buildlink3.mk"
+.endif # LIBDOCKAPP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdockapp
diff --git a/devel/libebml/buildlink3.mk b/devel/libebml/buildlink3.mk
index 83f8ea01ef0..82a438a10f5 100644
--- a/devel/libebml/buildlink3.mk
+++ b/devel/libebml/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.15 2007/11/14 18:20:05 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:17 joerg Exp $
 #
 # This Makefile fragment is included by packages that use libebml.
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBEBML_BUILDLINK3_MK:=	${LIBEBML_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libebml
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libebml
-.endif
+.if !defined(LIBEBML_BUILDLINK3_MK)
+LIBEBML_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibebml}
-BUILDLINK_PACKAGES+=	libebml
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libebml
-
-.if !empty(LIBEBML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libebml+=	libebml>=0.7.7
 BUILDLINK_ABI_DEPENDS.libebml?=	libebml>=0.7.7
 BUILDLINK_PKGSRCDIR.libebml?=	../../devel/libebml
-.endif	# LIBEBML_BUILDLINK3_MK
+.endif # LIBEBML_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libebml
diff --git a/devel/libelf/buildlink3.mk b/devel/libelf/buildlink3.mk
index b0b3436c615..6718361f8b3 100644
--- a/devel/libelf/buildlink3.mk
+++ b/devel/libelf/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2007/10/11 18:53:12 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:17 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBELF_BUILDLINK3_MK:=	${LIBELF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libelf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libelf
-.endif
+.if !defined(LIBELF_BUILDLINK3_MK)
+LIBELF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibelf}
-BUILDLINK_PACKAGES+=	libelf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libelf
-
-.if !empty(LIBELF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libelf+=	libelf>=0.8.5
 BUILDLINK_PKGSRCDIR.libelf?=	../../devel/libelf
-.endif	# LIBELF_BUILDLINK3_MK
+.endif # LIBELF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libelf
diff --git a/devel/libetm/buildlink3.mk b/devel/libetm/buildlink3.mk
index 2a7efa27792..da40597a239 100644
--- a/devel/libetm/buildlink3.mk
+++ b/devel/libetm/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:17 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBETM_BUILDLINK3_MK:=	${LIBETM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libetm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libetm
-.endif
+.if !defined(LIBETM_BUILDLINK3_MK)
+LIBETM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibetm}
-BUILDLINK_PACKAGES+=	libetm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libetm
-
-.if !empty(LIBETM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libetm+=	libetm>=1.09
 BUILDLINK_PKGSRCDIR.libetm?=	../../devel/libetm
 BUILDLINK_DEPMETHOD.libetm?=	build
-.endif	# LIBETM_BUILDLINK3_MK
+.endif # LIBETM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libetm
diff --git a/devel/libevent/buildlink3.mk b/devel/libevent/buildlink3.mk
index cd71d9f8689..32b10adb938 100644
--- a/devel/libevent/buildlink3.mk
+++ b/devel/libevent/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/02/27 22:50:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:17 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBEVENT_BUILDLINK3_MK:=	${LIBEVENT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libevent
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libevent
-.endif
+.if !defined(LIBEVENT_BUILDLINK3_MK)
+LIBEVENT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibevent}
-BUILDLINK_PACKAGES+=	libevent
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libevent
-
-.if !empty(LIBEVENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libevent+=libevent>=0.6
 BUILDLINK_ABI_DEPENDS.libevent+=libevent-1.4.9* # exact match -- see Makefile
 BUILDLINK_PKGSRCDIR.libevent?=	../../devel/libevent
-.endif	# LIBEVENT_BUILDLINK3_MK
+.endif # LIBEVENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libevent
diff --git a/devel/libextractor/buildlink3.mk b/devel/libextractor/buildlink3.mk
index f6a57ef2f68..23a8154d757 100644
--- a/devel/libextractor/buildlink3.mk
+++ b/devel/libextractor/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:17 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBEXTRACTOR_BUILDLINK3_MK:=	${LIBEXTRACTOR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libextractor
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libextractor
-.endif
+.if !defined(LIBEXTRACTOR_BUILDLINK3_MK)
+LIBEXTRACTOR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibextractor}
-BUILDLINK_PACKAGES+=	libextractor
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libextractor
-
-.if !empty(LIBEXTRACTOR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libextractor+=	libextractor>=0.3.10
 BUILDLINK_ABI_DEPENDS.libextractor+=	libextractor>=0.5.3nb3
 BUILDLINK_PKGSRCDIR.libextractor?=	../../devel/libextractor
-.endif	# LIBEXTRACTOR_BUILDLINK3_MK
+.endif # LIBEXTRACTOR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libextractor
diff --git a/devel/libffi/buildlink3.mk b/devel/libffi/buildlink3.mk
index 0dae4ba8f42..fccf3154867 100644
--- a/devel/libffi/buildlink3.mk
+++ b/devel/libffi/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/10/11 22:33:56 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:17 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBFFI_BUILDLINK3_MK:=	${LIBFFI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libffi
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libffi
-.endif
+.if !defined(LIBFFI_BUILDLINK3_MK)
+LIBFFI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibffi}
-BUILDLINK_PACKAGES+=	libffi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libffi
-
-.if ${LIBFFI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libffi+=	libffi>=1.20
 BUILDLINK_ABI_DEPENDS.libffi+=	libffi>=2.0betanb1
 #BUILDLINK_API_DEPENDS.libffi+=	libffi>=3.0.6
 BUILDLINK_PKGSRCDIR.libffi?=	../../devel/libffi
-.endif	# LIBFFI_BUILDLINK3_MK
+.endif # LIBFFI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libffi
diff --git a/devel/libfirm/buildlink3.mk b/devel/libfirm/buildlink3.mk
index 981bd3855a6..92228e97db7 100644
--- a/devel/libfirm/buildlink3.mk
+++ b/devel/libfirm/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/12/17 16:52:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:18 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBFIRM_BUILDLINK3_MK:=	${LIBFIRM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libfirm
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libfirm
-.endif
+.if !defined(LIBFIRM_BUILDLINK3_MK)
+LIBFIRM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibfirm}
-BUILDLINK_PACKAGES+=	libfirm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfirm
-
-.if ${LIBFIRM_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libfirm+=	libfirm>=1.15.0
 BUILDLINK_PKGSRCDIR.libfirm?=	../../devel/libfirm
-.endif	# LIBFIRM_BUILDLINK3_MK
+.endif # LIBFIRM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libfirm
diff --git a/devel/libgail-gnome/buildlink3.mk b/devel/libgail-gnome/buildlink3.mk
index 036461cf17e..6f643c6da07 100644
--- a/devel/libgail-gnome/buildlink3.mk
+++ b/devel/libgail-gnome/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.18 2008/09/06 20:54:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGAIL_GNOME_BUILDLINK3_MK:=	${LIBGAIL_GNOME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgail-gnome
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgail-gnome
-.endif
+.if !defined(LIBGAIL_GNOME_BUILDLINK3_MK)
+LIBGAIL_GNOME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgail-gnome}
-BUILDLINK_PACKAGES+=	libgail-gnome
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgail-gnome
-
-.if !empty(LIBGAIL_GNOME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgail-gnome+=	libgail-gnome>=1.1.1nb2
 BUILDLINK_ABI_DEPENDS.libgail-gnome?=	libgail-gnome>=1.20.0nb2
 BUILDLINK_PKGSRCDIR.libgail-gnome?=	../../devel/libgail-gnome
-.endif	# LIBGAIL_GNOME_BUILDLINK3_MK
 
 .include "../../devel/at-spi/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
@@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.libgail-gnome?=	../../devel/libgail-gnome
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBGAIL_GNOME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgail-gnome
diff --git a/devel/libgcroots/buildlink3.mk b/devel/libgcroots/buildlink3.mk
index 5c6fe276845..5448f42a5e9 100644
--- a/devel/libgcroots/buildlink3.mk
+++ b/devel/libgcroots/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/29 13:06:36 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGCROOTS_BUILDLINK3_MK:=	${LIBGCROOTS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgcroots
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libgcroots
-.endif
+.if !defined(LIBGCROOTS_BUILDLINK3_MK)
+LIBGCROOTS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgcroots}
-BUILDLINK_PACKAGES+=	libgcroots
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgcroots
-
-.if ${LIBGCROOTS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libgcroots+=	libgcroots>=0.2.1
 BUILDLINK_PKGSRCDIR.libgcroots?=	../../devel/libgcroots
-.endif	# LIBGCROOTS_BUILDLINK3_MK
+.endif # LIBGCROOTS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgcroots
diff --git a/devel/libgee/buildlink3.mk b/devel/libgee/buildlink3.mk
index 6a560cb8cd0..2ab5101c8ee 100644
--- a/devel/libgee/buildlink3.mk
+++ b/devel/libgee/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/05 21:59:43 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:18 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBGEE_BUILDLINK3_MK:=	${LIBGEE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgee
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libgee
-.endif
+.if !defined(LIBGEE_BUILDLINK3_MK)
+LIBGEE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgee}
-BUILDLINK_PACKAGES+=	libgee
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgee
-
-.if ${LIBGEE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libgee+=	libgee>=0.1.5
 BUILDLINK_PKGSRCDIR.libgee?=	../../devel/libgee
-.endif	# LIBGEE_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"
+.endif # LIBGEE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgee
diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk
index aeb84d5edce..43652dcae5d 100644
--- a/devel/libgetopt/buildlink3.mk
+++ b/devel/libgetopt/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGETOPT_BUILDLINK3_MK:=	${LIBGETOPT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	getopt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	getopt
-.endif
+.if !defined(LIBGETOPT_BUILDLINK3_MK)
+LIBGETOPT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngetopt}
-BUILDLINK_PACKAGES+=	getopt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}getopt
-
-.if !empty(LIBGETOPT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.getopt+=	libgetopt>=1.3
 BUILDLINK_PKGSRCDIR.getopt?=	../../devel/libgetopt
-.endif	# LIBGETOPT_BUILDLINK3_MK
+.endif # LIBGETOPT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-getopt
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
index ca1fac122a9..1737cd31796 100644
--- a/devel/libglade/buildlink3.mk
+++ b/devel/libglade/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/09/21 12:58:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGLADE_BUILDLINK3_MK:=	${LIBGLADE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libglade
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libglade
-.endif
+.if !defined(LIBGLADE_BUILDLINK3_MK)
+LIBGLADE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibglade}
-BUILDLINK_PACKAGES+=	libglade
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libglade
-
-.if !empty(LIBGLADE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.3.6
 BUILDLINK_ABI_DEPENDS.libglade+=	libglade>=2.5.1nb4
 BUILDLINK_PKGSRCDIR.libglade?=	../../devel/libglade
@@ -19,9 +12,9 @@ BUILDLINK_PKGSRCDIR.libglade?=	../../devel/libglade
 PRINT_PLIST_AWK+=	/^@dirrm lib\/libglade$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm lib\/libglade\/2.0$$/ \
 				{ print "@comment in libglade: " $$0; next; }
-.endif	# LIBGLADE_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBGLADE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libglade
diff --git a/devel/libglademm/buildlink3.mk b/devel/libglademm/buildlink3.mk
index 8ddef3acba3..3d29e435590 100644
--- a/devel/libglademm/buildlink3.mk
+++ b/devel/libglademm/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/09/21 13:03:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGLADEMM_BUILDLINK3_MK:=	${LIBGLADEMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libglademm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libglademm
-.endif
+.if !defined(LIBGLADEMM_BUILDLINK3_MK)
+LIBGLADEMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibglademm}
-BUILDLINK_PACKAGES+=	libglademm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libglademm
-
-.if !empty(LIBGLADEMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libglademm+=	libglademm>=2.6.0
 BUILDLINK_ABI_DEPENDS.libglademm+=	libglademm>=2.6.2nb1
 BUILDLINK_PKGSRCDIR.libglademm?=	../../devel/libglademm
-.endif	# LIBGLADEMM_BUILDLINK3_MK
 
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
+.endif # LIBGLADEMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libglademm
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index 106884f2fa9..2729d413c47 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.20 2008/04/10 16:40:49 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:24:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGNOME_BUILDLINK3_MK:=	${LIBGNOME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgnome
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnome
-.endif
+.if !defined(LIBGNOME_BUILDLINK3_MK)
+LIBGNOME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnome}
-BUILDLINK_PACKAGES+=	libgnome
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnome
-
-.if !empty(LIBGNOME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.8.0
 BUILDLINK_ABI_DEPENDS.libgnome+=	libgnome>=2.20.1.1nb1
 BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
-.endif	# LIBGNOME_BUILDLINK3_MK
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.endif # LIBGNOME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgnome
diff --git a/devel/libgnomemm/buildlink3.mk b/devel/libgnomemm/buildlink3.mk
index b1873da170a..d9e161be9e3 100644
--- a/devel/libgnomemm/buildlink3.mk
+++ b/devel/libgnomemm/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGNOMEMM_BUILDLINK3_MK:=	${LIBGNOMEMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgnomemm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnomemm
-.endif
+.if !defined(LIBGNOMEMM_BUILDLINK3_MK)
+LIBGNOMEMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomemm}
-BUILDLINK_PACKAGES+=	libgnomemm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomemm
-
-.if !empty(LIBGNOMEMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomemm+=	libgnomemm>=2.10.0
 BUILDLINK_ABI_DEPENDS.libgnomemm+=	libgnomemm>=2.20.0nb1
 BUILDLINK_PKGSRCDIR.libgnomemm?=	../../devel/libgnomemm
-.endif	# LIBGNOMEMM_BUILDLINK3_MK
 
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
+.endif # LIBGNOMEMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgnomemm
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index bdbe455f1c0..ac19605de9d 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.25 2008/10/16 13:26:11 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGNOMEUI_BUILDLINK3_MK:=	${LIBGNOMEUI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgnomeui
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnomeui
-.endif
+.if !defined(LIBGNOMEUI_BUILDLINK3_MK)
+LIBGNOMEUI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeui}
-BUILDLINK_PACKAGES+=	libgnomeui
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomeui
-
-.if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.8.0
 BUILDLINK_ABI_DEPENDS.libgnomeui+=	libgnomeui>=2.20.1.1nb2
 BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
-.endif	# LIBGNOMEUI_BUILDLINK3_MK
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -27,5 +19,6 @@ BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
+.endif # LIBGNOMEUI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgnomeui
diff --git a/devel/libgnomeuimm/buildlink3.mk b/devel/libgnomeuimm/buildlink3.mk
index 396bdb4765b..cb372dae48f 100644
--- a/devel/libgnomeuimm/buildlink3.mk
+++ b/devel/libgnomeuimm/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:19 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGNOMEUIMM_BUILDLINK3_MK:=	${LIBGNOMEUIMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgnomeuimm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnomeuimm
-.endif
+.if !defined(LIBGNOMEUIMM_BUILDLINK3_MK)
+LIBGNOMEUIMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeuimm}
-BUILDLINK_PACKAGES+=	libgnomeuimm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomeuimm
-
-.if !empty(LIBGNOMEUIMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomeuimm+=	libgnomeuimm>=2.10.0
 BUILDLINK_ABI_DEPENDS.libgnomeuimm+=	libgnomeuimm>=2.20.0nb1
 BUILDLINK_PKGSRCDIR.libgnomeuimm?=	../../devel/libgnomeuimm
-.endif	# LIBGNOMEUIMM_BUILDLINK3_MK
 
 .include "../../devel/gconfmm/buildlink3.mk"
 .include "../../devel/libglademm/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libgnomeuimm?=	../../devel/libgnomeuimm
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libgnomecanvasmm/buildlink3.mk"
 .include "../../sysutils/gnome-vfsmm/buildlink3.mk"
+.endif # LIBGNOMEUIMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgnomeuimm
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
index de444af5dbe..1cda8a36775 100644
--- a/devel/libgphoto2/buildlink3.mk
+++ b/devel/libgphoto2/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/03/18 13:25:11 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:19 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGPHOTO2_BUILDLINK3_MK:=	${LIBGPHOTO2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgphoto2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgphoto2
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgphoto2}
-BUILDLINK_PACKAGES+=	libgphoto2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgphoto2
+.if !defined(LIBGPHOTO2_BUILDLINK3_MK)
+LIBGPHOTO2_BUILDLINK3_MK:=
 
-.if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgphoto2+=		libgphoto2>=2.1.2
 BUILDLINK_ABI_DEPENDS.libgphoto2+=	libgphoto2>=2.1.6nb1
 BUILDLINK_PKGSRCDIR.libgphoto2?=	../../devel/libgphoto2
-.endif	# LIBGPHOTO2_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 .if ${OPSYS} != "SunOS"
@@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.libgphoto2?=	../../devel/libgphoto2
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
+.endif # LIBGPHOTO2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgphoto2
diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk
index cd1ee2c3392..3de80b621a9 100644
--- a/devel/libgsf/buildlink3.mk
+++ b/devel/libgsf/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.19 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBGSF_BUILDLINK3_MK:=	${LIBGSF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgsf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgsf
-.endif
+.if !defined(LIBGSF_BUILDLINK3_MK)
+LIBGSF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgsf}
-BUILDLINK_PACKAGES+=	libgsf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgsf
-
-.if !empty(LIBGSF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.13.3
 BUILDLINK_ABI_DEPENDS.libgsf?=	libgsf>=1.14.7nb3
 BUILDLINK_PKGSRCDIR.libgsf?=	../../devel/libgsf
-.endif	# LIBGSF_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libgsf?=	../../devel/libgsf
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBGSF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgsf
diff --git a/devel/libgweather/buildlink3.mk b/devel/libgweather/buildlink3.mk
index ef223d09d55..7addf056c14 100644
--- a/devel/libgweather/buildlink3.mk
+++ b/devel/libgweather/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/16 13:36:46 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:19 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGWEATHER_BUILDLINK3_MK:=	${LIBGWEATHER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgweather
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libgweather
-.endif
+.if !defined(LIBGWEATHER_BUILDLINK3_MK)
+LIBGWEATHER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgweather}
-BUILDLINK_PACKAGES+=	libgweather
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgweather
-
-.if ${LIBGWEATHER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libgweather+=	libgweather>=2.22.0
 BUILDLINK_PKGSRCDIR.libgweather?=	../../devel/libgweather
-.endif	# LIBGWEATHER_BUILDLINK3_MK
 
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
+.endif # LIBGWEATHER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgweather
diff --git a/devel/libhfs/buildlink3.mk b/devel/libhfs/buildlink3.mk
index dd341c75ff2..720eff2d7eb 100644
--- a/devel/libhfs/buildlink3.mk
+++ b/devel/libhfs/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBHFS_BUILDLINK3_MK:=	${LIBHFS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libhfs
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libhfs
-.endif
+.if !defined(LIBHFS_BUILDLINK3_MK)
+LIBHFS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibhfs}
-BUILDLINK_PACKAGES+=	libhfs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libhfs
-
-.if !empty(LIBHFS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libhfs+=	libhfs>=3.2.6nb1
 BUILDLINK_PKGSRCDIR.libhfs?=	../../devel/libhfs
-.endif	# LIBHFS_BUILDLINK3_MK
+.endif # LIBHFS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libhfs
diff --git a/devel/libiberty/buildlink3.mk b/devel/libiberty/buildlink3.mk
index 5d1e9436d30..b2311d72111 100644
--- a/devel/libiberty/buildlink3.mk
+++ b/devel/libiberty/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:19 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBIBERTY_BUILDLINK3_MK:=	${LIBIBERTY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libiberty
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libiberty
-.endif
+.if !defined(LIBIBERTY_BUILDLINK3_MK)
+LIBIBERTY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibiberty}
-BUILDLINK_PACKAGES+=	libiberty
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libiberty
-
-.if !empty(LIBIBERTY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libiberty+=	libiberty>=1.0nb1
 BUILDLINK_ABI_DEPENDS.libiberty?=	libiberty>=1.0nb2
 BUILDLINK_PKGSRCDIR.libiberty?=	../../devel/libiberty
-.endif	# LIBIBERTY_BUILDLINK3_MK
 BUILDLINK_DEPMETHOD.libiberty?= build
+.endif # LIBIBERTY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libiberty
diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk
index 6bd073817a7..cad4cb70f4d 100644
--- a/devel/libidn/buildlink3.mk
+++ b/devel/libidn/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBIDN_BUILDLINK3_MK:=	${LIBIDN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libidn
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libidn
-.endif
+.if !defined(LIBIDN_BUILDLINK3_MK)
+LIBIDN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibidn}
-BUILDLINK_PACKAGES+=	libidn
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libidn
-
-.if !empty(LIBIDN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libidn+=	libidn>=0.4.6
 BUILDLINK_ABI_DEPENDS.libidn+=	libidn>=0.6.1nb1
 BUILDLINK_PKGSRCDIR.libidn?=	../../devel/libidn
-.endif	# LIBIDN_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
+.endif # LIBIDN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libidn
diff --git a/devel/libixp/buildlink3.mk b/devel/libixp/buildlink3.mk
index 7f4c67e1b1c..7a242144e48 100644
--- a/devel/libixp/buildlink3.mk
+++ b/devel/libixp/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/06 21:47:09 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBIXP_BUILDLINK3_MK:=	${LIBIXP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libixp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libixp
-.endif
+.if !defined(LIBIXP_BUILDLINK3_MK)
+LIBIXP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibixp}
-BUILDLINK_PACKAGES+=	libixp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libixp
-
-.if ${LIBIXP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libixp+=	libixp>=0.4
 BUILDLINK_PKGSRCDIR.libixp?=	../../devel/libixp
-.endif	# LIBIXP_BUILDLINK3_MK
+.endif # LIBIXP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libixp
diff --git a/devel/libjit/buildlink3.mk b/devel/libjit/buildlink3.mk
index 4fbc9e9b2a6..5288bdd1013 100644
--- a/devel/libjit/buildlink3.mk
+++ b/devel/libjit/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBJIT_BUILDLINK3_MK:=	${LIBJIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libjit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libjit
-.endif
+.if !defined(LIBJIT_BUILDLINK3_MK)
+LIBJIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibjit}
-BUILDLINK_PACKAGES+=	libjit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libjit
-
-.if !empty(LIBJIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libjit+=	libjit>=0.0.2
 BUILDLINK_ABI_DEPENDS.libjit+=	libjit>=0.0.4nb1
 BUILDLINK_PKGSRCDIR.libjit?=	../../devel/libjit
-.endif	# LIBJIT_BUILDLINK3_MK
+.endif # LIBJIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libjit
diff --git a/devel/libjudy/buildlink3.mk b/devel/libjudy/buildlink3.mk
index 3e547027665..0f8c3df03df 100644
--- a/devel/libjudy/buildlink3.mk
+++ b/devel/libjudy/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/06/13 13:28:10 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBJUDY_BUILDLINK3_MK:=	${LIBJUDY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libjudy
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libjudy
-.endif
+.if !defined(LIBJUDY_BUILDLINK3_MK)
+LIBJUDY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibjudy}
-BUILDLINK_PACKAGES+=	libjudy
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libjudy
-
-.if !empty(LIBJUDY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libjudy+=	libjudy>=1.0.3
 BUILDLINK_PKGSRCDIR.libjudy?=	../../devel/libjudy
-.endif	# LIBJUDY_BUILDLINK3_MK
+.endif # LIBJUDY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libjudy
diff --git a/devel/libltdl/buildlink3.mk b/devel/libltdl/buildlink3.mk
index 62195facab0..dc6c63bb6e6 100644
--- a/devel/libltdl/buildlink3.mk
+++ b/devel/libltdl/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/12/12 21:52:35 joerg Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBLTDL_BUILDLINK3_MK:=	${LIBLTDL_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:20 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 .if ${OPSYS} == "NetBSD"
@@ -11,20 +8,17 @@ _SKIP_LIBLTDL=		yes
 .endif
 
 .if !defined(_SKIP_LIBLTDL)
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libltdl
-.endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibltdl}
-BUILDLINK_PACKAGES+=	libltdl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libltdl
+BUILDLINK_TREE+=	libltdl
+
+.if !defined(LIBLTDL_BUILDLINK3_MK)
+LIBLTDL_BUILDLINK3_MK:=
 
-.if !empty(LIBLTDL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libltdl+=	libltdl>=1.5.10
 BUILDLINK_PKGSRCDIR.libltdl?=	../../devel/libltdl
-.endif	# LIBLTDL_BUILDLINK3_MK
 
 .include "../../mk/dlopen.buildlink3.mk"
 .endif
+.endif # LIBLTDL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libltdl
diff --git a/devel/libmaa/buildlink3.mk b/devel/libmaa/buildlink3.mk
index 6ab13890e4a..9ff50bc4140 100644
--- a/devel/libmaa/buildlink3.mk
+++ b/devel/libmaa/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/12 00:50:20 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:20 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBMAA_BUILDLINK3_MK:=	${LIBMAA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmaa
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmaa
-.endif
+.if !defined(LIBMAA_BUILDLINK3_MK)
+LIBMAA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmaa}
-BUILDLINK_PACKAGES+=	libmaa
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmaa
-
-.if ${LIBMAA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmaa+=	libmaa>=0.990
 BUILDLINK_PKGSRCDIR.libmaa?=	../../devel/libmaa
-.endif	# LIBMAA_BUILDLINK3_MK
+.endif # LIBMAA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmaa
diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk
index 9760d433243..d88cb765222 100644
--- a/devel/libmatchbox/buildlink3.mk
+++ b/devel/libmatchbox/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/12/27 13:37:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:20 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMATCHBOX_BUILDLINK3_MK:=	${LIBMATCHBOX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmatchbox
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmatchbox
-.endif
+.if !defined(LIBMATCHBOX_BUILDLINK3_MK)
+LIBMATCHBOX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmatchbox}
-BUILDLINK_PACKAGES+=	libmatchbox
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmatchbox
-
-.if !empty(LIBMATCHBOX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmatchbox+=	libmatchbox>=1.4
 BUILDLINK_ABI_DEPENDS.libmatchbox+=	libmatchbox>=1.7nb3
 BUILDLINK_PKGSRCDIR.libmatchbox?=	../../devel/libmatchbox
-.endif	# LIBMATCHBOX_BUILDLINK3_MK
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
+.endif # LIBMATCHBOX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmatchbox
diff --git a/devel/libmcs/buildlink3.mk b/devel/libmcs/buildlink3.mk
index 9f0e714d9a0..6f6cdf35531 100644
--- a/devel/libmcs/buildlink3.mk
+++ b/devel/libmcs/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/11/10 11:39:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:20 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBMCS_BUILDLINK3_MK:=	${LIBMCS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmcs
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmcs
-.endif
+.if !defined(LIBMCS_BUILDLINK3_MK)
+LIBMCS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmcs}
-BUILDLINK_PACKAGES+=	libmcs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmcs
-
-.if ${LIBMCS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmcs+=	libmcs>=0.7.1
 BUILDLINK_PKGSRCDIR.libmcs?=	../../devel/libmcs
-.endif	# LIBMCS_BUILDLINK3_MK
 
 .include "../../devel/libmowgli/buildlink3.mk"
+.endif # LIBMCS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmcs
diff --git a/devel/libmemcache/buildlink3.mk b/devel/libmemcache/buildlink3.mk
index 91813d9e331..a8284159933 100644
--- a/devel/libmemcache/buildlink3.mk
+++ b/devel/libmemcache/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:20 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMEMCACHE_BUILDLINK3_MK:=	${LIBMEMCACHE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmemcache
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmemcache
-.endif
+.if !defined(LIBMEMCACHE_BUILDLINK3_MK)
+LIBMEMCACHE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmemcache}
-BUILDLINK_PACKAGES+=	libmemcache
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmemcache
-
-.if !empty(LIBMEMCACHE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmemcache+=	libmemcache>=1.4.0beta5
 BUILDLINK_PKGSRCDIR.libmemcache?=	../../devel/libmemcache
-.endif	# LIBMEMCACHE_BUILDLINK3_MK
+.endif # LIBMEMCACHE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmemcache
diff --git a/devel/libmemmgr/buildlink3.mk b/devel/libmemmgr/buildlink3.mk
index 769b9e0755a..c335af4473e 100644
--- a/devel/libmemmgr/buildlink3.mk
+++ b/devel/libmemmgr/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:20 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMEMMGR_BUILDLINK3_MK:=	${LIBMEMMGR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmemmgr
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmemmgr
-.endif
+.if !defined(LIBMEMMGR_BUILDLINK3_MK)
+LIBMEMMGR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmemmgr}
-BUILDLINK_PACKAGES+=	libmemmgr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmemmgr
-
-.if !empty(LIBMEMMGR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmemmgr+=	libmemmgr>=1.04
 BUILDLINK_PKGSRCDIR.libmemmgr?=	../../devel/libmemmgr
 BUILDLINK_DEPMETHOD.libmemmgr?=	build
-.endif	# LIBMEMMGR_BUILDLINK3_MK
 
 .include "../../devel/libetm/buildlink3.mk"
+.endif # LIBMEMMGR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmemmgr
diff --git a/devel/libmimedir/buildlink3.mk b/devel/libmimedir/buildlink3.mk
index fba9624a7c0..0c7f81d8258 100644
--- a/devel/libmimedir/buildlink3.mk
+++ b/devel/libmimedir/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:20 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMIMEDIR_BUILDLINK3_MK:=	${LIBMIMEDIR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmimedir
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmimedir
-.endif
+.if !defined(LIBMIMEDIR_BUILDLINK3_MK)
+LIBMIMEDIR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmimedir}
-BUILDLINK_PACKAGES+=	libmimedir
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmimedir
-
-.if !empty(LIBMIMEDIR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmimedir+=	libmimedir>=0.4nb1
 BUILDLINK_PKGSRCDIR.libmimedir?=	../../devel/libmimedir
-.endif	# LIBMIMEDIR_BUILDLINK3_MK
+.endif # LIBMIMEDIR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmimedir
diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk
index 847e69626d6..e87330f51b5 100644
--- a/devel/libmm/buildlink3.mk
+++ b/devel/libmm/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/09/07 17:16:43 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:20 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBMM_BUILDLINK3_MK:=	${LIBMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmm
-.endif
+.if !defined(LIBMM_BUILDLINK3_MK)
+LIBMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmm}
-BUILDLINK_PACKAGES+=	libmm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmm
-
-.if !empty(LIBMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmm+=	libmm>=1.4.0
 BUILDLINK_PKGSRCDIR.libmm?=	../../devel/libmm
-.endif	# LIBMM_BUILDLINK3_MK
+.endif # LIBMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmm
diff --git a/devel/libmowgli/buildlink3.mk b/devel/libmowgli/buildlink3.mk
index 385df49995a..03b687841a4 100644
--- a/devel/libmowgli/buildlink3.mk
+++ b/devel/libmowgli/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/11/10 12:08:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:20 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMOWGLI_BUILDLINK3_MK:=	${LIBMOWGLI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmowgli
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmowgli
-.endif
+.if !defined(LIBMOWGLI_BUILDLINK3_MK)
+LIBMOWGLI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmowgli}
-BUILDLINK_PACKAGES+=	libmowgli
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmowgli
-
-.if ${LIBMOWGLI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmowgli+=	libmowgli>=0.7.0
 BUILDLINK_PKGSRCDIR.libmowgli?=		../../devel/libmowgli
-.endif	# LIBMOWGLI_BUILDLINK3_MK
+.endif # LIBMOWGLI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmowgli
diff --git a/devel/libmtp/buildlink3.mk b/devel/libmtp/buildlink3.mk
index 9ada2e78487..4298b7b2759 100644
--- a/devel/libmtp/buildlink3.mk
+++ b/devel/libmtp/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/06 23:24:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:20 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBMTP_BUILDLINK3_MK:=	${LIBMTP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmtp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmtp
-.endif
+.if !defined(LIBMTP_BUILDLINK3_MK)
+LIBMTP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmtp}
-BUILDLINK_PACKAGES+=	libmtp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmtp
-
-.if ${LIBMTP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmtp+=	libmtp>=0.3.0
 BUILDLINK_PKGSRCDIR.libmtp?=	../../devel/libmtp
-.endif	# LIBMTP_BUILDLINK3_MK
 
 .include "../../devel/libusb/buildlink3.mk"
+.endif # LIBMTP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmtp
diff --git a/devel/libnet10/buildlink3.mk b/devel/libnet10/buildlink3.mk
index dbb7c2b5e69..8e76fbaa63c 100644
--- a/devel/libnet10/buildlink3.mk
+++ b/devel/libnet10/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/18 18:36:21 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBNET10_BUILDLINK3_MK:=	${LIBNET10_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libnet10
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libnet10
-.endif
+.if !defined(LIBNET10_BUILDLINK3_MK)
+LIBNET10_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnet10}
-BUILDLINK_PACKAGES+=	libnet10
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnet10
-
-.if ${LIBNET10_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libnet10+=	libnet10>=1.0.2a
 BUILDLINK_PKGSRCDIR.libnet10?=		../../devel/libnet10
 
 BUILDLINK_INCDIRS.libnet10+=		include/libnet10
 BUILDLINK_LIBDIRS.libnet10+=		lib/libnet10
-.endif	# LIBNET10_BUILDLINK3_MK
+.endif # LIBNET10_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libnet10
diff --git a/devel/libnet11/buildlink3.mk b/devel/libnet11/buildlink3.mk
index c14b9cc5dff..cd80c3bc434 100644
--- a/devel/libnet11/buildlink3.mk
+++ b/devel/libnet11/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.6 2007/02/18 18:31:00 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBNET11_BUILDLINK3_MK:=	${LIBNET11_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libnet11
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libnet11
-.endif
+.if !defined(LIBNET11_BUILDLINK3_MK)
+LIBNET11_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnet11}
-BUILDLINK_PACKAGES+=	libnet11
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnet11
-
-.if ${LIBNET11_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libnet11+=	libnet11>=1.1.2.1
 BUILDLINK_PKGSRCDIR.libnet11?=		../../devel/libnet11
 
 BUILDLINK_INCDIRS.libnet11+=		include/libnet11
 BUILDLINK_LIBDIRS.libnet11+=		lib/libnet11
 BUILDLINK_CPPFLAGS.libnet11+=		-lnet
-.endif	# LIBNET11_BUILDLINK3_MK
+.endif # LIBNET11_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libnet11
diff --git a/devel/libntlm/buildlink3.mk b/devel/libntlm/buildlink3.mk
index ca35458007f..2faaacf49c2 100644
--- a/devel/libntlm/buildlink3.mk
+++ b/devel/libntlm/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBNTLM_BUILDLINK3_MK:=	${LIBNTLM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libntlm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libntlm
-.endif
+.if !defined(LIBNTLM_BUILDLINK3_MK)
+LIBNTLM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibntlm}
-BUILDLINK_PACKAGES+=	libntlm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libntlm
-
-.if !empty(LIBNTLM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libntlm+=	libntlm>=0.3.2
 BUILDLINK_ABI_DEPENDS.libntlm+=	libntlm>=0.3.6nb1
 BUILDLINK_PKGSRCDIR.libntlm?=	../../devel/libntlm
-.endif	# LIBNTLM_BUILDLINK3_MK
+.endif # LIBNTLM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libntlm
diff --git a/devel/liboil/buildlink3.mk b/devel/liboil/buildlink3.mk
index b91ad9c15e0..14f507d8e74 100644
--- a/devel/liboil/buildlink3.mk
+++ b/devel/liboil/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBOIL_BUILDLINK3_MK:=	${LIBOIL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	liboil
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	liboil
-.endif
+.if !defined(LIBOIL_BUILDLINK3_MK)
+LIBOIL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliboil}
-BUILDLINK_PACKAGES+=	liboil
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liboil
-
-.if !empty(LIBOIL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.liboil+=	liboil>=0.3.6
 BUILDLINK_PKGSRCDIR.liboil?=	../../devel/liboil
-.endif	# LIBOIL_BUILDLINK3_MK
+.endif # LIBOIL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-liboil
diff --git a/devel/liboop/buildlink3.mk b/devel/liboop/buildlink3.mk
index e8e52fbd782..59b3669d8ba 100644
--- a/devel/liboop/buildlink3.mk
+++ b/devel/liboop/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBOOP_BUILDLINK3_MK:=	${LIBOOP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	liboop
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	liboop
-.endif
+.if !defined(LIBOOP_BUILDLINK3_MK)
+LIBOOP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliboop}
-BUILDLINK_PACKAGES+=	liboop
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liboop
-
-.if !empty(LIBOOP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.liboop+=	liboop>=0.9
 BUILDLINK_ABI_DEPENDS.liboop+=	liboop>=1.0nb1
 BUILDLINK_PKGSRCDIR.liboop?=	../../devel/liboop
-.endif	# LIBOOP_BUILDLINK3_MK
+.endif # LIBOOP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-liboop
diff --git a/devel/libosip/buildlink3.mk b/devel/libosip/buildlink3.mk
index 31b9aac9a9f..cdf123298aa 100644
--- a/devel/libosip/buildlink3.mk
+++ b/devel/libosip/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2008/11/11 22:02:42 schwarz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBOSIP2_BUILDLINK3_MK:=	${LIBOSIP2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libosip2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libosip2
-.endif
+.if !defined(LIBOSIP2_BUILDLINK3_MK)
+LIBOSIP2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibosip2}
-BUILDLINK_PACKAGES+=	libosip2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libosip2
-
-.if !empty(LIBOSIP2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libosip2+=	libosip2>=2.2.0
 BUILDLINK_ABI_DEPENDS.libosip2+=	libosip2>=3.2.0
 BUILDLINK_PKGSRCDIR.libosip2?=	../../devel/libosip
-.endif	# LIBOSIP2_BUILDLINK3_MK
+.endif # LIBOSIP2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libosip2
diff --git a/devel/libowfat/buildlink3.mk b/devel/libowfat/buildlink3.mk
index 02acf9226fd..342b7f5016e 100644
--- a/devel/libowfat/buildlink3.mk
+++ b/devel/libowfat/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/06 23:48:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBOWFAT_BUILDLINK3_MK:=	${LIBOWFAT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libowfat
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libowfat
-.endif
+.if !defined(LIBOWFAT_BUILDLINK3_MK)
+LIBOWFAT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibowfat}
-BUILDLINK_PACKAGES+=	libowfat
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libowfat
-
-.if ${LIBOWFAT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libowfat+=	libowfat>=0.26
 BUILDLINK_PKGSRCDIR.libowfat?=		../../devel/libowfat
 BUILDLINK_DEPMETHOD.libowfat?=		build
-.endif	# LIBOWFAT_BUILDLINK3_MK
+.endif # LIBOWFAT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libowfat
diff --git a/devel/libportlib/buildlink3.mk b/devel/libportlib/buildlink3.mk
index 6075ed16115..e34074aad52 100644
--- a/devel/libportlib/buildlink3.mk
+++ b/devel/libportlib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBPORTLIB_BUILDLINK3_MK:=	${LIBPORTLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libportlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libportlib
-.endif
+.if !defined(LIBPORTLIB_BUILDLINK3_MK)
+LIBPORTLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibportlib}
-BUILDLINK_PACKAGES+=	libportlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libportlib
-
-.if !empty(LIBPORTLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libportlib+=	libportlib>=1.01
 BUILDLINK_PKGSRCDIR.libportlib?=	../../devel/libportlib
 BUILDLINK_DEPMETHOD.libportlib?=	build
-.endif	# LIBPORTLIB_BUILDLINK3_MK
+.endif # LIBPORTLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libportlib
diff --git a/devel/libproplist/buildlink3.mk b/devel/libproplist/buildlink3.mk
index d7ec63d44b8..0696aa27191 100644
--- a/devel/libproplist/buildlink3.mk
+++ b/devel/libproplist/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBPROPLIST_BUILDLINK3_MK:=	${LIBPROPLIST_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libproplist
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libproplist
-.endif
+.if !defined(LIBPROPLIST_BUILDLINK3_MK)
+LIBPROPLIST_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibproplist}
-BUILDLINK_PACKAGES+=	libproplist
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libproplist
-
-.if !empty(LIBPROPLIST_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libproplist+=		libproplist>=0.10.1
 BUILDLINK_ABI_DEPENDS.libproplist+=	libproplist>=0.10.1nb1
 BUILDLINK_PKGSRCDIR.libproplist?=	../../devel/libproplist
-.endif	# LIBPROPLIST_BUILDLINK3_MK
+.endif # LIBPROPLIST_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libproplist
diff --git a/devel/librfuncs/buildlink3.mk b/devel/librfuncs/buildlink3.mk
index b43aa779366..66c03cce859 100644
--- a/devel/librfuncs/buildlink3.mk
+++ b/devel/librfuncs/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/02/15 14:24:24 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBRFUNCS_BUILDLINK3_MK:=	${LIBRFUNCS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	librfuncs
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	librfuncs
-.endif
+.if !defined(LIBRFUNCS_BUILDLINK3_MK)
+LIBRFUNCS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrfuncs}
-BUILDLINK_PACKAGES+=	librfuncs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librfuncs
-
-.if !empty(LIBRFUNCS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.librfuncs+=	librfuncs>=1.0.4
 BUILDLINK_PKGSRCDIR.librfuncs?=	../../devel/librfuncs
 BUILDLINK_LDFLAGS.librfuncs+=	-lrfuncs
-.endif	# LIBRFUNCS_BUILDLINK3_MK
+.endif # LIBRFUNCS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-librfuncs
diff --git a/devel/librlog/buildlink3.mk b/devel/librlog/buildlink3.mk
index 37b303dc08c..3da30caed71 100644
--- a/devel/librlog/buildlink3.mk
+++ b/devel/librlog/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/18 14:18:18 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:21 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBRLOG_BUILDLINK3_MK:=	${LIBRLOG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	librlog
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	librlog
-.endif
+.if !defined(LIBRLOG_BUILDLINK3_MK)
+LIBRLOG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrlog}
-BUILDLINK_PACKAGES+=	librlog
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librlog
-
-.if ${LIBRLOG_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.librlog+=	librlog>=1.3.7
 BUILDLINK_PKGSRCDIR.librlog?=	../../devel/librlog
-.endif	# LIBRLOG_BUILDLINK3_MK
+.endif # LIBRLOG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-librlog
diff --git a/devel/librsync/buildlink3.mk b/devel/librsync/buildlink3.mk
index 94400a1a11b..31b677366b0 100644
--- a/devel/librsync/buildlink3.mk
+++ b/devel/librsync/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBRSYNC_BUILDLINK3_MK:=	${LIBRSYNC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	librsync
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	librsync
-.endif
+.if !defined(LIBRSYNC_BUILDLINK3_MK)
+LIBRSYNC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsync}
-BUILDLINK_PACKAGES+=	librsync
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librsync
-
-.if !empty(LIBRSYNC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6nb2
 BUILDLINK_ABI_DEPENDS.librsync+=	librsync>=0.9.7nb1
 BUILDLINK_PKGSRCDIR.librsync?=	../../devel/librsync
-.endif	# LIBRSYNC_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.endif # LIBRSYNC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-librsync
diff --git a/devel/librxspencer/buildlink3.mk b/devel/librxspencer/buildlink3.mk
index 3673f40acdd..99810645141 100644
--- a/devel/librxspencer/buildlink3.mk
+++ b/devel/librxspencer/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/21 21:06:12 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBRXSPENCER_BUILDLINK3_MK:=	${LIBRXSPENCER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	librxspencer
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	librxspencer
-.endif
+.if !defined(LIBRXSPENCER_BUILDLINK3_MK)
+LIBRXSPENCER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrxspencer}
-BUILDLINK_PACKAGES+=	librxspencer
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librxspencer
-
-.if !empty(LIBRXSPENCER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.librxspencer+=	librxspencer>=3.8.3
 BUILDLINK_PKGSRCDIR.librxspencer?=	../../devel/librxspencer
 BUILDLINK_INCDIRS.librxspencer+=	include/rxspencer
-.endif	# LIBRXSPENCER_BUILDLINK3_MK
+.endif # LIBRXSPENCER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-librxspencer
diff --git a/devel/libscsi/buildlink3.mk b/devel/libscsi/buildlink3.mk
index 85d9778e03a..eb0bf005062 100644
--- a/devel/libscsi/buildlink3.mk
+++ b/devel/libscsi/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:22 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBSCSI_BUILDLINK3_MK:=	${LIBSCSI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libscsi
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libscsi
-.endif
+.if !defined(LIBSCSI_BUILDLINK3_MK)
+LIBSCSI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibscsi}
-BUILDLINK_PACKAGES+=	libscsi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libscsi
-
-.if !empty(LIBSCSI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libscsi+=	libscsi>=1.6
 BUILDLINK_PKGSRCDIR.libscsi?=	../../devel/libscsi
 BUILDLINK_DEPMETHOD.libscsi?=	build
-.endif	# LIBSCSI_BUILDLINK3_MK
+.endif # LIBSCSI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libscsi
diff --git a/devel/libsexy/buildlink3.mk b/devel/libsexy/buildlink3.mk
index 46683e67d25..09276071f2d 100644
--- a/devel/libsexy/buildlink3.mk
+++ b/devel/libsexy/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:22 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBSEXY_BUILDLINK3_MK:=	${LIBSEXY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsexy
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libsexy
-.endif
+.if !defined(LIBSEXY_BUILDLINK3_MK)
+LIBSEXY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsexy}
-BUILDLINK_PACKAGES+=	libsexy
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsexy
-
-.if !empty(LIBSEXY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsexy+=	libsexy>=0.1.8
 BUILDLINK_ABI_DEPENDS.libsexy?=	libsexy>=0.1.8nb1
 BUILDLINK_PKGSRCDIR.libsexy?=	../../devel/libsexy
-.endif	# LIBSEXY_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBSEXY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsexy
diff --git a/devel/libsexymm/buildlink3.mk b/devel/libsexymm/buildlink3.mk
index 562b546fe1c..463fe935af6 100644
--- a/devel/libsexymm/buildlink3.mk
+++ b/devel/libsexymm/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/07/17 19:10:48 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSEXYMM_BUILDLINK3_MK:=	${LIBSEXYMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsexymm
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libsexymm
-.endif
+.if !defined(LIBSEXYMM_BUILDLINK3_MK)
+LIBSEXYMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsexymm}
-BUILDLINK_PACKAGES+=	libsexymm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsexymm
-
-.if ${LIBSEXYMM_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libsexymm+=	libsexymm>=0.1.9
 BUILDLINK_PKGSRCDIR.libsexymm?=	../../devel/libsexymm
-.endif	# LIBSEXYMM_BUILDLINK3_MK
 
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../devel/libsexy/buildlink3.mk"
+.endif # LIBSEXYMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsexymm
diff --git a/devel/libsigc++/buildlink3.mk b/devel/libsigc++/buildlink3.mk
index 0d8f0371e79..96d79fa0233 100644
--- a/devel/libsigc++/buildlink3.mk
+++ b/devel/libsigc++/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/09/21 12:59:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSIGCPP_BUILDLINK3_MK:=	${LIBSIGCPP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsigcpp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libsigcpp
-.endif
+.if !defined(LIBSIGCPP_BUILDLINK3_MK)
+LIBSIGCPP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsigcpp}
-BUILDLINK_PACKAGES+=	libsigcpp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigcpp
-
-.if !empty(LIBSIGCPP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsigcpp+=	libsigc++>=2.0.3
 BUILDLINK_ABI_DEPENDS.libsigcpp+=	libsigc++>=2.0.17nb1
 BUILDLINK_PKGSRCDIR.libsigcpp?=		../../devel/libsigc++
-.endif	# LIBSIGCPP_BUILDLINK3_MK
+.endif # LIBSIGCPP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsigcpp
diff --git a/devel/libsigc++1/buildlink3.mk b/devel/libsigc++1/buildlink3.mk
index 570810a2946..60f7c0d8b68 100644
--- a/devel/libsigc++1/buildlink3.mk
+++ b/devel/libsigc++1/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/09/21 12:59:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSIGCPP1_BUILDLINK3_MK:=	${LIBSIGCPP1_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsigcpp1
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libsigcpp1
-.endif
+.if !defined(LIBSIGCPP1_BUILDLINK3_MK)
+LIBSIGCPP1_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsigcpp1}
-BUILDLINK_PACKAGES+=	libsigcpp1
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigcpp1
-
-.if !empty(LIBSIGCPP1_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsigcpp1+=	libsigc++1>=1.2.3nb1
 BUILDLINK_ABI_DEPENDS.libsigcpp1+=	libsigc++1>=1.2.7nb1
 BUILDLINK_PKGSRCDIR.libsigcpp1?=	../../devel/libsigc++1
-.endif	# LIBSIGCPP1_BUILDLINK3_MK
+.endif # LIBSIGCPP1_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsigcpp1
diff --git a/devel/libsigsegv/buildlink3.mk b/devel/libsigsegv/buildlink3.mk
index d8d06cf96a2..42626213f18 100644
--- a/devel/libsigsegv/buildlink3.mk
+++ b/devel/libsigsegv/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/12/29 13:54:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSIGSEGV_BUILDLINK3_MK:=	${LIBSIGSEGV_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsigsegv
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libsigsegv
-.endif
+.if !defined(LIBSIGSEGV_BUILDLINK3_MK)
+LIBSIGSEGV_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsigsegv}
-BUILDLINK_PACKAGES+=	libsigsegv
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigsegv
-
-.if !empty(LIBSIGSEGV_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsigsegv+=	libsigsegv>=2.2
 BUILDLINK_PKGSRCDIR.libsigsegv?=	../../devel/libsigsegv
-.endif	# LIBSIGSEGV_BUILDLINK3_MK
+.endif # LIBSIGSEGV_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsigsegv
diff --git a/devel/libsigsegv25/buildlink3.mk b/devel/libsigsegv25/buildlink3.mk
index 3975fb722d3..95c62a84c15 100644
--- a/devel/libsigsegv25/buildlink3.mk
+++ b/devel/libsigsegv25/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/12 22:11:28 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSIGSEGV25_BUILDLINK3_MK:=	${LIBSIGSEGV25_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsigsegv25
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libsigsegv25
-.endif
+.if !defined(LIBSIGSEGV25_BUILDLINK3_MK)
+LIBSIGSEGV25_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsigsegv25}
-BUILDLINK_PACKAGES+=	libsigsegv25
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigsegv25
-
-.if !empty(LIBSIGSEGV25_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsigsegv25+=	libsigsegv25>=2.2
 BUILDLINK_PKGSRCDIR.libsigsegv25?=	../../devel/libsigsegv25
-.endif	# LIBSIGSEGV25_BUILDLINK3_MK
+.endif # LIBSIGSEGV25_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsigsegv25
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index 1ebfeb9944c..835fa12495c 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/02/25 12:38:36 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSLANG_BUILDLINK3_MK:=	${LIBSLANG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libslang
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libslang
-.endif
+.if !defined(LIBSLANG_BUILDLINK3_MK)
+LIBSLANG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibslang}
-BUILDLINK_PACKAGES+=	libslang
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang
-
-.if !empty(LIBSLANG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libslang+=	libslang>=1.4.9nb1
 BUILDLINK_ABI_DEPENDS.libslang+=	libslang>=1.4.9nb4
 BUILDLINK_PKGSRCDIR.libslang?=	../../devel/libslang
-.endif	# LIBSLANG_BUILDLINK3_MK
+.endif # LIBSLANG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libslang
diff --git a/devel/libslang2/buildlink3.mk b/devel/libslang2/buildlink3.mk
index 4eceb35f4f6..7d0cf1485c7 100644
--- a/devel/libslang2/buildlink3.mk
+++ b/devel/libslang2/buildlink3.mk
@@ -1,24 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:23 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSLANG2_BUILDLINK3_MK:=	${LIBSLANG2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libslang2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libslang2
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibslang2}
-BUILDLINK_PACKAGES+=	libslang2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang2
+.if !defined(LIBSLANG2_BUILDLINK3_MK)
+LIBSLANG2_BUILDLINK3_MK:=
 
-.if ${LIBSLANG2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libslang2+=	libslang2>=2.1.3
 BUILDLINK_PKGSRCDIR.libslang2?=	../../devel/libslang2
 BUILDLINK_FNAME_TRANSFORM.libslang2+=	-e 's|include/slang2/|include/|g'
 BUILDLINK_TRANSFORM+=		l:slang:slang2
 pkgbase:=	libslang2
 .  include "../../mk/pkg-build-options.mk"
-.endif	# LIBSLANG2_BUILDLINK3_MK
 
 .if !empty(PKG_BUILD_OPTIONS.libslang2:Mpng)
 .  include "../../graphics/png/buildlink3.mk"
@@ -32,5 +24,6 @@ pkgbase:=	libslang2
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # LIBSLANG2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libslang2
diff --git a/devel/libsmi/buildlink3.mk b/devel/libsmi/buildlink3.mk
index 185f3fd9a37..65d986902e7 100644
--- a/devel/libsmi/buildlink3.mk
+++ b/devel/libsmi/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/06/05 19:29:46 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:23 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBSMI_BUILDLINK3_MK:=	${LIBSMI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsmi
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libsmi
-.endif
+.if !defined(LIBSMI_BUILDLINK3_MK)
+LIBSMI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsmi}
-BUILDLINK_PACKAGES+=	libsmi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsmi
-
-.if ${LIBSMI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libsmi+=	libsmi>=0.4.5nb1
 BUILDLINK_PKGSRCDIR.libsmi?=	../../devel/libsmi
-.endif	# LIBSMI_BUILDLINK3_MK
+.endif # LIBSMI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsmi
diff --git a/devel/libstatgrab/buildlink3.mk b/devel/libstatgrab/buildlink3.mk
index c8182b234b5..6b25a904879 100644
--- a/devel/libstatgrab/buildlink3.mk
+++ b/devel/libstatgrab/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:23 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSTATGRAB_BUILDLINK3_MK:=	${LIBSTATGRAB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libstatgrab
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libstatgrab
-.endif
+.if !defined(LIBSTATGRAB_BUILDLINK3_MK)
+LIBSTATGRAB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibstatgrab}
-BUILDLINK_PACKAGES+=	libstatgrab
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libstatgrab
-
-.if !empty(LIBSTATGRAB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libstatgrab+=	libstatgrab>=0.10
 BUILDLINK_ABI_DEPENDS.libstatgrab+=	libstatgrab>=0.10.3nb1
 BUILDLINK_PKGSRCDIR.libstatgrab?=	../../devel/libstatgrab
-.endif	# LIBSTATGRAB_BUILDLINK3_MK
+.endif # LIBSTATGRAB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libstatgrab
diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk
index 9bdab64a5d5..d27ace99915 100644
--- a/devel/libstroke/buildlink3.mk
+++ b/devel/libstroke/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:23 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSTROKE_BUILDLINK3_MK:=	${LIBSTROKE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libstroke
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libstroke
-.endif
+.if !defined(LIBSTROKE_BUILDLINK3_MK)
+LIBSTROKE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibstroke}
-BUILDLINK_PACKAGES+=	libstroke
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libstroke
-
-.if !empty(LIBSTROKE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libstroke+=	libstroke>=0.5.1
 BUILDLINK_ABI_DEPENDS.libstroke+=	libstroke>=0.5.1nb2
 BUILDLINK_PKGSRCDIR.libstroke?=	../../devel/libstroke
-.endif	# LIBSTROKE_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
+.endif # LIBSTROKE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libstroke
diff --git a/devel/libtai/buildlink3.mk b/devel/libtai/buildlink3.mk
index d5a6767b015..8f2a236a2b1 100644
--- a/devel/libtai/buildlink3.mk
+++ b/devel/libtai/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/07/30 10:36:27 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:23 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBTAI_BUILDLINK3_MK:=	${LIBTAI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtai
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libtai
-.endif
+.if !defined(LIBTAI_BUILDLINK3_MK)
+LIBTAI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtai}
-BUILDLINK_PACKAGES+=	libtai
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtai
-
-.if ${LIBTAI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libtai+=	libtai>=0.60nb1
 BUILDLINK_PKGSRCDIR.libtai?=	../../devel/libtai
 BUILDLINK_DEPMETHOD.libtai?=	build
-.endif	# LIBTAI_BUILDLINK3_MK
+.endif # LIBTAI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtai
diff --git a/devel/libtar/buildlink3.mk b/devel/libtar/buildlink3.mk
index aeef02e96bc..22b14778d37 100644
--- a/devel/libtar/buildlink3.mk
+++ b/devel/libtar/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:23 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBTAR_BUILDLINK3_MK:=	${LIBTAR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtar
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libtar
-.endif
+.if !defined(LIBTAR_BUILDLINK3_MK)
+LIBTAR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtar}
-BUILDLINK_PACKAGES+=	libtar
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtar
-
-.if !empty(LIBTAR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtar+=	libtar>=1.2.11
 BUILDLINK_PKGSRCDIR.libtar?=	../../devel/libtar
-.endif	# LIBTAR_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
+.endif # LIBTAR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtar
diff --git a/devel/libtecla/buildlink3.mk b/devel/libtecla/buildlink3.mk
index ce732b0612f..dff3b653194 100644
--- a/devel/libtecla/buildlink3.mk
+++ b/devel/libtecla/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:23 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBTECLA_BUILDLINK3_MK:=	${LIBTECLA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtecla
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libtecla
-.endif
+.if !defined(LIBTECLA_BUILDLINK3_MK)
+LIBTECLA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtecla}
-BUILDLINK_PACKAGES+=	libtecla
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtecla
-
-.if !empty(LIBTECLA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtecla+=	libtecla>=1.5.0
 BUILDLINK_ABI_DEPENDS.libtecla?=	libtecla>=1.6.1nb1
 BUILDLINK_PKGSRCDIR.libtecla?=	../../devel/libtecla
-.endif	# LIBTECLA_BUILDLINK3_MK
+.endif # LIBTECLA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtecla
diff --git a/devel/libthai/buildlink3.mk b/devel/libthai/buildlink3.mk
index da5bea668f5..c19c7d8149d 100644
--- a/devel/libthai/buildlink3.mk
+++ b/devel/libthai/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/11 02:20:44 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:23 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBTHAI_BUILDLINK3_MK:=	${LIBTHAI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libthai
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libthai
-.endif
+.if !defined(LIBTHAI_BUILDLINK3_MK)
+LIBTHAI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibthai}
-BUILDLINK_PACKAGES+=	libthai
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libthai
-
-.if ${LIBTHAI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libthai+=	libthai>=0.1.9
 BUILDLINK_PKGSRCDIR.libthai?=	../../devel/libthai
-.endif	# LIBTHAI_BUILDLINK3_MK
 
 .include "../../devel/libdatrie/buildlink3.mk"
+.endif # LIBTHAI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libthai
diff --git a/devel/libts/buildlink3.mk b/devel/libts/buildlink3.mk
index 0f0282d4653..1643dc33e16 100644
--- a/devel/libts/buildlink3.mk
+++ b/devel/libts/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:23 joerg Exp $
 
 BUILDLINK_DEPMETHOD.libts?=	build
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBTS_BUILDLINK3_MK:=	${LIBTS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libts
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libts
-.endif
+.if !defined(LIBTS_BUILDLINK3_MK)
+LIBTS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibts}
-BUILDLINK_PACKAGES+=	libts
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libts
-
-.if !empty(LIBTS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libts+=	libts>=1.08
 BUILDLINK_PKGSRCDIR.libts?=	../../devel/libts
-.endif	# LIBTS_BUILDLINK3_MK
+.endif # LIBTS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libts
diff --git a/devel/libusb/buildlink3.mk b/devel/libusb/buildlink3.mk
index 1ae02f3a66c..3d2758c0565 100644
--- a/devel/libusb/buildlink3.mk
+++ b/devel/libusb/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:23 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBUSB_BUILDLINK3_MK:=	${LIBUSB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libusb
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libusb
-.endif
+.if !defined(LIBUSB_BUILDLINK3_MK)
+LIBUSB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibusb}
-BUILDLINK_PACKAGES+=	libusb
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libusb
-
-.if !empty(LIBUSB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libusb+=	libusb>=0.1.7
 BUILDLINK_ABI_DEPENDS.libusb+=	libusb>=0.1.8nb2
 BUILDLINK_PKGSRCDIR.libusb?=	../../devel/libusb
-.endif	# LIBUSB_BUILDLINK3_MK
+.endif # LIBUSB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libusb
diff --git a/devel/libvolume_id/buildlink3.mk b/devel/libvolume_id/buildlink3.mk
index 14ea7195842..66ecfb9e7e0 100644
--- a/devel/libvolume_id/buildlink3.mk
+++ b/devel/libvolume_id/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 13:48:23 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:24 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBVOLUME_ID_BUILDLINK3_MK:=	${LIBVOLUME_ID_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libvolume_id
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libvolume_id
-.endif
+.if !defined(LIBVOLUME_ID_BUILDLINK3_MK)
+LIBVOLUME_ID_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvolume_id}
-BUILDLINK_PACKAGES+=	libvolume_id
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvolume_id
-
-.if ${LIBVOLUME_ID_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libvolume_id+=	libvolume_id>=0.81.0
 BUILDLINK_PKGSRCDIR.libvolume_id?=	../../devel/libvolume_id
-.endif	# LIBVOLUME_ID_BUILDLINK3_MK
+.endif # LIBVOLUME_ID_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libvolume_id
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index c8cef2d6af3..08eab8d1f3d 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/11/05 11:36:17 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:24 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBWNCK_BUILDLINK3_MK:=	${LIBWNCK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libwnck
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libwnck
-.endif
+.if !defined(LIBWNCK_BUILDLINK3_MK)
+LIBWNCK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwnck}
-BUILDLINK_PACKAGES+=	libwnck
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwnck
-
-.if !empty(LIBWNCK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libwnck+=	libwnck>=2.20.0
 BUILDLINK_ABI_DEPENDS.libwnck?=	libwnck>=2.20.0
 BUILDLINK_PKGSRCDIR.libwnck?=	../../devel/libwnck
-.endif	# LIBWNCK_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
+.endif # LIBWNCK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libwnck
diff --git a/devel/lwp/buildlink3.mk b/devel/lwp/buildlink3.mk
index ee2340f1bd1..58605f5ddaf 100644
--- a/devel/lwp/buildlink3.mk
+++ b/devel/lwp/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:24 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LWP_BUILDLINK3_MK:=	${LWP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	lwp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	lwp
-.endif
+.if !defined(LWP_BUILDLINK3_MK)
+LWP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlwp}
-BUILDLINK_PACKAGES+=	lwp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lwp
-
-.if !empty(LWP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lwp+=	lwp>=1.6
 BUILDLINK_ABI_DEPENDS.lwp+=	lwp>=1.10nb1
 BUILDLINK_PKGSRCDIR.lwp?=	../../devel/lwp
-.endif	# LWP_BUILDLINK3_MK
+.endif # LWP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-lwp
diff --git a/devel/m17n-lib/buildlink3.mk b/devel/m17n-lib/buildlink3.mk
index 4c9b3f655cd..52e4a99e600 100644
--- a/devel/m17n-lib/buildlink3.mk
+++ b/devel/m17n-lib/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/03/09 11:17:27 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:24 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-M17N_LIB_BUILDLINK3_MK:=	${M17N_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	m17n-lib
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	m17n-lib
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nm17n-lib}
-BUILDLINK_PACKAGES+=	m17n-lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}m17n-lib
+.if !defined(M17N_LIB_BUILDLINK3_MK)
+M17N_LIB_BUILDLINK3_MK:=
 
-.if ${M17N_LIB_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.m17n-lib+=	m17n-lib>=1.5.1
 BUILDLINK_PKGSRCDIR.m17n-lib?=	../../devel/m17n-lib
-.endif	# M17N_LIB_BUILDLINK3_MK
 
 pkgbase := m17n-lib
 .include "../../mk/pkg-build-options.mk"
@@ -44,5 +36,6 @@ pkgbase := m17n-lib
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../misc/m17n-db/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # M17N_LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-m17n-lib
diff --git a/devel/mell/buildlink3.mk b/devel/mell/buildlink3.mk
index 69ef11beb9b..767af3c1701 100644
--- a/devel/mell/buildlink3.mk
+++ b/devel/mell/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MELL_BUILDLINK3_MK:=	${MELL_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:24 joerg Exp $
 
 .include "../../editors/emacs/modules.mk"
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	mell
-.endif
+BUILDLINK_TREE+=	mell
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmell}
-BUILDLINK_PACKAGES+=	mell
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mell
+.if !defined(MELL_BUILDLINK3_MK)
+MELL_BUILDLINK3_MK:=
 
-.if ${MELL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mell+=	${EMACS_PKGNAME_PREFIX}mell>=1.0.0
 BUILDLINK_PKGSRCDIR.mell?=	../../devel/mell
-.endif	# MELL_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.mell= ${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # MELL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mell
diff --git a/devel/mono-addins/buildlink3.mk b/devel/mono-addins/buildlink3.mk
index f0d67c60425..01f9a0d3f92 100644
--- a/devel/mono-addins/buildlink3.mk
+++ b/devel/mono-addins/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/03/17 22:54:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:24 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MONO_ADDINS_BUILDLINK3_MK:=	${MONO_ADDINS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mono-addins
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	mono-addins
-.endif
+.if !defined(MONO_ADDINS_BUILDLINK3_MK)
+MONO_ADDINS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmono-addins}
-BUILDLINK_PACKAGES+=	mono-addins
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono-addins
-
-.if ${MONO_ADDINS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mono-addins+=	mono-addins>=0.3
 BUILDLINK_PKGSRCDIR.mono-addins?=	../../devel/mono-addins
-.endif	# MONO_ADDINS_BUILDLINK3_MK
 
 .include "../../lang/mono/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
+.endif # MONO_ADDINS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mono-addins
diff --git a/devel/mono-tools/buildlink3.mk b/devel/mono-tools/buildlink3.mk
index f14711dffcd..a25fe2e2305 100644
--- a/devel/mono-tools/buildlink3.mk
+++ b/devel/mono-tools/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/07 13:26:57 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:24 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MONO_TOOLS_BUILDLINK3_MK:=	${MONO_TOOLS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mono-tools
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	mono-tools
-.endif
+.if !defined(MONO_TOOLS_BUILDLINK3_MK)
+MONO_TOOLS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmono-tools}
-BUILDLINK_PACKAGES+=	mono-tools
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono-tools
-
-.if ${MONO_TOOLS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mono-tools+=	mono-tools>=2.0
 BUILDLINK_PKGSRCDIR.mono-tools?=	../../devel/mono-tools
-.endif	# MONO_TOOLS_BUILDLINK3_MK
+.endif # MONO_TOOLS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mono-tools
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index ba66ad0c8c6..3bcdd5a0006 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.32 2008/02/27 21:32:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2009/03/20 19:24:24 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ncurses
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ncurses
-.endif
+.if !defined(NCURSES_BUILDLINK3_MK)
+NCURSES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nncurses}
-BUILDLINK_PACKAGES+=	ncurses
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ncurses
-
-.if !empty(NCURSES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ncurses+=	ncurses>=5.3nb1
 BUILDLINK_ABI_DEPENDS.ncurses+=	ncurses>=5.4nb1
 BUILDLINK_PKGSRCDIR.ncurses?=	../../devel/ncurses
@@ -35,7 +28,6 @@ buildlink-ncurses-curses-h:
 		${MKDIR} `${DIRNAME} "$$dest"`;				\
 		${LN} -s "$$src" "$$dest";				\
 	fi
+.endif # NCURSES_BUILDLINK3_MK
 
-.endif	# NCURSES_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ncurses
diff --git a/devel/ncursesw/buildlink3.mk b/devel/ncursesw/buildlink3.mk
index 9e9b0338b69..43de46e631a 100644
--- a/devel/ncursesw/buildlink3.mk
+++ b/devel/ncursesw/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/02/29 19:23:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:24 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NCURSESW_BUILDLINK3_MK:=${NCURSESW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ncursesw
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ncursesw
-.endif
+.if !defined(NCURSESW_BUILDLINK3_MK)
+NCURSESW_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nncursesw}
-BUILDLINK_PACKAGES+=	ncursesw
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ncursesw
-
-.if !empty(NCURSESW_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ncursesw+=	ncursesw>=5.5
 BUILDLINK_ABI_DEPENDS.ncursesw+=	ncursesw>=5.5
 BUILDLINK_PKGSRCDIR.ncursesw?=		../../devel/ncursesw
 
 BUILDLINK_LIBNAME.ncursesw=	ncursesw
 BUILDLINK_LDADD.ncursesw=	${BUILDLINK_LIBNAME.ncursesw:S/^/-l/:S/^-l$//}
-.endif	# NCURSESW_BUILDLINK3_MK
 
 .include "../../devel/ncurses/buildlink3.mk"
+.endif # NCURSESW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ncursesw
diff --git a/devel/netcdf/buildlink3.mk b/devel/netcdf/buildlink3.mk
index abf97c90b8e..7ca854e06fa 100644
--- a/devel/netcdf/buildlink3.mk
+++ b/devel/netcdf/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:24 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NETCDF_BUILDLINK3_MK:=	${NETCDF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	netcdf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	netcdf
-.endif
+.if !defined(NETCDF_BUILDLINK3_MK)
+NETCDF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetcdf}
-BUILDLINK_PACKAGES+=	netcdf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netcdf
-
-.if !empty(NETCDF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.netcdf+=	netcdf>=3.5
 BUILDLINK_ABI_DEPENDS.netcdf+=	netcdf>=3.5.0nb2
 BUILDLINK_PKGSRCDIR.netcdf?=	../../devel/netcdf
-.endif	# NETCDF_BUILDLINK3_MK
+.endif # NETCDF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-netcdf
diff --git a/devel/newt/buildlink3.mk b/devel/newt/buildlink3.mk
index 14c3c3aa7b9..9a9eacb84d5 100644
--- a/devel/newt/buildlink3.mk
+++ b/devel/newt/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:25 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NEWT_BUILDLINK3_MK:=	${NEWT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	newt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	newt
-.endif
+.if !defined(NEWT_BUILDLINK3_MK)
+NEWT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnewt}
-BUILDLINK_PACKAGES+=	newt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}newt
-
-.if !empty(NEWT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.newt+=	newt>=0.51.6
 BUILDLINK_ABI_DEPENDS.newt?=	newt>=0.51.6nb2
 BUILDLINK_PKGSRCDIR.newt?=	../../devel/newt
-.endif	# NEWT_BUILDLINK3_MK
 
 .include "../../devel/libslang/buildlink3.mk"
+.endif # NEWT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-newt
diff --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk
index 7d3835f7dbe..7f04497850c 100644
--- a/devel/nspr/buildlink3.mk
+++ b/devel/nspr/buildlink3.mk
@@ -1,17 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/09/25 04:18:25 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:25 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NSPR_BUILDLINK3_MK:=	${NSPR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	nspr
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	nspr
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnspr}
-BUILDLINK_PACKAGES+=	nspr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nspr
-
-.if ${NSPR_BUILDLINK3_MK} == "+"
+.if !defined(NSPR_BUILDLINK3_MK)
+NSPR_BUILDLINK3_MK:=
 
 .  include "../../mk/bsd.fast.prefs.mk"
 
@@ -29,7 +21,6 @@ BUILDLINK_FILES.nspr+=          include/nspr/*
 BUILDLINK_INCDIRS.nspr+=        include/nspr
 BUILDLINK_LIBDIRS.nspr+=        lib/nspr
 BUILDLINK_RPATHDIRS.nspr+=      lib/nspr
+.endif # NSPR_BUILDLINK3_MK
 
-.endif	# NSPR_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-nspr
diff --git a/devel/nss/buildlink3.mk b/devel/nss/buildlink3.mk
index 6977353f3c7..3b8b52c79c2 100644
--- a/devel/nss/buildlink3.mk
+++ b/devel/nss/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:25 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NSS_BUILDLINK3_MK:=	${NSS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	nss
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	nss
-.endif
+.if !defined(NSS_BUILDLINK3_MK)
+NSS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnss}
-BUILDLINK_PACKAGES+=	nss
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nss
-
-.if !empty(NSS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.nss+=		nss>=3.9.2nb1
 BUILDLINK_ABI_DEPENDS.nss+=	nss>=3.9.2nb4
 BUILDLINK_PKGSRCDIR.nss?=	../../devel/nss
@@ -23,8 +16,7 @@ BUILDLINK_INCDIRS.nss+=		include/nss
 BUILDLINK_LIBDIRS.nss+=		lib/nss
 BUILDLINK_RPATHDIRS.nss+=	lib/nss
 
-.endif	# NSS_BUILDLINK3_MK
-
 .include "../../devel/nspr/buildlink3.mk"
+.endif # NSS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-nss
diff --git a/devel/ode/buildlink3.mk b/devel/ode/buildlink3.mk
index 74ec76956ef..71ed23efb8d 100644
--- a/devel/ode/buildlink3.mk
+++ b/devel/ode/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:25 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ODE_BUILDLINK3_MK:=	${ODE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ode
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ode
-.endif
+.if !defined(ODE_BUILDLINK3_MK)
+ODE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Node}
-BUILDLINK_PACKAGES+=	ode
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ode
-
-.if !empty(ODE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ode+=		ode>=0.5nb2
 BUILDLINK_ABI_DEPENDS.ode?=	ode>=0.5nb2
 BUILDLINK_PKGSRCDIR.ode?=	../../devel/ode
-.endif	# ODE_BUILDLINK3_MK
+.endif # ODE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ode
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index e8b15f2626a..04cc31e3f0b 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:25 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OGRE_BUILDLINK3_MK:=	${OGRE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ogre
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ogre
-.endif
+.if !defined(OGRE_BUILDLINK3_MK)
+OGRE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nogre}
-BUILDLINK_PACKAGES+=	ogre
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ogre
-
-.if !empty(OGRE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ogre+=	ogre>=0.12.1nb1
 BUILDLINK_ABI_DEPENDS.ogre+=	ogre>=0.12.1nb8
 BUILDLINK_PKGSRCDIR.ogre?=	../../devel/ogre
-.endif	# OGRE_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/devIL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.endif # OGRE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ogre
diff --git a/devel/opal/buildlink3.mk b/devel/opal/buildlink3.mk
index e2d45c5ed7b..8ec67d92c5e 100644
--- a/devel/opal/buildlink3.mk
+++ b/devel/opal/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/18 11:58:08 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:25 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPAL_BUILDLINK3_MK:=	${OPAL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	opal
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	opal
-.endif
+.if !defined(OPAL_BUILDLINK3_MK)
+OPAL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopal}
-BUILDLINK_PACKAGES+=	opal
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}opal
-
-.if !empty(OPAL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.opal+=	opal>=3.6.1
 BUILDLINK_ABI_DEPENDS.opal?=	opal>=3.6.1
 BUILDLINK_PKGSRCDIR.opal?=	../../devel/opal
-.endif	# OPAL_BUILDLINK3_MK
 
 .include "../../devel/ptlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # OPAL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-opal
diff --git a/devel/ossp-uuid/buildlink3.mk b/devel/ossp-uuid/buildlink3.mk
index f7c2d8a9e4a..d6064f224da 100644
--- a/devel/ossp-uuid/buildlink3.mk
+++ b/devel/ossp-uuid/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/07/14 00:02:38 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:25 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-OSSP_UUID_BUILDLINK3_MK:=	${OSSP_UUID_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ossp-uuid
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ossp-uuid
-.endif
+.if !defined(OSSP_UUID_BUILDLINK3_MK)
+OSSP_UUID_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nossp-uuid}
-BUILDLINK_PACKAGES+=	ossp-uuid
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ossp-uuid
-
-.if !empty(OSSP_UUID_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ossp-uuid+=	ossp-uuid>=1.6.0
 BUILDLINK_ABI_DEPENDS.ossp-uuid+=	ossp-uuid>=1.6.2
 BUILDLINK_PKGSRCDIR.ossp-uuid?=		../../devel/ossp-uuid
-.endif	# OSSP_UUID_BUILDLINK3_MK
+.endif # OSSP_UUID_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ossp-uuid
diff --git a/devel/p5-B-Hooks-OP-Check/buildlink3.mk b/devel/p5-B-Hooks-OP-Check/buildlink3.mk
index 505522805ea..830082b701c 100644
--- a/devel/p5-B-Hooks-OP-Check/buildlink3.mk
+++ b/devel/p5-B-Hooks-OP-Check/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/11/02 23:30:34 he Exp $
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK:=	${P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:25 joerg Exp $
 
 BUILDLINK_DEPMETHOD.p5-B-Hooks-OP-Check?=	build
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	p5-B-Hooks-OP-Check
-.endif
+BUILDLINK_TREE+=	p5-B-Hooks-OP-Check
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-B-Hooks-OP-Check}
-BUILDLINK_PACKAGES+=	p5-B-Hooks-OP-Check
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-B-Hooks-OP-Check
+.if !defined(P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK)
+P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK:=
 
-.if ${P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Check+=	p5-B-Hooks-OP-Check>=0.12nb1
 BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-Check?=	../../devel/p5-B-Hooks-OP-Check
-.endif	# P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK
+.endif # P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-p5-B-Hooks-OP-Check
diff --git a/devel/p5-B-Hooks-OP-PPAddr/buildlink3.mk b/devel/p5-B-Hooks-OP-PPAddr/buildlink3.mk
index 8f3a6400a76..85f53a7f8aa 100644
--- a/devel/p5-B-Hooks-OP-PPAddr/buildlink3.mk
+++ b/devel/p5-B-Hooks-OP-PPAddr/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/19 18:02:22 abs Exp $
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK:=	${P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:25 joerg Exp $
 
 BUILDLINK_DEPMETHOD.p5-B-Hooks-OP-PPAddr?=	build
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	p5-B-Hooks-OP-PPAddr
-.endif
+BUILDLINK_TREE+=	p5-B-Hooks-OP-PPAddr
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-B-Hooks-OP-PPAddr}
-BUILDLINK_PACKAGES+=	p5-B-Hooks-OP-PPAddr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-B-Hooks-OP-PPAddr
+.if !defined(P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK)
+P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK:=
 
-.if ${P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-PPAddr+=	p5-B-Hooks-OP-PPAddr>=0.02
 BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-PPAddr?=	../../devel/p5-B-Hooks-OP-PPAddr
-.endif	# P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK
+.endif # P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-p5-B-Hooks-OP-PPAddr
diff --git a/devel/p5-B-Hooks-Parser/buildlink3.mk b/devel/p5-B-Hooks-Parser/buildlink3.mk
index fa2b3af1cc2..0b2a613b39f 100644
--- a/devel/p5-B-Hooks-Parser/buildlink3.mk
+++ b/devel/p5-B-Hooks-Parser/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/19 18:02:57 abs Exp $
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-P5_B_HOOKS_PARSER_BUILDLINK3_MK:=	${P5_B_HOOKS_PARSER_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:25 joerg Exp $
 
 BUILDLINK_DEPMETHOD.p5-B-Hooks-Parser?=	build
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	p5-B-Hooks-Parser
-.endif
+BUILDLINK_TREE+=	p5-B-Hooks-Parser
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-B-Hooks-Parser}
-BUILDLINK_PACKAGES+=	p5-B-Hooks-Parser
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-B-Hooks-Parser
+.if !defined(P5_B_HOOKS_PARSER_BUILDLINK3_MK)
+P5_B_HOOKS_PARSER_BUILDLINK3_MK:=
 
-.if ${P5_B_HOOKS_PARSER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.p5-B-Hooks-Parser+=	p5-B-Hooks-Parser>=0.08
 BUILDLINK_PKGSRCDIR.p5-B-Hooks-Parser?=	../../devel/p5-B-Hooks-Parser
-.endif	# P5_B_HOOKS_PARSER_BUILDLINK3_MK
+.endif # P5_B_HOOKS_PARSER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-p5-B-Hooks-Parser
diff --git a/devel/p5-glib2/buildlink3.mk b/devel/p5-glib2/buildlink3.mk
index 9298fa24960..6b900e47b0a 100644
--- a/devel/p5-glib2/buildlink3.mk
+++ b/devel/p5-glib2/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:26 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-P5_GLIB2_BUILDLINK3_MK:=	${P5_GLIB2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	p5-glib2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	p5-glib2
-.endif
+.if !defined(P5_GLIB2_BUILDLINK3_MK)
+P5_GLIB2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-glib2}
-BUILDLINK_PACKAGES+=	p5-glib2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-glib2
-
-.if !empty(P5_GLIB2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.p5-glib2+=	p5-glib2>=1.103
 BUILDLINK_ABI_DEPENDS.p5-glib2?=	p5-glib2>=1.103nb1
 BUILDLINK_PKGSRCDIR.p5-glib2?=	../../devel/p5-glib2
-.endif	# P5_GLIB2_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.endif # P5_GLIB2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-p5-glib2
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 13d96a7073e..fc41af569d0 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.21 2007/05/30 08:54:29 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:26 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pango
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pango
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npango}
-BUILDLINK_PACKAGES+=	pango
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pango
+.if !defined(PANGO_BUILDLINK3_MK)
+PANGO_BUILDLINK3_MK:=
 
-.if !empty(PANGO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.6.0
 BUILDLINK_ABI_DEPENDS.pango+=	pango>=1.12.1nb1
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
-.endif	# PANGO_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -32,5 +24,6 @@ pkgbase := pango
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.endif # PANGO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pango
diff --git a/devel/pangomm/buildlink3.mk b/devel/pangomm/buildlink3.mk
index 1a62222dbd9..3892705899d 100644
--- a/devel/pangomm/buildlink3.mk
+++ b/devel/pangomm/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/17 22:10:15 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:26 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PANGOMM_BUILDLINK3_MK:=	${PANGOMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pangomm
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	pangomm
-.endif
+.if !defined(PANGOMM_BUILDLINK3_MK)
+PANGOMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npangomm}
-BUILDLINK_PACKAGES+=	pangomm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pangomm
-
-.if ${PANGOMM_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.pangomm+=	pangomm>=2.24.0
 BUILDLINK_PKGSRCDIR.pangomm?=	../../devel/pangomm
-.endif	# PANGOMM_BUILDLINK3_MK
 
 .include "../../devel/glibmm/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairomm/buildlink3.mk"
+.endif # PANGOMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pangomm
diff --git a/devel/pccts/buildlink3.mk b/devel/pccts/buildlink3.mk
index b830b86c5be..a0994356b7d 100644
--- a/devel/pccts/buildlink3.mk
+++ b/devel/pccts/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:26 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PCCTS_BUILDLINK3_MK:=	${PCCTS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pccts
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pccts
-.endif
+.if !defined(PCCTS_BUILDLINK3_MK)
+PCCTS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npccts}
-BUILDLINK_PACKAGES+=	pccts
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pccts
-
-.if !empty(PCCTS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pccts+=	pccts>=1.33.22
 BUILDLINK_ABI_DEPENDS.pccts?=	pccts>=1.33.22nb1
 BUILDLINK_PKGSRCDIR.pccts?=	../../devel/pccts
 BUILDLINK_DEPMETHOD.pccts?=	build
-.endif	# PCCTS_BUILDLINK3_MK
+.endif # PCCTS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pccts
diff --git a/devel/pcre++/buildlink3.mk b/devel/pcre++/buildlink3.mk
index ac589e0e7a7..a605c2d1bd8 100644
--- a/devel/pcre++/buildlink3.mk
+++ b/devel/pcre++/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.6 2007/12/30 14:34:18 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:26 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PCREXX_BUILDLINK3_MK:=	${PCREXX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pcrexx
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pcrexx
-.endif
+.if !defined(PCREXX_BUILDLINK3_MK)
+PCREXX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npcrexx}
-BUILDLINK_PACKAGES+=	pcrexx
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pcrexx
-
-.if !empty(PCREXX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pcrexx+=	pcre++>=0.9.5
 BUILDLINK_PKGSRCDIR.pcrexx?=	../../devel/pcre++
-.endif	# PCREXX_BUILDLINK3_MK
 
 .include "../../devel/pcre/buildlink3.mk"
+.endif # PCREXX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pcrexx
diff --git a/devel/pcre-ocaml/buildlink3.mk b/devel/pcre-ocaml/buildlink3.mk
index b2ffa267d65..eef4c1840e6 100644
--- a/devel/pcre-ocaml/buildlink3.mk
+++ b/devel/pcre-ocaml/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/08/11 15:47:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:26 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PCRE_OCAML_BUILDLINK3_MK:=	${PCRE_OCAML_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pcre-ocaml
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	pcre-ocaml
-.endif
+.if !defined(PCRE_OCAML_BUILDLINK3_MK)
+PCRE_OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npcre-ocaml}
-BUILDLINK_PACKAGES+=	pcre-ocaml
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pcre-ocaml
-
-.if ${PCRE_OCAML_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.pcre-ocaml+=	pcre-ocaml>=5.10.3nb1
 BUILDLINK_PKGSRCDIR.pcre-ocaml?=	../../devel/pcre-ocaml
-.endif	# PCRE_OCAML_BUILDLINK3_MK
 
 .include "../../devel/pcre/buildlink3.mk"
+.endif # PCRE_OCAML_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pcre-ocaml
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index 2988ef8639f..543be8d2c03 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:26 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PCRE_BUILDLINK3_MK:=	${PCRE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pcre
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pcre
-.endif
+.if !defined(PCRE_BUILDLINK3_MK)
+PCRE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npcre}
-BUILDLINK_PACKAGES+=	pcre
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pcre
-
-.if !empty(PCRE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pcre+=	pcre>=3.4nb1
 BUILDLINK_ABI_DEPENDS.pcre+=	pcre>=6.2
 BUILDLINK_PKGSRCDIR.pcre?=	../../devel/pcre
-.endif	# PCRE_BUILDLINK3_MK
+.endif # PCRE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pcre
diff --git a/devel/pdcurses/buildlink3.mk b/devel/pdcurses/buildlink3.mk
index 42042b44d5b..445165bc4c4 100644
--- a/devel/pdcurses/buildlink3.mk
+++ b/devel/pdcurses/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/02/27 21:32:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:26 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PDCURSES_BUILDLINK3_MK:=	${PDCURSES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pdcurses
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pdcurses
-.endif
+.if !defined(PDCURSES_BUILDLINK3_MK)
+PDCURSES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npdcurses}
-BUILDLINK_PACKAGES+=	pdcurses
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pdcurses
-
-.if !empty(PDCURSES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pdcurses+=	pdcurses>=3.3
 BUILDLINK_PKGSRCDIR.pdcurses?=		../../devel/pdcurses
 
@@ -26,8 +19,6 @@ BUILDLINK_INCDIRS.pdcurses+=	include/xcurses
 BUILDLINK_TRANSFORM+=   	l:curses:XCurses
 .  endif
 
-.endif	# PDCURSES_BUILDLINK3_MK
-
 .include "../../mk/xaw.buildlink3.mk"
 
 .include "../../x11/libICE/buildlink3.mk"
@@ -38,5 +29,6 @@ BUILDLINK_TRANSFORM+=   	l:curses:XCurses
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.endif # PDCURSES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pdcurses
diff --git a/devel/physfs/buildlink3.mk b/devel/physfs/buildlink3.mk
index 2377555519e..76853c3bf5e 100644
--- a/devel/physfs/buildlink3.mk
+++ b/devel/physfs/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:26 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PHYSFS_BUILDLINK3_MK:=	${PHYSFS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	physfs
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	physfs
-.endif
+.if !defined(PHYSFS_BUILDLINK3_MK)
+PHYSFS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nphysfs}
-BUILDLINK_PACKAGES+=	physfs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}physfs
-
-.if !empty(PHYSFS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.physfs+=	physfs>=1.0.0
 BUILDLINK_ABI_DEPENDS.physfs+=	physfs>=1.0.1
 BUILDLINK_PKGSRCDIR.physfs?=	../../devel/physfs
-.endif	# PHYSFS_BUILDLINK3_MK
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # PHYSFS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-physfs
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index 7e8ab9c6aac..68aa8f95cd7 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:26 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-POPT_BUILDLINK3_MK:=	${POPT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	popt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	popt
-.endif
+.if !defined(POPT_BUILDLINK3_MK)
+POPT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npopt}
-BUILDLINK_PACKAGES+=	popt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}popt
-
-.if !empty(POPT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.popt+=	popt>=1.7nb3
 BUILDLINK_ABI_DEPENDS.popt+=	popt>=1.7nb6
 BUILDLINK_PKGSRCDIR.popt?=	../../devel/popt
-.endif	# POPT_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # POPT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-popt
diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk
index 875330ca58b..e51b87b3e74 100644
--- a/devel/pth/buildlink3.mk
+++ b/devel/pth/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:27 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PTH_BUILDLINK3_MK:=	${PTH_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pth
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pth
-.endif
+.if !defined(PTH_BUILDLINK3_MK)
+PTH_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npth}
-BUILDLINK_PACKAGES+=	pth
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pth
-
-.if !empty(PTH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pth+=		pth>=2.0.0
 BUILDLINK_ABI_DEPENDS.pth+=	pth>=2.0.0nb2
 BUILDLINK_PKGSRCDIR.pth?=	../../devel/pth
-.endif	# PTH_BUILDLINK3_MK
+.endif # PTH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pth
diff --git a/devel/pthread-sem/buildlink3.mk b/devel/pthread-sem/buildlink3.mk
index ef558cd2c81..c49307670bf 100644
--- a/devel/pthread-sem/buildlink3.mk
+++ b/devel/pthread-sem/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:27 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PTHREAD_SEM_BUILDLINK3_MK:=	${PTHREAD_SEM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pthread-sem
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pthread-sem
-.endif
+.if !defined(PTHREAD_SEM_BUILDLINK3_MK)
+PTHREAD_SEM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npthread-sem}
-BUILDLINK_PACKAGES+=	pthread-sem
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pthread-sem
-
-.if !empty(PTHREAD_SEM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pthread-sem+=		pthread-sem>=1.0
 BUILDLINK_PKGSRCDIR.pthread-sem?=	../../devel/pthread-sem
-.endif	# PTHREAD_SEM_BUILDLINK3_MK
+.endif # PTHREAD_SEM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pthread-sem
diff --git a/devel/pthread-stublib/buildlink3.mk b/devel/pthread-stublib/buildlink3.mk
index d9950b84f13..89e0d7144ce 100644
--- a/devel/pthread-stublib/buildlink3.mk
+++ b/devel/pthread-stublib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:27 joerg Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.10.
 # XXX After this file has been verified as correct, the comment lines
@@ -10,22 +10,15 @@
 # XXX
 # XXX	BUILDLINK_DEPMETHOD.pthread-stublib?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PTHREAD_STUBLIB_BUILDLINK3_MK:=	${PTHREAD_STUBLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pthread-stublib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pthread-stublib
-.endif
+.if !defined(PTHREAD_STUBLIB_BUILDLINK3_MK)
+PTHREAD_STUBLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npthread-stublib}
-BUILDLINK_PACKAGES+=	pthread-stublib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pthread-stublib
-
-.if !empty(PTHREAD_STUBLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pthread-stublib+=	pthread-stublib>=1.0
 BUILDLINK_PKGSRCDIR.pthread-stublib?=	../../devel/pthread-stublib
-.endif	# PTHREAD_STUBLIB_BUILDLINK3_MK
 
 IS_BUILTIN.pthread-stublib=no
+.endif # PTHREAD_STUBLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pthread-stublib
diff --git a/devel/ptlib/buildlink3.mk b/devel/ptlib/buildlink3.mk
index 46f07a7fbeb..87e1d59d807 100644
--- a/devel/ptlib/buildlink3.mk
+++ b/devel/ptlib/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/18 11:57:15 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:27 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PTLIB_BUILDLINK3_MK:=	${PTLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ptlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ptlib
-.endif
+.if !defined(PTLIB_BUILDLINK3_MK)
+PTLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nptlib}
-BUILDLINK_PACKAGES+=	ptlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ptlib
-
-.if !empty(PTLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ptlib+=	ptlib>=2.6.1
 BUILDLINK_ABI_DEPENDS.ptlib?=	ptlib>=2.6.1
 BUILDLINK_PKGSRCDIR.ptlib?=	../../devel/ptlib
-.endif	# PTLIB_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # PTLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ptlib
diff --git a/devel/pwlib/buildlink3.mk b/devel/pwlib/buildlink3.mk
index 81ff17e136f..b4794c83912 100644
--- a/devel/pwlib/buildlink3.mk
+++ b/devel/pwlib/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:14:38 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:27 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PWLIB_BUILDLINK3_MK:=	${PWLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pwlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pwlib
-.endif
+.if !defined(PWLIB_BUILDLINK3_MK)
+PWLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npwlib}
-BUILDLINK_PACKAGES+=	pwlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pwlib
-
-.if !empty(PWLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pwlib+=	pwlib>=1.8.3nb1
 BUILDLINK_ABI_DEPENDS.pwlib?=	pwlib>=1.8.3nb7
 BUILDLINK_PKGSRCDIR.pwlib?=	../../devel/pwlib
-.endif	# PWLIB_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # PWLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pwlib
diff --git a/devel/py-at-spi/buildlink3.mk b/devel/py-at-spi/buildlink3.mk
index c9ddab4b2a5..93905a52f7f 100644
--- a/devel/py-at-spi/buildlink3.mk
+++ b/devel/py-at-spi/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:27 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_AT_SPI_BUILDLINK3_MK:=	${PY_AT_SPI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-at-spi
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-at-spi
-.endif
+.if !defined(PY_AT_SPI_BUILDLINK3_MK)
+PY_AT_SPI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-at-spi}
-BUILDLINK_PACKAGES+=	py-at-spi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-at-spi
-
-.if ${PY_AT_SPI_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-at-spi+=	${PYPKGPREFIX}-at-spi>=1.20.1
 BUILDLINK_PKGSRCDIR.py-at-spi?=		../../devel/py-at-spi
-.endif	# PY_AT_SPI_BUILDLINK3_MK
 
 .include "../../devel/at-spi/buildlink3.mk"
+.endif # PY_AT_SPI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-at-spi
diff --git a/devel/py-compizconfig/buildlink3.mk b/devel/py-compizconfig/buildlink3.mk
index fd1c74a24e7..4cc94794574 100644
--- a/devel/py-compizconfig/buildlink3.mk
+++ b/devel/py-compizconfig/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:27 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_COMPIZCONFIG_BUILDLINK3_MK:=	${PY_COMPIZCONFIG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	${PYPKGPREFIX}-compizconfig
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	${PYPKGPREFIX}-compizconfig
-.endif
+.if !defined(PY_COMPIZCONFIG_BUILDLINK3_MK)
+PY_COMPIZCONFIG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-compizconfig}
-BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-compizconfig
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${PYPKGPREFIX}-compizconfig
-
-.if !empty(PY_COMPIZCONFIG_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-compizconfig+=	${PYPKGPREFIX}-compizconfig>=0.6.0
@@ -19,7 +12,6 @@ BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-compizconfig?=	${PYPKGPREFIX}-compizconfig>
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-compizconfig?=	../../devel/py-compizconfig
 
 .include "../../devel/libcompizconfig/buildlink3.mk"
+.endif # PY_COMPIZCONFIG_BUILDLINK3_MK
 
-.endif	# PY_COMPIZCONFIG_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-${PYPKGPREFIX}-compizconfig
diff --git a/devel/py-ctypes/buildlink3.mk b/devel/py-ctypes/buildlink3.mk
index e712a04c784..24c70f1b8c8 100644
--- a/devel/py-ctypes/buildlink3.mk
+++ b/devel/py-ctypes/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:27 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_CTYPES_BUILDLINK3_MK:=	${PY_CTYPES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-ctypes
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-ctypes
-.endif
+.if !defined(PY_CTYPES_BUILDLINK3_MK)
+PY_CTYPES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-ctypes}
-BUILDLINK_PACKAGES+=	py-ctypes
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-ctypes
-
-.if ${PY_CTYPES_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-ctypes+=	${PYPKGPREFIX}-ctypes>=1.0.0
 BUILDLINK_PKGSRCDIR.py-ctypes?=		../../devel/py-ctypes
-.endif	# PY_CTYPES_BUILDLINK3_MK
+.endif # PY_CTYPES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-ctypes
diff --git a/devel/py-curses/buildlink3.mk b/devel/py-curses/buildlink3.mk
index 66340934095..0e522ecfb8e 100644
--- a/devel/py-curses/buildlink3.mk
+++ b/devel/py-curses/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:27 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_CURSES_BUILDLINK3_MK:=	${PY_CURSES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pycurses
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pycurses
-.endif
+.if !defined(PY_CURSES_BUILDLINK3_MK)
+PY_CURSES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npycurses}
-BUILDLINK_PACKAGES+=	pycurses
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycurses
-
-.if !empty(PY_CURSES_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pycurses+=	${PYPKGPREFIX}-curses-[0-9]*
 BUILDLINK_ABI_DEPENDS.pycurses+=	${PYPKGPREFIX}-curses>=0nb4
 BUILDLINK_PKGSRCDIR.pycurses?=	../../devel/py-curses
-.endif	# PY_CURSES_BUILDLINK3_MK
 
 .include "../../devel/ncurses/buildlink3.mk"
+.endif # PY_CURSES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pycurses
diff --git a/devel/py-cursespanel/buildlink3.mk b/devel/py-cursespanel/buildlink3.mk
index 372216860d8..9b0f14f6fb5 100644
--- a/devel/py-cursespanel/buildlink3.mk
+++ b/devel/py-cursespanel/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:27 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-PY_CURSESPANEL_BUILDLINK3_MK:=	${PY_CURSESPANEL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pycursespanel
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pycursespanel
-.endif
+.if !defined(PY_CURSESPANEL_BUILDLINK3_MK)
+PY_CURSESPANEL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npycursespanel}
-BUILDLINK_PACKAGES+=	pycursespanel
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycursespanel
-
-.if !empty(PY_CURSESPANEL_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pycursespanel+=	${PYPKGPREFIX}-cursespanel-[0-9]*
 BUILDLINK_ABI_DEPENDS.pycursespanel?=	${PYPKGPREFIX}-cursespanel>=0nb3
 BUILDLINK_PKGSRCDIR.pycursespanel?=	../../devel/py-cursespanel
-.endif	# PY_CURSESPANEL_BUILDLINK3_MK
 
 .include "../../devel/ncurses/buildlink3.mk"
+.endif # PY_CURSESPANEL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pycursespanel
diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk
index caf4eb10d9f..9bda15a8d9d 100644
--- a/devel/py-game/buildlink3.mk
+++ b/devel/py-game/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:28 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_GAME_BUILDLINK3_MK:=	${PY_GAME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	${PYPKGPREFIX}-game
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	${PYPKGPREFIX}-game
-.endif
+.if !defined(PY_GAME_BUILDLINK3_MK)
+PY_GAME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-game}
-BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-game
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${PYPKGPREFIX}-game
-
-.if !empty(PY_GAME_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+=	${PYPKGPREFIX}-game>=1.6
@@ -23,7 +16,6 @@ BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?=	../../devel/py-game
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
+.endif # PY_GAME_BUILDLINK3_MK
 
-.endif	# PY_GAME_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-${PYPKGPREFIX}-game
diff --git a/devel/py-gobject-shared/buildlink3.mk b/devel/py-gobject-shared/buildlink3.mk
index 3fda7328f5b..a39da92430b 100644
--- a/devel/py-gobject-shared/buildlink3.mk
+++ b/devel/py-gobject-shared/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:28 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-PY_GOBJECT_SHARED_BUILDLINK3_MK:=	${PY_GOBJECT_SHARED_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-gobject-shared
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-gobject-shared
-.endif
+.if !defined(PY_GOBJECT_SHARED_BUILDLINK3_MK)
+PY_GOBJECT_SHARED_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-gobject-shared}
-BUILDLINK_PACKAGES+=	py-gobject-shared
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gobject-shared
-
-.if ${PY_GOBJECT_SHARED_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.py-gobject-shared+=	py-gobject-shared>=2.10.1
 BUILDLINK_PKGSRCDIR.py-gobject-shared?=		../../devel/py-gobject-shared
 BUILDLINK_DEPMETHOD.py-gobject-shared?=		build
-.endif	# PY_GOBJECT_SHARED_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.endif # PY_GOBJECT_SHARED_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-gobject-shared
diff --git a/devel/py-gobject/buildlink3.mk b/devel/py-gobject/buildlink3.mk
index d0dbf6e4aac..1a211168b28 100644
--- a/devel/py-gobject/buildlink3.mk
+++ b/devel/py-gobject/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:28 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PY_GOBJECT_BUILDLINK3_MK:=	${PY_GOBJECT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pygobject
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pygobject
-.endif
+.if !defined(PY_GOBJECT_BUILDLINK3_MK)
+PY_GOBJECT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygobject}
-BUILDLINK_PACKAGES+=	pygobject
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygobject
-
-.if !empty(PY_GOBJECT_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygobject+=	${PYPKGPREFIX}-gobject>=2.10.1nb1
 BUILDLINK_PKGSRCDIR.pygobject?=	../../devel/py-gobject
-.endif	# PY_GOBJECT_BUILDLINK3_MK
 
 .include "../../devel/py-gobject-shared/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # PY_GOBJECT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pygobject
diff --git a/devel/py-pexpect/buildlink3.mk b/devel/py-pexpect/buildlink3.mk
index e28535bf082..06a534530a1 100644
--- a/devel/py-pexpect/buildlink3.mk
+++ b/devel/py-pexpect/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:28 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_PEXPECT_BUILDLINK3_MK:=	${PY_PEXPECT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-pexpect
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	py-pexpect
-.endif
+.if !defined(PY_PEXPECT_BUILDLINK3_MK)
+PY_PEXPECT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-pexpect}
-BUILDLINK_PACKAGES+=	py-pexpect
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-pexpect
-
-.if !empty(PY_PEXPECT_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-pexpect+=	${PYPKGPREFIX}-pexpect>=2.1
 BUILDLINK_ABI_DEPENDS.py-pexpect+=	${PYPKGPREFIX}-pexpect>=2.1
 BUILDLINK_PKGSRCDIR.py-pexpect?=		../../devel/py-pexpect
-.endif	# PY_PEXPECT_BUILDLINK3_MK
+.endif # PY_PEXPECT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-pexpect
diff --git a/devel/py-readline/buildlink3.mk b/devel/py-readline/buildlink3.mk
index 4d4a701586e..85fca7f748e 100644
--- a/devel/py-readline/buildlink3.mk
+++ b/devel/py-readline/buildlink3.mk
@@ -1,24 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:28 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PYREADLINE_BUILDLINK3_MK:=	${PYREADLINE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pyreadline
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pyreadline
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyreadline}
-BUILDLINK_PACKAGES+=	pyreadline
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyreadline
-
-.if !empty(PYREADLINE_BUILDLINK3_MK:M+)
+.if !defined(PYREADLINE_BUILDLINK3_MK)
+PYREADLINE_BUILDLINK3_MK:=
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyreadline+=		${PYPKGPREFIX}-readline-[0-9]*
 BUILDLINK_ABI_DEPENDS.pyreadline?=	${PYPKGPREFIX}-readline>=0nb2
 BUILDLINK_PKGSRCDIR.pyreadline?=	../../devel/py-readline
+.endif # PYREADLINE_BUILDLINK3_MK
 
-.endif	# PYREADLINE_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pyreadline
diff --git a/devel/qof/buildlink3.mk b/devel/qof/buildlink3.mk
index 663e371f61c..0e06c92143d 100644
--- a/devel/qof/buildlink3.mk
+++ b/devel/qof/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/28 23:36:39 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:28 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-QOF_BUILDLINK3_MK:=	${QOF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	qof
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	qof
-.endif
+.if !defined(QOF_BUILDLINK3_MK)
+QOF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqof}
-BUILDLINK_PACKAGES+=	qof
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qof
-
-.if ${QOF_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.qof+=	qof>=0.7.5
 BUILDLINK_PKGSRCDIR.qof?=	../../devel/qof
-.endif	# QOF_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # QOF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qof
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 5397366befd..381f03d5d4d 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.30 2008/02/29 22:41:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:28 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-READLINE_BUILDLINK3_MK:=	${READLINE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	readline
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	readline
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nreadline}
-BUILDLINK_PACKAGES+=	readline
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}readline
+.if !defined(READLINE_BUILDLINK3_MK)
+READLINE_BUILDLINK3_MK:=
 
-.if !empty(READLINE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.readline+=	readline>=2.2
 BUILDLINK_ABI_DEPENDS.readline+=	readline>=5.0
 BUILDLINK_PKGSRCDIR.readline?=		../../devel/readline
@@ -32,7 +25,6 @@ BROKEN_READLINE_DETECTION?=	no
 .  if !empty(BROKEN_READLINE_DETECTION:M[yY][eE][sS])
 BUILDLINK_TRANSFORM+=		l:readline:readline:${BUILDLINK_LIBNAME.termcap}
 .  endif
-.endif	# READLINE_BUILDLINK3_MK
 
 CHECK_BUILTIN.readline:=	yes
 .include "../../devel/readline/builtin.mk"
@@ -44,5 +36,6 @@ USE_BUILTIN.termcap=	yes
 .endif
 
 .include "../../mk/termcap.buildlink3.mk"
+.endif # READLINE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-readline
diff --git a/devel/rpc2/buildlink3.mk b/devel/rpc2/buildlink3.mk
index 98aa4e340de..93ff3826083 100644
--- a/devel/rpc2/buildlink3.mk
+++ b/devel/rpc2/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:28 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-RPC2_BUILDLINK3_MK:=	${RPC2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	rpc2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	rpc2
-.endif
+.if !defined(RPC2_BUILDLINK3_MK)
+RPC2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrpc2}
-BUILDLINK_PACKAGES+=	rpc2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rpc2
-
-.if !empty(RPC2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rpc2+=	rpc2>=1.10
 BUILDLINK_ABI_DEPENDS.rpc2+=	rpc2>=1.27nb1
 BUILDLINK_PKGSRCDIR.rpc2?=	../../devel/rpc2
-.endif	# RPC2_BUILDLINK3_MK
 
 .include "../../devel/lwp/buildlink3.mk"
+.endif # RPC2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-rpc2
diff --git a/devel/ruby-gnome2-glib/buildlink3.mk b/devel/ruby-gnome2-glib/buildlink3.mk
index 83fa7d4962c..4259ac6845b 100644
--- a/devel/ruby-gnome2-glib/buildlink3.mk
+++ b/devel/ruby-gnome2-glib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/01/19 04:01:52 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:29 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-RUBY_GNOME2_GLIB_BUILDLINK3_MK:=	${RUBY_GNOME2_GLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ruby-gnome2-glib
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ruby-gnome2-glib
-.endif
+.if !defined(RUBY_GNOME2_GLIB_BUILDLINK3_MK)
+RUBY_GNOME2_GLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nruby-gnome2-glib}
-BUILDLINK_PACKAGES+=	ruby-gnome2-glib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ruby-gnome2-glib
-
-.if ${RUBY_GNOME2_GLIB_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib>=0.17.0
 BUILDLINK_PKGSRCDIR.ruby-gnome2-glib?=		../../devel/ruby-gnome2-glib
-.endif	# RUBY_GNOME2_GLIB_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/ruby/buildlink3.mk"
+.endif # RUBY_GNOME2_GLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ruby-gnome2-glib
diff --git a/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk
index 55de94a0ead..c9ae329b60e 100644
--- a/devel/ruby-gnome2-pango/buildlink3.mk
+++ b/devel/ruby-gnome2-pango/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/01/19 04:07:54 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:29 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-RUBY_GNOME2_PANGO_BUILDLINK3_MK:=	${RUBY_GNOME2_PANGO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ruby-gnome2-pango
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ruby-gnome2-pango
-.endif
+.if !defined(RUBY_GNOME2_PANGO_BUILDLINK3_MK)
+RUBY_GNOME2_PANGO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nruby-gnome2-pango}
-BUILDLINK_PACKAGES+=	ruby-gnome2-pango
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ruby-gnome2-pango
-
-.if !empty(RUBY_GNOME2_PANGO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ruby-gnome2-pango+=	${RUBY_PKGPREFIX}-gnome2-pango>=0.16.0
 BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?=	../../devel/ruby-gnome2-pango
-.endif	# RUBY_GNOME2_PANGO_BUILDLINK3_MK
 
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../lang/ruby/buildlink3.mk"
+.endif # RUBY_GNOME2_PANGO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ruby-gnome2-pango
diff --git a/devel/rudiments/buildlink3.mk b/devel/rudiments/buildlink3.mk
index f9424831395..69bbd9950fa 100644
--- a/devel/rudiments/buildlink3.mk
+++ b/devel/rudiments/buildlink3.mk
@@ -1,24 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:29 joerg Exp $
 #
 # This Makefile fragment is included by packages that use rudiments.
 #
 # This file was created automatically using createbuildlink-3.1.
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-RUDIMENTS_BUILDLINK3_MK:=	${RUDIMENTS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	rudiments
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	rudiments
-.endif
+.if !defined(RUDIMENTS_BUILDLINK3_MK)
+RUDIMENTS_BUILDLINK3_MK:=
 
-.if !empty(RUDIMENTS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			rudiments
-BUILDLINK_ORDER:=			${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rudiments
 BUILDLINK_API_DEPENDS.rudiments+=		rudiments>=0.25.1
 BUILDLINK_ABI_DEPENDS.rudiments+=	rudiments>=0.28.2nb1
 BUILDLINK_PKGSRCDIR.rudiments?=		../../devel/rudiments
-
 .endif # RUDIMENTS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-rudiments
diff --git a/devel/rvm/buildlink3.mk b/devel/rvm/buildlink3.mk
index a1a2a67fcd0..cca6e0feed1 100644
--- a/devel/rvm/buildlink3.mk
+++ b/devel/rvm/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:29 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-RVM_BUILDLINK3_MK:=	${RVM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	rvm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	rvm
-.endif
+.if !defined(RVM_BUILDLINK3_MK)
+RVM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrvm}
-BUILDLINK_PACKAGES+=	rvm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rvm
-
-.if !empty(RVM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rvm+=	rvm>=1.3
 BUILDLINK_ABI_DEPENDS.rvm+=	rvm>=1.11nb1
 BUILDLINK_PKGSRCDIR.rvm?=	../../devel/rvm
-.endif	# RVM_BUILDLINK3_MK
 
 .include "../../devel/lwp/buildlink3.mk"
+.endif # RVM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-rvm
diff --git a/devel/rx/buildlink3.mk b/devel/rx/buildlink3.mk
index 855568a16cd..be81cd568f0 100644
--- a/devel/rx/buildlink3.mk
+++ b/devel/rx/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:29 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-RX_BUILDLINK3_MK:=	${RX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	rx
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	rx
-.endif
+.if !defined(RX_BUILDLINK3_MK)
+RX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrx}
-BUILDLINK_PACKAGES+=	rx
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rx
-
-.if !empty(RX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rx+=		rx>=1.5
 BUILDLINK_PKGSRCDIR.rx?=	../../devel/rx
-.endif	# RX_BUILDLINK3_MK
+.endif # RX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-rx
diff --git a/devel/sapnwrfcsdk/buildlink3.mk b/devel/sapnwrfcsdk/buildlink3.mk
index bf56f6ee162..0b2d2a7f169 100644
--- a/devel/sapnwrfcsdk/buildlink3.mk
+++ b/devel/sapnwrfcsdk/buildlink3.mk
@@ -1,26 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/09 16:53:16 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:29 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SAPNWRFCSDK_BUILDLINK3_MK:=	${SAPNWRFCSDK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sapnwrfcsdk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sapnwrfcsdk
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsapnwrfcsdk}
-BUILDLINK_PACKAGES+=	sapnwrfcsdk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sapnwrfcsdk
-
-.if !empty(SAPNWRFCSDK_BUILDLINK3_MK:M+)
+.if !defined(SAPNWRFCSDK_BUILDLINK3_MK)
+SAPNWRFCSDK_BUILDLINK3_MK:=
 
 .  include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_API_DEPENDS.sapnwrfcsdk+=	sapnwrfcsdk>=7.00
 BUILDLINK_ABI_DEPENDS.sapnwrfcsdk+=	sapnwrfcsdk>=7.00
 BUILDLINK_PKGSRCDIR.sapnwrfcsdk?=	../../devel/sapnwrfcsdk
-.endif	# SAPNWRFCSDK_BUILDLINK3_MK
 pkgbase := sapnwrfcsdk
 .include "../../mk/pkg-build-options.mk"
+.endif # SAPNWRFCSDK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sapnwrfcsdk
diff --git a/devel/semantic/buildlink3.mk b/devel/semantic/buildlink3.mk
index 7a1dc4d7a99..4df92886466 100644
--- a/devel/semantic/buildlink3.mk
+++ b/devel/semantic/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:29 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SEMANTIC_BUILDLINK3_MK:=	${SEMANTIC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	semantic
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	semantic
-.endif
+.if !defined(SEMANTIC_BUILDLINK3_MK)
+SEMANTIC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsemantic}
-BUILDLINK_PACKAGES+=	semantic
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}semantic
-
-.if ${SEMANTIC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.semantic+=	${EMACS_PKGNAME_PREFIX}semantic>=10
 BUILDLINK_PKGSRCDIR.semantic?=	../../devel/semantic
-.endif	# SEMANTIC_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.semantic=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # SEMANTIC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-semantic
diff --git a/devel/semi/buildlink3.mk b/devel/semi/buildlink3.mk
index 42c013de5df..a217b20d0f8 100644
--- a/devel/semi/buildlink3.mk
+++ b/devel/semi/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:29 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SEMI_BUILDLINK3_MK:=	${SEMI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	semi
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	semi
-.endif
+.if !defined(SEMI_BUILDLINK3_MK)
+SEMI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsemi}
-BUILDLINK_PACKAGES+=	semi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}semi
-
-.if ${SEMI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.semi+=	${EMACS_PKGNAME_PREFIX}semi>=1.14
 BUILDLINK_PKGSRCDIR.semi?=	../../devel/semi
-.endif	# SEMI_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.semi=	${EGREP} '.*\.el$$|.*\.elc$$'
 
 .include "../../devel/flim/buildlink3.mk"
+.endif # SEMI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-semi
diff --git a/devel/sgb/buildlink3.mk b/devel/sgb/buildlink3.mk
index 2070338bf9d..fbe078bf088 100644
--- a/devel/sgb/buildlink3.mk
+++ b/devel/sgb/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:29 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SGB_BUILDLINK3_MK:=	${SGB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sgb
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sgb
-.endif
+.if !defined(SGB_BUILDLINK3_MK)
+SGB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsgb}
-BUILDLINK_PACKAGES+=	sgb
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sgb
-
-.if !empty(SGB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sgb+=	sgb>=0pre20050409
 BUILDLINK_PKGSRCDIR.sgb?=	../../devel/sgb
-.endif	# SGB_BUILDLINK3_MK
+.endif # SGB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sgb
diff --git a/devel/silc-toolkit/buildlink3.mk b/devel/silc-toolkit/buildlink3.mk
index 937596997b8..88ecc5027b5 100644
--- a/devel/silc-toolkit/buildlink3.mk
+++ b/devel/silc-toolkit/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/10/25 01:40:36 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:29 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SILC_TOOLKIT_BUILDLINK3_MK:=	${SILC_TOOLKIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	silc-toolkit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	silc-toolkit
-.endif
+.if !defined(SILC_TOOLKIT_BUILDLINK3_MK)
+SILC_TOOLKIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsilc-toolkit}
-BUILDLINK_PACKAGES+=	silc-toolkit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}silc-toolkit
-
-.if !empty(SILC_TOOLKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.silc-toolkit+=	silc-toolkit>=0.9.12
 BUILDLINK_ABI_DEPENDS.silc-toolkit+=	silc-toolkit>=0.9.12nb1
 BUILDLINK_PKGSRCDIR.silc-toolkit?=	../../devel/silc-toolkit
-.endif	# SILC_TOOLKIT_BUILDLINK3_MK
 
 .include "../../devel/libgetopt/buildlink3.mk"
+.endif # SILC_TOOLKIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-silc-toolkit
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index dd0a86b486d..38610affb6f 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/09/06 20:54:32 wiz Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SUBVERSION_BASE_BUILDLINK3_MK:=	${SUBVERSION_BASE_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:30 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 .include "../../devel/subversion/Makefile.version"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	subversion-base
-.endif
+BUILDLINK_TREE+=	subversion-base
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsubversion-base}
-BUILDLINK_PACKAGES+=	subversion-base
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}subversion-base
+.if !defined(SUBVERSION_BASE_BUILDLINK3_MK)
+SUBVERSION_BASE_BUILDLINK3_MK:=
 
-.if !empty(SUBVERSION_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.subversion-base+=	subversion-base>=1.0.0
 BUILDLINK_ABI_DEPENDS.subversion-base?=	subversion-base>=1.5.2nb1
 BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
@@ -24,8 +17,6 @@ BUILDLINK_FILES.subversion-base+=	bin/svn-config
 pkgbase := subversion-base
 .include "../../mk/pkg-build-options.mk"
 
-.endif	# SUBVERSION_BASE_BUILDLINK3_MK
-
 .if !empty(PKG_BUILD_OPTIONS.subversion-base:Msasl)
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
@@ -42,5 +33,6 @@ pkgbase := subversion-base
 .  include "../../devel/apr0/buildlink3.mk"
 .  include "../../www/neon/buildlink3.mk"
 .endif
+.endif # SUBVERSION_BASE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-subversion-base
diff --git a/devel/swig/buildlink3.mk b/devel/swig/buildlink3.mk
index 54e64b8f072..22ff253193a 100644
--- a/devel/swig/buildlink3.mk
+++ b/devel/swig/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/12/02 10:15:46 wulf Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:30 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SWIG_BUILDLINK3_MK:=	${SWIG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	swig
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	swig
-.endif
+.if !defined(SWIG_BUILDLINK3_MK)
+SWIG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswig}
-BUILDLINK_PACKAGES+=	swig
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}swig
-
-.if !empty(SWIG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.swig+=	swig>=1.3.24
 BUILDLINK_ABI_DEPENDS.swig+=	swig>=1.3.31
 BUILDLINK_PKGSRCDIR.swig?=	../../devel/swig
@@ -19,6 +12,6 @@ BUILDLINK_PKGSRCDIR.swig?=	../../devel/swig
 BUILDLINK_DEPMETHOD.swig?=	build
 
 BUILDLINK_FILES.swig+=		share/swig/1.3/* share/swig/1.3/*/*
-.endif	# SWIG_BUILDLINK3_MK
+.endif # SWIG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-swig
diff --git a/devel/syncdir/buildlink3.mk b/devel/syncdir/buildlink3.mk
index e0837abbe49..446c63202c1 100644
--- a/devel/syncdir/buildlink3.mk
+++ b/devel/syncdir/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SYNCDIR_BUILDLINK3_MK:=		${SYNCDIR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	syncdir
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=		syncdir
-.endif
+.if !defined(SYNCDIR_BUILDLINK3_MK)
+SYNCDIR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nsyncdir}
-BUILDLINK_PACKAGES+=		syncdir
-BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}syncdir
-
-.if !empty(SYNCDIR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.syncdir+=	syncdir>=1.0
 BUILDLINK_ABI_DEPENDS.syncdir+=	syncdir>=1.0nb1
 BUILDLINK_PKGSRCDIR.syncdir?=	../../devel/syncdir
-.endif	# SYNCDIR_BUILDLINK3_MK
+.endif # SYNCDIR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-syncdir
diff --git a/devel/sysexits/buildlink3.mk b/devel/sysexits/buildlink3.mk
index b134fb3a3c7..f8d658cf60f 100644
--- a/devel/sysexits/buildlink3.mk
+++ b/devel/sysexits/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SYSEXITS_BUILDLINK3_MK:=	${SYSEXITS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sysexits
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sysexits
-.endif
+.if !defined(SYSEXITS_BUILDLINK3_MK)
+SYSEXITS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsysexits}
-BUILDLINK_PACKAGES+=	sysexits
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sysexits
-
-.if !empty(SYSEXITS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sysexits+=	sysexits>=1.1
 BUILDLINK_DEPMETHOD.sysexits?=	build
 BUILDLINK_PKGSRCDIR.sysexits?=	../../devel/sysexits
-.endif	# SYSEXITS_BUILDLINK3_MK
+.endif # SYSEXITS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sysexits
diff --git a/devel/tcl-tclcl/buildlink3.mk b/devel/tcl-tclcl/buildlink3.mk
index a522ca2fc23..a492722097e 100644
--- a/devel/tcl-tclcl/buildlink3.mk
+++ b/devel/tcl-tclcl/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:30 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TCL_TCLCL_BUILDLINK3_MK:=	${TCL_TCLCL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcl-tclcl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcl-tclcl
-.endif
+.if !defined(TCL_TCLCL_BUILDLINK3_MK)
+TCL_TCLCL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-tclcl}
-BUILDLINK_PACKAGES+=	tcl-tclcl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-tclcl
-
-.if !empty(TCL_TCLCL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-tclcl+=	tcl-tclcl>=1.15
 BUILDLINK_ABI_DEPENDS.tcl-tclcl+=	tcl-tclcl>=1.17nb2
 BUILDLINK_PKGSRCDIR.tcl-tclcl?=	../../devel/tcl-tclcl
-.endif	# TCL_TCLCL_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../lang/tcl-otcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
+.endif # TCL_TCLCL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcl-tclcl
diff --git a/devel/teem/buildlink3.mk b/devel/teem/buildlink3.mk
index 4cdd1e597e0..0a2af2b2ca6 100644
--- a/devel/teem/buildlink3.mk
+++ b/devel/teem/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:30 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TEEM_BUILDLINK3_MK:=	${TEEM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	teem
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	teem
-.endif
+.if !defined(TEEM_BUILDLINK3_MK)
+TEEM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nteem}
-BUILDLINK_PACKAGES+=	teem
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}teem
-
-.if !empty(TEEM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.teem+=		teem>=1.8.0
 BUILDLINK_ABI_DEPENDS.teem+=		teem>=1.8.0nb1
 BUILDLINK_PKGSRCDIR.teem?=		../../devel/teem
@@ -39,7 +32,6 @@ BUILDLINK_FILES.teem+=	lib/libnrrd.*
 BUILDLINK_FILES.teem+=	lib/libteem.*
 BUILDLINK_FILES.teem+=	lib/libten.*
 BUILDLINK_FILES.teem+=	lib/libunrrdu.*
+.endif # TEEM_BUILDLINK3_MK
 
-.endif	# TEEM_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-teem
diff --git a/devel/tre/buildlink3.mk b/devel/tre/buildlink3.mk
index a9b3c6f4bb3..56b24f71166 100644
--- a/devel/tre/buildlink3.mk
+++ b/devel/tre/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/09/13 19:23:40 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:30 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TRE_BUILDLINK3_MK:=	${TRE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tre
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tre
-.endif
+.if !defined(TRE_BUILDLINK3_MK)
+TRE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntre}
-BUILDLINK_PACKAGES+=	tre
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tre
-
-.if !empty(TRE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tre+=		tre>=0.7.2
 BUILDLINK_PKGSRCDIR.tre?=		../../devel/tre
 BUILDLINK_CPPFLAGS.tre+=		-I${BUILDLINK_PREFIX.tre}/include/tre
-.endif	# TRE_BUILDLINK3_MK
+.endif # TRE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tre
diff --git a/devel/ucl/buildlink3.mk b/devel/ucl/buildlink3.mk
index efb66907425..d448d28a244 100644
--- a/devel/ucl/buildlink3.mk
+++ b/devel/ucl/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-UCL_BUILDLINK3_MK:=	${UCL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ucl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ucl
-.endif
+.if !defined(UCL_BUILDLINK3_MK)
+UCL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nucl}
-BUILDLINK_PACKAGES+=	ucl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ucl
-
-.if !empty(UCL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ucl+=	ucl>=1.02
 BUILDLINK_ABI_DEPENDS.ucl+=	ucl>=1.02nb2
 BUILDLINK_PKGSRCDIR.ucl?=	../../devel/ucl
-.endif	# UCL_BUILDLINK3_MK
+.endif # UCL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ucl
diff --git a/devel/vanessa_adt/buildlink3.mk b/devel/vanessa_adt/buildlink3.mk
index ec83f9cf4e0..3a64aa6163b 100644
--- a/devel/vanessa_adt/buildlink3.mk
+++ b/devel/vanessa_adt/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $
 #
 # This file was created automatically using createbuildlink-3.5.
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-VANESSA_ADT_BUILDLINK3_MK:=	${VANESSA_ADT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	vanessa_adt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	vanessa_adt
-.endif
+.if !defined(VANESSA_ADT_BUILDLINK3_MK)
+VANESSA_ADT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvanessa_adt}
-BUILDLINK_PACKAGES+=	vanessa_adt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vanessa_adt
-
-.if !empty(VANESSA_ADT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.vanessa_adt+=	vanessa_adt>=0.0.6
 BUILDLINK_ABI_DEPENDS.vanessa_adt+=	vanessa_adt>=0.0.6nb1
 BUILDLINK_PKGSRCDIR.vanessa_adt?=	../../devel/vanessa_adt
-.endif	# VANESSA_ADT_BUILDLINK3_MK
 
 .include "../../devel/vanessa_logger/buildlink3.mk"
+.endif # VANESSA_ADT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-vanessa_adt
diff --git a/devel/vanessa_logger/buildlink3.mk b/devel/vanessa_logger/buildlink3.mk
index 4e5b566e6a8..98db6f59922 100644
--- a/devel/vanessa_logger/buildlink3.mk
+++ b/devel/vanessa_logger/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $
 #
 # This file was created automatically using createbuildlink-3.5.
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-VANESSA_LOGGER_BUILDLINK3_MK:=	${VANESSA_LOGGER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	vanessa_logger
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	vanessa_logger
-.endif
+.if !defined(VANESSA_LOGGER_BUILDLINK3_MK)
+VANESSA_LOGGER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvanessa_logger}
-BUILDLINK_PACKAGES+=	vanessa_logger
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vanessa_logger
-
-.if !empty(VANESSA_LOGGER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.vanessa_logger+=	vanessa_logger>=0.0.7
 BUILDLINK_ABI_DEPENDS.vanessa_logger+=	vanessa_logger>=0.0.7nb1
 BUILDLINK_PKGSRCDIR.vanessa_logger?=	../../devel/vanessa_logger
-.endif	# VANESSA_LOGGER_BUILDLINK3_MK
+.endif # VANESSA_LOGGER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-vanessa_logger
diff --git a/devel/vanessa_socket/buildlink3.mk b/devel/vanessa_socket/buildlink3.mk
index 82535019437..9cea9d06bdf 100644
--- a/devel/vanessa_socket/buildlink3.mk
+++ b/devel/vanessa_socket/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:31 joerg Exp $
 #
 # This file was created automatically using createbuildlink-3.5.
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-VANESSA_SOCKET_BUILDLINK3_MK:=	${VANESSA_SOCKET_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	vanessa_socket
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	vanessa_socket
-.endif
+.if !defined(VANESSA_SOCKET_BUILDLINK3_MK)
+VANESSA_SOCKET_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvanessa_socket}
-BUILDLINK_PACKAGES+=	vanessa_socket
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vanessa_socket
-
-.if !empty(VANESSA_SOCKET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.vanessa_socket+=	vanessa_socket>=0.0.7nb2
 BUILDLINK_ABI_DEPENDS.vanessa_socket?=	vanessa_socket>=0.0.7nb3
 BUILDLINK_PKGSRCDIR.vanessa_socket?=	../../devel/vanessa_socket
-.endif	# VANESSA_SOCKET_BUILDLINK3_MK
 
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/vanessa_logger/buildlink3.mk"
+.endif # VANESSA_SOCKET_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-vanessa_socket
diff --git a/devel/xfce4-dev-tools/buildlink3.mk b/devel/xfce4-dev-tools/buildlink3.mk
index 2f83ca3bddc..a7241acf173 100644
--- a/devel/xfce4-dev-tools/buildlink3.mk
+++ b/devel/xfce4-dev-tools/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/12/07 19:43:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $
 
 BUILDLINK_DEPMETHOD.xfce4-dev-tools?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_DEV_TOOLS_BUILDLINK3_MK:=	${XFCE4_DEV_TOOLS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-dev-tools
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-dev-tools
-.endif
+.if !defined(XFCE4_DEV_TOOLS_BUILDLINK3_MK)
+XFCE4_DEV_TOOLS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-dev-tools}
-BUILDLINK_PACKAGES+=	xfce4-dev-tools
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-dev-tools
-
-.if ${XFCE4_DEV_TOOLS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-dev-tools+=	xfce4-dev-tools>=4.4.0.1
 BUILDLINK_PKGSRCDIR.xfce4-dev-tools?=	../../devel/xfce4-dev-tools
-.endif	# XFCE4_DEV_TOOLS_BUILDLINK3_MK
+.endif # XFCE4_DEV_TOOLS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-dev-tools
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index 6c0867d04f5..6416a4f5b36 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:31 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	zlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	zlib
-.endif
+.if !defined(ZLIB_BUILDLINK3_MK)
+ZLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nzlib}
-BUILDLINK_PACKAGES+=	zlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}zlib
-
-.if !empty(ZLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.1.4nb1
 BUILDLINK_ABI_DEPENDS.zlib+=	zlib>=1.2.3
 BUILDLINK_PKGSRCDIR.zlib?=	../../devel/zlib
-.endif	# ZLIB_BUILDLINK3_MK
+.endif # ZLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-zlib
author	joerg <joerg@pkgsrc.org>	2009-03-20 19:23:50 +0000
committer	joerg <joerg@pkgsrc.org>	2009-03-20 19:23:50 +0000
commit	2d1ba244e90207d03eef397a99aa4091baeec5b3 (patch)
tree	647e974495c5d41703d41ca2e71c9b6063b9153a /devel
parent	4bf0a20854ae9e07b7965977a713f2efee890976 (diff)
download	pkgsrc-2d1ba244e90207d03eef397a99aa4091baeec5b3.tar.gz