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.

8 files changed, 16 insertions, 8 deletions

diff --git a/converters/fribidi/buildlink3.mk b/converters/fribidi/buildlink3.mk
index 92b49e062d6..dd9611c7487 100644
--- a/converters/fribidi/buildlink3.mk
+++ b/converters/fribidi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:03 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FRIBIDI_BUILDLINK3_MK:=	${FRIBIDI_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	fribidi
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfribidi}
 BUILDLINK_PACKAGES+=	fribidi
+BUILDLINK_ORDER+=	fribidi
 
 .if !empty(FRIBIDI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fribidi+=	fribidi>=0.10.4
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index 236721d0c43..1b22ee0ca19 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/04/06 06:21:40 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=	${ICONV_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	iconv
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Niconv}
 BUILDLINK_PACKAGES+=	iconv
+BUILDLINK_ORDER+=	iconv
 
 .if !empty(ICONV_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.iconv+=	libiconv>=1.9.1
diff --git a/converters/libwpd/buildlink3.mk b/converters/libwpd/buildlink3.mk
index 5f3a5a19c72..7e6398dbc8a 100644
--- a/converters/libwpd/buildlink3.mk
+++ b/converters/libwpd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:40 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWPD_BUILDLINK3_MK:=	${LIBWPD_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libwpd
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwpd}
 BUILDLINK_PACKAGES+=	libwpd
+BUILDLINK_ORDER+=	libwpd
 
 .if !empty(LIBWPD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libwpd+=	libwpd>=0.8.1nb1
diff --git a/converters/psiconv/buildlink3.mk b/converters/psiconv/buildlink3.mk
index c2b8cc6ed83..a86238a8436 100644
--- a/converters/psiconv/buildlink3.mk
+++ b/converters/psiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:03 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PSICONV_BUILDLINK3_MK:=	${PSICONV_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	psiconv
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npsiconv}
 BUILDLINK_PACKAGES+=	psiconv
+BUILDLINK_ORDER+=	psiconv
 
 .if !empty(PSICONV_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.psiconv+=	psiconv>=0.8.3nb1
diff --git a/converters/recode/buildlink3.mk b/converters/recode/buildlink3.mk
index 4f131e7f83a..78e18621bb9 100644
--- a/converters/recode/buildlink3.mk
+++ b/converters/recode/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RECODE_BUILDLINK3_MK:=	${RECODE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	recode
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrecode}
 BUILDLINK_PACKAGES+=	recode
+BUILDLINK_ORDER+=	recode
 
 .if !empty(RECODE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.recode+=	recode>=3.6nb1
diff --git a/converters/uulib/buildlink3.mk b/converters/uulib/buildlink3.mk
index 044696d34d9..efa0f0feb4e 100644
--- a/converters/uulib/buildlink3.mk
+++ b/converters/uulib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 UULIB_BUILDLINK3_MK:=	${UULIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	uulib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nuulib}
 BUILDLINK_PACKAGES+=	uulib
+BUILDLINK_ORDER+=	uulib
 
 .if !empty(UULIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.uulib+=	uulib>=0.5.20
diff --git a/converters/wv/buildlink3.mk b/converters/wv/buildlink3.mk
index 0909405ea9d..d7b51dbfd71 100644
--- a/converters/wv/buildlink3.mk
+++ b/converters/wv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/17 13:46:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WV_BUILDLINK3_MK:=	${WV_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	wv
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwv}
 BUILDLINK_PACKAGES+=	wv
+BUILDLINK_ORDER+=	wv
 
 .if !empty(WV_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wv+=		wv>=1.0.0
diff --git a/converters/wv2/buildlink3.mk b/converters/wv2/buildlink3.mk
index 956dbca3296..2aea54caeee 100644
--- a/converters/wv2/buildlink3.mk
+++ b/converters/wv2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WV2_BUILDLINK3_MK:=	${WV2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	wv2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwv2}
 BUILDLINK_PACKAGES+=	wv2
+BUILDLINK_ORDER+=	wv2
 
 .if !empty(WV2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wv2?=		wv2>=0.2.2nb1