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.

49 files changed, 294 insertions, 640 deletions

diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk
index ffed3925cfc..aa3f70cdc00 100644
--- a/sysutils/amanda-common/buildlink3.mk
+++ b/sysutils/amanda-common/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/02/15 16:23:09 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:23 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-AMANDA_COMMON_BUILDLINK3_MK:=	${AMANDA_COMMON_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	amanda-common
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	amanda-common
-.endif
+.if !defined(AMANDA_COMMON_BUILDLINK3_MK)
+AMANDA_COMMON_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Namanda-common}
-BUILDLINK_PACKAGES+=	amanda-common
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}amanda-common
-
-.if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.amanda-common+=	amanda-common>=2.5.2p1
 BUILDLINK_ABI_DEPENDS.amanda-common+=	amanda-common>=2.5.2p1
 BUILDLINK_PKGSRCDIR.amanda-common?=	../../sysutils/amanda-common
-.endif	# AMANDA_COMMON_BUILDLINK3_MK
+.endif # AMANDA_COMMON_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-amanda-common
diff --git a/sysutils/brasero/buildlink3.mk b/sysutils/brasero/buildlink3.mk
index 8b21da72c76..c67a3728283 100644
--- a/sysutils/brasero/buildlink3.mk
+++ b/sysutils/brasero/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/03/17 23:40:37 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:23 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BRASERO_BUILDLINK3_MK:=	${BRASERO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	brasero
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	brasero
-.endif
+.if !defined(BRASERO_BUILDLINK3_MK)
+BRASERO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbrasero}
-BUILDLINK_PACKAGES+=	brasero
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}brasero
-
-.if ${BRASERO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.brasero+=	brasero>=2.26.0
 BUILDLINK_PKGSRCDIR.brasero?=	../../sysutils/brasero
-.endif	# BRASERO_BUILDLINK3_MK
+.endif # BRASERO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-brasero
diff --git a/sysutils/consolekit/buildlink3.mk b/sysutils/consolekit/buildlink3.mk
index 1540d0b4e6a..0c63e5578c0 100644
--- a/sysutils/consolekit/buildlink3.mk
+++ b/sysutils/consolekit/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 03:32:22 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:23 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CONSOLEKIT_BUILDLINK3_MK:=	${CONSOLEKIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	consolekit
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	consolekit
-.endif
+.if !defined(CONSOLEKIT_BUILDLINK3_MK)
+CONSOLEKIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nconsolekit}
-BUILDLINK_PACKAGES+=	consolekit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}consolekit
-
-.if ${CONSOLEKIT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.consolekit+=	consolekit>=0.3.0
 BUILDLINK_PKGSRCDIR.consolekit?=	../../sysutils/consolekit
-.endif	# CONSOLEKIT_BUILDLINK3_MK
 
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.endif # CONSOLEKIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-consolekit
diff --git a/sysutils/dbus-glib/buildlink3.mk b/sysutils/dbus-glib/buildlink3.mk
index 9f19fc902df..9a318789a71 100644
--- a/sysutils/dbus-glib/buildlink3.mk
+++ b/sysutils/dbus-glib/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/08/23 09:45:16 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:23 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-DBUS_GLIB_BUILDLINK3_MK:=	${DBUS_GLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	dbus-glib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	dbus-glib
-.endif
+.if !defined(DBUS_GLIB_BUILDLINK3_MK)
+DBUS_GLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbus-glib}
-BUILDLINK_PACKAGES+=	dbus-glib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbus-glib
-
-.if !empty(DBUS_GLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.61
 BUILDLINK_ABI_DEPENDS.dbus-glib+=	dbus-glib>=0.71
 BUILDLINK_PKGSRCDIR.dbus-glib?=	../../sysutils/dbus-glib
-.endif	# DBUS_GLIB_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.endif # DBUS_GLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-dbus-glib
diff --git a/sysutils/dbus-qt3/buildlink3.mk b/sysutils/dbus-qt3/buildlink3.mk
index 13c6062cf06..a7892387b8e 100644
--- a/sysutils/dbus-qt3/buildlink3.mk
+++ b/sysutils/dbus-qt3/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/21 14:31:18 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:23 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-DBUS_QT3_BUILDLINK3_MK:=	${DBUS_QT3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	dbus-qt3
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	dbus-qt3
-.endif
+.if !defined(DBUS_QT3_BUILDLINK3_MK)
+DBUS_QT3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbus-qt3}
-BUILDLINK_PACKAGES+=	dbus-qt3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbus-qt3
-
-.if ${DBUS_QT3_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.dbus-qt3+=	dbus-qt3>=0.70
 BUILDLINK_PKGSRCDIR.dbus-qt3?=	../../sysutils/dbus-qt3
-.endif	# DBUS_QT3_BUILDLINK3_MK
 
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
+.endif # DBUS_QT3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-dbus-qt3
diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk
index d01f314dac8..679a718b3fb 100644
--- a/sysutils/dbus/buildlink3.mk
+++ b/sysutils/dbus/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/02/23 11:00:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:23 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DBUS_BUILDLINK3_MK:=	${DBUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	dbus
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	dbus
-.endif
+.if !defined(DBUS_BUILDLINK3_MK)
+DBUS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbus}
-BUILDLINK_PACKAGES+=	dbus
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbus
-
-.if !empty(DBUS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dbus+=	dbus>=0.91
 BUILDLINK_PKGSRCDIR.dbus?=	../../sysutils/dbus
 
@@ -22,8 +15,8 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/dbus-1\/services/ \
 				{ print "@comment in dbus: " $$0; next }
 PRINT_PLIST_AWK+=	/^@dirrm share\/dbus-1/ \
 				{ print "@comment in dbus: " $$0; next }
-.endif	# DBUS_BUILDLINK3_MK
 
 .include "../../textproc/expat/buildlink3.mk"
+.endif # DBUS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-dbus
diff --git a/sysutils/desktop-file-utils/buildlink3.mk b/sysutils/desktop-file-utils/buildlink3.mk
index ca6de9465ca..ecafdf8f3ba 100644
--- a/sysutils/desktop-file-utils/buildlink3.mk
+++ b/sysutils/desktop-file-utils/buildlink3.mk
@@ -1,23 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:23 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-DESKTOP_FILE_UTILS_BUILDLINK3_MK:=	${DESKTOP_FILE_UTILS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	desktop-file-utils
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	desktop-file-utils
-.endif
+.if !defined(DESKTOP_FILE_UTILS_BUILDLINK3_MK)
+DESKTOP_FILE_UTILS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndesktop-file-utils}
-BUILDLINK_PACKAGES+=	desktop-file-utils
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}desktop-file-utils
-
-.if !empty(DESKTOP_FILE_UTILS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.desktop-file-utils+=	desktop-file-utils>=0.8
 BUILDLINK_ABI_DEPENDS.desktop-file-utils+=	desktop-file-utils>=0.10nb1
 BUILDLINK_PKGSRCDIR.desktop-file-utils?=../../sysutils/desktop-file-utils
-.endif	# DESKTOP_FILE_UTILS_BUILDLINK3_MK
 
-.if !empty(DESKTOP_FILE_UTILS_BUILDLINK3_MK:M+)
 BUILDLINK_TARGETS+=	desktop-file-utils-buildlink-fake
 
 _DFU_FAKE_UPDATEDB=	${BUILDLINK_DIR}/bin/update-desktop-database
@@ -31,6 +22,6 @@ desktop-file-utils-buildlink-fake:
 		${ECHO} "echo '[pkgsrc] Doing nothing for update-desktop-database' \$$*" >> ${_DFU_FAKE_UPDATEDB};		\
 		${CHMOD} +x ${_DFU_FAKE_UPDATEDB};			\
 	fi
-.endif	# DESKTOP_FILE_UTILS_BUILDLINK3_MK
+.endif # DESKTOP_FILE_UTILS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-desktop-file-utils
diff --git a/sysutils/fam/buildlink3.mk b/sysutils/fam/buildlink3.mk
index dfdc6f92ea2..b95c6e22796 100644
--- a/sysutils/fam/buildlink3.mk
+++ b/sysutils/fam/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:23 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FAM_BUILDLINK3_MK:=	${FAM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fam
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	fam
-.endif
+.if !defined(FAM_BUILDLINK3_MK)
+FAM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfam}
-BUILDLINK_PACKAGES+=	fam
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fam
-
-.if !empty(FAM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fam+=		fam>=2.6.10
 BUILDLINK_ABI_DEPENDS.fam+=	fam>=2.7.0nb7
 BUILDLINK_PKGSRCDIR.fam?=	../../sysutils/fam
-.endif	# FAM_BUILDLINK3_MK
+.endif # FAM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fam
diff --git a/sysutils/file/buildlink3.mk b/sysutils/file/buildlink3.mk
index a5d9c722d4e..99c0c8e35f8 100644
--- a/sysutils/file/buildlink3.mk
+++ b/sysutils/file/buildlink3.mk
@@ -1,26 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/10/29 20:50:16 christos Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:24 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FILE_BUILDLINK3_MK:=	${FILE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	file
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	file
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfile}
-BUILDLINK_PACKAGES+=	file
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}file
-
-.if !empty(FILE_BUILDLINK3_MK:M+)
+.if !defined(FILE_BUILDLINK3_MK)
+FILE_BUILDLINK3_MK:=
 
 .  include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_API_DEPENDS.file+=	file>=4.17
 BUILDLINK_ABI_DEPENDS.file+=	file>=4.17
 BUILDLINK_PKGSRCDIR.file?=	../../sysutils/file
-.endif	# FILE_BUILDLINK3_MK
 pkgbase := file
 .include "../../mk/pkg-build-options.mk"
+.endif # FILE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-file
diff --git a/sysutils/gkrellm/buildlink3.mk b/sysutils/gkrellm/buildlink3.mk
index 664836f7efb..0a4aefa1aa3 100644
--- a/sysutils/gkrellm/buildlink3.mk
+++ b/sysutils/gkrellm/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:09:43 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:24 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GKRELLM_BUILDLINK3_MK:=	${GKRELLM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gkrellm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gkrellm
-.endif
+.if !defined(GKRELLM_BUILDLINK3_MK)
+GKRELLM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngkrellm}
-BUILDLINK_PACKAGES+=	gkrellm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gkrellm
-
-.if !empty(GKRELLM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gkrellm+=	gkrellm>=2.1.22
 BUILDLINK_ABI_DEPENDS.gkrellm?=	gkrellm>=2.2.10nb1
 BUILDLINK_PKGSRCDIR.gkrellm?=	../../sysutils/gkrellm
-.endif	# GKRELLM_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GKRELLM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gkrellm
diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk
index 894ebc03497..85a6dfcf255 100644
--- a/sysutils/gnome-menus/buildlink3.mk
+++ b/sysutils/gnome-menus/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/04/15 17:33:21 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:24 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_MENUS_BUILDLINK3_MK:=	${GNOME_MENUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-menus
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-menus
-.endif
+.if !defined(GNOME_MENUS_BUILDLINK3_MK)
+GNOME_MENUS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-menus}
-BUILDLINK_PACKAGES+=	gnome-menus
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-menus
-
-.if !empty(GNOME_MENUS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-menus+=		gnome-menus>=2.13.5
 BUILDLINK_ABI_DEPENDS.gnome-menus?=	gnome-menus>=2.20.3nb1
 BUILDLINK_PKGSRCDIR.gnome-menus?=	../../sysutils/gnome-menus
-.endif	# GNOME_MENUS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.endif # GNOME_MENUS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-menus
diff --git a/sysutils/gnome-mount/buildlink3.mk b/sysutils/gnome-mount/buildlink3.mk
index c89e1cad6e1..a0fa0a1032a 100644
--- a/sysutils/gnome-mount/buildlink3.mk
+++ b/sysutils/gnome-mount/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/12/02 19:59:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_MOUNT_BUILDLINK3_MK:=	${GNOME_MOUNT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-mount
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gnome-mount
-.endif
+.if !defined(GNOME_MOUNT_BUILDLINK3_MK)
+GNOME_MOUNT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-mount}
-BUILDLINK_PACKAGES+=	gnome-mount
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-mount
-
-.if ${GNOME_MOUNT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gnome-mount+=	gnome-mount>=0.8nb1
 BUILDLINK_PKGSRCDIR.gnome-mount?=	../../sysutils/gnome-mount
-.endif	# GNOME_MOUNT_BUILDLINK3_MK
 
 #.include "../../security/gnome-keyring/buildlink3.mk"
 #.include "../../sysutils/dbus-glib/buildlink3.mk"
@@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.gnome-mount?=	../../sysutils/gnome-mount
 #.include "../../sysutils/libnotify/buildlink3.mk"
 #.include "../../sysutils/nautilus/buildlink3.mk"
 #.include "../../x11/gtk2/buildlink3.mk"
+.endif # GNOME_MOUNT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-mount
diff --git a/sysutils/gnome-settings-daemon/buildlink3.mk b/sysutils/gnome-settings-daemon/buildlink3.mk
index dafd77ed0e5..c570dcd8275 100644
--- a/sysutils/gnome-settings-daemon/buildlink3.mk
+++ b/sysutils/gnome-settings-daemon/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/11 19:12:09 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GNOME_SETTINGS_DAEMON_BUILDLINK3_MK:=	${GNOME_SETTINGS_DAEMON_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-settings-daemon
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gnome-settings-daemon
-.endif
+.if !defined(GNOME_SETTINGS_DAEMON_BUILDLINK3_MK)
+GNOME_SETTINGS_DAEMON_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-settings-daemon}
-BUILDLINK_PACKAGES+=	gnome-settings-daemon
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-settings-daemon
-
-.if ${GNOME_SETTINGS_DAEMON_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gnome-settings-daemon+=	gnome-settings-daemon>=2.22.0
 BUILDLINK_PKGSRCDIR.gnome-settings-daemon?=	../../sysutils/gnome-settings-daemon
-.endif	# GNOME_SETTINGS_DAEMON_BUILDLINK3_MK
 
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.endif # GNOME_SETTINGS_DAEMON_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-settings-daemon
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
index 498bc8e381f..e07c99a8a57 100644
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ b/sysutils/gnome-vfs/buildlink3.mk
@@ -1,24 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.19 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:25:24 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_VFS_BUILDLINK3_MK:=	${GNOME_VFS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-vfs
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-vfs
-.endif
+.if !defined(GNOME_VFS_BUILDLINK3_MK)
+GNOME_VFS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-vfs}
-BUILDLINK_PACKAGES+=	gnome-vfs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-vfs
-
-.if !empty(GNOME_VFS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.8.0
 BUILDLINK_ABI_DEPENDS.gnome-vfs+=	gnome-vfs>=2.20.1nb1
 BUILDLINK_PKGSRCDIR.gnome-vfs?=		../../sysutils/gnome-vfs
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gnome-vfs-2.0\/modules/ \
 				{ print "@comment in gnome-vfs: " $$0; next; }
-.endif	# GNOME_VFS_BUILDLINK3_MK
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -26,5 +18,6 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/gnome-vfs-2.0\/modules/ \
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../mk/fam.buildlink3.mk"
+.endif # GNOME_VFS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-vfs
diff --git a/sysutils/gnome-vfsmm/buildlink3.mk b/sysutils/gnome-vfsmm/buildlink3.mk
index 4e9e1979271..2491b8c62d5 100644
--- a/sysutils/gnome-vfsmm/buildlink3.mk
+++ b/sysutils/gnome-vfsmm/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:24 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_VFSMM_BUILDLINK3_MK:=	${GNOME_VFSMM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-vfsmm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-vfsmm
-.endif
+.if !defined(GNOME_VFSMM_BUILDLINK3_MK)
+GNOME_VFSMM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-vfsmm}
-BUILDLINK_PACKAGES+=	gnome-vfsmm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-vfsmm
-
-.if !empty(GNOME_VFSMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-vfsmm+=	gnome-vfsmm>=2.10.0
 BUILDLINK_ABI_DEPENDS.gnome-vfsmm+=	gnome-vfsmm>=2.20.0nb1
 BUILDLINK_PKGSRCDIR.gnome-vfsmm?=	../../sysutils/gnome-vfsmm
-.endif	# GNOME_VFSMM_BUILDLINK3_MK
 
 .include "../../devel/glibmm/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
+.endif # GNOME_VFSMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-vfsmm
diff --git a/sysutils/hal-info/buildlink3.mk b/sysutils/hal-info/buildlink3.mk
index b373c253dd5..5c35cc03001 100644
--- a/sysutils/hal-info/buildlink3.mk
+++ b/sysutils/hal-info/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-HAL_INFO_BUILDLINK3_MK:=	${HAL_INFO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	hal-info
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	hal-info
-.endif
+.if !defined(HAL_INFO_BUILDLINK3_MK)
+HAL_INFO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhal-info}
-BUILDLINK_PACKAGES+=	hal-info
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hal-info
-
-.if ${HAL_INFO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.hal-info+=	hal-info>=20081022
 BUILDLINK_PKGSRCDIR.hal-info?=	../../sysutils/hal-info
-.endif	# HAL_INFO_BUILDLINK3_MK
+.endif # HAL_INFO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-hal-info
diff --git a/sysutils/hal/buildlink3.mk b/sysutils/hal/buildlink3.mk
index 11e9240c02e..09a7589c968 100644
--- a/sysutils/hal/buildlink3.mk
+++ b/sysutils/hal/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 15:20:51 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-HAL_BUILDLINK3_MK:=	${HAL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	hal
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	hal
-.endif
+.if !defined(HAL_BUILDLINK3_MK)
+HAL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhal}
-BUILDLINK_PACKAGES+=	hal
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hal
-
-.if ${HAL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.hal+=	hal>=0.5.11
 BUILDLINK_PKGSRCDIR.hal?=	../../sysutils/hal
-.endif	# HAL_BUILDLINK3_MK
 
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.endif # HAL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-hal
diff --git a/sysutils/ipa/buildlink3.mk b/sysutils/ipa/buildlink3.mk
index 4981738832f..66053838346 100644
--- a/sysutils/ipa/buildlink3.mk
+++ b/sysutils/ipa/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/01/03 15:01:25 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-IPA_BUILDLINK3_MK:=	${IPA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ipa
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ipa
-.endif
+.if !defined(IPA_BUILDLINK3_MK)
+IPA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nipa}
-BUILDLINK_PACKAGES+=	ipa
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ipa
-
-.if ${IPA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ipa+=	ipa>=2.0
 BUILDLINK_PKGSRCDIR.ipa?=	../../sysutils/ipa
 BUILDLINK_DEPMETHOD.ipa?=	build
-.endif	# IPA_BUILDLINK3_MK
+.endif # IPA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ipa
diff --git a/sysutils/libgamin/buildlink3.mk b/sysutils/libgamin/buildlink3.mk
index ff750edf395..f0aa2eb793d 100644
--- a/sysutils/libgamin/buildlink3.mk
+++ b/sysutils/libgamin/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/15 21:29:14 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGAMIN_BUILDLINK3_MK:=	${LIBGAMIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgamin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libgamin
-.endif
+.if !defined(LIBGAMIN_BUILDLINK3_MK)
+LIBGAMIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgamin}
-BUILDLINK_PACKAGES+=	libgamin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgamin
-
-.if ${LIBGAMIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libgamin+=	libgamin>=0.1.10
 BUILDLINK_PKGSRCDIR.libgamin?=	../../sysutils/libgamin
-.endif	# LIBGAMIN_BUILDLINK3_MK
+.endif # LIBGAMIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgamin
diff --git a/sysutils/libgksu/buildlink3.mk b/sysutils/libgksu/buildlink3.mk
index 495a0224273..5622a39568c 100644
--- a/sysutils/libgksu/buildlink3.mk
+++ b/sysutils/libgksu/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/11/15 19:37:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:25 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBGKSU_BUILDLINK3_MK:=	${LIBGKSU_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgksu
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libgksu
-.endif
+.if !defined(LIBGKSU_BUILDLINK3_MK)
+LIBGKSU_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgksu}
-BUILDLINK_PACKAGES+=	libgksu
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgksu
-
-.if ${LIBGKSU_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libgksu+=	libgksu>=2.0.7
 BUILDLINK_PKGSRCDIR.libgksu?=	../../sysutils/libgksu
-.endif	# LIBGKSU_BUILDLINK3_MK
 
 .include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
+.endif # LIBGKSU_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgksu
diff --git a/sysutils/libgtop/buildlink3.mk b/sysutils/libgtop/buildlink3.mk
index e203c1190e2..48a0b2542d5 100644
--- a/sysutils/libgtop/buildlink3.mk
+++ b/sysutils/libgtop/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/11/15 19:34:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:25 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGTOP_BUILDLINK3_MK:=		${LIBGTOP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgtop
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgtop
-.endif
+.if !defined(LIBGTOP_BUILDLINK3_MK)
+LIBGTOP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtop}
-BUILDLINK_PACKAGES+=	libgtop
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgtop
-
-.if !empty(LIBGTOP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgtop+=	libgtop>=2.14.0
 BUILDLINK_PKGSRCDIR.libgtop?=	../../sysutils/libgtop
-.endif	# LIBGTOP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
+.endif # LIBGTOP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgtop
diff --git a/sysutils/libnotify/buildlink3.mk b/sysutils/libnotify/buildlink3.mk
index 9fa4a6f199d..abea5d96f09 100644
--- a/sysutils/libnotify/buildlink3.mk
+++ b/sysutils/libnotify/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:25 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBNOTIFY_BUILDLINK3_MK:=	${LIBNOTIFY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libnotify
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libnotify
-.endif
+.if !defined(LIBNOTIFY_BUILDLINK3_MK)
+LIBNOTIFY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnotify}
-BUILDLINK_PACKAGES+=	libnotify
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnotify
-
-.if !empty(LIBNOTIFY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libnotify+=	libnotify>=0.3.2
 BUILDLINK_ABI_DEPENDS.libnotify?=	libnotify>=0.3.2nb1
 BUILDLINK_PKGSRCDIR.libnotify?=	../../sysutils/libnotify
-.endif	# LIBNOTIFY_BUILDLINK3_MK
 
 #.include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 #.include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBNOTIFY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libnotify
diff --git a/sysutils/libol/buildlink3.mk b/sysutils/libol/buildlink3.mk
index deb5833c470..23958689451 100644
--- a/sysutils/libol/buildlink3.mk
+++ b/sysutils/libol/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:25 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBOL_BUILDLINK3_MK:=	${LIBOL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libol
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libol
-.endif
+.if !defined(LIBOL_BUILDLINK3_MK)
+LIBOL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibol}
-BUILDLINK_PACKAGES+=	libol
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libol
-
-.if !empty(LIBOL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libol+=	libol>=0.3.17
 BUILDLINK_PKGSRCDIR.libol?=	../../sysutils/libol
-.endif	# LIBOL_BUILDLINK3_MK
+.endif # LIBOL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libol
diff --git a/sysutils/liboobs/buildlink3.mk b/sysutils/liboobs/buildlink3.mk
index 19c10c4bce2..428ec1785d5 100644
--- a/sysutils/liboobs/buildlink3.mk
+++ b/sysutils/liboobs/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/15 18:30:22 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:25 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBOOBS_BUILDLINK3_MK:=	${LIBOOBS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	liboobs
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	liboobs
-.endif
+.if !defined(LIBOOBS_BUILDLINK3_MK)
+LIBOOBS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliboobs}
-BUILDLINK_PACKAGES+=	liboobs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liboobs
-
-.if ${LIBOOBS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.liboobs+=	liboobs>=2.22.0
 BUILDLINK_PKGSRCDIR.liboobs?=	../../sysutils/liboobs
-.endif	# LIBOOBS_BUILDLINK3_MK
+.endif # LIBOOBS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-liboobs
diff --git a/sysutils/libpciaccess/buildlink3.mk b/sysutils/libpciaccess/buildlink3.mk
index 1ea93f6ca1a..bbdc9e223e7 100644
--- a/sysutils/libpciaccess/buildlink3.mk
+++ b/sysutils/libpciaccess/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/30 20:58:11 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:25 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBPCIACCESS_BUILDLINK3_MK:=	${LIBPCIACCESS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libpciaccess
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libpciaccess
-.endif
+.if !defined(LIBPCIACCESS_BUILDLINK3_MK)
+LIBPCIACCESS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpciaccess}
-BUILDLINK_PACKAGES+=	libpciaccess
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpciaccess
-
-.if ${LIBPCIACCESS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libpciaccess+=	libpciaccess>=0.10.4
 BUILDLINK_PKGSRCDIR.libpciaccess?=	../../sysutils/libpciaccess
-.endif	# LIBPCIACCESS_BUILDLINK3_MK
+.endif # LIBPCIACCESS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libpciaccess
diff --git a/sysutils/nautilus-cd-burner/buildlink3.mk b/sysutils/nautilus-cd-burner/buildlink3.mk
index 099b218ce2a..2574d4773d3 100644
--- a/sysutils/nautilus-cd-burner/buildlink3.mk
+++ b/sysutils/nautilus-cd-burner/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.17 2008/12/07 15:16:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:25 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-NAUTILUS_CD_BURNER_BUILDLINK3_MK:=	${NAUTILUS_CD_BURNER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	nautilus-cd-burner
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	nautilus-cd-burner
-.endif
+.if !defined(NAUTILUS_CD_BURNER_BUILDLINK3_MK)
+NAUTILUS_CD_BURNER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnautilus-cd-burner}
-BUILDLINK_PACKAGES+=	nautilus-cd-burner
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nautilus-cd-burner
-
-.if ${NAUTILUS_CD_BURNER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.nautilus-cd-burner+=	nautilus-cd-burner>=2.24.0
 BUILDLINK_PKGSRCDIR.nautilus-cd-burner?=	../../sysutils/nautilus-cd-burner
-.endif	# NAUTILUS_CD_BURNER_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/hal/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # NAUTILUS_CD_BURNER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-nautilus-cd-burner
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index 5d39b67a3ef..bb9dbcc2f29 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.32 2009/03/18 06:17:39 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2009/03/20 19:25:25 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-NAUTILUS_BUILDLINK3_MK:=	${NAUTILUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	nautilus
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	nautilus
-.endif
+.if !defined(NAUTILUS_BUILDLINK3_MK)
+NAUTILUS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnautilus}
-BUILDLINK_PACKAGES+=	nautilus
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nautilus
-
-.if !empty(NAUTILUS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.nautilus+=	nautilus>=2.12.1nb1
 BUILDLINK_ABI_DEPENDS.nautilus?=	nautilus>=2.20.0nb2
 BUILDLINK_PKGSRCDIR.nautilus?=	../../sysutils/nautilus
@@ -20,7 +13,6 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus$$/ \
 				{ print "@comment in nautilus: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus\/extensions-1.0$$/ \
 				{ print "@comment in nautilus: " $$0; next; }
-.endif	# NAUTILUS_BUILDLINK3_MK
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -30,5 +22,6 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus\/extensions-1.0$$/ \
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # NAUTILUS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-nautilus
diff --git a/sysutils/ndesk-dbus-glib/buildlink3.mk b/sysutils/ndesk-dbus-glib/buildlink3.mk
index 337f3b9a51e..b2f1ba57267 100644
--- a/sysutils/ndesk-dbus-glib/buildlink3.mk
+++ b/sysutils/ndesk-dbus-glib/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/25 15:49:30 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:25 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-NDESK_DBUS_GLIB_BUILDLINK3_MK:=	${NDESK_DBUS_GLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ndesk-dbus-glib
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ndesk-dbus-glib
-.endif
+.if !defined(NDESK_DBUS_GLIB_BUILDLINK3_MK)
+NDESK_DBUS_GLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nndesk-dbus-glib}
-BUILDLINK_PACKAGES+=	ndesk-dbus-glib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ndesk-dbus-glib
-
-.if ${NDESK_DBUS_GLIB_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ndesk-dbus-glib+=	ndesk-dbus-glib>=0.4.1
 BUILDLINK_PKGSRCDIR.ndesk-dbus-glib?=	../../sysutils/ndesk-dbus-glib
-.endif	# NDESK_DBUS_GLIB_BUILDLINK3_MK
 
 .include "../../lang/mono/buildlink3.mk"
+.endif # NDESK_DBUS_GLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ndesk-dbus-glib
diff --git a/sysutils/ndesk-dbus/buildlink3.mk b/sysutils/ndesk-dbus/buildlink3.mk
index a53363f231e..181ef5969e3 100644
--- a/sysutils/ndesk-dbus/buildlink3.mk
+++ b/sysutils/ndesk-dbus/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/25 15:18:28 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:25 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-NDESK_DBUS_BUILDLINK3_MK:=	${NDESK_DBUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ndesk-dbus
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ndesk-dbus
-.endif
+.if !defined(NDESK_DBUS_BUILDLINK3_MK)
+NDESK_DBUS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nndesk-dbus}
-BUILDLINK_PACKAGES+=	ndesk-dbus
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ndesk-dbus
-
-.if ${NDESK_DBUS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ndesk-dbus+=	ndesk-dbus>=0.6.1a
 BUILDLINK_PKGSRCDIR.ndesk-dbus?=	../../sysutils/ndesk-dbus
-.endif	# NDESK_DBUS_BUILDLINK3_MK
+.endif # NDESK_DBUS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ndesk-dbus
diff --git a/sysutils/pciutils/buildlink3.mk b/sysutils/pciutils/buildlink3.mk
index 27c7c1b7a66..006fbc95659 100644
--- a/sysutils/pciutils/buildlink3.mk
+++ b/sysutils/pciutils/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/11/03 22:01:29 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:26 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PCIUTILS_BUILDLINK3_MK:=	${PCIUTILS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pciutils
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pciutils
-.endif
+.if !defined(PCIUTILS_BUILDLINK3_MK)
+PCIUTILS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npciutils}
-BUILDLINK_PACKAGES+=	pciutils
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pciutils
-
-.if !empty(PCIUTILS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pciutils+=	pciutils>=3.0.2
 BUILDLINK_PKGSRCDIR.pciutils?=	../../sysutils/pciutils
 BUILDLINK_DEPMETHOD.pciutils?=	build
-.endif	# PCIUTILS_BUILDLINK3_MK
+.endif # PCIUTILS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pciutils
diff --git a/sysutils/py-dbus/buildlink3.mk b/sysutils/py-dbus/buildlink3.mk
index 7269ca4eab6..f88572fb7cb 100644
--- a/sysutils/py-dbus/buildlink3.mk
+++ b/sysutils/py-dbus/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:26 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_DBUS_BUILDLINK3_MK:=		${PY_DBUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-dbus
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	py-dbus
-.endif
+.if !defined(PY_DBUS_BUILDLINK3_MK)
+PY_DBUS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-dbus}
-BUILDLINK_PACKAGES+=	py-dbus
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-dbus
-
-.if !empty(PY_DBUS_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.23.4
 BUILDLINK_ABI_DEPENDS.py-dbus?=	${PYPKGPREFIX}-dbus>=0.71
 BUILDLINK_PKGSRCDIR.py-dbus?=	../../sysutils/py-dbus
-.endif	# PY_DBUS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.endif # PY_DBUS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-dbus
diff --git a/sysutils/py-gnome-menus/buildlink3.mk b/sysutils/py-gnome-menus/buildlink3.mk
index d6e3f6477b6..755c3c4856c 100644
--- a/sysutils/py-gnome-menus/buildlink3.mk
+++ b/sysutils/py-gnome-menus/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/24 12:55:31 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:26 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-PY_GNOME_MENUS_BUILDLINK3_MK:=	${PY_GNOME_MENUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-gnome-menus
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-gnome-menus
-.endif
+.if !defined(PY_GNOME_MENUS_BUILDLINK3_MK)
+PY_GNOME_MENUS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-gnome-menus}
-BUILDLINK_PACKAGES+=	py-gnome-menus
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gnome-menus
-
-.if ${PY_GNOME_MENUS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.py-gnome-menus+=	${PYPKGPREFIX}-gnome-menus>=2.16.1
 BUILDLINK_PKGSRCDIR.py-gnome-menus?=	../../sysutils/py-gnome-menus
-.endif	# PY_GNOME_MENUS_BUILDLINK3_MK
+.endif # PY_GNOME_MENUS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-gnome-menus
diff --git a/sysutils/py-notify/buildlink3.mk b/sysutils/py-notify/buildlink3.mk
index dfbe15058a4..1788b97bc1d 100644
--- a/sysutils/py-notify/buildlink3.mk
+++ b/sysutils/py-notify/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:26 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_NOTIFY_BUILDLINK3_MK:=	${PY_NOTIFY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-notify
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-notify
-.endif
+.if !defined(PY_NOTIFY_BUILDLINK3_MK)
+PY_NOTIFY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-notify}
-BUILDLINK_PACKAGES+=	py-notify
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-notify
-
-.if ${PY_NOTIFY_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-notify+=	${PYPKGPREFIX}-notify>=0.1.1
 BUILDLINK_PKGSRCDIR.py-notify?=	../../sysutils/py-notify
-.endif	# PY_NOTIFY_BUILDLINK3_MK
 
 .include "../../x11/py-gtk2/buildlink3.mk"
+.endif # PY_NOTIFY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-notify
diff --git a/sysutils/strigi/buildlink3.mk b/sysutils/strigi/buildlink3.mk
index 8deadba9d22..048f45e7a40 100644
--- a/sysutils/strigi/buildlink3.mk
+++ b/sysutils/strigi/buildlink3.mk
@@ -1,23 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/01/09 22:28:02 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:26 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-STRIGI_BUILDLINK3_MK:=	${STRIGI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	strigi
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	strigi
-.endif
+.if !defined(STRIGI_BUILDLINK3_MK)
+STRIGI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nstrigi}
-BUILDLINK_PACKAGES+=	strigi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}strigi
-
-.if ${STRIGI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.strigi+=	strigi>=0.6.2
 BUILDLINK_PKGSRCDIR.strigi?=	../../sysutils/strigi
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/strigi$$/ \
 				{ print "@comment in strigi: " $$0; next; }
-.endif	# STRIGI_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
@@ -25,5 +17,6 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/strigi$$/ \
 .include "../../textproc/libclucene/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
+.endif # STRIGI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-strigi
diff --git a/sysutils/system-tools-backends/buildlink3.mk b/sysutils/system-tools-backends/buildlink3.mk
index 8345a3f04b6..0019cc1b542 100644
--- a/sysutils/system-tools-backends/buildlink3.mk
+++ b/sysutils/system-tools-backends/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/15 18:28:56 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:26 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK:=	${SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	system-tools-backends
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	system-tools-backends
-.endif
+.if !defined(SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK)
+SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsystem-tools-backends}
-BUILDLINK_PACKAGES+=	system-tools-backends
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}system-tools-backends
-
-.if ${SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.system-tools-backends+=	system-tools-backends>=2.6.0
 BUILDLINK_PKGSRCDIR.system-tools-backends?=	../../sysutils/system-tools-backends
-.endif	# SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.endif # SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-system-tools-backends
diff --git a/sysutils/vcdimager-devel/buildlink3.mk b/sysutils/vcdimager-devel/buildlink3.mk
index 5976a34b683..c89e85d2562 100644
--- a/sysutils/vcdimager-devel/buildlink3.mk
+++ b/sysutils/vcdimager-devel/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:26 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-VCDIMAGER_BUILDLINK3_MK:=	${VCDIMAGER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	vcdimager
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	vcdimager
-.endif
+.if !defined(VCDIMAGER_BUILDLINK3_MK)
+VCDIMAGER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvcdimager}
-BUILDLINK_PACKAGES+=	vcdimager
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vcdimager
-
-.if !empty(VCDIMAGER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.vcdimager+=	vcdimager>=0.7.20
 BUILDLINK_ABI_DEPENDS.vcdimager+=	vcdimager>=0.7.23nb1
 BUILDLINK_PKGSRCDIR.vcdimager?=	../../sysutils/vcdimager-devel
-.endif	# VCDIMAGER_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # VCDIMAGER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-vcdimager
diff --git a/sysutils/xentools3/buildlink3.mk b/sysutils/xentools3/buildlink3.mk
index e213dda0d95..1153d9177a9 100644
--- a/sysutils/xentools3/buildlink3.mk
+++ b/sysutils/xentools3/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/02/15 20:34:35 bouyer Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:26 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XENTOOLS3_BUILDLINK3_MK:=	${XENTOOLS3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xentools3
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xentools3
-.endif
+.if !defined(XENTOOLS3_BUILDLINK3_MK)
+XENTOOLS3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxentools3}
-BUILDLINK_PACKAGES+=	xentools3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xentools3
-
-.if ${XENTOOLS3_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xentools3+=	xentools3>=3.1.3
 BUILDLINK_PKGSRCDIR.xentools3?=	../../sysutils/xentools3
-.endif	# XENTOOLS3_BUILDLINK3_MK
+.endif # XENTOOLS3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xentools3
diff --git a/sysutils/xfce4-appfinder/buildlink3.mk b/sysutils/xfce4-appfinder/buildlink3.mk
index 13e96ee9434..ebc26663d71 100644
--- a/sysutils/xfce4-appfinder/buildlink3.mk
+++ b/sysutils/xfce4-appfinder/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.17 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:26 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_APPFINDER_BUILDLINK3_MK:=	${XFCE4_APPFINDER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-appfinder
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-appfinder
-.endif
+.if !defined(XFCE4_APPFINDER_BUILDLINK3_MK)
+XFCE4_APPFINDER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-appfinder}
-BUILDLINK_PACKAGES+=	xfce4-appfinder
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-appfinder
-
-.if ${XFCE4_APPFINDER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-appfinder+=	xfce4-appfinder>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-appfinder?=	../../sysutils/xfce4-appfinder
-.endif	# XFCE4_APPFINDER_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_APPFINDER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-appfinder
diff --git a/sysutils/xfce4-battery-plugin/buildlink3.mk b/sysutils/xfce4-battery-plugin/buildlink3.mk
index 279271bb011..20fb6a00796 100644
--- a/sysutils/xfce4-battery-plugin/buildlink3.mk
+++ b/sysutils/xfce4-battery-plugin/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/05/04 10:18:17 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:26 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK:=	${XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-battery-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-battery-plugin
-.endif
+.if !defined(XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK)
+XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-battery-plugin}
-BUILDLINK_PACKAGES+=	xfce4-battery-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-battery-plugin
-
-.if ${XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-battery-plugin+=	xfce4-battery-plugin>=0.5.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-battery-plugin?=	../../sysutils/xfce4-battery-plugin
-.endif	# XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
@@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.xfce4-battery-plugin?=	../../sysutils/xfce4-battery-plugin
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-battery-plugin
diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
index 0c40dac8e25..ce2f481cbef 100644
--- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
+++ b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/04/12 09:55:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:27 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-cpugraph-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-cpugraph-plugin
-.endif
+.if !defined(XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK)
+XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-cpugraph-plugin}
-BUILDLINK_PACKAGES+=	xfce4-cpugraph-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-cpugraph-plugin
-
-.if ${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+=	xfce4-cpugraph-plugin>=0.3.0
 BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?=	../../sysutils/xfce4-cpugraph-plugin
-.endif	# XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-cpugraph-plugin
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
index 92167e81682..c8f5ff9b441 100644
--- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk
+++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/04/12 09:55:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:27 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:=	${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-diskperf-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-diskperf-plugin
-.endif
+.if !defined(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK)
+XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-diskperf-plugin}
-BUILDLINK_PACKAGES+=	xfce4-diskperf-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-diskperf-plugin
-
-.if ${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=2.1.0
 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?=	../../sysutils/xfce4-diskperf-plugin
-.endif	# XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-diskperf-plugin
diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
index 1667031207c..0eedbd70010 100644
--- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk
+++ b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/12/05 07:49:44 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:27 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-fsguard-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-fsguard-plugin
-.endif
+.if !defined(XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK)
+XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-fsguard-plugin}
-BUILDLINK_PACKAGES+=	xfce4-fsguard-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-fsguard-plugin
-
-.if ${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+=	xfce4-fsguard-plugin>=0.4.0
 BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?=	../../sysutils/xfce4-fsguard-plugin
-.endif	# XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-fsguard-plugin
diff --git a/sysutils/xfce4-genmon-plugin/buildlink3.mk b/sysutils/xfce4-genmon-plugin/buildlink3.mk
index 34d152b3b1b..cedaa9c2aed 100644
--- a/sysutils/xfce4-genmon-plugin/buildlink3.mk
+++ b/sysutils/xfce4-genmon-plugin/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:27 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_GENMON_PLUGIN_BUILDLINK3_MK:=	${XFCE4_GENMON_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-genmon-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-genmon-plugin
-.endif
+.if !defined(XFCE4_GENMON_PLUGIN_BUILDLINK3_MK)
+XFCE4_GENMON_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-genmon-plugin}
-BUILDLINK_PACKAGES+=	xfce4-genmon-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-genmon-plugin
-
-.if ${XFCE4_GENMON_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-genmon-plugin+=	xfce4-genmon-plugin>=3.1
 BUILDLINK_PKGSRCDIR.xfce4-genmon-plugin?=	../../sysutils/xfce4-genmon-plugin
-.endif	# XFCE4_GENMON_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_GENMON_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-genmon-plugin
diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk
index 29f396d9a46..fc75b596fec 100644
--- a/sysutils/xfce4-netload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-netload-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/04/12 09:55:16 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:27 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-netload-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-netload-plugin
-.endif
+.if !defined(XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK)
+XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-netload-plugin}
-BUILDLINK_PACKAGES+=	xfce4-netload-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-netload-plugin
-
-.if ${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.4.0
 BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?=	../../sysutils/xfce4-netload-plugin
-.endif	# XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-netload-plugin
diff --git a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
index b655b895197..e122a57c0a8 100644
--- a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
+++ b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/12/05 07:50:16 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:27 joerg Exp $
 
-BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
-XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:=	${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-quicklauncher-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-quicklauncher-plugin
-.endif
+.if !defined(XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK)
+XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-quicklauncher-plugin}
-BUILDLINK_PACKAGES+=	xfce4-quicklauncher-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-quicklauncher-plugin
-
-.if ${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+=	xfce4-quicklauncher-plugin>=1.9.4
 BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?=	../../sysutils/xfce4-quicklauncher-plugin
-.endif	# XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-quicklauncher-plugin
diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk
index 5fa2774b767..2f58776eabf 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:17 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:27 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-systemload-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-systemload-plugin
-.endif
+.if !defined(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK)
+XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-systemload-plugin}
-BUILDLINK_PACKAGES+=	xfce4-systemload-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-systemload-plugin
-
-.if ${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.4.2
 BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?=	../../sysutils/xfce4-systemload-plugin
-.endif	# XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-systemload-plugin
diff --git a/sysutils/xfce4-thunar/buildlink3.mk b/sysutils/xfce4-thunar/buildlink3.mk
index 1728459afc9..1aff93314d7 100644
--- a/sysutils/xfce4-thunar/buildlink3.mk
+++ b/sysutils/xfce4-thunar/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2008/12/19 23:54:47 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:27 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_THUNAR_BUILDLINK3_MK:=	${XFCE4_THUNAR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-thunar
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-thunar
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-thunar}
-BUILDLINK_PACKAGES+=	xfce4-thunar
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-thunar
+.if !defined(XFCE4_THUNAR_BUILDLINK3_MK)
+XFCE4_THUNAR_BUILDLINK3_MK:=
 
-.if ${XFCE4_THUNAR_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-thunar+=	xfce4-thunar>=0.9.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-thunar?=	../../sysutils/xfce4-thunar
-.endif	# XFCE4_THUNAR_BUILDLINK3_MK
 
 pkgbase := xfce4-thunar
 .include "../../mk/pkg-build-options.mk"
@@ -35,5 +27,6 @@ pkgbase := xfce4-thunar
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/fam.buildlink3.mk"
+.endif # XFCE4_THUNAR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-thunar
diff --git a/sysutils/xfce4-xarchiver/buildlink3.mk b/sysutils/xfce4-xarchiver/buildlink3.mk
index 0edb5e67bba..b715395ac20 100644
--- a/sysutils/xfce4-xarchiver/buildlink3.mk
+++ b/sysutils/xfce4-xarchiver/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:27 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_XARCHIVER_BUILDLINK3_MK:=	${XFCE4_XARCHIVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-xarchiver
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-xarchiver
-.endif
+.if !defined(XFCE4_XARCHIVER_BUILDLINK3_MK)
+XFCE4_XARCHIVER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-xarchiver}
-BUILDLINK_PACKAGES+=	xfce4-xarchiver
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xarchiver
-
-.if ${XFCE4_XARCHIVER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-xarchiver+=	xfce4-xarchiver>=0.5.2nb1
 BUILDLINK_PKGSRCDIR.xfce4-xarchiver?=	../../sysutils/xfce4-xarchiver
-.endif	# XFCE4_XARCHIVER_BUILDLINK3_MK
 
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_XARCHIVER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-xarchiver
diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk
index ff8de8d535e..ffd4b3d6700 100644
--- a/sysutils/xfce4-xkb-plugin/buildlink3.mk
+++ b/sysutils/xfce4-xkb-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/04/12 09:55:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:27 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_XKB_PLUGIN_BUILDLINK3_MK:=	${XFCE4_XKB_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-xkb-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-xkb-plugin
-.endif
+.if !defined(XFCE4_XKB_PLUGIN_BUILDLINK3_MK)
+XFCE4_XKB_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-xkb-plugin}
-BUILDLINK_PACKAGES+=	xfce4-xkb-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xkb-plugin
-
-.if ${XFCE4_XKB_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+=	xfce4-xkb-plugin>=0.4.3
 BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?=	../../sysutils/xfce4-xkb-plugin
-.endif	# XFCE4_XKB_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_XKB_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-xkb-plugin