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.

35 files changed, 70 insertions, 35 deletions

diff --git a/textproc/aiksaurus/buildlink3.mk b/textproc/aiksaurus/buildlink3.mk
index c4621d67713..2c51e567453 100644
--- a/textproc/aiksaurus/buildlink3.mk
+++ b/textproc/aiksaurus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:36 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:40 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AIKSAURUS_BUILDLINK3_MK:=	${AIKSAURUS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	aiksaurus
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naiksaurus}
 BUILDLINK_PACKAGES+=	aiksaurus
+BUILDLINK_ORDER+=	aiksaurus
 
 .if !empty(AIKSAURUS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.aiksaurus+=	aiksaurus>=1.2.1
diff --git a/textproc/aspell/buildlink3.mk b/textproc/aspell/buildlink3.mk
index f336907d134..0772ea37f5c 100644
--- a/textproc/aspell/buildlink3.mk
+++ b/textproc/aspell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/12 10:27:36 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:40 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ASPELL_BUILDLINK3_MK:=	${ASPELL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	aspell
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naspell}
 BUILDLINK_PACKAGES+=	aspell
+BUILDLINK_ORDER+=	aspell
 
 .if !empty(ASPELL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.aspell+=	aspell>=0.50.3
diff --git a/textproc/btparse/buildlink3.mk b/textproc/btparse/buildlink3.mk
index 998be28bcce..b01a7cb3cf0 100644
--- a/textproc/btparse/buildlink3.mk
+++ b/textproc/btparse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:36 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:40 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BTPARSE_BUILDLINK3_MK:=	${BTPARSE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	btparse
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbtparse}
 BUILDLINK_PACKAGES+=	btparse
+BUILDLINK_ORDER+=	btparse
 
 .if !empty(BTPARSE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.btparse+=	btparse>=0.34
diff --git a/textproc/chasen-base/buildlink3.mk b/textproc/chasen-base/buildlink3.mk
index 388645b1ab6..16d98b81338 100644
--- a/textproc/chasen-base/buildlink3.mk
+++ b/textproc/chasen-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:36 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:40 jlam Exp $
 #
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -10,6 +10,7 @@ BUILDLINK_DEPENDS+=	chasen-base
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nchasen-base}
 BUILDLINK_PACKAGES+=	chasen-base
+BUILDLINK_ORDER+=	chasen-base
 
 .if !empty(CHASEN_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.chasen-base+=	chasen-base>=2.3.3
diff --git a/textproc/chasen/buildlink3.mk b/textproc/chasen/buildlink3.mk
index f5e85479f1b..2e25dfd1124 100644
--- a/textproc/chasen/buildlink3.mk
+++ b/textproc/chasen/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:36 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:40 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CHASEN_BUILDLINK3_MK:=	${CHASEN_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	chasen
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nchasen}
 BUILDLINK_PACKAGES+=	chasen
+BUILDLINK_ORDER+=	chasen
 
 .if !empty(CHASEN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.chasen+=	chasen>=2.0
diff --git a/textproc/eb/buildlink3.mk b/textproc/eb/buildlink3.mk
index 549fb7ac804..804812421c7 100644
--- a/textproc/eb/buildlink3.mk
+++ b/textproc/eb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/12 10:27:36 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:40 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EB_BUILDLINK3_MK:=	${EB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	eb
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Neb}
 BUILDLINK_PACKAGES+=	eb
+BUILDLINK_ORDER+=	eb
 
 _EB_REQD=		3.3.2nb1
 
diff --git a/textproc/enchant/buildlink3.mk b/textproc/enchant/buildlink3.mk
index 07891dedd6a..4b849e780f3 100644
--- a/textproc/enchant/buildlink3.mk
+++ b/textproc/enchant/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:36 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:40 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ENCHANT_BUILDLINK3_MK:=	${ENCHANT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	enchant
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nenchant}
 BUILDLINK_PACKAGES+=	enchant
+BUILDLINK_ORDER+=	enchant
 
 .if !empty(ENCHANT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.enchant+=	enchant>=1.1.3
diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk
index 0388cd0f382..cab28f2b532 100644
--- a/textproc/expat/buildlink3.mk
+++ b/textproc/expat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:50 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 22:39:40 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EXPAT_BUILDLINK3_MK:=	${EXPAT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	expat
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nexpat}
 BUILDLINK_PACKAGES+=	expat
+BUILDLINK_ORDER+=	expat
 
 .if !empty(EXPAT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.7
diff --git a/textproc/gdome2/buildlink3.mk b/textproc/gdome2/buildlink3.mk
index d598ed646cc..5c8a9c27117 100644
--- a/textproc/gdome2/buildlink3.mk
+++ b/textproc/gdome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:50 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GDOME2_BUILDLINK3_MK:=	${GDOME2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gdome2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdome2}
 BUILDLINK_PACKAGES+=	gdome2
+BUILDLINK_ORDER+=	gdome2
 
 .if !empty(GDOME2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gdome2+=	gdome2>=0.8.1nb1
diff --git a/textproc/gnome-doc-utils/buildlink3.mk b/textproc/gnome-doc-utils/buildlink3.mk
index 6971a3d7b19..697df5aedc7 100644
--- a/textproc/gnome-doc-utils/buildlink3.mk
+++ b/textproc/gnome-doc-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DOC_UTILS_BUILDLINK3_MK:=	${GNOME_DOC_UTILS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnome-doc-utils
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-doc-utils}
 BUILDLINK_PACKAGES+=	gnome-doc-utils
+BUILDLINK_ORDER+=	gnome-doc-utils
 
 .if !empty(GNOME_DOC_UTILS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPMETHOD.gnome-doc-utils+=	build
diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk
index 86418596873..5c69855c1bb 100644
--- a/textproc/gnome-spell/buildlink3.mk
+++ b/textproc/gnome-spell/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:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_SPELL_BUILDLINK3_MK:=	${GNOME_SPELL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnome-spell
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-spell}
 BUILDLINK_PACKAGES+=	gnome-spell
+BUILDLINK_ORDER+=	gnome-spell
 
 .if !empty(GNOME_SPELL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-spell+=		gnome-spell>=1.0.5
diff --git a/textproc/gtk-doc/buildlink3.mk b/textproc/gtk-doc/buildlink3.mk
index 9ee06eda285..daccc62c895 100644
--- a/textproc/gtk-doc/buildlink3.mk
+++ b/textproc/gtk-doc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:50 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 22:39:41 jlam Exp $
 
 # provided mostly for pkg-config
 
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	gtk-doc
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk-doc}
 BUILDLINK_PACKAGES+=	gtk-doc
+BUILDLINK_ORDER+=	gtk-doc
 
 .if !empty(GTK_DOC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk-doc+=	gtk-doc>=1.4nb1
diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk
index c63990a51cf..42be7cd5072 100644
--- a/textproc/gtkspell/buildlink3.mk
+++ b/textproc/gtkspell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:46:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKSPELL_BUILDLINK3_MK:=	${GTKSPELL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gtkspell
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkspell}
 BUILDLINK_PACKAGES+=	gtkspell
+BUILDLINK_ORDER+=	gtkspell
 
 .if !empty(GTKSPELL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkspell+=	gtkspell>=2.0.2nb6
diff --git a/textproc/hre/buildlink3.mk b/textproc/hre/buildlink3.mk
index 98498c371fa..bfe6e7a1b05 100644
--- a/textproc/hre/buildlink3.mk
+++ b/textproc/hre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HRE_BUILDLINK3_MK:=	${HRE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	hre
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhre}
 BUILDLINK_PACKAGES+=	hre
+BUILDLINK_ORDER+=	hre
 
 .if !empty(HRE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.hre+=		hre>=0.9.7
diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk
index 814cd1bb310..a40bee429bd 100644
--- a/textproc/icu/buildlink3.mk
+++ b/textproc/icu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICU_BUILDLINK3_MK:=	${ICU_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	icu
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nicu}
 BUILDLINK_PACKAGES+=	icu
+BUILDLINK_ORDER+=	icu
 
 .if !empty(ICU_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.icu+=	icu>=3.4
diff --git a/textproc/iso-codes/buildlink3.mk b/textproc/iso-codes/buildlink3.mk
index cd8e3cb0e25..74aec93fadc 100644
--- a/textproc/iso-codes/buildlink3.mk
+++ b/textproc/iso-codes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 ISO_CODES_BUILDLINK3_MK:=	${ISO_CODES_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	iso-codes
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Niso-codes}
 BUILDLINK_PACKAGES+=	iso-codes
+BUILDLINK_ORDER+=	iso-codes
 
 .if !empty(ISO_CODES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.iso-codes+=	iso-codes>=0.50
diff --git a/textproc/jade/buildlink3.mk b/textproc/jade/buildlink3.mk
index 833097de303..2892c4021ea 100644
--- a/textproc/jade/buildlink3.mk
+++ b/textproc/jade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JADE_BUILDLINK3_MK:=	${JADE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	jade
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njade}
 BUILDLINK_PACKAGES+=	jade
+BUILDLINK_ORDER+=	jade
 
 .if !empty(JADE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.jade+=	jade>=1.2.1nb7
diff --git a/textproc/kakasi/buildlink3.mk b/textproc/kakasi/buildlink3.mk
index f367828d5f0..9913e3728ed 100644
--- a/textproc/kakasi/buildlink3.mk
+++ b/textproc/kakasi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:51 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KAKASI_BUILDLINK3_MK:=	${KAKASI_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	kakasi
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkakasi}
 BUILDLINK_PACKAGES+=	kakasi
+BUILDLINK_ORDER+=	kakasi
 
 .if !empty(KAKASI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.kakasi+=	kakasi>=2.3.0
diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk
index 91ba83d2c21..9169d47c4aa 100644
--- a/textproc/libcroco/buildlink3.mk
+++ b/textproc/libcroco/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:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCROCO_BUILDLINK3_MK:=	${LIBCROCO_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libcroco
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcroco}
 BUILDLINK_PACKAGES+=	libcroco
+BUILDLINK_ORDER+=	libcroco
 
 .if !empty(LIBCROCO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcroco+=	libcroco>=0.6.0
diff --git a/textproc/libpathan/buildlink3.mk b/textproc/libpathan/buildlink3.mk
index c4956a25619..238c17c023f 100644
--- a/textproc/libpathan/buildlink3.mk
+++ b/textproc/libpathan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPATHAN_BUILDLINK3_MK:=	${LIBPATHAN_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libpathan
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpathan}
 BUILDLINK_PACKAGES+=	libpathan
+BUILDLINK_ORDER+=	libpathan
 
 .if !empty(LIBPATHAN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libpathan+=	libpathan>=1.2.2
diff --git a/textproc/libunicode/buildlink3.mk b/textproc/libunicode/buildlink3.mk
index e43cb250efa..d487c78b64f 100644
--- a/textproc/libunicode/buildlink3.mk
+++ b/textproc/libunicode/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBUNICODE_BUILDLINK3_MK:=	${LIBUNICODE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libunicode
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibunicode}
 BUILDLINK_PACKAGES+=	libunicode
+BUILDLINK_ORDER+=	libunicode
 
 .if !empty(LIBUNICODE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libunicode+=		libunicode>=0.4
diff --git a/textproc/libxml++2/buildlink3.mk b/textproc/libxml++2/buildlink3.mk
index b2c81c14f4c..ec84f943fee 100644
--- a/textproc/libxml++2/buildlink3.mk
+++ b/textproc/libxml++2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXML++2_BUILDLINK3_MK:=	${LIBXML++2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libxml++2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxml++2}
 BUILDLINK_PACKAGES+=	libxml++2
+BUILDLINK_ORDER+=	libxml++2
 
 .if !empty(LIBXML++2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libxml++2+=	libxml++2>=2.10.0
diff --git a/textproc/libxml/buildlink3.mk b/textproc/libxml/buildlink3.mk
index 36d54a82a3b..f12b13adfdc 100644
--- a/textproc/libxml/buildlink3.mk
+++ b/textproc/libxml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXML_BUILDLINK3_MK:=	${LIBXML_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libxml
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxml}
 BUILDLINK_PACKAGES+=	libxml
+BUILDLINK_ORDER+=	libxml
 
 .if !empty(LIBXML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libxml+=	libxml>=1.8.11
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index aa15f6cc218..140f3b1ad94 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXML2_BUILDLINK3_MK:=	${LIBXML2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libxml2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxml2}
 BUILDLINK_PACKAGES+=	libxml2
+BUILDLINK_ORDER+=	libxml2
 
 .if !empty(LIBXML2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.2
diff --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk
index 3f8db7d5095..03a3fe79840 100644
--- a/textproc/libxslt/buildlink3.mk
+++ b/textproc/libxslt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXSLT_BUILDLINK3_MK:=	${LIBXSLT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libxslt
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxslt}
 BUILDLINK_PACKAGES+=	libxslt
+BUILDLINK_ORDER+=	libxslt
 
 .if !empty(LIBXSLT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.8
diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk
index 62921c33a7a..fbbaf78f2eb 100644
--- a/textproc/opensp/buildlink3.mk
+++ b/textproc/opensp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSP_BUILDLINK3_MK:=	${OPENSP_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	opensp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopensp}
 BUILDLINK_PACKAGES+=	opensp
+BUILDLINK_ORDER+=	opensp
 
 .if !empty(OPENSP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.opensp+=	opensp>=1.5.1
diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk
index 5d2e38bbec9..91841a237ed 100644
--- a/textproc/py-xml/buildlink3.mk
+++ b/textproc/py-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/12 10:27:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYXML_BUILDLINK3_MK:=	${PYXML_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	pyxml
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyxml}
 BUILDLINK_PACKAGES+=	pyxml
+BUILDLINK_ORDER+=	pyxml
 
 .if !empty(PYXML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pyxml+=	${PYPKGPREFIX}-xml>=0.8.3nb1
diff --git a/textproc/raptor/buildlink3.mk b/textproc/raptor/buildlink3.mk
index 16a17ceac18..912f754ea5c 100644
--- a/textproc/raptor/buildlink3.mk
+++ b/textproc/raptor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RAPTOR_BUILDLINK3_MK:=	${RAPTOR_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	raptor
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nraptor}
 BUILDLINK_PACKAGES+=	raptor
+BUILDLINK_ORDER+=	raptor
 
 .if !empty(RAPTOR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.raptor?=		raptor>=1.0.0
diff --git a/textproc/ruby-eruby/buildlink3.mk b/textproc/ruby-eruby/buildlink3.mk
index 49d220fff44..0b5844d6d5f 100644
--- a/textproc/ruby-eruby/buildlink3.mk
+++ b/textproc/ruby-eruby/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 RUBY_ERUBY_BUILDLINK3_MK:=	${RUBY_ERUBY_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	${RUBY_PKGPREFIX}-eruby
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-eruby}
 BUILDLINK_PACKAGES+=	${RUBY_PKGPREFIX}-eruby
+BUILDLINK_ORDER+=	${RUBY_PKGPREFIX}-eruby
 
 .if !empty(RUBY_ERUBY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ruby18-eruby+=	${RUBY_PKGPREFIX}-eruby>=0.9.7
diff --git a/textproc/ruby-rdtool/buildlink3.mk b/textproc/ruby-rdtool/buildlink3.mk
index 628df0fb82b..2b852a13ec5 100644
--- a/textproc/ruby-rdtool/buildlink3.mk
+++ b/textproc/ruby-rdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 
@@ -10,6 +10,7 @@ BUILDLINK_DEPENDS+=	${RUBY_PKGPREFIX}-rdtool
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-rdtool}
 BUILDLINK_PACKAGES+=	${RUBY_PKGPREFIX}-rdtool
+BUILDLINK_ORDER+=	${RUBY_PKGPREFIX}-rdtool
 
 .if !empty(RUBY_RDTOOL_BUILDLINK3_MK:M+)
 
diff --git a/textproc/sablotron/buildlink3.mk b/textproc/sablotron/buildlink3.mk
index 7ecc0430086..83e5daa4506 100644
--- a/textproc/sablotron/buildlink3.mk
+++ b/textproc/sablotron/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SABLOTRON_BUILDLINK3_MK:=	${SABLOTRON_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	sablotron
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsablotron}
 BUILDLINK_PACKAGES+=	sablotron
+BUILDLINK_ORDER+=	sablotron
 
 .if !empty(SABLOTRON_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sablotron+=	sablotron>=1.0
diff --git a/textproc/scrollkeeper/buildlink3.mk b/textproc/scrollkeeper/buildlink3.mk
index d0cbad39daf..51505429716 100644
--- a/textproc/scrollkeeper/buildlink3.mk
+++ b/textproc/scrollkeeper/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/12 10:27:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SCROLLKEEPER_BUILDLINK3_MK:=	${SCROLLKEEPER_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	scrollkeeper
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nscrollkeeper}
 BUILDLINK_PACKAGES+=	scrollkeeper
+BUILDLINK_ORDER+=	scrollkeeper
 
 .if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.scrollkeeper+=	scrollkeeper>=0.3.12nb2
diff --git a/textproc/xalan-c/buildlink3.mk b/textproc/xalan-c/buildlink3.mk
index ff1921e1508..2c4b611ab1d 100644
--- a/textproc/xalan-c/buildlink3.mk
+++ b/textproc/xalan-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XALAN_C_BUILDLINK3_MK:=	${XALAN_C_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xalan-c
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxalan-c}
 BUILDLINK_PACKAGES+=	xalan-c
+BUILDLINK_ORDER+=	xalan-c
 
 .if !empty(XALAN_C_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xalan-c+=	xalan-c>=1.6nb3
diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk
index ee40317a2c2..630872cf559 100644
--- a/textproc/xerces-c/buildlink3.mk
+++ b/textproc/xerces-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XERCES_C_BUILDLINK3_MK:=	${XERCES_C_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	xerces-c
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxerces-c}
 BUILDLINK_PACKAGES+=	xerces-c
+BUILDLINK_ORDER+=	xerces-c
 
 .if !empty(XERCES_C_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xerces-c+=	xerces-c>=2.3.0
diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk
index 288c3d68b00..7755947d5f8 100644
--- a/textproc/xmlcatmgr/buildlink3.mk
+++ b/textproc/xmlcatmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:42 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xmlcatmgr.
 #
@@ -21,6 +21,7 @@ BUILDLINK_DEPENDS+=	xmlcatmgr
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxmlcatmgr}
 BUILDLINK_PACKAGES+=	xmlcatmgr
+BUILDLINK_ORDER+=	xmlcatmgr
 
 .if !empty(XMLCATMGR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.xmlcatmgr+=		xmlcatmgr>=2.0beta1