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.

17 files changed, 102 insertions, 221 deletions

diff --git a/chat/ekg/buildlink3.mk b/chat/ekg/buildlink3.mk
index 8cb024504aa..0e9a825d181 100644
--- a/chat/ekg/buildlink3.mk
+++ b/chat/ekg/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.19 2008/03/05 15:03:18 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:00 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EKG_BUILDLINK3_MK:=	${EKG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ekg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ekg
-.endif
+.if !defined(EKG_BUILDLINK3_MK)
+EKG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nekg}
-BUILDLINK_PACKAGES+=	ekg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ekg
-
-.if !empty(EKG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ekg+=	ekg>=1.6
 BUILDLINK_ABI_DEPENDS.ekg+=	ekg>=1.7nb1
 BUILDLINK_PKGSRCDIR.ekg?=	../../chat/ekg
-.endif	# EKG_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.endif # EKG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ekg
diff --git a/chat/empathy/buildlink3.mk b/chat/empathy/buildlink3.mk
index 683f0f2413d..a51eedb1092 100644
--- a/chat/empathy/buildlink3.mk
+++ b/chat/empathy/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/01/13 09:08:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:00 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EMPATHY_BUILDLINK3_MK:=	${EMPATHY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	empathy
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	empathy
-.endif
+.if !defined(EMPATHY_BUILDLINK3_MK)
+EMPATHY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nempathy}
-BUILDLINK_PACKAGES+=	empathy
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}empathy
-
-.if ${EMPATHY_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.empathy+=	empathy>=2.24.1nb1
 BUILDLINK_PKGSRCDIR.empathy?=	../../chat/empathy
-.endif	# EMPATHY_BUILDLINK3_MK
 
 .include "../../chat/telepathy-mission-control/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.empathy?=	../../chat/empathy
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # EMPATHY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-empathy
diff --git a/chat/gale/buildlink3.mk b/chat/gale/buildlink3.mk
index ebc6008fee2..9d7e3f24066 100644
--- a/chat/gale/buildlink3.mk
+++ b/chat/gale/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/01/18 05:06:24 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GALE_BUILDLINK3_MK:=	${GALE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gale
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gale
-.endif
+.if !defined(GALE_BUILDLINK3_MK)
+GALE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngale}
-BUILDLINK_PACKAGES+=	gale
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gale
-
-.if !empty(GALE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gale+=	gale>=0.99f
 BUILDLINK_ABI_DEPENDS.gale?=	gale>=0.99fnb2
 BUILDLINK_PKGSRCDIR.gale?=	../../chat/gale
-.endif	# GALE_BUILDLINK3_MK
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
@@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gale?=	../../chat/gale
 .include "../../net/adns/buildlink3.mk"
 .include "../../security/rsaref/buildlink3.mk"
 .include "../../www/libwww/buildlink3.mk"
+.endif # GALE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gale
diff --git a/chat/jabberd/buildlink3.mk b/chat/jabberd/buildlink3.mk
index 771a4974f8e..0a1104d38dd 100644
--- a/chat/jabberd/buildlink3.mk
+++ b/chat/jabberd/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:06:24 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-JABBERD_BUILDLINK3_MK:=	${JABBERD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	jabberd
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	jabberd
-.endif
+.if !defined(JABBERD_BUILDLINK3_MK)
+JABBERD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njabberd}
-BUILDLINK_PACKAGES+=	jabberd
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jabberd
-
-.if !empty(JABBERD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.jabberd+=	jabberd>=1.4.2
 BUILDLINK_ABI_DEPENDS.jabberd?=	jabberd>=1.4.2nb6
 BUILDLINK_PKGSRCDIR.jabberd?=	../../chat/jabberd
-.endif	# JABBERD_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
+.endif # JABBERD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-jabberd
diff --git a/chat/libirc/buildlink3.mk b/chat/libirc/buildlink3.mk
index a8439a25184..595bd7458f7 100644
--- a/chat/libirc/buildlink3.mk
+++ b/chat/libirc/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBIRC_BUILDLINK3_MK:=	${LIBIRC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libirc
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libirc
-.endif
+.if !defined(LIBIRC_BUILDLINK3_MK)
+LIBIRC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibirc}
-BUILDLINK_PACKAGES+=	libirc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libirc
-
-.if !empty(LIBIRC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libirc+=	libirc>=0.2nb1
 BUILDLINK_ABI_DEPENDS.libirc+=	libirc>=0.2nb2
 BUILDLINK_PKGSRCDIR.libirc?=	../../chat/libirc
-.endif	# LIBIRC_BUILDLINK3_MK
 
 .include "../../devel/glib/buildlink3.mk"
+.endif # LIBIRC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libirc
diff --git a/chat/libmsn/buildlink3.mk b/chat/libmsn/buildlink3.mk
index 76a378db949..61e60e5aa0d 100644
--- a/chat/libmsn/buildlink3.mk
+++ b/chat/libmsn/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/10 08:56:39 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBMSN_BUILDLINK3_MK:=	${LIBMSN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmsn
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmsn
-.endif
+.if !defined(LIBMSN_BUILDLINK3_MK)
+LIBMSN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmsn}
-BUILDLINK_PACKAGES+=	libmsn
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmsn
-
-.if ${LIBMSN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmsn+=	libmsn>=4.0beta2
 BUILDLINK_PKGSRCDIR.libmsn?=	../../chat/libmsn
-.endif	# LIBMSN_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
+.endif # LIBMSN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmsn
diff --git a/chat/libotr/buildlink3.mk b/chat/libotr/buildlink3.mk
index 34b310c1be3..457a67fdd3c 100644
--- a/chat/libotr/buildlink3.mk
+++ b/chat/libotr/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/11/11 21:53:57 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBOTR_BUILDLINK3_MK:=	${LIBOTR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libotr
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libotr
-.endif
+.if !defined(LIBOTR_BUILDLINK3_MK)
+LIBOTR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibotr}
-BUILDLINK_PACKAGES+=	libotr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libotr
-
-.if !empty(LIBOTR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libotr+=	libotr>=3.0.0
 BUILDLINK_PKGSRCDIR.libotr?=	../../chat/libotr
-.endif	# LIBOTR_BUILDLINK3_MK
 
 .include "../../security/libgcrypt/buildlink3.mk"
+.endif # LIBOTR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libotr
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index d242758b49a..7d875742db5 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/08/19 18:18:10 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBPURPLE_BUILDLINK3_MK:=	${LIBPURPLE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libpurple
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libpurple
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpurple}
-BUILDLINK_PACKAGES+=	libpurple
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpurple
+.if !defined(LIBPURPLE_BUILDLINK3_MK)
+LIBPURPLE_BUILDLINK3_MK:=
 
-.if ${LIBPURPLE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.5.0
 BUILDLINK_PKGSRCDIR.libpurple?=	../../chat/libpurple
-.endif	# LIBPURPLE_BUILDLINK3_MK
 
 pkgbase := libpurple
 .include "../../mk/pkg-build-options.mk"
@@ -24,5 +16,6 @@ pkgbase := libpurple
 .  include "../../sysutils/dbus-glib/buildlink3.mk"
 .  include "../../sysutils/py-dbus/buildlink3.mk"
 .endif
+.endif # LIBPURPLE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libpurple
diff --git a/chat/libtelepathy/buildlink3.mk b/chat/libtelepathy/buildlink3.mk
index cfdfff99778..a90d45df0d7 100644
--- a/chat/libtelepathy/buildlink3.mk
+++ b/chat/libtelepathy/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/14 22:58:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBTELEPATHY_BUILDLINK3_MK:=	${LIBTELEPATHY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtelepathy
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libtelepathy
-.endif
+.if !defined(LIBTELEPATHY_BUILDLINK3_MK)
+LIBTELEPATHY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtelepathy}
-BUILDLINK_PACKAGES+=	libtelepathy
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtelepathy
-
-.if ${LIBTELEPATHY_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libtelepathy+=	libtelepathy>=0.3.3
 BUILDLINK_PKGSRCDIR.libtelepathy?=	../../chat/libtelepathy
-.endif	# LIBTELEPATHY_BUILDLINK3_MK
 
 .include "../../chat/telepathy-glib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
+.endif # LIBTELEPATHY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtelepathy
diff --git a/chat/libtlen/buildlink3.mk b/chat/libtlen/buildlink3.mk
index 2870ee1647a..f82ad4c84f6 100644
--- a/chat/libtlen/buildlink3.mk
+++ b/chat/libtlen/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBTLEN_BUILDLINK3_MK:=	${LIBTLEN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtlen
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libtlen
-.endif
+.if !defined(LIBTLEN_BUILDLINK3_MK)
+LIBTLEN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtlen}
-BUILDLINK_PACKAGES+=	libtlen
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtlen
-
-.if !empty(LIBTLEN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtlen+=	libtlen>=20040212
 BUILDLINK_ABI_DEPENDS.libtlen+=	libtlen>=20040212nb1
 BUILDLINK_PKGSRCDIR.libtlen?=	../../chat/libtlen
-.endif	# LIBTLEN_BUILDLINK3_MK
+.endif # LIBTLEN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtlen
diff --git a/chat/loudmouth/buildlink3.mk b/chat/loudmouth/buildlink3.mk
index 213481a46f8..fcaf84117d6 100644
--- a/chat/loudmouth/buildlink3.mk
+++ b/chat/loudmouth/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/03/06 14:53:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LOUDMOUTH_BUILDLINK3_MK:=	${LOUDMOUTH_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	loudmouth
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	loudmouth
-.endif
+.if !defined(LOUDMOUTH_BUILDLINK3_MK)
+LOUDMOUTH_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nloudmouth}
-BUILDLINK_PACKAGES+=	loudmouth
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}loudmouth
-
-.if !empty(LOUDMOUTH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.loudmouth+=	loudmouth>=1.0
 BUILDLINK_ABI_DEPENDS.loudmouth+=	loudmouth>=1.2.3nb1
 BUILDLINK_PKGSRCDIR.loudmouth?=	../../chat/loudmouth
-.endif	# LOUDMOUTH_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.endif # LOUDMOUTH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-loudmouth
diff --git a/chat/meanwhile/buildlink3.mk b/chat/meanwhile/buildlink3.mk
index 1cf6b7636af..8cdda8eb7e3 100644
--- a/chat/meanwhile/buildlink3.mk
+++ b/chat/meanwhile/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/08/13 05:29:27 dan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MEANWHILE_BUILDLINK3_MK:=	${MEANWHILE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	meanwhile
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	meanwhile
-.endif
+.if !defined(MEANWHILE_BUILDLINK3_MK)
+MEANWHILE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmeanwhile}
-BUILDLINK_PACKAGES+=	meanwhile
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}meanwhile
-
-.if ${MEANWHILE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.meanwhile+=	meanwhile>=1.0.2
 BUILDLINK_PKGSRCDIR.meanwhile?=	../../chat/meanwhile
-.endif	# MEANWHILE_BUILDLINK3_MK
+.endif # MEANWHILE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-meanwhile
diff --git a/chat/pidgin/buildlink3.mk b/chat/pidgin/buildlink3.mk
index 5a4b7b9ba76..4c94d2f34d7 100644
--- a/chat/pidgin/buildlink3.mk
+++ b/chat/pidgin/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/09/16 19:59:46 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:01 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PIDGIN_BUILDLINK3_MK:=	${PIDGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pidgin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	pidgin
-.endif
+.if !defined(PIDGIN_BUILDLINK3_MK)
+PIDGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npidgin}
-BUILDLINK_PACKAGES+=	pidgin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pidgin
-
-.if ${PIDGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.pidgin+=	pidgin>=2.5.1
 BUILDLINK_PKGSRCDIR.pidgin?=	../../chat/pidgin
-.endif	# PIDGIN_BUILDLINK3_MK
 
 .include "../../chat/libpurple/buildlink3.mk"
+.endif # PIDGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pidgin
diff --git a/chat/riece/buildlink3.mk b/chat/riece/buildlink3.mk
index 7c9608d3a7d..95086d30e26 100644
--- a/chat/riece/buildlink3.mk
+++ b/chat/riece/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/10/06 07:24:31 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:02 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-RIECE_BUILDLINK3_MK:=	${RIECE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	riece
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	riece
-.endif
+.if !defined(RIECE_BUILDLINK3_MK)
+RIECE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nriece}
-BUILDLINK_PACKAGES+=	riece
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}riece
-
-.if ${RIECE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.riece+=	${EMACS_PKGNAME_PREFIX}riece>=4
 BUILDLINK_PKGSRCDIR.riece?=	../../chat/riece
-.endif	# RIECE_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.riece=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # RIECE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-riece
diff --git a/chat/telepathy-glib/buildlink3.mk b/chat/telepathy-glib/buildlink3.mk
index 4efd0aa0b8c..92ebf04f423 100644
--- a/chat/telepathy-glib/buildlink3.mk
+++ b/chat/telepathy-glib/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/14 22:57:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:02 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TELEPATHY_GLIB_BUILDLINK3_MK:=	${TELEPATHY_GLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	telepathy-glib
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	telepathy-glib
-.endif
+.if !defined(TELEPATHY_GLIB_BUILDLINK3_MK)
+TELEPATHY_GLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntelepathy-glib}
-BUILDLINK_PACKAGES+=	telepathy-glib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}telepathy-glib
-
-.if ${TELEPATHY_GLIB_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.telepathy-glib+=	telepathy-glib>=0.7.18
 BUILDLINK_PKGSRCDIR.telepathy-glib?=	../../chat/telepathy-glib
-.endif	# TELEPATHY_GLIB_BUILDLINK3_MK
 
 PRINT_PLIST_AWK+=	/^@dirrm include\/telepathy-1.0$$/ \
 			{ print "@comment in telepathy-glib: " $$0; next; }
@@ -22,5 +14,6 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/telepathy-1.0$$/ \
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
+.endif # TELEPATHY_GLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-telepathy-glib
diff --git a/chat/telepathy-mission-control/buildlink3.mk b/chat/telepathy-mission-control/buildlink3.mk
index 0002b775e25..d6e9ad94d8c 100644
--- a/chat/telepathy-mission-control/buildlink3.mk
+++ b/chat/telepathy-mission-control/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/14 22:59:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:02 joerg Exp $
 
-BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
-TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK:=	${TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	telepathy-mission-control
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	telepathy-mission-control
-.endif
+.if !defined(TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK)
+TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntelepathy-mission-control}
-BUILDLINK_PACKAGES+=	telepathy-mission-control
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}telepathy-mission-control
-
-.if ${TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.telepathy-mission-control+=	telepathy-mission-control>=4.67
 BUILDLINK_PKGSRCDIR.telepathy-mission-control?=	../../chat/telepathy-mission-control
-.endif	# TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK
 
 .include "../../chat/libtelepathy/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"
@@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.telepathy-mission-control?=	../../chat/telepathy-mission-con
 .include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.endif # TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-telepathy-mission-control
diff --git a/chat/zephyr/buildlink3.mk b/chat/zephyr/buildlink3.mk
index f3e26f29ce8..5035a2fca94 100644
--- a/chat/zephyr/buildlink3.mk
+++ b/chat/zephyr/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:02 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ZEPHYR_BUILDLINK3_MK:=	${ZEPHYR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	zephyr
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	zephyr
-.endif
+.if !defined(ZEPHYR_BUILDLINK3_MK)
+ZEPHYR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nzephyr}
-BUILDLINK_PACKAGES+=	zephyr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}zephyr
-
-.if !empty(ZEPHYR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.zephyr+=	zephyr>=20010518nb1
 BUILDLINK_ABI_DEPENDS.zephyr?=	zephyr>=20010518nb4
 BUILDLINK_PKGSRCDIR.zephyr?=	../../chat/zephyr
 BUILDLINK_DEPMETHOD.zephyr?=	build
-.endif	# ZEPHYR_BUILDLINK3_MK
+.endif # ZEPHYR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-zephyr