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.

7 files changed, 42 insertions, 91 deletions

diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk
index 9e072c839ab..54d23c7ae5a 100644
--- a/fonts/Xft2/buildlink3.mk
+++ b/fonts/Xft2/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:32:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:33 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XFT2_BUILDLINK3_MK:=	${XFT2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	Xft2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=		Xft2
-.endif
+.if !defined(XFT2_BUILDLINK3_MK)
+XFT2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXft2}
-BUILDLINK_PACKAGES+=	Xft2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xft2
-
-.if !empty(XFT2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1
 BUILDLINK_ABI_DEPENDS.Xft2+=	Xft2>=2.1.7nb2
 BUILDLINK_PKGSRCDIR.Xft2?=	../../fonts/Xft2
-.endif	# XFT2_BUILDLINK3_MK
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
+.endif # XFT2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-Xft2
diff --git a/fonts/font-util/buildlink3.mk b/fonts/font-util/buildlink3.mk
index 7c276338896..0146f6f57f4 100644
--- a/fonts/font-util/buildlink3.mk
+++ b/fonts/font-util/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 20:15:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:34 joerg Exp $
 
 BUILDLINK_DEPMETHOD.font-util?=	build
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FONT_UTIL_BUILDLINK3_MK:=	${FONT_UTIL_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	font-util
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	font-util
-.endif
+.if !defined(FONT_UTIL_BUILDLINK3_MK)
+FONT_UTIL_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfont-util}
-BUILDLINK_PACKAGES+=	font-util
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}font-util
-
-.if ${FONT_UTIL_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.font-util+=	font-util>=1.0.1
 BUILDLINK_PKGSRCDIR.font-util?=	../../fonts/font-util
-.endif	# FONT_UTIL_BUILDLINK3_MK
+.endif # FONT_UTIL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-font-util
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
index 4bce66fa107..28d8c7b391f 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.25 2007/10/16 18:12:56 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:34 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FONTCONFIG_BUILDLINK3_MK:=	${FONTCONFIG_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	fontconfig
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	fontconfig
-.endif
+.if !defined(FONTCONFIG_BUILDLINK3_MK)
+FONTCONFIG_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfontconfig}
-BUILDLINK_PACKAGES+=	fontconfig
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fontconfig
-
-.if !empty(FONTCONFIG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.4.2
 BUILDLINK_PKGSRCDIR.fontconfig?=	../../fonts/fontconfig
-.endif	# FONTCONFIG_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.endif # FONTCONFIG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-fontconfig
diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk
index 5d10f5f3a60..9f190c12841 100644
--- a/fonts/gucharmap/buildlink3.mk
+++ b/fonts/gucharmap/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/03/15 19:42:26 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:24:34 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GUCHARMAP_BUILDLINK3_MK:=	${GUCHARMAP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gucharmap
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gucharmap
-.endif
+.if !defined(GUCHARMAP_BUILDLINK3_MK)
+GUCHARMAP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngucharmap}
-BUILDLINK_PACKAGES+=	gucharmap
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gucharmap
-
-.if !empty(GUCHARMAP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gucharmap+=	gucharmap>=2.24.1
 BUILDLINK_PKGSRCDIR.gucharmap?=	../../fonts/gucharmap
-.endif	# GUCHARMAP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GUCHARMAP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gucharmap
diff --git a/fonts/libfontenc/buildlink3.mk b/fonts/libfontenc/buildlink3.mk
index d1ff58bd825..e04a6bb5fcb 100644
--- a/fonts/libfontenc/buildlink3.mk
+++ b/fonts/libfontenc/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/06/30 03:06:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:34 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBFONTENC_BUILDLINK3_MK:=	${LIBFONTENC_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libfontenc
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	libfontenc
-.endif
+.if !defined(LIBFONTENC_BUILDLINK3_MK)
+LIBFONTENC_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibfontenc}
-BUILDLINK_PACKAGES+=	libfontenc
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfontenc
-
-.if ${LIBFONTENC_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libfontenc+=	libfontenc>=0.99
 BUILDLINK_PKGSRCDIR.libfontenc?=	../../fonts/libfontenc
-.endif	# LIBFONTENC_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
+.endif # LIBFONTENC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libfontenc
diff --git a/fonts/mftrace/buildlink3.mk b/fonts/mftrace/buildlink3.mk
index 85cd1b69168..c95060b5b6f 100644
--- a/fonts/mftrace/buildlink3.mk
+++ b/fonts/mftrace/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:34 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MFTRACE_BUILDLINK3_MK:=	${MFTRACE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	mftrace
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mftrace
-.endif
+.if !defined(MFTRACE_BUILDLINK3_MK)
+MFTRACE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmftrace}
-BUILDLINK_PACKAGES+=	mftrace
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mftrace
-
-.if !empty(MFTRACE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mftrace+=	mftrace>=1.0.19
 BUILDLINK_ABI_DEPENDS.mftrace?=	mftrace>=1.1.1nb3
 BUILDLINK_PKGSRCDIR.mftrace?=	../../fonts/mftrace
-.endif	# MFTRACE_BUILDLINK3_MK
+.endif # MFTRACE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mftrace
diff --git a/fonts/t1lib/buildlink3.mk b/fonts/t1lib/buildlink3.mk
index 384aef2a6b0..c6b464a03db 100644
--- a/fonts/t1lib/buildlink3.mk
+++ b/fonts/t1lib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:34 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-T1LIB_BUILDLINK3_MK:=	${T1LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	t1lib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	t1lib
-.endif
+.if !defined(T1LIB_BUILDLINK3_MK)
+T1LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nt1lib}
-BUILDLINK_PACKAGES+=	t1lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}t1lib
-
-.if !empty(T1LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.t1lib+=	t1lib>=5.0.1
 BUILDLINK_ABI_DEPENDS.t1lib+=	t1lib>=5.1.0nb5
 BUILDLINK_PKGSRCDIR.t1lib?=	../../fonts/t1lib
-.endif	# T1LIB_BUILDLINK3_MK
+.endif # T1LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-t1lib