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.

9 files changed, 18 insertions, 9 deletions

diff --git a/misc/Addresses/buildlink3.mk b/misc/Addresses/buildlink3.mk
index a9d48dc1dd4..69be21cfac7 100644
--- a/misc/Addresses/buildlink3.mk
+++ b/misc/Addresses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 ADDRESSES_BUILDLINK3_MK:=	${ADDRESSES_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	Addresses
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NAddresses}
 BUILDLINK_PACKAGES+=	Addresses
+BUILDLINK_ORDER+=	Addresses
 
 .if !empty(ADDRESSES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Addresses+=	Addresses>=0.4.5
diff --git a/misc/goffice/buildlink3.mk b/misc/goffice/buildlink3.mk
index 2a55c75a616..d6f5f272441 100644
--- a/misc/goffice/buildlink3.mk
+++ b/misc/goffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:46:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GOFFICE_BUILDLINK3_MK:=	${GOFFICE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	goffice
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngoffice}
 BUILDLINK_PACKAGES+=	goffice
+BUILDLINK_ORDER+=	goffice
 
 .if !empty(GOFFICE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.goffice+=	goffice>=0.1.2
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index 45131a2077d..090818a0e65 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/04/17 13:46:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEPIM_BUILDLINK3_MK:=	${KDEPIM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	kdepim
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdepim}
 BUILDLINK_PACKAGES+=	kdepim
+BUILDLINK_ORDER+=	kdepim
 
 .if !empty(KDEPIM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdepim+=	kdepim>=3.5.0nb1
diff --git a/misc/koffice/buildlink3.mk b/misc/koffice/buildlink3.mk
index bd13352df23..8b9103bdcef 100644
--- a/misc/koffice/buildlink3.mk
+++ b/misc/koffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/17 13:46:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KOFFICE_BUILDLINK3_MK:=	${KOFFICE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	koffice
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkoffice}
 BUILDLINK_PACKAGES+=	koffice
+BUILDLINK_ORDER+=	koffice
 
 .if !empty(KOFFICE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.koffice?=	koffice>=1.4.2nb5
diff --git a/misc/libcdio/buildlink3.mk b/misc/libcdio/buildlink3.mk
index 61cf026a6fe..39ad46d1406 100644
--- a/misc/libcdio/buildlink3.mk
+++ b/misc/libcdio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:27 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:30 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBCDIO_BUILDLINK3_MK:=	${LIBCDIO_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libcdio
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcdio}
 BUILDLINK_PACKAGES+=	libcdio
+BUILDLINK_ORDER+=	libcdio
 
 .if !empty(LIBCDIO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcdio+=	libcdio>=0.65
diff --git a/misc/libutf/buildlink3.mk b/misc/libutf/buildlink3.mk
index fd513544088..f59bb075141 100644
--- a/misc/libutf/buildlink3.mk
+++ b/misc/libutf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/05/26 21:13:01 agc Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:30 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBUTF_BUILDLINK3_MK:=	${LIBUTF_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libutf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibutf}
 BUILDLINK_PACKAGES+=	libutf
+BUILDLINK_ORDER+=	libutf
 
 .if ${LIBUTF_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libutf+=	libutf>=3.0
diff --git a/misc/proj/buildlink3.mk b/misc/proj/buildlink3.mk
index 3349fc0b42a..8380762c49c 100644
--- a/misc/proj/buildlink3.mk
+++ b/misc/proj/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:27 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:30 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PROJ_BUILDLINK3_MK:=	${PROJ_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	proj
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nproj}
 BUILDLINK_PACKAGES+=	proj
+BUILDLINK_ORDER+=	proj
 
 .if !empty(PROJ_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.proj+=	proj>=4.4.7nb1
diff --git a/misc/rpm/buildlink3.mk b/misc/rpm/buildlink3.mk
index e56dba1a958..b8c61af4a29 100644
--- a/misc/rpm/buildlink3.mk
+++ b/misc/rpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:27 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:30 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RPM_BUILDLINK3_MK:=	${RPM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	rpm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrpm}
 BUILDLINK_PACKAGES+=	rpm
+BUILDLINK_ORDER+=	rpm
 
 .if !empty(RPM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rpm+=	rpm>=2.5.4nb4
diff --git a/misc/xfce4-weather-plugin/buildlink3.mk b/misc/xfce4-weather-plugin/buildlink3.mk
index a9087dd0c03..2279015f927 100644
--- a/misc/xfce4-weather-plugin/buildlink3.mk
+++ b/misc/xfce4-weather-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:30 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-weather-plugin
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-weather-plugin}
 BUILDLINK_PACKAGES+=	xfce4-weather-plugin
+BUILDLINK_ORDER+=	xfce4-weather-plugin
 
 .if !empty(XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-weather-plugin+=	xfce4-weather-plugin>=0.4.9