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.

83 files changed, 166 insertions, 83 deletions

diff --git a/graphics/Coin/buildlink3.mk b/graphics/Coin/buildlink3.mk
index 4481d54b77e..6dc5ac8145e 100644
--- a/graphics/Coin/buildlink3.mk
+++ b/graphics/Coin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:46:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Coin.
 #
@@ -14,6 +14,7 @@ BUILDLINK_DEPENDS+=	Coin
 
 .if !empty(COIN_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			Coin
+BUILDLINK_ORDER+=			Coin
 BUILDLINK_API_DEPENDS.Coin+=		Coin>=2.2.1
 BUILDLINK_ABI_DEPENDS.Coin?=		Coin>=2.4.4nb2
 BUILDLINK_PKGSRCDIR.Coin?=		../../graphics/Coin
diff --git a/graphics/GLXKit/buildlink3.mk b/graphics/GLXKit/buildlink3.mk
index 7e75b2b4f59..5baa3a691d7 100644
--- a/graphics/GLXKit/buildlink3.mk
+++ b/graphics/GLXKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLXKIT_BUILDLINK3_MK:=	${GLXKIT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	GLXKit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGLXKit}
 BUILDLINK_PACKAGES+=	GLXKit
+BUILDLINK_ORDER+=	GLXKit
 
 .if !empty(GLXKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GLXKit+=	GLXKit>=0.3.1r2nb3
diff --git a/graphics/GUIlib/buildlink3.mk b/graphics/GUIlib/buildlink3.mk
index eac08737cd1..f8e5017d456 100644
--- a/graphics/GUIlib/buildlink3.mk
+++ b/graphics/GUIlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/06/12 16:28:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GUILIB_BUILDLINK3_MK:=	${GUILIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	GUIlib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGUIlib}
 BUILDLINK_PACKAGES+=	GUIlib
+BUILDLINK_ORDER+=	GUIlib
 
 .if !empty(GUILIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GUIlib+=	GUIlib>=1.1.0nb2
diff --git a/graphics/GeometryKit/buildlink3.mk b/graphics/GeometryKit/buildlink3.mk
index cafecf1c361..513670c209f 100644
--- a/graphics/GeometryKit/buildlink3.mk
+++ b/graphics/GeometryKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GEOMETRYKIT_BUILDLINK3_MK:=	${GEOMETRYKIT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	GeometryKit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGeometryKit}
 BUILDLINK_PACKAGES+=	GeometryKit
+BUILDLINK_ORDER+=	GeometryKit
 
 .if !empty(GEOMETRYKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GeometryKit+=	GeometryKit>=0.3.1r2nb3
diff --git a/graphics/GlutKit/buildlink3.mk b/graphics/GlutKit/buildlink3.mk
index dbfaa2e4ce6..b1dfdd85aa6 100644
--- a/graphics/GlutKit/buildlink3.mk
+++ b/graphics/GlutKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLUTKIT_BUILDLINK3_MK:=	${GLUTKIT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	GlutKit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGlutKit}
 BUILDLINK_PACKAGES+=	GlutKit
+BUILDLINK_ORDER+=	GlutKit
 
 .if !empty(GLUTKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.GlutKit+=	GlutKit>=0.3.1r2nb4
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index 64ec27d41b8..81e1e5d1713 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/04/17 13:46:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 IMAGEMAGICK_BUILDLINK3_MK:=	${IMAGEMAGICK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	ImageMagick
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NImageMagick}
 BUILDLINK_PACKAGES+=	ImageMagick
+BUILDLINK_ORDER+=	ImageMagick
 
 .if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ImageMagick+=		ImageMagick>=5.5.7.11nb1
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 974377e5c88..9ce8bcddb05 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2006/04/06 06:22:00 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	MesaLib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NMesaLib}
 BUILDLINK_PACKAGES+=	MesaLib
+BUILDLINK_ORDER+=	MesaLib
 
 .if !empty(MESALIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=3.4.2
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index 73a2aaaa570..37fb5770b8d 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/12 10:27:16 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENRM_BUILDLINK3_MK:=	${OPENRM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	OpenRM
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NOpenRM}
 BUILDLINK_PACKAGES+=	OpenRM
+BUILDLINK_ORDER+=	OpenRM
 
 .if !empty(OPENRM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.OpenRM+=	OpenRM>=1.5.1
diff --git a/graphics/RenderKit/buildlink3.mk b/graphics/RenderKit/buildlink3.mk
index 3170e25b896..b3edb149535 100644
--- a/graphics/RenderKit/buildlink3.mk
+++ b/graphics/RenderKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 RENDERKIT_BUILDLINK3_MK:=	${RENDERKIT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	RenderKit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NRenderKit}
 BUILDLINK_PACKAGES+=	RenderKit
+BUILDLINK_ORDER+=	RenderKit
 
 .if !empty(RENDERKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.RenderKit+=	RenderKit>=0.3.1r2nb3
diff --git a/graphics/SDLKit/buildlink3.mk b/graphics/SDLKit/buildlink3.mk
index 84c92dd2bb2..d6924598d5e 100644
--- a/graphics/SDLKit/buildlink3.mk
+++ b/graphics/SDLKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/06/12 16:28:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDLKIT_BUILDLINK3_MK:=	${SDLKIT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	SDLKit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDLKit}
 BUILDLINK_PACKAGES+=	SDLKit
+BUILDLINK_ORDER+=	SDLKit
 
 .if !empty(SDLKIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDLKit+=	SDLKit>=0.3.1r2nb5
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index 03a66bf73cf..220ecf1645b 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/06/12 16:25:22 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_IMAGE_BUILDLINK3_MK:=	${SDL_IMAGE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	SDL_image
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_image}
 BUILDLINK_PACKAGES+=	SDL_image
+BUILDLINK_ORDER+=	SDL_image
 
 .if !empty(SDL_IMAGE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_image+=	SDL_image>=1.2.3nb1
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index 482203fddc7..c16bfcf5aac 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:16 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AALIB_BUILDLINK3_MK:=	${AALIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	aalib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naalib}
 BUILDLINK_PACKAGES+=	aalib
+BUILDLINK_ORDER+=	aalib
 
 .if !empty(AALIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.aalib+=	aalib>=1.4.0.4
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index 9d0047175dc..f1298e9af1d 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/04/17 13:45:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=	${CAIRO_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	cairo
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncairo}
 BUILDLINK_PACKAGES+=	cairo
+BUILDLINK_ORDER+=	cairo
 
 .if !empty(CAIRO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.0.0nb2
diff --git a/graphics/cal3d/buildlink3.mk b/graphics/cal3d/buildlink3.mk
index bcfbe04282d..5504550dfa0 100644
--- a/graphics/cal3d/buildlink3.mk
+++ b/graphics/cal3d/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:16 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAL3D_BUILDLINK3_MK:=	${CAL3D_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	cal3d
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncal3d}
 BUILDLINK_PACKAGES+=	cal3d
+BUILDLINK_ORDER+=	cal3d
 
 .if !empty(CAL3D_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cal3d+=	cal3d>=0.9.1
diff --git a/graphics/camlimages/buildlink3.mk b/graphics/camlimages/buildlink3.mk
index 649943cef3c..30d84fef29f 100644
--- a/graphics/camlimages/buildlink3.mk
+++ b/graphics/camlimages/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CAMLIMAGES_BUILDLINK3_MK:=	${CAMLIMAGES_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	camlimages
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncamlimages}
 BUILDLINK_PACKAGES+=	camlimages
+BUILDLINK_ORDER+=	camlimages
 
 .if !empty(CAMLIMAGES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.camlimages+=	camlimages>=2.2.0
diff --git a/graphics/compface/buildlink3.mk b/graphics/compface/buildlink3.mk
index 098c2e6f025..6ba956f4e11 100644
--- a/graphics/compface/buildlink3.mk
+++ b/graphics/compface/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 COMPFACE_BUILDLINK3_MK:=	${COMPFACE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	compface
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncompface}
 BUILDLINK_PACKAGES+=	compface
+BUILDLINK_ORDER+=	compface
 
 .if !empty(COMPFACE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.compface+=	compface>=1.4
diff --git a/graphics/digikam/buildlink3.mk b/graphics/digikam/buildlink3.mk
index e3b4370abcd..c929bf0f026 100644
--- a/graphics/digikam/buildlink3.mk
+++ b/graphics/digikam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DIGIKAM_BUILDLINK3_MK:=	${DIGIKAM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	digikam
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndigikam}
 BUILDLINK_PACKAGES+=	digikam
+BUILDLINK_ORDER+=	digikam
 
 .if !empty(DIGIKAM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.digikam+=	digikam>=0.8.1
diff --git a/graphics/epeg/buildlink3.mk b/graphics/epeg/buildlink3.mk
index d7356f71430..3397c220498 100644
--- a/graphics/epeg/buildlink3.mk
+++ b/graphics/epeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EPEG_BUILDLINK3_MK:=	${EPEG_BUILDLINK3_MK}+
@@ -8,6 +8,7 @@ BUILDLINK_DEPENDS+=	epeg
 .endif
 
 BUILDLINK_PACKAGES+=	epeg
+BUILDLINK_ORDER+=	epeg
 
 .if !empty(EPEG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.epeg+=	epeg>=0.9.0
diff --git a/graphics/exiv2/buildlink3.mk b/graphics/exiv2/buildlink3.mk
index e83ab7232c0..06c8be05899 100644
--- a/graphics/exiv2/buildlink3.mk
+++ b/graphics/exiv2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/06/11 00:05:50 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EXIV2_BUILDLINK3_MK:=	${EXIV2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	exiv2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nexiv2}
 BUILDLINK_PACKAGES+=	exiv2
+BUILDLINK_ORDER+=	exiv2
 
 .if ${EXIV2_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.exiv2+=	exiv2>=0.10
diff --git a/graphics/fnlib/buildlink3.mk b/graphics/fnlib/buildlink3.mk
index 8dd5deb210c..06f910de65d 100644
--- a/graphics/fnlib/buildlink3.mk
+++ b/graphics/fnlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/17 13:46:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FNLIB_BUILDLINK3_MK:=	${FNLIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	fnlib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfnlib}
 BUILDLINK_PACKAGES+=	fnlib
+BUILDLINK_ORDER+=	fnlib
 
 .if !empty(FNLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fnlib+=	fnlib>=0.5nb6
diff --git a/graphics/freeglut/buildlink3.mk b/graphics/freeglut/buildlink3.mk
index bd34ae28687..2e2de20617f 100644
--- a/graphics/freeglut/buildlink3.mk
+++ b/graphics/freeglut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREEGLUT_BUILDLINK3_MK:=	${FREEGLUT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	freeglut
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreeglut}
 BUILDLINK_PACKAGES+=	freeglut
+BUILDLINK_ORDER+=	freeglut
 
 .if !empty(FREEGLUT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.freeglut+=	freeglut>=2.2.0
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index b9079f91f46..7caaee68cce 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE_BUILDLINK3_MK:=	${FREETYPE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	freetype
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreetype}
 BUILDLINK_PACKAGES+=	freetype
+BUILDLINK_ORDER+=	freetype
 
 .if !empty(FREETYPE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.freetype+=	freetype-lib>=1.3.1nb1
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index ff3dad8036a..5c8b4f435e4 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	freetype2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreetype2}
 BUILDLINK_PACKAGES+=	freetype2
+BUILDLINK_ORDER+=	freetype2
 
 .if !empty(FREETYPE2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.8
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 93d4efa175f..79d86425ea5 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GD_BUILDLINK3_MK:=	${GD_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gd
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngd}
 BUILDLINK_PACKAGES+=	gd
+BUILDLINK_ORDER+=	gd
 
 .if !empty(GD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gd+=		gd>=2.0.15nb1
diff --git a/graphics/gdchart/buildlink3.mk b/graphics/gdchart/buildlink3.mk
index 63b470c47c4..d85428a0140 100644
--- a/graphics/gdchart/buildlink3.mk
+++ b/graphics/gdchart/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:18 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GDCHART_BUILDLINK3_MK:=	${GDCHART_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gdchart
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdchart}
 BUILDLINK_PACKAGES+=	gdchart
+BUILDLINK_ORDER+=	gdchart
 
 .if !empty(GDCHART_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gdchart+=	gdchart>=0.11.4nb1
diff --git a/graphics/gdk-pixbuf-gnome/buildlink3.mk b/graphics/gdk-pixbuf-gnome/buildlink3.mk
index 4ba34cdff61..efafae8bd0f 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink3.mk
+++ b/graphics/gdk-pixbuf-gnome/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:18 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GDK_PIXBUF_GNOME_BUILDLINK3_MK:=	${GDK_PIXBUF_GNOME_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gdk-pixbuf-gnome
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdk-pixbuf-gnome}
 BUILDLINK_PACKAGES+=	gdk-pixbuf-gnome
+BUILDLINK_ORDER+=	gdk-pixbuf-gnome
 
 .if !empty(GDK_PIXBUF_GNOME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gdk-pixbuf-gnome+=	gdk-pixbuf-gnome>=0.22.0nb2
diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk
index 71af150e731..866774291b6 100644
--- a/graphics/gdk-pixbuf/buildlink3.mk
+++ b/graphics/gdk-pixbuf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/17 13:46:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GDK_PIXBUF_BUILDLINK3_MK:=	${GDK_PIXBUF_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gdk-pixbuf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdk-pixbuf}
 BUILDLINK_PACKAGES+=	gdk-pixbuf
+BUILDLINK_ORDER+=	gdk-pixbuf
 
 .if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gdk-pixbuf+=		gdk-pixbuf>=0.22.0nb2
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index eb7e964f68a..95e300a891e 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gimp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp}
 BUILDLINK_PACKAGES+=	gimp
+BUILDLINK_ORDER+=	gimp
 
 .if !empty(GIMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gimp+=	gimp>=2.2.9nb1
diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk
index 4455392685b..825baa212b7 100644
--- a/graphics/gimp1-base/buildlink3.mk
+++ b/graphics/gimp1-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GIMP_BASE_BUILDLINK3_MK:=	${GIMP_BASE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gimp-base
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp-base}
 BUILDLINK_PACKAGES+=	gimp-base
+BUILDLINK_ORDER+=	gimp-base
 
 .if !empty(GIMP_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gimp-base+=	gimp-base>=1.2.5nb2
diff --git a/graphics/gimp24/buildlink3.mk b/graphics/gimp24/buildlink3.mk
index bc7eb71db20..6e4fd503b0c 100644
--- a/graphics/gimp24/buildlink3.mk
+++ b/graphics/gimp24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/06/08 15:39:38 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gimp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp}
 BUILDLINK_PACKAGES+=	gimp
+BUILDLINK_ORDER+=	gimp
 
 .if !empty(GIMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gimp+=	gimp>=2.3.4nb1
diff --git a/graphics/gle/buildlink3.mk b/graphics/gle/buildlink3.mk
index 7d9fb361244..584ad6ae1f1 100644
--- a/graphics/gle/buildlink3.mk
+++ b/graphics/gle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLE_BUILDLINK3_MK:=	${GLE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gle
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngle}
 BUILDLINK_PACKAGES+=	gle
+BUILDLINK_ORDER+=	gle
 
 .if !empty(GLE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gle+=		gle>=3.0.3
diff --git a/graphics/glitz/buildlink3.mk b/graphics/glitz/buildlink3.mk
index 9a5198baf6d..a8c1339cb46 100644
--- a/graphics/glitz/buildlink3.mk
+++ b/graphics/glitz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLITZ_BUILDLINK3_MK:=	${GLITZ_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	glitz
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglitz}
 BUILDLINK_PACKAGES+=	glitz
+BUILDLINK_ORDER+=	glitz
 
 .if !empty(GLITZ_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glitz+=	glitz>=0.4.4
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 54cbadf846b..b5193f34bdc 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2006/04/06 06:22:02 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	glu
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglu}
 BUILDLINK_PACKAGES+=	glu
+BUILDLINK_ORDER+=	glu
 
 .if !empty(GLU_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glu+=		glu>=3.4.2
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index 3a04c2601cf..4ac064e635e 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:02 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLUT_BUILDLINK3_MK:=	${GLUT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	glut
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglut}
 BUILDLINK_PACKAGES+=	glut
+BUILDLINK_ORDER+=	glut
 
 .if !empty(GLUT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glut+=	glut>=3.4.2
diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk
index 8eaa98b21fe..fcc77c5ea37 100644
--- a/graphics/gnome-icon-theme/buildlink3.mk
+++ b/graphics/gnome-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME_ICON_THEME_BUILDLINK3_MK:=	${GNOME_ICON_THEME_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnome-icon-theme
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-icon-theme}
 BUILDLINK_PACKAGES+=	gnome-icon-theme
+BUILDLINK_ORDER+=	gnome-icon-theme
 
 .if !empty(GNOME_ICON_THEME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.8.0
diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk
index 1d03bd1bb1c..75bcca995f0 100644
--- a/graphics/graphviz/buildlink3.mk
+++ b/graphics/graphviz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:45:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GRAPHVIZ_BUILDLINK3_MK:=	${GRAPHVIZ_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	graphviz
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngraphviz}
 BUILDLINK_PACKAGES+=	graphviz
+BUILDLINK_ORDER+=	graphviz
 
 .if !empty(GRAPHVIZ_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.graphviz+=	graphviz>=1.12
diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk
index a4c9220c9db..d157692bb7b 100644
--- a/graphics/gtkglext/buildlink3.mk
+++ b/graphics/gtkglext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLEXT_BUILDLINK3_MK:=	${GTKGLEXT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtkglext
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkglext}
 BUILDLINK_PACKAGES+=	gtkglext
+BUILDLINK_ORDER+=	gtkglext
 
 .if !empty(GTKGLEXT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkglext+=	gtkglext>=1.2.0
diff --git a/graphics/hermes/buildlink3.mk b/graphics/hermes/buildlink3.mk
index d07432d3650..4f70b499fb0 100644
--- a/graphics/hermes/buildlink3.mk
+++ b/graphics/hermes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:17 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HERMES_BUILDLINK3_MK:=	${HERMES_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	Hermes
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NHermes}
 BUILDLINK_PACKAGES+=	Hermes
+BUILDLINK_ORDER+=	Hermes
 
 .if !empty(HERMES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Hermes+=	Hermes>=1.3.2
diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk
index fad5840bd97..9a31db98549 100644
--- a/graphics/hicolor-icon-theme/buildlink3.mk
+++ b/graphics/hicolor-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/06/21 16:08:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 HICOLOR_ICON_THEME_BUILDLINK3_MK:=	${HICOLOR_ICON_THEME_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	hicolor-icon-theme
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhicolor-icon-theme}
 BUILDLINK_PACKAGES+=	hicolor-icon-theme
+BUILDLINK_ORDER+=	hicolor-icon-theme
 
 .if !empty(HICOLOR_ICON_THEME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.hicolor-icon-theme+=	hicolor-icon-theme>=0.4
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index 26c31ae4095..e7da7859093 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMLIB_BUILDLINK3_MK:=	${IMLIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	imlib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nimlib}
 BUILDLINK_PACKAGES+=	imlib
+BUILDLINK_ORDER+=	imlib
 
 .if !empty(IMLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.imlib+=	imlib>=1.9.14nb5
diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk
index 51edcbdf06b..63c597d223b 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/17 13:46:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMLIB2_BUILDLINK3_MK:=	${IMLIB2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	imlib2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nimlib2}
 BUILDLINK_PACKAGES+=	imlib2
+BUILDLINK_ORDER+=	imlib2
 
 .if !empty(IMLIB2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.imlib2+=	imlib2>=1.1.0nb2
diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk
index 97116322180..10a703b7899 100644
--- a/graphics/jasper/buildlink3.mk
+++ b/graphics/jasper/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JASPER_BUILDLINK3_MK:=	${JASPER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	jasper
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njasper}
 BUILDLINK_PACKAGES+=	jasper
+BUILDLINK_ORDER+=	jasper
 
 .if !empty(JASPER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.jasper+=	jasper>=1.600.0
diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk
index e7275c2e534..1e29b619e98 100644
--- a/graphics/jpeg/buildlink3.mk
+++ b/graphics/jpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:03 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JPEG_BUILDLINK3_MK:=	${JPEG_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	jpeg
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njpeg}
 BUILDLINK_PACKAGES+=	jpeg
+BUILDLINK_ORDER+=	jpeg
 
 .if !empty(JPEG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.jpeg+=	jpeg>=6b
diff --git a/graphics/kdegraphics3/buildlink3.mk b/graphics/kdegraphics3/buildlink3.mk
index 13e50b87c1a..6eeafc65234 100644
--- a/graphics/kdegraphics3/buildlink3.mk
+++ b/graphics/kdegraphics3/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:19 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 KDEGRAPHICS_BUILDLINK3_MK:=	${KDEGRAPHICS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	kdegraphics
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdegraphics}
 BUILDLINK_PACKAGES+=	kdegraphics
+BUILDLINK_ORDER+=	kdegraphics
 
 .if !empty(KDEGRAPHICS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kdegraphics+=	kdegraphics>=3.5.0nb2
diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk
index 7d9cf8348f2..24a3f5f99be 100644
--- a/graphics/lcms/buildlink3.mk
+++ b/graphics/lcms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LCMS_BUILDLINK3_MK:=	${LCMS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	lcms
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlcms}
 BUILDLINK_PACKAGES+=	lcms
+BUILDLINK_ORDER+=	lcms
 
 .if !empty(LCMS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lcms+=	lcms>=1.06
diff --git a/graphics/lib3ds/buildlink3.mk b/graphics/lib3ds/buildlink3.mk
index c2ba3bd872e..1293a725f36 100644
--- a/graphics/lib3ds/buildlink3.mk
+++ b/graphics/lib3ds/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIB3DS_BUILDLINK3_MK:=	${LIB3DS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	lib3ds
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlib3ds}
 BUILDLINK_PACKAGES+=	lib3ds
+BUILDLINK_ORDER+=	lib3ds
 
 .if !empty(LIB3DS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lib3ds+=	lib3ds>=1.2.0nb2
diff --git a/graphics/libart2/buildlink3.mk b/graphics/libart2/buildlink3.mk
index 2cdf17cd3ea..71a4ea53aac 100644
--- a/graphics/libart2/buildlink3.mk
+++ b/graphics/libart2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBART2_BUILDLINK3_MK:=	${LIBART2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libart2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibart2}
 BUILDLINK_PACKAGES+=	libart2
+BUILDLINK_ORDER+=	libart2
 
 .if !empty(LIBART2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libart2+=	libart2>=2.3.10nb1
diff --git a/graphics/libexif-gtk/buildlink3.mk b/graphics/libexif-gtk/buildlink3.mk
index 4cc0ae7b1bc..7474190eacd 100644
--- a/graphics/libexif-gtk/buildlink3.mk
+++ b/graphics/libexif-gtk/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:19 jlam Exp $
 #
 # This file was created automatically using createbuildlink-3.4.
 
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	libexif-gtk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibexif-gtk}
 BUILDLINK_PACKAGES+=	libexif-gtk
+BUILDLINK_ORDER+=	libexif-gtk
 
 .if !empty(LIBEXIF_GTK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libexif-gtk+=	libexif-gtk>=0.3.3nb7
diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk
index b49df26a88e..269bd551475 100644
--- a/graphics/libexif/buildlink3.mk
+++ b/graphics/libexif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/12 10:27:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBEXIF_BUILDLINK3_MK:=	${LIBEXIF_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libexif
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibexif}
 BUILDLINK_PACKAGES+=	libexif
+BUILDLINK_ORDER+=	libexif
 
 .if !empty(LIBEXIF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libexif+=	libexif>=0.6.11
diff --git a/graphics/libgdgeda/buildlink3.mk b/graphics/libgdgeda/buildlink3.mk
index 35f87980db8..43daed2c0e0 100644
--- a/graphics/libgdgeda/buildlink3.mk
+++ b/graphics/libgdgeda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDGEDA_BUILDLINK3_MK:=	${LIBGDGEDA_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libgdgeda
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgdgeda}
 BUILDLINK_PACKAGES+=	libgdgeda
+BUILDLINK_ORDER+=	libgdgeda
 
 .if !empty(LIBGDGEDA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgdgeda+=	libgdgeda>=2.0.15
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index 17b025f29db..c989e5e1bf4 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDIPLUS_BUILDLINK3_MK:=	${LIBGDIPLUS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libgdiplus
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgdiplus}
 BUILDLINK_PACKAGES+=	libgdiplus
+BUILDLINK_ORDER+=	libgdiplus
 
 .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgdiplus+=	libgdiplus>=1.1.11
diff --git a/graphics/libggi/buildlink3.mk b/graphics/libggi/buildlink3.mk
index b39c6dcfb44..1c98940e9b5 100644
--- a/graphics/libggi/buildlink3.mk
+++ b/graphics/libggi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGGI_BUILDLINK3_MK:=	${LIBGGI_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libggi
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibggi}
 BUILDLINK_PACKAGES+=	libggi
+BUILDLINK_ORDER+=	libggi
 
 .if !empty(LIBGGI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libggi+=	libggi>=2.1.0
diff --git a/graphics/libggiwmh/buildlink3.mk b/graphics/libggiwmh/buildlink3.mk
index aeb7e3ab200..341240823db 100644
--- a/graphics/libggiwmh/buildlink3.mk
+++ b/graphics/libggiwmh/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGGIWMH_BUILDLINK3_MK:=	${LIBGGIWMH_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libggiwmh
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibggiwmh}
 BUILDLINK_PACKAGES+=	libggiwmh
+BUILDLINK_ORDER+=	libggiwmh
 
 .if !empty(LIBGGIWMH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libggiwmh+=	libggiwmh>=0.2.0
diff --git a/graphics/libgii/buildlink3.mk b/graphics/libgii/buildlink3.mk
index 4ff0f580ea7..c8b97f0101e 100644
--- a/graphics/libgii/buildlink3.mk
+++ b/graphics/libgii/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGII_BUILDLINK3_MK:=	${LIBGII_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libgii
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgii}
 BUILDLINK_PACKAGES+=	libgii
+BUILDLINK_ORDER+=	libgii
 
 .if !empty(LIBGII_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgii+=	libgii>=0.9.0
diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index 22a9eebc4a9..6519c9b8f66 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/17 13:46:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMECANVAS_BUILDLINK3_MK:=	${LIBGNOMECANVAS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libgnomecanvas
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomecanvas}
 BUILDLINK_PACKAGES+=	libgnomecanvas
+BUILDLINK_ORDER+=	libgnomecanvas
 
 .if !empty(LIBGNOMECANVAS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomecanvas+=	libgnomecanvas>=2.8.0
diff --git a/graphics/libgnomecanvasmm/buildlink3.mk b/graphics/libgnomecanvasmm/buildlink3.mk
index 4375851e25f..0bd3258ef64 100644
--- a/graphics/libgnomecanvasmm/buildlink3.mk
+++ b/graphics/libgnomecanvasmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:46:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:19 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 LIBGNOMECANVASMM_BUILDLINK3_MK:=	${LIBGNOMECANVASMM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libgnomecanvasmm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomecanvasmm}
 BUILDLINK_PACKAGES+=	libgnomecanvasmm
+BUILDLINK_ORDER+=	libgnomecanvasmm
 
 .if !empty(LIBGNOMECANVASMM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomecanvasmm+=	libgnomecanvasmm>=2.10.0
diff --git a/graphics/libkexif/buildlink3.mk b/graphics/libkexif/buildlink3.mk
index 0fd4f6f8be2..1b031fe5c46 100644
--- a/graphics/libkexif/buildlink3.mk
+++ b/graphics/libkexif/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:20 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBKEXIF_BUILDLINK3_MK:=	${LIBKEXIF_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libkexif
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibkexif}
 BUILDLINK_PACKAGES+=	libkexif
+BUILDLINK_ORDER+=	libkexif
 
 .if !empty(LIBKEXIF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libkexif+=	libkexif>=0.2.1
diff --git a/graphics/libkipi/buildlink3.mk b/graphics/libkipi/buildlink3.mk
index 0ccad8d29c3..0d4869ec79e 100644
--- a/graphics/libkipi/buildlink3.mk
+++ b/graphics/libkipi/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:20 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBKIPI_BUILDLINK3_MK:=	${LIBKIPI_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libkipi
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibkipi}
 BUILDLINK_PACKAGES+=	libkipi
+BUILDLINK_ORDER+=	libkipi
 
 .if !empty(LIBKIPI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libkipi+=	libkipi>=0.1
diff --git a/graphics/libpixman/buildlink3.mk b/graphics/libpixman/buildlink3.mk
index be08a7d82a4..f1dbd133fed 100644
--- a/graphics/libpixman/buildlink3.mk
+++ b/graphics/libpixman/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPIXMAN_BUILDLINK3_MK:=	${LIBPIXMAN_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libpixman
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpixman}
 BUILDLINK_PACKAGES+=	libpixman
+BUILDLINK_ORDER+=	libpixman
 
 .if !empty(LIBPIXMAN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libpixman+=	libpixman>=0.1.4
diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk
index 1755ec3c616..49614aab7e6 100644
--- a/graphics/librsvg/buildlink3.mk
+++ b/graphics/librsvg/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:20 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBRSVG_BUILDLINK3_MK:=	${LIBRSVG_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	librsvg
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsvg}
 BUILDLINK_PACKAGES+=	librsvg
+BUILDLINK_ORDER+=	librsvg
 
 .if !empty(LIBRSVG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=1.0.1nb5
diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk
index 29564ab512d..ed773bb85fb 100644
--- a/graphics/librsvg2/buildlink3.mk
+++ b/graphics/librsvg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/04/17 13:46:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRSVG2_BUILDLINK3_MK:=	${LIBRSVG2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	librsvg2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsvg2}
 BUILDLINK_PACKAGES+=	librsvg2
+BUILDLINK_ORDER+=	librsvg2
 
 .if !empty(LIBRSVG2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.librsvg2+=	librsvg2>=2.12.6nb1
diff --git a/graphics/libscigraphica/buildlink3.mk b/graphics/libscigraphica/buildlink3.mk
index f2c90fb3bcc..7cc983485ad 100644
--- a/graphics/libscigraphica/buildlink3.mk
+++ b/graphics/libscigraphica/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/07/02 10:18:32 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:20 jlam Exp $
 #
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -10,6 +10,7 @@ BUILDLINK_DEPENDS+=	libscigraphica
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibscigraphica}
 BUILDLINK_PACKAGES+=	libscigraphica
+BUILDLINK_ORDER+=	libscigraphica
 
 .if ${LIBSCIGRAPHICA_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libscigraphica+=	libscigraphica>=2.1.1
diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk
index 3f717c5cfbd..2a589cfda39 100644
--- a/graphics/libungif/buildlink3.mk
+++ b/graphics/libungif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBUNGIF_BUILDLINK3_MK:=	${LIBUNGIF_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libungif
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibungif}
 BUILDLINK_PACKAGES+=	libungif
+BUILDLINK_ORDER+=	libungif
 
 .if !empty(LIBUNGIF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libungif+=	libungif>=4.1.0
diff --git a/graphics/libvideogfx/buildlink3.mk b/graphics/libvideogfx/buildlink3.mk
index 030eae3ab52..56227f3e253 100644
--- a/graphics/libvideogfx/buildlink3.mk
+++ b/graphics/libvideogfx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBVIDEOGFX_BUILDLINK3_MK:=	${LIBVIDEOGFX_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libvideogfx
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvideogfx}
 BUILDLINK_PACKAGES+=	libvideogfx
+BUILDLINK_ORDER+=	libvideogfx
 
 .if !empty(LIBVIDEOGFX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libvideogfx+=	libvideogfx>=1.0.3
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index d00eae79eeb..55506309765 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/06/07 07:26:35 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWMF_BUILDLINK3_MK:=	${LIBWMF_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libwmf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwmf}
 BUILDLINK_PACKAGES+=	libwmf
+BUILDLINK_ORDER+=	libwmf
 
 .if !empty(LIBWMF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libwmf+=	libwmf>=0.2.8nb2
diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk
index 8ace015d88b..bba7eec4583 100644
--- a/graphics/mng/buildlink3.mk
+++ b/graphics/mng/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MNG_BUILDLINK3_MK:=	${MNG_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	mng
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmng}
 BUILDLINK_PACKAGES+=	mng
+BUILDLINK_ORDER+=	mng
 
 .if !empty(MNG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mng+=		mng>=1.0.0
diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk
index 39d844983e4..27f9f67a76c 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:46:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NETPBM_BUILDLINK3_MK:=	${NETPBM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	netpbm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetpbm}
 BUILDLINK_PACKAGES+=	netpbm
+BUILDLINK_ORDER+=	netpbm
 
 .if !empty(NETPBM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.netpbm+=	netpbm>=10.11.6
diff --git a/graphics/openexr/buildlink3.mk b/graphics/openexr/buildlink3.mk
index f737cfe4c1e..20b67a5c0cc 100644
--- a/graphics/openexr/buildlink3.mk
+++ b/graphics/openexr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/06/14 19:20:05 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENEXR_BUILDLINK3_MK:=	${OPENEXR_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	openexr
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenexr}
 BUILDLINK_PACKAGES+=	openexr
+BUILDLINK_ORDER+=	openexr
 
 .if !empty(OPENEXR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openexr+=	openexr>=1.2.1
diff --git a/graphics/plotutils-nox11/buildlink3.mk b/graphics/plotutils-nox11/buildlink3.mk
index 03c800a0846..6f4d4b5f79e 100644
--- a/graphics/plotutils-nox11/buildlink3.mk
+++ b/graphics/plotutils-nox11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PLOTUTILS_NOX11_BUILDLINK3_MK:=	${PLOTUTILS_NOX11_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	plotutils-nox11
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nplotutils-nox11}
 BUILDLINK_PACKAGES+=	plotutils-nox11
+BUILDLINK_ORDER+=	plotutils-nox11
 
 .if !empty(PLOTUTILS_NOX11_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.plotutils-nox11+=	plotutils-nox11>=2.4.1
diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk
index e71c657a4f5..0887b22b08e 100644
--- a/graphics/plotutils/buildlink3.mk
+++ b/graphics/plotutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/17 13:45:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PLOTUTILS_BUILDLINK3_MK:=	${PLOTUTILS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	plotutils
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nplotutils}
 BUILDLINK_PACKAGES+=	plotutils
+BUILDLINK_ORDER+=	plotutils
 
 .if !empty(PLOTUTILS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.plotutils+=	plotutils>=2.4.1nb2
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index 2b91c977136..d14daeb111a 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/05/09 22:28:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNG_BUILDLINK3_MK:=	${PNG_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	png
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npng}
 BUILDLINK_PACKAGES+=	png
+BUILDLINK_ORDER+=	png
 
 .if !empty(PNG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.png+=		png>=1.2.4
diff --git a/graphics/py-cairo/buildlink3.mk b/graphics/py-cairo/buildlink3.mk
index 8ba0f85aaf9..57eecd148d4 100644
--- a/graphics/py-cairo/buildlink3.mk
+++ b/graphics/py-cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/05/23 11:17:33 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_CAIRO_BUILDLINK3_MK:=	${PY_CAIRO_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pycairo
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npycairo}
 BUILDLINK_PACKAGES+=	pycairo
+BUILDLINK_ORDER+=	pycairo
 
 .if !empty(PY_CAIRO_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk
index c0737bb5d5f..20c7ab9e38b 100644
--- a/graphics/py-imaging/buildlink3.mk
+++ b/graphics/py-imaging/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_IMAGING_BUILDLINK3_MK:=	${PY_IMAGING_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	pyimaging
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyimaging}
 BUILDLINK_PACKAGES+=	pyimaging
+BUILDLINK_ORDER+=	pyimaging
 
 .if !empty(PY_IMAGING_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.4
diff --git a/graphics/py-matplotlib/buildlink3.mk b/graphics/py-matplotlib/buildlink3.mk
index 2e2a599d1f4..b558c82404e 100644
--- a/graphics/py-matplotlib/buildlink3.mk
+++ b/graphics/py-matplotlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/04/06 16:43:39 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_MATPLOTLIB_BUILDLINK3_MK:=	${PY_MATPLOTLIB_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	pymatplotlib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npymatplotlib}
 BUILDLINK_PACKAGES+=	pymatplotlib
+BUILDLINK_ORDER+=	pymatplotlib
 
 .if !empty(PY_MATPLOTLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pymatplotlib+=	${PYPKGPREFIX}-matplotlib>=0.87.2
diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk
index 5c8c4589ea3..f39d1809267 100644
--- a/graphics/sane-backends/buildlink3.mk
+++ b/graphics/sane-backends/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:20 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SANE_BACKENDS_BUILDLINK3_MK:=	${SANE_BACKENDS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	sane-backends
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsane-backends}
 BUILDLINK_PACKAGES+=	sane-backends
+BUILDLINK_ORDER+=	sane-backends
 
 .if !empty(SANE_BACKENDS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sane-backends+=	sane-backends>=1.0.3
diff --git a/graphics/simage/buildlink3.mk b/graphics/simage/buildlink3.mk
index f378ce01a81..1241d9c6fc3 100644
--- a/graphics/simage/buildlink3.mk
+++ b/graphics/simage/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:20 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SIMAGE_BUILDLINK3_MK:=	${SIMAGE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	simage
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsimage}
 BUILDLINK_PACKAGES+=	simage
+BUILDLINK_ORDER+=	simage
 
 .if !empty(SIMAGE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.simage+=	simage>=1.6.1
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index f511d4d8fc0..687abc41764 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:05 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:21 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TIFF_BUILDLINK3_MK:=	${TIFF_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	tiff
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntiff}
 BUILDLINK_PACKAGES+=	tiff
+BUILDLINK_ORDER+=	tiff
 
 .if !empty(TIFF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tiff+=	tiff>=3.6.1
diff --git a/graphics/urt/buildlink3.mk b/graphics/urt/buildlink3.mk
index dec901ac302..6de8d23bdad 100644
--- a/graphics/urt/buildlink3.mk
+++ b/graphics/urt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:21 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 URT_BUILDLINK3_MK:=	${URT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	urt
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nurt}
 BUILDLINK_PACKAGES+=	urt
+BUILDLINK_ORDER+=	urt
 
 .if !empty(URT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.urt+=	urt>=3.1b1nb5
diff --git a/graphics/wxsvg/buildlink3.mk b/graphics/wxsvg/buildlink3.mk
index 6ef7d9ef788..4237d8e8f7b 100644
--- a/graphics/wxsvg/buildlink3.mk
+++ b/graphics/wxsvg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/17 13:46:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:21 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXSVG_BUILDLINK3_MK:=	${WXSVG_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	wxsvg
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwxsvg}
 BUILDLINK_PACKAGES+=	wxsvg
+BUILDLINK_ORDER+=	wxsvg
 
 .if !empty(WXSVG_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.wxsvg+=	wxsvg>=1.0beta5
diff --git a/graphics/xfce4-artwork/buildlink3.mk b/graphics/xfce4-artwork/buildlink3.mk
index ac46abb2bd8..b6104d87a77 100644
--- a/graphics/xfce4-artwork/buildlink3.mk
+++ b/graphics/xfce4-artwork/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:21 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_ARTWORK_BUILDLINK3_MK:=	${XFCE4_ARTWORK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-artwork
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-artwork}
 BUILDLINK_PACKAGES+=	xfce4-artwork
+BUILDLINK_ORDER+=	xfce4-artwork
 
 .if !empty(XFCE4_ARTWORK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-artwork+=	xfce4-artwork>=0.0.4nb5
diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk
index ada72e87052..6f63c5dcf3b 100644
--- a/graphics/xfce4-icon-theme/buildlink3.mk
+++ b/graphics/xfce4-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:21 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_ICON_THEME_BUILDLINK3_MK:=	${XFCE4_ICON_THEME_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-icon-theme
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-icon-theme}
 BUILDLINK_PACKAGES+=	xfce4-icon-theme
+BUILDLINK_ORDER+=	xfce4-icon-theme
 
 .if !empty(XFCE4_ICON_THEME_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-icon-theme+=	xfce4-icon-theme>=4.2.3
diff --git a/graphics/xfce4-iconbox/buildlink3.mk b/graphics/xfce4-iconbox/buildlink3.mk
index f50f9744988..c5f0479564d 100644
--- a/graphics/xfce4-iconbox/buildlink3.mk
+++ b/graphics/xfce4-iconbox/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:21 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_ICONBOX_BUILDLINK3_MK:=	${XFCE4_ICONBOX_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xfce4-iconbox
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-iconbox}
 BUILDLINK_PACKAGES+=	xfce4-iconbox
+BUILDLINK_ORDER+=	xfce4-iconbox
 
 .if !empty(XFCE4_ICONBOX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xfce4-iconbox+=	xfce4-iconbox>=4.2.3
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index 414cbab91c4..7ec337fbfb2 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2006/04/12 10:27:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2006/07/08 22:39:21 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XPM_BUILDLINK3_MK:=	${XPM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xpm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxpm}
 BUILDLINK_PACKAGES+=	xpm
+BUILDLINK_ORDER+=	xpm
 
 .if !empty(XPM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xpm+=		xpm>=3.4k