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.

61 files changed, 366 insertions, 798 deletions

diff --git a/net/GeoIP/buildlink3.mk b/net/GeoIP/buildlink3.mk
index c7edfc62a11..efa000ac3d0 100644
--- a/net/GeoIP/buildlink3.mk
+++ b/net/GeoIP/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:06 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GEOIP_BUILDLINK3_MK:=	${GEOIP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	GeoIP
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	GeoIP
-.endif
+.if !defined(GEOIP_BUILDLINK3_MK)
+GEOIP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGeoIP}
-BUILDLINK_PACKAGES+=	GeoIP
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GeoIP
-
-.if !empty(GEOIP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GeoIP+=	GeoIP>=1.3.1
 BUILDLINK_ABI_DEPENDS.GeoIP+=	GeoIP>=1.3.4nb1
 BUILDLINK_PKGSRCDIR.GeoIP?=	../../net/GeoIP
-.endif	# GEOIP_BUILDLINK3_MK
+.endif # GEOIP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-GeoIP
diff --git a/net/ORBit/buildlink3.mk b/net/ORBit/buildlink3.mk
index f8e1b664837..14064cb63c9 100644
--- a/net/ORBit/buildlink3.mk
+++ b/net/ORBit/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:06 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ORBIT_BUILDLINK3_MK:=	${ORBIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ORBit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ORBit
-.endif
+.if !defined(ORBIT_BUILDLINK3_MK)
+ORBIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NORBit}
-BUILDLINK_PACKAGES+=	ORBit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ORBit
-
-.if !empty(ORBIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ORBit+=	ORBit>=0.5.15nb5
 BUILDLINK_ABI_DEPENDS.ORBit+=	ORBit>=0.5.17nb1
 BUILDLINK_PKGSRCDIR.ORBit?=	../../net/ORBit
-.endif	# ORBIT_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
+.endif # ORBIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ORBit
diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk
index 9eebddc1980..eaaaa99c9af 100644
--- a/net/ORBit2/buildlink3.mk
+++ b/net/ORBit2/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/07/09 16:56:15 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ORBIT2_BUILDLINK3_MK:=	${ORBIT2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ORBit2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ORBit2
-.endif
+.if !defined(ORBIT2_BUILDLINK3_MK)
+ORBIT2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NORBit2}
-BUILDLINK_PACKAGES+=	ORBit2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ORBit2
-
-.if !empty(ORBIT2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ORBit2+=	ORBit2>=2.12.0
 BUILDLINK_ABI_DEPENDS.ORBit2?=	ORBit2>=2.12.4nb1
 BUILDLINK_PKGSRCDIR.ORBit2?=	../../net/ORBit2
@@ -20,9 +13,9 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/orbit-2.0$$/ \
 				{ print "@comment in ORBit2: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm share\/idl$$/ \
 				{ print "@comment in ORBit2: " $$0; next; }
-.endif	# ORBIT2_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
+.endif # ORBIT2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ORBit2
diff --git a/net/SDL_net/buildlink3.mk b/net/SDL_net/buildlink3.mk
index 192ba042822..ba213936b75 100644
--- a/net/SDL_net/buildlink3.mk
+++ b/net/SDL_net/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SDL_NET_BUILDLINK3_MK:=	${SDL_NET_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	SDL_net
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	SDL_net
-.endif
+.if !defined(SDL_NET_BUILDLINK3_MK)
+SDL_NET_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_net}
-BUILDLINK_PACKAGES+=	SDL_net
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_net
-
-.if !empty(SDL_NET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb1
 BUILDLINK_ABI_DEPENDS.SDL_net+=	SDL_net>=1.2.6
 BUILDLINK_PKGSRCDIR.SDL_net?=	../../net/SDL_net
-.endif	# SDL_NET_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
+.endif # SDL_NET_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-SDL_net
diff --git a/net/adns/buildlink3.mk b/net/adns/buildlink3.mk
index 2eddc2a2cef..141d66fe9c2 100644
--- a/net/adns/buildlink3.mk
+++ b/net/adns/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-ADNS_BUILDLINK3_MK:=	${ADNS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	adns
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	adns
-.endif
+.if !defined(ADNS_BUILDLINK3_MK)
+ADNS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nadns}
-BUILDLINK_PACKAGES+=	adns
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}adns
-
-.if !empty(ADNS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.adns+=	adns>=1.0
 BUILDLINK_ABI_DEPENDS.adns+=	adns>=1.1nb2
 BUILDLINK_PKGSRCDIR.adns?=	../../net/adns
-.endif	# ADNS_BUILDLINK3_MK
+.endif # ADNS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-adns
diff --git a/net/avahi/buildlink3.mk b/net/avahi/buildlink3.mk
index 91a393401a6..c45bcddca8f 100644
--- a/net/avahi/buildlink3.mk
+++ b/net/avahi/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-AVAHI_BUILDLINK3_MK:=	${AVAHI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	avahi
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	avahi
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Navahi}
-BUILDLINK_PACKAGES+=	avahi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}avahi
+.if !defined(AVAHI_BUILDLINK3_MK)
+AVAHI_BUILDLINK3_MK:=
 
-.if ${AVAHI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.avahi+=	avahi>=0.6.23
 BUILDLINK_PKGSRCDIR.avahi?=	../../net/avahi
-.endif	# AVAHI_BUILDLINK3_MK
 
 pkgbase := avahi
 .include "../../mk/pkg-build-options.mk"
@@ -25,5 +17,6 @@ pkgbase := avahi
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # AVAHI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-avahi
diff --git a/net/bind9/buildlink3.mk b/net/bind9/buildlink3.mk
index 6fc2c42c86b..9ef1a184ea2 100644
--- a/net/bind9/buildlink3.mk
+++ b/net/bind9/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:08:40 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BIND_BUILDLINK3_MK:=	${BIND_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	bind
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	bind
-.endif
+.if !defined(BIND_BUILDLINK3_MK)
+BIND_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbind}
-BUILDLINK_PACKAGES+=	bind
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bind
-
-.if !empty(BIND_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.bind+=	bind>=9.2.2
 BUILDLINK_ABI_DEPENDS.bind+=	bind>=9.4.1pl1nb2
 BUILDLINK_PKGSRCDIR.bind?=	../../net/bind9
 
 BUILDLINK_INCDIRS.bind?=	include/bind
 BUILDLINK_LDFLAGS.bind?=	${BUILDLINK_LDADD.bind}
-.endif	# BIND_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
+.endif # BIND_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-bind
diff --git a/net/bind95/buildlink3.mk b/net/bind95/buildlink3.mk
index 6dba3b8d8c1..954f6d45716 100644
--- a/net/bind95/buildlink3.mk
+++ b/net/bind95/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BIND_BUILDLINK3_MK:=	${BIND_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	bind
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	bind
-.endif
+.if !defined(BIND_BUILDLINK3_MK)
+BIND_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbind}
-BUILDLINK_PACKAGES+=	bind
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bind
-
-.if ${BIND_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.bind+=	bind>=9.5.0
 BUILDLINK_PKGSRCDIR.bind?=	../../net/bind95
-.endif	# BIND_BUILDLINK3_MK
+.endif # BIND_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-bind
diff --git a/net/bind96/buildlink3.mk b/net/bind96/buildlink3.mk
index ebd9d6963c6..6539d0e019a 100644
--- a/net/bind96/buildlink3.mk
+++ b/net/bind96/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/04 00:21:36 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BIND_BUILDLINK3_MK:=	${BIND_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	bind
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	bind
-.endif
+.if !defined(BIND_BUILDLINK3_MK)
+BIND_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbind}
-BUILDLINK_PACKAGES+=	bind
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bind
-
-.if ${BIND_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.bind+=	bind>=9.6.0
 BUILDLINK_PKGSRCDIR.bind?=	../../net/bind96
-.endif	# BIND_BUILDLINK3_MK
+.endif # BIND_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-bind
diff --git a/net/boinc3-libs/buildlink3.mk b/net/boinc3-libs/buildlink3.mk
index 8b7f7b9761b..c630c9eac02 100644
--- a/net/boinc3-libs/buildlink3.mk
+++ b/net/boinc3-libs/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:07 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BOINC_LIBS_BUILDLINK3_MK:=	${BOINC_LIBS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	boinclibs
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	boinclibs
-.endif
+.if !defined(BOINC_LIBS_BUILDLINK3_MK)
+BOINC_LIBS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboinclibs}
-BUILDLINK_PACKAGES+=	boinclibs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boinclibs
-
-.if !empty(BOINC_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.boinclibs+=	boinc3-libs>=3.19.20040714
 BUILDLINK_PKGSRCDIR.boinclibs?=	../../net/boinc3-libs
 
 # installs static libraries only
 BUILDLINK_DEPMETHOD.boinclibs?=	build
-.endif	# BOINC_LIBS_BUILDLINK3_MK
+.endif # BOINC_LIBS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-boinclibs
diff --git a/net/dante/buildlink3.mk b/net/dante/buildlink3.mk
index c3497541170..d02b3ed3c63 100644
--- a/net/dante/buildlink3.mk
+++ b/net/dante/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:07 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DANTE_BUILDLINK3_MK:=	${DANTE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	dante
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	dante
-.endif
+.if !defined(DANTE_BUILDLINK3_MK)
+DANTE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndante}
-BUILDLINK_PACKAGES+=	dante
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dante
-
-.if !empty(DANTE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dante+=	dante>=1.1.13
 BUILDLINK_ABI_DEPENDS.dante+=	dante>=1.1.14nb1
 BUILDLINK_PKGSRCDIR.dante?=	../../net/dante
-.endif	# DANTE_BUILDLINK3_MK
+.endif # DANTE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-dante
diff --git a/net/flow-tools/buildlink3.mk b/net/flow-tools/buildlink3.mk
index 78be816c2d3..37cd6abbbea 100644
--- a/net/flow-tools/buildlink3.mk
+++ b/net/flow-tools/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/07/29 21:34:31 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:08 joerg Exp $
 
 BUILDLINK_DEPMETHOD.flow-tools?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FLOW_TOOLS_BUILDLINK3_MK:=	${FLOW_TOOLS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	flow-tools
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	flow-tools
-.endif
+.if !defined(FLOW_TOOLS_BUILDLINK3_MK)
+FLOW_TOOLS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nflow-tools}
-BUILDLINK_PACKAGES+=	flow-tools
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flow-tools
-
-.if ${FLOW_TOOLS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.flow-tools+=	flow-tools>=0.68nb2
 BUILDLINK_PKGSRCDIR.flow-tools?=	../../net/flow-tools
-.endif	# FLOW_TOOLS_BUILDLINK3_MK
+.endif # FLOW_TOOLS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-flow-tools
diff --git a/net/freewais-sf/buildlink3.mk b/net/freewais-sf/buildlink3.mk
index e146b6d8ab8..558c5a0d9a0 100644
--- a/net/freewais-sf/buildlink3.mk
+++ b/net/freewais-sf/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:08 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FREEWAIS_SF_BUILDLINK3_MK:=	${FREEWAIS_SF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	freewais-sf
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	freewais-sf
-.endif
+.if !defined(FREEWAIS_SF_BUILDLINK3_MK)
+FREEWAIS_SF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreewais-sf}
-BUILDLINK_PACKAGES+=	freewais-sf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freewais-sf
-
-.if !empty(FREEWAIS_SF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.freewais-sf+=	freewais-sf>=2.2.12
 BUILDLINK_ABI_DEPENDS.freewais-sf+=	freewais-sf>=2.2.12nb2
 BUILDLINK_PKGSRCDIR.freewais-sf?=	../../net/freewais-sf
-.endif	# FREEWAIS_SF_BUILDLINK3_MK
+.endif # FREEWAIS_SF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-freewais-sf
diff --git a/net/gift/buildlink3.mk b/net/gift/buildlink3.mk
index 5686a3c19fd..cba40ba86d5 100644
--- a/net/gift/buildlink3.mk
+++ b/net/gift/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/11/02 01:55:53 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:08 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GIFT_BUILDLINK3_MK:=	${GIFT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gift
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gift
-.endif
+.if !defined(GIFT_BUILDLINK3_MK)
+GIFT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngift}
-BUILDLINK_PACKAGES+=	gift
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gift
-
-.if !empty(GIFT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gift+=	gift>=0.11.6
 BUILDLINK_ABI_DEPENDS.gift+=	gift>=0.11.6nb2
 BUILDLINK_PKGSRCDIR.gift?=	../../net/gift
-.endif	# GIFT_BUILDLINK3_MK
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk"
+.endif # GIFT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gift
diff --git a/net/gnet/buildlink3.mk b/net/gnet/buildlink3.mk
index 405514de3be..0366bc2ec4d 100644
--- a/net/gnet/buildlink3.mk
+++ b/net/gnet/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:08 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GNET_BUILDLINK3_MK:=	${GNET_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnet
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnet
-.endif
+.if !defined(GNET_BUILDLINK3_MK)
+GNET_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnet}
-BUILDLINK_PACKAGES+=	gnet
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnet
-
-.if !empty(GNET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnet+=	gnet>=2.0.3nb1
 BUILDLINK_ABI_DEPENDS.gnet+=	gnet>=2.0.7nb2
 BUILDLINK_PKGSRCDIR.gnet?=	../../net/gnet
-.endif	# GNET_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.endif # GNET_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnet
diff --git a/net/gnet1/buildlink3.mk b/net/gnet1/buildlink3.mk
index c8a485ac1ba..76fd071e3d7 100644
--- a/net/gnet1/buildlink3.mk
+++ b/net/gnet1/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:08 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GNET1_BUILDLINK3_MK:=	${GNET1_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnet1
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnet1
-.endif
+.if !defined(GNET1_BUILDLINK3_MK)
+GNET1_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnet1}
-BUILDLINK_PACKAGES+=	gnet1
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnet1
-
-.if !empty(GNET1_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnet1+=	gnet1>=1.1.8nb2
 BUILDLINK_ABI_DEPENDS.gnet1+=	gnet1>=1.1.8nb4
 BUILDLINK_PKGSRCDIR.gnet1?=	../../net/gnet1
-.endif	# GNET1_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.endif # GNET1_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnet1
diff --git a/net/gsnmp/buildlink3.mk b/net/gsnmp/buildlink3.mk
index 280bbdd2373..5e92cb3ede2 100644
--- a/net/gsnmp/buildlink3.mk
+++ b/net/gsnmp/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/10/29 09:48:31 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:08 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GSNMP_BUILDLINK3_MK:=	${GSNMP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gsnmp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gsnmp
-.endif
+.if !defined(GSNMP_BUILDLINK3_MK)
+GSNMP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngsnmp}
-BUILDLINK_PACKAGES+=	gsnmp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsnmp
-
-.if ${GSNMP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gsnmp+=	gsnmp>=0.2.0
 BUILDLINK_PKGSRCDIR.gsnmp?=	../../net/gsnmp
-.endif	# GSNMP_BUILDLINK3_MK
+.endif # GSNMP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gsnmp
diff --git a/net/hesiod/buildlink3.mk b/net/hesiod/buildlink3.mk
index 93cc6b416b1..89907f3b710 100644
--- a/net/hesiod/buildlink3.mk
+++ b/net/hesiod/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:08 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-HESIOD_BUILDLINK3_MK:=	${HESIOD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	hesiod
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	hesiod
-.endif
+.if !defined(HESIOD_BUILDLINK3_MK)
+HESIOD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhesiod}
-BUILDLINK_PACKAGES+=	hesiod
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hesiod
-
-.if !empty(HESIOD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.hesiod+=	hesiod>=3.0.2
 BUILDLINK_PKGSRCDIR.hesiod?=	../../net/hesiod
 BUILDLINK_DEPMETHOD.hesiod?=	build
-.endif	# HESIOD_BUILDLINK3_MK
+.endif # HESIOD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-hesiod
diff --git a/net/howl/buildlink3.mk b/net/howl/buildlink3.mk
index ad053395c05..42cc13cec79 100644
--- a/net/howl/buildlink3.mk
+++ b/net/howl/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:08 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-HOWL_BUILDLINK3_MK:=		${HOWL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	howl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=		howl
-.endif
+.if !defined(HOWL_BUILDLINK3_MK)
+HOWL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nhowl}
-BUILDLINK_PACKAGES+=		howl
-BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}howl
-
-.if !empty(HOWL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.howl+=	howl>=0.9.5
 BUILDLINK_ABI_DEPENDS.howl+=	howl>=0.9.5nb1
 BUILDLINK_PKGSRCDIR.howl?=	../../net/howl
-.endif	# HOWL_BUILDLINK3_MK
+.endif # HOWL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-howl
diff --git a/net/isc-dhcp/buildlink3.mk b/net/isc-dhcp/buildlink3.mk
index 11c5fc0ffa5..d5680e30c18 100644
--- a/net/isc-dhcp/buildlink3.mk
+++ b/net/isc-dhcp/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/06/16 14:52:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:08 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-ISC_DHCP_BASE_BUILDLINK3_MK:=	${ISC_DHCP_BASE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	isc-dhcp-base
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	isc-dhcp-base
-.endif
+.if !defined(ISC_DHCP_BASE_BUILDLINK3_MK)
+ISC_DHCP_BASE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nisc-dhcp-base}
-BUILDLINK_PACKAGES+=	isc-dhcp-base
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp-base
-
-.if ${ISC_DHCP_BASE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.isc-dhcp-base+=	isc-dhcp-base>=3.1.0<4
 BUILDLINK_PKGSRCDIR.isc-dhcp-base?=	../../net/isc-dhcp
-.endif	# ISC_DHCP_BASE_BUILDLINK3_MK
+.endif # ISC_DHCP_BASE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-isc-dhcp-base
diff --git a/net/isc-dhcp4/buildlink3.mk b/net/isc-dhcp4/buildlink3.mk
index 9c1e452eca3..707db1b6f6c 100644
--- a/net/isc-dhcp4/buildlink3.mk
+++ b/net/isc-dhcp4/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/01/04 00:56:32 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:09 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-ISC_DHCP_BUILDLINK3_MK:=	${ISC_DHCP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	isc-dhcp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	isc-dhcp
-.endif
+.if !defined(ISC_DHCP_BUILDLINK3_MK)
+ISC_DHCP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nisc-dhcp}
-BUILDLINK_PACKAGES+=	isc-dhcp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp
-
-.if ${ISC_DHCP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.isc-dhcp+=	isc-dhcp>=4.1.0
 BUILDLINK_PKGSRCDIR.isc-dhcp?=	../../net/isc-dhcp4
-.endif	# ISC_DHCP_BUILDLINK3_MK
+.endif # ISC_DHCP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-isc-dhcp
diff --git a/net/kdenetwork3/buildlink3.mk b/net/kdenetwork3/buildlink3.mk
index a63d46c09c9..b696c094d65 100644
--- a/net/kdenetwork3/buildlink3.mk
+++ b/net/kdenetwork3/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/01/18 05:08:43 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:09 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-KDENETWORK_BUILDLINK3_MK:=	${KDENETWORK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kdenetwork
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	kdenetwork
-.endif
+.if !defined(KDENETWORK_BUILDLINK3_MK)
+KDENETWORK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdenetwork}
-BUILDLINK_PACKAGES+=	kdenetwork
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdenetwork
-
-.if !empty(KDENETWORK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdenetwork+=	kdenetwork>=3.5.0nb1
 BUILDLINK_ABI_DEPENDS.kdenetwork?=	kdenetwork>=3.5.8nb2
 BUILDLINK_PKGSRCDIR.kdenetwork?=	../../net/kdenetwork3
-.endif	# KDENETWORK_BUILDLINK3_MK
 
 .include "../../converters/uulib/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.kdenetwork?=	../../net/kdenetwork3
 .include "../../net/openslp/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
+.endif # KDENETWORK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kdenetwork
diff --git a/net/ldns/buildlink3.mk b/net/ldns/buildlink3.mk
index df596a870f6..179d10f8745 100644
--- a/net/ldns/buildlink3.mk
+++ b/net/ldns/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/12/17 17:52:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:09 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LDNS_BUILDLINK3_MK:=		${LDNS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ldns
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ldns
-.endif
+.if !defined(LDNS_BUILDLINK3_MK)
+LDNS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nldns}
-BUILDLINK_PACKAGES+=	ldns
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ldns
-
-.if ${LDNS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ldns+=	ldns>=1.4
 BUILDLINK_PKGSRCDIR.ldns?=	../../net/ldns
-.endif	# LDNS_BUILDLINK3_MK
+.endif # LDNS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ldns
diff --git a/net/libIDL/buildlink3.mk b/net/libIDL/buildlink3.mk
index ab0ee88b361..adb4a5550d3 100644
--- a/net/libIDL/buildlink3.mk
+++ b/net/libIDL/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBIDL_BUILDLINK3_MK:=	${LIBIDL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libIDL
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libIDL
-.endif
+.if !defined(LIBIDL_BUILDLINK3_MK)
+LIBIDL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibIDL}
-BUILDLINK_PACKAGES+=	libIDL
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libIDL
-
-.if !empty(LIBIDL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libIDL+=	libIDL>=0.8.3nb1
 BUILDLINK_ABI_DEPENDS.libIDL+=	libIDL>=0.8.6nb1
 BUILDLINK_PKGSRCDIR.libIDL?=	../../net/libIDL
-.endif	# LIBIDL_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # LIBIDL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libIDL
diff --git a/net/libares/buildlink3.mk b/net/libares/buildlink3.mk
index 0959ac58e32..8ac9b70f640 100644
--- a/net/libares/buildlink3.mk
+++ b/net/libares/buildlink3.mk
@@ -1,23 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/12/12 21:52:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBARES_BUILDLINK3_MK:=	${LIBARES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libares
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libares
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibares}
-BUILDLINK_PACKAGES+=	libares
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libares
+.if !defined(LIBARES_BUILDLINK3_MK)
+LIBARES_BUILDLINK3_MK:=
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(LIBARES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libares+=	libares>=1.1.1
 BUILDLINK_PKGSRCDIR.libares?=	../../net/libares
 BUILDLINK_DEPMETHOD.libares?=	build
-.endif	# LIBARES_BUILDLINK3_MK
 
 .if ${OPSYS} == "Interix"
 BUILDLINK_PASSTHRU_DIRS+=	/usr/local/include/bind /usr/local/lib/bind
@@ -25,5 +17,6 @@ BUILDLINK_CPPFLAGS.libares+=	-I/usr/local/include/bind
 BUILDLINK_LDFLAGS.libares+=	-L/usr/local/lib/bind
 BUILDLINK_LIBS.libares+=	-lbind -ldb
 .endif
+.endif # LIBARES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libares
diff --git a/net/libcares/buildlink3.mk b/net/libcares/buildlink3.mk
index 4dedddbc527..85de59b99e5 100644
--- a/net/libcares/buildlink3.mk
+++ b/net/libcares/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/18 22:38:18 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:09 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBCARES_BUILDLINK3_MK:=	${LIBCARES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libcares
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libcares
-.endif
+.if !defined(LIBCARES_BUILDLINK3_MK)
+LIBCARES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcares}
-BUILDLINK_PACKAGES+=	libcares
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcares
-
-.if !empty(LIBCARES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcares+=	libcares>=1.3.0nb1
 BUILDLINK_PKGSRCDIR.libcares?=	../../net/libcares
-.endif	# LIBCARES_BUILDLINK3_MK
+.endif # LIBCARES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libcares
diff --git a/net/libdnet/buildlink3.mk b/net/libdnet/buildlink3.mk
index 2fd291e8cbd..d410fdad359 100644
--- a/net/libdnet/buildlink3.mk
+++ b/net/libdnet/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBDNET_BUILDLINK3_MK:=	${LIBDNET_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdnet
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdnet
-.endif
+.if !defined(LIBDNET_BUILDLINK3_MK)
+LIBDNET_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdnet}
-BUILDLINK_PACKAGES+=	libdnet
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdnet
-
-.if !empty(LIBDNET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdnet+=	libdnet>=1.7
 BUILDLINK_ABI_DEPENDS.libdnet?=	libdnet>=1.10nb1
 BUILDLINK_PKGSRCDIR.libdnet?=	../../net/libdnet
-.endif	# LIBDNET_BUILDLINK3_MK
+.endif # LIBDNET_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdnet
diff --git a/net/libfetch/buildlink3.mk b/net/libfetch/buildlink3.mk
index 5de5816a9c2..55fc9ba7f54 100644
--- a/net/libfetch/buildlink3.mk
+++ b/net/libfetch/buildlink3.mk
@@ -1,22 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/02/05 16:59:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:09 joerg Exp $
 
 BUILDLINK_DEPMETHOD.libfetch?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBFETCH_BUILDLINK3_MK:=	${LIBFETCH_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libfetch
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libfetch
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibfetch}
-BUILDLINK_PACKAGES+=	libfetch
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfetch
+.if !defined(LIBFETCH_BUILDLINK3_MK)
+LIBFETCH_BUILDLINK3_MK:=
 
-.if ${LIBFETCH_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libfetch+=	libfetch>=2.21
 BUILDLINK_PKGSRCDIR.libfetch?=	../../net/libfetch
-.endif	# LIBFETCH_BUILDLINK3_MK
 
 pkgbase := libfetch
 .include "../../mk/pkg-build-options.mk"
@@ -24,5 +16,6 @@ pkgbase := libfetch
 .if !empty(PKG_BUILD_OPTIONS.libfetch:Mopenssl)
 .include "../../security/openssl/buildlink3.mk"
 .endif
+.endif # LIBFETCH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libfetch
diff --git a/net/liblive/buildlink3.mk b/net/liblive/buildlink3.mk
index 977778392f5..16923eea528 100644
--- a/net/liblive/buildlink3.mk
+++ b/net/liblive/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/07/17 10:11:19 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBLIVE_BUILDLINK3_MK:=	${LIBLIVE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	liblive
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	liblive
-.endif
+.if !defined(LIBLIVE_BUILDLINK3_MK)
+LIBLIVE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliblive}
-BUILDLINK_PACKAGES+=	liblive
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblive
-
-.if !empty(LIBLIVE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.liblive+=	liblive>=20080706
 BUILDLINK_ABI_DEPENDS.liblive+=	liblive>=20080706
 BUILDLINK_PKGSRCDIR.liblive?=	../../net/liblive
@@ -19,6 +12,6 @@ BUILDLINK_INCDIRS.liblive+=     include/BasicUsageEnvironment
 BUILDLINK_INCDIRS.liblive+=     include/UsageEnvironment
 BUILDLINK_INCDIRS.liblive+=     include/groupsock
 BUILDLINK_INCDIRS.liblive+=     include/liveMedia
-.endif	# LIBLIVE_BUILDLINK3_MK
+.endif # LIBLIVE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-liblive
diff --git a/net/libmms/buildlink3.mk b/net/libmms/buildlink3.mk
index e2a4297d303..7727b933d3f 100644
--- a/net/libmms/buildlink3.mk
+++ b/net/libmms/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/20 09:15:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:09 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBMMS_BUILDLINK3_MK:=	${LIBMMS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmms
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libmms
-.endif
+.if !defined(LIBMMS_BUILDLINK3_MK)
+LIBMMS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmms}
-BUILDLINK_PACKAGES+=	libmms
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmms
-
-.if ${LIBMMS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libmms+=	libmms>=0.3
 BUILDLINK_PKGSRCDIR.libmms?=	../../net/libmms
-.endif	# LIBMMS_BUILDLINK3_MK
+.endif # LIBMMS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmms
diff --git a/net/libnids/buildlink3.mk b/net/libnids/buildlink3.mk
index 9fab1433bf4..655e2d62c53 100644
--- a/net/libnids/buildlink3.mk
+++ b/net/libnids/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:10 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBNIDS_BUILDLINK3_MK:=	${LIBNIDS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libnids
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libnids
-.endif
+.if !defined(LIBNIDS_BUILDLINK3_MK)
+LIBNIDS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnids}
-BUILDLINK_PACKAGES+=	libnids
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnids
-
-.if !empty(LIBNIDS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libnids+=	libnids>=1.18
 BUILDLINK_PKGSRCDIR.libnids?=	../../net/libnids
 BUILDLINK_DEPMETHOD.libnids?=	build
-.endif	# LIBNIDS_BUILDLINK3_MK
+.endif # LIBNIDS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libnids
diff --git a/net/libnipper/buildlink3.mk b/net/libnipper/buildlink3.mk
index 6d39ec67eb3..5d350ab0a23 100644
--- a/net/libnipper/buildlink3.mk
+++ b/net/libnipper/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/08 17:27:56 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBNIPPER_BUILDLINK3_MK:=	${LIBNIPPER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libnipper
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libnipper
-.endif
+.if !defined(LIBNIPPER_BUILDLINK3_MK)
+LIBNIPPER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnipper}
-BUILDLINK_PACKAGES+=	libnipper
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnipper
-
-.if ${LIBNIPPER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libnipper+=	libnipper>=0.12.1
 BUILDLINK_PKGSRCDIR.libnipper?=	../../net/libnipper
-.endif	# LIBNIPPER_BUILDLINK3_MK
+.endif # LIBNIPPER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libnipper
diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk
index a154e59afd1..6dcfe2251db 100644
--- a/net/libpcap/buildlink3.mk
+++ b/net/libpcap/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/12/12 21:52:36 joerg Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBPCAP_BUILDLINK3_MK:=	${LIBPCAP_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:25:10 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libpcap
-.endif
+BUILDLINK_TREE+=	libpcap
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpcap}
-BUILDLINK_PACKAGES+=	libpcap
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpcap
+.if !defined(LIBPCAP_BUILDLINK3_MK)
+LIBPCAP_BUILDLINK3_MK:=
 
-.if !empty(LIBPCAP_BUILDLINK3_MK:M+)
 # XXX?
 BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.5.0
 BUILDLINK_PKGSRCDIR.libpcap?=	../../net/libpcap
@@ -24,7 +17,6 @@ BUILDLINK_PKGSRCDIR.libpcap?=	../../net/libpcap
 BUILDLINK_LDADD.libpcap+=	-lnsl -lsocket
 BUILDLINK_LDFLAGS.libpcap?=	${BUILDLINK_LDADD.libpcap}
 .  endif
+.endif # LIBPCAP_BUILDLINK3_MK
 
-.endif	# LIBPCAP_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libpcap
diff --git a/net/libradius/buildlink3.mk b/net/libradius/buildlink3.mk
index bb809272c07..aeda1becce4 100644
--- a/net/libradius/buildlink3.mk
+++ b/net/libradius/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/01/03 17:08:52 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBRADIUS_BUILDLINK3_MK:=	${LIBRADIUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libradius
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libradius
-.endif
+.if !defined(LIBRADIUS_BUILDLINK3_MK)
+LIBRADIUS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibradius}
-BUILDLINK_PACKAGES+=	libradius
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libradius
-
-.if ${LIBRADIUS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libradius+=	libradius>=20040827
 BUILDLINK_PKGSRCDIR.libradius?=	../../net/libradius
 BUILDLINK_DEPMETHOD.libradius?=	build
@@ -21,6 +14,6 @@ BUILDLINK_DEPMETHOD.libradius?=	build
 BUILDLINK_LDADD.libradius+=	-lmd
 BUILDLINK_LDFLAGS.libradius?=	${BUILDLINK_LDADD.libradius}
 .  endif
-.endif	# LIBRADIUS_BUILDLINK3_MK
+.endif # LIBRADIUS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libradius
diff --git a/net/libsoup24/buildlink3.mk b/net/libsoup24/buildlink3.mk
index 9d331d0184f..b2dc6b009f4 100644
--- a/net/libsoup24/buildlink3.mk
+++ b/net/libsoup24/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/16 13:02:18 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSOUP24_BUILDLINK3_MK:=	${LIBSOUP24_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsoup24
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libsoup24
-.endif
+.if !defined(LIBSOUP24_BUILDLINK3_MK)
+LIBSOUP24_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsoup24}
-BUILDLINK_PACKAGES+=	libsoup24
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsoup24
-
-.if !empty(LIBSOUP24_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libsoup24+=	libsoup24>=2.4.0
 BUILDLINK_ABI_DEPENDS.libsoup24?=	libsoup24>=2.4.0
 BUILDLINK_PKGSRCDIR.libsoup24?=		../../net/libsoup24
-.endif	# LIBSOUP24_BUILDLINK3_MK
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/libproxy/buildlink3.mk"
+.endif # LIBSOUP24_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsoup24
diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk
index 953e1586f45..cf9fde1f991 100644
--- a/net/libtorrent/buildlink3.mk
+++ b/net/libtorrent/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/12/03 12:57:40 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBTORRENT_BUILDLINK3_MK:=	${LIBTORRENT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtorrent
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libtorrent
-.endif
+.if !defined(LIBTORRENT_BUILDLINK3_MK)
+LIBTORRENT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtorrent}
-BUILDLINK_PACKAGES+=	libtorrent
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtorrent
-
-.if !empty(LIBTORRENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtorrent+=	libtorrent>=0.12.0
 BUILDLINK_ABI_DEPENDS.libtorrent+=	libtorrent>=0.12.0
 BUILDLINK_PKGSRCDIR.libtorrent?=	../../net/libtorrent
-.endif	# LIBTORRENT_BUILDLINK3_MK
 
 .include "../../devel/libsigc++/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.endif # LIBTORRENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtorrent
diff --git a/net/libupnp/buildlink3.mk b/net/libupnp/buildlink3.mk
index 2399be4c3e0..d4a2b88a768 100644
--- a/net/libupnp/buildlink3.mk
+++ b/net/libupnp/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/08/19 01:36:22 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:10 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBUPNP_BUILDLINK3_MK:=	${LIBUPNP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libupnp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libupnp
-.endif
+.if !defined(LIBUPNP_BUILDLINK3_MK)
+LIBUPNP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibupnp}
-BUILDLINK_PACKAGES+=	libupnp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libupnp
-
-.if ${LIBUPNP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libupnp+=	libupnp>=1.4.6
 BUILDLINK_PKGSRCDIR.libupnp?=	../../net/libupnp
-.endif	# LIBUPNP_BUILDLINK3_MK
+.endif # LIBUPNP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libupnp
diff --git a/net/libvncserver/buildlink3.mk b/net/libvncserver/buildlink3.mk
index e025d492b7b..a9031791332 100644
--- a/net/libvncserver/buildlink3.mk
+++ b/net/libvncserver/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/07/11 14:37:25 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBVNCSERVER_BUILDLINK3_MK:=	${LIBVNCSERVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libVNCServer
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libVNCServer
-.endif
+.if !defined(LIBVNCSERVER_BUILDLINK3_MK)
+LIBVNCSERVER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibVNCServer}
-BUILDLINK_PACKAGES+=	libVNCServer
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libVNCServer
-
-.if ${LIBVNCSERVER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libVNCServer+=	libVNCServer>=0.9.1
 BUILDLINK_PKGSRCDIR.libVNCServer?=	../../net/libvncserver
-.endif	# LIBVNCSERVER_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.endif # LIBVNCSERVER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libVNCServer
diff --git a/net/linc/buildlink3.mk b/net/linc/buildlink3.mk
index 5fc6acdb55f..0bfd52ea87b 100644
--- a/net/linc/buildlink3.mk
+++ b/net/linc/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/01/18 05:08:44 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:10 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LINC_BUILDLINK3_MK:=	${LINC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	linc
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	linc
-.endif
+.if !defined(LINC_BUILDLINK3_MK)
+LINC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlinc}
-BUILDLINK_PACKAGES+=	linc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}linc
-
-.if !empty(LINC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.linc+=	linc>=1.1.1
 BUILDLINK_ABI_DEPENDS.linc+=	linc>=1.1.1nb5
 BUILDLINK_PKGSRCDIR.linc?=	../../net/linc
-.endif	# LINC_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.endif # LINC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-linc
diff --git a/net/mDNSResponder/buildlink3.mk b/net/mDNSResponder/buildlink3.mk
index a6ae10c699d..9c0b4678d99 100644
--- a/net/mDNSResponder/buildlink3.mk
+++ b/net/mDNSResponder/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:10 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MDNSRESPONDER_BUILDLINK3_MK:=	${MDNSRESPONDER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mDNSResponder
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mDNSResponder
-.endif
+.if !defined(MDNSRESPONDER_BUILDLINK3_MK)
+MDNSRESPONDER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NmDNSResponder}
-BUILDLINK_PACKAGES+=	mDNSResponder
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mDNSResponder
-
-.if !empty(MDNSRESPONDER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mDNSResponder+=	mDNSResponder>=98
 BUILDLINK_ABI_DEPENDS.mDNSResponder?=	mDNSResponder>=107.5nb1
 BUILDLINK_PKGSRCDIR.mDNSResponder?=	../../net/mDNSResponder
-.endif	# MDNSRESPONDER_BUILDLINK3_MK
+.endif # MDNSRESPONDER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mDNSResponder
diff --git a/net/monotorrent/buildlink3.mk b/net/monotorrent/buildlink3.mk
index a1e320630a0..e541c7f2a0c 100644
--- a/net/monotorrent/buildlink3.mk
+++ b/net/monotorrent/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/11/30 11:26:35 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:11 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MONOTORRENT_BUILDLINK3_MK:=	${MONOTORRENT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	monotorrent
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	monotorrent
-.endif
+.if !defined(MONOTORRENT_BUILDLINK3_MK)
+MONOTORRENT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmonotorrent}
-BUILDLINK_PACKAGES+=	monotorrent
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}monotorrent
-
-.if ${MONOTORRENT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.monotorrent+=	monotorrent>=0.62
 BUILDLINK_PKGSRCDIR.monotorrent?=	../../net/monotorrent
-.endif	# MONOTORRENT_BUILDLINK3_MK
 
 .include "../../lang/mono/buildlink3.mk"
+.endif # MONOTORRENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-monotorrent
diff --git a/net/net-snmp/buildlink3.mk b/net/net-snmp/buildlink3.mk
index e4f17aaccf8..74a29cca570 100644
--- a/net/net-snmp/buildlink3.mk
+++ b/net/net-snmp/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:11 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-NET_SNMP_BUILDLINK3_MK:=	${NET_SNMP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	net-snmp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	net-snmp
-.endif
+.if !defined(NET_SNMP_BUILDLINK3_MK)
+NET_SNMP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnet-snmp}
-BUILDLINK_PACKAGES+=	net-snmp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}net-snmp
-
-.if !empty(NET_SNMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.net-snmp+=	net-snmp>=5.0.9nb3
 BUILDLINK_ABI_DEPENDS.net-snmp+=	net-snmp>=5.2.1.2
 BUILDLINK_PKGSRCDIR.net-snmp?=	../../net/net-snmp
-.endif	# NET_SNMP_BUILDLINK3_MK
 
 .include "../../security/tcp_wrappers/buildlink3.mk"
+.endif # NET_SNMP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-net-snmp
diff --git a/net/net6/buildlink3.mk b/net/net6/buildlink3.mk
index a3ccdf70a76..68709b9a1c8 100644
--- a/net/net6/buildlink3.mk
+++ b/net/net6/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/03/06 14:53:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NET6_BUILDLINK3_MK:=	${NET6_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	net6
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	net6
-.endif
+.if !defined(NET6_BUILDLINK3_MK)
+NET6_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnet6}
-BUILDLINK_PACKAGES+=	net6
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}net6
-
-.if ${NET6_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.net6+=	net6>=1.3.5
 BUILDLINK_ABI_DEPENDS.net6?=	net6>=1.3.5nb1
 BUILDLINK_PKGSRCDIR.net6?=	../../net/net6
-.endif	# NET6_BUILDLINK3_MK
 
 .include "../../devel/libsigc++/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.endif # NET6_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-net6
diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk
index 9486e547ada..2b2f3a4e077 100644
--- a/net/netatalk/buildlink3.mk
+++ b/net/netatalk/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:11 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	netatalk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	netatalk
-.endif
+.if !defined(NETATALK_BUILDLINK3_MK)
+NETATALK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetatalk}
-BUILDLINK_PACKAGES+=	netatalk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netatalk
-
-.if !empty(NETATALK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.netatalk+=	netatalk>=2.0.3nb2
 BUILDLINK_ABI_DEPENDS.netatalk?=	netatalk>=2.0.3nb3
 BUILDLINK_PKGSRCDIR.netatalk?=	../../net/netatalk
 BUILDLINK_DEPMETHOD.netatalk?=	build
-.endif	# NETATALK_BUILDLINK3_MK
+.endif # NETATALK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-netatalk
diff --git a/net/openh323/buildlink3.mk b/net/openh323/buildlink3.mk
index 98f1e9adc36..9e9f95f99a4 100644
--- a/net/openh323/buildlink3.mk
+++ b/net/openh323/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/01/18 05:08:47 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENH323_BUILDLINK3_MK:=	${OPENH323_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openh323
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openh323
-.endif
+.if !defined(OPENH323_BUILDLINK3_MK)
+OPENH323_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenh323}
-BUILDLINK_PACKAGES+=	openh323
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openh323
-
-.if !empty(OPENH323_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openh323+=	openh323>=1.15.1
 BUILDLINK_ABI_DEPENDS.openh323+=	openh323>=1.15.2nb2
 BUILDLINK_PKGSRCDIR.openh323?=	../../net/openh323
-.endif	# OPENH323_BUILDLINK3_MK
 
 .include "../../devel/pwlib/buildlink3.mk"
+.endif # OPENH323_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openh323
diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk
index cedc1aa6003..43d625f8c6e 100644
--- a/net/openslp/buildlink3.mk
+++ b/net/openslp/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENSLP_BUILDLINK3_MK:=	${OPENSLP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openslp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openslp
-.endif
+.if !defined(OPENSLP_BUILDLINK3_MK)
+OPENSLP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenslp}
-BUILDLINK_PACKAGES+=	openslp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openslp
-
-.if !empty(OPENSLP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openslp+=	openslp>=1.0.1
 BUILDLINK_ABI_DEPENDS.openslp+=	openslp>=1.2.1
 BUILDLINK_PKGSRCDIR.openslp?=	../../net/openslp
-.endif	# OPENSLP_BUILDLINK3_MK
+.endif # OPENSLP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openslp
diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk
index d327f8b0f3e..a3535959a35 100644
--- a/net/py-ORBit/buildlink3.mk
+++ b/net/py-ORBit/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 17:30:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:11 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_ORBIT_BUILDLINK3_MK:=	${PY_ORBIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pyorbit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pyorbit
-.endif
+.if !defined(PY_ORBIT_BUILDLINK3_MK)
+PY_ORBIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyorbit}
-BUILDLINK_PACKAGES+=	pyorbit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyorbit
-
-.if !empty(PY_ORBIT_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.0nb1
 BUILDLINK_ABI_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.pyorbit?=	../../net/py-ORBit
-.endif	# PY_ORBIT_BUILDLINK3_MK
 
 .include "../../net/ORBit2/buildlink3.mk"
+.endif # PY_ORBIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pyorbit
diff --git a/net/py-boto/buildlink3.mk b/net/py-boto/buildlink3.mk
index b013ff343ca..6f199a1d6bf 100644
--- a/net/py-boto/buildlink3.mk
+++ b/net/py-boto/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/04/25 21:54:15 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:11 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_BOTO_BUILDLINK3_MK:=		${PY_BOTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-boto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-boto
-.endif
+.if !defined(PY_BOTO_BUILDLINK3_MK)
+PY_BOTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-boto}
-BUILDLINK_PACKAGES+=	py-boto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-boto
-
-.if ${PY_BOTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.py-boto+=	${PYPKGPREFIX}-boto>=1.0a
 BUILDLINK_PKGSRCDIR.py-boto?=	../../net/py-boto
-.endif	# PY_BOTO_BUILDLINK3_MK
+.endif # PY_BOTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-boto
diff --git a/net/py-libdnet/buildlink3.mk b/net/py-libdnet/buildlink3.mk
index e823246b0e4..d6b84f267ad 100644
--- a/net/py-libdnet/buildlink3.mk
+++ b/net/py-libdnet/buildlink3.mk
@@ -1,23 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PYLIBDNET_BUILDLINK3_MK:=	${PYLIBDNET_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pylibdnet
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pylibdnet
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npylibdnet}
-BUILDLINK_PACKAGES+=	pylibdnet
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pylibdnet
-
-.if !empty(PYLIBDNET_BUILDLINK3_MK:M+)
+.if !defined(PYLIBDNET_BUILDLINK3_MK)
+PYLIBDNET_BUILDLINK3_MK:=
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pylibdnet+=	${PYPKGPREFIX}-libdnet>=1.7
 BUILDLINK_ABI_DEPENDS.pylibdnet?=	${PYPKGPREFIX}-libdnet>=1.10nb1
 BUILDLINK_PKGSRCDIR.pylibdnet?=	../../net/py-libdnet
-.endif	# PYLIBDNET_BUILDLINK3_MK
+.endif # PYLIBDNET_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pylibdnet
diff --git a/net/py-libpcap/buildlink3.mk b/net/py-libpcap/buildlink3.mk
index 5f31b69c8b3..bdd9d3eed05 100644
--- a/net/py-libpcap/buildlink3.mk
+++ b/net/py-libpcap/buildlink3.mk
@@ -1,24 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:11 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PYLIBPCAP_BUILDLINK3_MK:=	${PYLIBPCAP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pylibpcap
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pylibpcap
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npylibpcap}
-BUILDLINK_PACKAGES+=	pylibpcap
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pylibpcap
-
-.if !empty(PYLIBPCAP_BUILDLINK3_MK:M+)
+.if !defined(PYLIBPCAP_BUILDLINK3_MK)
+PYLIBPCAP_BUILDLINK3_MK:=
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pylibpcap+=	${PYPKGPREFIX}-libpcap>=0.5.0
 BUILDLINK_ABI_DEPENDS.pylibpcap?=	${PYPKGPREFIX}-libpcap>=0.5nb1
 BUILDLINK_PKGSRCDIR.pylibpcap?=	../../net/py-libpcap
+.endif # PYLIBPCAP_BUILDLINK3_MK
 
-.endif	# PYLIBPCAP_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pylibpcap
diff --git a/net/py-soappy/buildlink3.mk b/net/py-soappy/buildlink3.mk
index 7f62bc01455..e6c40155d1e 100644
--- a/net/py-soappy/buildlink3.mk
+++ b/net/py-soappy/buildlink3.mk
@@ -1,24 +1,17 @@
-# $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:11 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_SOAPPY_BUILDLINK3_MK:=	${PY_SOAPPY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-SOAPpy
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	py-SOAPpy
-.endif
+.if !defined(PY_SOAPPY_BUILDLINK3_MK)
+PY_SOAPPY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-SOAPpy}
-BUILDLINK_PACKAGES+=	py-SOAPpy
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-SOAPpy
-
-.if !empty(PY_SOAPPY_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-SOAPpy+=	${PYPKGPREFIX}-SOAPpy>=0.11.4
 BUILDLINK_ABI_DEPENDS.py-SOAPpy?=	${PYPKGPREFIX}-SOAPpy>=0.11.4nb4
 BUILDLINK_PKGSRCDIR.py-SOAPpy?=	../../net/py-soappy
-.endif	# PY_SOAPPY_BUILDLINK3_MK
 
 .include "../../textproc/py-xml/buildlink3.mk"
+.endif # PY_SOAPPY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-SOAPpy
diff --git a/net/radiusclient-ng/buildlink3.mk b/net/radiusclient-ng/buildlink3.mk
index cbfb2b886fd..a2c7a23c13d 100644
--- a/net/radiusclient-ng/buildlink3.mk
+++ b/net/radiusclient-ng/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/13 19:58:56 bouyer Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-RADIUSCLIENT_NG_BUILDLINK3_MK:=	${RADIUSCLIENT_NG_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:12 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	radiusclient-ng
-.endif
+BUILDLINK_TREE+=	radiusclient-ng
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nradiusclient-ng}
-BUILDLINK_PACKAGES+=	radiusclient-ng
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}radiusclient-ng
+.if !defined(RADIUSCLIENT_NG_BUILDLINK3_MK)
+RADIUSCLIENT_NG_BUILDLINK3_MK:=
 
-.if !empty(RADIUSCLIENT_NG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.radiusclient-ng+=	radiusclient-ng>=0.5.5.1
 BUILDLINK_PKGSRCDIR.radiusclient-ng?=	../../net/radiusclient-ng
 BUILDLINK_DEPMETHOD.radiusclient-ng?=	build
@@ -22,6 +15,6 @@ BUILDLINK_DEPMETHOD.radiusclient-ng?=	build
 BUILDLINK_LDADD.radiusclient-ng+=	-lmd
 BUILDLINK_LDFLAGS.radiusclient-ng?=	${BUILDLINK_LDADD.radiusclient-ng}
 .  endif
-.endif	# RADIUSCLIENT_NG_BUILDLINK3_MK
+.endif # RADIUSCLIENT_NG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-radiusclient-ng
diff --git a/net/samba/buildlink3.mk b/net/samba/buildlink3.mk
index 040e3e7be7d..47a50c6a5a1 100644
--- a/net/samba/buildlink3.mk
+++ b/net/samba/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SAMBA_BUILDLINK3_MK:=	${SAMBA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	samba
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	samba
-.endif
+.if !defined(SAMBA_BUILDLINK3_MK)
+SAMBA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsamba}
-BUILDLINK_PACKAGES+=	samba
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}samba
-
-.if !empty(SAMBA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.samba+=	samba>=3.0.7
 BUILDLINK_PKGSRCDIR.samba?=	../../net/samba
-.endif	# SAMBA_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.endif # SAMBA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-samba
diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk
index f7b38874b52..5338e8e211d 100644
--- a/net/socks4/buildlink3.mk
+++ b/net/socks4/buildlink3.mk
@@ -1,22 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SOCKS4_BUILDLINK3_MK:=	${SOCKS4_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	socks4
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	socks4
-.endif
+.if !defined(SOCKS4_BUILDLINK3_MK)
+SOCKS4_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsocks4}
-BUILDLINK_PACKAGES+=	socks4
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}socks4
-
-.if !empty(SOCKS4_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.socks4+=	socks4>=2.2
 BUILDLINK_PKGSRCDIR.socks4?=	../../net/socks4
 
 BUILDLINK_TRANSFORM+=	l:socks:socks4
+.endif # SOCKS4_BUILDLINK3_MK
 
-.endif	# SOCKS4_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-socks4
diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk
index 10ece1c263f..ca7b4d64ba2 100644
--- a/net/socks5/buildlink3.mk
+++ b/net/socks5/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SOCKS5_BUILDLINK3_MK:=	${SOCKS5_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	socks5
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	socks5
-.endif
+.if !defined(SOCKS5_BUILDLINK3_MK)
+SOCKS5_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsocks5}
-BUILDLINK_PACKAGES+=	socks5
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}socks5
-
-.if !empty(SOCKS5_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.socks5+=	socks5>=1.0.2
 BUILDLINK_PKGSRCDIR.socks5?=	../../net/socks5
-.endif	# SOCKS5_BUILDLINK3_MK
+.endif # SOCKS5_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-socks5
diff --git a/net/solaris-tap/buildlink3.mk b/net/solaris-tap/buildlink3.mk
index e89bd66f03e..03438132861 100644
--- a/net/solaris-tap/buildlink3.mk
+++ b/net/solaris-tap/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/07/01 00:43:20 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:12 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SOLARIS_TAP_BUILDLINK3_MK:=	${SOLARIS_TAP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	solaris-tap
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	solaris-tap
-.endif
+.if !defined(SOLARIS_TAP_BUILDLINK3_MK)
+SOLARIS_TAP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsolaris-tap}
-BUILDLINK_PACKAGES+=	solaris-tap
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}solaris-tap
-
-.if ${SOLARIS_TAP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.solaris-tap+=	solaris-tap>=20070525
 BUILDLINK_PKGSRCDIR.solaris-tap?=	../../net/solaris-tap
 BUILDLINK_DEPMETHOD.solaris-tap?=	build
-.endif	# SOLARIS_TAP_BUILDLINK3_MK
+.endif # SOLARIS_TAP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-solaris-tap
diff --git a/net/spread/buildlink3.mk b/net/spread/buildlink3.mk
index f019606fe78..7f0edb629e2 100644
--- a/net/spread/buildlink3.mk
+++ b/net/spread/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/05/22 14:04:33 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SPREAD_BUILDLINK3_MK:=	${SPREAD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	spread
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	spread
-.endif
+.if !defined(SPREAD_BUILDLINK3_MK)
+SPREAD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspread}
-BUILDLINK_PACKAGES+=	spread
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}spread
-
-.if !empty(SPREAD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.spread+=	spread>=3.17.1
 BUILDLINK_PKGSRCDIR.spread?=	../../net/spread
 BUILDLINK_INCDIRS.spread?=	include/spread
-.endif	# SPREAD_BUILDLINK3_MK
+.endif # SPREAD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-spread
diff --git a/net/tcl-scotty/buildlink3.mk b/net/tcl-scotty/buildlink3.mk
index d18ecfc8e71..0dd4ca56bc5 100644
--- a/net/tcl-scotty/buildlink3.mk
+++ b/net/tcl-scotty/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:12 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TCL_SCOTTY_BUILDLINK3_MK:=	${TCL_SCOTTY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcl-scotty
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcl-scotty
-.endif
+.if !defined(TCL_SCOTTY_BUILDLINK3_MK)
+TCL_SCOTTY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-scotty}
-BUILDLINK_PACKAGES+=	tcl-scotty
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-scotty
-
-.if !empty(TCL_SCOTTY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-scotty+=	tcl-scotty>=2.1.11
 BUILDLINK_ABI_DEPENDS.tcl-scotty+=	tcl-scotty>=2.1.11nb4
 BUILDLINK_PKGSRCDIR.tcl-scotty?=	../../net/tcl-scotty
-.endif	# TCL_SCOTTY_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
+.endif # TCL_SCOTTY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcl-scotty
diff --git a/net/whoson/buildlink3.mk b/net/whoson/buildlink3.mk
index ec54d5743ea..ad0a3c7c231 100644
--- a/net/whoson/buildlink3.mk
+++ b/net/whoson/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WHOSON_BUILDLINK3_MK:=	${WHOSON_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	whoson
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	whoson
-.endif
+.if !defined(WHOSON_BUILDLINK3_MK)
+WHOSON_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwhoson}
-BUILDLINK_PACKAGES+=	whoson
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}whoson
-
-.if !empty(WHOSON_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.whoson+=	whoson>=2.03
 BUILDLINK_PKGSRCDIR.whoson?=	../../net/whoson
-.endif	# WHOSON_BUILDLINK3_MK
+.endif # WHOSON_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-whoson
diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk
index 6320d866b34..7857115af87 100644
--- a/net/xfce4-wavelan-plugin/buildlink3.mk
+++ b/net/xfce4-wavelan-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/04/12 09:55:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:12 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-wavelan-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-wavelan-plugin
-.endif
+.if !defined(XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK)
+XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wavelan-plugin}
-BUILDLINK_PACKAGES+=	xfce4-wavelan-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wavelan-plugin
-
-.if ${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.5.3
 BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?=	../../net/xfce4-wavelan-plugin
-.endif	# XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-wavelan-plugin
diff --git a/net/yaz/buildlink3.mk b/net/yaz/buildlink3.mk
index ee439e8d49c..2c27b1cdde9 100644
--- a/net/yaz/buildlink3.mk
+++ b/net/yaz/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/10/16 21:21:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:12 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-YAZ_BUILDLINK3_MK:=	${YAZ_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	yaz
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	yaz
-.endif
+.if !defined(YAZ_BUILDLINK3_MK)
+YAZ_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nyaz}
-BUILDLINK_PACKAGES+=	yaz
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}yaz
-
-.if !empty(YAZ_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.yaz+=	yaz>=2.0
 BUILDLINK_ABI_DEPENDS.yaz+=	yaz>=3.0
 BUILDLINK_PKGSRCDIR.yaz?=	../../net/yaz
-.endif	# YAZ_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.endif # YAZ_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-yaz