From 9430e4930752307717c0058ee21f02a3ea56b0ad Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 8 Jul 2006 22:38:58 +0000
Subject: 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.

---
 x11/Xaw-Xpm/buildlink3.mk                 | 3 ++-
 x11/Xaw3d/buildlink3.mk                   | 3 ++-
 x11/Xbae/buildlink3.mk                    | 3 ++-
 x11/Xcomposite/buildlink3.mk              | 3 ++-
 x11/Xfixes/buildlink3.mk                  | 3 ++-
 x11/XmHTML/buildlink3.mk                  | 3 ++-
 x11/Xrandr-mixedcase/buildlink3.mk        | 3 ++-
 x11/Xrender/buildlink3.mk                 | 3 ++-
 x11/blt/buildlink3.mk                     | 3 ++-
 x11/compositeproto/buildlink3.mk          | 3 ++-
 x11/control-center/buildlink3.mk          | 3 ++-
 x11/efltk/buildlink3.mk                   | 3 ++-
 x11/fixesproto/buildlink3.mk              | 3 ++-
 x11/fltk/buildlink3.mk                    | 3 ++-
 x11/fox/buildlink3.mk                     | 3 ++-
 x11/gnome-desktop/buildlink3.mk           | 3 ++-
 x11/gnome-libs/buildlink3.mk              | 3 ++-
 x11/gnome-mag/buildlink3.mk               | 3 ++-
 x11/gnome-panel/buildlink3.mk             | 3 ++-
 x11/gnome2-control-center/buildlink3.mk   | 3 ++-
 x11/gnustep-back/buildlink3.mk            | 3 ++-
 x11/gnustep-gui/buildlink3.mk             | 3 ++-
 x11/gnustep-preferences/buildlink3.mk     | 3 ++-
 x11/gtk+extra/buildlink3.mk               | 3 ++-
 x11/gtk/buildlink3.mk                     | 3 ++-
 x11/gtk2+extra/buildlink3.mk              | 3 ++-
 x11/gtk2-engines/buildlink3.mk            | 3 ++-
 x11/gtk2/buildlink3.mk                    | 3 ++-
 x11/gtkglarea/buildlink3.mk               | 3 ++-
 x11/gtkglarea2/buildlink3.mk              | 3 ++-
 x11/gtkmm/buildlink3.mk                   | 3 ++-
 x11/gtksourceview/buildlink3.mk           | 3 ++-
 x11/gtoolkit/buildlink3.mk                | 3 ++-
 x11/kdebase3/buildlink3.mk                | 3 ++-
 x11/kdelibs3/buildlink3.mk                | 3 ++-
 x11/lablgtk/buildlink3.mk                 | 3 ++-
 x11/lablgtk2/buildlink3.mk                | 3 ++-
 x11/lesstif/buildlink3.mk                 | 3 ++-
 x11/libexo/buildlink3.mk                  | 3 ++-
 x11/libxfce4gui/buildlink3.mk             | 3 ++-
 x11/libxfce4mcs/buildlink3.mk             | 3 ++-
 x11/libxfce4util/buildlink3.mk            | 3 ++-
 x11/libxklavier/buildlink3.mk             | 3 ++-
 x11/libzvt/buildlink3.mk                  | 3 ++-
 x11/mowitz/buildlink3.mk                  | 3 ++-
 x11/neXtaw/buildlink3.mk                  | 3 ++-
 x11/ocaml-graphics/buildlink3.mk          | 3 ++-
 x11/openmotif/buildlink3.mk               | 3 ++-
 x11/paragui/buildlink3.mk                 | 3 ++-
 x11/py-Pmw/buildlink3.mk                  | 3 ++-
 x11/py-Tk/buildlink3.mk                   | 3 ++-
 x11/py-Xlib/buildlink3.mk                 | 3 ++-
 x11/py-gnome2-extras/buildlink3.mk        | 3 ++-
 x11/py-gnome2/buildlink3.mk               | 3 ++-
 x11/py-gtk2/buildlink3.mk                 | 3 ++-
 x11/py-qt2-sip/buildlink3.mk              | 3 ++-
 x11/py-qt3-base/buildlink3.mk             | 3 ++-
 x11/py-qt3-modules/buildlink3.mk          | 3 ++-
 x11/py-qt3-sip/buildlink3.mk              | 3 ++-
 x11/py-wxWidgets/buildlink3.mk            | 3 ++-
 x11/pygtk/buildlink3.mk                   | 3 ++-
 x11/qt1/buildlink3.mk                     | 3 ++-
 x11/qt2-designer/buildlink3.mk            | 3 ++-
 x11/qt2-libs/buildlink3.mk                | 3 ++-
 x11/qt3-libs/buildlink3.mk                | 3 ++-
 x11/qt3-qscintilla/buildlink3.mk          | 3 ++-
 x11/qt3-tools/buildlink3.mk               | 3 ++-
 x11/qt4-libs/buildlink3.mk                | 3 ++-
 x11/qt4-tools/buildlink3.mk               | 3 ++-
 x11/randrproto/buildlink3.mk              | 3 ++-
 x11/renderproto/buildlink3.mk             | 3 ++-
 x11/startup-notification/buildlink3.mk    | 3 ++-
 x11/tk-BWidget/buildlink3.mk              | 3 ++-
 x11/tk/buildlink3.mk                      | 3 ++-
 x11/tk83/buildlink3.mk                    | 3 ++-
 x11/vte/buildlink3.mk                     | 3 ++-
 x11/wxGTK-contrib/buildlink3.mk           | 3 ++-
 x11/wxGTK/buildlink3.mk                   | 3 ++-
 x11/wxGTK24/buildlink3.mk                 | 3 ++-
 x11/xcursor/buildlink3.mk                 | 3 ++-
 x11/xextproto/buildlink3.mk               | 3 ++-
 x11/xfce4-clipman-plugin/buildlink3.mk    | 3 ++-
 x11/xfce4-desktop/buildlink3.mk           | 3 ++-
 x11/xfce4-gtk2-engine/buildlink3.mk       | 3 ++-
 x11/xfce4-mcs-manager/buildlink3.mk       | 3 ++-
 x11/xfce4-mcs-plugins/buildlink3.mk       | 3 ++-
 x11/xfce4-notes-plugin/buildlink3.mk      | 3 ++-
 x11/xfce4-panel/buildlink3.mk             | 3 ++-
 x11/xfce4-session/buildlink3.mk           | 3 ++-
 x11/xfce4-taskbar-plugin/buildlink3.mk    | 3 ++-
 x11/xfce4-toys/buildlink3.mk              | 3 ++-
 x11/xfce4-trigger-launcher/buildlink3.mk  | 3 ++-
 x11/xfce4-utils/buildlink3.mk             | 3 ++-
 x11/xfce4-windowlist-plugin/buildlink3.mk | 3 ++-
 x11/xforms/buildlink3.mk                  | 3 ++-
 x11/xosd/buildlink3.mk                    | 3 ++-
 x11/xproto/buildlink3.mk                  | 3 ++-
 x11/xscreensaver/buildlink3.mk            | 3 ++-
 x11/xview-lib/buildlink3.mk               | 3 ++-
 99 files changed, 198 insertions(+), 99 deletions(-)

