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.

5 files changed, 30 insertions, 65 deletions

diff --git a/time/libical/buildlink3.mk b/time/libical/buildlink3.mk
index acbc8706ee4..11457565f1d 100644
--- a/time/libical/buildlink3.mk
+++ b/time/libical/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/19 21:48:05 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBICAL_BUILDLINK3_MK:=	${LIBICAL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libical
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libical
-.endif
+.if !defined(LIBICAL_BUILDLINK3_MK)
+LIBICAL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibical}
-BUILDLINK_PACKAGES+=	libical
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libical
-
-.if ${LIBICAL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libical+=	libical>=0.42
 BUILDLINK_PKGSRCDIR.libical?=	../../time/libical
-.endif	# LIBICAL_BUILDLINK3_MK
+.endif # LIBICAL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libical
diff --git a/time/py-mxDateTime/buildlink3.mk b/time/py-mxDateTime/buildlink3.mk
index 7c99741d404..248165078f6 100644
--- a/time/py-mxDateTime/buildlink3.mk
+++ b/time/py-mxDateTime/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 17:30:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:34 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PY_MXDATETIME_BUILDLINK3_MK:=	${PY_MXDATETIME_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	py-mxDateTime
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	py-mxDateTime
-.endif
+.if !defined(PY_MXDATETIME_BUILDLINK3_MK)
+PY_MXDATETIME_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-mxDateTime}
-BUILDLINK_PACKAGES+=	py-mxDateTime
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-mxDateTime
-
-.if !empty(PY_MXDATETIME_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-mxDateTime+=	${PYPKGPREFIX}-mxDateTime>=2.0.5
 BUILDLINK_ABI_DEPENDS.py-mxDateTime?=	${PYPKGPREFIX}-mxDateTime>=2.0.6nb1
 BUILDLINK_PKGSRCDIR.py-mxDateTime?=	../../time/py-mxDateTime
 BUILDLINK_INCDIRS.py-mxDateTime+=	${PYSITELIB}/mx/DateTime/mxDateTime
-.endif	# PY_MXDATETIME_BUILDLINK3_MK
+.endif # PY_MXDATETIME_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-py-mxDateTime
diff --git a/time/xfce4-datetime-plugin/buildlink3.mk b/time/xfce4-datetime-plugin/buildlink3.mk
index 8dec343a651..7e61f6c3d0c 100644
--- a/time/xfce4-datetime-plugin/buildlink3.mk
+++ b/time/xfce4-datetime-plugin/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/04/12 09:55:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:34 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:=	${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-datetime-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-datetime-plugin
-.endif
+.if !defined(XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK)
+XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-datetime-plugin}
-BUILDLINK_PACKAGES+=	xfce4-datetime-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-datetime-plugin
-
-.if ${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-datetime-plugin+=	xfce4-datetime-plugin>=0.4.1
 BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?=	../../time/xfce4-datetime-plugin
-.endif	# XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-datetime-plugin
diff --git a/time/xfce4-orage/buildlink3.mk b/time/xfce4-orage/buildlink3.mk
index 0025e6052ea..b86b618ca5f 100644
--- a/time/xfce4-orage/buildlink3.mk
+++ b/time/xfce4-orage/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:34 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_ORAGE_BUILDLINK3_MK:=	${XFCE4_ORAGE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-orage
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-orage
-.endif
+.if !defined(XFCE4_ORAGE_BUILDLINK3_MK)
+XFCE4_ORAGE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-orage}
-BUILDLINK_PACKAGES+=	xfce4-orage
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-orage
-
-.if ${XFCE4_ORAGE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-orage+=	xfce4-orage>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-orage?=	../../time/xfce4-orage
-.endif	# XFCE4_ORAGE_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_ORAGE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-orage
diff --git a/time/xfce4-timer-plugin/buildlink3.mk b/time/xfce4-timer-plugin/buildlink3.mk
index ac16ae257db..ec6e87529f4 100644
--- a/time/xfce4-timer-plugin/buildlink3.mk
+++ b/time/xfce4-timer-plugin/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-XFCE4_TIMER_PLUGIN_BUILDLINK3_MK:=	${XFCE4_TIMER_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-timer-plugin
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-timer-plugin
-.endif
+.if !defined(XFCE4_TIMER_PLUGIN_BUILDLINK3_MK)
+XFCE4_TIMER_PLUGIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-timer-plugin}
-BUILDLINK_PACKAGES+=	xfce4-timer-plugin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-timer-plugin
-
-.if ${XFCE4_TIMER_PLUGIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-timer-plugin+=	xfce4-timer-plugin>=0.5.1
 BUILDLINK_PKGSRCDIR.xfce4-timer-plugin?=	../../time/xfce4-timer-plugin
-.endif	# XFCE4_TIMER_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_TIMER_PLUGIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-timer-plugin