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/games/ggz-client-libs/buildlink3.mk b/games/ggz-client-libs/buildlink3.mk
index 6a0e83b07e3..75e43e94382 100644
--- a/games/ggz-client-libs/buildlink3.mk
+++ b/games/ggz-client-libs/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/25 23:24:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:34 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GGZ_CLIENT_LIBS_BUILDLINK3_MK:=	${GGZ_CLIENT_LIBS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	ggz-client-libs
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	ggz-client-libs
-.endif
+.if !defined(GGZ_CLIENT_LIBS_BUILDLINK3_MK)
+GGZ_CLIENT_LIBS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nggz-client-libs}
-BUILDLINK_PACKAGES+=	ggz-client-libs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ggz-client-libs
-
-.if ${GGZ_CLIENT_LIBS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.ggz-client-libs+=	ggz-client-libs>=0.0.14.1
 BUILDLINK_PKGSRCDIR.ggz-client-libs?=	../../games/ggz-client-libs
-.endif	# GGZ_CLIENT_LIBS_BUILDLINK3_MK
 
 .include "../../games/libggz/buildlink3.mk"
+.endif # GGZ_CLIENT_LIBS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-ggz-client-libs
diff --git a/games/kdegames3/buildlink3.mk b/games/kdegames3/buildlink3.mk
index ded6a7ba7bc..73577d59c7c 100644
--- a/games/kdegames3/buildlink3.mk
+++ b/games/kdegames3/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:06:35 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:34 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-KDEGAMES_BUILDLINK3_MK:=	${KDEGAMES_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	kdegames
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	kdegames
-.endif
+.if !defined(KDEGAMES_BUILDLINK3_MK)
+KDEGAMES_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdegames}
-BUILDLINK_PACKAGES+=	kdegames
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdegames
-
-.if !empty(KDEGAMES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdegames+=	kdegames>=3.5.0nb1
 BUILDLINK_ABI_DEPENDS.kdegames?=	kdegames>=3.5.8nb2
 BUILDLINK_PKGSRCDIR.kdegames?=	../../games/kdegames3
-.endif	# KDEGAMES_BUILDLINK3_MK
 
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
+.endif # KDEGAMES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-kdegames
diff --git a/games/libggz/buildlink3.mk b/games/libggz/buildlink3.mk
index 38ab48d6e1b..c5fee5f314e 100644
--- a/games/libggz/buildlink3.mk
+++ b/games/libggz/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/25 23:09:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:34 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBGGZ_BUILDLINK3_MK:=	${LIBGGZ_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libggz
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libggz
-.endif
+.if !defined(LIBGGZ_BUILDLINK3_MK)
+LIBGGZ_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibggz}
-BUILDLINK_PACKAGES+=	libggz
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libggz
-
-.if ${LIBGGZ_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libggz+=	libggz>=0.0.14.1
 BUILDLINK_PKGSRCDIR.libggz?=	../../games/libggz
-.endif	# LIBGGZ_BUILDLINK3_MK
 
 .include "../../security/gnutls/buildlink3.mk"
+.endif # LIBGGZ_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libggz
diff --git a/games/plib/buildlink3.mk b/games/plib/buildlink3.mk
index 87ba9493164..9d8c99d45da 100644
--- a/games/plib/buildlink3.mk
+++ b/games/plib/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:34 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PLIB_BUILDLINK3_MK:=	${PLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	plib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	plib
-.endif
+.if !defined(PLIB_BUILDLINK3_MK)
+PLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nplib}
-BUILDLINK_PACKAGES+=	plib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}plib
-
-.if !empty(PLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.plib+=	plib>=1.6.0
 BUILDLINK_ABI_DEPENDS.plib?=	plib>=1.6.0nb3
 BUILDLINK_PKGSRCDIR.plib?=	../../games/plib
 BUILDLINK_DEPMETHOD.plib?=	build
-.endif	# PLIB_BUILDLINK3_MK
 
 .include "../../graphics/Mesa/buildlink3.mk"
+.endif # PLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-plib
diff --git a/games/simgear/buildlink3.mk b/games/simgear/buildlink3.mk
index 8d9628ef6e7..3e429368058 100644
--- a/games/simgear/buildlink3.mk
+++ b/games/simgear/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/05 21:17:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:35 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SIMGEAR_BUILDLINK3_MK:=	${SIMGEAR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	simgear
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	simgear
-.endif
+.if !defined(SIMGEAR_BUILDLINK3_MK)
+SIMGEAR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsimgear}
-BUILDLINK_PACKAGES+=	simgear
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}simgear
-
-.if ${SIMGEAR_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.simgear+=	simgear>=1.0.0
 BUILDLINK_PKGSRCDIR.simgear?=	../../games/simgear
 BUILDLINK_DEPMETHOD.simgear?=	build
-.endif	# SIMGEAR_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../games/plib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.endif # SIMGEAR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-simgear