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.

32 files changed, 191 insertions, 414 deletions

diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk
index e81263b9a88..5cf36de0362 100644
--- a/www/ap-perl/buildlink3.mk
+++ b/www/ap-perl/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:35 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-AP_PERL_BUILDLINK3_MK:=	${AP_PERL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ap13-perl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ap13-perl
-.endif
+.if !defined(AP_PERL_BUILDLINK3_MK)
+AP_PERL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nap-perl}
-BUILDLINK_PACKAGES+=	ap13-perl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ap13-perl
-
-.if !empty(AP_PERL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ap13-perl+=	ap13-perl>=1.29
 BUILDLINK_ABI_DEPENDS.ap13-perl?=	ap13-perl>=1.29
 BUILDLINK_PKGSRCDIR.ap13-perl?=	../../www/ap-perl
@@ -21,8 +14,8 @@ BUILDLINK_FILES.ap13-perl+=	\
 	${PERL5_SUB_INSTALLVENDORARCH}/auto/Apache/include/*
 BUILDLINK_FILES.ap13-perl+=	\
 	${PERL5_SUB_INSTALLVENDORARCH}/auto/Apache/include/modules/perl/*
-.endif	# AP_PERL_BUILDLINK3_MK
 
 .include "../../www/apache/buildlink3.mk"
+.endif # AP_PERL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ap13-perl
diff --git a/www/ap2-perl/buildlink3.mk b/www/ap2-perl/buildlink3.mk
index ab550bcdbee..43c2dc77937 100644
--- a/www/ap2-perl/buildlink3.mk
+++ b/www/ap2-perl/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/06/30 16:09:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:35 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-AP2_PERL_BUILDLINK3_MK:=	${AP2_PERL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ap2-perl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ap2-perl
-.endif
+.if !defined(AP2_PERL_BUILDLINK3_MK)
+AP2_PERL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nap2-perl}
-BUILDLINK_PACKAGES+=	ap2-perl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ap2-perl
-
-.if !empty(AP2_PERL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ap2-perl+=	${APACHE_PKG_PREFIX}-perl>=2.0.1
 BUILDLINK_ABI_DEPENDS.ap2-perl?=	${APACHE_PKG_PREFIX}-perl>=2.0.3
 BUILDLINK_PKGSRCDIR.ap2-perl?=	../../www/ap2-perl
-.endif	# AP2_PERL_BUILDLINK3_MK
 
 .include "../../mk/apache.mk"
+.endif # AP2_PERL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ap2-perl
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 52b1fc1030e..fa3783b17af 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:11:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:25:35 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	apache
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	apache
-.endif
+.if !defined(APACHE_BUILDLINK3_MK)
+APACHE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napache}
-BUILDLINK_PACKAGES+=	apache
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apache
-
-.if !empty(APACHE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.apache+=	apache-1.3.*
 BUILDLINK_ABI_DEPENDS.apache?=	apache>=1.3.34nb5
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache
@@ -32,7 +25,6 @@ CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
 # required because httpd/os.h includes <dlfcn.h> when it is found by
 # Apache's configure script.
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # APACHE_BUILDLINK3_MK
 
-.endif	# APACHE_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-apache
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
index f8f78a397b8..91eb634448d 100644
--- a/www/apache2/buildlink3.mk
+++ b/www/apache2/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.27 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:25:35 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	apache
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	apache
-.endif
+.if !defined(APACHE_BUILDLINK3_MK)
+APACHE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napache}
-BUILDLINK_PACKAGES+=	apache
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apache
-
-.if !empty(APACHE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.51<2.2
 BUILDLINK_ABI_DEPENDS.apache+=	apache>=2.0.63nb4
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
@@ -26,8 +19,8 @@ APXS?=		${BUILDLINK_PREFIX.apache}/sbin/apxs
 .  if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=	--with-apxs2=${APXS:Q}
 .  endif
-.endif	# APACHE_BUILDLINK3_MK
 
 .include "../../devel/apr0/buildlink3.mk"
+.endif # APACHE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-apache
diff --git a/www/apache22/buildlink3.mk b/www/apache22/buildlink3.mk
index 162c4cbacf1..89383370fd0 100644
--- a/www/apache22/buildlink3.mk
+++ b/www/apache22/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.6 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:35 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	apache
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	apache
-.endif
+.if !defined(APACHE_BUILDLINK3_MK)
+APACHE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napache}
-BUILDLINK_PACKAGES+=	apache
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apache
-
-.if !empty(APACHE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.apache+=	apache>=2.2.3
 BUILDLINK_ABI_DEPENDS.apache?=	apache>=2.2.9nb3
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache22
@@ -26,9 +19,9 @@ APXS?=		${BUILDLINK_PREFIX.apache}/sbin/apxs
 .  if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=	--with-apxs2=${APXS:Q}
 .  endif
-.endif	# APACHE_BUILDLINK3_MK
 
 .include "../../devel/apr/buildlink3.mk"
 .include "../../devel/apr-util/buildlink3.mk"
+.endif # APACHE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-apache
diff --git a/www/cgic/buildlink3.mk b/www/cgic/buildlink3.mk
index 5132df5a982..864a87c4eb7 100644
--- a/www/cgic/buildlink3.mk
+++ b/www/cgic/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:36 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CGIC_BUILDLINK3_MK:=	${CGIC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cgic
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cgic
-.endif
+.if !defined(CGIC_BUILDLINK3_MK)
+CGIC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncgic}
-BUILDLINK_PACKAGES+=	cgic
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cgic
-
-.if !empty(CGIC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cgic+=	cgic>=2.02nb1
 BUILDLINK_PKGSRCDIR.cgic?=	../../www/cgic
-.endif	# CGIC_BUILDLINK3_MK
+.endif # CGIC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cgic
diff --git a/www/cgilib/buildlink3.mk b/www/cgilib/buildlink3.mk
index a387a8b8836..44796173190 100644
--- a/www/cgilib/buildlink3.mk
+++ b/www/cgilib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:36 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CGILIB_BUILDLINK3_MK:=	${CGILIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cgilib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cgilib
-.endif
+.if !defined(CGILIB_BUILDLINK3_MK)
+CGILIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncgilib}
-BUILDLINK_PACKAGES+=	cgilib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cgilib
-
-.if !empty(CGILIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cgilib+=	cgilib>=0.5nb1
 BUILDLINK_ABI_DEPENDS.cgilib+=	cgilib>=0.5nb2
 BUILDLINK_PKGSRCDIR.cgilib?=	../../www/cgilib
-.endif	# CGILIB_BUILDLINK3_MK
+.endif # CGILIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cgilib
diff --git a/www/clearsilver/buildlink3.mk b/www/clearsilver/buildlink3.mk
index f7042e8fce0..e279cf24d23 100644
--- a/www/clearsilver/buildlink3.mk
+++ b/www/clearsilver/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/19 17:05:51 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:36 joerg Exp $
 
 BUILDLINK_DEPMETHOD.clearsilver?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CLEARSILVER_BUILDLINK3_MK:=	${CLEARSILVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	clearsilver-base
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	clearsilver-base
-.endif
+.if !defined(CLEARSILVER_BUILDLINK3_MK)
+CLEARSILVER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclearsilver-base}
-BUILDLINK_PACKAGES+=	clearsilver-base
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clearsilver-base
-
-.if !empty(CLEARSILVER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.clearsilver+=		clearsilver-base>=0.9.0
 BUILDLINK_ABI_DEPENDS.clearsilver+=	clearsilver>=0.10.1
 BUILDLINK_PKGSRCDIR.clearsilver?=	../../www/clearsilver-base
-.endif	# CLEARSILVER_BUILDLINK3_MK
+.endif # CLEARSILVER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-clearsilver-base
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index 269f5071aee..06e6ea70840 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.20 2008/03/10 18:35:54 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:25:36 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CURL_BUILDLINK3_MK:=	${CURL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	curl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	curl
-.endif
+.if !defined(CURL_BUILDLINK3_MK)
+CURL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncurl}
-BUILDLINK_PACKAGES+=	curl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}curl
-
-.if !empty(CURL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.curl+=	curl>=7.12.3
 BUILDLINK_ABI_DEPENDS.curl+=	curl>=7.17.1nb1
 BUILDLINK_PKGSRCDIR.curl?=	../../www/curl
@@ -24,10 +17,10 @@ pkgbase:= curl
 .  if !empty(PKG_BUILD_OPTIONS.curl:Mgssapi)
 .    include "../../mk/krb5.buildlink3.mk"
 .  endif
-.endif	# CURL_BUILDLINK3_MK
 
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.endif # CURL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-curl
diff --git a/www/emacs-w3m/buildlink3.mk b/www/emacs-w3m/buildlink3.mk
index 539ed72cb8f..c047da877f2 100644
--- a/www/emacs-w3m/buildlink3.mk
+++ b/www/emacs-w3m/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:18 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:36 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EMACS_W3M_BUILDLINK3_MK:=	${EMACS_W3M_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	emacs-w3m
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	emacs-w3m
-.endif
+.if !defined(EMACS_W3M_BUILDLINK3_MK)
+EMACS_W3M_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nemacs-w3m}
-BUILDLINK_PACKAGES+=	emacs-w3m
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-w3m
-
-.if ${EMACS_W3M_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.emacs-w3m+=	${EMACS_PKGNAME_PREFIX}emacs-w3m>=1.4
 BUILDLINK_PKGSRCDIR.emacs-w3m?=	../../www/emacs-w3m
-.endif	# EMACS_W3M_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs-w3m=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # EMACS_W3M_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-emacs-w3m
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index c6a6fc570b4..7bdc53db7b1 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,20 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.27 2008/04/15 18:16:16 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:25:36 joerg Exp $
 #
 # This Makefile fragment is included by packages that use epiphany.
 #
 # This file was created automatically using createbuildlink-3.1.
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EPIPHANY_BUILDLINK3_MK:=	${EPIPHANY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	epiphany
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	epiphany
-.endif
+.if !defined(EPIPHANY_BUILDLINK3_MK)
+EPIPHANY_BUILDLINK3_MK:=
 
-.if !empty(EPIPHANY_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			epiphany
-BUILDLINK_ORDER:=			${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}epiphany
 BUILDLINK_API_DEPENDS.epiphany+=		epiphany>=1.8.2
 BUILDLINK_ABI_DEPENDS.epiphany?=		epiphany>=2.20.3nb2
 BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
@@ -32,4 +27,4 @@ BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 #      this is already pulled in directly by the only user, epiphany-extensions
 .endif # EPIPHANY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-epiphany
diff --git a/www/fcgi/buildlink3.mk b/www/fcgi/buildlink3.mk
index 80828c1fb6c..23177a51042 100644
--- a/www/fcgi/buildlink3.mk
+++ b/www/fcgi/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:36 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FCGI_BUILDLINK3_MK:=	${FCGI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fcgi
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	fcgi
-.endif
+.if !defined(FCGI_BUILDLINK3_MK)
+FCGI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfcgi}
-BUILDLINK_PACKAGES+=	fcgi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fcgi
-
-.if !empty(FCGI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fcgi+=	fcgi>=2.2.2nb1
 BUILDLINK_ABI_DEPENDS.fcgi+=	fcgi>=2.4.0nb1
 BUILDLINK_PKGSRCDIR.fcgi?=	../../www/fcgi
-.endif	# FCGI_BUILDLINK3_MK
+.endif # FCGI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fcgi
diff --git a/www/firefox-gtk1/buildlink3.mk b/www/firefox-gtk1/buildlink3.mk
index ddea80e2821..431c7ba7142 100644
--- a/www/firefox-gtk1/buildlink3.mk
+++ b/www/firefox-gtk1/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/05/19 10:43:02 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:36 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FIREFOX_GTK1_BUILDLINK3_MK:=	${FIREFOX_GTK1_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	firefox-gtk1
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	firefox-gtk1
-.endif
+.if !defined(FIREFOX_GTK1_BUILDLINK3_MK)
+FIREFOX_GTK1_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfirefox-gtk1}
-BUILDLINK_PACKAGES+=	firefox-gtk1
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox-gtk1
-
-.if !empty(FIREFOX_GTK1_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.firefox-gtk1+=	firefox-gtk1>=2.0
 BUILDLINK_ABI_DEPENDS.firefox-gtk1+=	firefox-gtk1>=2.0.0.3nb1
 BUILDLINK_PKGSRCDIR.firefox-gtk1?=	../../www/firefox-gtk1
-.endif	# FIREFOX_GTK1_BUILDLINK3_MK
+.endif # FIREFOX_GTK1_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-firefox-gtk1
diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk
index d3c293b0110..14d602597cf 100644
--- a/www/firefox/buildlink3.mk
+++ b/www/firefox/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.17 2008/05/31 23:08:33 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:36 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FIREFOX_BUILDLINK3_MK:=	${FIREFOX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	firefox
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=		firefox
-.endif
+.if !defined(FIREFOX_BUILDLINK3_MK)
+FIREFOX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfirefox}
-BUILDLINK_PACKAGES+=	firefox
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox
-
-.if !empty(FIREFOX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.firefox+=	firefox>=2.0
 BUILDLINK_API_DEPENDS.firefox+=	firefox<=2.99
 BUILDLINK_ABI_DEPENDS.firefox+=	firefox>=2.0.0.3nb1
 BUILDLINK_PKGSRCDIR.firefox?=	../../www/firefox
-.endif	# FIREFOX_BUILDLINK3_MK
+.endif # FIREFOX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-firefox
diff --git a/www/firefox3/buildlink3.mk b/www/firefox3/buildlink3.mk
index c784d13c03d..34982d7fce6 100644
--- a/www/firefox3/buildlink3.mk
+++ b/www/firefox3/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/06/28 10:01:06 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:36 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FIREFOX3_BUILDLINK3_MK:=	${FIREFOX3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	firefox3
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=		firefox3
-.endif
+.if !defined(FIREFOX3_BUILDLINK3_MK)
+FIREFOX3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfirefox3}
-BUILDLINK_PACKAGES+=	firefox3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox3
-
-.if !empty(FIREFOX3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.firefox3+=	firefox3>=3.0
 BUILDLINK_PKGSRCDIR.firefox3?=		../../www/firefox3
 # XXX wip
@@ -22,6 +15,6 @@ GECKO_EXTRA_INC_DIRS= \
   xpconnect
 
 GECKO_EXTRA_INCLUDE=	${GECKO_EXTRA_INC_DIRS:C,^,-I${BUILDLINK_PREFIX.firefox3}/include/firefox3/,}
-.endif	# FIREFOX3_BUILDLINK3_MK
+.endif # FIREFOX3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-firefox3
diff --git a/www/gtkhtml314/buildlink3.mk b/www/gtkhtml314/buildlink3.mk
index 54fb03b9453..45fd5298eee 100644
--- a/www/gtkhtml314/buildlink3.mk
+++ b/www/gtkhtml314/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/10/24 20:35:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:37 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTKHTML314_BUILDLINK3_MK:=	${GTKHTML314_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gtkhtml314
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtkhtml314
-.endif
+.if !defined(GTKHTML314_BUILDLINK3_MK)
+GTKHTML314_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkhtml314}
-BUILDLINK_PACKAGES+=	gtkhtml314
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkhtml314
-
-.if !empty(GTKHTML314_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkhtml314+=	gtkhtml314>=3.24.0
 BUILDLINK_PKGSRCDIR.gtkhtml314?=	../../www/gtkhtml314
-.endif	# GTKHTML314_BUILDLINK3_MK
 
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
+.endif # GTKHTML314_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gtkhtml314
diff --git a/www/libghttp/buildlink3.mk b/www/libghttp/buildlink3.mk
index db1f8fa54da..6edf0d9009c 100644
--- a/www/libghttp/buildlink3.mk
+++ b/www/libghttp/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:37 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGHTTP_BUILDLINK3_MK:=	${LIBGHTTP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libghttp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libghttp
-.endif
+.if !defined(LIBGHTTP_BUILDLINK3_MK)
+LIBGHTTP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibghttp}
-BUILDLINK_PACKAGES+=	libghttp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libghttp
-
-.if !empty(LIBGHTTP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libghttp+=	libghttp>=1.0.9
 BUILDLINK_ABI_DEPENDS.libghttp+=	libghttp>=1.0.9nb1
 BUILDLINK_PKGSRCDIR.libghttp?=	../../www/libghttp
-.endif	# LIBGHTTP_BUILDLINK3_MK
+.endif # LIBGHTTP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libghttp
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
index ba15dc2bcb6..c724cb7aebd 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.21 2008/10/16 14:02:29 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:37 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGTKHTML_BUILDLINK3_MK:=	${LIBGTKHTML_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgtkhtml
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgtkhtml
-.endif
+.if !defined(LIBGTKHTML_BUILDLINK3_MK)
+LIBGTKHTML_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtkhtml}
-BUILDLINK_PACKAGES+=	libgtkhtml
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgtkhtml
-
-.if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgtkhtml+=		libgtkhtml>=2.6.0
 BUILDLINK_ABI_DEPENDS.libgtkhtml+=	libgtkhtml>=2.6.3nb10
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
-.endif	# LIBGTKHTML_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBGTKHTML_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgtkhtml
diff --git a/www/libproxy/buildlink3.mk b/www/libproxy/buildlink3.mk
index d18f1551d87..744cd6c120e 100644
--- a/www/libproxy/buildlink3.mk
+++ b/www/libproxy/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/04 02:11:07 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:37 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBPROXY_BUILDLINK3_MK:=	${LIBPROXY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libproxy
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libproxy
-.endif
+.if !defined(LIBPROXY_BUILDLINK3_MK)
+LIBPROXY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibproxy}
-BUILDLINK_PACKAGES+=	libproxy
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libproxy
-
-.if ${LIBPROXY_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libproxy+=	libproxy>=0.2.3
 BUILDLINK_PKGSRCDIR.libproxy?=	../../www/libproxy
-.endif	# LIBPROXY_BUILDLINK3_MK
+.endif # LIBPROXY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libproxy
diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk
index 430e8215f77..b69f2a49956 100644
--- a/www/libwww/buildlink3.mk
+++ b/www/libwww/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:09:51 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:37 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBWWW_BUILDLINK3_MK:=	${LIBWWW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libwww
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libwww
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwww}
-BUILDLINK_PACKAGES+=	libwww
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwww
+.if !defined(LIBWWW_BUILDLINK3_MK)
+LIBWWW_BUILDLINK3_MK:=
 
-.if !empty(LIBWWW_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libwww+=	libwww>=5.3.2nb2
 BUILDLINK_ABI_DEPENDS.libwww+=	libwww>=5.4.0nb6
 BUILDLINK_PKGSRCDIR.libwww?=	../../www/libwww
-.endif	# LIBWWW_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -32,5 +24,6 @@ pkgbase := libwww
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.endif # LIBWWW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libwww
diff --git a/www/mono-xsp/buildlink3.mk b/www/mono-xsp/buildlink3.mk
index 523f2c898d4..93ce4e47358 100644
--- a/www/mono-xsp/buildlink3.mk
+++ b/www/mono-xsp/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/07 13:25:12 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:37 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MONO_XSP_BUILDLINK3_MK:=	${MONO_XSP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mono-xsp
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	mono-xsp
-.endif
+.if !defined(MONO_XSP_BUILDLINK3_MK)
+MONO_XSP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmono-xsp}
-BUILDLINK_PACKAGES+=	mono-xsp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono-xsp
-
-.if ${MONO_XSP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mono-xsp+=	mono-xsp>=2.0
 BUILDLINK_PKGSRCDIR.mono-xsp?=	../../www/mono-xsp
-.endif	# MONO_XSP_BUILDLINK3_MK
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
+.endif # MONO_XSP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mono-xsp
diff --git a/www/neon/buildlink3.mk b/www/neon/buildlink3.mk
index 8cb5ff41b2b..08377f4ce2d 100644
--- a/www/neon/buildlink3.mk
+++ b/www/neon/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:09:52 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:37 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-NEON_BUILDLINK3_MK:=	${NEON_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	neon
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	neon
-.endif
+.if !defined(NEON_BUILDLINK3_MK)
+NEON_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nneon}
-BUILDLINK_PACKAGES+=	neon
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}neon
-
-.if !empty(NEON_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.neon+=	neon>=0.24.4
 BUILDLINK_ABI_DEPENDS.neon+=	neon>=0.26.3nb2
 BUILDLINK_PKGSRCDIR.neon?=	../../www/neon
-.endif	# NEON_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.endif # NEON_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-neon
diff --git a/www/php4/buildlink3.mk b/www/php4/buildlink3.mk
index 94576cb42c1..4904be4b583 100644
--- a/www/php4/buildlink3.mk
+++ b/www/php4/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:37 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PHP_BUILDLINK3_MK:=	${PHP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	php
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	php
-.endif
+.if !defined(PHP_BUILDLINK3_MK)
+PHP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nphp}
-BUILDLINK_PACKAGES+=	php
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}php
-
-.if !empty(PHP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.php+=		php-4.4.*
 BUILDLINK_ABI_DEPENDS.php+=	php>=4.4.1nb3
 BUILDLINK_PKGSRCDIR.php?=	../../www/php4
-.endif	# PHP_BUILDLINK3_MK
+.endif # PHP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-php
diff --git a/www/py-gdata/buildlink3.mk b/www/py-gdata/buildlink3.mk
index f6cb7489d29..212f2c70749 100644
--- a/www/py-gdata/buildlink3.mk
+++ b/www/py-gdata/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:37 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_GDATA_BUILDLINK3_MK:=	${PY_GDATA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-gdata
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-gdata
-.endif
+.if !defined(PY_GDATA_BUILDLINK3_MK)
+PY_GDATA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-gdata}
-BUILDLINK_PACKAGES+=	py-gdata
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gdata
-
-.if ${PY_GDATA_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-gdata+=	${PYPKGPREFIX}-gdata>=1.2.1
 BUILDLINK_PKGSRCDIR.py-gdata?=	../../www/py-gdata
-.endif	# PY_GDATA_BUILDLINK3_MK
+.endif # PY_GDATA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-gdata
diff --git a/www/seamonkey-gtk1/buildlink3.mk b/www/seamonkey-gtk1/buildlink3.mk
index 2021aec1e34..43f27a28fe6 100644
--- a/www/seamonkey-gtk1/buildlink3.mk
+++ b/www/seamonkey-gtk1/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/18 00:08:40 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:38 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-SEAMONKEY_GTK1_BUILDLINK3_MK:=		${SEAMONKEY_GTK1_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	seamonkey-gtk1
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	seamonkey-gtk1
-.endif
+.if !defined(SEAMONKEY_GTK1_BUILDLINK3_MK)
+SEAMONKEY_GTK1_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nseamonkey-gtk1}
-BUILDLINK_PACKAGES+=	seamonkey-gtk1
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey-gtk1
-
-.if !empty(SEAMONKEY_GTK1_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.seamonkey-gtk1+=	seamonkey-gtk1>=1.0
 BUILDLINK_ABI_DEPENDS.seamonkey-gtk1?=	seamonkey-gtk1>=1.0.1nb1
 BUILDLINK_PKGSRCDIR.seamonkey-gtk1?=	../../www/seamonkey-gtk1
-.endif	# SEAMONKEY_GTK1_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.seamonkey-gtk1?=	../../www/seamonkey-gtk1
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/ORBit/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.endif # SEAMONKEY_GTK1_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-seamonkey-gtk1
diff --git a/www/seamonkey/buildlink3.mk b/www/seamonkey/buildlink3.mk
index 747c507216c..2ddd07aab25 100644
--- a/www/seamonkey/buildlink3.mk
+++ b/www/seamonkey/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/05/19 10:43:02 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:37 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SEAMONKEY_BUILDLINK3_MK:=	${SEAMONKEY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	seamonkey
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	seamonkey
-.endif
+.if !defined(SEAMONKEY_BUILDLINK3_MK)
+SEAMONKEY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nseamonkey}
-BUILDLINK_PACKAGES+=	seamonkey
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey
-
-.if !empty(SEAMONKEY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.seamonkey+=	seamonkey>=1.0
 BUILDLINK_ABI_DEPENDS.seamonkey?=	seamonkey>=1.0.1nb1
 BUILDLINK_PKGSRCDIR.seamonkey?=		../../www/seamonkey
-.endif	# SEAMONKEY_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # SEAMONKEY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-seamonkey
diff --git a/www/serf/buildlink3.mk b/www/serf/buildlink3.mk
index eb8c02c98fb..9148942a84c 100644
--- a/www/serf/buildlink3.mk
+++ b/www/serf/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SERF_BUILDLINK3_MK:=	${SERF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	serf
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	serf
-.endif
+.if !defined(SERF_BUILDLINK3_MK)
+SERF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nserf}
-BUILDLINK_PACKAGES+=	serf
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}serf
-
-.if ${SERF_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.serf+=	serf>=0.1.0
 BUILDLINK_ABI_DEPENDS.serf?=	serf>=0.1.2nb3
 BUILDLINK_PKGSRCDIR.serf?=	../../www/serf
-.endif	# SERF_BUILDLINK3_MK
 
 .include "../../devel/apr/buildlink3.mk"
 .include "../../devel/apr-util/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.endif # SERF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-serf
diff --git a/www/sope/buildlink3.mk b/www/sope/buildlink3.mk
index e06c52e0ed7..88ca99a3784 100644
--- a/www/sope/buildlink3.mk
+++ b/www/sope/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SOPE_BUILDLINK3_MK:=	${SOPE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sope
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sope
-.endif
+.if !defined(SOPE_BUILDLINK3_MK)
+SOPE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsope}
-BUILDLINK_PACKAGES+=	sope
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sope
-
-.if !empty(SOPE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sope+=	sope>=4.5.4nb2
 BUILDLINK_ABI_DEPENDS.sope?=	sope>=4.5.4nb3
 BUILDLINK_PKGSRCDIR.sope?=	../../www/sope
-.endif	# SOPE_BUILDLINK3_MK
+.endif # SOPE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sope
diff --git a/www/swish-e/buildlink3.mk b/www/swish-e/buildlink3.mk
index 8894ec28984..a731813633d 100644
--- a/www/swish-e/buildlink3.mk
+++ b/www/swish-e/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/08/29 14:17:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SWISH_E_BUILDLINK3_MK:=	${SWISH_E_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	swish-e
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	swish-e
-.endif
+.if !defined(SWISH_E_BUILDLINK3_MK)
+SWISH_E_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswish-e}
-BUILDLINK_PACKAGES+=	swish-e
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}swish-e
-
-.if ${SWISH_E_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.swish-e+=	swish-e>=2.4.5nb1
 BUILDLINK_PKGSRCDIR.swish-e?=	../../www/swish-e
-.endif	# SWISH_E_BUILDLINK3_MK
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.endif # SWISH_E_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-swish-e
diff --git a/www/tidy/buildlink3.mk b/www/tidy/buildlink3.mk
index 2da1799d4aa..6f42308976d 100644
--- a/www/tidy/buildlink3.mk
+++ b/www/tidy/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/04/09 09:01:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TIDY_BUILDLINK3_MK:=	${TIDY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tidy
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tidy
-.endif
+.if !defined(TIDY_BUILDLINK3_MK)
+TIDY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntidy}
-BUILDLINK_PACKAGES+=	tidy
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tidy
-
-.if !empty(TIDY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tidy+=	tidy>=20080324
 BUILDLINK_PKGSRCDIR.tidy?=	../../www/tidy
-.endif	# TIDY_BUILDLINK3_MK
+.endif # TIDY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tidy
diff --git a/www/w3/buildlink3.mk b/www/w3/buildlink3.mk
index 0cba45f9682..1bedbd715b7 100644
--- a/www/w3/buildlink3.mk
+++ b/www/w3/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/12/16 13:45:59 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:38 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-W3_BUILDLINK3_MK:=	${W3_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	w3
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	w3
-.endif
+.if !defined(W3_BUILDLINK3_MK)
+W3_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nw3}
-BUILDLINK_PACKAGES+=	w3
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}w3
-
-.if ${W3_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.w3+=	${EMACS_PKGNAME_PREFIX}w3>=3.99	# 4.0betaX
 BUILDLINK_PKGSRCDIR.w3?=	../../www/w3
-.endif	# W3_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.w3=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # W3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-w3
diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk
index de229f9485d..de631d977f3 100644
--- a/www/webkit-gtk/buildlink3.mk
+++ b/www/webkit-gtk/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/18 03:13:12 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:38 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WEBKIT_GTK_BUILDLINK3_MK:=	${WEBKIT_GTK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	webkit-gtk
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	webkit-gtk
-.endif
+.if !defined(WEBKIT_GTK_BUILDLINK3_MK)
+WEBKIT_GTK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwebkit-gtk}
-BUILDLINK_PACKAGES+=	webkit-gtk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}webkit-gtk
-
-.if ${WEBKIT_GTK_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.webkit-gtk+=	webkit-gtk>=1.1.3
 BUILDLINK_PKGSRCDIR.webkit-gtk?=	../../www/webkit-gtk
-.endif	# WEBKIT_GTK_BUILDLINK3_MK
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
@@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.webkit-gtk?=	../../www/webkit-gtk
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.endif # WEBKIT_GTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-webkit-gtk