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/emulators/DatLib/buildlink3.mk b/emulators/DatLib/buildlink3.mk
index 191e32785c0..dde49b66d14 100644
--- a/emulators/DatLib/buildlink3.mk
+++ b/emulators/DatLib/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/02/26 00:00:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:32 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DATLIB_BUILDLINK3_MK:=	${DATLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	DatLib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	DatLib
-.endif
+.if !defined(DATLIB_BUILDLINK3_MK)
+DATLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NDatLib}
-BUILDLINK_PACKAGES+=	DatLib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}DatLib
-
-.if !empty(DATLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.DatLib+=	DatLib>=2.20
 BUILDLINK_PKGSRCDIR.DatLib?=	../../emulators/DatLib
-.endif	# DATLIB_BUILDLINK3_MK
+.endif # DATLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-DatLib
diff --git a/emulators/cygwin_lib/buildlink3.mk b/emulators/cygwin_lib/buildlink3.mk
index a8a17e99f08..fd0866af54c 100644
--- a/emulators/cygwin_lib/buildlink3.mk
+++ b/emulators/cygwin_lib/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:32 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CYGWIN_LIB_BUILDLINK3_MK:=	${CYGWIN_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	cygwin_lib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cygwin_lib
-.endif
+.if !defined(CYGWIN_LIB_BUILDLINK3_MK)
+CYGWIN_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncygwin_lib}
-BUILDLINK_PACKAGES+=	cygwin_lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cygwin_lib
-
-.if !empty(CYGWIN_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cygwin_lib+=		cygwin_lib>=1.5.11.1
 BUILDLINK_PKGSRCDIR.cygwin_lib?=	../../emulators/cygwin_lib
-.endif	# CYGWIN_LIB_BUILDLINK3_MK
+.endif # CYGWIN_LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-cygwin_lib
diff --git a/emulators/gpsim-devel/buildlink3.mk b/emulators/gpsim-devel/buildlink3.mk
index d43784b9f52..44e869930e5 100644
--- a/emulators/gpsim-devel/buildlink3.mk
+++ b/emulators/gpsim-devel/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/01/27 10:58:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:33 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GPSIM_BUILDLINK3_MK:=	${GPSIM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gpsim
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gpsim
-.endif
+.if !defined(GPSIM_BUILDLINK3_MK)
+GPSIM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngpsim}
-BUILDLINK_PACKAGES+=	gpsim
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gpsim
-
-.if !empty(GPSIM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gpsim+=	gpsim>=20050905
 BUILDLINK_ABI_DEPENDS.gpsim+=	gpsim>=20050905nb3
 BUILDLINK_PKGSRCDIR.gpsim?=	../../emulators/gpsim-devel
-.endif	# GPSIM_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"
+.endif # GPSIM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gpsim
diff --git a/emulators/libspectrum/buildlink3.mk b/emulators/libspectrum/buildlink3.mk
index 06643914d52..e12dd786efc 100644
--- a/emulators/libspectrum/buildlink3.mk
+++ b/emulators/libspectrum/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:33 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSPECTRUM_BUILDLINK3_MK:=	${LIBSPECTRUM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	libspectrum
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libspectrum
-.endif
+.if !defined(LIBSPECTRUM_BUILDLINK3_MK)
+LIBSPECTRUM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibspectrum}
-BUILDLINK_PACKAGES+=	libspectrum
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspectrum
-
-.if !empty(LIBSPECTRUM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libspectrum+=		libspectrum>=0.2.2
 BUILDLINK_ABI_DEPENDS.libspectrum+=	libspectrum>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.libspectrum?=	../../emulators/libspectrum
-.endif	# LIBSPECTRUM_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
+.endif # LIBSPECTRUM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-libspectrum
diff --git a/emulators/lrmi/buildlink3.mk b/emulators/lrmi/buildlink3.mk
index 5465677d726..4fa23d02e4f 100644
--- a/emulators/lrmi/buildlink3.mk
+++ b/emulators/lrmi/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:33 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LRMI_BUILDLINK3_MK:=	${LRMI_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	lrmi
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	lrmi
-.endif
+.if !defined(LRMI_BUILDLINK3_MK)
+LRMI_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlrmi}
-BUILDLINK_PACKAGES+=	lrmi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lrmi
-
-.if !empty(LRMI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lrmi+=	lrmi>=0.8nb1
 BUILDLINK_PKGSRCDIR.lrmi?=	../../emulators/lrmi
-.endif	# LRMI_BUILDLINK3_MK
+.endif # LRMI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-lrmi
diff --git a/emulators/wine-devel/buildlink3.mk b/emulators/wine-devel/buildlink3.mk
index be31710e53c..6dabcbe8644 100644
--- a/emulators/wine-devel/buildlink3.mk
+++ b/emulators/wine-devel/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:33 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WINE_BUILDLINK3_MK:=	${WINE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	wine
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	wine
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwine}
-BUILDLINK_PACKAGES+=	wine
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wine
+.if !defined(WINE_BUILDLINK3_MK)
+WINE_BUILDLINK3_MK:=
 
-.if ${WINE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.wine+=	wine>=0.9.6nb1
 BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
-.endif	# WINE_BUILDLINK3_MK
 
 pkgbase:= wine
 .include "../../mk/pkg-build-options.mk"
@@ -26,5 +18,6 @@ pkgbase:= wine
 .endif
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
+.endif # WINE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-wine
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index 61a01cd16a2..25398b5dadc 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/03/18 11:11:09 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:33 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WINE_BUILDLINK3_MK:=	${WINE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	wine
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	wine
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwine}
-BUILDLINK_PACKAGES+=	wine
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wine
+.if !defined(WINE_BUILDLINK3_MK)
+WINE_BUILDLINK3_MK:=
 
-.if ${WINE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.wine+=	wine>=0.9.6nb1
 BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
-.endif	# WINE_BUILDLINK3_MK
 
 pkgbase:= wine
 .include "../../mk/pkg-build-options.mk"
@@ -26,5 +18,6 @@ pkgbase:= wine
 .endif
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
+.endif # WINE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-wine