Simply and speed up buildlink3.mk files and processing.

This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time.
author: joerg <joerg> 2009-03-20 19:23:50 +0000
committer: joerg <joerg> 2009-03-20 19:23:50 +0000
commit: 405c61d80251d8e80401aed2264d4bede218cb22 (patch)
tree: 647e974495c5d41703d41ca2e71c9b6063b9153a /graphics
parent: f0f715d4dd4a290c5c6ae716c774f59caf5aa61c (diff)
download: pkgsrc-405c61d80251d8e80401aed2264d4bede218cb22.tar.gz
111 files changed, 660 insertions, 1437 deletions
diff --git a/graphics/Coin/buildlink3.mk b/graphics/Coin/buildlink3.mk
index eb155bbe302..58f9fcba565 100644
--- a/graphics/Coin/buildlink3.mk
+++ b/graphics/Coin/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/03/08 13:39:20 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:35 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-COIN_BUILDLINK3_MK:=	${COIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Coin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	Coin
-.endif
+.if !defined(COIN_BUILDLINK3_MK)
+COIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NCoin}
-BUILDLINK_PACKAGES+=	Coin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Coin
-
-.if ${COIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.Coin+=		Coin>=2.2.1
 BUILDLINK_ABI_DEPENDS.Coin+=		Coin>=2.4.4nb3
 BUILDLINK_PKGSRCDIR.Coin?=		../../graphics/Coin
@@ -20,7 +13,6 @@ BUILDLINK_PKGSRCDIR.Coin?=		../../graphics/Coin
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
-
 .endif # COIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Coin
diff --git a/graphics/GLXKit/buildlink3.mk b/graphics/GLXKit/buildlink3.mk
index 20750752a3a..651bad9e02b 100644
--- a/graphics/GLXKit/buildlink3.mk
+++ b/graphics/GLXKit/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:06:37 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:35 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLXKIT_BUILDLINK3_MK:=	${GLXKIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	GLXKit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	GLXKit
-.endif
+.if !defined(GLXKIT_BUILDLINK3_MK)
+GLXKIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGLXKit}
-BUILDLINK_PACKAGES+=	GLXKit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GLXKit
-
-.if !empty(GLXKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GLXKit+=	GLXKit>=0.3.1r2nb3
 BUILDLINK_ABI_DEPENDS.GLXKit?=	GLXKit>=0.3.1r2nb12
 BUILDLINK_PKGSRCDIR.GLXKit?=	../../graphics/GLXKit
-.endif	# GLXKIT_BUILDLINK3_MK
 
 .include "../../graphics/RenderKit/buildlink3.mk"
+.endif # GLXKIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-GLXKit
diff --git a/graphics/GUIlib/buildlink3.mk b/graphics/GUIlib/buildlink3.mk
index 90fe5fc9e1d..b1a9048c48b 100644
--- a/graphics/GUIlib/buildlink3.mk
+++ b/graphics/GUIlib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:50 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:35 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GUILIB_BUILDLINK3_MK:=	${GUILIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	GUIlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	GUIlib
-.endif
+.if !defined(GUILIB_BUILDLINK3_MK)
+GUILIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGUIlib}
-BUILDLINK_PACKAGES+=	GUIlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GUIlib
-
-.if !empty(GUILIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GUIlib+=	GUIlib>=1.1.0nb2
 BUILDLINK_ABI_DEPENDS.GUIlib+=	GUIlib>=1.1.0nb7
 BUILDLINK_PKGSRCDIR.GUIlib?=	../../graphics/GUIlib
-.endif	# GUILIB_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
+.endif # GUILIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-GUIlib
diff --git a/graphics/GeometryKit/buildlink3.mk b/graphics/GeometryKit/buildlink3.mk
index f88f0bcbc29..d6ea700b480 100644
--- a/graphics/GeometryKit/buildlink3.mk
+++ b/graphics/GeometryKit/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:06:37 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:35 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GEOMETRYKIT_BUILDLINK3_MK:=	${GEOMETRYKIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	GeometryKit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	GeometryKit
-.endif
+.if !defined(GEOMETRYKIT_BUILDLINK3_MK)
+GEOMETRYKIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGeometryKit}
-BUILDLINK_PACKAGES+=	GeometryKit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GeometryKit
-
-.if !empty(GEOMETRYKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GeometryKit+=	GeometryKit>=0.3.1r2nb3
 BUILDLINK_ABI_DEPENDS.GeometryKit?=	GeometryKit>=0.3.1r2nb12
 BUILDLINK_PKGSRCDIR.GeometryKit?=	../../graphics/GeometryKit
-.endif	# GEOMETRYKIT_BUILDLINK3_MK
 
 .include "../../x11/gnustep-back/buildlink3.mk"
+.endif # GEOMETRYKIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-GeometryKit
diff --git a/graphics/GlutKit/buildlink3.mk b/graphics/GlutKit/buildlink3.mk
index 92ed45a6a66..f19fa09b159 100644
--- a/graphics/GlutKit/buildlink3.mk
+++ b/graphics/GlutKit/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:06:38 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:35 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLUTKIT_BUILDLINK3_MK:=	${GLUTKIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	GlutKit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	GlutKit
-.endif
+.if !defined(GLUTKIT_BUILDLINK3_MK)
+GLUTKIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGlutKit}
-BUILDLINK_PACKAGES+=	GlutKit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GlutKit
-
-.if !empty(GLUTKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GlutKit+=	GlutKit>=0.3.1r2nb4
 BUILDLINK_ABI_DEPENDS.GlutKit?=	GlutKit>=0.3.1r2nb14
 BUILDLINK_PKGSRCDIR.GlutKit?=	../../graphics/GlutKit
-.endif	# GLUTKIT_BUILDLINK3_MK
 
 .include "../../graphics/RenderKit/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.endif # GLUTKIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-GlutKit
diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk
index 988c2afe35b..eadc1692986 100644
--- a/graphics/GraphicsMagick/buildlink3.mk
+++ b/graphics/GraphicsMagick/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/11/10 11:24:27 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:36 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GRAPHICSMAGICK_BUILDLINK3_MK:=	${GRAPHICSMAGICK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	GraphicsMagick
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	GraphicsMagick
-.endif
+.if !defined(GRAPHICSMAGICK_BUILDLINK3_MK)
+GRAPHICSMAGICK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGraphicsMagick}
-BUILDLINK_PACKAGES+=	GraphicsMagick
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GraphicsMagick
-
-.if ${GRAPHICSMAGICK_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.GraphicsMagick+=	GraphicsMagick>=1.2
 BUILDLINK_ABI_DEPENDS.GraphicsMagick?=	GraphicsMagick>=1.3
 BUILDLINK_PKGSRCDIR.GraphicsMagick?=	../../graphics/GraphicsMagick
-.endif	# GRAPHICSMAGICK_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
@@ -33,5 +25,6 @@ BUILDLINK_PKGSRCDIR.GraphicsMagick?=	../../graphics/GraphicsMagick
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # GRAPHICSMAGICK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-GraphicsMagick
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index 4697cd2628f..da4e41b972c 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/01/13 12:55:30 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:24:36 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-IMAGEMAGICK_BUILDLINK3_MK:=	${IMAGEMAGICK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ImageMagick
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ImageMagick
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NImageMagick}
-BUILDLINK_PACKAGES+=	ImageMagick
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ImageMagick
+.if !defined(IMAGEMAGICK_BUILDLINK3_MK)
+IMAGEMAGICK_BUILDLINK3_MK:=
 
-.if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ImageMagick+=	ImageMagick>=5.5.7.11nb1
 BUILDLINK_ABI_DEPENDS.ImageMagick+=	ImageMagick>=6.3.1.6nb1
 BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
-.endif	# IMAGEMAGICK_BUILDLINK3_MK
 
 pkgbase := ImageMagick
 .include "../../mk/pkg-build-options.mk"
@@ -38,5 +30,6 @@ pkgbase := ImageMagick
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # IMAGEMAGICK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ImageMagick
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 1044f72bbec..c1c23e96505 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.46 2008/05/15 19:46:47 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.47 2009/03/20 19:24:36 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	MesaLib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	MesaLib
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NMesaLib}
-BUILDLINK_PACKAGES+=	MesaLib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}MesaLib
+.if !defined(MESALIB_BUILDLINK3_MK)
+MESALIB_BUILDLINK3_MK:=
 
-.if !empty(MESALIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=3.4.2
 BUILDLINK_ABI_DEPENDS.MesaLib+=	MesaLib>=7.0.3
 BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
@@ -30,12 +23,11 @@ pkgbase:= MesaLib
 .  include "../../graphics/MesaLib/dri.mk"
 .endif
 
-.endif	# MESALIB_BUILDLINK3_MK
-
 .if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
 .include "../../devel/pthread-stublib/buildlink3.mk"
 .endif
 
 .include "../../x11/libXext/buildlink3.mk"
+.endif # MESALIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-MesaLib
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index f2a3808be25..59f7bb2d230 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2009/02/03 08:35:13 obache Exp $
+# $NetBSD: builtin.mk,v 1.17 2009/03/20 19:24:36 joerg Exp $
 
 BUILTIN_PKG:=	MesaLib
 
@@ -68,15 +68,11 @@ CHECK_BUILTIN.MesaLib?=	no
 .if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.MesaLib:M[nN][oO])
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 .    include "../../mk/pthread.buildlink3.mk"
 .    include "../../mk/pthread.builtin.mk"
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
 BUILTIN_PKG:=	MesaLib
 .  endif
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 .  include "../../mk/x11.builtin.mk"
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
 
 .endif	# CHECK_BUILTIN.MesaLib
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index d7b18e6d1b1..c533ab6e8ea 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/02/15 14:58:19 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:36 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENRM_BUILDLINK3_MK:=	${OPENRM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	OpenRM
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	OpenRM
-.endif
+.if !defined(OPENRM_BUILDLINK3_MK)
+OPENRM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NOpenRM}
-BUILDLINK_PACKAGES+=	OpenRM
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}OpenRM
-
-.if !empty(OPENRM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.OpenRM+=	OpenRM>=1.5.1
 BUILDLINK_ABI_DEPENDS.OpenRM?=	OpenRM>=1.5.2nb3
 BUILDLINK_PKGSRCDIR.OpenRM?=	../../graphics/OpenRM
-.endif	# OPENRM_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # OPENRM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-OpenRM
diff --git a/graphics/RenderKit/buildlink3.mk b/graphics/RenderKit/buildlink3.mk
index 5f88357ac05..158e7dd0f31 100644
--- a/graphics/RenderKit/buildlink3.mk
+++ b/graphics/RenderKit/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:06:38 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:36 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-RENDERKIT_BUILDLINK3_MK:=	${RENDERKIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	RenderKit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	RenderKit
-.endif
+.if !defined(RENDERKIT_BUILDLINK3_MK)
+RENDERKIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NRenderKit}
-BUILDLINK_PACKAGES+=	RenderKit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}RenderKit
-
-.if !empty(RENDERKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.RenderKit+=	RenderKit>=0.3.1r2nb3
 BUILDLINK_ABI_DEPENDS.RenderKit?=	RenderKit>=0.3.1r2nb12
 BUILDLINK_PKGSRCDIR.RenderKit?=	../../graphics/RenderKit
-.endif	# RENDERKIT_BUILDLINK3_MK
 
 .include "../../graphics/GeometryKit/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.endif # RENDERKIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-RenderKit
diff --git a/graphics/SDLKit/buildlink3.mk b/graphics/SDLKit/buildlink3.mk
index 6fecee921e8..0229d935a68 100644
--- a/graphics/SDLKit/buildlink3.mk
+++ b/graphics/SDLKit/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:06:38 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:36 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SDLKIT_BUILDLINK3_MK:=	${SDLKIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	SDLKit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	SDLKit
-.endif
+.if !defined(SDLKIT_BUILDLINK3_MK)
+SDLKIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDLKit}
-BUILDLINK_PACKAGES+=	SDLKit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDLKit
-
-.if !empty(SDLKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDLKit+=	SDLKit>=0.3.1r2nb5
 BUILDLINK_ABI_DEPENDS.SDLKit?=	SDLKit>=0.3.1r2nb17
 BUILDLINK_PKGSRCDIR.SDLKit?=	../../graphics/SDLKit
-.endif	# SDLKIT_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/RenderKit/buildlink3.mk"
+.endif # SDLKIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-SDLKit
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index 83af44a56a1..d2b743e014a 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:10:50 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:36 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SDL_IMAGE_BUILDLINK3_MK:=	${SDL_IMAGE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	SDL_image
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	SDL_image
-.endif
+.if !defined(SDL_IMAGE_BUILDLINK3_MK)
+SDL_IMAGE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_image}
-BUILDLINK_PACKAGES+=	SDL_image
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_image
-
-.if !empty(SDL_IMAGE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_image+=	SDL_image>=1.2.3nb1
 BUILDLINK_ABI_DEPENDS.SDL_image+=	SDL_image>=1.2.5
 BUILDLINK_PKGSRCDIR.SDL_image?=	../../graphics/SDL_image
 BUILDLINK_INCDIRS.SDL_image?=	include/SDL
-.endif	# SDL_IMAGE_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.endif # SDL_IMAGE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-SDL_image
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index c73ec32fd38..3989e38275e 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/05/30 08:54:30 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:36 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-AALIB_BUILDLINK3_MK:=	${AALIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	aalib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	aalib
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naalib}
-BUILDLINK_PACKAGES+=	aalib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}aalib
+.if !defined(AALIB_BUILDLINK3_MK)
+AALIB_BUILDLINK3_MK:=
 
-.if !empty(AALIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.aalib+=	aalib>=1.4.0.4
 BUILDLINK_ABI_DEPENDS.aalib+=	aalib>=1.4.0.5nb2
 BUILDLINK_PKGSRCDIR.aalib?=	../../graphics/aalib
-.endif	# AALIB_BUILDLINK3_MK
 
 pkgbase := aalib
 .include "../../mk/pkg-build-options.mk"
@@ -31,5 +23,6 @@ pkgbase := aalib
 .if !empty(PKG_BUILD_OPTIONS.aalib:Mx11)
 .  include "../../x11/libX11/buildlink3.mk"
 .endif
+.endif # AALIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-aalib
diff --git a/graphics/agg/buildlink3.mk b/graphics/agg/buildlink3.mk
index 337cb49abf7..26e0580757a 100644
--- a/graphics/agg/buildlink3.mk
+++ b/graphics/agg/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/27 06:41:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:36 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-AGG_BUILDLINK3_MK:=	${AGG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	agg
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	agg
-.endif
+.if !defined(AGG_BUILDLINK3_MK)
+AGG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nagg}
-BUILDLINK_PACKAGES+=	agg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}agg
-
-.if ${AGG_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.agg+=	agg>=2.5
 BUILDLINK_PKGSRCDIR.agg?=	../../graphics/agg
-.endif	# AGG_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
+.endif # AGG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-agg
diff --git a/graphics/babl/buildlink3.mk b/graphics/babl/buildlink3.mk
index b0d416ebe97..5a17e572f72 100644
--- a/graphics/babl/buildlink3.mk
+++ b/graphics/babl/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/08/19 17:51:14 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:36 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BABL_BUILDLINK3_MK:=	${BABL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	babl
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	babl
-.endif
+.if !defined(BABL_BUILDLINK3_MK)
+BABL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbabl}
-BUILDLINK_PACKAGES+=	babl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}babl
-
-.if ${BABL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.babl+=	babl>=0.0.22
 BUILDLINK_PKGSRCDIR.babl?=	../../graphics/babl
-.endif	# BABL_BUILDLINK3_MK
 
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # BABL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-babl
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index a0c1b245d01..2fbbbf15ff5 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.30 2008/10/17 13:00:44 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:37 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CAIRO_BUILDLINK3_MK:=	${CAIRO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cairo
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	cairo
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncairo}
-BUILDLINK_PACKAGES+=	cairo
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cairo
+.if !defined(CAIRO_BUILDLINK3_MK)
+CAIRO_BUILDLINK3_MK:=
 
-.if ${CAIRO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.0.0nb2
 BUILDLINK_ABI_DEPENDS.cairo+=	cairo>=1.6.4
 BUILDLINK_PKGSRCDIR.cairo?=	../../graphics/cairo
@@ -19,7 +12,6 @@ BUILDLINK_PKGSRCDIR.cairo?=	../../graphics/cairo
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 BUILDLINK_API_DEPENDS.glitz+=	glitz>=0.5.1
 BUILDLINK_API_DEPENDS.pixman+=	pixman>=0.12.0
-.endif	# CAIRO_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -35,5 +27,6 @@ pkgbase := cairo
 .include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
+.endif # CAIRO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cairo
diff --git a/graphics/cairomm/buildlink3.mk b/graphics/cairomm/buildlink3.mk
index 97919cbb172..f6367959c8f 100644
--- a/graphics/cairomm/buildlink3.mk
+++ b/graphics/cairomm/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/09/06 19:56:40 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CAIROMM_BUILDLINK3_MK:=	${CAIROMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cairomm
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	cairomm
-.endif
+.if !defined(CAIROMM_BUILDLINK3_MK)
+CAIROMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncairomm}
-BUILDLINK_PACKAGES+=	cairomm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cairomm
-
-.if ${CAIROMM_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.cairomm+=	cairomm>=1.2.2
 BUILDLINK_PKGSRCDIR.cairomm?=	../../graphics/cairomm
-.endif	# CAIROMM_BUILDLINK3_MK
 
 .include "../../graphics/cairo/buildlink3.mk"
+.endif # CAIROMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cairomm
diff --git a/graphics/cal3d/buildlink3.mk b/graphics/cal3d/buildlink3.mk
index cd4e7cf7171..f4a0fba037f 100644
--- a/graphics/cal3d/buildlink3.mk
+++ b/graphics/cal3d/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:50 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:37 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CAL3D_BUILDLINK3_MK:=	${CAL3D_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cal3d
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cal3d
-.endif
+.if !defined(CAL3D_BUILDLINK3_MK)
+CAL3D_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncal3d}
-BUILDLINK_PACKAGES+=	cal3d
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cal3d
-
-.if !empty(CAL3D_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cal3d+=	cal3d>=0.9.1
 BUILDLINK_ABI_DEPENDS.cal3d+=	cal3d>=0.9.1nb2
 BUILDLINK_PKGSRCDIR.cal3d?=	../../graphics/cal3d
-.endif	# CAL3D_BUILDLINK3_MK
 
 .include "../../graphics/Mesa/buildlink3.mk"
+.endif # CAL3D_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cal3d
diff --git a/graphics/camlimages/buildlink3.mk b/graphics/camlimages/buildlink3.mk
index a0d60c430db..366c7c69d33 100644
--- a/graphics/camlimages/buildlink3.mk
+++ b/graphics/camlimages/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:50 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:37 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CAMLIMAGES_BUILDLINK3_MK:=	${CAMLIMAGES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	camlimages
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	camlimages
-.endif
+.if !defined(CAMLIMAGES_BUILDLINK3_MK)
+CAMLIMAGES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncamlimages}
-BUILDLINK_PACKAGES+=	camlimages
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}camlimages
-
-.if !empty(CAMLIMAGES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.camlimages+=	camlimages>=2.2.0
 BUILDLINK_ABI_DEPENDS.camlimages?=	camlimages>=2.2.0nb1
 BUILDLINK_PKGSRCDIR.camlimages?=	../../graphics/camlimages
-.endif	# CAMLIMAGES_BUILDLINK3_MK
+.endif # CAMLIMAGES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-camlimages
diff --git a/graphics/clutter-cairo/buildlink3.mk b/graphics/clutter-cairo/buildlink3.mk
index 24fae3bffe1..837ba89552d 100644
--- a/graphics/clutter-cairo/buildlink3.mk
+++ b/graphics/clutter-cairo/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/14 11:04:35 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CLUTTER_CAIRO_BUILDLINK3_MK:=	${CLUTTER_CAIRO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	clutter-cairo
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	clutter-cairo
-.endif
+.if !defined(CLUTTER_CAIRO_BUILDLINK3_MK)
+CLUTTER_CAIRO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclutter-cairo}
-BUILDLINK_PACKAGES+=	clutter-cairo
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clutter-cairo
-
-.if ${CLUTTER_CAIRO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.clutter-cairo+=	clutter-cairo>=0.8.0
 BUILDLINK_PKGSRCDIR.clutter-cairo?=	../../graphics/clutter-cairo
-.endif	# CLUTTER_CAIRO_BUILDLINK3_MK
 
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/clutter/buildlink3.mk"
+.endif # CLUTTER_CAIRO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-clutter-cairo
diff --git a/graphics/clutter-gtk/buildlink3.mk b/graphics/clutter-gtk/buildlink3.mk
index f9fe6d66af6..646c775cd04 100644
--- a/graphics/clutter-gtk/buildlink3.mk
+++ b/graphics/clutter-gtk/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/14 11:06:42 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CLUTTER_GTK_BUILDLINK3_MK:=	${CLUTTER_GTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	clutter-gtk
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	clutter-gtk
-.endif
+.if !defined(CLUTTER_GTK_BUILDLINK3_MK)
+CLUTTER_GTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclutter-gtk}
-BUILDLINK_PACKAGES+=	clutter-gtk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clutter-gtk
-
-.if ${CLUTTER_GTK_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.clutter-gtk+=	clutter-gtk>=0.8.0
 BUILDLINK_PKGSRCDIR.clutter-gtk?=	../../graphics/clutter-gtk
-.endif	# CLUTTER_GTK_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/clutter/buildlink3.mk"
+.endif # CLUTTER_GTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-clutter-gtk
diff --git a/graphics/clutter/buildlink3.mk b/graphics/clutter/buildlink3.mk
index 4d7d0b92820..f0656367dd3 100644
--- a/graphics/clutter/buildlink3.mk
+++ b/graphics/clutter/buildlink3.mk
@@ -1,24 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/14 10:57:18 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CLUTTER_BUILDLINK3_MK:=	${CLUTTER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	clutter
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	clutter
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclutter}
-BUILDLINK_PACKAGES+=	clutter
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clutter
+.if !defined(CLUTTER_BUILDLINK3_MK)
+CLUTTER_BUILDLINK3_MK:=
 
-.if ${CLUTTER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.clutter+=	clutter>=0.8.0
 BUILDLINK_PKGSRCDIR.clutter?=	../../graphics/clutter
 
 PRINT_PLIST_AWK+=	/^@dirrm include\/clutter-0.8$$/ \
 				{ print "@comment in clutter: " $$0; next; }
-.endif	# CLUTTER_BUILDLINK3_MK
 
 pkgbase := clutter
 .include "../../mk/pkg-build-options.mk"
@@ -36,5 +28,6 @@ pkgbase := clutter
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
+.endif # CLUTTER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-clutter
diff --git a/graphics/compface/buildlink3.mk b/graphics/compface/buildlink3.mk
index b8a709c98bc..5859f41a946 100644
--- a/graphics/compface/buildlink3.mk
+++ b/graphics/compface/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:50 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:37 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-COMPFACE_BUILDLINK3_MK:=	${COMPFACE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	compface
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	compface
-.endif
+.if !defined(COMPFACE_BUILDLINK3_MK)
+COMPFACE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncompface}
-BUILDLINK_PACKAGES+=	compface
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compface
-
-.if !empty(COMPFACE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.compface+=	compface>=1.4
 BUILDLINK_ABI_DEPENDS.compface?=	compface>=1.5.1nb1
 BUILDLINK_PKGSRCDIR.compface?=	../../graphics/compface
-.endif	# COMPFACE_BUILDLINK3_MK
+.endif # COMPFACE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-compface
diff --git a/graphics/digikam/buildlink3.mk b/graphics/digikam/buildlink3.mk
index 336287c791d..b7ee606d7a6 100644
--- a/graphics/digikam/buildlink3.mk
+++ b/graphics/digikam/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.19 2009/01/07 01:43:49 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:37 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DIGIKAM_BUILDLINK3_MK:=	${DIGIKAM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	digikam
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	digikam
-.endif
+.if !defined(DIGIKAM_BUILDLINK3_MK)
+DIGIKAM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndigikam}
-BUILDLINK_PACKAGES+=	digikam
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}digikam
-
-.if !empty(DIGIKAM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.digikam+=	digikam>=0.8.1
 BUILDLINK_ABI_DEPENDS.digikam?=	digikam>=0.9.5beta1nb1
 BUILDLINK_PKGSRCDIR.digikam?=	../../graphics/digikam
-.endif	# DIGIKAM_BUILDLINK3_MK
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
@@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.digikam?=	../../graphics/digikam
 .include "../../graphics/libkipi/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
+.endif # DIGIKAM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-digikam
diff --git a/graphics/djvulibre-lib/buildlink3.mk b/graphics/djvulibre-lib/buildlink3.mk
index b6568863819..a8a0e19c1a9 100644
--- a/graphics/djvulibre-lib/buildlink3.mk
+++ b/graphics/djvulibre-lib/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/08/30 17:03:28 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-DJVULIBRE_LIB_BUILDLINK3_MK:=	${DJVULIBRE_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	djvulibre-lib
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	djvulibre-lib
-.endif
+.if !defined(DJVULIBRE_LIB_BUILDLINK3_MK)
+DJVULIBRE_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndjvulibre-lib}
-BUILDLINK_PACKAGES+=	djvulibre-lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}djvulibre-lib
-
-.if ${DJVULIBRE_LIB_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.djvulibre-lib+=	djvulibre-lib>=3.5.17
 BUILDLINK_PKGSRCDIR.djvulibre-lib?=	../../graphics/djvulibre-lib
-.endif	# DJVULIBRE_LIB_BUILDLINK3_MK
+.endif # DJVULIBRE_LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-djvulibre-lib
diff --git a/graphics/epeg/buildlink3.mk b/graphics/epeg/buildlink3.mk
index 56402c48882..db5e45b62dc 100644
--- a/graphics/epeg/buildlink3.mk
+++ b/graphics/epeg/buildlink3.mk
@@ -1,21 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:50 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EPEG_BUILDLINK3_MK:=	${EPEG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	epeg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	epeg
-.endif
+.if !defined(EPEG_BUILDLINK3_MK)
+EPEG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES+=	epeg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}epeg
-
-.if !empty(EPEG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.epeg+=	epeg>=0.9.0
 BUILDLINK_PKGSRCDIR.epeg?=	../../graphics/epeg
-.endif	# EPEG_BUILDLINK3_MK
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.endif # EPEG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-epeg
diff --git a/graphics/evas-buffer/buildlink3.mk b/graphics/evas-buffer/buildlink3.mk
index 05f9b27201d..0ae23e4459b 100644
--- a/graphics/evas-buffer/buildlink3.mk
+++ b/graphics/evas-buffer/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 18:56:19 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-EVAS_BUFFER_BUILDLINK3_MK:=	${EVAS_BUFFER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	evas-buffer
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	evas-buffer
-.endif
+.if !defined(EVAS_BUFFER_BUILDLINK3_MK)
+EVAS_BUFFER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nevas-buffer}
-BUILDLINK_PACKAGES+=	evas-buffer
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evas-buffer
-
-.if ${EVAS_BUFFER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.evas-buffer+=	evas-buffer>=0.9.9.050
 BUILDLINK_PKGSRCDIR.evas-buffer?=	../../graphics/evas-buffer
-.endif	# EVAS_BUFFER_BUILDLINK3_MK
+.endif # EVAS_BUFFER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-evas-buffer
diff --git a/graphics/evas-software-x11/buildlink3.mk b/graphics/evas-software-x11/buildlink3.mk
index a0a6bd497c8..164a054237a 100644
--- a/graphics/evas-software-x11/buildlink3.mk
+++ b/graphics/evas-software-x11/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 19:14:12 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-EVAS_SOFTWARE_X11_BUILDLINK3_MK:=	${EVAS_SOFTWARE_X11_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	evas-software-x11
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	evas-software-x11
-.endif
+.if !defined(EVAS_SOFTWARE_X11_BUILDLINK3_MK)
+EVAS_SOFTWARE_X11_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nevas-software-x11}
-BUILDLINK_PACKAGES+=	evas-software-x11
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evas-software-x11
-
-.if ${EVAS_SOFTWARE_X11_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.evas-software-x11+=	evas-software-x11>=0.9.9.050
 BUILDLINK_PKGSRCDIR.evas-software-x11?=	../../graphics/evas-software-x11
-.endif	# EVAS_SOFTWARE_X11_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
+.endif # EVAS_SOFTWARE_X11_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-evas-software-x11
diff --git a/graphics/evas/buildlink3.mk b/graphics/evas/buildlink3.mk
index fcfd7382274..a894deb7f75 100644
--- a/graphics/evas/buildlink3.mk
+++ b/graphics/evas/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 18:12:55 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EVAS_BUILDLINK3_MK:=	${EVAS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	evas
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	evas
-.endif
+.if !defined(EVAS_BUILDLINK3_MK)
+EVAS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nevas}
-BUILDLINK_PACKAGES+=	evas
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evas
-
-.if ${EVAS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.evas+=	evas>=0.9.9.050
 BUILDLINK_PKGSRCDIR.evas?=	../../graphics/evas
-.endif	# EVAS_BUILDLINK3_MK
 
 .include "../../devel/eet/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.endif # EVAS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-evas
diff --git a/graphics/exiv2/buildlink3.mk b/graphics/exiv2/buildlink3.mk
index 50444b50c9e..c5253dde7eb 100644
--- a/graphics/exiv2/buildlink3.mk
+++ b/graphics/exiv2/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/01/07 01:07:51 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EXIV2_BUILDLINK3_MK:=	${EXIV2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	exiv2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	exiv2
-.endif
+.if !defined(EXIV2_BUILDLINK3_MK)
+EXIV2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nexiv2}
-BUILDLINK_PACKAGES+=	exiv2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}exiv2
-
-.if ${EXIV2_BUILDLINK3_MK} == "+"
 # 0.18 changes the signature of printTag
 BUILDLINK_API_DEPENDS.exiv2+=	exiv2>=0.18
 BUILDLINK_ABI_DEPENDS.exiv2+=	exiv2>=0.18
 BUILDLINK_PKGSRCDIR.exiv2?=	../../graphics/exiv2
-.endif	# EXIV2_BUILDLINK3_MK
+.endif # EXIV2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-exiv2
diff --git a/graphics/fnlib/buildlink3.mk b/graphics/fnlib/buildlink3.mk
index 722ac8a44a7..898211a3e0a 100644
--- a/graphics/fnlib/buildlink3.mk
+++ b/graphics/fnlib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:50 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FNLIB_BUILDLINK3_MK:=	${FNLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fnlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	fnlib
-.endif
+.if !defined(FNLIB_BUILDLINK3_MK)
+FNLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfnlib}
-BUILDLINK_PACKAGES+=	fnlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fnlib
-
-.if !empty(FNLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fnlib+=	fnlib>=0.5nb6
 BUILDLINK_ABI_DEPENDS.fnlib+=	fnlib>=0.5nb10
 BUILDLINK_PKGSRCDIR.fnlib?=	../../graphics/fnlib
-.endif	# FNLIB_BUILDLINK3_MK
 
 .include "../../graphics/imlib/buildlink3.mk"
+.endif # FNLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fnlib
diff --git a/graphics/freeglut/buildlink3.mk b/graphics/freeglut/buildlink3.mk
index 0ea88c55834..34c977b2d1e 100644
--- a/graphics/freeglut/buildlink3.mk
+++ b/graphics/freeglut/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/11/08 01:10:12 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FREEGLUT_BUILDLINK3_MK:=	${FREEGLUT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	freeglut
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	freeglut
-.endif
+.if !defined(FREEGLUT_BUILDLINK3_MK)
+FREEGLUT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreeglut}
-BUILDLINK_PACKAGES+=	freeglut
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freeglut
-
-.if !empty(FREEGLUT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.freeglut+=	freeglut>=2.2.0
 BUILDLINK_ABI_DEPENDS.freeglut+=	freeglut>=2.2.0nb3
 BUILDLINK_PKGSRCDIR.freeglut?=	../../graphics/freeglut
-.endif	# FREEGLUT_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.endif # FREEGLUT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-freeglut
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index f64936796b5..83e2d27e9bc 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FREETYPE_BUILDLINK3_MK:=	${FREETYPE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	freetype
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	freetype
-.endif
+.if !defined(FREETYPE_BUILDLINK3_MK)
+FREETYPE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreetype}
-BUILDLINK_PACKAGES+=	freetype
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freetype
-
-.if !empty(FREETYPE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.freetype+=	freetype-lib>=1.3.1nb1
 BUILDLINK_ABI_DEPENDS.freetype+=freetype-lib>=1.3.1nb2
 BUILDLINK_ABI_DEPENDS.freetype?=	freetype-lib>=1.3.1nb3
 BUILDLINK_PKGSRCDIR.freetype?=	../../graphics/freetype-lib
-.endif	# FREETYPE_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # FREETYPE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-freetype
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index 5d537b2c993..ac4c8033aeb 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.29 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	freetype2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	freetype2
-.endif
+.if !defined(FREETYPE2_BUILDLINK3_MK)
+FREETYPE2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreetype2}
-BUILDLINK_PACKAGES+=	freetype2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freetype2
-
-.if !empty(FREETYPE2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.8
 BUILDLINK_ABI_DEPENDS.freetype2+=	freetype2>=2.1.10nb1
 BUILDLINK_PKGSRCDIR.freetype2?=	../../graphics/freetype2
@@ -19,7 +12,6 @@ BUILDLINK_INCDIRS.freetype2?=	include/freetype2
 
 FREETYPE_CONFIG?=	${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
 CONFIGURE_ENV+=		FREETYPE_CONFIG=${FREETYPE_CONFIG:Q}
+.endif # FREETYPE2_BUILDLINK3_MK
 
-.endif	# FREETYPE2_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-freetype2
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 267fce41fb0..24382910cc6 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/11/20 17:25:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GD_BUILDLINK3_MK:=	${GD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gd
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gd
-.endif
+.if !defined(GD_BUILDLINK3_MK)
+GD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngd}
-BUILDLINK_PACKAGES+=	gd
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gd
-
-.if !empty(GD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gd+=		gd>=2.0.15nb1
 BUILDLINK_ABI_DEPENDS.gd+=	gd>=2.0.33nb3
 BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd
-.endif	# GD_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
@@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd
 .include "../../graphics/png/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
+.endif # GD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gd
diff --git a/graphics/gdchart/buildlink3.mk b/graphics/gdchart/buildlink3.mk
index 035eea49e60..e93781841d0 100644
--- a/graphics/gdchart/buildlink3.mk
+++ b/graphics/gdchart/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GDCHART_BUILDLINK3_MK:=	${GDCHART_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gdchart
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gdchart
-.endif
+.if !defined(GDCHART_BUILDLINK3_MK)
+GDCHART_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdchart}
-BUILDLINK_PACKAGES+=	gdchart
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdchart
-
-.if !empty(GDCHART_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gdchart+=	gdchart>=0.11.4nb1
 BUILDLINK_ABI_DEPENDS.gdchart+=	gdchart>=0.11.5nb2
 BUILDLINK_PKGSRCDIR.gdchart?=	../../graphics/gdchart
-.endif	# GDCHART_BUILDLINK3_MK
 
 .include "../../graphics/gd/buildlink3.mk"
+.endif # GDCHART_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gdchart
diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk
index 41034eb3c1c..815ff50b5d4 100644
--- a/graphics/gdk-pixbuf/buildlink3.mk
+++ b/graphics/gdk-pixbuf/buildlink3.mk
@@ -1,27 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:39 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GDK_PIXBUF_BUILDLINK3_MK:=	${GDK_PIXBUF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gdk-pixbuf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gdk-pixbuf
-.endif
+.if !defined(GDK_PIXBUF_BUILDLINK3_MK)
+GDK_PIXBUF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdk-pixbuf}
-BUILDLINK_PACKAGES+=	gdk-pixbuf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdk-pixbuf
-
-.if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gdk-pixbuf+=		gdk-pixbuf>=0.22.0nb2
 BUILDLINK_ABI_DEPENDS.gdk-pixbuf+=	gdk-pixbuf>=0.22.0nb8
 BUILDLINK_PKGSRCDIR.gdk-pixbuf?=	../../graphics/gdk-pixbuf
 BUILDLINK_CPPFLAGS.gdk-pixbuf+= \
 	-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0
-.endif	# GDK_PIXBUF_BUILDLINK3_MK
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.endif # GDK_PIXBUF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gdk-pixbuf
diff --git a/graphics/gegl/buildlink3.mk b/graphics/gegl/buildlink3.mk
index 03bb5b73334..9bacd23a11d 100644
--- a/graphics/gegl/buildlink3.mk
+++ b/graphics/gegl/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/02/03 06:21:40 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GEGL_BUILDLINK3_MK:=	${GEGL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gegl
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gegl
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngegl}
-BUILDLINK_PACKAGES+=	gegl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gegl
+.if !defined(GEGL_BUILDLINK3_MK)
+GEGL_BUILDLINK3_MK:=
 
-.if ${GEGL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gegl+=	gegl>=0.0.20
 BUILDLINK_PKGSRCDIR.gegl?=	../../graphics/gegl
-.endif	# GEGL_BUILDLINK3_MK
 
 pkgbase := gegl
 .include "../../mk/pkg-build-options.mk"
@@ -28,5 +20,6 @@ pkgbase := gegl
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GEGL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gegl
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index 5ef58a662ce..1da31be09c5 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.26 2008/09/30 19:55:03 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2009/03/20 19:24:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gimp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gimp
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp}
-BUILDLINK_PACKAGES+=	gimp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gimp
+.if !defined(GIMP_BUILDLINK3_MK)
+GIMP_BUILDLINK3_MK:=
 
-.if !empty(GIMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gimp+=	gimp>=2.4.0
 BUILDLINK_ABI_DEPENDS.gimp+=	gimp>=2.4.4
 BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp
-.endif	# GIMP_BUILDLINK3_MK
 
 pkgbase := gimp
 .include "../../mk/pkg-build-options.mk"
@@ -44,5 +36,6 @@ pkgbase := gimp
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GIMP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gimp
diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk
index 27413481875..a7e73782b8c 100644
--- a/graphics/gimp1-base/buildlink3.mk
+++ b/graphics/gimp1-base/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/12/15 20:32:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:39 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GIMP_BASE_BUILDLINK3_MK:=	${GIMP_BASE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gimp-base
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gimp-base
-.endif
+.if !defined(GIMP_BASE_BUILDLINK3_MK)
+GIMP_BASE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp-base}
-BUILDLINK_PACKAGES+=	gimp-base
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gimp-base
-
-.if !empty(GIMP_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gimp-base+=	gimp-base>=1.2.5nb2
 BUILDLINK_ABI_DEPENDS.gimp-base+=	gimp-base>=1.2.5nb5
 BUILDLINK_PKGSRCDIR.gimp-base?=	../../graphics/gimp1-base
-.endif	# GIMP_BASE_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gimp-base?=	../../graphics/gimp1-base
 .include "../../multimedia/mpeg-lib/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.endif # GIMP_BASE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gimp-base
diff --git a/graphics/gle/buildlink3.mk b/graphics/gle/buildlink3.mk
index 6af9f29f56c..bcd4b099b90 100644
--- a/graphics/gle/buildlink3.mk
+++ b/graphics/gle/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLE_BUILDLINK3_MK:=	${GLE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gle
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gle
-.endif
+.if !defined(GLE_BUILDLINK3_MK)
+GLE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngle}
-BUILDLINK_PACKAGES+=	gle
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gle
-
-.if !empty(GLE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gle+=		gle>=3.0.3
 BUILDLINK_ABI_DEPENDS.gle+=	gle>=3.1.0nb2
 BUILDLINK_PKGSRCDIR.gle?=	../../graphics/gle
-.endif	# GLE_BUILDLINK3_MK
 
 .include "../../graphics/Mesa/buildlink3.mk"
+.endif # GLE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gle
diff --git a/graphics/glew/buildlink3.mk b/graphics/glew/buildlink3.mk
index fb0c88f0f34..a51a14ffe9a 100644
--- a/graphics/glew/buildlink3.mk
+++ b/graphics/glew/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/08/15 15:21:27 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLEW_BUILDLINK3_MK:=	${GLEW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	glew
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	glew
-.endif
+.if !defined(GLEW_BUILDLINK3_MK)
+GLEW_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglew}
-BUILDLINK_PACKAGES+=	glew
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glew
-
-.if !empty(GLEW_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glew+=	glew>=1.3.4
 BUILDLINK_ABI_DEPENDS.glew+=	glew>=1.3.4
 BUILDLINK_PKGSRCDIR.glew?=	../../graphics/glew
-.endif	# GLEW_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
+.endif # GLEW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-glew
diff --git a/graphics/glitz/buildlink3.mk b/graphics/glitz/buildlink3.mk
index 91b5ad0bff0..3f9535e3b34 100644
--- a/graphics/glitz/buildlink3.mk
+++ b/graphics/glitz/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/23 01:24:38 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLITZ_BUILDLINK3_MK:=	${GLITZ_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	glitz
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	glitz
-.endif
+.if !defined(GLITZ_BUILDLINK3_MK)
+GLITZ_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglitz}
-BUILDLINK_PACKAGES+=	glitz
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glitz
-
-.if !empty(GLITZ_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glitz+=	glitz>=0.4.4
 BUILDLINK_ABI_DEPENDS.glitz+=	glitz>=0.4.4nb2
 BUILDLINK_PKGSRCDIR.glitz?=	../../graphics/glitz
-.endif	# GLITZ_BUILDLINK3_MK
+.endif # GLITZ_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-glitz
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 8d98d52c4eb..f019fc7bfe8 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.33 2008/04/24 11:57:35 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2009/03/20 19:24:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	glu
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	glu
-.endif
+.if !defined(GLU_BUILDLINK3_MK)
+GLU_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglu}
-BUILDLINK_PACKAGES+=	glu
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glu
-
-.if !empty(GLU_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glu+=	glu>=3.4.2
 BUILDLINK_ABI_DEPENDS.glu+=	glu>=7.0.3
 BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
-.endif	# GLU_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
+.endif # GLU_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-glu
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index 16803c04514..aa86eb02921 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/01/16 07:55:17 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:39 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLUT_BUILDLINK3_MK:=	${GLUT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	glut
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	glut
-.endif
+.if !defined(GLUT_BUILDLINK3_MK)
+GLUT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglut}
-BUILDLINK_PACKAGES+=	glut
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glut
-
-.if !empty(GLUT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glut+=	glut>=3.4.2
 BUILDLINK_ABI_DEPENDS.glut+=	glut>=7.0.3
 BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
-.endif	# GLUT_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
+.endif # GLUT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-glut
diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk
index 2f53a6e3c7f..c4b226cbc62 100644
--- a/graphics/gnome-icon-theme/buildlink3.mk
+++ b/graphics/gnome-icon-theme/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:39 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GNOME_ICON_THEME_BUILDLINK3_MK:=	${GNOME_ICON_THEME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-icon-theme
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-icon-theme
-.endif
+.if !defined(GNOME_ICON_THEME_BUILDLINK3_MK)
+GNOME_ICON_THEME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-icon-theme}
-BUILDLINK_PACKAGES+=	gnome-icon-theme
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-icon-theme
-
-.if !empty(GNOME_ICON_THEME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.8.0
 BUILDLINK_ABI_DEPENDS.gnome-icon-theme?=	gnome-icon-theme>=2.12.1nb2
 BUILDLINK_PKGSRCDIR.gnome-icon-theme?=	../../graphics/gnome-icon-theme
@@ -30,6 +23,6 @@ PRINT_PLIST_AWK+=	/^@dirrm ${d:S/\//\\\//g}$$/ \
 			{ print "@comment in gnome-icon-theme: " $$0; next; }
 .  endfor
 .  undef dirs
-.endif	# GNOME_ICON_THEME_BUILDLINK3_MK
+.endif # GNOME_ICON_THEME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-icon-theme
diff --git a/graphics/goocanvas/buildlink3.mk b/graphics/goocanvas/buildlink3.mk
index c61602e56ff..94fb68237fd 100644
--- a/graphics/goocanvas/buildlink3.mk
+++ b/graphics/goocanvas/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/22 10:27:17 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:40 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GOOCANVAS_BUILDLINK3_MK:=	${GOOCANVAS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	goocanvas
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	goocanvas
-.endif
+.if !defined(GOOCANVAS_BUILDLINK3_MK)
+GOOCANVAS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngoocanvas}
-BUILDLINK_PACKAGES+=	goocanvas
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}goocanvas
-
-.if ${GOOCANVAS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.goocanvas+=	goocanvas>=0.12
 BUILDLINK_PKGSRCDIR.goocanvas?=	../../graphics/goocanvas
-.endif	# GOOCANVAS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GOOCANVAS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-goocanvas
diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk
index e6eafb80dca..3ae060d06f9 100644
--- a/graphics/graphviz/buildlink3.mk
+++ b/graphics/graphviz/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/03/06 07:36:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:40 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GRAPHVIZ_BUILDLINK3_MK:=	${GRAPHVIZ_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	graphviz
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	graphviz
-.endif
+.if !defined(GRAPHVIZ_BUILDLINK3_MK)
+GRAPHVIZ_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngraphviz}
-BUILDLINK_PACKAGES+=	graphviz
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}graphviz
-
-.if ${GRAPHVIZ_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.graphviz+=	graphviz>=1.12
 BUILDLINK_ABI_DEPENDS.graphviz+=	graphviz>=2.6nb5
 BUILDLINK_PKGSRCDIR.graphviz?=	../../graphics/graphviz
-.endif	# GRAPHVIZ_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.endif # GRAPHVIZ_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-graphviz
diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk
index 9676d5d1a06..24d2aaa6c45 100644
--- a/graphics/gtkglext/buildlink3.mk
+++ b/graphics/gtkglext/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:40 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTKGLEXT_BUILDLINK3_MK:=	${GTKGLEXT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtkglext
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtkglext
-.endif
+.if !defined(GTKGLEXT_BUILDLINK3_MK)
+GTKGLEXT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkglext}
-BUILDLINK_PACKAGES+=	gtkglext
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkglext
-
-.if !empty(GTKGLEXT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkglext+=	gtkglext>=1.2.0
 BUILDLINK_ABI_DEPENDS.gtkglext?=	gtkglext>=1.2.0nb1
 BUILDLINK_PKGSRCDIR.gtkglext?=	../../graphics/gtkglext
-.endif	# GTKGLEXT_BUILDLINK3_MK
 
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GTKGLEXT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtkglext
diff --git a/graphics/gtkimageview/buildlink3.mk b/graphics/gtkimageview/buildlink3.mk
index 75a865d0439..362d7f857b1 100644
--- a/graphics/gtkimageview/buildlink3.mk
+++ b/graphics/gtkimageview/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/08/31 00:09:13 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:40 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTKIMAGEVIEW_BUILDLINK3_MK:=	${GTKIMAGEVIEW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtkimageview
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gtkimageview
-.endif
+.if !defined(GTKIMAGEVIEW_BUILDLINK3_MK)
+GTKIMAGEVIEW_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkimageview}
-BUILDLINK_PACKAGES+=	gtkimageview
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkimageview
-
-.if ${GTKIMAGEVIEW_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gtkimageview+=	gtkimageview>=1.3.0
 BUILDLINK_PKGSRCDIR.gtkimageview?=	../../graphics/gtkimageview
-.endif	# GTKIMAGEVIEW_BUILDLINK3_MK
+.endif # GTKIMAGEVIEW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtkimageview
diff --git a/graphics/guile-cairo/buildlink3.mk b/graphics/guile-cairo/buildlink3.mk
index bc7e846d588..bbc5f62d9f7 100644
--- a/graphics/guile-cairo/buildlink3.mk
+++ b/graphics/guile-cairo/buildlink3.mk
@@ -1,18 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/08/10 21:21:01 gdt Exp $
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GUILE_CAIRO_BUILDLINK3_MK:=	${GUILE_CAIRO_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:40 joerg Exp $
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	guile-cairo
-.endif
+BUILDLINK_TREE+=	guile-cairo
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile-cairo}
-BUILDLINK_PACKAGES+=	guile-cairo
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile-cairo
+.if !defined(GUILE_CAIRO_BUILDLINK3_MK)
+GUILE_CAIRO_BUILDLINK3_MK:=
 
-.if ${GUILE_CAIRO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.guile-cairo+=	guile-cairo>=1.4.0
 BUILDLINK_PKGSRCDIR.guile-cairo?=	../../graphics/guile-cairo
-.endif	# GUILE_CAIRO_BUILDLINK3_MK
+.endif # GUILE_CAIRO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-guile-cairo
diff --git a/graphics/hermes/buildlink3.mk b/graphics/hermes/buildlink3.mk
index 412b696c935..8b49ee7d71b 100644
--- a/graphics/hermes/buildlink3.mk
+++ b/graphics/hermes/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:40 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-HERMES_BUILDLINK3_MK:=	${HERMES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Hermes
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Hermes
-.endif
+.if !defined(HERMES_BUILDLINK3_MK)
+HERMES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NHermes}
-BUILDLINK_PACKAGES+=	Hermes
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Hermes
-
-.if !empty(HERMES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Hermes+=	Hermes>=1.3.2
 BUILDLINK_ABI_DEPENDS.Hermes+=	Hermes>=1.3.3nb2
 BUILDLINK_PKGSRCDIR.Hermes?=	../../graphics/hermes
-.endif	# HERMES_BUILDLINK3_MK
+.endif # HERMES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Hermes
diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk
index 9b962ab5cc0..414226c49b8 100644
--- a/graphics/hicolor-icon-theme/buildlink3.mk
+++ b/graphics/hicolor-icon-theme/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/01/13 16:27:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:40 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-HICOLOR_ICON_THEME_BUILDLINK3_MK:=	${HICOLOR_ICON_THEME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	hicolor-icon-theme
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	hicolor-icon-theme
-.endif
+.if !defined(HICOLOR_ICON_THEME_BUILDLINK3_MK)
+HICOLOR_ICON_THEME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhicolor-icon-theme}
-BUILDLINK_PACKAGES+=	hicolor-icon-theme
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hicolor-icon-theme
-
-.if !empty(HICOLOR_ICON_THEME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.hicolor-icon-theme+=	hicolor-icon-theme>=0.4
 BUILDLINK_ABI_DEPENDS.hicolor-icon-theme+=	hicolor-icon-theme>=0.9nb1
 BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme
@@ -53,6 +46,6 @@ guic-buildlink-fake:
 		${CHMOD} +x ${_GUIC_FAKE};				\
 	fi
 .endif	# HICOLOR_ICON_THEME_DEPEND_ONLY
-.endif	# HICOLOR_ICON_THEME_BUILDLINK3_MK
+.endif # HICOLOR_ICON_THEME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-hicolor-icon-theme
diff --git a/graphics/icon-naming-utils/buildlink3.mk b/graphics/icon-naming-utils/buildlink3.mk
index c6a47d63bd3..344fe68f9c9 100644
--- a/graphics/icon-naming-utils/buildlink3.mk
+++ b/graphics/icon-naming-utils/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/08/19 13:36:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:40 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-ICON_NAMING_UTILS_BUILDLINK3_MK:=	${ICON_NAMING_UTILS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	icon-naming-utils
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	icon-naming-utils
-.endif
+.if !defined(ICON_NAMING_UTILS_BUILDLINK3_MK)
+ICON_NAMING_UTILS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nicon-naming-utils}
-BUILDLINK_PACKAGES+=	icon-naming-utils
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}icon-naming-utils
-
-.if ${ICON_NAMING_UTILS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.icon-naming-utils+=	icon-naming-utils>=0.8.7
 BUILDLINK_DEPMETHOD.icon-naming-utils?=		build
 BUILDLINK_PKGSRCDIR.icon-naming-utils?=		../../graphics/icon-naming-utils
-.endif	# ICON_NAMING_UTILS_BUILDLINK3_MK
+.endif # ICON_NAMING_UTILS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-icon-naming-utils
diff --git a/graphics/ilmbase/buildlink3.mk b/graphics/ilmbase/buildlink3.mk
index 7787a338a00..fadc5e17a75 100644
--- a/graphics/ilmbase/buildlink3.mk
+++ b/graphics/ilmbase/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/11/30 21:50:22 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:40 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ILMBASE_BUILDLINK3_MK:=	${ILMBASE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ilmbase
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ilmbase
-.endif
+.if !defined(ILMBASE_BUILDLINK3_MK)
+ILMBASE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nilmbase}
-BUILDLINK_PACKAGES+=	ilmbase
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ilmbase
-
-.if ${ILMBASE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ilmbase+=	ilmbase>=1.0.1
 BUILDLINK_PKGSRCDIR.ilmbase?=	../../graphics/ilmbase
-.endif	# ILMBASE_BUILDLINK3_MK
+.endif # ILMBASE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ilmbase
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index 7af8bcac22f..7788b77cd5c 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/01/31 01:38:48 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:40 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-IMLIB_BUILDLINK3_MK:=	${IMLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	imlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	imlib
-.endif
+.if !defined(IMLIB_BUILDLINK3_MK)
+IMLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nimlib}
-BUILDLINK_PACKAGES+=	imlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}imlib
-
-.if !empty(IMLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.imlib+=	imlib>=1.9.14nb5
 BUILDLINK_ABI_DEPENDS.imlib+=	imlib>=1.9.15nb4
 BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
-.endif	# IMLIB_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
+.endif # IMLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-imlib
diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk
index 2ed59418c95..a10b05eb409 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/11/17 01:40:50 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:41 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-IMLIB2_BUILDLINK3_MK:=	${IMLIB2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	imlib2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	imlib2
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nimlib2}
-BUILDLINK_PACKAGES+=	imlib2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}imlib2
+.if !defined(IMLIB2_BUILDLINK3_MK)
+IMLIB2_BUILDLINK3_MK:=
 
-.if !empty(IMLIB2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.imlib2+=	imlib2>=1.1.0nb2
 BUILDLINK_ABI_DEPENDS.imlib2+=	imlib2>=1.2.0nb5
 BUILDLINK_PKGSRCDIR.imlib2?=	../../graphics/imlib2
-.endif	# IMLIB2_BUILDLINK3_MK
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
@@ -39,5 +31,6 @@ pkgbase := imlib2
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .endif
+.endif # IMLIB2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-imlib2
diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk
index ed84c148e1d..4e3ef783860 100644
--- a/graphics/jasper/buildlink3.mk
+++ b/graphics/jasper/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/01/17 23:47:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:41 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-JASPER_BUILDLINK3_MK:=	${JASPER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	jasper
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	jasper
-.endif
+.if !defined(JASPER_BUILDLINK3_MK)
+JASPER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njasper}
-BUILDLINK_PACKAGES+=	jasper
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jasper
-
-.if !empty(JASPER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.jasper+=	jasper>=1.600.0
 BUILDLINK_ABI_DEPENDS.jasper+=	jasper>=1.900.0
 BUILDLINK_PKGSRCDIR.jasper?=	../../graphics/jasper
-.endif	# JASPER_BUILDLINK3_MK
 
 .include "../../graphics/jpeg/buildlink3.mk"
+.endif # JASPER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-jasper
diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk
index 92088a10853..874ca963c68 100644
--- a/graphics/jpeg/buildlink3.mk
+++ b/graphics/jpeg/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:41 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-JPEG_BUILDLINK3_MK:=	${JPEG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	jpeg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	jpeg
-.endif
+.if !defined(JPEG_BUILDLINK3_MK)
+JPEG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njpeg}
-BUILDLINK_PACKAGES+=	jpeg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jpeg
-
-.if !empty(JPEG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.jpeg+=	jpeg>=6b
 BUILDLINK_ABI_DEPENDS.jpeg+=	jpeg>=6bnb2
 BUILDLINK_PKGSRCDIR.jpeg?=	../../graphics/jpeg
-.endif	# JPEG_BUILDLINK3_MK
+.endif # JPEG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-jpeg
diff --git a/graphics/kdegraphics3/buildlink3.mk b/graphics/kdegraphics3/buildlink3.mk
index 9223d9d00c7..b622210e9cb 100644
--- a/graphics/kdegraphics3/buildlink3.mk
+++ b/graphics/kdegraphics3/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/01/18 05:06:41 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:41 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-KDEGRAPHICS_BUILDLINK3_MK:=	${KDEGRAPHICS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kdegraphics
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	kdegraphics
-.endif
+.if !defined(KDEGRAPHICS_BUILDLINK3_MK)
+KDEGRAPHICS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdegraphics}
-BUILDLINK_PACKAGES+=	kdegraphics
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdegraphics
-
-.if !empty(KDEGRAPHICS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdegraphics+=	kdegraphics>=3.5.0nb2
 BUILDLINK_ABI_DEPENDS.kdegraphics?=	kdegraphics>=3.5.8nb3
 BUILDLINK_PKGSRCDIR.kdegraphics?=	../../graphics/kdegraphics3
-.endif	# KDEGRAPHICS_BUILDLINK3_MK
 
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
@@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.kdegraphics?=	../../graphics/kdegraphics3
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
+.endif # KDEGRAPHICS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kdegraphics
diff --git a/graphics/kipi-plugins/buildlink3.mk b/graphics/kipi-plugins/buildlink3.mk
index 56ba78072b1..8f2ce90de1a 100644
--- a/graphics/kipi-plugins/buildlink3.mk
+++ b/graphics/kipi-plugins/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/03/02 12:33:09 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:41 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-KIPI_PLUGINS_BUILDLINK3_MK:=	${KIPI_PLUGINS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kipi-plugins
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	kipi-plugins
-.endif
+.if !defined(KIPI_PLUGINS_BUILDLINK3_MK)
+KIPI_PLUGINS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkipi-plugins}
-BUILDLINK_PACKAGES+=	kipi-plugins
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kipi-plugins
-
-.if ${KIPI_PLUGINS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.kipi-plugins+=	kipi-plugins>=0.1.4nb6
 BUILDLINK_PKGSRCDIR.kipi-plugins?=	../../graphics/kipi-plugins
-.endif	# KIPI_PLUGINS_BUILDLINK3_MK
+.endif # KIPI_PLUGINS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kipi-plugins
diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk
index 3cef04af615..c32a6d96c8c 100644
--- a/graphics/lcms/buildlink3.mk
+++ b/graphics/lcms/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:41 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LCMS_BUILDLINK3_MK:=	${LCMS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	lcms
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	lcms
-.endif
+.if !defined(LCMS_BUILDLINK3_MK)
+LCMS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlcms}
-BUILDLINK_PACKAGES+=	lcms
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lcms
-
-.if !empty(LCMS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lcms+=	lcms>=1.06
 BUILDLINK_ABI_DEPENDS.lcms+=	lcms>=1.12nb2
 BUILDLINK_PKGSRCDIR.lcms?=	../../graphics/lcms
@@ -28,7 +21,6 @@ buildlink-include-lcms:
 		${LN} -s ${BUILDLINK_PREFIX.lcms}/include/${_h_} ${BUILDLINK_DIR}/include/lcms/${_h_}; \
 	fi
 .endfor
+.endif # LCMS_BUILDLINK3_MK
 
-.endif	# LCMS_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-lcms
diff --git a/graphics/lib3ds/buildlink3.mk b/graphics/lib3ds/buildlink3.mk
index 8136a910c18..a8832880390 100644
--- a/graphics/lib3ds/buildlink3.mk
+++ b/graphics/lib3ds/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:41 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIB3DS_BUILDLINK3_MK:=	${LIB3DS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	lib3ds
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	lib3ds
-.endif
+.if !defined(LIB3DS_BUILDLINK3_MK)
+LIB3DS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlib3ds}
-BUILDLINK_PACKAGES+=	lib3ds
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lib3ds
-
-.if !empty(LIB3DS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lib3ds+=	lib3ds>=1.2.0nb2
 BUILDLINK_ABI_DEPENDS.lib3ds?=	lib3ds>=1.2.0nb4
 BUILDLINK_PKGSRCDIR.lib3ds?=	../../graphics/lib3ds
-.endif	# LIB3DS_BUILDLINK3_MK
 
 .include "../../graphics/Mesa/buildlink3.mk"
+.endif # LIB3DS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-lib3ds
diff --git a/graphics/libart/buildlink3.mk b/graphics/libart/buildlink3.mk
index 0655316f68c..c051da5108a 100644
--- a/graphics/libart/buildlink3.mk
+++ b/graphics/libart/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/09/21 13:00:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:41 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBART_BUILDLINK3_MK:=	${LIBART_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libart
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libart
-.endif
+.if !defined(LIBART_BUILDLINK3_MK)
+LIBART_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibart}
-BUILDLINK_PACKAGES+=	libart
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libart
-
-.if !empty(LIBART_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libart+=	libart>=2.3.10nb1
 BUILDLINK_ABI_DEPENDS.libart+=	libart>=2.3.16nb1
 BUILDLINK_PKGSRCDIR.libart?=	../../graphics/libart
-.endif	# LIBART_BUILDLINK3_MK
+.endif # LIBART_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libart
diff --git a/graphics/libexif-gtk/buildlink3.mk b/graphics/libexif-gtk/buildlink3.mk
index 9cd9da9feb7..227fc24b289 100644
--- a/graphics/libexif-gtk/buildlink3.mk
+++ b/graphics/libexif-gtk/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:41 joerg Exp $
 #
 # This file was created automatically using createbuildlink-3.4.
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBEXIF_GTK_BUILDLINK3_MK:=	${LIBEXIF_GTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libexif-gtk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libexif-gtk
-.endif
+.if !defined(LIBEXIF_GTK_BUILDLINK3_MK)
+LIBEXIF_GTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibexif-gtk}
-BUILDLINK_PACKAGES+=	libexif-gtk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libexif-gtk
-
-.if !empty(LIBEXIF_GTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libexif-gtk+=	libexif-gtk>=0.3.3nb7
 BUILDLINK_ABI_DEPENDS.libexif-gtk+=	libexif-gtk>=0.3.5nb4
 BUILDLINK_PKGSRCDIR.libexif-gtk?=	../../graphics/libexif-gtk
-.endif	# LIBEXIF_GTK_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBEXIF_GTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libexif-gtk
diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk
index f435c795b7c..a7f3b267794 100644
--- a/graphics/libexif/buildlink3.mk
+++ b/graphics/libexif/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:41 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBEXIF_BUILDLINK3_MK:=	${LIBEXIF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libexif
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libexif
-.endif
+.if !defined(LIBEXIF_BUILDLINK3_MK)
+LIBEXIF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibexif}
-BUILDLINK_PACKAGES+=	libexif
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libexif
-
-.if !empty(LIBEXIF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libexif+=	libexif>=0.6.11
 BUILDLINK_ABI_DEPENDS.libexif+=	libexif>=0.6.13nb1
 BUILDLINK_PKGSRCDIR.libexif?=	../../graphics/libexif
-.endif	# LIBEXIF_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # LIBEXIF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libexif
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index b9b0991eb8e..1322ee19617 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.24 2008/10/07 13:23:25 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:24:41 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGDIPLUS_BUILDLINK3_MK:=	${LIBGDIPLUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgdiplus
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libgdiplus
-.endif
+.if !defined(LIBGDIPLUS_BUILDLINK3_MK)
+LIBGDIPLUS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgdiplus}
-BUILDLINK_PACKAGES+=	libgdiplus
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgdiplus
-
-.if ${LIBGDIPLUS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libgdiplus+=	libgdiplus>=2.0
 BUILDLINK_ABI_DEPENDS.libgdiplus?=	libgdiplus>=2.0
 BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
-.endif	# LIBGDIPLUS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
@@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
+.endif # LIBGDIPLUS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgdiplus
diff --git a/graphics/libggi/buildlink3.mk b/graphics/libggi/buildlink3.mk
index ceafd241f05..5c13ed3dd44 100644
--- a/graphics/libggi/buildlink3.mk
+++ b/graphics/libggi/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/02/04 15:26:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:42 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBGGI_BUILDLINK3_MK:=	${LIBGGI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libggi
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libggi
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibggi}
-BUILDLINK_PACKAGES+=	libggi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libggi
+.if !defined(LIBGGI_BUILDLINK3_MK)
+LIBGGI_BUILDLINK3_MK:=
 
-.if !empty(LIBGGI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libggi+=	libggi>=2.1.0
 BUILDLINK_ABI_DEPENDS.libggi?=	libggi>=2.1.1nb1
 BUILDLINK_PKGSRCDIR.libggi?=	../../graphics/libggi
-.endif	# LIBGGI_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -27,5 +19,6 @@ BUILDLINK_PKGSRCDIR.libggi?=	../../graphics/libggi
 .include "../../graphics/libgii/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
+.endif # LIBGGI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libggi
diff --git a/graphics/libggiwmh/buildlink3.mk b/graphics/libggiwmh/buildlink3.mk
index dc3754ea308..4f8cf572073 100644
--- a/graphics/libggiwmh/buildlink3.mk
+++ b/graphics/libggiwmh/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGGIWMH_BUILDLINK3_MK:=	${LIBGGIWMH_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libggiwmh
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libggiwmh
-.endif
+.if !defined(LIBGGIWMH_BUILDLINK3_MK)
+LIBGGIWMH_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibggiwmh}
-BUILDLINK_PACKAGES+=	libggiwmh
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libggiwmh
-
-.if !empty(LIBGGIWMH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libggiwmh+=	libggiwmh>=0.2.0
 BUILDLINK_ABI_DEPENDS.libggiwmh?=	libggiwmh>=0.2.1nb1
 BUILDLINK_PKGSRCDIR.libggiwmh?=	../../graphics/libggiwmh
-.endif	# LIBGGIWMH_BUILDLINK3_MK
 
 .include "../../graphics/libggi/buildlink3.mk"
+.endif # LIBGGIWMH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libggiwmh
diff --git a/graphics/libgii/buildlink3.mk b/graphics/libgii/buildlink3.mk
index 6cdf45cc3e3..efcb9205294 100644
--- a/graphics/libgii/buildlink3.mk
+++ b/graphics/libgii/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/02/02 19:17:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:42 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBGII_BUILDLINK3_MK:=	${LIBGII_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgii
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgii
-.endif
+.if !defined(LIBGII_BUILDLINK3_MK)
+LIBGII_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgii}
-BUILDLINK_PACKAGES+=	libgii
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgii
-
-.if !empty(LIBGII_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgii+=	libgii>=0.9.0
 BUILDLINK_ABI_DEPENDS.libgii?=	libgii>=0.9.1nb1
 BUILDLINK_PKGSRCDIR.libgii?=	../../graphics/libgii
-.endif	# LIBGII_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
+.endif # LIBGII_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgii
diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index 8f1e7f77143..b401f13585e 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/10/16 17:49:18 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGNOMECANVAS_BUILDLINK3_MK:=	${LIBGNOMECANVAS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgnomecanvas
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnomecanvas
-.endif
+.if !defined(LIBGNOMECANVAS_BUILDLINK3_MK)
+LIBGNOMECANVAS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomecanvas}
-BUILDLINK_PACKAGES+=	libgnomecanvas
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomecanvas
-
-.if !empty(LIBGNOMECANVAS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomecanvas+=	libgnomecanvas>=2.8.0
 BUILDLINK_ABI_DEPENDS.libgnomecanvas+=	libgnomecanvas>=2.14.0nb1
 BUILDLINK_PKGSRCDIR.libgnomecanvas?=	../../graphics/libgnomecanvas
-.endif	# LIBGNOMECANVAS_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBGNOMECANVAS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgnomecanvas
diff --git a/graphics/libgnomecanvasmm/buildlink3.mk b/graphics/libgnomecanvasmm/buildlink3.mk
index 1748f0e2c50..fb0dfd9d722 100644
--- a/graphics/libgnomecanvasmm/buildlink3.mk
+++ b/graphics/libgnomecanvasmm/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/09/24 16:49:19 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:42 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-LIBGNOMECANVASMM_BUILDLINK3_MK:=	${LIBGNOMECANVASMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgnomecanvasmm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnomecanvasmm
-.endif
+.if !defined(LIBGNOMECANVASMM_BUILDLINK3_MK)
+LIBGNOMECANVASMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomecanvasmm}
-BUILDLINK_PACKAGES+=	libgnomecanvasmm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomecanvasmm
-
-.if !empty(LIBGNOMECANVASMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomecanvasmm+=	libgnomecanvasmm>=2.10.0
 BUILDLINK_ABI_DEPENDS.libgnomecanvasmm+=	libgnomecanvasmm>=2.14.0nb1
 BUILDLINK_PKGSRCDIR.libgnomecanvasmm?=	../../graphics/libgnomecanvasmm
-.endif	# LIBGNOMECANVASMM_BUILDLINK3_MK
 
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
+.endif # LIBGNOMECANVASMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgnomecanvasmm
diff --git a/graphics/libkdcraw/buildlink3.mk b/graphics/libkdcraw/buildlink3.mk
index 9740a84d295..a1cd48fe7b0 100644
--- a/graphics/libkdcraw/buildlink3.mk
+++ b/graphics/libkdcraw/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/01/18 05:06:42 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBKDCRAW_BUILDLINK3_MK:=	${LIBKDCRAW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libkdcraw
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libkdcraw
-.endif
+.if !defined(LIBKDCRAW_BUILDLINK3_MK)
+LIBKDCRAW_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibkdcraw}
-BUILDLINK_PACKAGES+=	libkdcraw
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libkdcraw
-
-.if ${LIBKDCRAW_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libkdcraw+=	libkdcraw>=0.1.1
 BUILDLINK_ABI_DEPENDS.libkdcraw?=	libkdcraw>=0.1.3nb1
 BUILDLINK_PKGSRCDIR.libkdcraw?=	../../graphics/libkdcraw
-.endif	# LIBKDCRAW_BUILDLINK3_MK
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
+.endif # LIBKDCRAW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libkdcraw
diff --git a/graphics/libkexif/buildlink3.mk b/graphics/libkexif/buildlink3.mk
index 035d284489f..502c67bb40d 100644
--- a/graphics/libkexif/buildlink3.mk
+++ b/graphics/libkexif/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:06:42 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBKEXIF_BUILDLINK3_MK:=	${LIBKEXIF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libkexif
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libkexif
-.endif
+.if !defined(LIBKEXIF_BUILDLINK3_MK)
+LIBKEXIF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibkexif}
-BUILDLINK_PACKAGES+=	libkexif
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libkexif
-
-.if !empty(LIBKEXIF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libkexif+=	libkexif>=0.2.5
 BUILDLINK_ABI_DEPENDS.libkexif?=	libkexif>=0.2.5nb4
 BUILDLINK_PKGSRCDIR.libkexif?=	../../graphics/libkexif
-.endif	# LIBKEXIF_BUILDLINK3_MK
 
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.endif # LIBKEXIF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libkexif
diff --git a/graphics/libkexiv2/buildlink3.mk b/graphics/libkexiv2/buildlink3.mk
index 9b350f2bd92..c68c49c5028 100644
--- a/graphics/libkexiv2/buildlink3.mk
+++ b/graphics/libkexiv2/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/01/18 05:06:42 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:42 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBKEXIV2_BUILDLINK3_MK:=	${LIBKEXIV2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libkexiv2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libkexiv2
-.endif
+.if !defined(LIBKEXIV2_BUILDLINK3_MK)
+LIBKEXIV2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibkexiv2}
-BUILDLINK_PACKAGES+=	libkexiv2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libkexiv2
-
-.if ${LIBKEXIV2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libkexiv2+=	libkexiv2>=0.1.1
 BUILDLINK_ABI_DEPENDS.libkexiv2+=	libkexiv2>=0.1.6nb2
 BUILDLINK_PKGSRCDIR.libkexiv2?=	../../graphics/libkexiv2
-.endif	# LIBKEXIV2_BUILDLINK3_MK
 
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
+.endif # LIBKEXIV2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libkexiv2
diff --git a/graphics/libkipi/buildlink3.mk b/graphics/libkipi/buildlink3.mk
index 99777de9533..0776645219c 100644
--- a/graphics/libkipi/buildlink3.mk
+++ b/graphics/libkipi/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:06:42 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:42 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBKIPI_BUILDLINK3_MK:=	${LIBKIPI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libkipi
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libkipi
-.endif
+.if !defined(LIBKIPI_BUILDLINK3_MK)
+LIBKIPI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibkipi}
-BUILDLINK_PACKAGES+=	libkipi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libkipi
-
-.if !empty(LIBKIPI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libkipi+=	libkipi>=0.1.5
 BUILDLINK_ABI_DEPENDS.libkipi?=	libkipi>=0.1.5nb5
 BUILDLINK_PKGSRCDIR.libkipi?=	../../graphics/libkipi
@@ -20,10 +13,10 @@ BUILDLINK_PKGSRCDIR.libkipi?=	../../graphics/libkipi
 PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
 				{ print "@comment in libkipi: " $$0; next; }
 .  endfor
-.endif	# LIBKIPI_BUILDLINK3_MK
 
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.endif # LIBKIPI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libkipi
diff --git a/graphics/liblqr/buildlink3.mk b/graphics/liblqr/buildlink3.mk
index c0f1d614e1d..f20c9ba9938 100644
--- a/graphics/liblqr/buildlink3.mk
+++ b/graphics/liblqr/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/05 02:00:39 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:42 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBLQR_BUILDLINK3_MK:=	${LIBLQR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	liblqr
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	liblqr
-.endif
+.if !defined(LIBLQR_BUILDLINK3_MK)
+LIBLQR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliblqr}
-BUILDLINK_PACKAGES+=	liblqr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblqr
-
-.if ${LIBLQR_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.liblqr+=	liblqr>=0.1.0.2
 BUILDLINK_PKGSRCDIR.liblqr?=	../../graphics/liblqr
-.endif	# LIBLQR_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.endif # LIBLQR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-liblqr
diff --git a/graphics/libotf/buildlink3.mk b/graphics/libotf/buildlink3.mk
index 2b0c8abc37d..6bfa898d83f 100644
--- a/graphics/libotf/buildlink3.mk
+++ b/graphics/libotf/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/26 11:47:35 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:43 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBOTF_BUILDLINK3_MK:=	${LIBOTF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libotf
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libotf
-.endif
+.if !defined(LIBOTF_BUILDLINK3_MK)
+LIBOTF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibotf}
-BUILDLINK_PACKAGES+=	libotf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libotf
-
-.if ${LIBOTF_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libotf+=	libotf>=0.9.7
 BUILDLINK_PKGSRCDIR.libotf?=	../../graphics/libotf
-.endif	# LIBOTF_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
+.endif # LIBOTF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libotf
diff --git a/graphics/libpuzzle/buildlink3.mk b/graphics/libpuzzle/buildlink3.mk
index 2a39b013be3..0323f912eca 100644
--- a/graphics/libpuzzle/buildlink3.mk
+++ b/graphics/libpuzzle/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/03/05 00:23:46 imil Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:43 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBPUZZLE_BUILDLINK3_MK:=	${LIBPUZZLE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libpuzzle
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libpuzzle
-.endif
+.if !defined(LIBPUZZLE_BUILDLINK3_MK)
+LIBPUZZLE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpuzzle}
-BUILDLINK_PACKAGES+=	libpuzzle
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpuzzle
-
-.if ${LIBPUZZLE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libpuzzle+=	libpuzzle>=0.9
 BUILDLINK_PKGSRCDIR.libpuzzle?=	../../graphics/libpuzzle
-.endif	# LIBPUZZLE_BUILDLINK3_MK
 
 .include "../../graphics/gd/buildlink3.mk"
+.endif # LIBPUZZLE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libpuzzle
diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk
index 605b0fa9e89..5d9899b7ecc 100644
--- a/graphics/librsvg/buildlink3.mk
+++ b/graphics/librsvg/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/02/27 20:11:20 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:43 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBRSVG_BUILDLINK3_MK:=		${LIBRSVG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	librsvg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	librsvg
-.endif
+.if !defined(LIBRSVG_BUILDLINK3_MK)
+LIBRSVG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsvg}
-BUILDLINK_PACKAGES+=	librsvg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librsvg
-
-.if !empty(LIBRSVG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.librsvg+=		librsvg>=2.12.6nb1
 BUILDLINK_ABI_DEPENDS.librsvg+=		librsvg>=2.18.2nb4
 BUILDLINK_PKGSRCDIR.librsvg?=		../../graphics/librsvg
-.endif	# LIBRSVG_BUILDLINK3_MK
 
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../textproc/libcroco/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBRSVG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-librsvg
diff --git a/graphics/libscigraphica/buildlink3.mk b/graphics/libscigraphica/buildlink3.mk
index 905380ded2d..e6c3581dcd7 100644
--- a/graphics/libscigraphica/buildlink3.mk
+++ b/graphics/libscigraphica/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.4 2007/09/21 13:03:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:43 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSCIGRAPHICA_BUILDLINK3_MK:=	${LIBSCIGRAPHICA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libscigraphica
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libscigraphica
-.endif
+.if !defined(LIBSCIGRAPHICA_BUILDLINK3_MK)
+LIBSCIGRAPHICA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibscigraphica}
-BUILDLINK_PACKAGES+=	libscigraphica
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libscigraphica
-
-.if ${LIBSCIGRAPHICA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libscigraphica+=	libscigraphica>=2.1.1
 BUILDLINK_PKGSRCDIR.libscigraphica?=	../../graphics/libscigraphica
-.endif	# LIBSCIGRAPHICA_BUILDLINK3_MK
 
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../math/py-numarray/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2+extra/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBSCIGRAPHICA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libscigraphica
diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk
index 359691b42c5..9129045a4a1 100644
--- a/graphics/libungif/buildlink3.mk
+++ b/graphics/libungif/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:43 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBUNGIF_BUILDLINK3_MK:=	${LIBUNGIF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libungif
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libungif
-.endif
+.if !defined(LIBUNGIF_BUILDLINK3_MK)
+LIBUNGIF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibungif}
-BUILDLINK_PACKAGES+=	libungif
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libungif
-
-.if !empty(LIBUNGIF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libungif+=	libungif>=4.1.0
 BUILDLINK_ABI_DEPENDS.libungif+=	libungif>=4.1.3nb1
 BUILDLINK_PKGSRCDIR.libungif?=	../../graphics/libungif
-.endif	# LIBUNGIF_BUILDLINK3_MK
+.endif # LIBUNGIF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libungif
diff --git a/graphics/libv4l/buildlink3.mk b/graphics/libv4l/buildlink3.mk
index fc17139058d..aab59d0bf1e 100644
--- a/graphics/libv4l/buildlink3.mk
+++ b/graphics/libv4l/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/01/10 21:04:23 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:43 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBV4L_BUILDLINK3_MK:=		${LIBV4L_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libv4l
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libv4l
-.endif
+.if !defined(LIBV4L_BUILDLINK3_MK)
+LIBV4L_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibv4l}
-BUILDLINK_PACKAGES+=	libv4l
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libv4l
-
-.if !empty(LIBV4L_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libv4l+=		libv4l>=0.4.3nb2
 BUILDLINK_ABI_DEPENDS.libv4l+=		libv4l>=0.4.3nb2
 BUILDLINK_PKGSRCDIR.libv4l?=		../../graphics/libv4l
-.endif	# LIBV4L_BUILDLINK3_MK
+.endif # LIBV4L_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libv4l
diff --git a/graphics/libvideogfx/buildlink3.mk b/graphics/libvideogfx/buildlink3.mk
index 67e7eefadc1..8159d3e8c57 100644
--- a/graphics/libvideogfx/buildlink3.mk
+++ b/graphics/libvideogfx/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/02/07 23:54:48 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:43 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBVIDEOGFX_BUILDLINK3_MK:=	${LIBVIDEOGFX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libvideogfx
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libvideogfx
-.endif
+.if !defined(LIBVIDEOGFX_BUILDLINK3_MK)
+LIBVIDEOGFX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvideogfx}
-BUILDLINK_PACKAGES+=	libvideogfx
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvideogfx
-
-.if !empty(LIBVIDEOGFX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libvideogfx+=	libvideogfx>=1.0.3
 BUILDLINK_ABI_DEPENDS.libvideogfx+=	libvideogfx>=1.0.3nb3
 BUILDLINK_PKGSRCDIR.libvideogfx?=	../../graphics/libvideogfx
-.endif	# LIBVIDEOGFX_BUILDLINK3_MK
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif # LIBVIDEOGFX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libvideogfx
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index 47f7bc74b11..fd0cf655116 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:43 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBWMF_BUILDLINK3_MK:=	${LIBWMF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libwmf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libwmf
-.endif
+.if !defined(LIBWMF_BUILDLINK3_MK)
+LIBWMF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwmf}
-BUILDLINK_PACKAGES+=	libwmf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwmf
-
-.if !empty(LIBWMF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libwmf+=	libwmf>=0.2.8nb2
 BUILDLINK_ABI_DEPENDS.libwmf+=	libwmf>=0.2.8.4nb3
 BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
-.endif	# LIBWMF_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBWMF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libwmf
diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk
index 94bb9876d61..7cd75193815 100644
--- a/graphics/mng/buildlink3.mk
+++ b/graphics/mng/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:43 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MNG_BUILDLINK3_MK:=	${MNG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mng
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mng
-.endif
+.if !defined(MNG_BUILDLINK3_MK)
+MNG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmng}
-BUILDLINK_PACKAGES+=	mng
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mng
-
-.if !empty(MNG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mng+=		mng>=1.0.0
 BUILDLINK_ABI_DEPENDS.mng+=	mng>=1.0.9nb1
 BUILDLINK_PKGSRCDIR.mng?=	../../graphics/mng
-.endif	# MNG_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
+.endif # MNG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mng
diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk
index 494f6c2e744..4a18529c963 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:43 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NETPBM_BUILDLINK3_MK:=	${NETPBM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	netpbm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	netpbm
-.endif
+.if !defined(NETPBM_BUILDLINK3_MK)
+NETPBM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetpbm}
-BUILDLINK_PACKAGES+=	netpbm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netpbm
-
-.if !empty(NETPBM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.netpbm+=	netpbm>=10.11.6
 BUILDLINK_ABI_DEPENDS.netpbm+=	netpbm>=10.33nb1
 BUILDLINK_PKGSRCDIR.netpbm?=	../../graphics/netpbm
-.endif	# NETPBM_BUILDLINK3_MK
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.endif # NETPBM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-netpbm
diff --git a/graphics/openexr/buildlink3.mk b/graphics/openexr/buildlink3.mk
index f85a0c997c7..99218085e2e 100644
--- a/graphics/openexr/buildlink3.mk
+++ b/graphics/openexr/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/11/30 21:52:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENEXR_BUILDLINK3_MK:=	${OPENEXR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openexr
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openexr
-.endif
+.if !defined(OPENEXR_BUILDLINK3_MK)
+OPENEXR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenexr}
-BUILDLINK_PACKAGES+=	openexr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openexr
-
-.if !empty(OPENEXR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openexr+=	openexr>=1.6.1
 BUILDLINK_PKGSRCDIR.openexr?=	../../graphics/openexr
 
 PTHREAD_OPTS+=	require
-.endif	# OPENEXR_BUILDLINK3_MK
 
 .include "../../graphics/ilmbase/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # OPENEXR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openexr
diff --git a/graphics/p5-cairo/buildlink3.mk b/graphics/p5-cairo/buildlink3.mk
index b6af34efa54..c8582acf3bf 100644
--- a/graphics/p5-cairo/buildlink3.mk
+++ b/graphics/p5-cairo/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/04/13 23:21:38 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-P5_CAIRO_BUILDLINK3_MK:=	${P5_CAIRO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	p5-cairo
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	p5-cairo
-.endif
+.if !defined(P5_CAIRO_BUILDLINK3_MK)
+P5_CAIRO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-cairo}
-BUILDLINK_PACKAGES+=	p5-cairo
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-cairo
-
-.if ${P5_CAIRO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.p5-cairo+=	p5-cairo>=1.023
 BUILDLINK_PKGSRCDIR.p5-cairo?=	../../graphics/p5-cairo
-.endif	# P5_CAIRO_BUILDLINK3_MK
 
 .include "../../graphics/cairo/buildlink3.mk"
+.endif # P5_CAIRO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-p5-cairo
diff --git a/graphics/pfstools/buildlink3.mk b/graphics/pfstools/buildlink3.mk
index 438be02f635..24600026400 100644
--- a/graphics/pfstools/buildlink3.mk
+++ b/graphics/pfstools/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/18 12:46:39 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PFSTOOLS_BUILDLINK3_MK:=	${PFSTOOLS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pfstools
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	pfstools
-.endif
+.if !defined(PFSTOOLS_BUILDLINK3_MK)
+PFSTOOLS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npfstools}
-BUILDLINK_PACKAGES+=	pfstools
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pfstools
-
-.if ${PFSTOOLS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.pfstools+=	pfstools>=1.7.0
 BUILDLINK_PKGSRCDIR.pfstools?=	../../graphics/pfstools
-.endif	# PFSTOOLS_BUILDLINK3_MK
+.endif # PFSTOOLS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pfstools
diff --git a/graphics/plotutils-nox11/buildlink3.mk b/graphics/plotutils-nox11/buildlink3.mk
index 59e1d567ce0..5aa6915a241 100644
--- a/graphics/plotutils-nox11/buildlink3.mk
+++ b/graphics/plotutils-nox11/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PLOTUTILS_NOX11_BUILDLINK3_MK:=	${PLOTUTILS_NOX11_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	plotutils-nox11
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	plotutils-nox11
-.endif
+.if !defined(PLOTUTILS_NOX11_BUILDLINK3_MK)
+PLOTUTILS_NOX11_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nplotutils-nox11}
-BUILDLINK_PACKAGES+=	plotutils-nox11
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}plotutils-nox11
-
-.if !empty(PLOTUTILS_NOX11_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.plotutils-nox11+=	plotutils-nox11>=2.4.1
 BUILDLINK_ABI_DEPENDS.plotutils-nox11?=	plotutils-nox11>=2.4.1nb2
 BUILDLINK_PKGSRCDIR.plotutils-nox11?=	../../graphics/plotutils-nox11
-.endif	# PLOTUTILS_NOX11_BUILDLINK3_MK
 
 .include "../../graphics/png/buildlink3.mk"
+.endif # PLOTUTILS_NOX11_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-plotutils-nox11
diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk
index ce64ab6c84a..ee788149f7d 100644
--- a/graphics/plotutils/buildlink3.mk
+++ b/graphics/plotutils/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/01/22 22:09:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PLOTUTILS_BUILDLINK3_MK:=	${PLOTUTILS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	plotutils
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	plotutils
-.endif
+.if !defined(PLOTUTILS_BUILDLINK3_MK)
+PLOTUTILS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nplotutils}
-BUILDLINK_PACKAGES+=	plotutils
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}plotutils
-
-.if !empty(PLOTUTILS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.plotutils+=	plotutils>=2.4.1nb2
 BUILDLINK_ABI_DEPENDS.plotutils+=	plotutils>=2.4.1nb5
 BUILDLINK_PKGSRCDIR.plotutils?=	../../graphics/plotutils
-.endif	# PLOTUTILS_BUILDLINK3_MK
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.endif # PLOTUTILS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-plotutils
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index 7d17890b35d..c55386c555e 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.22 2008/08/18 21:35:37 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PNG_BUILDLINK3_MK:=	${PNG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	png
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	png
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npng}
-BUILDLINK_PACKAGES+=	png
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}png
+.if !defined(PNG_BUILDLINK3_MK)
+PNG_BUILDLINK3_MK:=
 
-.if !empty(PNG_BUILDLINK3_MK:M+)
 # XXX tv - remove this OPSYS block the next time ABI_DEPENDS is bumped:
 .  include "../../mk/bsd.fast.prefs.mk"
 .  if ${OPSYS} == "Interix"
@@ -26,7 +19,6 @@ BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
 .  if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
 CPPFLAGS+=	-DPNG_NO_ASSEMBLER_CODE
 .  endif
-.endif	# PNG_BUILDLINK3_MK
 
 # Work around broken libtool archive "/usr/X11/lib/libpng12.la" under
 # Mac OS 10.5.4 or newer which references a non-existing version of the
@@ -36,5 +28,6 @@ BUILDLINK_TRANSFORM+=	rename:-lpng12.0.26.0:-lpng
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
+.endif # PNG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-png
diff --git a/graphics/py-cairo/buildlink3.mk b/graphics/py-cairo/buildlink3.mk
index 880f800af13..273f1809d13 100644
--- a/graphics/py-cairo/buildlink3.mk
+++ b/graphics/py-cairo/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 17:30:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PY_CAIRO_BUILDLINK3_MK:=	${PY_CAIRO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pycairo
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pycairo
-.endif
+.if !defined(PY_CAIRO_BUILDLINK3_MK)
+PY_CAIRO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npycairo}
-BUILDLINK_PACKAGES+=	pycairo
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycairo
-
-.if !empty(PY_CAIRO_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pycairo+=	${PYPKGPREFIX}-cairo>=1.0.2
 BUILDLINK_ABI_DEPENDS.pycairo+=	${PYPKGPREFIX}-cairo>=1.0.2nb1
 BUILDLINK_PKGSRCDIR.pycairo?=	../../graphics/py-cairo
-.endif	# PY_CAIRO_BUILDLINK3_MK
 
 .include "../../math/py-Numeric/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+.endif # PY_CAIRO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pycairo
diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk
index b75bdf77033..fe0ff5899d6 100644
--- a/graphics/py-imaging/buildlink3.mk
+++ b/graphics/py-imaging/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 17:30:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_IMAGING_BUILDLINK3_MK:=	${PY_IMAGING_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pyimaging
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pyimaging
-.endif
+.if !defined(PY_IMAGING_BUILDLINK3_MK)
+PY_IMAGING_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyimaging}
-BUILDLINK_PACKAGES+=	pyimaging
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyimaging
-
-.if !empty(PY_IMAGING_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.4
 BUILDLINK_ABI_DEPENDS.pyimaging?=	${PYPKGPREFIX}-imaging>=1.1.5nb1
 BUILDLINK_PKGSRCDIR.pyimaging?=	../../graphics/py-imaging
-.endif	# PY_IMAGING_BUILDLINK3_MK
 
 .include "../../graphics/jpeg/buildlink3.mk"
+.endif # PY_IMAGING_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pyimaging
diff --git a/graphics/py-matplotlib/buildlink3.mk b/graphics/py-matplotlib/buildlink3.mk
index eaae70abc68..183ac617356 100644
--- a/graphics/py-matplotlib/buildlink3.mk
+++ b/graphics/py-matplotlib/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 17:30:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_MATPLOTLIB_BUILDLINK3_MK:=	${PY_MATPLOTLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pymatplotlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pymatplotlib
-.endif
+.if !defined(PY_MATPLOTLIB_BUILDLINK3_MK)
+PY_MATPLOTLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npymatplotlib}
-BUILDLINK_PACKAGES+=	pymatplotlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pymatplotlib
-
-.if !empty(PY_MATPLOTLIB_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pymatplotlib+=	${PYPKGPREFIX}-matplotlib>=0.87.2
 BUILDLINK_PKGSRCDIR.pymatplotlib?=	../../graphics/py-matplotlib
-.endif	# PY_MATPLOTLIB_BUILDLINK3_MK
+.endif # PY_MATPLOTLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pymatplotlib
diff --git a/graphics/qimageblitz/buildlink3.mk b/graphics/qimageblitz/buildlink3.mk
index 9c0456fd7e3..5810a2609a2 100644
--- a/graphics/qimageblitz/buildlink3.mk
+++ b/graphics/qimageblitz/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/04 10:07:38 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-QIMAGEBLITZ_BUILDLINK3_MK:=	${QIMAGEBLITZ_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	qimageblitz
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	qimageblitz
-.endif
+.if !defined(QIMAGEBLITZ_BUILDLINK3_MK)
+QIMAGEBLITZ_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqimageblitz}
-BUILDLINK_PACKAGES+=	qimageblitz
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qimageblitz
-
-.if ${QIMAGEBLITZ_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.qimageblitz+=	qimageblitz>=0.0.4
 BUILDLINK_PKGSRCDIR.qimageblitz?=	../../graphics/qimageblitz
-.endif	# QIMAGEBLITZ_BUILDLINK3_MK
 
 .include "../../x11/qt4-libs/buildlink3.mk"
+.endif # QIMAGEBLITZ_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qimageblitz
diff --git a/graphics/quesoglc/buildlink3.mk b/graphics/quesoglc/buildlink3.mk
index 8ae77a2eb97..2c3846ff0cb 100644
--- a/graphics/quesoglc/buildlink3.mk
+++ b/graphics/quesoglc/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/15 16:03:46 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-QUESOGLC_BUILDLINK3_MK:=	${QUESOGLC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	quesoglc
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	quesoglc
-.endif
+.if !defined(QUESOGLC_BUILDLINK3_MK)
+QUESOGLC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nquesoglc}
-BUILDLINK_PACKAGES+=	quesoglc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}quesoglc
-
-.if ${QUESOGLC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.quesoglc+=	quesoglc>=0.7.1
 BUILDLINK_PKGSRCDIR.quesoglc?=	../../graphics/quesoglc
-.endif	# QUESOGLC_BUILDLINK3_MK
+.endif # QUESOGLC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-quesoglc
diff --git a/graphics/ruby-rcairo/buildlink3.mk b/graphics/ruby-rcairo/buildlink3.mk
index ec44eb89455..90be99c5af7 100644
--- a/graphics/ruby-rcairo/buildlink3.mk
+++ b/graphics/ruby-rcairo/buildlink3.mk
@@ -1,22 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/06/22 03:31:52 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:45 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+BUILDLINK_TREE+=	${RUBY_PKGPREFIX}-rcairo
 
-RUBY_RCAIRO_BUILDLINK3_MK:=	${RUBY_RCAIRO_BUILDLINK3_MK}+
+.if !defined(RUBY_RCAIRO_BUILDLINK3_MK)
+RUBY_RCAIRO_BUILDLINK3_MK:=
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	${RUBY_PKGPREFIX}-rcairo
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-rcairo}
-BUILDLINK_PACKAGES+=	${RUBY_PKGPREFIX}-rcairo
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${RUBY_PKGPREFIX}-rcairo
-
-.if ${RUBY_RCAIRO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ruby18-rcairo+=	${RUBY_PKGPREFIX}-rcairo>=1.6.0
 BUILDLINK_PKGSRCDIR.ruby18-rcairo?=	../../graphics/ruby-rcairo
-.endif	# RUBY_RCAIRO_BUILDLINK3_MK
 
 .include "../../graphics/cairo/buildlink3.mk"
+.endif # RUBY_RCAIRO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-${RUBY_PKGPREFIX}-rcairo
diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk
index c9eb2ee54f4..c36beaa1926 100644
--- a/graphics/sane-backends/buildlink3.mk
+++ b/graphics/sane-backends/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:45 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SANE_BACKENDS_BUILDLINK3_MK:=	${SANE_BACKENDS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sane-backends
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sane-backends
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsane-backends}
-BUILDLINK_PACKAGES+=	sane-backends
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sane-backends
+.if !defined(SANE_BACKENDS_BUILDLINK3_MK)
+SANE_BACKENDS_BUILDLINK3_MK:=
 
-.if !empty(SANE_BACKENDS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sane-backends+=	sane-backends>=1.0.3
 BUILDLINK_ABI_DEPENDS.sane-backends+=	sane-backends>=1.0.17nb1
 BUILDLINK_PKGSRCDIR.sane-backends?=	../../graphics/sane-backends
-.endif	# SANE_BACKENDS_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.sane-backends?=	../../graphics/sane-backends
 . include "../../devel/libusb/buildlink3.mk"
 .endif
 .include "../../graphics/jpeg/buildlink3.mk"
+.endif # SANE_BACKENDS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sane-backends
diff --git a/graphics/silgraphite-ft/buildlink3.mk b/graphics/silgraphite-ft/buildlink3.mk
index 7c0d0422315..571a1ce9fd5 100644
--- a/graphics/silgraphite-ft/buildlink3.mk
+++ b/graphics/silgraphite-ft/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/13 06:58:01 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:45 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SILGRAPHITE_FT_BUILDLINK3_MK:=	${SILGRAPHITE_FT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	silgraphite-ft
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	silgraphite-ft
-.endif
+.if !defined(SILGRAPHITE_FT_BUILDLINK3_MK)
+SILGRAPHITE_FT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsilgraphite-ft}
-BUILDLINK_PACKAGES+=	silgraphite-ft
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}silgraphite-ft
-
-.if ${SILGRAPHITE_FT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.silgraphite-ft+=	silgraphite-ft>=2.2.0
 BUILDLINK_PKGSRCDIR.silgraphite-ft?=	../../graphics/silgraphite-ft
-.endif	# SILGRAPHITE_FT_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/silgraphite/buildlink3.mk"
+.endif # SILGRAPHITE_FT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-silgraphite-ft
diff --git a/graphics/silgraphite-xft/buildlink3.mk b/graphics/silgraphite-xft/buildlink3.mk
index 3892cc94b07..a508dfe52b1 100644
--- a/graphics/silgraphite-xft/buildlink3.mk
+++ b/graphics/silgraphite-xft/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/15 00:44:52 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:45 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SILGRAPHITE_XFT_BUILDLINK3_MK:=	${SILGRAPHITE_XFT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	silgraphite-xft
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	silgraphite-xft
-.endif
+.if !defined(SILGRAPHITE_XFT_BUILDLINK3_MK)
+SILGRAPHITE_XFT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsilgraphite-xft}
-BUILDLINK_PACKAGES+=	silgraphite-xft
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}silgraphite-xft
-
-.if ${SILGRAPHITE_XFT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.silgraphite-xft+=	silgraphite-xft>=2.3
 BUILDLINK_PKGSRCDIR.silgraphite-xft?=	../../wip/silgraphite-xft
-.endif	# SILGRAPHITE_XFT_BUILDLINK3_MK
 
 .include "../../graphics/silgraphite-ft/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.endif # SILGRAPHITE_XFT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-silgraphite-xft
diff --git a/graphics/silgraphite/buildlink3.mk b/graphics/silgraphite/buildlink3.mk
index a1e7220d097..69b6bade0f8 100644
--- a/graphics/silgraphite/buildlink3.mk
+++ b/graphics/silgraphite/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/09 01:54:25 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:45 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SILGRAPHITE_BUILDLINK3_MK:=	${SILGRAPHITE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	silgraphite
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	silgraphite
-.endif
+.if !defined(SILGRAPHITE_BUILDLINK3_MK)
+SILGRAPHITE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsilgraphite}
-BUILDLINK_PACKAGES+=	silgraphite
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}silgraphite
-
-.if ${SILGRAPHITE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.silgraphite+=	silgraphite>=2.3
 BUILDLINK_PKGSRCDIR.silgraphite?=	../../graphics/silgraphite
-.endif	# SILGRAPHITE_BUILDLINK3_MK
+.endif # SILGRAPHITE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-silgraphite
diff --git a/graphics/simage/buildlink3.mk b/graphics/simage/buildlink3.mk
index 8f793ee506b..ca57e8d7857 100644
--- a/graphics/simage/buildlink3.mk
+++ b/graphics/simage/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/01/07 12:25:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:45 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SIMAGE_BUILDLINK3_MK:=	${SIMAGE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	simage
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	simage
-.endif
+.if !defined(SIMAGE_BUILDLINK3_MK)
+SIMAGE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsimage}
-BUILDLINK_PACKAGES+=	simage
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}simage
-
-.if !empty(SIMAGE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.simage+=	simage>=1.6.1
 BUILDLINK_ABI_DEPENDS.simage+=	simage>=1.6.1nb4
 BUILDLINK_PKGSRCDIR.simage?=	../../graphics/simage
-.endif	# SIMAGE_BUILDLINK3_MK
 
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
@@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.simage?=	../../graphics/simage
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
+.endif # SIMAGE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-simage
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index f4a74e4888d..beeca3ba7cc 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:45 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TIFF_BUILDLINK3_MK:=	${TIFF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tiff
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tiff
-.endif
+.if !defined(TIFF_BUILDLINK3_MK)
+TIFF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntiff}
-BUILDLINK_PACKAGES+=	tiff
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tiff
-
-.if !empty(TIFF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tiff+=	tiff>=3.6.1
 BUILDLINK_ABI_DEPENDS.tiff+=	tiff>=3.7.2nb1
 BUILDLINK_PKGSRCDIR.tiff?=	../../graphics/tiff
-.endif	# TIFF_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.endif # TIFF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tiff
diff --git a/graphics/unicap/buildlink3.mk b/graphics/unicap/buildlink3.mk
index 7f347f5148c..7e1bfb9db02 100644
--- a/graphics/unicap/buildlink3.mk
+++ b/graphics/unicap/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:45 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-UNICAP_BUILDLINK3_MK:=	${UNICAP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	unicap
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	unicap
-.endif
+.if !defined(UNICAP_BUILDLINK3_MK)
+UNICAP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nunicap}
-BUILDLINK_PACKAGES+=	unicap
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}unicap
-
-.if !empty(UNICAP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.unicap+=	unicap>=0.9.1
 BUILDLINK_ABI_DEPENDS.unicap+=	unicap>=0.9.1
 BUILDLINK_PKGSRCDIR.unicap?=	../../graphics/unicap
-.endif	# UNICAP_BUILDLINK3_MK
 
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
+.endif # UNICAP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-unicap
diff --git a/graphics/urt/buildlink3.mk b/graphics/urt/buildlink3.mk
index 0b3c9cefce4..59ab73ea14a 100644
--- a/graphics/urt/buildlink3.mk
+++ b/graphics/urt/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/05/24 04:46:52 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:45 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-URT_BUILDLINK3_MK:=	${URT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	urt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	urt
-.endif
+.if !defined(URT_BUILDLINK3_MK)
+URT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nurt}
-BUILDLINK_PACKAGES+=	urt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}urt
-
-.if !empty(URT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.urt+=	urt>=3.1b1nb5
 BUILDLINK_ABI_DEPENDS.urt+=	urt>=3.1b1nb7
 BUILDLINK_PKGSRCDIR.urt?=	../../graphics/urt
-.endif	# URT_BUILDLINK3_MK
 
 .include "../../graphics/netpbm/buildlink3.mk"
+.endif # URT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-urt
diff --git a/graphics/wxsvg/buildlink3.mk b/graphics/wxsvg/buildlink3.mk
index b97573bcc3e..7ad73c6732a 100644
--- a/graphics/wxsvg/buildlink3.mk
+++ b/graphics/wxsvg/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.9 2008/09/22 20:21:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:45 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WXSVG_BUILDLINK3_MK:=	${WXSVG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	wxsvg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	wxsvg
-.endif
+.if !defined(WXSVG_BUILDLINK3_MK)
+WXSVG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwxsvg}
-BUILDLINK_PACKAGES+=	wxsvg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxsvg
-
-.if !empty(WXSVG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wxsvg+=	wxsvg>=1.0beta5
 BUILDLINK_ABI_DEPENDS.wxsvg?=	wxsvg>=1.0beta5nb2
 BUILDLINK_PKGSRCDIR.wxsvg?=	../../graphics/wxsvg
-.endif	# WXSVG_BUILDLINK3_MK
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/wxGTK26/buildlink3.mk"
+.endif # WXSVG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-wxsvg
diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk
index efc36251ed8..b275040a6ea 100644
--- a/graphics/xfce4-icon-theme/buildlink3.mk
+++ b/graphics/xfce4-icon-theme/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/12/18 16:43:28 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:46 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_ICON_THEME_BUILDLINK3_MK:=	${XFCE4_ICON_THEME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-icon-theme
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-icon-theme
-.endif
+.if !defined(XFCE4_ICON_THEME_BUILDLINK3_MK)
+XFCE4_ICON_THEME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-icon-theme}
-BUILDLINK_PACKAGES+=	xfce4-icon-theme
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-icon-theme
-
-.if ${XFCE4_ICON_THEME_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-icon-theme+=	xfce4-icon-theme>=4.4.3
 BUILDLINK_PKGSRCDIR.xfce4-icon-theme?=	../../graphics/xfce4-icon-theme
-.endif	# XFCE4_ICON_THEME_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_ICON_THEME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-icon-theme
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index cc8ff134f2c..3d2d52a248a 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.24 2007/01/06 16:45:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:24:46 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XPM_BUILDLINK3_MK:=	${XPM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xpm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xpm
-.endif
+.if !defined(XPM_BUILDLINK3_MK)
+XPM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxpm}
-BUILDLINK_PACKAGES+=	xpm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xpm
-
-.if !empty(XPM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xpm+=		xpm>=3.4k
 BUILDLINK_ABI_DEPENDS.xpm+=	xpm>=3.4knb6
 BUILDLINK_PKGSRCDIR.xpm?=	../../graphics/xpm
-.endif	# XPM_BUILDLINK3_MK
 
 .include "../../mk/x11.buildlink3.mk"
+.endif # XPM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xpm
author	joerg <joerg>	2009-03-20 19:23:50 +0000
committer	joerg <joerg>	2009-03-20 19:23:50 +0000
commit	405c61d80251d8e80401aed2264d4bede218cb22 (patch)
tree	647e974495c5d41703d41ca2e71c9b6063b9153a /graphics
parent	f0f715d4dd4a290c5c6ae716c774f59caf5aa61c (diff)
download	pkgsrc-405c61d80251d8e80401aed2264d4bede218cb22.tar.gz