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.

37 files changed, 74 insertions, 37 deletions

diff --git a/databases/bdb-xml/buildlink3.mk b/databases/bdb-xml/buildlink3.mk
index baa6178b0f4..40633232c2c 100644
--- a/databases/bdb-xml/buildlink3.mk
+++ b/databases/bdb-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BDB_XML_BUILDLINK3_MK:=	${BDB_XML_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	bdb-xml
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbdb-xml}
 BUILDLINK_PACKAGES+=	bdb-xml
+BUILDLINK_ORDER+=	bdb-xml
 
 .if !empty(BDB_XML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.bdb-xml+=	bdb-xml>=1.2.1nb3
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index 8d2082681e2..586d30186cc 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/05/31 10:09:24 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB_BUILDLINK3_MK:=	${DB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	db2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb2}
 BUILDLINK_PACKAGES+=	db2
+BUILDLINK_ORDER+=	db2
 
 .if !empty(DB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.db2+=		db>=2.7.3
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index 28f64fd8fb9..929127ab634 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/05/31 10:10:50 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB3_BUILDLINK3_MK:=	${DB3_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	db3
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb3}
 BUILDLINK_PACKAGES+=	db3
+BUILDLINK_ORDER+=	db3
 
 .if !empty(DB3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.db3+=		db3>=2.9.2
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index 155fd908a86..3cc231a4889 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2006/05/31 10:13:23 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB4_BUILDLINK3_MK:=	${DB4_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	db4
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb4}
 BUILDLINK_PACKAGES+=	db4
+BUILDLINK_ORDER+=	db4
 
 .if !empty(DB4_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.db4+=		db4>=4.4.16
diff --git a/databases/dbh/buildlink3.mk b/databases/dbh/buildlink3.mk
index 5d2c248c5fc..6aa72310d32 100644
--- a/databases/dbh/buildlink3.mk
+++ b/databases/dbh/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DBH_BUILDLINK3_MK:=	${DBH_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	dbh
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbh}
 BUILDLINK_PACKAGES+=	dbh
+BUILDLINK_ORDER+=	dbh
 
 .if !empty(DBH_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dbh+=		dbh>=1.0.22
diff --git a/databases/edb/buildlink3.mk b/databases/edb/buildlink3.mk
index 4f21cecd8ce..ddd93b3f6ba 100644
--- a/databases/edb/buildlink3.mk
+++ b/databases/edb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EDB_BUILDLINK3_MK:=	${EDB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	edb
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nedb}
 BUILDLINK_PACKAGES+=	edb
+BUILDLINK_ORDER+=	edb
 
 .if !empty(EDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.edb+=	edb>=1.0.3nb3
diff --git a/databases/freetds/buildlink3.mk b/databases/freetds/buildlink3.mk
index 4ba7c916783..9c806d543dc 100644
--- a/databases/freetds/buildlink3.mk
+++ b/databases/freetds/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FREETDS_BUILDLINK3_MK:=	${FREETDS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	freetds
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreetds}
 BUILDLINK_PACKAGES+=	freetds
+BUILDLINK_ORDER+=	freetds
 
 .if !empty(FREETDS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.63nb2
diff --git a/databases/gdbm/buildlink3.mk b/databases/gdbm/buildlink3.mk
index f42a955a4d0..7b1c979e58d 100644
--- a/databases/gdbm/buildlink3.mk
+++ b/databases/gdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GDBM_BUILDLINK3_MK:=	${GDBM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gdbm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdbm}
 BUILDLINK_PACKAGES+=	gdbm
+BUILDLINK_ORDER+=	gdbm
 
 .if !empty(GDBM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gdbm+=	gdbm>=1.8.3
diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk
index 923b93225fa..2452a1d7f8b 100644
--- a/databases/gnome-mime-data/buildlink3.mk
+++ b/databases/gnome-mime-data/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/06/16 09:34:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MIME_DATA_BUILDLINK3_MK:=	${GNOME_MIME_DATA_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnome-mime-data
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-mime-data}
 BUILDLINK_PACKAGES+=	gnome-mime-data
+BUILDLINK_ORDER+=	gnome-mime-data
 
 .if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.4.0
diff --git a/databases/iodbc/buildlink3.mk b/databases/iodbc/buildlink3.mk
index f12d869d476..5d474b4984c 100644
--- a/databases/iodbc/buildlink3.mk
+++ b/databases/iodbc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IODBC_BUILDLINK3_MK:=	${IODBC_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	iodbc
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Niodbc}
 BUILDLINK_PACKAGES+=	iodbc
+BUILDLINK_ORDER+=	iodbc
 
 .if !empty(IODBC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.iodbc+=	iodbc>=3.52.3
diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk
index 080a4e30965..22ab1823301 100644
--- a/databases/libgda/buildlink3.mk
+++ b/databases/libgda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGDA_BUILDLINK3_MK:=	${LIBGDA_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libgda
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgda}
 BUILDLINK_PACKAGES+=	libgda
+BUILDLINK_ORDER+=	libgda
 
 .if !empty(LIBGDA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgda+=	libgda>=1.9.100
diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk
index 861ead62e0f..100b429d62d 100644
--- a/databases/libgnomedb/buildlink3.mk
+++ b/databases/libgnomedb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/04/17 13:46:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEDB_BUILDLINK3_MK:=	${LIBGNOMEDB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libgnomedb
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomedb}
 BUILDLINK_PACKAGES+=	libgnomedb
+BUILDLINK_ORDER+=	libgnomedb
 
 .if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libgnomedb+=		libgnomedb>=1.9.100
diff --git a/databases/libpqxx/buildlink3.mk b/databases/libpqxx/buildlink3.mk
index 2fe492ea0a3..76ca495abdd 100644
--- a/databases/libpqxx/buildlink3.mk
+++ b/databases/libpqxx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBPQXX_BUILDLINK3_MK:=	${LIBPQXX_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libpqxx
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpqxx}
 BUILDLINK_PACKAGES+=	libpqxx
+BUILDLINK_ORDER+=	libpqxx
 
 .if !empty(LIBPQXX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libpqxx+=	libpqxx>=2.5.0
diff --git a/databases/metakit-lib/buildlink3.mk b/databases/metakit-lib/buildlink3.mk
index f53df1c3005..3f836939d42 100644
--- a/databases/metakit-lib/buildlink3.mk
+++ b/databases/metakit-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 METAKIT_LIB_BUILDLINK3_MK:=	${METAKIT_LIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	metakit-lib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmetakit-lib}
 BUILDLINK_PACKAGES+=	metakit-lib
+BUILDLINK_ORDER+=	metakit-lib
 
 .if !empty(METAKIT_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.metakit-lib+=	metakit-lib>=2.4.8
diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk
index 9e36e4baf41..693743b0fe7 100644
--- a/databases/mysql4-client/buildlink3.mk
+++ b/databases/mysql4-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 22:39:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	mysql-client
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
 BUILDLINK_PACKAGES+=	mysql-client
+BUILDLINK_ORDER+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=4.1.7
diff --git a/databases/mysql5-client/buildlink3.mk b/databases/mysql5-client/buildlink3.mk
index c3cc29aaaaf..61c171d4d23 100644
--- a/databases/mysql5-client/buildlink3.mk
+++ b/databases/mysql5-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	mysql-client
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
 BUILDLINK_PACKAGES+=	mysql-client
+BUILDLINK_ORDER+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=5.0.15
diff --git a/databases/openldap-client/buildlink3.mk b/databases/openldap-client/buildlink3.mk
index 13d6627ab5e..89b4ff6aae0 100644
--- a/databases/openldap-client/buildlink3.mk
+++ b/databases/openldap-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/05/31 18:18:34 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=		${OPENLDAP_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=			openldap-client
 
 BUILDLINK_PACKAGES:=			${BUILDLINK_PACKAGES:Nopenldap-client}
 BUILDLINK_PACKAGES+=			openldap-client
+BUILDLINK_ORDER+=			openldap-client
 
 .if !empty(OPENLDAP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openldap-client+=	openldap-client>=2.3.11nb2
diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk
index 03f09b2c525..134912c6073 100644
--- a/databases/p5-DBI/buildlink3.mk
+++ b/databases/p5-DBI/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:41 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 P5_DBI_BUILDLINK3_MK:=	${P5_DBI_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	p5-DBI
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-DBI}
 BUILDLINK_PACKAGES+=	p5-DBI
+BUILDLINK_ORDER+=	p5-DBI
 
 .if !empty(P5_DBI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.48nb1
diff --git a/databases/php-pdo/buildlink3.mk b/databases/php-pdo/buildlink3.mk
index 83beba72752..5fa639ebfc9 100644
--- a/databases/php-pdo/buildlink3.mk
+++ b/databases/php-pdo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PHP_PDO_BUILDLINK3_MK:=		${PHP_PDO_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=		php-pdo
 
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nphp-pdo}
 BUILDLINK_PACKAGES+=		php-pdo
+BUILDLINK_ORDER+=		php-pdo
 
 .if !empty(PHP_PDO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.php-pdo+=	${PHP_PKG_PREFIX}-pdo-5.*
diff --git a/databases/postgresql74-lib/buildlink3.mk b/databases/postgresql74-lib/buildlink3.mk
index 2a73fa24ea9..e00d81f9dc9 100644
--- a/databases/postgresql74-lib/buildlink3.mk
+++ b/databases/postgresql74-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 POSTGRESQL74_LIB_BUILDLINK3_MK:=	${POSTGRESQL74_LIB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	postgresql74-lib
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql74-lib}
 BUILDLINK_PACKAGES+=	postgresql74-lib
+BUILDLINK_ORDER+=	postgresql74-lib
 
 .if !empty(POSTGRESQL74_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.postgresql74-lib+=		postgresql{74,}-lib>=7.4.0
diff --git a/databases/postgresql80-client/buildlink3.mk b/databases/postgresql80-client/buildlink3.mk
index 302372a8eca..19fd8299ce6 100644
--- a/databases/postgresql80-client/buildlink3.mk
+++ b/databases/postgresql80-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 POSTGRESQL80_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL80_CLIENT_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	postgresql80-client
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql80-client}
 BUILDLINK_PACKAGES+=	postgresql80-client
+BUILDLINK_ORDER+=	postgresql80-client
 
 .if !empty(POSTGRESQL80_CLIENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.postgresql80-client+=		postgresql80-client>=8.0.2
diff --git a/databases/postgresql81-client/buildlink3.mk b/databases/postgresql81-client/buildlink3.mk
index 3f3718e90db..69e2906ce69 100644
--- a/databases/postgresql81-client/buildlink3.mk
+++ b/databases/postgresql81-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 POSTGRESQL81_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL81_CLIENT_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	postgresql81-client
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql81-client}
 BUILDLINK_PACKAGES+=	postgresql81-client
+BUILDLINK_ORDER+=	postgresql81-client
 
 .if !empty(POSTGRESQL81_CLIENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.postgresql81-client+=		postgresql81-client>=8.1.0
diff --git a/databases/py-ZODB/buildlink3.mk b/databases/py-ZODB/buildlink3.mk
index 54c37686f81..d1b42f0eb34 100644
--- a/databases/py-ZODB/buildlink3.mk
+++ b/databases/py-ZODB/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/06/16 10:58:23 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_ZODB_BUILDLINK3_MK:=	${PY_ZODB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pyZODB
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NpyZODB}
 BUILDLINK_PACKAGES+=	pyZODB
+BUILDLINK_ORDER+=	pyZODB
 
 .if !empty(PY_ZODB_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
diff --git a/databases/py-bsddb3/buildlink3.mk b/databases/py-bsddb3/buildlink3.mk
index 9564ae597c8..8019fb3c215 100644
--- a/databases/py-bsddb3/buildlink3.mk
+++ b/databases/py-bsddb3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/06/16 10:58:23 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_BSDDB3_BUILDLINK3_MK:=	${PY_BSDDB3_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	py-bsddb3
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-bsddb3}
 BUILDLINK_PACKAGES+=	py-bsddb3
+BUILDLINK_ORDER+=	py-bsddb3
 
 .if !empty(PY_BSDDB3_BUILDLINK3_MK:M+)
 .  include "../../mk/pthread.buildlink3.mk"
diff --git a/databases/py-ldap/buildlink3.mk b/databases/py-ldap/buildlink3.mk
index ccba42ada61..11c67856c76 100644
--- a/databases/py-ldap/buildlink3.mk
+++ b/databases/py-ldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/06/16 10:58:23 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_LDAP_BUILDLINK3_MK:=	${PY_LDAP_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pyldap
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyldap}
 BUILDLINK_PACKAGES+=	pyldap
+BUILDLINK_ORDER+=	pyldap
 
 .if !empty(PY_LDAP_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
diff --git a/databases/py-metakit/buildlink3.mk b/databases/py-metakit/buildlink3.mk
index 96f892a5d73..e8395d5a90f 100644
--- a/databases/py-metakit/buildlink3.mk
+++ b/databases/py-metakit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/06/16 10:58:23 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_METAKIT_BUILDLINK3_MK:=	${PY_METAKIT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pymetakit
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npymetakit}
 BUILDLINK_PACKAGES+=	pymetakit
+BUILDLINK_ORDER+=	pymetakit
 
 .if !empty(PY_METAKIT_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
diff --git a/databases/py-psycopg/buildlink3.mk b/databases/py-psycopg/buildlink3.mk
index a2b4404f0d3..f6c5ad78ba6 100644
--- a/databases/py-psycopg/buildlink3.mk
+++ b/databases/py-psycopg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/06/16 10:58:23 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_PSYCOPG_BUILDLINK3_MK:=	${PY_PSYCOPG_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	psycopg
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npsycopg}
 BUILDLINK_PACKAGES+=	psycopg
+BUILDLINK_ORDER+=	psycopg
 
 .if !empty(PY_PSYCOPG_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
diff --git a/databases/qdbm/buildlink3.mk b/databases/qdbm/buildlink3.mk
index 198a57ecb5e..b1476e27418 100644
--- a/databases/qdbm/buildlink3.mk
+++ b/databases/qdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/05/07 10:38:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 QDBM_BUILDLINK3_MK:=	${QDBM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	qdbm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqdbm}
 BUILDLINK_PACKAGES+=	qdbm
+BUILDLINK_ORDER+=	qdbm
 
 .if !empty(QDBM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qdbm+=	qdbm>=1.8.40
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index cbd2c77add7..3e5103c8508 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/05/02 09:08:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	rrdtool
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrrdtool}
 BUILDLINK_PACKAGES+=	rrdtool
+BUILDLINK_ORDER+=	rrdtool
 
 .if !empty(RRDTOOL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.rrdtool+=	rrdtool>=1.2.9
diff --git a/databases/sdbm/buildlink3.mk b/databases/sdbm/buildlink3.mk
index 5b800340e33..f9cb7dc7ae1 100644
--- a/databases/sdbm/buildlink3.mk
+++ b/databases/sdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDBM_BUILDLINK3_MK:=	${SDBM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	sdbm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsdbm}
 BUILDLINK_PACKAGES+=	sdbm
+BUILDLINK_ORDER+=	sdbm
 
 .if !empty(SDBM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sdbm+=	sdbm>=90.12.1
diff --git a/databases/shared-mime-info/buildlink3.mk b/databases/shared-mime-info/buildlink3.mk
index 540ba9c7dff..e43dd56b58e 100644
--- a/databases/shared-mime-info/buildlink3.mk
+++ b/databases/shared-mime-info/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/05/21 16:13:34 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 SHARED_MIME_INFO_BUILDLINK3_MK:=	${SHARED_MIME_INFO_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	shared-mime-info
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nshared-mime-info}
 BUILDLINK_PACKAGES+=	shared-mime-info
+BUILDLINK_ORDER+=	shared-mime-info
 
 .if !empty(SHARED_MIME_INFO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.shared-mime-info+=	shared-mime-info>=0.15
diff --git a/databases/sqlite/buildlink3.mk b/databases/sqlite/buildlink3.mk
index 637cba8de79..ec5bbaa3aed 100644
--- a/databases/sqlite/buildlink3.mk
+++ b/databases/sqlite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SQLITE_BUILDLINK3_MK:=	${SQLITE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	sqlite
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsqlite}
 BUILDLINK_PACKAGES+=	sqlite
+BUILDLINK_ORDER+=	sqlite
 
 .if !empty(SQLITE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sqlite+=	sqlite>=2.8.0
diff --git a/databases/sqlite3/buildlink3.mk b/databases/sqlite3/buildlink3.mk
index 76b22a6c4f5..16b91aa9e45 100644
--- a/databases/sqlite3/buildlink3.mk
+++ b/databases/sqlite3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SQLITE3_BUILDLINK3_MK:=	${SQLITE3_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	sqlite3
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsqlite3}
 BUILDLINK_PACKAGES+=	sqlite3
+BUILDLINK_ORDER+=	sqlite3
 
 .if !empty(SQLITE3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.0.8
diff --git a/databases/tcl-postgresql74/buildlink3.mk b/databases/tcl-postgresql74/buildlink3.mk
index 834867d6a71..d80e27f9ed3 100644
--- a/databases/tcl-postgresql74/buildlink3.mk
+++ b/databases/tcl-postgresql74/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/06/16 09:12:35 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:05 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 TCL_POSTGRESQL74_BUILDLINK3_MK:=	${TCL_POSTGRESQL74_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	tcl-postgresql74
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-postgresql74}
 BUILDLINK_PACKAGES+=	tcl-postgresql74
+BUILDLINK_ORDER+=	tcl-postgresql74
 
 .if !empty(TCL_POSTGRESQL74_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tcl-postgresql74+=	tcl-postgresql74>=7.3.6
diff --git a/databases/tdb/buildlink3.mk b/databases/tdb/buildlink3.mk
index e5f11f70bc3..d5cdc188b76 100644
--- a/databases/tdb/buildlink3.mk
+++ b/databases/tdb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TDB_BUILDLINK3_MK:=	${TDB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	tdb
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntdb}
 BUILDLINK_PACKAGES+=	tdb
+BUILDLINK_ORDER+=	tdb
 
 .if !empty(TDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tdb+=		tdb>=1.0.6
diff --git a/databases/tinycdb/buildlink3.mk b/databases/tinycdb/buildlink3.mk
index e2281ee1782..63f2d7667dd 100644
--- a/databases/tinycdb/buildlink3.mk
+++ b/databases/tinycdb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TINYCDB_BUILDLINK3_MK:=	${TINYCDB_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	tinycdb
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntinycdb}
 BUILDLINK_PACKAGES+=	tinycdb
+BUILDLINK_ORDER+=	tinycdb
 
 .if !empty(TINYCDB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tinycdb+=	tinycdb>=0.75
diff --git a/databases/unixodbc/buildlink3.mk b/databases/unixodbc/buildlink3.mk
index a346061bcdf..8b74374804f 100644
--- a/databases/unixodbc/buildlink3.mk
+++ b/databases/unixodbc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:06 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 UNIXODBC_BUILDLINK3_MK:=	${UNIXODBC_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	unixodbc
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nunixodbc}
 BUILDLINK_PACKAGES+=	unixodbc
+BUILDLINK_ORDER+=	unixodbc
 
 .if !empty(UNIXODBC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.unixodbc+=	unixodbc>=2.0.11nb1