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.
author: joerg <joerg@pkgsrc.org> 2009-03-20 19:23:50 +0000
committer: joerg <joerg@pkgsrc.org> 2009-03-20 19:23:50 +0000
commit: 2d1ba244e90207d03eef397a99aa4091baeec5b3 (patch)
tree: 647e974495c5d41703d41ca2e71c9b6063b9153a /mail
parent: 4bf0a20854ae9e07b7965977a713f2efee890976 (diff)
download: pkgsrc-2d1ba244e90207d03eef397a99aa4091baeec5b3.tar.gz
24 files changed, 144 insertions, 314 deletions
diff --git a/mail/Pantomime/buildlink3.mk b/mail/Pantomime/buildlink3.mk
index 5327ec7552b..d80d6b233f7 100644
--- a/mail/Pantomime/buildlink3.mk
+++ b/mail/Pantomime/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.9 2008/01/18 05:08:20 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:53 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PANTOMIME_BUILDLINK3_MK:=	${PANTOMIME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Pantomime
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	Pantomime
-.endif
+.if !defined(PANTOMIME_BUILDLINK3_MK)
+PANTOMIME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NPantomime}
-BUILDLINK_PACKAGES+=	Pantomime
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Pantomime
-
-.if !empty(PANTOMIME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Pantomime+=	Pantomime>=1.1.2
 BUILDLINK_ABI_DEPENDS.Pantomime+=	Pantomime>=1.1.2nb5
 BUILDLINK_PKGSRCDIR.Pantomime?=	../../mail/Pantomime
@@ -20,8 +13,7 @@ BUILDLINK_PKGSRCDIR.Pantomime?=	../../mail/Pantomime
 
 BUILDLINK_INCDIRS.Pantomime+=	${GNUSTEP_LOCAL_ROOT:Q}/${GNUSTEP_IDIR:Q}/Pantomime
 
-.endif	# PANTOMIME_BUILDLINK3_MK
-
 .include "../../devel/gnustep-base/buildlink3.mk"
+.endif # PANTOMIME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Pantomime
diff --git a/mail/akonadi/buildlink3.mk b/mail/akonadi/buildlink3.mk
index 5a578ea4f0b..e83dba1b926 100644
--- a/mail/akonadi/buildlink3.mk
+++ b/mail/akonadi/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/03 11:19:56 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-AKONADI_BUILDLINK3_MK:=	${AKONADI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	akonadi
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	akonadi
-.endif
+.if !defined(AKONADI_BUILDLINK3_MK)
+AKONADI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nakonadi}
-BUILDLINK_PACKAGES+=	akonadi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}akonadi
-
-.if ${AKONADI_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.akonadi+=	akonadi>=0.82.0
 BUILDLINK_PKGSRCDIR.akonadi?=	../../mail/akonadi
-.endif	# AKONADI_BUILDLINK3_MK
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-qdbus/buildlink3.mk"
+.endif # AKONADI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-akonadi
diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk
index e8791ba26ce..8045a3889d9 100644
--- a/mail/clamav/buildlink3.mk
+++ b/mail/clamav/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.18 2008/11/27 06:07:49 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CLAMAV_BUILDLINK3_MK:=	${CLAMAV_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	clamav
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	clamav
-.endif
+.if !defined(CLAMAV_BUILDLINK3_MK)
+CLAMAV_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclamav}
-BUILDLINK_PACKAGES+=	clamav
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clamav
-
-.if ${CLAMAV_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.94.2
 BUILDLINK_PKGSRCDIR.clamav?=	../../mail/clamav
-.endif	# CLAMAV_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
+.endif # CLAMAV_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-clamav
diff --git a/mail/claws-mail-pgpcore/buildlink3.mk b/mail/claws-mail-pgpcore/buildlink3.mk
index 5fc78ba692f..8b5e6c694eb 100644
--- a/mail/claws-mail-pgpcore/buildlink3.mk
+++ b/mail/claws-mail-pgpcore/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/01/11 03:11:38 smb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:54 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-CLAWS_MAIL_PGPCORE_BUILDLINK3_MK:=	${CLAWS_MAIL_PGPCORE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	claws-mail-pgpcore
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	claws-mail-pgpcore
-.endif
+.if !defined(CLAWS_MAIL_PGPCORE_BUILDLINK3_MK)
+CLAWS_MAIL_PGPCORE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclaws-mail-pgpcore}
-BUILDLINK_PACKAGES+=	claws-mail-pgpcore
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}claws-mail-pgpcore
-
-.if ${CLAWS_MAIL_PGPCORE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.claws-mail-pgpcore+=	claws-mail-pgpcore>=3.7.0
 BUILDLINK_PKGSRCDIR.claws-mail-pgpcore?=	../../mail/claws-mail-pgpcore
-.endif	# CLAWS_MAIL_PGPCORE_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
+.endif # CLAWS_MAIL_PGPCORE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-claws-mail-pgpcore
diff --git a/mail/claws-mail/buildlink3.mk b/mail/claws-mail/buildlink3.mk
index b1b1e577cd8..4bf6c9782fd 100644
--- a/mail/claws-mail/buildlink3.mk
+++ b/mail/claws-mail/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/01/11 03:11:37 smb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:54 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CLAWS_MAIL_BUILDLINK3_MK:=	${CLAWS_MAIL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	claws-mail
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	claws-mail
-.endif
+.if !defined(CLAWS_MAIL_BUILDLINK3_MK)
+CLAWS_MAIL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclaws-mail}
-BUILDLINK_PACKAGES+=	claws-mail
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}claws-mail
-
-.if ${CLAWS_MAIL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.7.0
 BUILDLINK_PKGSRCDIR.claws-mail?=	../../mail/claws-mail
-.endif	# CLAWS_MAIL_BUILDLINK3_MK
+.endif # CLAWS_MAIL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-claws-mail
diff --git a/mail/dovecot/buildlink3.mk b/mail/dovecot/buildlink3.mk
index 9de38cab06e..1184de8db01 100644
--- a/mail/dovecot/buildlink3.mk
+++ b/mail/dovecot/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/19 15:50:27 joerg Exp $
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-DOVECOT_BUILDLINK3_MK:=			${DOVECOT_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:54 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=			dovecot
-.endif
+BUILDLINK_TREE+=	dovecot
 
-BUILDLINK_PACKAGES:=			${BUILDLINK_PACKAGES:Ndovecot}
-BUILDLINK_PACKAGES+=			dovecot
-BUILDLINK_ORDER:=			${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dovecot
+.if !defined(DOVECOT_BUILDLINK3_MK)
+DOVECOT_BUILDLINK3_MK:=
 
-.if !empty(DOVECOT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=1.1beta16
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot
-.endif # DOVECOT_BUILDLINK3_MK
 
 pkgbase := dovecot
 .include "../../mk/pkg-build-options.mk"
+.endif # DOVECOT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-dovecot
diff --git a/mail/drac/buildlink3.mk b/mail/drac/buildlink3.mk
index c09b4e9abc4..d6482712b44 100644
--- a/mail/drac/buildlink3.mk
+++ b/mail/drac/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DRAC_BUILDLINK3_MK:=	${DRAC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	drac
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	drac
-.endif
+.if !defined(DRAC_BUILDLINK3_MK)
+DRAC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndrac}
-BUILDLINK_PACKAGES+=	drac
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}drac
-
-.if !empty(DRAC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.drac+=	drac>=1.10
 BUILDLINK_PKGSRCDIR.drac?=	../../mail/drac
 BUILDLINK_DEPMETHOD.drac?=	build
-.endif	# DRAC_BUILDLINK3_MK
+.endif # DRAC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-drac
diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
index 823469fcae9..eeffdfe0672 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.27 2009/03/19 12:02:09 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:24:54 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=	${EVOLUTION_DATA_SERVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	evolution-data-server
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	evolution-data-server
-.endif
+.if !defined(EVOLUTION_DATA_SERVER_BUILDLINK3_MK)
+EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nevolution-data-server}
-BUILDLINK_PACKAGES+=	evolution-data-server
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evolution-data-server
-
-.if !empty(EVOLUTION_DATA_SERVER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.8.0
 BUILDLINK_ABI_DEPENDS.evolution-data-server?=	evolution-data-server>=2.22.3nb1
 BUILDLINK_PKGSRCDIR.evolution-data-server?=	../../mail/evolution-data-server
@@ -22,7 +15,6 @@ PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2\/camel-providers$$/ \
 		{ print "@comment in evolution-data-server: " $$0; next }
 PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2$$/ \
 		{ print "@comment in evolution-data-server: " $$0; next }
-.endif	# EVOLUTION_DATA_SERVER_BUILDLINK3_MK
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
@@ -31,5 +23,6 @@ PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2$$/ \
 .include "../../databases/db4/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../time/libical/buildlink3.mk"
+.endif # EVOLUTION_DATA_SERVER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-evolution-data-server
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
index 3af7b9f08d2..a56580e4f0f 100644
--- a/mail/evolution/buildlink3.mk
+++ b/mail/evolution/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.23 2008/09/06 20:54:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:54 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-EVOLUTION_BUILDLINK3_MK:=	${EVOLUTION_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	evolution
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	evolution
-.endif
+.if !defined(EVOLUTION_BUILDLINK3_MK)
+EVOLUTION_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nevolution}
-BUILDLINK_PACKAGES+=	evolution
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evolution
-
-.if !empty(EVOLUTION_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.evolution+=	evolution>=2.8.0
 BUILDLINK_ABI_DEPENDS.evolution?=	evolution>=2.22.3.1nb1
 BUILDLINK_PKGSRCDIR.evolution?=	../../mail/evolution
-.endif	# EVOLUTION_BUILDLINK3_MK
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/evolution\/2.10$$/ \
 				{ print "@comment in evolution: " $$0; next }
@@ -33,5 +25,6 @@ PRINT_PLIST_AWK+=	/^@dirrm libexec\/evolution$$/ \
 .include "../../devel/nss/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../www/gtkhtml314/buildlink3.mk"
+.endif # EVOLUTION_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-evolution
diff --git a/mail/faces/buildlink3.mk b/mail/faces/buildlink3.mk
index 0c22049a802..aba2f5f5107 100644
--- a/mail/faces/buildlink3.mk
+++ b/mail/faces/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FACES_BUILDLINK3_MK:=	${FACES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	faces
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	faces
-.endif
+.if !defined(FACES_BUILDLINK3_MK)
+FACES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfaces}
-BUILDLINK_PACKAGES+=	faces
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faces
-
-.if !empty(FACES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.faces+=	faces>=1.6.1nb1
 BUILDLINK_ABI_DEPENDS.faces+=	faces>=1.6.1nb4
 BUILDLINK_PKGSRCDIR.faces?=	../../mail/faces
-.endif	# FACES_BUILDLINK3_MK
+.endif # FACES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-faces
diff --git a/mail/gmime/buildlink3.mk b/mail/gmime/buildlink3.mk
index abff4d4e884..ecd3f729527 100644
--- a/mail/gmime/buildlink3.mk
+++ b/mail/gmime/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:54 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GMIME_BUILDLINK3_MK:=	${GMIME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gmime
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gmime
-.endif
+.if !defined(GMIME_BUILDLINK3_MK)
+GMIME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngmime}
-BUILDLINK_PACKAGES+=	gmime
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gmime
-
-.if !empty(GMIME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.7
 BUILDLINK_PKGSRCDIR.gmime?=	../../mail/gmime
-.endif	# GMIME_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.endif # GMIME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gmime
diff --git a/mail/gmime24/buildlink3.mk b/mail/gmime24/buildlink3.mk
index bb892a9af27..e647b0c441d 100644
--- a/mail/gmime24/buildlink3.mk
+++ b/mail/gmime24/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/24 16:37:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GMIME24_BUILDLINK3_MK:=	${GMIME24_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gmime24
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gmime24
-.endif
+.if !defined(GMIME24_BUILDLINK3_MK)
+GMIME24_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngmime24}
-BUILDLINK_PACKAGES+=	gmime24
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gmime24
-
-.if ${GMIME24_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gmime24+=	gmime24>=2.4.3
 BUILDLINK_PKGSRCDIR.gmime24?=	../../mail/gmime24
-.endif	# GMIME24_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.endif # GMIME24_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gmime24
diff --git a/mail/imap-uw/buildlink3.mk b/mail/imap-uw/buildlink3.mk
index 38ce81c6283..01e6fcfdc09 100644
--- a/mail/imap-uw/buildlink3.mk
+++ b/mail/imap-uw/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/11/13 14:20:20 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:55 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-IMAP_UW_BUILDLINK3_MK:=	${IMAP_UW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	imap-uw
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	imap-uw
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nimap-uw}
-BUILDLINK_PACKAGES+=	imap-uw
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}imap-uw
+.if !defined(IMAP_UW_BUILDLINK3_MK)
+IMAP_UW_BUILDLINK3_MK:=
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(IMAP_UW_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.imap-uw+=	imap-uw>=2007dnb1
 BUILDLINK_ABI_DEPENDS.imap-uw+=	imap-uw>=2007dnb1
 BUILDLINK_PKGSRCDIR.imap-uw?=	../../mail/imap-uw
@@ -23,8 +16,8 @@ BUILDLINK_LDFLAGS.imap-uw+=	-flat_namespace
 # function symbols from the executable unless we do this:
 INSTALL_UNSTRIPPED?=	yes
 . endif
-.endif	# IMAP_UW_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
+.endif # IMAP_UW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-imap-uw
diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk
index 3b8db3e63dd..7755b020f3c 100644
--- a/mail/libesmtp/buildlink3.mk
+++ b/mail/libesmtp/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:08:26 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBESMTP_BUILDLINK3_MK:=	${LIBESMTP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libesmtp
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libesmtp
-.endif
+.if !defined(LIBESMTP_BUILDLINK3_MK)
+LIBESMTP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibesmtp}
-BUILDLINK_PACKAGES+=	libesmtp
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libesmtp
-
-.if !empty(LIBESMTP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libesmtp+=	libesmtp>=1.0rc1nb1
 BUILDLINK_ABI_DEPENDS.libesmtp?=	libesmtp>=1.0.4nb1
 BUILDLINK_PKGSRCDIR.libesmtp?=	../../mail/libesmtp
@@ -21,8 +14,7 @@ LIBESMTP=	-lesmtp
 CONFIGURE_ENV+=	LIBESMTP=${LIBESMTP:Q}
 MAKE_ENV+=	LIBESMTP=${LIBESMTP:Q}
 
-.endif	# LIBESMTP_BUILDLINK3_MK
-
 .include "../../security/openssl/buildlink3.mk"
+.endif # LIBESMTP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libesmtp
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index 5ceecbe3d4e..e0e7ae0ea64 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,22 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.18 2008/10/05 22:42:36 smb Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBETPAN_BUILDLINK3_MK:=	${LIBETPAN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libetpan
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libetpan
-.endif
+.if !defined(LIBETPAN_BUILDLINK3_MK)
+LIBETPAN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibetpan}
-BUILDLINK_PACKAGES+=	libetpan
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libetpan
-
-.if !empty(LIBETPAN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libetpan+=	libetpan>=0.38nb1
 BUILDLINK_ABI_DEPENDS.libetpan?=	libetpan>=0.52nb4
 BUILDLINK_ABI_DEPENDS.libetpan?=	libetpan>=0.56
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
-.endif	# LIBETPAN_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
@@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.endif # LIBETPAN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libetpan
diff --git a/mail/libmilter/buildlink3.mk b/mail/libmilter/buildlink3.mk
index 5d915cd2acc..18e5d3b2481 100644
--- a/mail/libmilter/buildlink3.mk
+++ b/mail/libmilter/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/04/26 06:42:39 jnemeth Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMILTER_BUILDLINK3_MK:=	${LIBMILTER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libmilter
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmilter
-.endif
+.if !defined(LIBMILTER_BUILDLINK3_MK)
+LIBMILTER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmilter}
-BUILDLINK_PACKAGES+=	libmilter
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmilter
-
-.if !empty(LIBMILTER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.14
 BUILDLINK_PKGSRCDIR.libmilter?=	../../mail/libmilter
 BUILDLINK_DEPMETHOD.libmilter?=	build
 
 PTHREAD_OPTS+=		require
-.endif	# LIBMILTER_BUILDLINK3_MK
 
 .include "../../mk/pthread.buildlink3.mk"
+.endif # LIBMILTER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libmilter
diff --git a/mail/libsieve/buildlink3.mk b/mail/libsieve/buildlink3.mk
index 46286397db6..a99f8f0d9de 100644
--- a/mail/libsieve/buildlink3.mk
+++ b/mail/libsieve/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/09/08 12:26:15 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSIEVE_BUILDLINK3_MK:=	${LIBSIEVE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsieve
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libsieve
-.endif
+.if !defined(LIBSIEVE_BUILDLINK3_MK)
+LIBSIEVE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsieve}
-BUILDLINK_PACKAGES+=	libsieve
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsieve
-
-.if ${LIBSIEVE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libsieve+=	libsieve>=2.2.5
 BUILDLINK_PKGSRCDIR.libsieve?=	../../mail/libsieve
-.endif	# LIBSIEVE_BUILDLINK3_MK
+.endif # LIBSIEVE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsieve
diff --git a/mail/libspf-alt/buildlink3.mk b/mail/libspf-alt/buildlink3.mk
index 242d4af2373..104490b7471 100644
--- a/mail/libspf-alt/buildlink3.mk
+++ b/mail/libspf-alt/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/07/03 13:54:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSPF_ALT_BUILDLINK3_MK:=	${LIBSPF_ALT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libspf_alt
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libspf_alt
-.endif
+.if !defined(LIBSPF_ALT_BUILDLINK3_MK)
+LIBSPF_ALT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibspf_alt}
-BUILDLINK_PACKAGES+=	libspf_alt
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspf_alt
-
-.if !empty(LIBSPF_ALT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb1
 BUILDLINK_ABI_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb3
 BUILDLINK_PKGSRCDIR.libspf_alt?=	../../mail/libspf-alt
-.endif	# LIBSPF_ALT_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/resolv.buildlink3.mk"
+.endif # LIBSPF_ALT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libspf_alt
diff --git a/mail/libspf2/buildlink3.mk b/mail/libspf2/buildlink3.mk
index 88d647d28af..1a09017e399 100644
--- a/mail/libspf2/buildlink3.mk
+++ b/mail/libspf2/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/05 21:59:32 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBSPF2_BUILDLINK3_MK:=	${LIBSPF2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libspf2
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libspf2
-.endif
+.if !defined(LIBSPF2_BUILDLINK3_MK)
+LIBSPF2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibspf2}
-BUILDLINK_PACKAGES+=	libspf2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspf2
-
-.if ${LIBSPF2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libspf2+=	libspf2>=1.2.5
 BUILDLINK_PKGSRCDIR.libspf2?=	../../mail/libspf2
-.endif	# LIBSPF2_BUILDLINK3_MK
+.endif # LIBSPF2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libspf2
diff --git a/mail/libsylph/buildlink3.mk b/mail/libsylph/buildlink3.mk
index ef1127156b3..f45a9ef938e 100644
--- a/mail/libsylph/buildlink3.mk
+++ b/mail/libsylph/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/01/18 05:08:26 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSYLPH_BUILDLINK3_MK:=	${LIBSYLPH_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libsylph
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libsylph
-.endif
+.if !defined(LIBSYLPH_BUILDLINK3_MK)
+LIBSYLPH_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsylph}
-BUILDLINK_PACKAGES+=	libsylph
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsylph
-
-.if ${LIBSYLPH_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libsylph+=	libsylph>=0.3.0
 BUILDLINK_ABI_DEPENDS.libsylph?=	libsylph>=0.3.0nb1
 BUILDLINK_PKGSRCDIR.libsylph?=	../../mail/libsylph
-.endif	# LIBSYLPH_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.endif # LIBSYLPH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libsylph
diff --git a/mail/libytnef/buildlink3.mk b/mail/libytnef/buildlink3.mk
index 739da777aab..bb1df62954b 100644
--- a/mail/libytnef/buildlink3.mk
+++ b/mail/libytnef/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/01/09 03:53:10 smb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBYTNEF_BUILDLINK3_MK:=	${LIBYTNEF_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libytnef
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libytnef
-.endif
+.if !defined(LIBYTNEF_BUILDLINK3_MK)
+LIBYTNEF_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibytnef}
-BUILDLINK_PACKAGES+=	libytnef
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libytnef
-
-.if ${LIBYTNEF_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libytnef+=	libytnef>=1.5
 BUILDLINK_PKGSRCDIR.libytnef?=	../../mail/libytnef
-.endif	# LIBYTNEF_BUILDLINK3_MK
+.endif # LIBYTNEF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libytnef
diff --git a/mail/mew/buildlink3.mk b/mail/mew/buildlink3.mk
index 2da53354f45..4f4a85d1404 100644
--- a/mail/mew/buildlink3.mk
+++ b/mail/mew/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:24:56 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MEW_BUILDLINK3_MK:=	${MEW_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mew
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	mew
-.endif
+.if !defined(MEW_BUILDLINK3_MK)
+MEW_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmew}
-BUILDLINK_PACKAGES+=	mew
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mew
-
-.if ${MEW_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mew+=	${EMACS_PKGNAME_PREFIX}mew>=5
 BUILDLINK_PKGSRCDIR.mew?=	../../mail/mew
-.endif	# MEW_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.mew=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # MEW_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mew
diff --git a/mail/perdition/buildlink3.mk b/mail/perdition/buildlink3.mk
index d1689bbda05..3b883d19b13 100644
--- a/mail/perdition/buildlink3.mk
+++ b/mail/perdition/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:56 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PERDITION_BUILDLINK3_MK:=	${PERDITION_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	perdition
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	perdition
-.endif
+.if !defined(PERDITION_BUILDLINK3_MK)
+PERDITION_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nperdition}
-BUILDLINK_PACKAGES+=	perdition
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}perdition
-
-.if !empty(PERDITION_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.perdition+=	perdition>=1.17
 BUILDLINK_ABI_DEPENDS.perdition?=	perdition>=1.17nb1
 BUILDLINK_PKGSRCDIR.perdition?=	../../mail/perdition
-.endif	# PERDITION_BUILDLINK3_MK
 
 # The following are included in Makefile.common for "configure"'s sake.
 #.include "../../devel/popt/buildlink3.mk"
 #.include "../../devel/vanessa_adt/buildlink3.mk"
 #.include "../../devel/vanessa_logger/buildlink3.mk"
 #.include "../../devel/vanessa_socket/buildlink3.mk"
+.endif # PERDITION_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-perdition
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index 8039bcf7cd4..8fc1ef4c4ec 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.20 2008/12/04 07:18:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:24:56 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SQUIRRELMAIL_BUILDLINK3_MK:=	${SQUIRRELMAIL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	squirrelmail
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	squirrelmail
-.endif
+.if !defined(SQUIRRELMAIL_BUILDLINK3_MK)
+SQUIRRELMAIL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsquirrelmail}
-BUILDLINK_PACKAGES+=	squirrelmail
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}squirrelmail
-
-.if ${SQUIRRELMAIL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.17
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
-.endif	# SQUIRRELMAIL_BUILDLINK3_MK
+.endif # SQUIRRELMAIL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-squirrelmail
author	joerg <joerg@pkgsrc.org>	2009-03-20 19:23:50 +0000
committer	joerg <joerg@pkgsrc.org>	2009-03-20 19:23:50 +0000
commit	2d1ba244e90207d03eef397a99aa4091baeec5b3 (patch)
tree	647e974495c5d41703d41ca2e71c9b6063b9153a /mail
parent	4bf0a20854ae9e07b7965977a713f2efee890976 (diff)
download	pkgsrc-2d1ba244e90207d03eef397a99aa4091baeec5b3.tar.gz