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.

40 files changed, 240 insertions, 521 deletions

diff --git a/databases/bdb-xml/buildlink3.mk b/databases/bdb-xml/buildlink3.mk
index 54c7dffbf9c..40e46ede4fa 100644
--- a/databases/bdb-xml/buildlink3.mk
+++ b/databases/bdb-xml/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/09/24 19:32:00 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:04 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BDB_XML_BUILDLINK3_MK:=	${BDB_XML_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	bdb-xml
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	bdb-xml
-.endif
+.if !defined(BDB_XML_BUILDLINK3_MK)
+BDB_XML_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbdb-xml}
-BUILDLINK_PACKAGES+=	bdb-xml
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bdb-xml
-
-.if !empty(BDB_XML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.bdb-xml+=	bdb-xml>=1.2.1nb3
 BUILDLINK_ABI_DEPENDS.bdb-xml?=	bdb-xml>=1.2.1nb8
 BUILDLINK_PKGSRCDIR.bdb-xml?=	../../databases/bdb-xml
-.endif	# BDB_XML_BUILDLINK3_MK
 
 .include "../../databases/db46/buildlink3.mk"
 .include "../../textproc/libpathan/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
+.endif # BDB_XML_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-bdb-xml
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index 684a2ecec15..0c46c1d5093 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.25 2006/12/12 21:52:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:04 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DB_BUILDLINK3_MK:=	${DB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	db2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	db2
-.endif
+.if !defined(DB_BUILDLINK3_MK)
+DB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb2}
-BUILDLINK_PACKAGES+=	db2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db2
-
-.if !empty(DB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.db2+=		db>=2.7.3
 BUILDLINK_ABI_DEPENDS.db2+=	db>=2.7.7nb2
 BUILDLINK_PKGSRCDIR.db2?=	../../databases/db
@@ -23,6 +16,6 @@ BUILDLINK_LDADD.db2=		-ldb2
 BUILDLINK_LIBS.db2=		${BUILDLINK_LDADD.db2}
 BUILDLINK_TRANSFORM+=		l:db:db2
 .  endif
-.endif	# DB_BUILDLINK3_MK
+.endif # DB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-db2
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index 7413120912c..f5305c69e68 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.21 2006/12/12 21:52:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:04 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DB3_BUILDLINK3_MK:=	${DB3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	db3
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	db3
-.endif
+.if !defined(DB3_BUILDLINK3_MK)
+DB3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb3}
-BUILDLINK_PACKAGES+=	db3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db3
-
-.if !empty(DB3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.db3+=		db3>=2.9.2
 BUILDLINK_ABI_DEPENDS.db3+=	db3>=3.11.2nb3
 BUILDLINK_PKGSRCDIR.db3?=	../../databases/db3
@@ -24,8 +17,8 @@ BUILDLINK_TRANSFORM+=		l:db-3:db3
 BUILDLINK_LIBS.db3=		${BUILDLINK_LDADD.db3}
 BUILDLINK_TRANSFORM+=		l:db:db3
 .  endif
-.endif	# DB3_BUILDLINK3_MK
 
 .include "../../mk/pthread.buildlink3.mk"
+.endif # DB3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-db3
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index 5ab5e630fec..715c72a4cb6 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.34 2008/09/06 20:53:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2009/03/20 19:24:04 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DB4_BUILDLINK3_MK:=	${DB4_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	db4
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	db4
-.endif
+.if !defined(DB4_BUILDLINK3_MK)
+DB4_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb4}
-BUILDLINK_PACKAGES+=	db4
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db4
-
-.if !empty(DB4_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.db4+=	db4>=4.7.25.1
 BUILDLINK_ABI_DEPENDS.db4?=	db4>=4.7.25.1
 BUILDLINK_PKGSRCDIR.db4?=	../../databases/db4
@@ -30,6 +23,6 @@ BUILDLINK_TRANSFORM+=		l:db:db4
 PTHREAD_OPTS+=	native
 .    include "../../mk/pthread.buildlink3.mk"
 .  endif
-.endif	# DB4_BUILDLINK3_MK
+.endif # DB4_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-db4
diff --git a/databases/db46/buildlink3.mk b/databases/db46/buildlink3.mk
index 567359b3fc1..ecfae217fc9 100644
--- a/databases/db46/buildlink3.mk
+++ b/databases/db46/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/09/09 22:23:32 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DB46_BUILDLINK3_MK:=	${DB46_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	db46
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	db46
-.endif
+.if !defined(DB46_BUILDLINK3_MK)
+DB46_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb46}
-BUILDLINK_PACKAGES+=	db46
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db46
-
-.if !empty(DB46_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.db46+=	db46>=4.6.21
 BUILDLINK_PKGSRCDIR.db46?=	../../databases/db46
 BUILDLINK_INCDIRS.db46?=		include/db46
@@ -29,6 +22,6 @@ BUILDLINK_TRANSFORM+=		l:db:db46
 PTHREAD_OPTS+=	native
 .    include "../../mk/pthread.buildlink3.mk"
 .  endif
-.endif	# DB46_BUILDLINK3_MK
+.endif # DB46_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-db46
diff --git a/databases/dbh/buildlink3.mk b/databases/dbh/buildlink3.mk
index 08a3f459350..171645ef6fe 100644
--- a/databases/dbh/buildlink3.mk
+++ b/databases/dbh/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DBH_BUILDLINK3_MK:=	${DBH_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	dbh
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	dbh
-.endif
+.if !defined(DBH_BUILDLINK3_MK)
+DBH_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbh}
-BUILDLINK_PACKAGES+=	dbh
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbh
-
-.if !empty(DBH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dbh+=		dbh>=1.0.22
 BUILDLINK_PKGSRCDIR.dbh?=	../../databases/dbh
-.endif	# DBH_BUILDLINK3_MK
+.endif # DBH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-dbh
diff --git a/databases/edb/buildlink3.mk b/databases/edb/buildlink3.mk
index bf6df29aadb..8ff6618b212 100644
--- a/databases/edb/buildlink3.mk
+++ b/databases/edb/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EDB_BUILDLINK3_MK:=	${EDB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	edb
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	edb
-.endif
+.if !defined(EDB_BUILDLINK3_MK)
+EDB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nedb}
-BUILDLINK_PACKAGES+=	edb
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}edb
-
-.if !empty(EDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.edb+=	edb>=1.0.3nb3
 BUILDLINK_ABI_DEPENDS.edb+=	edb>=1.0.3nb5
 BUILDLINK_PKGSRCDIR.edb?=	../../databases/edb
-.endif	# EDB_BUILDLINK3_MK
+.endif # EDB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-edb
diff --git a/databases/freetds/buildlink3.mk b/databases/freetds/buildlink3.mk
index 958fb88d4c6..4718b74ad5e 100644
--- a/databases/freetds/buildlink3.mk
+++ b/databases/freetds/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/05/08 20:14:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FREETDS_BUILDLINK3_MK:=	${FREETDS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	freetds
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	freetds
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreetds}
-BUILDLINK_PACKAGES+=	freetds
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freetds
+.if !defined(FREETDS_BUILDLINK3_MK)
+FREETDS_BUILDLINK3_MK:=
 
-.if !empty(FREETDS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.82
 BUILDLINK_ABI_DEPENDS.freetds?=	freetds>=0.63nb4
 BUILDLINK_PKGSRCDIR.freetds?=	../../databases/freetds
-.endif	# FREETDS_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 
@@ -29,5 +21,6 @@ pkgbase := freetds
 .if !empty(PKG_BUILD_OPTIONS.freetds:Mopenssl)
 .  include "../../security/openssl/buildlink3.mk"
 .endif
+.endif # FREETDS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-freetds
diff --git a/databases/gdbm/buildlink3.mk b/databases/gdbm/buildlink3.mk
index 0b0314eb737..dd1ddc1c63d 100644
--- a/databases/gdbm/buildlink3.mk
+++ b/databases/gdbm/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GDBM_BUILDLINK3_MK:=	${GDBM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gdbm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gdbm
-.endif
+.if !defined(GDBM_BUILDLINK3_MK)
+GDBM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdbm}
-BUILDLINK_PACKAGES+=	gdbm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdbm
-
-.if !empty(GDBM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gdbm+=	gdbm>=1.8.3
 BUILDLINK_ABI_DEPENDS.gdbm+=	gdbm>=1.8.3nb1
 BUILDLINK_PKGSRCDIR.gdbm?=	../../databases/gdbm
-.endif	# GDBM_BUILDLINK3_MK
+.endif # GDBM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gdbm
diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk
index ff7e472ce74..ae6fa7971f7 100644
--- a/databases/gnome-mime-data/buildlink3.mk
+++ b/databases/gnome-mime-data/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:05 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_MIME_DATA_BUILDLINK3_MK:=	${GNOME_MIME_DATA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-mime-data
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-mime-data
-.endif
+.if !defined(GNOME_MIME_DATA_BUILDLINK3_MK)
+GNOME_MIME_DATA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-mime-data}
-BUILDLINK_PACKAGES+=	gnome-mime-data
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-mime-data
-
-.if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.4.0
 BUILDLINK_ABI_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.4.2nb2
 BUILDLINK_PKGSRCDIR.gnome-mime-data?=	../../databases/gnome-mime-data
@@ -21,8 +14,7 @@ BUILDLINK_PKGSRCDIR.gnome-mime-data?=	../../databases/gnome-mime-data
 #
 USE_TOOLS+=	perl
 
-.endif	# GNOME_MIME_DATA_BUILDLINK3_MK
-
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # GNOME_MIME_DATA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-mime-data
diff --git a/databases/iodbc/buildlink3.mk b/databases/iodbc/buildlink3.mk
index 6e219e8bdce..1a0f90d299d 100644
--- a/databases/iodbc/buildlink3.mk
+++ b/databases/iodbc/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-IODBC_BUILDLINK3_MK:=	${IODBC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	iodbc
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	iodbc
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Niodbc}
-BUILDLINK_PACKAGES+=	iodbc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}iodbc
+.if !defined(IODBC_BUILDLINK3_MK)
+IODBC_BUILDLINK3_MK:=
 
-.if !empty(IODBC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.iodbc+=	iodbc>=3.52.3
 BUILDLINK_PKGSRCDIR.iodbc?=	../../databases/iodbc
-.endif	# IODBC_BUILDLINK3_MK
 
 # ODBC drivers don't need these bits, but ODBC clients do.
 .if !defined(ODBC_DRIVER)
 .  include "../../mk/dlopen.buildlink3.mk"
 .  include "../../mk/pthread.buildlink3.mk"
 .endif
+.endif # IODBC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-iodbc
diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk
index df37c784484..a1bbad7f95d 100644
--- a/databases/libgda/buildlink3.mk
+++ b/databases/libgda/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/08/09 19:07:38 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBGDA_BUILDLINK3_MK:=	${LIBGDA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgda
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgda
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgda}
-BUILDLINK_PACKAGES+=	libgda
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgda
+.if !defined(LIBGDA_BUILDLINK3_MK)
+LIBGDA_BUILDLINK3_MK:=
 
-.if !empty(LIBGDA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgda+=	libgda>=2.99.2
 BUILDLINK_ABI_DEPENDS.libgda+=	libgda>=3.0.0
 BUILDLINK_PKGSRCDIR.libgda?=	../../databases/libgda
@@ -20,7 +13,6 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/libgda-3.0\/providers$$/ \
 				{ print "@comment in libgda: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm share\/libgda-3.0$$/ \
 				{ print "@comment in libgda: " $$0; next; }
-.endif	# LIBGDA_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -34,5 +26,6 @@ pkgbase := libgda
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBGDA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgda
diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk
index 53e62fb6405..95c7c65d57e 100644
--- a/databases/libgnomedb/buildlink3.mk
+++ b/databases/libgnomedb/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.23 2008/01/18 05:06:27 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:05 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGNOMEDB_BUILDLINK3_MK:=	${LIBGNOMEDB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgnomedb
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnomedb
-.endif
+.if !defined(LIBGNOMEDB_BUILDLINK3_MK)
+LIBGNOMEDB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomedb}
-BUILDLINK_PACKAGES+=	libgnomedb
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomedb
-
-.if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomedb+=	libgnomedb>=2.99.2
 BUILDLINK_ABI_DEPENDS.libgnomedb+=	libgnomedb>=3.0.0nb2
 BUILDLINK_PKGSRCDIR.libgnomedb?=	../../databases/libgnomedb
-.endif	# LIBGNOMEDB_BUILDLINK3_MK
 
 .include "../../databases/libgda/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libgnomedb?=	../../databases/libgnomedb
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtksourceview/buildlink3.mk"
+.endif # LIBGNOMEDB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgnomedb
diff --git a/databases/libpqxx/buildlink3.mk b/databases/libpqxx/buildlink3.mk
index 1d96585b092..580d4dd5858 100644
--- a/databases/libpqxx/buildlink3.mk
+++ b/databases/libpqxx/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:05 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBPQXX_BUILDLINK3_MK:=	${LIBPQXX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libpqxx
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libpqxx
-.endif
+.if !defined(LIBPQXX_BUILDLINK3_MK)
+LIBPQXX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpqxx}
-BUILDLINK_PACKAGES+=	libpqxx
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpqxx
-
-.if !empty(LIBPQXX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libpqxx+=	libpqxx>=2.5.0
 BUILDLINK_ABI_DEPENDS.libpqxx?=	libpqxx>=2.5.4nb1
 BUILDLINK_PKGSRCDIR.libpqxx?=	../../databases/libpqxx
-.endif	# LIBPQXX_BUILDLINK3_MK
+.endif # LIBPQXX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libpqxx
diff --git a/databases/metakit-lib/buildlink3.mk b/databases/metakit-lib/buildlink3.mk
index cef0ca31a17..b5f410b4628 100644
--- a/databases/metakit-lib/buildlink3.mk
+++ b/databases/metakit-lib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:06 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-METAKIT_LIB_BUILDLINK3_MK:=	${METAKIT_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	metakit-lib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	metakit-lib
-.endif
+.if !defined(METAKIT_LIB_BUILDLINK3_MK)
+METAKIT_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmetakit-lib}
-BUILDLINK_PACKAGES+=	metakit-lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}metakit-lib
-
-.if !empty(METAKIT_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.metakit-lib+=	metakit-lib>=2.4.8
 BUILDLINK_ABI_DEPENDS.metakit-lib+=	metakit-lib>=2.4.9.3nb1
 BUILDLINK_PKGSRCDIR.metakit-lib?=	../../databases/metakit-lib
-.endif	# METAKIT_LIB_BUILDLINK3_MK
+.endif # METAKIT_LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-metakit-lib
diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk
index b2e16611dfb..e2fd4f0ea1c 100644
--- a/databases/mysql4-client/buildlink3.mk
+++ b/databases/mysql4-client/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.23 2008/03/26 13:22:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:06 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mysql-client
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	mysql-client
-.endif
+.if !defined(MYSQL_CLIENT_BUILDLINK3_MK)
+MYSQL_CLIENT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
-BUILDLINK_PACKAGES+=	mysql-client
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mysql-client
-
-.if ${MYSQL_CLIENT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=4.1.22<5
 BUILDLINK_ABI_DEPENDS.mysql-client?=	mysql-client>=4.1.22nb1
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql4-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=	include/mysql
-.endif	# MYSQL_CLIENT_BUILDLINK3_MK
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.endif # MYSQL_CLIENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mysql-client
diff --git a/databases/mysql5-client/buildlink3.mk b/databases/mysql5-client/buildlink3.mk
index b8a3d4e8122..cb427907899 100644
--- a/databases/mysql5-client/buildlink3.mk
+++ b/databases/mysql5-client/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/09/18 11:50:44 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:06 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mysql-client
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	mysql-client
-.endif
+.if !defined(MYSQL_CLIENT_BUILDLINK3_MK)
+MYSQL_CLIENT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
-BUILDLINK_PACKAGES+=	mysql-client
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mysql-client
-
-.if ${MYSQL_CLIENT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=5.0.15
 BUILDLINK_ABI_DEPENDS.mysql-client+=	mysql-client>=5.0.67
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql5-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=	include/mysql
-.endif	# MYSQL_CLIENT_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.endif # MYSQL_CLIENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mysql-client
diff --git a/databases/openldap-client/buildlink3.mk b/databases/openldap-client/buildlink3.mk
index c52c347c1a0..0547cf1ce57 100644
--- a/databases/openldap-client/buildlink3.mk
+++ b/databases/openldap-client/buildlink3.mk
@@ -1,26 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/01/18 05:06:28 tnn Exp $
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-OPENLDAP_BUILDLINK3_MK:=		${OPENLDAP_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:06 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=			openldap-client
-.endif
+BUILDLINK_TREE+=	openldap-client
 
-BUILDLINK_PACKAGES:=			${BUILDLINK_PACKAGES:Nopenldap-client}
-BUILDLINK_PACKAGES+=			openldap-client
-BUILDLINK_ORDER:=			${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openldap-client
+.if !defined(OPENLDAP_BUILDLINK3_MK)
+OPENLDAP_BUILDLINK3_MK:=
 
-.if !empty(OPENLDAP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openldap-client+=	openldap-client>=2.4.6
 BUILDLINK_ABI_DEPENDS.openldap-client?=	openldap-client>=2.4.7nb1
 BUILDLINK_PKGSRCDIR.openldap-client?=	../../databases/openldap-client
 
 # Export the deprecated API from the openldap-2.2.x releases.
 BUILDLINK_CPPFLAGS.openldap-client+=	-DLDAP_DEPRECATED
-.endif	# OPENLDAP_BUILDLINK3_MK
 
 pkgbase := openldap-client
 .include "../../mk/pkg-build-options.mk"
@@ -30,5 +22,6 @@ pkgbase := openldap-client
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
 .include "../../security/openssl/buildlink3.mk"
+.endif # OPENLDAP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openldap-client
diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk
index 741ebba1660..0ebcb373cbd 100644
--- a/databases/p5-DBI/buildlink3.mk
+++ b/databases/p5-DBI/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/10/13 17:55:44 erh Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:06 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-P5_DBI_BUILDLINK3_MK:=	${P5_DBI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	p5-DBI
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	p5-DBI
-.endif
+.if !defined(P5_DBI_BUILDLINK3_MK)
+P5_DBI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-DBI}
-BUILDLINK_PACKAGES+=	p5-DBI
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-DBI
-
-.if !empty(P5_DBI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.52
 BUILDLINK_PKGSRCDIR.p5-DBI?=	../../databases/p5-DBI
 BUILDLINK_INCDIRS.p5-DBI?=	${PERL5_SUB_INSTALLVENDORARCH}/auto/DBI
 
 # We want all of the arch-dependent DBI files.
 BUILDLINK_CONTENTS_FILTER.p5-DBI?=	${GREP} '/auto/DBI/'
-.endif	# P5_DBI_BUILDLINK3_MK
 
 .include "../../lang/perl5/buildlink3.mk"
+.endif # P5_DBI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-p5-DBI
diff --git a/databases/php-pdo/buildlink3.mk b/databases/php-pdo/buildlink3.mk
index 8d48da56f1f..626d1c5aedf 100644
--- a/databases/php-pdo/buildlink3.mk
+++ b/databases/php-pdo/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/13 10:57:20 sborrill Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:06 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PHP_PDO_BUILDLINK3_MK:=		${PHP_PDO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	php-pdo
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=		php-pdo
-.endif
+.if !defined(PHP_PDO_BUILDLINK3_MK)
+PHP_PDO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nphp-pdo}
-BUILDLINK_PACKAGES+=		php-pdo
-BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}php-pdo
-
-.if !empty(PHP_PDO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.php-pdo+=	${PHP_PKG_PREFIX}-pdo-5.*
 BUILDLINK_ABI_DEPENDS.php-pdo?=	${PHP_PKG_PREFIX}-pdo>=5.2.9
 BUILDLINK_PKGSRCDIR.php-pdo?=	../../databases/php-pdo
 BUILDLINK_INCDIRS.php-pdo?=	include/php/ext/pdo
-.endif  # PHP_PDO_BUILDLINK3_MK
+.endif # PHP_PDO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-php-pdo
diff --git a/databases/postgresql81-client/buildlink3.mk b/databases/postgresql81-client/buildlink3.mk
index 271158de1d8..bfdb5dbdf93 100644
--- a/databases/postgresql81-client/buildlink3.mk
+++ b/databases/postgresql81-client/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.9 2008/01/18 05:06:29 tnn Exp $
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-POSTGRESQL81_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL81_CLIENT_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:06 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	postgresql81-client
-.endif
+BUILDLINK_TREE+=	postgresql81-client
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql81-client}
-BUILDLINK_PACKAGES+=	postgresql81-client
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}postgresql81-client
+.if !defined(POSTGRESQL81_CLIENT_BUILDLINK3_MK)
+POSTGRESQL81_CLIENT_BUILDLINK3_MK:=
 
-.if ${POSTGRESQL81_CLIENT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.postgresql81-client+=		postgresql81-client>=8.1.0
 BUILDLINK_ABI_DEPENDS.postgresql81-client?=	postgresql81-client>=8.1.11nb1
 BUILDLINK_PKGSRCDIR.postgresql81-client?=	../../databases/postgresql81-client
@@ -27,9 +20,9 @@ BUILDLINK_LIBDIRS.postgresql81-client?=	${PG_SUBPREFIX}/lib
 BUILDLINK_LDADD.postgresql81-client=	-lpq ${BUILDLINK_LDADD.gettext}
 
 BUILDLINK_FILES.postgresql81-client+=	bin/pg_config
-.endif	# POSTGRESQL81_CLIENT_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # POSTGRESQL81_CLIENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-postgresql81-client
diff --git a/databases/postgresql82-client/buildlink3.mk b/databases/postgresql82-client/buildlink3.mk
index 3ccf9d3b61c..1765ac8c80f 100644
--- a/databases/postgresql82-client/buildlink3.mk
+++ b/databases/postgresql82-client/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/01/18 05:06:30 tnn Exp $
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-POSTGRESQL82_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL82_CLIENT_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:06 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	postgresql82-client
-.endif
+BUILDLINK_TREE+=	postgresql82-client
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql82-client}
-BUILDLINK_PACKAGES+=	postgresql82-client
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}postgresql82-client
+.if !defined(POSTGRESQL82_CLIENT_BUILDLINK3_MK)
+POSTGRESQL82_CLIENT_BUILDLINK3_MK:=
 
-.if ${POSTGRESQL82_CLIENT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.postgresql82-client+=	postgresql82-client>=8.2.0
 BUILDLINK_ABI_DEPENDS.postgresql82-client?=	postgresql82-client>=8.2.6nb1
 BUILDLINK_PKGSRCDIR.postgresql82-client?=	../../databases/postgresql82-client
@@ -27,9 +20,9 @@ BUILDLINK_LIBDIRS.postgresql82-client?=	${PG_SUBPREFIX}/lib
 BUILDLINK_LDADD.postgresql82-client=	-lpq ${BUILDLINK_LDADD.gettext}
 
 BUILDLINK_FILES.postgresql82-client+=	bin/pg_config
-.endif	# POSTGRESQL82_CLIENT_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # POSTGRESQL82_CLIENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-postgresql82-client
diff --git a/databases/postgresql83-client/buildlink3.mk b/databases/postgresql83-client/buildlink3.mk
index efc960dafed..eab6e319aba 100644
--- a/databases/postgresql83-client/buildlink3.mk
+++ b/databases/postgresql83-client/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/04 12:42:53 adam Exp $
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-POSTGRESQL83_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL83_CLIENT_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:06 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	postgresql83-client
-.endif
+BUILDLINK_TREE+=	postgresql83-client
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql83-client}
-BUILDLINK_PACKAGES+=	postgresql83-client
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}postgresql83-client
+.if !defined(POSTGRESQL83_CLIENT_BUILDLINK3_MK)
+POSTGRESQL83_CLIENT_BUILDLINK3_MK:=
 
-.if ${POSTGRESQL83_CLIENT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.postgresql83-client+=	postgresql83-client>=8.3.0
 BUILDLINK_ABI_DEPENDS.postgresql83-client?=	postgresql83-client>=8.3.0
 BUILDLINK_PKGSRCDIR.postgresql83-client?=	../../databases/postgresql83-client
@@ -27,9 +20,9 @@ BUILDLINK_LIBDIRS.postgresql83-client?=	${PG_SUBPREFIX}/lib
 BUILDLINK_LDADD.postgresql83-client=	-lpq ${BUILDLINK_LDADD.gettext}
 
 BUILDLINK_FILES.postgresql83-client+=	bin/pg_config
-.endif	# POSTGRESQL83_CLIENT_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # POSTGRESQL83_CLIENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-postgresql83-client
diff --git a/databases/py-ZODB/buildlink3.mk b/databases/py-ZODB/buildlink3.mk
index 4f2eac8d21e..02c880a7d5b 100644
--- a/databases/py-ZODB/buildlink3.mk
+++ b/databases/py-ZODB/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:06 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PY_ZODB_BUILDLINK3_MK:=	${PY_ZODB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pyZODB
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pyZODB
-.endif
+.if !defined(PY_ZODB_BUILDLINK3_MK)
+PY_ZODB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NpyZODB}
-BUILDLINK_PACKAGES+=	pyZODB
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyZODB
-
-.if !empty(PY_ZODB_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyZODB+=	${PYPKGPREFIX}-ZODB>=3.2nb1
 BUILDLINK_ABI_DEPENDS.pyZODB+=	${PYPKGPREFIX}-ZODB>=3.2.1nb2
 BUILDLINK_PKGSRCDIR.pyZODB?=	../../databases/py-ZODB
-.endif	# PY_ZODB_BUILDLINK3_MK
+.endif # PY_ZODB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pyZODB
diff --git a/databases/py-bsddb3/buildlink3.mk b/databases/py-bsddb3/buildlink3.mk
index 0524fa720d6..fa8d3e57607 100644
--- a/databases/py-bsddb3/buildlink3.mk
+++ b/databases/py-bsddb3/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/09/18 16:54:22 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:06 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_BSDDB3_BUILDLINK3_MK:=	${PY_BSDDB3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-bsddb3
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	py-bsddb3
-.endif
+.if !defined(PY_BSDDB3_BUILDLINK3_MK)
+PY_BSDDB3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-bsddb3}
-BUILDLINK_PACKAGES+=	py-bsddb3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-bsddb3
-
-.if !empty(PY_BSDDB3_BUILDLINK3_MK:M+)
 .  include "../../mk/pthread.buildlink3.mk"
 .  include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-bsddb3+=	${PYPKGPREFIX}-bsddb3>=4.7.2
 BUILDLINK_ABI_DEPENDS.py-bsddb3+=	${PYPKGPREFIX}-bsddb3>=4.7.2
 BUILDLINK_PKGSRCDIR.py-bsddb3?=	../../databases/py-bsddb3
-.endif	# PY_BSDDB3_BUILDLINK3_MK
 
 .include "../../databases/db4/buildlink3.mk"
+.endif # PY_BSDDB3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-bsddb3
diff --git a/databases/py-ldap/buildlink3.mk b/databases/py-ldap/buildlink3.mk
index 7ae58d71b96..6d1a3c7b764 100644
--- a/databases/py-ldap/buildlink3.mk
+++ b/databases/py-ldap/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 17:30:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PY_LDAP_BUILDLINK3_MK:=	${PY_LDAP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pyldap
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pyldap
-.endif
+.if !defined(PY_LDAP_BUILDLINK3_MK)
+PY_LDAP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyldap}
-BUILDLINK_PACKAGES+=	pyldap
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyldap
-
-.if !empty(PY_LDAP_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyldap+=	${PYPKGPREFIX}-ldap>=2.2.0
 BUILDLINK_ABI_DEPENDS.pyldap+=	${PYPKGPREFIX}-ldap>=2.2.0
 BUILDLINK_PKGSRCDIR.pyldap?=	../../databases/py-ldap
-.endif	# PY_LDAP_BUILDLINK3_MK
+.endif # PY_LDAP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pyldap
diff --git a/databases/py-metakit/buildlink3.mk b/databases/py-metakit/buildlink3.mk
index fe83ca419d6..130ae5fab8b 100644
--- a/databases/py-metakit/buildlink3.mk
+++ b/databases/py-metakit/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:07 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_METAKIT_BUILDLINK3_MK:=	${PY_METAKIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pymetakit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pymetakit
-.endif
+.if !defined(PY_METAKIT_BUILDLINK3_MK)
+PY_METAKIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npymetakit}
-BUILDLINK_PACKAGES+=	pymetakit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pymetakit
-
-.if !empty(PY_METAKIT_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pymetakit+=	${PYPKGPREFIX}-metakit-[0-9]*
 BUILDLINK_ABI_DEPENDS.pymetakit+=	${PYPKGPREFIX}-metakit>=2.4.9.3nb2
 BUILDLINK_PKGSRCDIR.pymetakit?=	../../databases/py-metakit
-.endif	# PY_METAKIT_BUILDLINK3_MK
+.endif # PY_METAKIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pymetakit
diff --git a/databases/py-psycopg/buildlink3.mk b/databases/py-psycopg/buildlink3.mk
index 06d231d9ae9..3a06a7cc4cf 100644
--- a/databases/py-psycopg/buildlink3.mk
+++ b/databases/py-psycopg/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 17:30:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:07 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_PSYCOPG_BUILDLINK3_MK:=	${PY_PSYCOPG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	psycopg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	psycopg
-.endif
+.if !defined(PY_PSYCOPG_BUILDLINK3_MK)
+PY_PSYCOPG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npsycopg}
-BUILDLINK_PACKAGES+=	psycopg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}psycopg
-
-.if !empty(PY_PSYCOPG_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.psycopg+=	${PYPKGPREFIX}-psycopg>=1.1.21
 BUILDLINK_ABI_DEPENDS.psycopg+=	${PYPKGPREFIX}-psycopg>=1.1.21nb1
 BUILDLINK_PKGSRCDIR.psycopg?=	../../databases/py-psycopg
-.endif	# PY_PSYCOPG_BUILDLINK3_MK
+.endif # PY_PSYCOPG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-psycopg
diff --git a/databases/py-sqlite2/buildlink3.mk b/databases/py-sqlite2/buildlink3.mk
index 40cd37725b9..0d3798dc69e 100644
--- a/databases/py-sqlite2/buildlink3.mk
+++ b/databases/py-sqlite2/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/01/10 10:39:18 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:07 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_SQLITE2_BUILDLINK3_MK:=	${PY_SQLITE2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-sqlite2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-sqlite2
-.endif
+.if !defined(PY_SQLITE2_BUILDLINK3_MK)
+PY_SQLITE2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-sqlite2}
-BUILDLINK_PACKAGES+=	py-sqlite2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-sqlite2
-
-.if ${PY_SQLITE2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.py-sqlite2+=	${PYPKGPREFIX}-sqlite2>=2.3.2
 BUILDLINK_PKGSRCDIR.py-sqlite2?=	../../databases/py-sqlite2
-.endif	# PY_SQLITE2_BUILDLINK3_MK
+.endif # PY_SQLITE2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-sqlite2
diff --git a/databases/qdbm/buildlink3.mk b/databases/qdbm/buildlink3.mk
index ccd2a40f17b..4080d4ef924 100644
--- a/databases/qdbm/buildlink3.mk
+++ b/databases/qdbm/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/09/03 02:56:00 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-QDBM_BUILDLINK3_MK:=	${QDBM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	qdbm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	qdbm
-.endif
+.if !defined(QDBM_BUILDLINK3_MK)
+QDBM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqdbm}
-BUILDLINK_PACKAGES+=	qdbm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qdbm
-
-.if !empty(QDBM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qdbm+=	qdbm>=1.8.40
 BUILDLINK_ABI_DEPENDS.qdbm+=	qdbm>=1.8.65
 BUILDLINK_PKGSRCDIR.qdbm?=	../../databases/qdbm
@@ -23,11 +16,11 @@ CONFIGURE_ARGS+=	--enable-pthread
 BUILDLINK_CFLAGS.qdbm+=	${PTHREAD_CFLAGS}
 BUILDLINK_LDFLAGS.qdbm+=${PTHREAD_LDFLAGS}
 .  endif
-.endif	# QDBM_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.endif # QDBM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qdbm
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index 8392084a821..3e3f1a6ef23 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.21 2009/01/02 20:07:07 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	rrdtool
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	rrdtool
-.endif
+.if !defined(RRDTOOL_BUILDLINK3_MK)
+RRDTOOL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrrdtool}
-BUILDLINK_PACKAGES+=	rrdtool
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rrdtool
-
-.if ${RRDTOOL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.rrdtool+=	rrdtool>=1.3.5
 BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
-.endif	# RRDTOOL_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
@@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
+.endif # RRDTOOL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-rrdtool
diff --git a/databases/rrdtool12/buildlink3.mk b/databases/rrdtool12/buildlink3.mk
index d0a97fb9670..a4c3cd818f0 100644
--- a/databases/rrdtool12/buildlink3.mk
+++ b/databases/rrdtool12/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/01/02 20:07:10 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	rrdtool
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	rrdtool
-.endif
+.if !defined(RRDTOOL_BUILDLINK3_MK)
+RRDTOOL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrrdtool}
-BUILDLINK_PACKAGES+=	rrdtool
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rrdtool
-
-.if ${RRDTOOL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.rrdtool+=	rrdtool>=1.2.29
 BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
-.endif	# RRDTOOL_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
+.endif # RRDTOOL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-rrdtool
diff --git a/databases/sdbm/buildlink3.mk b/databases/sdbm/buildlink3.mk
index 525e047d651..64a72a04968 100644
--- a/databases/sdbm/buildlink3.mk
+++ b/databases/sdbm/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SDBM_BUILDLINK3_MK:=	${SDBM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sdbm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sdbm
-.endif
+.if !defined(SDBM_BUILDLINK3_MK)
+SDBM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsdbm}
-BUILDLINK_PACKAGES+=	sdbm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sdbm
-
-.if !empty(SDBM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sdbm+=	sdbm>=90.12.1
 BUILDLINK_PKGSRCDIR.sdbm?=	../../databases/sdbm
-.endif	# SDBM_BUILDLINK3_MK
+.endif # SDBM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sdbm
diff --git a/databases/shared-mime-info/buildlink3.mk b/databases/shared-mime-info/buildlink3.mk
index 67d9851fc4e..5378163693e 100644
--- a/databases/shared-mime-info/buildlink3.mk
+++ b/databases/shared-mime-info/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/12/06 11:38:26 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:07 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-SHARED_MIME_INFO_BUILDLINK3_MK:=	${SHARED_MIME_INFO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	shared-mime-info
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	shared-mime-info
-.endif
+.if !defined(SHARED_MIME_INFO_BUILDLINK3_MK)
+SHARED_MIME_INFO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nshared-mime-info}
-BUILDLINK_PACKAGES+=	shared-mime-info
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}shared-mime-info
-
-.if !empty(SHARED_MIME_INFO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.shared-mime-info+=	shared-mime-info>=0.15
 BUILDLINK_ABI_DEPENDS.shared-mime-info+=	shared-mime-info>=0.16nb2
 BUILDLINK_PKGSRCDIR.shared-mime-info?=	../../databases/shared-mime-info
@@ -31,10 +24,10 @@ shared-mime-info-buildlink-fake:
 		${ECHO} "echo '[pkgsrc] Doing nothing for update-mime-database' \$$*" >> ${_SMI_FAKE_UPDATEDB};		\
 		${CHMOD} +x ${_SMI_FAKE_UPDATEDB};			\
 	fi
-.endif	# SHARED_MIME_INFO_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # SHARED_MIME_INFO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-shared-mime-info
diff --git a/databases/sqlite/buildlink3.mk b/databases/sqlite/buildlink3.mk
index 19345b6a091..78a03a3cb51 100644
--- a/databases/sqlite/buildlink3.mk
+++ b/databases/sqlite/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SQLITE_BUILDLINK3_MK:=	${SQLITE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sqlite
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sqlite
-.endif
+.if !defined(SQLITE_BUILDLINK3_MK)
+SQLITE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsqlite}
-BUILDLINK_PACKAGES+=	sqlite
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sqlite
-
-.if !empty(SQLITE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sqlite+=	sqlite>=2.8.0
 BUILDLINK_ABI_DEPENDS.sqlite+=	sqlite>=2.8.16nb1
 BUILDLINK_PKGSRCDIR.sqlite?=	../../databases/sqlite
-.endif	# SQLITE_BUILDLINK3_MK
+.endif # SQLITE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sqlite
diff --git a/databases/sqlite3/buildlink3.mk b/databases/sqlite3/buildlink3.mk
index eb142659dbe..7a4fb167b60 100644
--- a/databases/sqlite3/buildlink3.mk
+++ b/databases/sqlite3/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/11/15 10:39:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:08 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SQLITE3_BUILDLINK3_MK:=	${SQLITE3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sqlite3
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sqlite3
-.endif
+.if !defined(SQLITE3_BUILDLINK3_MK)
+SQLITE3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsqlite3}
-BUILDLINK_PACKAGES+=	sqlite3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sqlite3
-
-.if !empty(SQLITE3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.0.8
 BUILDLINK_ABI_DEPENDS.sqlite3+=	sqlite3>=3.2.7nb1
 BUILDLINK_PKGSRCDIR.sqlite3?=	../../databases/sqlite3
-.endif	# SQLITE3_BUILDLINK3_MK
+.endif # SQLITE3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sqlite3
diff --git a/databases/tdb/buildlink3.mk b/databases/tdb/buildlink3.mk
index 20f43a88984..98afc6b095c 100644
--- a/databases/tdb/buildlink3.mk
+++ b/databases/tdb/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:08 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TDB_BUILDLINK3_MK:=	${TDB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tdb
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tdb
-.endif
+.if !defined(TDB_BUILDLINK3_MK)
+TDB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntdb}
-BUILDLINK_PACKAGES+=	tdb
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tdb
-
-.if !empty(TDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tdb+=		tdb>=1.0.6
 BUILDLINK_ABI_DEPENDS.tdb+=	tdb>=1.0.6nb2
 BUILDLINK_PKGSRCDIR.tdb?=	../../databases/tdb
-.endif	# TDB_BUILDLINK3_MK
+.endif # TDB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tdb
diff --git a/databases/tinycdb/buildlink3.mk b/databases/tinycdb/buildlink3.mk
index 41f102898c5..8467198912b 100644
--- a/databases/tinycdb/buildlink3.mk
+++ b/databases/tinycdb/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:08 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TINYCDB_BUILDLINK3_MK:=	${TINYCDB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tinycdb
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tinycdb
-.endif
+.if !defined(TINYCDB_BUILDLINK3_MK)
+TINYCDB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntinycdb}
-BUILDLINK_PACKAGES+=	tinycdb
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tinycdb
-
-.if !empty(TINYCDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tinycdb+=	tinycdb>=0.75
 BUILDLINK_DEPMETHOD.tinycdb?=	build
 BUILDLINK_PKGSRCDIR.tinycdb?=	../../databases/tinycdb
-.endif	# TINYCDB_BUILDLINK3_MK
+.endif # TINYCDB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tinycdb
diff --git a/databases/tokyocabinet/buildlink3.mk b/databases/tokyocabinet/buildlink3.mk
index efa4f796cb3..b1f8d6fbf35 100644
--- a/databases/tokyocabinet/buildlink3.mk
+++ b/databases/tokyocabinet/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/12/15 11:15:05 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:08 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TOKYOCABINET_BUILDLINK3_MK:=	${TOKYOCABINET_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tokyocabinet
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	tokyocabinet
-.endif
+.if !defined(TOKYOCABINET_BUILDLINK3_MK)
+TOKYOCABINET_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntokyocabinet}
-BUILDLINK_PACKAGES+=	tokyocabinet
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tokyocabinet
-
-.if ${TOKYOCABINET_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.tokyocabinet+=	tokyocabinet>=1.3.7
 BUILDLINK_ABI_DEPENDS.tokyocabinet+=	tokyocabinet>=1.3.24
 BUILDLINK_PKGSRCDIR.tokyocabinet?=	../../databases/tokyocabinet
-.endif	# TOKYOCABINET_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/lzmalib/buildlink3.mk"
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # TOKYOCABINET_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tokyocabinet
diff --git a/databases/unixodbc/buildlink3.mk b/databases/unixodbc/buildlink3.mk
index aaa52813839..b2b475b30d9 100644
--- a/databases/unixodbc/buildlink3.mk
+++ b/databases/unixodbc/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:08 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-UNIXODBC_BUILDLINK3_MK:=	${UNIXODBC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	unixodbc
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	unixodbc
-.endif
+.if !defined(UNIXODBC_BUILDLINK3_MK)
+UNIXODBC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nunixodbc}
-BUILDLINK_PACKAGES+=	unixodbc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}unixodbc
-
-.if !empty(UNIXODBC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.unixodbc+=	unixodbc>=2.0.11nb1
 BUILDLINK_ABI_DEPENDS.unixodbc+=	unixodbc>=2.0.11nb3
 BUILDLINK_PKGSRCDIR.unixodbc?=	../../databases/unixodbc
-.endif	# UNIXODBC_BUILDLINK3_MK
+.endif # UNIXODBC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-unixodbc