(limited to 'x11')

diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk
index 3a1a553157f..cf8783d399b 100644
--- a/x11/Xaw-Xpm/buildlink3.mk
+++ b/x11/Xaw-Xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XAW_XPM_BUILDLINK3_MK:=	${XAW_XPM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	Xaw-Xpm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXaw-Xpm}
 BUILDLINK_PACKAGES+=	Xaw-Xpm
+BUILDLINK_ORDER+=	Xaw-Xpm
 
 .if !empty(XAW_XPM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xaw-Xpm+=	Xaw-Xpm>=1.1
diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk
index 4550c2493e7..b7b0f2a54ac 100644
--- a/x11/Xaw3d/buildlink3.mk
+++ b/x11/Xaw3d/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XAW3D_BUILDLINK3_MK:=	${XAW3D_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	Xaw3d
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXaw3d}
 BUILDLINK_PACKAGES+=	Xaw3d
+BUILDLINK_ORDER+=	Xaw3d
 
 .if !empty(XAW3D_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xaw3d+=	Xaw3d>=1.5
diff --git a/x11/Xbae/buildlink3.mk b/x11/Xbae/buildlink3.mk
index 52303d281e5..1025a5d2244 100644
--- a/x11/Xbae/buildlink3.mk
+++ b/x11/Xbae/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XBAE_BUILDLINK3_MK:=	${XBAE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	Xbae
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXbae}
 BUILDLINK_PACKAGES+=	Xbae
+BUILDLINK_ORDER+=	Xbae
 
 .if !empty(XBAE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xbae+=	Xbae>=4.8.4
diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
index e5a99874f8d..5370c9b0b89 100644
--- a/x11/Xcomposite/buildlink3.mk
+++ b/x11/Xcomposite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/18 19:23:46 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XCOMPOSITE_BUILDLINK3_MK:=	${XCOMPOSITE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	Xcomposite
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXcomposite}
 BUILDLINK_PACKAGES+=	Xcomposite
+BUILDLINK_ORDER+=	Xcomposite
 
 .if !empty(XCOMPOSITE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xcomposite+=		Xcomposite>=1.0.1
diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk
index c3e1ec93ad6..2707121f638 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/18 19:23:47 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFIXES_BUILDLINK3_MK:=	${XFIXES_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	Xfixes
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXfixes}
 BUILDLINK_PACKAGES+=	Xfixes
+BUILDLINK_ORDER+=	Xfixes
 
 .if !empty(XFIXES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xfixes+=	Xfixes>=2.0.0
diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk
index 553c4942d0b..946b7ea874c 100644
--- a/x11/XmHTML/buildlink3.mk
+++ b/x11/XmHTML/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:46:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XMHTML_BUILDLINK3_MK:=	${XMHTML_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	XmHTML
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXmHTML}
 BUILDLINK_PACKAGES+=	XmHTML
+BUILDLINK_ORDER+=	XmHTML
 
 .if !empty(XMHTML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb2
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index ffdd8683c1f..8eaee5f2d39 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/04/18 19:23:47 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRANDR_BUILDLINK3_MK:=	${XRANDR_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	Xrandr
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXrandr}
 BUILDLINK_PACKAGES+=	Xrandr
+BUILDLINK_ORDER+=	Xrandr
 
 .if !empty(XRANDR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=0.99
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index 9a6911990fb..bafaf6b95ae 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.39 2006/04/18 19:23:47 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.40 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	Xrender
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXrender}
 BUILDLINK_PACKAGES+=	Xrender
+BUILDLINK_ORDER+=	Xrender
 
 .if !empty(XRENDER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.2
diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk
index 771926a12a2..8a781d15d71 100644
--- a/x11/blt/buildlink3.mk
+++ b/x11/blt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/12 10:27:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BLT_BUILDLINK3_MK:=	${BLT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	blt
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblt}
 BUILDLINK_PACKAGES+=	blt
+BUILDLINK_ORDER+=	blt
 
 .if !empty(BLT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.blt+=		blt>=2.4z
diff --git a/x11/compositeproto/buildlink3.mk b/x11/compositeproto/buildlink3.mk
index ef7fd00c416..e2b381c390d 100644
--- a/x11/compositeproto/buildlink3.mk
+++ b/x11/compositeproto/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/04/18 17:17:50 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPMETHOD.compositeproto?=	build
 
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	compositeproto
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncompositeproto}
 BUILDLINK_PACKAGES+=	compositeproto
+BUILDLINK_ORDER+=	compositeproto
 
 .if !empty(COMPOSITEPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.compositeproto+=	compositeproto>=0.2.1
diff --git a/x11/control-center/buildlink3.mk b/x11/control-center/buildlink3.mk
index adf9d0cba77..b6cbcdef2ec 100644
--- a/x11/control-center/buildlink3.mk
+++ b/x11/control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:46:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CONTROL_CENTER_BUILDLINK3_MK:=	${CONTROL_CENTER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	control-center
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncontrol-center}
 BUILDLINK_PACKAGES+=	control-center
+BUILDLINK_ORDER+=	control-center
 
 .if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.control-center+=	control-center>=1.4.0.4nb9
diff --git a/x11/efltk/buildlink3.mk b/x11/efltk/buildlink3.mk
index bec82062292..54b71b76559 100644
--- a/x11/efltk/buildlink3.mk
+++ b/x11/efltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EFLTK_BUILDLINK3_MK:=	${EFLTK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	efltk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nefltk}
 BUILDLINK_PACKAGES+=	efltk
+BUILDLINK_ORDER+=	efltk
 
 .if !empty(EFLTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.efltk+=	efltk>=2.0.5nb1
diff --git a/x11/fixesproto/buildlink3.mk b/x11/fixesproto/buildlink3.mk
index 45b32b5de76..2f0248c31df 100644
--- a/x11/fixesproto/buildlink3.mk
+++ b/x11/fixesproto/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/04/18 17:13:35 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:44 jlam Exp $
 
 BUILDLINK_DEPMETHOD.fixesproto?=	build
 
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	fixesproto
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfixesproto}
 BUILDLINK_PACKAGES+=	fixesproto
+BUILDLINK_ORDER+=	fixesproto
 
 .if !empty(FIXESPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fixesproto+=	fixesproto>=3.0.0
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index 6a8c1e31fd3..866f27e7af4 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/04/12 10:27:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FLTK_BUILDLINK3_MK:=	${FLTK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	fltk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfltk}
 BUILDLINK_PACKAGES+=	fltk
+BUILDLINK_ORDER+=	fltk
 
 .if !empty(FLTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.1.5rc1
diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk
index 798fc8fca60..56c5039f2f4 100644
--- a/x11/fox/buildlink3.mk
+++ b/x11/fox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/17 13:45:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FOX_BUILDLINK3_MK:=	${FOX_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	fox
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfox}
 BUILDLINK_PACKAGES+=	fox
+BUILDLINK_ORDER+=	fox
 
 .if !empty(FOX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fox+=		fox>=1.4.16
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 2f301eda9b9..c1da2b95ab8 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnome-desktop
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-desktop}
 BUILDLINK_PACKAGES+=	gnome-desktop
+BUILDLINK_ORDER+=	gnome-desktop
 
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-desktop+=	gnome-desktop>=2.14.0
diff --git a/x11/gnome-libs/buildlink3.mk b/x11/gnome-libs/buildlink3.mk
index 6587cf39c60..6d7398901cb 100644
--- a/x11/gnome-libs/buildlink3.mk
+++ b/x11/gnome-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/17 13:46:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_LIBS_BUILDLINK3_MK:=	${GNOME_LIBS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnome-libs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-libs}
 BUILDLINK_PACKAGES+=	gnome-libs
+BUILDLINK_ORDER+=	gnome-libs
 
 .if !empty(GNOME_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-libs+=		gnome-libs>=1.4.2nb1
diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk
index e97a13321f3..42da3de3ce2 100644
--- a/x11/gnome-mag/buildlink3.mk
+++ b/x11/gnome-mag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/17 13:46:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MAG_BUILDLINK3_MK:=	${GNOME_MAG_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnome-mag
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-mag}
 BUILDLINK_PACKAGES+=	gnome-mag
+BUILDLINK_ORDER+=	gnome-mag
 
 .if !empty(GNOME_MAG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-mag+=	gnome-mag>=0.12.0
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index c2b0b7f55a7..c3b2e62506f 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/04/17 13:46:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PANEL_BUILDLINK3_MK:=	${GNOME_PANEL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnome-panel
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-panel}
 BUILDLINK_PACKAGES+=	gnome-panel
+BUILDLINK_ORDER+=	gnome-panel
 
 .if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-panel+=		gnome-panel>=2.12.1nb3
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index 4cd90590132..78581cb9e58 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/04/17 13:46:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnome2-control-center
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome2-control-center}
 BUILDLINK_PACKAGES+=	gnome2-control-center
+BUILDLINK_ORDER+=	gnome2-control-center
 
 .if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.12.1nb1
diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk
index 4998d27173e..671217b46bd 100644
--- a/x11/gnustep-back/buildlink3.mk
+++ b/x11/gnustep-back/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_BACK_BUILDLINK3_MK:=	${GNUSTEP_BACK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnustep-back
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-back}
 BUILDLINK_PACKAGES+=	gnustep-back
+BUILDLINK_ORDER+=	gnustep-back
 
 .if !empty(GNUSTEP_BACK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-back+=	gnustep-back>=0.9.2
diff --git a/x11/gnustep-gui/buildlink3.mk b/x11/gnustep-gui/buildlink3.mk
index cf8f0afd9a0..61a8b9cc76e 100644
--- a/x11/gnustep-gui/buildlink3.mk
+++ b/x11/gnustep-gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/17 13:46:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_GUI_BUILDLINK3_MK:=	${GNUSTEP_GUI_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnustep-gui
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-gui}
 BUILDLINK_PACKAGES+=	gnustep-gui
+BUILDLINK_ORDER+=	gnustep-gui
 
 .if !empty(GNUSTEP_GUI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-gui+=		gnustep-gui>=0.9.2
diff --git a/x11/gnustep-preferences/buildlink3.mk b/x11/gnustep-preferences/buildlink3.mk
index 91f0c050e2b..59dab3e901d 100644
--- a/x11/gnustep-preferences/buildlink3.mk
+++ b/x11/gnustep-preferences/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNUSTEP_PREFERENCES_BUILDLINK3_MK:=	${GNUSTEP_PREFERENCES_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnustep-preferences
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-preferences}
 BUILDLINK_PACKAGES+=	gnustep-preferences
+BUILDLINK_ORDER+=	gnustep-preferences
 
 .if !empty(GNUSTEP_PREFERENCES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-preferences+=	gnustep-preferences>=1.2.0
diff --git a/x11/gtk+extra/buildlink3.mk b/x11/gtk+extra/buildlink3.mk
index 5a961e89937..8a8ddd539a6 100644
--- a/x11/gtk+extra/buildlink3.mk
+++ b/x11/gtk+extra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:41 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK+EXTRA_BUILDLINK3_MK:=	${GTK+EXTRA_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtk+extra
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk+extra}
 BUILDLINK_PACKAGES+=	gtk+extra
+BUILDLINK_ORDER+=	gtk+extra
 
 .if !empty(GTK+EXTRA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk+extra+=	gtk+extra>=0.99.17nb2
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index 65b9900edae..a0ff3005eb9 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:23:00 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk}
 BUILDLINK_PACKAGES+=	gtk
+BUILDLINK_ORDER+=	gtk
 
 .if !empty(GTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk+=		gtk+>=1.2.10
diff --git a/x11/gtk2+extra/buildlink3.mk b/x11/gtk2+extra/buildlink3.mk
index 7c966753d63..b976c6d9e0b 100644
--- a/x11/gtk2+extra/buildlink3.mk
+++ b/x11/gtk2+extra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:46:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK2+EXTRA_BUILDLINK3_MK:=	${GTK2+EXTRA_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtk2+extra
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2+extra}
 BUILDLINK_PACKAGES+=	gtk2+extra
+BUILDLINK_ORDER+=	gtk2+extra
 
 .if !empty(GTK2+EXTRA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk2+extra+=	gtk2+extra>=2.1.1
diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk
index 7619ec808bd..85c7a048d0d 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/17 13:46:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK2_ENGINES_BUILDLINK3_MK:=	${GTK2_ENGINES_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtk2-engines
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2-engines}
 BUILDLINK_PACKAGES+=	gtk2-engines
+BUILDLINK_ORDER+=	gtk2-engines
 
 .if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk2-engines+=	gtk2-engines>=2.6.0
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 1165b0fe5a7..b2f4ab89266 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2006/04/17 13:45:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK2_BUILDLINK3_MK:=	${GTK2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtk2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2}
 BUILDLINK_PACKAGES+=	gtk2
+BUILDLINK_ORDER+=	gtk2
 
 .if !empty(GTK2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
diff --git a/x11/gtkglarea/buildlink3.mk b/x11/gtkglarea/buildlink3.mk
index e8f2fce0c39..42ad647b722 100644
--- a/x11/gtkglarea/buildlink3.mk
+++ b/x11/gtkglarea/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:41 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLAREA_BUILDLINK3_MK:=	${GTKGLAREA_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtkglarea
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkglarea}
 BUILDLINK_PACKAGES+=	gtkglarea
+BUILDLINK_ORDER+=	gtkglarea
 
 .if !empty(GTKGLAREA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkglarea+=	gtkglarea>=1.2.2nb3
diff --git a/x11/gtkglarea2/buildlink3.mk b/x11/gtkglarea2/buildlink3.mk
index b445a123981..71bdcb72ec5 100644
--- a/x11/gtkglarea2/buildlink3.mk
+++ b/x11/gtkglarea2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/17 13:46:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLAREA2_BUILDLINK3_MK:=	${GTKGLAREA2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtkglarea2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkglarea2}
 BUILDLINK_PACKAGES+=	gtkglarea2
+BUILDLINK_ORDER+=	gtkglarea2
 
 .if !empty(GTKGLAREA2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkglarea2+=		gtkglarea2>=1.99.0nb3
diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk
index 7b4abf9c262..0b7b5fe8923 100644
--- a/x11/gtkmm/buildlink3.mk
+++ b/x11/gtkmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/05/13 20:32:15 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTKMM_BUILDLINK3_MK:=	${GTKMM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtkmm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkmm}
 BUILDLINK_PACKAGES+=	gtkmm
+BUILDLINK_ORDER+=	gtkmm
 
 .if !empty(GTKMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.6.3
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
index f21359d9bf9..a4508fbd8ec 100644
--- a/x11/gtksourceview/buildlink3.mk
+++ b/x11/gtksourceview/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/17 13:46:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKSOURCEVIEW_BUILDLINK3_MK:=	${GTKSOURCEVIEW_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtksourceview
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtksourceview}
 BUILDLINK_PACKAGES+=	gtksourceview
+BUILDLINK_ORDER+=	gtksourceview
 
 .if !empty(GTKSOURCEVIEW_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtksourceview+=	gtksourceview>=1.2.0
diff --git a/x11/gtoolkit/buildlink3.mk b/x11/gtoolkit/buildlink3.mk
index c7cc413635a..0bd897fa7a8 100644
--- a/x11/gtoolkit/buildlink3.mk
+++ b/x11/gtoolkit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTOOLKIT_BUILDLINK3_MK:=	${GTOOLKIT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtoolkit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtoolkit}
 BUILDLINK_PACKAGES+=	gtoolkit
+BUILDLINK_ORDER+=	gtoolkit
 
 .if !empty(GTOOLKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtoolkit+=	gtoolkit>=0.9.5nb5
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index 416d66d203e..b70aec65a22 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/05/31 18:22:26 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	kdebase
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdebase}
 BUILDLINK_PACKAGES+=	kdebase
+BUILDLINK_ORDER+=	kdebase
 
 .if !empty(KDEBASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdebase+=	kdebase>=3.5.0nb2
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index 54b063e2e39..b13110a6daa 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/04/17 13:46:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDELIBS_BUILDLINK3_MK:=	${KDELIBS_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	kdelibs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdelibs}
 BUILDLINK_PACKAGES+=	kdelibs
+BUILDLINK_ORDER+=	kdelibs
 
 .if !empty(KDELIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs>=3.2.0
diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk
index dd364af12b1..17175aa815a 100644
--- a/x11/lablgtk/buildlink3.mk
+++ b/x11/lablgtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:41 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LABLGTK_BUILDLINK3_MK:=	${LABLGTK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	lablgtk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlablgtk}
 BUILDLINK_PACKAGES+=	lablgtk
+BUILDLINK_ORDER+=	lablgtk
 
 .if !empty(LABLGTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lablgtk+=	lablgtk>=1.2.5nb3
diff --git a/x11/lablgtk2/buildlink3.mk b/x11/lablgtk2/buildlink3.mk
index acc2234c481..bdacc0e715b 100644
--- a/x11/lablgtk2/buildlink3.mk
+++ b/x11/lablgtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/12 10:27:41 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LABLGTK2_BUILDLINK3_MK:=	${LABLGTK2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	lablgtk2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlablgtk2}
 BUILDLINK_PACKAGES+=	lablgtk2
+BUILDLINK_ORDER+=	lablgtk2
 
 .if !empty(LABLGTK2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0nb3
diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk
index 6be94e3b9a9..49dc00de51e 100644
--- a/x11/lesstif/buildlink3.mk
+++ b/x11/lesstif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:41 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LESSTIF_BUILDLINK3_MK:=	${LESSTIF_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	lesstif
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlesstif}
 BUILDLINK_PACKAGES+=	lesstif
+BUILDLINK_ORDER+=	lesstif
 
 .if !empty(LESSTIF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lesstif+=	lesstif>=0.91.4
diff --git a/x11/libexo/buildlink3.mk b/x11/libexo/buildlink3.mk
index f9832b3ece3..ddec5e89b1b 100644
--- a/x11/libexo/buildlink3.mk
+++ b/x11/libexo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EXO_BUILDLINK3_MK:=	${EXO_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	exo
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nexo}
 BUILDLINK_PACKAGES+=	exo
+BUILDLINK_ORDER+=	exo
 
 .if !empty(EXO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.exo+=		exo>=0.3.0
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 0f110d8603f..ea10eda2cd2 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/04/17 13:46:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4GUI_BUILDLINK3_MK:=	${LIBXFCE4GUI_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libxfce4gui
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4gui}
 BUILDLINK_PACKAGES+=	libxfce4gui
+BUILDLINK_ORDER+=	libxfce4gui
 
 .if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libxfce4gui+=	libxfce4gui>=4.2.3
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index 1c9a95c9a38..e4a4268d203 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4MCS_BUILDLINK3_MK:=	${LIBXFCE4MCS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libxfce4mcs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4mcs}
 BUILDLINK_PACKAGES+=	libxfce4mcs
+BUILDLINK_ORDER+=	libxfce4mcs
 
 .if !empty(LIBXFCE4MCS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libxfce4mcs+=	libxfce4mcs>=4.2.3
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index 9eb75edd6a1..ef298913fef 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4UTIL_BUILDLINK3_MK:=	${LIBXFCE4UTIL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libxfce4util
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4util}
 BUILDLINK_PACKAGES+=	libxfce4util
+BUILDLINK_ORDER+=	libxfce4util
 
 .if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libxfce4util+=	libxfce4util>=4.2.3.2
diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk
index e39885181cb..6297bb5b920 100644
--- a/x11/libxklavier/buildlink3.mk
+++ b/x11/libxklavier/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXKLAVIER_BUILDLINK3_MK:=	${LIBXKLAVIER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libxklavier
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxklavier}
 BUILDLINK_PACKAGES+=	libxklavier
+BUILDLINK_ORDER+=	libxklavier
 
 .if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libxklavier+=		libxklavier>=2.0
diff --git a/x11/libzvt/buildlink3.mk b/x11/libzvt/buildlink3.mk
index 49828ee5ec5..62d5e7e0bb5 100644
--- a/x11/libzvt/buildlink3.mk
+++ b/x11/libzvt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBZVT_BUILDLINK3_MK:=	${LIBZVT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libzvt
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibzvt}
 BUILDLINK_PACKAGES+=	libzvt
+BUILDLINK_ORDER+=	libzvt
 
 .if !empty(LIBZVT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libzvt+=	libzvt>=2.0.1nb5
diff --git a/x11/mowitz/buildlink3.mk b/x11/mowitz/buildlink3.mk
index 01cb356bd88..c7df6311172 100644
--- a/x11/mowitz/buildlink3.mk
+++ b/x11/mowitz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MOWITZ_BUILDLINK3_MK:=	${MOWITZ_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	Mowitz
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NMowitz}
 BUILDLINK_PACKAGES+=	Mowitz
+BUILDLINK_ORDER+=	Mowitz
 
 .if !empty(MOWITZ_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Mowitz+=	Mowitz>=0.2.1
diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk
index d90f01f93c0..78f3179ac0d 100644
--- a/x11/neXtaw/buildlink3.mk
+++ b/x11/neXtaw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NEXTAW_BUILDLINK3_MK:=	${NEXTAW_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	neXtaw
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NneXtaw}
 BUILDLINK_PACKAGES+=	neXtaw
+BUILDLINK_ORDER+=	neXtaw
 
 .if !empty(NEXTAW_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.neXtaw+=	neXtaw>=0.15.1
diff --git a/x11/ocaml-graphics/buildlink3.mk b/x11/ocaml-graphics/buildlink3.mk
index e4e57cabc65..c9575739a23 100644
--- a/x11/ocaml-graphics/buildlink3.mk
+++ b/x11/ocaml-graphics/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OCAML_GRAPHICS_BUILDLINK3_MK:=	${OCAML_GRAPHICS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	ocaml-graphics
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nocaml-graphics}
 BUILDLINK_PACKAGES+=	ocaml-graphics
+BUILDLINK_ORDER+=	ocaml-graphics
 
 .if !empty(OCAML_GRAPHICS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ocaml-graphics+=	ocaml-graphics>=3.08.2
diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk
index 9c4b714c8cc..0155e4663e8 100644
--- a/x11/openmotif/buildlink3.mk
+++ b/x11/openmotif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENMOTIF_BUILDLINK3_MK:=	${OPENMOTIF_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	openmotif
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenmotif}
 BUILDLINK_PACKAGES+=	openmotif
+BUILDLINK_ORDER+=	openmotif
 
 .if !empty(OPENMOTIF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openmotif+=	openmotif>=2.2.3
diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk
index befc6599005..cb1e29b6b05 100644
--- a/x11/paragui/buildlink3.mk
+++ b/x11/paragui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/06/12 16:28:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PARAGUI_BUILDLINK3_MK:=	${PARAGUI_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	paragui
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nparagui}
 BUILDLINK_PACKAGES+=	paragui
+BUILDLINK_ORDER+=	paragui
 
 .if !empty(PARAGUI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.paragui+=	paragui>=1.0.4nb3
diff --git a/x11/py-Pmw/buildlink3.mk b/x11/py-Pmw/buildlink3.mk
index a87a794ddfd..7d36cdfdeb7 100644
--- a/x11/py-Pmw/buildlink3.mk
+++ b/x11/py-Pmw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_PMW_BUILDLINK3_MK:=	${PY_PMW_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	pypmw
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npypmw}
 BUILDLINK_PACKAGES+=	pypmw
+BUILDLINK_ORDER+=	pypmw
 
 .if !empty(PY_PMW_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pypmw+=	${PYPKGPREFIX}-Pmw-[0-9]*
diff --git a/x11/py-Tk/buildlink3.mk b/x11/py-Tk/buildlink3.mk
index 6b2359f63d5..c74f2237145 100644
--- a/x11/py-Tk/buildlink3.mk
+++ b/x11/py-Tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYTK_BUILDLINK3_MK:=	${PYTK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pytk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npytk}
 BUILDLINK_PACKAGES+=	pytk
+BUILDLINK_ORDER+=	pytk
 
 .if !empty(PYTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pytk+=	${PYPKGPREFIX}-Tk-[0-9]*
diff --git a/x11/py-Xlib/buildlink3.mk b/x11/py-Xlib/buildlink3.mk
index 869a87062b9..7b739952d1b 100644
--- a/x11/py-Xlib/buildlink3.mk
+++ b/x11/py-Xlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_XLIB_BUILDLINK3_MK:=	${PY_XLIB_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	py-Xlib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-Xlib}
 BUILDLINK_PACKAGES+=	py-Xlib
+BUILDLINK_ORDER+=	py-Xlib
 
 .if !empty(PY_XLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.py-Xlib+=	${PYPKGPREFIX}-Xlib>=0.12
diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk
index 8d3a6cd7c02..7b7ae65cfd4 100644
--- a/x11/py-gnome2-extras/buildlink3.mk
+++ b/x11/py-gnome2-extras/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/06 16:27:28 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYGNOME2EX_BUILDLINK3_MK:=	${PYGNOME2EX_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pygnome2ex
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome2ex}
 BUILDLINK_PACKAGES+=	pygnome2ex
+BUILDLINK_ORDER+=	pygnome2ex
 
 .if ${PYGNOME2EX_BUILDLINK3_MK} == "+"
 .include "../../lang/python/pyversion.mk"
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index f510e073064..6217ac99e05 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/06/09 14:29:56 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNOME2_BUILDLINK3_MK:=	${PY_GNOME2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pygnome2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome2}
 BUILDLINK_PACKAGES+=	pygnome2
+BUILDLINK_ORDER+=	pygnome2
 
 .if !empty(PY_GNOME2_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 8f120b2d521..4bbdd0b6ea7 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/02 10:44:45 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_GTK2_BUILDLINK3_MK:=	${PY_GTK2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pygtk2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygtk2}
 BUILDLINK_PACKAGES+=	pygtk2
+BUILDLINK_ORDER+=	pygtk2
 
 .if !empty(PY_GTK2_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
diff --git a/x11/py-qt2-sip/buildlink3.mk b/x11/py-qt2-sip/buildlink3.mk
index f935c7a93bc..195580a2197 100644
--- a/x11/py-qt2-sip/buildlink3.mk
+++ b/x11/py-qt2-sip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_QT2_SIP_BUILDLINK3_MK:=	${PY_QT2_SIP_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	pyqt2sip
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt2sip}
 BUILDLINK_PACKAGES+=	pyqt2sip
+BUILDLINK_ORDER+=	pyqt2sip
 
 .if !empty(PY_QT2_SIP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip-[0-9]*
diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk
index 2d4a9963cee..7ea4092999c 100644
--- a/x11/py-qt3-base/buildlink3.mk
+++ b/x11/py-qt3-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:46:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PYQT3_BASE_BUILDLINK3_MK:=	${PYQT3_BASE_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	pyqt3-base
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt3-base}
 BUILDLINK_PACKAGES+=	pyqt3-base
+BUILDLINK_ORDER+=	pyqt3-base
 
 .if !empty(PYQT3_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pyqt3-base+=	${PYPKGPREFIX}-qt3-base>=3.11
diff --git a/x11/py-qt3-modules/buildlink3.mk b/x11/py-qt3-modules/buildlink3.mk
index 8826f5c969b..f6d220d0b49 100644
--- a/x11/py-qt3-modules/buildlink3.mk
+++ b/x11/py-qt3-modules/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:46:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PYQT3_MOD_BUILDLINK3_MK:=	${PYQT3_MOD_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	pyqt3-mod
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt3-mod}
 BUILDLINK_PACKAGES+=	pyqt3-mod
+BUILDLINK_ORDER+=	pyqt3-mod
 
 .if !empty(PYQT3_MOD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.11
diff --git a/x11/py-qt3-sip/buildlink3.mk b/x11/py-qt3-sip/buildlink3.mk
index 05d04583dce..d3fe6fd7ee8 100644
--- a/x11/py-qt3-sip/buildlink3.mk
+++ b/x11/py-qt3-sip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYQT3_SIP_BUILDLINK3_MK:=	${PYQT3_SIP_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	pyqt3-sip
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt3-sip}
 BUILDLINK_PACKAGES+=	pyqt3-sip
+BUILDLINK_ORDER+=	pyqt3-sip
 
 .if !empty(PYQT3_SIP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pyqt3-sip+=	${PYPKGPREFIX}-qt3-sip>=4.0rc3
diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk
index 7ad5dc352ea..7c7e9d2e3b4 100644
--- a/x11/py-wxWidgets/buildlink3.mk
+++ b/x11/py-wxWidgets/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/06/21 21:19:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PY_WXWIDGETS_BUILDLINK3_MK:=	${PY_WXWIDGETS_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	${PYPKGPREFIX}-wxWidgets
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-wxWidgets}
 BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-wxWidgets
+BUILDLINK_ORDER+=	${PYPKGPREFIX}-wxWidgets
 
 .if !empty(PY_WXWIDGETS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0
diff --git a/x11/pygtk/buildlink3.mk b/x11/pygtk/buildlink3.mk
index 04095b1561e..e61543a56e1 100644
--- a/x11/pygtk/buildlink3.mk
+++ b/x11/pygtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/05/28 17:57:31 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GTK_BUILDLINK3_MK:=	${PY_GTK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pygtk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygtk}
 BUILDLINK_PACKAGES+=	pygtk
+BUILDLINK_ORDER+=	pygtk
 
 .if !empty(PY_GTK_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
diff --git a/x11/qt1/buildlink3.mk b/x11/qt1/buildlink3.mk
index d7c95fff93c..9d6bf2a6563 100644
--- a/x11/qt1/buildlink3.mk
+++ b/x11/qt1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:43 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 QT1_BUILDLINK3_MK:=	${QT1_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	qt1
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt1}
 BUILDLINK_PACKAGES+=	qt1
+BUILDLINK_ORDER+=	qt1
 
 .if !empty(QT1_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt1+=		qt1>=1.44
diff --git a/x11/qt2-designer/buildlink3.mk b/x11/qt2-designer/buildlink3.mk
index ddcb2612426..804eaec767d 100644
--- a/x11/qt2-designer/buildlink3.mk
+++ b/x11/qt2-designer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT2_DESIGNER_BUILDLINK3_MK:=	${QT2_DESIGNER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	qt2-designer
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt2-designer}
 BUILDLINK_PACKAGES+=	qt2-designer
+BUILDLINK_ORDER+=	qt2-designer
 
 .if !empty(QT2_DESIGNER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt2-designer+=	qt2-designer>=2.3.1nb2
diff --git a/x11/qt2-libs/buildlink3.mk b/x11/qt2-libs/buildlink3.mk
index 65eade8686b..8fab81326b2 100644
--- a/x11/qt2-libs/buildlink3.mk
+++ b/x11/qt2-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:45:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT2_LIBS_BUILDLINK3_MK:=	${QT2_LIBS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	qt2-libs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt2-libs}
 BUILDLINK_PACKAGES+=	qt2-libs
+BUILDLINK_ORDER+=	qt2-libs
 
 .if !empty(QT2_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt2-libs+=	qt2-libs>=2.3.1nb2
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index 72ee2002884..d8f8a13f449 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_LIBS_BUILDLINK3_MK:=	${QT3_LIBS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	qt3-libs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt3-libs}
 BUILDLINK_PACKAGES+=	qt3-libs
+BUILDLINK_ORDER+=	qt3-libs
 
 .if !empty(QT3_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.2.3
diff --git a/x11/qt3-qscintilla/buildlink3.mk b/x11/qt3-qscintilla/buildlink3.mk
index 0513e37cda0..76f2e3b993b 100644
--- a/x11/qt3-qscintilla/buildlink3.mk
+++ b/x11/qt3-qscintilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_QSCINTILLA_BUILDLINK3_MK:=	${QT3_QSCINTILLA_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	qt3-qscintilla
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt3-qscintilla}
 BUILDLINK_PACKAGES+=	qt3-qscintilla
+BUILDLINK_ORDER+=	qt3-qscintilla
 
 .if !empty(QT3_QSCINTILLA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.2
diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk
index 128d66c3576..83625e343cf 100644
--- a/x11/qt3-tools/buildlink3.mk
+++ b/x11/qt3-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/17 13:46:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_TOOLS_BUILDLINK3_MK:=	${QT3_TOOLS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	qt3-tools
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt3-tools}
 BUILDLINK_PACKAGES+=	qt3-tools
+BUILDLINK_ORDER+=	qt3-tools
 
 .if !empty(QT3_TOOLS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb3
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index bdbb6807239..2e964999938 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/05/31 19:18:07 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT4_LIBS_BUILDLINK3_MK:=	${QT4_LIBS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	qt4-libs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt4-libs}
 BUILDLINK_PACKAGES+=	qt4-libs
+BUILDLINK_ORDER+=	qt4-libs
 
 .if !empty(QT4_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.1.0
diff --git a/x11/qt4-tools/buildlink3.mk b/x11/qt4-tools/buildlink3.mk
index d5a18233ce7..fcd45b5e87f 100644
--- a/x11/qt4-tools/buildlink3.mk
+++ b/x11/qt4-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/05/31 19:19:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT4_TOOLS_BUILDLINK3_MK:=	${QT4_TOOLS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	qt4-tools
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt4-tools}
 BUILDLINK_PACKAGES+=	qt4-tools
+BUILDLINK_ORDER+=	qt4-tools
 
 .if !empty(QT4_TOOLS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.1.0
diff --git a/x11/randrproto/buildlink3.mk b/x11/randrproto/buildlink3.mk
index 7bb3a2e462e..91f4ceffa7d 100644
--- a/x11/randrproto/buildlink3.mk
+++ b/x11/randrproto/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/04/18 17:14:45 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPMETHOD.randrproto?=	build
 
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	randrproto
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrandrproto}
 BUILDLINK_PACKAGES+=	randrproto
+BUILDLINK_ORDER+=	randrproto
 
 .if !empty(RANDRPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.randrproto+=	randrproto>=1.1.1
diff --git a/x11/renderproto/buildlink3.mk b/x11/renderproto/buildlink3.mk
index 4d8b31b5065..5b3e9c29dcf 100644
--- a/x11/renderproto/buildlink3.mk
+++ b/x11/renderproto/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/06/16 14:35:54 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 RENDERPROTO_BUILDLINK3_MK:=	${RENDERPROTO_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	renderproto
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrenderproto}
 BUILDLINK_PACKAGES+=	renderproto
+BUILDLINK_ORDER+=	renderproto
 
 .if !empty(RENDERPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.renderproto+=	renderproto>=0.9.1
diff --git a/x11/startup-notification/buildlink3.mk b/x11/startup-notification/buildlink3.mk
index 5b793169134..b6b5255acde 100644
--- a/x11/startup-notification/buildlink3.mk
+++ b/x11/startup-notification/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:43 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 STARTUP_NOTIFICATION_BUILDLINK3_MK:=	${STARTUP_NOTIFICATION_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	startup-notification
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nstartup-notification}
 BUILDLINK_PACKAGES+=	startup-notification
+BUILDLINK_ORDER+=	startup-notification
 
 .if !empty(STARTUP_NOTIFICATION_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.5
diff --git a/x11/tk-BWidget/buildlink3.mk b/x11/tk-BWidget/buildlink3.mk
index fe2e81951ed..f2d30dcbfd9 100644
--- a/x11/tk-BWidget/buildlink3.mk
+++ b/x11/tk-BWidget/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:44 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:48 jlam Exp $
 #
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -10,6 +10,7 @@ BUILDLINK_DEPENDS+=	tk-BWidget
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk-BWidget}
 BUILDLINK_PACKAGES+=	tk-BWidget
+BUILDLINK_ORDER+=	tk-BWidget
 
 .if !empty(TK_BWIDGET_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tk-BWidget+=	tk-BWidget>=1.7.0
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index 5bb266c2a97..2318dac225d 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/06/17 19:34:29 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	tk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk}
 BUILDLINK_PACKAGES+=	tk
+BUILDLINK_ORDER+=	tk
 
 .if !empty(TK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tk+=	tk>=8.4.6nb1
diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk
index 6f695e6f879..dd8b648dde2 100644
--- a/x11/tk83/buildlink3.mk
+++ b/x11/tk83/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:04 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	tk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk}
 BUILDLINK_PACKAGES+=	tk
+BUILDLINK_ORDER+=	tk
 
 .if !empty(TK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tk+=		tk-8.3.4*
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index 79e50594443..31d8f79bbff 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/17 13:46:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 VTE_BUILDLINK3_MK:=	${VTE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	vte
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvte}
 BUILDLINK_PACKAGES+=	vte
+BUILDLINK_ORDER+=	vte
 
 .if !empty(VTE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.vte+=		vte>=0.11.11
diff --git a/x11/wxGTK-contrib/buildlink3.mk b/x11/wxGTK-contrib/buildlink3.mk
index 3228e8dd743..cf708573da0 100644
--- a/x11/wxGTK-contrib/buildlink3.mk
+++ b/x11/wxGTK-contrib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/17 13:46:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WXGTK_CONTRIB_BUILDLINK3_MK:=	${WXGTK_CONTRIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	wxGTK-contrib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK-contrib}
 BUILDLINK_PACKAGES+=	wxGTK-contrib
+BUILDLINK_ORDER+=	wxGTK-contrib
 
 .if !empty(WXGTK_CONTRIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0
diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk
index 3cff7bf0da5..1e7dce3e8a2 100644
--- a/x11/wxGTK/buildlink3.mk
+++ b/x11/wxGTK/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXGTK_BUILDLINK3_MK:=	${WXGTK_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	wxGTK
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK}
 BUILDLINK_PACKAGES+=	wxGTK
+BUILDLINK_ORDER+=	wxGTK
 
 .if !empty(WXGTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wxGTK+=	wxGTK>=2.6.0
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
index 96264aaf52a..63d153b1301 100644
--- a/x11/wxGTK24/buildlink3.mk
+++ b/x11/wxGTK24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:45:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXGTK24_BUILDLINK3_MK:=	${WXGTK24_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	wxGTK24
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK24}
 BUILDLINK_PACKAGES+=	wxGTK24
+BUILDLINK_ORDER+=	wxGTK24
 
 .if !empty(WXGTK24_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wxGTK24+=	wxGTK24>=2.4.2
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index 1a25939ea71..b0476ab2cb1 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:23:04 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XCURSOR_BUILDLINK3_MK:=	${XCURSOR_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xcursor
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxcursor}
 BUILDLINK_PACKAGES+=	xcursor
+BUILDLINK_ORDER+=	xcursor
 
 .if !empty(XCURSOR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xcursor+=	xcursor>=1.0
diff --git a/x11/xextproto/buildlink3.mk b/x11/xextproto/buildlink3.mk
index da02c2fb664..3dc5b54e1a5 100644
--- a/x11/xextproto/buildlink3.mk
+++ b/x11/xextproto/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/04/18 17:12:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPMETHOD.xextproto?=	build
 
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	xextproto
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxextproto}
 BUILDLINK_PACKAGES+=	xextproto
+BUILDLINK_ORDER+=	xextproto
 
 .if !empty(XEXTPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.0
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index 3a89bf57dde..70e78e8c7c1 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-clipman-plugin
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-clipman-plugin}
 BUILDLINK_PACKAGES+=	xfce4-clipman-plugin
+BUILDLINK_ORDER+=	xfce4-clipman-plugin
 
 .if !empty(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.4.1
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index a8de733b268..8cf2e282737 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_DESKTOP_BUILDLINK3_MK:=	${XFCE4_DESKTOP_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-desktop
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-desktop}
 BUILDLINK_PACKAGES+=	xfce4-desktop
+BUILDLINK_ORDER+=	xfce4-desktop
 
 .if !empty(XFCE4_DESKTOP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.3
diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk
index 4a6d28ffa03..f82d3430c6d 100644
--- a/x11/xfce4-gtk2-engine/buildlink3.mk
+++ b/x11/xfce4-gtk2-engine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_GTK2_ENGINE_BUILDLINK3_MK:=	${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-gtk2-engine
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-gtk2-engine}
 BUILDLINK_PACKAGES+=	xfce4-gtk2-engine
+BUILDLINK_ORDER+=	xfce4-gtk2-engine
 
 .if !empty(XFCE4_GTK2_ENGINE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.2.8
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index 19dba2cd38b..813c3cac074 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/17 13:46:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_MANAGER_BUILDLINK3_MK:=	${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-mcs-manager
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-manager}
 BUILDLINK_PACKAGES+=	xfce4-mcs-manager
+BUILDLINK_ORDER+=	xfce4-mcs-manager
 
 .if !empty(XFCE4_MCS_MANAGER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.2.3
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index 5b8f9703592..fa3b8fceb83 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/17 13:46:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_PLUGINS_BUILDLINK3_MK:=	${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-mcs-plugins
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-plugins}
 BUILDLINK_PACKAGES+=	xfce4-mcs-plugins
+BUILDLINK_ORDER+=	xfce4-mcs-plugins
 
 .if !empty(XFCE4_MCS_PLUGINS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.2.3
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index b68b9647c71..2b0a0b06d05 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-notes-plugin
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-notes-plugin}
 BUILDLINK_PACKAGES+=	xfce4-notes-plugin
+BUILDLINK_ORDER+=	xfce4-notes-plugin
 
 .if !empty(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=0.11.1
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index 509bd89fe25..fadbaa077b0 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/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:49 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-panel
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-panel}
 BUILDLINK_PACKAGES+=	xfce4-panel
+BUILDLINK_ORDER+=	xfce4-panel
 
 .if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.2.3
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index de24747b008..eb3d3a69b43 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/17 13:46:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_SESSION_BUILDLINK3_MK:=	${XFCE4_SESSION_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-session
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-session}
 BUILDLINK_PACKAGES+=	xfce4-session
+BUILDLINK_ORDER+=	xfce4-session
 
 .if !empty(XFCE4_SESSION_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.2.3
diff --git a/x11/xfce4-taskbar-plugin/buildlink3.mk b/x11/xfce4-taskbar-plugin/buildlink3.mk
index b1086022839..f52e8d1ab2b 100644
--- a/x11/xfce4-taskbar-plugin/buildlink3.mk
+++ b/x11/xfce4-taskbar-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:=	${XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-taskbar-plugin
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-taskbar-plugin}
 BUILDLINK_PACKAGES+=	xfce4-taskbar-plugin
+BUILDLINK_ORDER+=	xfce4-taskbar-plugin
 
 .if !empty(XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-taskbar-plugin+=	xfce4-taskbar-plugin>=0.2.2
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
index 7fa7cdd87d0..6469b556b1a 100644
--- a/x11/xfce4-toys/buildlink3.mk
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_TOYS_BUILDLINK3_MK:=	${XFCE4_TOYS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-toys
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-toys}
 BUILDLINK_PACKAGES+=	xfce4-toys
+BUILDLINK_ORDER+=	xfce4-toys
 
 .if !empty(XFCE4_TOYS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-toys+=	xfce4-toys>=4.2.3
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
index 8d82bded60b..4d145a39b7e 100644
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:=	${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-trigger-launcher
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-trigger-launcher}
 BUILDLINK_PACKAGES+=	xfce4-trigger-launcher
+BUILDLINK_ORDER+=	xfce4-trigger-launcher
 
 .if !empty(XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.2.3
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 651a84027a5..03efffd34ea 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_UTILS_BUILDLINK3_MK:=	${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-utils
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-utils}
 BUILDLINK_PACKAGES+=	xfce4-utils
+BUILDLINK_ORDER+=	xfce4-utils
 
 .if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-utils+=	xfce4-utils>=4.2.3
diff --git a/x11/xfce4-windowlist-plugin/buildlink3.mk b/x11/xfce4-windowlist-plugin/buildlink3.mk
index 1215f83cd65..96bb62252b4 100644
--- a/x11/xfce4-windowlist-plugin/buildlink3.mk
+++ b/x11/xfce4-windowlist-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-windowlist-plugin
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-windowlist-plugin}
 BUILDLINK_PACKAGES+=	xfce4-windowlist-plugin
+BUILDLINK_ORDER+=	xfce4-windowlist-plugin
 
 .if !empty(XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-windowlist-plugin+=	xfce4-windowlist-plugin>=0.1.0nb1
diff --git a/x11/xforms/buildlink3.mk b/x11/xforms/buildlink3.mk
index 31ce7b1a40f..8dc1124ea88 100644
--- a/x11/xforms/buildlink3.mk
+++ b/x11/xforms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:44 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFORMS_BUILDLINK3_MK:=	${XFORMS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xforms
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxforms}
 BUILDLINK_PACKAGES+=	xforms
+BUILDLINK_ORDER+=	xforms
 
 .if !empty(XFORMS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xforms+=	xforms>=1.0nb2
diff --git a/x11/xosd/buildlink3.mk b/x11/xosd/buildlink3.mk
index 0b5e61c802e..fb68037f096 100644
--- a/x11/xosd/buildlink3.mk
+++ b/x11/xosd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:45 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XOSD_BUILDLINK3_MK:=	${XOSD_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xosd
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxosd}
 BUILDLINK_PACKAGES+=	xosd
+BUILDLINK_ORDER+=	xosd
 
 .if !empty(XOSD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xosd+=	xosd>=2.2.12
diff --git a/x11/xproto/buildlink3.mk b/x11/xproto/buildlink3.mk
index 6628a3a89b0..773c42d3117 100644
--- a/x11/xproto/buildlink3.mk
+++ b/x11/xproto/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/04/18 17:10:50 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 22:39:49 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xproto.
 #
@@ -12,6 +12,7 @@ BUILDLINK_DEPENDS+=	xproto
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxproto}
 BUILDLINK_PACKAGES+=	xproto
+BUILDLINK_ORDER+=	xproto
 
 .if !empty(XPROTO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xproto?=		xproto>=6.6
diff --git a/x11/xscreensaver/buildlink3.mk b/x11/xscreensaver/buildlink3.mk
index 07a4cca151a..e4526671c5e 100644
--- a/x11/xscreensaver/buildlink3.mk
+++ b/x11/xscreensaver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:46 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XSCREENSAVER_BUILDLINK3_MK:=	${XSCREENSAVER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xscreensaver
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxscreensaver}
 BUILDLINK_PACKAGES+=	xscreensaver
+BUILDLINK_ORDER+=	xscreensaver
 
 .if !empty(XSCREENSAVER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xscreensaver+=	xscreensaver>=4.14
diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk
index e5709c163d7..0cbd1caf489 100644
--- a/x11/xview-lib/buildlink3.mk
+++ b/x11/xview-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:47 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:49 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XVIEW_LIB_BUILDLINK3_MK:=	${XVIEW_LIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xview-lib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxview-lib}
 BUILDLINK_PACKAGES+=	xview-lib
+BUILDLINK_ORDER+=	xview-lib
 
 .if !empty(XVIEW_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xview-lib+=	xview-lib>=3.2.1
-- 
cgit v1.2.3