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/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index 04f2b4eb4e5..ac6e603a341 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/17 13:46:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 METACITY_BUILDLINK3_MK:=	${METACITY_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	metacity
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmetacity}
 BUILDLINK_PACKAGES+=	metacity
+BUILDLINK_ORDER+=	metacity
 
 .if !empty(METACITY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.metacity+=	metacity>=2.8.5
diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk
index bc961a04c2d..1aa1a30542a 100644
--- a/wm/openbox/buildlink3.mk
+++ b/wm/openbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENBOX_BUILDLINK3_MK:=	${OPENBOX_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	openbox
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenbox}
 BUILDLINK_PACKAGES+=	openbox
+BUILDLINK_ORDER+=	openbox
 
 .if !empty(OPENBOX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openbox+=	openbox>=3.1
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index f39ca7f549e..308f0cc53af 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/17 13:46:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WINDOWMAKER_BUILDLINK3_MK:=	${WINDOWMAKER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	windowmaker
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwindowmaker}
 BUILDLINK_PACKAGES+=	windowmaker
+BUILDLINK_ORDER+=	windowmaker
 
 .if !empty(WINDOWMAKER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.windowmaker+=		windowmaker>=0.80.2nb3
diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk
index 84500e9ee4c..8ae40b884b4 100644
--- a/wm/xfce4-wm-themes/buildlink3.mk
+++ b/wm/xfce4-wm-themes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_WM_THEMES_BUILDLINK3_MK:=	${XFCE4_WM_THEMES_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-wm-themes
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wm-themes}
 BUILDLINK_PACKAGES+=	xfce4-wm-themes
+BUILDLINK_ORDER+=	xfce4-wm-themes
 
 .if !empty(XFCE4_WM_THEMES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.2.3
diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk
index c19fe6def8c..df9bf72fb56 100644
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_WM_BUILDLINK3_MK:=	${XFCE4_WM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-wm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wm}
 BUILDLINK_PACKAGES+=	xfce4-wm
+BUILDLINK_ORDER+=	xfce4-wm
 
 .if !empty(XFCE4_WM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-wm+=	xfce4-wm>=4.2.3.2