Change the format of BUILDLINK_ORDER to contain depth information as well,

and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.

For example, "make show-buildlink3" in fonts/Xft2 displays:

	zlib
	fontconfig
	    iconv
	    zlib
	    freetype2
	    expat
	freetype2
	Xrender
	    renderproto

5 files changed, 10 insertions, 10 deletions

diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk
index 4aa0121aa28..4004f368c6a 100644
--- a/fonts/Xft2/buildlink3.mk
+++ b/fonts/Xft2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 22:39:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:10:49 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFT2_BUILDLINK3_MK:=	${XFT2_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=		Xft2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXft2}
 BUILDLINK_PACKAGES+=	Xft2
-BUILDLINK_ORDER+=	Xft2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xft2
 
 .if !empty(XFT2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
index 63ac92ca43a..ddc6bb14856 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 22:39:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2006/07/08 23:10:49 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FONTCONFIG_BUILDLINK3_MK:=	${FONTCONFIG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	fontconfig
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfontconfig}
 BUILDLINK_PACKAGES+=	fontconfig
-BUILDLINK_ORDER+=	fontconfig
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fontconfig
 
 .if !empty(FONTCONFIG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fontconfig+=		fontconfig>=1.0.1
diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk
index ac87f0928df..90b2b2be001 100644
--- a/fonts/gucharmap/buildlink3.mk
+++ b/fonts/gucharmap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:49 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GUCHARMAP_BUILDLINK3_MK:=	${GUCHARMAP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gucharmap
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngucharmap}
 BUILDLINK_PACKAGES+=	gucharmap
-BUILDLINK_ORDER+=	gucharmap
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gucharmap
 
 .if !empty(GUCHARMAP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gucharmap+=	gucharmap>=1.4.0
diff --git a/fonts/mftrace/buildlink3.mk b/fonts/mftrace/buildlink3.mk
index 1b681c0534c..85cd1b69168 100644
--- a/fonts/mftrace/buildlink3.mk
+++ b/fonts/mftrace/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:49 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MFTRACE_BUILDLINK3_MK:=	${MFTRACE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	mftrace
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmftrace}
 BUILDLINK_PACKAGES+=	mftrace
-BUILDLINK_ORDER+=	mftrace
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mftrace
 
 .if !empty(MFTRACE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mftrace+=	mftrace>=1.0.19
diff --git a/fonts/t1lib/buildlink3.mk b/fonts/t1lib/buildlink3.mk
index 1a72ac60479..384aef2a6b0 100644
--- a/fonts/t1lib/buildlink3.mk
+++ b/fonts/t1lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:49 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 T1LIB_BUILDLINK3_MK:=	${T1LIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	t1lib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nt1lib}
 BUILDLINK_PACKAGES+=	t1lib
-BUILDLINK_ORDER+=	t1lib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}t1lib
 
 .if !empty(T1LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.t1lib+=	t1lib>=5.0.1