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.

68 files changed, 408 insertions, 884 deletions

diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index 5aaf4b1a87e..0eae66d6ff0 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.24 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:25:16 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LINUX_PAM_BUILDLINK3_MK:=	${LINUX_PAM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	linux-pam
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	linux-pam
-.endif
+.if !defined(LINUX_PAM_BUILDLINK3_MK)
+LINUX_PAM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlinux-pam}
-BUILDLINK_PACKAGES+=	linux-pam
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}linux-pam
-
-.if !empty(LINUX_PAM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.linux-pam+=		PAM>=0.75
 BUILDLINK_ABI_DEPENDS.linux-pam+=	PAM>=0.77nb5
 BUILDLINK_PKGSRCDIR.linux-pam?=		../../security/PAM
-.endif	# LINUX_PAM_BUILDLINK3_MK
 
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # LINUX_PAM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-linux-pam
diff --git a/security/beecrypt/buildlink3.mk b/security/beecrypt/buildlink3.mk
index fc5618fc335..5a3dae4b0a4 100644
--- a/security/beecrypt/buildlink3.mk
+++ b/security/beecrypt/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:16 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BEECRYPT_BUILDLINK3_MK:=	${BEECRYPT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	beecrypt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	beecrypt
-.endif
+.if !defined(BEECRYPT_BUILDLINK3_MK)
+BEECRYPT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbeecrypt}
-BUILDLINK_PACKAGES+=	beecrypt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}beecrypt
-
-.if !empty(BEECRYPT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.beecrypt+=	beecrypt>=3.0.0
 BUILDLINK_ABI_DEPENDS.beecrypt+=	beecrypt>=3.0.0nb1
 BUILDLINK_PKGSRCDIR.beecrypt?=	../../security/beecrypt
-.endif	# BEECRYPT_BUILDLINK3_MK
+.endif # BEECRYPT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-beecrypt
diff --git a/security/botan/buildlink3.mk b/security/botan/buildlink3.mk
index 792599a4133..c3263fd7301 100644
--- a/security/botan/buildlink3.mk
+++ b/security/botan/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:16 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-BOTAN_BUILDLINK3_MK:=	${BOTAN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	botan
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	botan
-.endif
+.if !defined(BOTAN_BUILDLINK3_MK)
+BOTAN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbotan}
-BUILDLINK_PACKAGES+=	botan
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}botan
-
-.if !empty(BOTAN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.botan+=	botan>=1.4.11
 BUILDLINK_PKGSRCDIR.botan?=	../../security/botan
-.endif	# BOTAN_BUILDLINK3_MK
+.endif # BOTAN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-botan
diff --git a/security/ccid/buildlink3.mk b/security/ccid/buildlink3.mk
index 4f842494b59..3f4f7c76f99 100644
--- a/security/ccid/buildlink3.mk
+++ b/security/ccid/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/03/04 15:52:15 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:16 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CCID_BUILDLINK3_MK:=	${CCID_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ccid
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ccid
-.endif
+.if !defined(CCID_BUILDLINK3_MK)
+CCID_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nccid}
-BUILDLINK_PACKAGES+=	ccid
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ccid
-
-.if ${CCID_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ccid+=	ccid>=1.3.2
 BUILDLINK_PKGSRCDIR.ccid?=	../../security/ccid
-.endif	# CCID_BUILDLINK3_MK
 
 .include "../../security/pcsc-lite/buildlink3.mk"
+.endif # CCID_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ccid
diff --git a/security/courier-authlib/buildlink3.mk b/security/courier-authlib/buildlink3.mk
index af966e15b58..40c0e9e9272 100644
--- a/security/courier-authlib/buildlink3.mk
+++ b/security/courier-authlib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:16 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-COURIER_AUTHLIB_BUILDLINK3_MK:=	${COURIER_AUTHLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	courier-authlib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	courier-authlib
-.endif
+.if !defined(COURIER_AUTHLIB_BUILDLINK3_MK)
+COURIER_AUTHLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncourier-authlib}
-BUILDLINK_PACKAGES+=	courier-authlib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}courier-authlib
-
-.if !empty(COURIER_AUTHLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.courier-authlib+=	courier-authlib>=0.53
 BUILDLINK_ABI_DEPENDS.courier-authlib?=	courier-authlib>=0.58nb2
 BUILDLINK_PKGSRCDIR.courier-authlib?=	../../security/courier-authlib
-.endif	# COURIER_AUTHLIB_BUILDLINK3_MK
+.endif # COURIER_AUTHLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-courier-authlib
diff --git a/security/crypto++/buildlink3.mk b/security/crypto++/buildlink3.mk
index 4dc5333250c..046c3684afb 100644
--- a/security/crypto++/buildlink3.mk
+++ b/security/crypto++/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/12/01 04:17:50 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:17 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CRYPTOPP_BUILDLINK3_MK:=	${CRYPTOPP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cryptopp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cryptopp
-.endif
+.if !defined(CRYPTOPP_BUILDLINK3_MK)
+CRYPTOPP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncryptopp}
-BUILDLINK_PACKAGES+=	cryptopp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cryptopp
-
-.if !empty(CRYPTOPP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cryptopp+=	cryptopp>=5.1
 BUILDLINK_DEPMETHOD.cryptopp?=	build
 BUILDLINK_ABI_DEPENDS.cryptopp?=	cryptopp>=5.2.1nb1
 BUILDLINK_PKGSRCDIR.cryptopp?=	../../security/crypto++
-.endif	# CRYPTOPP_BUILDLINK3_MK
+.endif # CRYPTOPP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cryptopp
diff --git a/security/cvm/buildlink3.mk b/security/cvm/buildlink3.mk
index 7b65f1734b3..dd12e99acb2 100644
--- a/security/cvm/buildlink3.mk
+++ b/security/cvm/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/04/13 06:51:19 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:17 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CVM_BUILDLINK3_MK:=	${CVM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cvm
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cvm
-.endif
+.if !defined(CVM_BUILDLINK3_MK)
+CVM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncvm}
-BUILDLINK_PACKAGES+=	cvm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cvm
-
-.if !empty(CVM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cvm+=		cvm>=0.90
 BUILDLINK_PKGSRCDIR.cvm?=	../../security/cvm
 BUILDLINK_DEPMETHOD.cvm?=	build
-.endif	# CVM_BUILDLINK3_MK
+.endif # CVM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cvm
diff --git a/security/cyrus-sasl/buildlink3.mk b/security/cyrus-sasl/buildlink3.mk
index a89968ced7d..44eaa9aabdb 100644
--- a/security/cyrus-sasl/buildlink3.mk
+++ b/security/cyrus-sasl/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:17 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CYRUS_SASL_BUILDLINK3_MK:=	${CYRUS_SASL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cyrus-sasl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cyrus-sasl
-.endif
+.if !defined(CYRUS_SASL_BUILDLINK3_MK)
+CYRUS_SASL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncyrus-sasl}
-BUILDLINK_PACKAGES+=	cyrus-sasl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cyrus-sasl
-
-.if !empty(CYRUS_SASL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cyrus-sasl+=	cyrus-sasl>=2.1.12
 BUILDLINK_ABI_DEPENDS.cyrus-sasl?=	cyrus-sasl>=2.1.20nb3
 BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl
-.endif	# CYRUS_SASL_BUILDLINK3_MK
 
 # Cyrus SASL mechanisms are shared modules loaded via dlopen().
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # CYRUS_SASL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cyrus-sasl
diff --git a/security/dirmngr/buildlink3.mk b/security/dirmngr/buildlink3.mk
index c0359935108..c00ef3a7f05 100644
--- a/security/dirmngr/buildlink3.mk
+++ b/security/dirmngr/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:17 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DIRMNGR_BUILDLINK3_MK:=	${DIRMNGR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	dirmngr
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	dirmngr
-.endif
+.if !defined(DIRMNGR_BUILDLINK3_MK)
+DIRMNGR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndirmngr}
-BUILDLINK_PACKAGES+=	dirmngr
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dirmngr
-
-.if !empty(DIRMNGR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dirmngr+=	dirmngr>=0.9.3nb1
 BUILDLINK_ABI_DEPENDS.dirmngr?=	dirmngr>=0.9.3nb2
 BUILDLINK_PKGSRCDIR.dirmngr?=	../../security/dirmngr
-.endif	# DIRMNGR_BUILDLINK3_MK
+.endif # DIRMNGR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-dirmngr
diff --git a/security/gnome-keyring/buildlink3.mk b/security/gnome-keyring/buildlink3.mk
index cff5e479b5d..50c258f5aec 100644
--- a/security/gnome-keyring/buildlink3.mk
+++ b/security/gnome-keyring/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/03/21 12:04:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:17 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_KEYRING_BUILDLINK3_MK:=	${GNOME_KEYRING_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnome-keyring
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-keyring
-.endif
+.if !defined(GNOME_KEYRING_BUILDLINK3_MK)
+GNOME_KEYRING_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-keyring}
-BUILDLINK_PACKAGES+=	gnome-keyring
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-keyring
-
-.if !empty(GNOME_KEYRING_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-keyring+=	gnome-keyring>=0.4.0
 BUILDLINK_ABI_DEPENDS.gnome-keyring?=	gnome-keyring>=0.8
 BUILDLINK_PKGSRCDIR.gnome-keyring?=	../../security/gnome-keyring
@@ -20,7 +13,6 @@ BUILDLINK_PKGSRCDIR.gnome-keyring?=	../../security/gnome-keyring
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GNOME_KEYRING_BUILDLINK3_MK
 
-.endif	# GNOME_KEYRING_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnome-keyring
diff --git a/security/gnupg2/buildlink3.mk b/security/gnupg2/buildlink3.mk
index 9cbc129f98a..d221cc38c8e 100644
--- a/security/gnupg2/buildlink3.mk
+++ b/security/gnupg2/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/11/08 21:06:33 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:17 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GNUPG2_BUILDLINK3_MK:=	${GNUPG2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnupg2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gnupg2
-.endif
+.if !defined(GNUPG2_BUILDLINK3_MK)
+GNUPG2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnupg2}
-BUILDLINK_PACKAGES+=	gnupg2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnupg2
-
-.if ${GNUPG2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gnupg2+=	gnupg2>=2.0.0
 BUILDLINK_PKGSRCDIR.gnupg2?=	../../security/gnupg2
 BUILDLINK_PREFIX.gnupg2?=	${LOCALBASE}
@@ -26,12 +19,12 @@ pkgbase:=	libgcrypt
 PKGSRC_MAKE_ENV+=	PKG_OPTIONS.libgcrypt+=idea
 .   	endif
 .   endif
-.endif	# GNUPG2_BUILDLINK3_MK
 
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
 .include "../../security/pinentry/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.endif # GNUPG2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnupg2
diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index ecc9f9b509b..c166c25043e 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.21 2008/03/06 14:52:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:17 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GNUTLS_BUILDLINK3_MK:=	${GNUTLS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gnutls
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnutls
-.endif
+.if !defined(GNUTLS_BUILDLINK3_MK)
+GNUTLS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnutls}
-BUILDLINK_PACKAGES+=	gnutls
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnutls
-
-.if !empty(GNUTLS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=1.2.6
 BUILDLINK_ABI_DEPENDS.gnutls+=	gnutls>=2.2.2
 BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
-.endif	# GNUTLS_BUILDLINK3_MK
 
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"
 .include "../../security/opencdk/buildlink3.mk"
+.endif # GNUTLS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gnutls
diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk
index 8982fb9030e..2cb25aefc85 100644
--- a/security/gpgme/buildlink3.mk
+++ b/security/gpgme/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/19 23:01:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:17 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GPGME_BUILDLINK3_MK:=	${GPGME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gpgme
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gpgme
-.endif
+.if !defined(GPGME_BUILDLINK3_MK)
+GPGME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngpgme}
-BUILDLINK_PACKAGES+=	gpgme
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gpgme
-
-.if ${GPGME_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=0.9.0
 BUILDLINK_ABI_DEPENDS.gpgme+=	gpgme>=1.0.3nb1
 BUILDLINK_PKGSRCDIR.gpgme?=	../../security/gpgme
-.endif	# GPGME_BUILDLINK3_MK
 
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../devel/librfuncs/buildlink3.mk"
+.endif # GPGME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gpgme
diff --git a/security/gsasl/buildlink3.mk b/security/gsasl/buildlink3.mk
index b94fe95929b..7426770d73f 100644
--- a/security/gsasl/buildlink3.mk
+++ b/security/gsasl/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/12/09 14:06:13 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:17 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GSASL_BUILDLINK3_MK:=	${GSASL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gsasl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gsasl
-.endif
+.if !defined(GSASL_BUILDLINK3_MK)
+GSASL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngsasl}
-BUILDLINK_PACKAGES+=	gsasl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsasl
-
-.if !empty(GSASL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gsasl+=	gsasl>=0.2.15
 BUILDLINK_PKGSRCDIR.gsasl?=	../../security/gsasl
-.endif	# GSASL_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/libntlm/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"
+.endif # GSASL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gsasl
diff --git a/security/gss/buildlink3.mk b/security/gss/buildlink3.mk
index ca536d436d0..83e79628de0 100644
--- a/security/gss/buildlink3.mk
+++ b/security/gss/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:17 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GSS_BUILDLINK3_MK:=	${GSS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gss
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gss
-.endif
+.if !defined(GSS_BUILDLINK3_MK)
+GSS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngss}
-BUILDLINK_PACKAGES+=	gss
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gss
-
-.if !empty(GSS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gss+=		gss>=0.0.6nb1
 BUILDLINK_ABI_DEPENDS.gss+=	gss>=0.0.13nb1
 BUILDLINK_PKGSRCDIR.gss?=	../../security/gss
-.endif	# GSS_BUILDLINK3_MK
+.endif # GSS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gss
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index ecd3766230e..c7fa5f9c789 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,24 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.34 2008/02/28 08:14:41 jlam Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.35 2009/03/20 19:25:18 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	heimdal
-.endif
+BUILDLINK_TREE+=	heimdal
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nheimdal}
-BUILDLINK_PACKAGES+=	heimdal
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}heimdal
+.if !defined(HEIMDAL_BUILDLINK3_MK)
+HEIMDAL_BUILDLINK3_MK:=
 
-.if !empty(HEIMDAL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.heimdal+=	heimdal>=0.4e
 BUILDLINK_ABI_DEPENDS.heimdal+=	heimdal>=1.1
 BUILDLINK_PKGSRCDIR.heimdal?=	../../security/heimdal
 BUILDLINK_INCDIRS.heimdal?=	include/krb5
-.endif	# HEIMDAL_BUILDLINK3_MK
 
 pkgbase := heimdal
 .include "../../mk/pkg-build-options.mk"
@@ -28,5 +20,6 @@ pkgbase := heimdal
 .endif
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
+.endif # HEIMDAL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-heimdal
diff --git a/security/kth-krb4/buildlink3.mk b/security/kth-krb4/buildlink3.mk
index cf6668d7a30..f3e9833f61c 100644
--- a/security/kth-krb4/buildlink3.mk
+++ b/security/kth-krb4/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/09/07 08:46:20 wennmach Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-KTH_KRB4_BUILDLINK3_MK:=	${KTH_KRB4_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kth-krb4
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	kth-krb4
-.endif
+.if !defined(KTH_KRB4_BUILDLINK3_MK)
+KTH_KRB4_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkth-krb4}
-BUILDLINK_PACKAGES+=	kth-krb4
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kth-krb4
-
-.if !empty(KTH_KRB4_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kth-krb4+=	kth-krb4>=1.1.1
 BUILDLINK_ABI_DEPENDS.kth-krb4+=	kth-krb4>=1.2.1nb5
 BUILDLINK_ABI_DEPENDS.kth-krb4?=	kth-krb4>=1.2.1nb6
 BUILDLINK_PKGSRCDIR.kth-krb4?=		../../security/kth-krb4
-.endif	# KTH_KRB4_BUILDLINK3_MK
+.endif # KTH_KRB4_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kth-krb4
diff --git a/security/lasso/buildlink3.mk b/security/lasso/buildlink3.mk
index 06ca01fb320..dca511c1b8e 100644
--- a/security/lasso/buildlink3.mk
+++ b/security/lasso/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:18 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LASSO_BUILDLINK3_MK:=	${LASSO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	lasso
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	lasso
-.endif
+.if !defined(LASSO_BUILDLINK3_MK)
+LASSO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlasso}
-BUILDLINK_PACKAGES+=	lasso
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lasso
-
-.if ${LASSO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.lasso+=	lasso>=2.2.1
 BUILDLINK_PKGSRCDIR.lasso?=	../../security/lasso
-.endif	# LASSO_BUILDLINK3_MK
 
 .include "../../security/xmlsec1/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.endif # LASSO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-lasso
diff --git a/security/libassuan/buildlink3.mk b/security/libassuan/buildlink3.mk
index 7196caa7884..e709cc6007d 100644
--- a/security/libassuan/buildlink3.mk
+++ b/security/libassuan/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/11/17 12:34:47 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBASSUAN_BUILDLINK3_MK:=	${LIBASSUAN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libassuan
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libassuan
-.endif
+.if !defined(LIBASSUAN_BUILDLINK3_MK)
+LIBASSUAN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibassuan}
-BUILDLINK_PACKAGES+=	libassuan
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libassuan
-
-.if !empty(LIBASSUAN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libassuan+=	libassuan>=1.0.0
 BUILDLINK_ABI_DEPENDS.libassuan?=	libassuan>=1.0.0
 BUILDLINK_PKGSRCDIR.libassuan?=	../../security/libassuan
-.endif	# LIBASSUAN_BUILDLINK3_MK
 
 .include "../../security/libgpg-error/buildlink3.mk"
+.endif # LIBASSUAN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libassuan
diff --git a/security/libcrack/buildlink3.mk b/security/libcrack/buildlink3.mk
index 66b5c989349..f38d78f96cd 100644
--- a/security/libcrack/buildlink3.mk
+++ b/security/libcrack/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBCRACK_BUILDLINK3_MK:=	${LIBCRACK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libcrack
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libcrack
-.endif
+.if !defined(LIBCRACK_BUILDLINK3_MK)
+LIBCRACK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcrack}
-BUILDLINK_PACKAGES+=	libcrack
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcrack
-
-.if !empty(LIBCRACK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcrack+=	libcrack>=2.7
 BUILDLINK_ABI_DEPENDS.libcrack+=	libcrack>=2.7nb1
 BUILDLINK_PKGSRCDIR.libcrack?=	../../security/libcrack
-.endif	# LIBCRACK_BUILDLINK3_MK
+.endif # LIBCRACK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libcrack
diff --git a/security/libdes/buildlink3.mk b/security/libdes/buildlink3.mk
index 35a58d67f48..8c0c6045ee2 100644
--- a/security/libdes/buildlink3.mk
+++ b/security/libdes/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:18 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBDES_BUILDLINK3_MK:=	${LIBDES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libdes
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdes
-.endif
+.if !defined(LIBDES_BUILDLINK3_MK)
+LIBDES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdes}
-BUILDLINK_PACKAGES+=	libdes
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdes
-
-.if !empty(LIBDES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libdes+=	libdes>=4.04b
 BUILDLINK_PKGSRCDIR.libdes?=	../../security/libdes
 BUILDLINK_DEPMETHOD.libdes?=	build
-.endif	# LIBDES_BUILDLINK3_MK
+.endif # LIBDES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libdes
diff --git a/security/libfprint/buildlink3.mk b/security/libfprint/buildlink3.mk
index c3456f39fa2..a3ebaf34bfa 100644
--- a/security/libfprint/buildlink3.mk
+++ b/security/libfprint/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 21:51:06 plunky Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBFPRINT_BUILDLINK3_MK:=	${LIBFPRINT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libfprint
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libfprint
-.endif
+.if !defined(LIBFPRINT_BUILDLINK3_MK)
+LIBFPRINT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibfprint}
-BUILDLINK_PACKAGES+=	libfprint
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfprint
-
-.if !empty(LIBFPRINT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libfprint+=	libfprint>=0.0.6
 BUILDLINK_ABI_DEPENDS.libfprint+=	libfprint>=0.0.6
 BUILDLINK_PKGSRCDIR.libfprint?=		../../security/libfprint
-.endif	# LIBFPRINT_BUILDLINK3_MK
+.endif # LIBFPRINT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libfprint
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index c19aa2ba82a..2cb300fc3fe 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/10/14 01:42:51 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBFWBUILDER_BUILDLINK3_MK:=	${LIBFWBUILDER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libfwbuilder
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libfwbuilder
-.endif
+.if !defined(LIBFWBUILDER_BUILDLINK3_MK)
+LIBFWBUILDER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibfwbuilder}
-BUILDLINK_PACKAGES+=	libfwbuilder
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfwbuilder
-
-.if !empty(LIBFWBUILDER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.12
 BUILDLINK_ABI_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.12
 BUILDLINK_PKGSRCDIR.libfwbuilder?=	../../security/libfwbuilder
-.endif	# LIBFWBUILDER_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
+.endif # LIBFWBUILDER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libfwbuilder
diff --git a/security/libfwbuilder21/buildlink3.mk b/security/libfwbuilder21/buildlink3.mk
index a7037975e43..8c359123f49 100644
--- a/security/libfwbuilder21/buildlink3.mk
+++ b/security/libfwbuilder21/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/01/28 20:34:54 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBFWBUILDER21_BUILDLINK3_MK:=	${LIBFWBUILDER21_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libfwbuilder21
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libfwbuilder21
-.endif
+.if !defined(LIBFWBUILDER21_BUILDLINK3_MK)
+LIBFWBUILDER21_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibfwbuilder21}
-BUILDLINK_PACKAGES+=	libfwbuilder21
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfwbuilder21
-
-.if !empty(LIBFWBUILDER21_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libfwbuilder21+=	libfwbuilder21>=2.1.16
 BUILDLINK_ABI_DEPENDS.libfwbuilder21+=	libfwbuilder21>=2.1.16
 BUILDLINK_PKGSRCDIR.libfwbuilder21?=	../../security/libfwbuilder21
-.endif	# LIBFWBUILDER21_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
+.endif # LIBFWBUILDER21_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libfwbuilder21
diff --git a/security/libgcrypt/buildlink3.mk b/security/libgcrypt/buildlink3.mk
index b66305bc572..e294c9992bd 100644
--- a/security/libgcrypt/buildlink3.mk
+++ b/security/libgcrypt/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:18 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGCRYPT_BUILDLINK3_MK:=	${LIBGCRYPT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgcrypt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgcrypt
-.endif
+.if !defined(LIBGCRYPT_BUILDLINK3_MK)
+LIBGCRYPT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgcrypt}
-BUILDLINK_PACKAGES+=	libgcrypt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgcrypt
-
-.if !empty(LIBGCRYPT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.2.0
 BUILDLINK_ABI_DEPENDS.libgcrypt+=	libgcrypt>=1.2.2nb1
 BUILDLINK_PKGSRCDIR.libgcrypt?=	../../security/libgcrypt
-.endif	# LIBGCRYPT_BUILDLINK3_MK
 
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # LIBGCRYPT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgcrypt
diff --git a/security/libgpg-error/buildlink3.mk b/security/libgpg-error/buildlink3.mk
index 72c8c4a22c3..77493642ed9 100644
--- a/security/libgpg-error/buildlink3.mk
+++ b/security/libgpg-error/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:19 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGPG_ERROR_BUILDLINK3_MK:=	${LIBGPG_ERROR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libgpg-error
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgpg-error
-.endif
+.if !defined(LIBGPG_ERROR_BUILDLINK3_MK)
+LIBGPG_ERROR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgpg-error}
-BUILDLINK_PACKAGES+=	libgpg-error
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgpg-error
-
-.if !empty(LIBGPG_ERROR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=0.6
 BUILDLINK_ABI_DEPENDS.libgpg-error+=	libgpg-error>=1.0nb1
 BUILDLINK_PKGSRCDIR.libgpg-error?=	../../security/libgpg-error
-.endif	# LIBGPG_ERROR_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif # LIBGPG_ERROR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libgpg-error
diff --git a/security/libidea/buildlink3.mk b/security/libidea/buildlink3.mk
index 481fe6888bb..5446756dcb6 100644
--- a/security/libidea/buildlink3.mk
+++ b/security/libidea/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBIDEA_BUILDLINK3_MK:=	${LIBIDEA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libidea
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libidea
-.endif
+.if !defined(LIBIDEA_BUILDLINK3_MK)
+LIBIDEA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibidea}
-BUILDLINK_PACKAGES+=	libidea
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libidea
-
-.if !empty(LIBIDEA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libidea+=	libidea>=0.8.2
 BUILDLINK_PKGSRCDIR.libidea?=	../../security/libidea
 BUILDLINK_DEPMETHOD.libidea?=	build
-.endif	# LIBIDEA_BUILDLINK3_MK
+.endif # LIBIDEA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libidea
diff --git a/security/libident/buildlink3.mk b/security/libident/buildlink3.mk
index 4ecc91b66a8..799e782dad5 100644
--- a/security/libident/buildlink3.mk
+++ b/security/libident/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:19 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBIDENT_BUILDLINK3_MK:=	${LIBIDENT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libident
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libident
-.endif
+.if !defined(LIBIDENT_BUILDLINK3_MK)
+LIBIDENT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibident}
-BUILDLINK_PACKAGES+=	libident
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libident
-
-.if !empty(LIBIDENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libident+=	libident>=0.22
 BUILDLINK_ABI_DEPENDS.libident+=	libident>=0.22nb1
 BUILDLINK_PKGSRCDIR.libident?=	../../security/libident
-.endif	# LIBIDENT_BUILDLINK3_MK
+.endif # LIBIDENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libident
diff --git a/security/libksba/buildlink3.mk b/security/libksba/buildlink3.mk
index 93873c7c766..2f05f077fa5 100644
--- a/security/libksba/buildlink3.mk
+++ b/security/libksba/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBKSBA_BUILDLINK3_MK:=	${LIBKSBA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libksba
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libksba
-.endif
+.if !defined(LIBKSBA_BUILDLINK3_MK)
+LIBKSBA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibksba}
-BUILDLINK_PACKAGES+=	libksba
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libksba
-
-.if !empty(LIBKSBA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libksba+=	libksba>=0.9.7
 BUILDLINK_ABI_DEPENDS.libksba+=	libksba>=0.9.13nb1
 BUILDLINK_PKGSRCDIR.libksba?=	../../security/libksba
-.endif	# LIBKSBA_BUILDLINK3_MK
 
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libgpg-error/buildlink3.mk"
+.endif # LIBKSBA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libksba
diff --git a/security/libksba04/buildlink3.mk b/security/libksba04/buildlink3.mk
index d9350ed3286..278992e7aae 100644
--- a/security/libksba04/buildlink3.mk
+++ b/security/libksba04/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBKSBA_BUILDLINK3_MK:=	${LIBKSBA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libksba
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libksba
-.endif
+.if !defined(LIBKSBA_BUILDLINK3_MK)
+LIBKSBA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibksba}
-BUILDLINK_PACKAGES+=	libksba
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libksba
-
-.if !empty(LIBKSBA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libksba+=	libksba>=0.4.7nb1
 BUILDLINK_ABI_DEPENDS.libksba+=	libksba>=0.4.7nb2
 BUILDLINK_PKGSRCDIR.libksba?=	../../security/libksba04
-.endif	# LIBKSBA_BUILDLINK3_MK
+.endif # LIBKSBA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libksba
diff --git a/security/libmcrypt/buildlink3.mk b/security/libmcrypt/buildlink3.mk
index 61cac0b7e62..31bf57e252a 100644
--- a/security/libmcrypt/buildlink3.mk
+++ b/security/libmcrypt/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:19 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMCRYPT_BUILDLINK3_MK:=	${LIBMCRYPT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmcrypt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmcrypt
-.endif
+.if !defined(LIBMCRYPT_BUILDLINK3_MK)
+LIBMCRYPT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmcrypt}
-BUILDLINK_PACKAGES+=	libmcrypt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmcrypt
-
-.if !empty(LIBMCRYPT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmcrypt+=	libmcrypt>=2.5.6
 BUILDLINK_ABI_DEPENDS.libmcrypt+=	libmcrypt>=2.5.7nb1
 BUILDLINK_PKGSRCDIR.libmcrypt?=	../../security/libmcrypt
-.endif	# LIBMCRYPT_BUILDLINK3_MK
+.endif # LIBMCRYPT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmcrypt
diff --git a/security/libnasl/buildlink3.mk b/security/libnasl/buildlink3.mk
index b000b90530a..1939db7e5ff 100644
--- a/security/libnasl/buildlink3.mk
+++ b/security/libnasl/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/10/13 22:32:54 bad Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBNASL_BUILDLINK3_MK:=	${LIBNASL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libnasl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libnasl
-.endif
+.if !defined(LIBNASL_BUILDLINK3_MK)
+LIBNASL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnasl}
-BUILDLINK_PACKAGES+=	libnasl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnasl
-
-.if !empty(LIBNASL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libnasl+=	libnasl>=2.2.11
 BUILDLINK_ABI_DEPENDS.libnasl?=	libnasl>=2.2.11nb1
 BUILDLINK_PKGSRCDIR.libnasl?=	../../security/libnasl
-.endif	# LIBNASL_BUILDLINK3_MK
 
 .include "../../security/nessus-libraries/buildlink3.mk"
+.endif # LIBNASL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libnasl
diff --git a/security/libp11/buildlink3.mk b/security/libp11/buildlink3.mk
index c8be83f7139..a6704b6b353 100644
--- a/security/libp11/buildlink3.mk
+++ b/security/libp11/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/05 20:28:24 hasso Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:19 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBP11_BUILDLINK3_MK:=	${LIBP11_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libp11
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libp11
-.endif
+.if !defined(LIBP11_BUILDLINK3_MK)
+LIBP11_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibp11}
-BUILDLINK_PACKAGES+=	libp11
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libp11
-
-.if !empty(LIBP11_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libp11+=	libp11>=0.2.4
 BUILDLINK_PKGSRCDIR.libp11?=	../../security/libp11
-.endif	# LIBP11_BUILDLINK3_MK
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.endif # LIBP11_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libp11
diff --git a/security/libprelude/buildlink3.mk b/security/libprelude/buildlink3.mk
index 74b1e442524..7213b715a38 100644
--- a/security/libprelude/buildlink3.mk
+++ b/security/libprelude/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/03/06 14:53:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:19 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBPRELUDE_BUILDLINK3_MK:=	${LIBPRELUDE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libprelude
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libprelude
-.endif
+.if !defined(LIBPRELUDE_BUILDLINK3_MK)
+LIBPRELUDE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibprelude}
-BUILDLINK_PACKAGES+=	libprelude
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libprelude
-
-.if !empty(LIBPRELUDE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libprelude+=	libprelude>=0.9.0
 BUILDLINK_ABI_DEPENDS.libprelude+=	libprelude>=0.9.16nb1
 BUILDLINK_PKGSRCDIR.libprelude?=	../../security/libprelude
-.endif	# LIBPRELUDE_BUILDLINK3_MK
 
 .include "../../security/gnutls/buildlink3.mk"
+.endif # LIBPRELUDE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libprelude
diff --git a/security/libpreludedb/buildlink3.mk b/security/libpreludedb/buildlink3.mk
index 2b84e18ec2e..20134722b8b 100644
--- a/security/libpreludedb/buildlink3.mk
+++ b/security/libpreludedb/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/03/06 14:53:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:19 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBPRELUDEDB_BUILDLINK3_MK:=	${LIBPRELUDEDB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libpreludedb
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libpreludedb
-.endif
+.if !defined(LIBPRELUDEDB_BUILDLINK3_MK)
+LIBPRELUDEDB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpreludedb}
-BUILDLINK_PACKAGES+=	libpreludedb
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpreludedb
-
-.if !empty(LIBPRELUDEDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libpreludedb+=	libpreludedb>=0.9.3
 BUILDLINK_ABI_DEPENDS.libpreludedb?=	libpreludedb>=0.9.13nb2
 BUILDLINK_PKGSRCDIR.libpreludedb?=	../../security/libpreludedb
-.endif	# LIBPRELUDEDB_BUILDLINK3_MK
 
 .include "../../security/libprelude/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
+.endif # LIBPRELUDEDB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libpreludedb
diff --git a/security/libssh/buildlink3.mk b/security/libssh/buildlink3.mk
index bfc028d841b..5b71f5e9bc8 100644
--- a/security/libssh/buildlink3.mk
+++ b/security/libssh/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:20 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBSSH_BUILDLINK3_MK:=	${NETWIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libssh
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libssh
-.endif
+.if !defined(LIBSSH_BUILDLINK3_MK)
+LIBSSH_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibssh}
-BUILDLINK_PACKAGES+=	libssh
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libssh
-
-.if !empty(LIBSSH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libssh+=	libssh>=0.11
 BUILDLINK_PKGSRCDIR.libssh?=	../../security/libssh
-.endif	# LIBSSH_BUILDLINK3_MK
+.endif # LIBSSH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libssh
diff --git a/security/libssh2/buildlink3.mk b/security/libssh2/buildlink3.mk
index 47b94f20918..fd884595fb5 100644
--- a/security/libssh2/buildlink3.mk
+++ b/security/libssh2/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/02 14:11:54 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:20 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBSSH2_BUILDLINK3_MK:=	${LIBSSH2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libssh2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libssh2
-.endif
+.if !defined(LIBSSH2_BUILDLINK3_MK)
+LIBSSH2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibssh2}
-BUILDLINK_PACKAGES+=	libssh2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libssh2
-
-.if ${LIBSSH2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libssh2+=	libssh2>=0.18
 BUILDLINK_PKGSRCDIR.libssh2?=	../../security/libssh2
-.endif	# LIBSSH2_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.endif # LIBSSH2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libssh2
diff --git a/security/libtasn1/buildlink3.mk b/security/libtasn1/buildlink3.mk
index 8afbc6257a1..abc7aed1cc9 100644
--- a/security/libtasn1/buildlink3.mk
+++ b/security/libtasn1/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:20 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBTASN1_BUILDLINK3_MK:=	${LIBTASN1_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtasn1
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libtasn1
-.endif
+.if !defined(LIBTASN1_BUILDLINK3_MK)
+LIBTASN1_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtasn1}
-BUILDLINK_PACKAGES+=	libtasn1
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtasn1
-
-.if !empty(LIBTASN1_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtasn1+=	libtasn1>=0.2.7
 BUILDLINK_ABI_DEPENDS.libtasn1+=	libtasn1>=0.3.0
 BUILDLINK_PKGSRCDIR.libtasn1?=	../../security/libtasn1
-.endif	# LIBTASN1_BUILDLINK3_MK
+.endif # LIBTASN1_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtasn1
diff --git a/security/libtcpa/buildlink3.mk b/security/libtcpa/buildlink3.mk
index 1461b7d3bf5..a071eb50c74 100644
--- a/security/libtcpa/buildlink3.mk
+++ b/security/libtcpa/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:09:38 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:20 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBTCPA_BUILDLINK3_MK:=	${LIBTCPA_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libtcpa
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libtcpa
-.endif
+.if !defined(LIBTCPA_BUILDLINK3_MK)
+LIBTCPA_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtcpa}
-BUILDLINK_PACKAGES+=	libtcpa
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtcpa
-
-.if !empty(LIBTCPA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libtcpa+=	libtcpa>=1.1b
 BUILDLINK_ABI_DEPENDS.libtcpa?=	libtcpa>=1.1bnb3
 BUILDLINK_PKGSRCDIR.libtcpa?=	../../security/libtcpa
 BUILDLINK_DEPMETHOD.libtcpa?=	build
-.endif	# LIBTCPA_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
+.endif # LIBTCPA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libtcpa
diff --git a/security/mhash/buildlink3.mk b/security/mhash/buildlink3.mk
index 23ee2e1fa5f..a1d56a9efc8 100644
--- a/security/mhash/buildlink3.mk
+++ b/security/mhash/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:20 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MHASH_BUILDLINK3_MK:=	${MHASH_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mhash
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mhash
-.endif
+.if !defined(MHASH_BUILDLINK3_MK)
+MHASH_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmhash}
-BUILDLINK_PACKAGES+=	mhash
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mhash
-
-.if !empty(MHASH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mhash+=	mhash>=0.8.3
 BUILDLINK_ABI_DEPENDS.mhash+=	mhash>=0.9.2nb1
 BUILDLINK_PKGSRCDIR.mhash?=	../../security/mhash
-.endif	# MHASH_BUILDLINK3_MK
+.endif # MHASH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mhash
diff --git a/security/mit-krb5/buildlink3.mk b/security/mit-krb5/buildlink3.mk
index 02476012150..c28799aa577 100644
--- a/security/mit-krb5/buildlink3.mk
+++ b/security/mit-krb5/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:20 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MIT_KRB5_BUILDLINK3_MK:=	${MIT_KRB5_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mit-krb5
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mit-krb5
-.endif
+.if !defined(MIT_KRB5_BUILDLINK3_MK)
+MIT_KRB5_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmit-krb5}
-BUILDLINK_PACKAGES+=	mit-krb5
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mit-krb5
-
-.if !empty(MIT_KRB5_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mit-krb5+=		mit-krb5>=1.3.1
 BUILDLINK_ABI_DEPENDS.mit-krb5+=	mit-krb5>=1.4nb1
 BUILDLINK_PKGSRCDIR.mit-krb5?=		../../security/mit-krb5
-.endif	# MIT_KRB5_BUILDLINK3_MK
+.endif # MIT_KRB5_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mit-krb5
diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk
index ce8970aa212..807e5ef8e47 100644
--- a/security/nessus-core/buildlink3.mk
+++ b/security/nessus-core/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/10/13 22:32:54 bad Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:20 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-NESSUS_CORE_BUILDLINK3_MK:=	${NESSUS_CORE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	nessus-core
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	nessus-core
-.endif
+.if !defined(NESSUS_CORE_BUILDLINK3_MK)
+NESSUS_CORE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnessus-core}
-BUILDLINK_PACKAGES+=	nessus-core
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nessus-core
-
-.if !empty(NESSUS_CORE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.nessus-core+=	nessus-core>=2.2.11
 BUILDLINK_ABI_DEPENDS.nessus-core?=	nessus-core>=2.2.11nb1
 BUILDLINK_PKGSRCDIR.nessus-core?=	../../security/nessus-core
-.endif	# NESSUS_CORE_BUILDLINK3_MK
 
 .include "../../security/libnasl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # NESSUS_CORE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-nessus-core
diff --git a/security/nessus-libraries/buildlink3.mk b/security/nessus-libraries/buildlink3.mk
index 66f9bbbe120..4e61ee75d02 100644
--- a/security/nessus-libraries/buildlink3.mk
+++ b/security/nessus-libraries/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/10/13 22:32:54 bad Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:20 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-NESSUS_LIBRARIES_BUILDLINK3_MK:=	${NESSUS_LIBRARIES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	nessus-libraries
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	nessus-libraries
-.endif
+.if !defined(NESSUS_LIBRARIES_BUILDLINK3_MK)
+NESSUS_LIBRARIES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnessus-libraries}
-BUILDLINK_PACKAGES+=	nessus-libraries
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nessus-libraries
-
-.if !empty(NESSUS_LIBRARIES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.nessus-libraries+=	nessus-libraries>=2.2.11
 BUILDLINK_ABI_DEPENDS.nessus-libraries?=	nessus-libraries>=2.2.11nb1
 BUILDLINK_PKGSRCDIR.nessus-libraries?=	../../security/nessus-libraries
-.endif	# NESSUS_LIBRARIES_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.endif # NESSUS_LIBRARIES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-nessus-libraries
diff --git a/security/ocaml-ssl/buildlink3.mk b/security/ocaml-ssl/buildlink3.mk
index cb5f32a4cff..7e0c6f9685b 100644
--- a/security/ocaml-ssl/buildlink3.mk
+++ b/security/ocaml-ssl/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/01/18 05:09:39 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:20 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-OCAML_SSL_BUILDLINK3_MK:=	${OCAML_SSL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ocaml-ssl
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ocaml-ssl
-.endif
+.if !defined(OCAML_SSL_BUILDLINK3_MK)
+OCAML_SSL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nocaml-ssl}
-BUILDLINK_PACKAGES+=	ocaml-ssl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ocaml-ssl
-
-.if ${OCAML_SSL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.4.0
 BUILDLINK_ABI_DEPENDS.ocaml-ssl?=	ocaml-ssl>=0.4.1nb1
 BUILDLINK_PKGSRCDIR.ocaml-ssl?=	../../security/ocaml-ssl
-.endif	# OCAML_SSL_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
+.endif # OCAML_SSL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ocaml-ssl
diff --git a/security/opencdk/buildlink3.mk b/security/opencdk/buildlink3.mk
index 67323938e2a..465a98de2c9 100644
--- a/security/opencdk/buildlink3.mk
+++ b/security/opencdk/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/06/05 05:35:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:20 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENCDK_BUILDLINK3_MK:=	${OPENCDK_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	opencdk
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	opencdk
-.endif
+.if !defined(OPENCDK_BUILDLINK3_MK)
+OPENCDK_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopencdk}
-BUILDLINK_PACKAGES+=	opencdk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}opencdk
-
-.if !empty(OPENCDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.opencdk+=	opencdk>=0.5.4nb1
 BUILDLINK_ABI_DEPENDS.opencdk+=	opencdk>=0.6.0
 BUILDLINK_PKGSRCDIR.opencdk?=	../../security/opencdk
-.endif	# OPENCDK_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
+.endif # OPENCDK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-opencdk
diff --git a/security/openct/buildlink3.mk b/security/openct/buildlink3.mk
index e1932998569..d3d887eeebd 100644
--- a/security/openct/buildlink3.mk
+++ b/security/openct/buildlink3.mk
@@ -1,22 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 10:07:49 hasso Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENCT_BUILDLINK3_MK:=	${OPENCT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openct
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openct
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenct}
-BUILDLINK_PACKAGES+=	openct
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openct
+.if !defined(OPENCT_BUILDLINK3_MK)
+OPENCT_BUILDLINK3_MK:=
 
-.if !empty(OPENCT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openct+=	openct>=0.6.15
 BUILDLINK_PKGSRCDIR.openct?=	../../security/openct
 pkgbase := openct
 .include "../../mk/pkg-build-options.mk"
-.endif	# OPENCT_BUILDLINK3_MK
 
 .if !empty(PKG_BUILD_OPTIONS.openct:Mpcsc-lite)
 .include "../../security/pcsc-lite/buildlink3.mk"
@@ -27,5 +19,6 @@ pkgbase := openct
 .endif
 
 .include "../../devel/libltdl/buildlink3.mk"
+.endif # OPENCT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openct
diff --git a/security/openpam/buildlink3.mk b/security/openpam/buildlink3.mk
index 5a8f988f221..91bddb82584 100644
--- a/security/openpam/buildlink3.mk
+++ b/security/openpam/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENPAM_BUILDLINK3_MK:=	${OPENPAM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openpam
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openpam
-.endif
+.if !defined(OPENPAM_BUILDLINK3_MK)
+OPENPAM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenpam}
-BUILDLINK_PACKAGES+=	openpam
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openpam
-
-.if !empty(OPENPAM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openpam+=	openpam>=20040210
 BUILDLINK_PKGSRCDIR.openpam?=	../../security/openpam
-.endif	# OPENPAM_BUILDLINK3_MK
 
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # OPENPAM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openpam
diff --git a/security/opensc/buildlink3.mk b/security/opensc/buildlink3.mk
index 67d059f6813..45051aee729 100644
--- a/security/opensc/buildlink3.mk
+++ b/security/opensc/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 10:50:05 hasso Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENSC_BUILDLINK3_MK:=	${OPENSC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	opensc
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	opensc
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopensc}
-BUILDLINK_PACKAGES+=	opensc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}opensc
+.if !defined(OPENSC_BUILDLINK3_MK)
+OPENSC_BUILDLINK3_MK:=
 
-.if !empty(OPENSC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.opensc+=	opensc>=0.11.5
 BUILDLINK_PKGSRCDIR.opensc?=	../../security/opensc
 pkgbase := opensc
 .include "../../mk/pkg-build-options.mk"
-.endif	# OPENSC_BUILDLINK3_MK
 
 .include "../../devel/libltdl/buildlink3.mk"
 .if !empty(PKG_BUILD_OPTIONS.opensc:Mopenct)
 .include "../../security/openct/buildlink3.mk"
 .endif
+.endif # OPENSC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-opensc
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index faf498d7e6f..3be853512e8 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,17 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.39 2008/01/17 06:42:47 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.40 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openssl
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openssl
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenssl}
-BUILDLINK_PACKAGES+=	openssl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openssl
-
-.if !empty(OPENSSL_BUILDLINK3_MK:M+)
+.if !defined(OPENSSL_BUILDLINK3_MK)
+OPENSSL_BUILDLINK3_MK:=
 
 .  include "../../mk/bsd.fast.prefs.mk"
 
@@ -26,7 +18,6 @@ WRAPPER_REORDER_CMDS+=	reorder:l:crypt:crypto
 
 SSLBASE=	${BUILDLINK_PREFIX.openssl}
 BUILD_DEFS+=	SSLBASE
-.endif	# OPENSSL_BUILDLINK3_MK
 
 pkgbase := openssl
 .include "../../mk/pkg-build-options.mk"
@@ -34,5 +25,6 @@ pkgbase := openssl
 .if !empty(PKG_BUILD_OPTIONS.openssl:Mrsaref)
 .  include "../../security/rsaref/buildlink3.mk"
 .endif
+.endif # OPENSSL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openssl
diff --git a/security/openvas-libnasl/buildlink3.mk b/security/openvas-libnasl/buildlink3.mk
index 4c185872de8..25997571405 100644
--- a/security/openvas-libnasl/buildlink3.mk
+++ b/security/openvas-libnasl/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/04 01:09:31 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-OPENVAS_LIBNASL_BUILDLINK3_MK:=	${OPENVAS_LIBNASL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openvas-libnasl
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	openvas-libnasl
-.endif
+.if !defined(OPENVAS_LIBNASL_BUILDLINK3_MK)
+OPENVAS_LIBNASL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenvas-libnasl}
-BUILDLINK_PACKAGES+=	openvas-libnasl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openvas-libnasl
-
-.if ${OPENVAS_LIBNASL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.openvas-libnasl+=	openvas-libnasl>=2.0.0
 BUILDLINK_PKGSRCDIR.openvas-libnasl?=	../../security/openvas-libnasl
-.endif	# OPENVAS_LIBNASL_BUILDLINK3_MK
+.endif # OPENVAS_LIBNASL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openvas-libnasl
diff --git a/security/openvas-libraries/buildlink3.mk b/security/openvas-libraries/buildlink3.mk
index e92d1b82446..17c140214ec 100644
--- a/security/openvas-libraries/buildlink3.mk
+++ b/security/openvas-libraries/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/04 01:08:52 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-OPENVAS_LIBRARIES_BUILDLINK3_MK:=	${OPENVAS_LIBRARIES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openvas-libraries
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	openvas-libraries
-.endif
+.if !defined(OPENVAS_LIBRARIES_BUILDLINK3_MK)
+OPENVAS_LIBRARIES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenvas-libraries}
-BUILDLINK_PACKAGES+=	openvas-libraries
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openvas-libraries
-
-.if ${OPENVAS_LIBRARIES_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.openvas-libraries+=	openvas-libraries>=2.0.0
 BUILDLINK_PKGSRCDIR.openvas-libraries?=	../../security/openvas-libraries
-.endif	# OPENVAS_LIBRARIES_BUILDLINK3_MK
+.endif # OPENVAS_LIBRARIES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openvas-libraries
diff --git a/security/openvas-server/buildlink3.mk b/security/openvas-server/buildlink3.mk
index cc0ad5d109f..0d3ec0e0715 100644
--- a/security/openvas-server/buildlink3.mk
+++ b/security/openvas-server/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/04 01:11:55 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-OPENVAS_SERVER_BUILDLINK3_MK:=	${OPENVAS_SERVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openvas-server
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	openvas-server
-.endif
+.if !defined(OPENVAS_SERVER_BUILDLINK3_MK)
+OPENVAS_SERVER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenvas-server}
-BUILDLINK_PACKAGES+=	openvas-server
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openvas-server
-
-.if ${OPENVAS_SERVER_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.openvas-server+=	openvas-server>=2.0.0
 BUILDLINK_PKGSRCDIR.openvas-server?=	../../security/openvas-server
-.endif	# OPENVAS_SERVER_BUILDLINK3_MK
+.endif # OPENVAS_SERVER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openvas-server
diff --git a/security/pakchois/buildlink3.mk b/security/pakchois/buildlink3.mk
index b2b505d783e..22ab0e15663 100644
--- a/security/pakchois/buildlink3.mk
+++ b/security/pakchois/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/30 03:32:19 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PAKCHOIS_BUILDLINK3_MK:=	${PAKCHOIS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pakchois
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	pakchois
-.endif
+.if !defined(PAKCHOIS_BUILDLINK3_MK)
+PAKCHOIS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npakchois}
-BUILDLINK_PACKAGES+=	pakchois
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pakchois
-
-.if ${PAKCHOIS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.pakchois+=	pakchois>=0.4
 BUILDLINK_PKGSRCDIR.pakchois?=	../../security/pakchois
-.endif	# PAKCHOIS_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.endif # PAKCHOIS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pakchois
diff --git a/security/pcsc-lite/buildlink3.mk b/security/pcsc-lite/buildlink3.mk
index 86845b86f32..34033eec5c1 100644
--- a/security/pcsc-lite/buildlink3.mk
+++ b/security/pcsc-lite/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/03/04 15:52:15 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PCSC_LITE_BUILDLINK3_MK:=	${PCSC_LITE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pcsc-lite
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	pcsc-lite
-.endif
+.if !defined(PCSC_LITE_BUILDLINK3_MK)
+PCSC_LITE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npcsc-lite}
-BUILDLINK_PACKAGES+=	pcsc-lite
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pcsc-lite
-
-.if ${PCSC_LITE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.pcsc-lite+=	pcsc-lite>=1.4.99
 BUILDLINK_PKGSRCDIR.pcsc-lite?=	../../security/pcsc-lite
-.endif	# PCSC_LITE_BUILDLINK3_MK
 
 .include "../../devel/libusb/buildlink3.mk"
+.endif # PCSC_LITE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pcsc-lite
diff --git a/security/pinentry/buildlink3.mk b/security/pinentry/buildlink3.mk
index 1eb47253bee..68e7dda36d1 100644
--- a/security/pinentry/buildlink3.mk
+++ b/security/pinentry/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PINENTRY_BUILDLINK3_MK:=	${PINENTRY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pinentry
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pinentry
-.endif
+.if !defined(PINENTRY_BUILDLINK3_MK)
+PINENTRY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npinentry}
-BUILDLINK_PACKAGES+=	pinentry
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pinentry
-
-.if !empty(PINENTRY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pinentry+=	pinentry>=0.7.1
 BUILDLINK_ABI_DEPENDS.pinentry+=	pinentry>=0.7.1nb3
 BUILDLINK_PKGSRCDIR.pinentry?=	../../security/pinentry
-.endif	# PINENTRY_BUILDLINK3_MK
+.endif # PINENTRY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pinentry
diff --git a/security/policykit-gnome/buildlink3.mk b/security/policykit-gnome/buildlink3.mk
index 636fbe80218..7bdfa8292fa 100644
--- a/security/policykit-gnome/buildlink3.mk
+++ b/security/policykit-gnome/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/11/22 21:21:48 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-POLICYKIT_GNOME_BUILDLINK3_MK:=	${POLICYKIT_GNOME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	policykit-gnome
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	policykit-gnome
-.endif
+.if !defined(POLICYKIT_GNOME_BUILDLINK3_MK)
+POLICYKIT_GNOME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npolicykit-gnome}
-BUILDLINK_PACKAGES+=	policykit-gnome
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}policykit-gnome
-
-.if ${POLICYKIT_GNOME_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.policykit-gnome+=	policykit-gnome>=0.9.2
 BUILDLINK_PKGSRCDIR.policykit-gnome?=	../../security/policykit-gnome
-.endif	# POLICYKIT_GNOME_BUILDLINK3_MK
 
 .include "../../security/policykit/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.endif # POLICYKIT_GNOME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-policykit-gnome
diff --git a/security/policykit/buildlink3.mk b/security/policykit/buildlink3.mk
index d72f2db89ac..e59fa205927 100644
--- a/security/policykit/buildlink3.mk
+++ b/security/policykit/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 03:33:38 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-POLICYKIT_BUILDLINK3_MK:=	${POLICYKIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	policykit
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	policykit
-.endif
+.if !defined(POLICYKIT_BUILDLINK3_MK)
+POLICYKIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npolicykit}
-BUILDLINK_PACKAGES+=	policykit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}policykit
-
-.if ${POLICYKIT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.policykit+=	policykit>=0.9
 BUILDLINK_PKGSRCDIR.policykit?=	../../security/policykit
-.endif	# POLICYKIT_BUILDLINK3_MK
 
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.endif # POLICYKIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-policykit
diff --git a/security/py-SSLCrypto/buildlink3.mk b/security/py-SSLCrypto/buildlink3.mk
index 168d27bd775..267aef7a77a 100644
--- a/security/py-SSLCrypto/buildlink3.mk
+++ b/security/py-SSLCrypto/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/04/25 22:16:20 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_SSLCRYPTO_BUILDLINK3_MK:=	${PY_SSLCRYPTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-SSLCrypto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-SSLCrypto
-.endif
+.if !defined(PY_SSLCRYPTO_BUILDLINK3_MK)
+PY_SSLCRYPTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-SSLCrypto}
-BUILDLINK_PACKAGES+=	py-SSLCrypto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-SSLCrypto
-
-.if ${PY_SSLCRYPTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.py-SSLCrypto+=	${PYPKGPREFIX}-SSLCrypto>=0.1.1
 BUILDLINK_ABI_DEPENDS.py-SSLCrypto?=	${PYPKGPREFIX}-SSLCrypto>=0.1.1nb1
 BUILDLINK_PKGSRCDIR.py-SSLCrypto?=	../../security/py-SSLCrypto
-.endif	# PY_SSLCRYPTO_BUILDLINK3_MK
 
 #.include "../../security/openssl/buildlink3.mk"
+.endif # PY_SSLCRYPTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-SSLCrypto
diff --git a/security/py-amkCrypto/buildlink3.mk b/security/py-amkCrypto/buildlink3.mk
index 5c2fe79a573..4d2bc406139 100644
--- a/security/py-amkCrypto/buildlink3.mk
+++ b/security/py-amkCrypto/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 17:30:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY24_AMKCRYPTO_BUILDLINK3_MK:=	${PY24_AMKCRYPTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-amkCrypto
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	py-amkCrypto
-.endif
+.if !defined(PY24_AMKCRYPTO_BUILDLINK3_MK)
+PY24_AMKCRYPTO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-amkCrypto}
-BUILDLINK_PACKAGES+=	py-amkCrypto
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-amkCrypto
-
-.if ${PY24_AMKCRYPTO_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-amkCrypto+=	${PYPKGPREFIX}-amkCrypto>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.py-amkCrypto?=	../../security/py-amkCrypto
-.endif	# PY24_AMKCRYPTO_BUILDLINK3_MK
+.endif # PY24_AMKCRYPTO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-amkCrypto
diff --git a/security/py-gnupg/buildlink3.mk b/security/py-gnupg/buildlink3.mk
index 32fe4ac0d92..c0a8d4c1b03 100644
--- a/security/py-gnupg/buildlink3.mk
+++ b/security/py-gnupg/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_GNUPG_BUILDLINK3_MK:=	${PY_GNUPG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-gnupg
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	py-gnupg
-.endif
+.if !defined(PY_GNUPG_BUILDLINK3_MK)
+PY_GNUPG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-gnupg}
-BUILDLINK_PACKAGES+=	py-gnupg
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gnupg
-
-.if !empty(PY_GNUPG_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-gnupg+=	${PYPKGPREFIX}-gnupg-[0-9]*
 BUILDLINK_ABI_DEPENDS.py-gnupg+=	${PYPKGPREFIX}-gnupg>=0.3.2
 BUILDLINK_PKGSRCDIR.py-gnupg?=		../../security/py-gnupg
-.endif	# PY_GNUPG_BUILDLINK3_MK
+.endif # PY_GNUPG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-gnupg
diff --git a/security/qca/buildlink3.mk b/security/qca/buildlink3.mk
index 316589f0045..d6bb7e3ea12 100644
--- a/security/qca/buildlink3.mk
+++ b/security/qca/buildlink3.mk
@@ -1,23 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/12/20 20:37:22 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:22 joerg Exp $
 #
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-QCA_BUILDLINK3_MK:=	${QCA_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	qca
-.endif
+BUILDLINK_TREE+=	qca
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqca}
-BUILDLINK_PACKAGES+=	qca
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qca
+.if !defined(QCA_BUILDLINK3_MK)
+QCA_BUILDLINK3_MK:=
 
-.if !empty(QCA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qca+=	qca>=1.0
 BUILDLINK_ABI_DEPENDS.qca?=	qca>=1.0nb3
 BUILDLINK_PKGSRCDIR.qca?=	../../security/qca
-.endif	# QCA_BUILDLINK3_MK
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+.endif # QCA_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qca
diff --git a/security/qca2/buildlink3.mk b/security/qca2/buildlink3.mk
index 8b9685a7332..7a8e2a37c7b 100644
--- a/security/qca2/buildlink3.mk
+++ b/security/qca2/buildlink3.mk
@@ -1,23 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/19 15:32:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:22 joerg Exp $
 #
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-QCA2_BUILDLINK3_MK:=	${QCA2_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	qca2
-.endif
+BUILDLINK_TREE+=	qca2
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqca2}
-BUILDLINK_PACKAGES+=	qca2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qca2
+.if !defined(QCA2_BUILDLINK3_MK)
+QCA2_BUILDLINK3_MK:=
 
-.if !empty(QCA2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qca2+=	qca2>=2.0.0
 BUILDLINK_ABI_DEPENDS.qca2?=	qca2>=2.0.0
 BUILDLINK_PKGSRCDIR.qca2?=	../../security/qca2
-.endif	# QCA2_BUILDLINK3_MK
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
+.endif # QCA2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-qca2
diff --git a/security/rsaref/buildlink3.mk b/security/rsaref/buildlink3.mk
index fa001a516fa..6fb42dd3df0 100644
--- a/security/rsaref/buildlink3.mk
+++ b/security/rsaref/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:22 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-RSAREF_BUILDLINK3_MK:=	${RSAREF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	rsaref
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	rsaref
-.endif
+.if !defined(RSAREF_BUILDLINK3_MK)
+RSAREF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrsaref}
-BUILDLINK_PACKAGES+=	rsaref
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rsaref
-
-.if !empty(RSAREF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rsaref+=	rsaref>=2.0p3
 BUILDLINK_ABI_DEPENDS.rsaref+=	rsaref>=2.0p3nb1
 BUILDLINK_PKGSRCDIR.rsaref?=	../../security/rsaref
-.endif	# RSAREF_BUILDLINK3_MK
+.endif # RSAREF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-rsaref
diff --git a/security/seahorse/buildlink3.mk b/security/seahorse/buildlink3.mk
index c74314af267..04574faf982 100644
--- a/security/seahorse/buildlink3.mk
+++ b/security/seahorse/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/10/27 16:51:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:22 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SEAHORSE_BUILDLINK3_MK:=	${SEAHORSE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	seahorse
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	seahorse
-.endif
+.if !defined(SEAHORSE_BUILDLINK3_MK)
+SEAHORSE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nseahorse}
-BUILDLINK_PACKAGES+=	seahorse
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seahorse
-
-.if ${SEAHORSE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.seahorse+=	seahorse>=2.24.1
 BUILDLINK_PKGSRCDIR.seahorse?=	../../security/seahorse
-.endif	# SEAHORSE_BUILDLINK3_MK
 
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # SEAHORSE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-seahorse
diff --git a/security/skey/buildlink3.mk b/security/skey/buildlink3.mk
index d06ec3332dd..9a5c12a4a19 100644
--- a/security/skey/buildlink3.mk
+++ b/security/skey/buildlink3.mk
@@ -1,22 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/01/20 14:48:56 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:22 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SKEY_BUILDLINK3_MK:=	${SKEY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	skey
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	skey
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nskey}
-BUILDLINK_PACKAGES+=	skey
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}skey
+.if !defined(SKEY_BUILDLINK3_MK)
+SKEY_BUILDLINK3_MK:=
 
-.if !empty(SKEY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.skey+=	skey>=1.1.5
 BUILDLINK_ABI_DEPENDS.skey?=	skey>=1.1.5nb2
 BUILDLINK_PKGSRCDIR.skey?=	../../security/skey
 BUILDLINK_DEPMETHOD.skey?=	build
-.endif	# SKEY_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -24,5 +16,6 @@ BUILDLINK_DEPMETHOD.skey?=	build
 .if ${OPSYS} == "SunOS"
 BUILDLINK_TRANSFORM+=	l:skey:skey:md5
 .endif
+.endif # SKEY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-skey
diff --git a/security/tcl-tls/buildlink3.mk b/security/tcl-tls/buildlink3.mk
index f417be13713..983198f1489 100644
--- a/security/tcl-tls/buildlink3.mk
+++ b/security/tcl-tls/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:22 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-TCL_TLS_BUILDLINK3_MK:=	${TCL_TLS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcl-tls
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcl-tls
-.endif
+.if !defined(TCL_TLS_BUILDLINK3_MK)
+TCL_TLS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-tls}
-BUILDLINK_PACKAGES+=	tcl-tls
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-tls
-
-.if !empty(TCL_TLS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-tls+=	tcl-tls>=1.5.0
 BUILDLINK_PKGSRCDIR.tcl-tls?=	../../security/tcl-tls
-.endif	# TCL_TLS_BUILDLINK3_MK
+.endif # TCL_TLS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcl-tls
diff --git a/security/tcp_wrappers/buildlink3.mk b/security/tcp_wrappers/buildlink3.mk
index 5776176e524..caf277f634a 100644
--- a/security/tcp_wrappers/buildlink3.mk
+++ b/security/tcp_wrappers/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:23 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TCP_WRAPPERS_BUILDLINK3_MK:=	${TCP_WRAPPERS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	tcp_wrappers
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tcp_wrappers
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcp_wrappers}
-BUILDLINK_PACKAGES+=	tcp_wrappers
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcp_wrappers
+.if !defined(TCP_WRAPPERS_BUILDLINK3_MK)
+TCP_WRAPPERS_BUILDLINK3_MK:=
 
-.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcp_wrappers+=	tcp_wrappers>=7.6.1nb1
 BUILDLINK_ABI_DEPENDS.tcp_wrappers+=	tcp_wrappers>=7.6.1nb3
 BUILDLINK_PKGSRCDIR.tcp_wrappers?=	../../security/tcp_wrappers
-.endif	# TCP_WRAPPERS_BUILDLINK3_MK
 
 # need libnsl and libsocket to link into an executable on Solaris.
 .include "../../mk/bsd.fast.prefs.mk"
@@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.tcp_wrappers?=	../../security/tcp_wrappers
 BUILDLINK_LDADD.tcp_wrappers+=		-lnsl -lsocket
 BUILDLINK_LDFLAGS.tcp_wrappers?=	${BUILDLINK_LDADD.tcp_wrappers}
 .endif
+.endif # TCP_WRAPPERS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-tcp_wrappers
diff --git a/security/xmlsec1/buildlink3.mk b/security/xmlsec1/buildlink3.mk
index 550b4472d68..74567b34610 100644
--- a/security/xmlsec1/buildlink3.mk
+++ b/security/xmlsec1/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/02 21:08:34 manu Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:23 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XMLSEC1_BUILDLINK3_MK:=	${XMLSEC1_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xmlsec1
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xmlsec1
-.endif
+.if !defined(XMLSEC1_BUILDLINK3_MK)
+XMLSEC1_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxmlsec1}
-BUILDLINK_PACKAGES+=	xmlsec1
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmlsec1
-
-.if ${XMLSEC1_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xmlsec1+=	xmlsec1>=1.2.6nb6
 BUILDLINK_PKGSRCDIR.xmlsec1?=	../../security/xmlsec1
 BUILDLINK_INCDIRS.xmlsec1+=	include/xmlsec1
 BUILDLINK_CPPFLAGS.xmlsec1+=	-DXMLSEC_CRYPTO_OPENSSL
 BUILDLINK_LIBS.xmlsec1+=	-lxmlsec1-openssl
-.endif	# XMLSEC1_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
+.endif # XMLSEC1_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xmlsec1