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.

8 files changed, 48 insertions, 105 deletions

diff --git a/wm/blackbox70/buildlink3.mk b/wm/blackbox70/buildlink3.mk
index 1d54581158a..5534fe7ebea 100644
--- a/wm/blackbox70/buildlink3.mk
+++ b/wm/blackbox70/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/02/01 21:56:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:34 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-BLACKBOX70_BUILDLINK3_MK:=	${BLACKBOX70_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	blackbox70
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	blackbox70
-.endif
+.if !defined(BLACKBOX70_BUILDLINK3_MK)
+BLACKBOX70_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblackbox70}
-BUILDLINK_PACKAGES+=	blackbox70
-BUILDLINK_ORDER:=       ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}blackbox70
-
-.if !empty(BLACKBOX70_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.blackbox70+=	blackbox70>=0.70.0
 BUILDLINK_ABI_DEPENDS.blackbox70+=	blackbox70>=0.70.0
 BUILDLINK_PKGSRCDIR.blackbox70?=	../../wm/blackbox70
-.endif	# BLACKBOX70_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
+.endif # BLACKBOX70_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-blackbox70
diff --git a/wm/compiz-fusion-plugins-main/buildlink3.mk b/wm/compiz-fusion-plugins-main/buildlink3.mk
index f2f6952e8d0..04633250bbd 100644
--- a/wm/compiz-fusion-plugins-main/buildlink3.mk
+++ b/wm/compiz-fusion-plugins-main/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/05/12 13:19:17 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK:=	${COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	compiz-fusion-plugins-main
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	compiz-fusion-plugins-main
-.endif
+.if !defined(COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK)
+COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncompiz-fusion-plugins-main}
-BUILDLINK_PACKAGES+=	compiz-fusion-plugins-main
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compiz-fusion-plugins-main
-
-.if ${COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.compiz-fusion-plugins-main+=	compiz-fusion-plugins-main>=0.6.0nb1
 BUILDLINK_PKGSRCDIR.compiz-fusion-plugins-main?=	../../wm/compiz-fusion-plugins-main
-.endif	# COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK
 
 .include "../../wm/compiz/buildlink3.mk"
+.endif # COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-compiz-fusion-plugins-main
diff --git a/wm/compiz/buildlink3.mk b/wm/compiz/buildlink3.mk
index c59d53a4406..485aeb7e49b 100644
--- a/wm/compiz/buildlink3.mk
+++ b/wm/compiz/buildlink3.mk
@@ -1,21 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/04/23 18:34:52 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-COMPIZ_BUILDLINK3_MK:=	${COMPIZ_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	compiz
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	compiz
-.endif
+.if !defined(COMPIZ_BUILDLINK3_MK)
+COMPIZ_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncompiz}
-BUILDLINK_PACKAGES+=	compiz
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compiz
-
-.if ${COMPIZ_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.compiz+=	compiz>=0.6.2
 BUILDLINK_PKGSRCDIR.compiz?=	../../wm/compiz
-.endif	# COMPIZ_BUILDLINK3_MK
-
 
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
@@ -35,5 +26,6 @@ BUILDLINK_PKGSRCDIR.compiz?=	../../wm/compiz
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
+.endif # COMPIZ_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-compiz
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index 4a53c731def..005ae536c3a 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.19 2008/04/15 17:53:51 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:25:35 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-METACITY_BUILDLINK3_MK:=	${METACITY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	metacity
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	metacity
-.endif
+.if !defined(METACITY_BUILDLINK3_MK)
+METACITY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmetacity}
-BUILDLINK_PACKAGES+=	metacity
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}metacity
-
-.if !empty(METACITY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.metacity+=	metacity>=2.8.5
 BUILDLINK_ABI_DEPENDS.metacity+=	metacity>=2.14.1nb1
 BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity
-.endif	# METACITY_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
@@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
+.endif # METACITY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-metacity
diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk
index 478fbd7f604..3d2ae1cdcae 100644
--- a/wm/openbox/buildlink3.mk
+++ b/wm/openbox/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/12/15 20:33:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:35 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPENBOX_BUILDLINK3_MK:=	${OPENBOX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	openbox
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openbox
-.endif
+.if !defined(OPENBOX_BUILDLINK3_MK)
+OPENBOX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenbox}
-BUILDLINK_PACKAGES+=	openbox
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openbox
-
-.if !empty(OPENBOX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openbox+=	openbox>=3.1
 BUILDLINK_ABI_DEPENDS.openbox+=	openbox>=3.2nb3
 BUILDLINK_PKGSRCDIR.openbox?=	../../wm/openbox
-.endif	# OPENBOX_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.endif # OPENBOX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-openbox
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index d7c24c774c3..51ca1001946 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:35 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-WINDOWMAKER_BUILDLINK3_MK:=	${WINDOWMAKER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	windowmaker
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	windowmaker
-.endif
+.if !defined(WINDOWMAKER_BUILDLINK3_MK)
+WINDOWMAKER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwindowmaker}
-BUILDLINK_PACKAGES+=	windowmaker
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}windowmaker
-
-.if !empty(WINDOWMAKER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.windowmaker+=		windowmaker>=0.80.2nb3
 BUILDLINK_ABI_DEPENDS.windowmaker+=	windowmaker>=0.92.0nb7
 BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
-.endif	# WINDOWMAKER_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.endif # WINDOWMAKER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-windowmaker
diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk
index b97ea0db45c..4710aab1c99 100644
--- a/wm/xfce4-wm-themes/buildlink3.mk
+++ b/wm/xfce4-wm-themes/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.21 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:35 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_WM_THEMES_BUILDLINK3_MK:=	${XFCE4_WM_THEMES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-wm-themes
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-wm-themes
-.endif
+.if !defined(XFCE4_WM_THEMES_BUILDLINK3_MK)
+XFCE4_WM_THEMES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wm-themes}
-BUILDLINK_PACKAGES+=	xfce4-wm-themes
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wm-themes
-
-.if ${XFCE4_WM_THEMES_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-wm-themes?=	../../wm/xfce4-wm-themes
-.endif	# XFCE4_WM_THEMES_BUILDLINK3_MK
 
 .include "../../wm/xfce4-wm/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_WM_THEMES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-wm-themes
diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk
index 12e3012314a..a38027dfeb0 100644
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.24 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:25:35 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_WM_BUILDLINK3_MK:=	${XFCE4_WM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-wm
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-wm
-.endif
+.if !defined(XFCE4_WM_BUILDLINK3_MK)
+XFCE4_WM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wm}
-BUILDLINK_PACKAGES+=	xfce4-wm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wm
-
-.if ${XFCE4_WM_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-wm+=	xfce4-wm>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-wm?=	../../wm/xfce4-wm
-.endif	# XFCE4_WM_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
@@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.xfce4-wm?=	../../wm/xfce4-wm
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_WM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-wm