Track information in a new variable BUILDLINK_ORDER that informs us

of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.

5 files changed, 10 insertions, 5 deletions

diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk
index e479ee70fd4..4aa0121aa28 100644
--- a/fonts/Xft2/buildlink3.mk
+++ b/fonts/Xft2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:21:59 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 22:39:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFT2_BUILDLINK3_MK:=	${XFT2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=		Xft2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXft2}
 BUILDLINK_PACKAGES+=	Xft2
+BUILDLINK_ORDER+=	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 dd30a5de0ea..63ac92ca43a 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/04/12 10:27:15 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 22:39:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FONTCONFIG_BUILDLINK3_MK:=	${FONTCONFIG_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	fontconfig
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfontconfig}
 BUILDLINK_PACKAGES+=	fontconfig
+BUILDLINK_ORDER+=	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 249abd5d975..ac87f0928df 100644
--- a/fonts/gucharmap/buildlink3.mk
+++ b/fonts/gucharmap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/04/17 13:46:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GUCHARMAP_BUILDLINK3_MK:=	${GUCHARMAP_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gucharmap
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngucharmap}
 BUILDLINK_PACKAGES+=	gucharmap
+BUILDLINK_ORDER+=	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 c056d8e2b22..1b681c0534c 100644
--- a/fonts/mftrace/buildlink3.mk
+++ b/fonts/mftrace/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:15 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MFTRACE_BUILDLINK3_MK:=	${MFTRACE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	mftrace
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmftrace}
 BUILDLINK_PACKAGES+=	mftrace
+BUILDLINK_ORDER+=	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 4d5a681cc97..1a72ac60479 100644
--- a/fonts/t1lib/buildlink3.mk
+++ b/fonts/t1lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:15 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 T1LIB_BUILDLINK3_MK:=	${T1LIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	t1lib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nt1lib}
 BUILDLINK_PACKAGES+=	t1lib
+BUILDLINK_ORDER+=	t1lib
 
 .if !empty(T1LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.t1lib+=	t1lib>=5.0.1