Over 1200 files touched but no revisions bumped :)

RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).

52 files changed, 137 insertions, 137 deletions

diff --git a/databases/bdb-xml/buildlink3.mk b/databases/bdb-xml/buildlink3.mk
index 438b8c3b539..36a67e72b22 100644
--- a/databases/bdb-xml/buildlink3.mk
+++ b/databases/bdb-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BDB_XML_BUILDLINK3_MK:=	${BDB_XML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbdb-xml}
 BUILDLINK_PACKAGES+=	bdb-xml
 
 .if !empty(BDB_XML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bdb-xml+=	bdb-xml>=1.2.1nb3
-BUILDLINK_RECOMMENDED.bdb-xml?=	bdb-xml>=1.2.1nb4
+BUILDLINK_API_DEPENDS.bdb-xml+=	bdb-xml>=1.2.1nb3
+BUILDLINK_ABI_DEPENDS.bdb-xml?=	bdb-xml>=1.2.1nb4
 BUILDLINK_PKGSRCDIR.bdb-xml?=	../../databases/bdb-xml
 .endif	# BDB_XML_BUILDLINK3_MK
 
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index 49d0fc9b8dc..0582af9ced8 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2004/11/15 17:54:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB_BUILDLINK3_MK:=	${DB_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb2}
 BUILDLINK_PACKAGES+=	db2
 
 .if !empty(DB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.db2+=		db>=2.7.3
-BUILDLINK_RECOMMENDED.db2+=	db>=2.7.7nb2
+BUILDLINK_API_DEPENDS.db2+=		db>=2.7.3
+BUILDLINK_ABI_DEPENDS.db2+=	db>=2.7.7nb2
 BUILDLINK_PKGSRCDIR.db2?=	../../databases/db
 BUILDLINK_INCDIRS.db2?=		include/db2
 BUILDLINK_LDADD.db2=		-ldb2
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index c0b26fd7bdd..db91a2dbe1b 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/11/15 17:54:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB3_BUILDLINK3_MK:=	${DB3_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb3}
 BUILDLINK_PACKAGES+=	db3
 
 .if !empty(DB3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.db3+=		db3>=2.9.2
-BUILDLINK_RECOMMENDED.db3+=	db3>=3.11.2nb3
+BUILDLINK_API_DEPENDS.db3+=		db3>=2.9.2
+BUILDLINK_ABI_DEPENDS.db3+=	db3>=3.11.2nb3
 BUILDLINK_PKGSRCDIR.db3?=	../../databases/db3
 BUILDLINK_INCDIRS.db3?=		include/db3
 BUILDLINK_LDADD.db3=		-ldb3
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index 43545e75f91..326a640d089 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2006/01/06 15:08:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB4_BUILDLINK3_MK:=	${DB4_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb4}
 BUILDLINK_PACKAGES+=	db4
 
 .if !empty(DB4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.db4+=		db4>=4.4.16
+BUILDLINK_API_DEPENDS.db4+=		db4>=4.4.16
 BUILDLINK_PKGSRCDIR.db4?=	../../databases/db4
 BUILDLINK_INCDIRS.db4?=		include/db4
 BUILDLINK_LDADD.db4=		-ldb4
@@ -23,7 +23,7 @@ BUILDLINK_TRANSFORM+=		l:db-4:db4
 #
 # Older db4 packages didn't enable the db-1.85 compatibility API.
 #
-BUILDLINK_DEPENDS.db4+=		db4>=4.2.52nb1
+BUILDLINK_API_DEPENDS.db4+=		db4>=4.2.52nb1
 BUILDLINK_LIBS.db4=		${BUILDLINK_LDADD.db4}
 BUILDLINK_TRANSFORM+=		l:db:db4
 .  endif
diff --git a/databases/dbh/buildlink3.mk b/databases/dbh/buildlink3.mk
index d8266d11080..d03ff74bd2e 100644
--- a/databases/dbh/buildlink3.mk
+++ b/databases/dbh/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/03/16 13:29:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DBH_BUILDLINK3_MK:=	${DBH_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbh}
 BUILDLINK_PACKAGES+=	dbh
 
 .if !empty(DBH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbh+=		dbh>=1.0.22
+BUILDLINK_API_DEPENDS.dbh+=		dbh>=1.0.22
 BUILDLINK_PKGSRCDIR.dbh?=	../../databases/dbh
 .endif	# DBH_BUILDLINK3_MK
 
diff --git a/databases/edb/buildlink3.mk b/databases/edb/buildlink3.mk
index 7ee06ce8ead..7e77ae83489 100644
--- a/databases/edb/buildlink3.mk
+++ b/databases/edb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EDB_BUILDLINK3_MK:=	${EDB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nedb}
 BUILDLINK_PACKAGES+=	edb
 
 .if !empty(EDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.edb+=	edb>=1.0.3nb3
-BUILDLINK_RECOMMENDED.edb+=	edb>=1.0.3nb5
+BUILDLINK_API_DEPENDS.edb+=	edb>=1.0.3nb3
+BUILDLINK_ABI_DEPENDS.edb+=	edb>=1.0.3nb5
 BUILDLINK_PKGSRCDIR.edb?=	../../databases/edb
 .endif	# EDB_BUILDLINK3_MK
 
diff --git a/databases/freetds/buildlink3.mk b/databases/freetds/buildlink3.mk
index 1b7fdbda0cb..079518c52f8 100644
--- a/databases/freetds/buildlink3.mk
+++ b/databases/freetds/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FREETDS_BUILDLINK3_MK:=	${FREETDS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreetds}
 BUILDLINK_PACKAGES+=	freetds
 
 .if !empty(FREETDS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freetds+=	freetds>=0.63nb2
-BUILDLINK_RECOMMENDED.freetds?=	freetds>=0.63nb4
+BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.63nb2
+BUILDLINK_ABI_DEPENDS.freetds?=	freetds>=0.63nb4
 BUILDLINK_PKGSRCDIR.freetds?=	../../databases/freetds
 .endif	# FREETDS_BUILDLINK3_MK
 
diff --git a/databases/gdbm/buildlink3.mk b/databases/gdbm/buildlink3.mk
index 67f5950197a..2d0b584c3f0 100644
--- a/databases/gdbm/buildlink3.mk
+++ b/databases/gdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:18 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GDBM_BUILDLINK3_MK:=	${GDBM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdbm}
 BUILDLINK_PACKAGES+=	gdbm
 
 .if !empty(GDBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdbm+=	gdbm>=1.8.3
-BUILDLINK_RECOMMENDED.gdbm+=	gdbm>=1.8.3nb1
+BUILDLINK_API_DEPENDS.gdbm+=	gdbm>=1.8.3
+BUILDLINK_ABI_DEPENDS.gdbm+=	gdbm>=1.8.3nb1
 BUILDLINK_PKGSRCDIR.gdbm?=	../../databases/gdbm
 .endif	# GDBM_BUILDLINK3_MK
 
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index 82f7129cfe7..0a5ec89e770 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/09 10:35:49 tonio Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/06 06:21:41 reed Exp $
 #
 
 DISTNAME=	geneweb-4.10
@@ -23,7 +23,7 @@ BUILD_TARGET=	out
 
 # needed for patch-ab to work:
 # since 3.09.0, camlp4 uses _loc instead of loc
-BUILDLINK_DEPENDS.ocaml+=       ocaml>=3.09.0
+BUILDLINK_API_DEPENDS.ocaml+=       ocaml>=3.09.0
 
 # sysutils/coreutils a 'gwc' program, so conflict with it if
 # ${GNU_PROGRAM_PREFIX} == "g"
diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk
index df4edcfe365..5f0294667d9 100644
--- a/databases/gnome-mime-data/buildlink3.mk
+++ b/databases/gnome-mime-data/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MIME_DATA_BUILDLINK3_MK:=	${GNOME_MIME_DATA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-mime-data}
 BUILDLINK_PACKAGES+=	gnome-mime-data
 
 .if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.4.0
-BUILDLINK_RECOMMENDED.gnome-mime-data?=	gnome-mime-data>=2.4.2nb2
+BUILDLINK_API_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.4.0
+BUILDLINK_ABI_DEPENDS.gnome-mime-data?=	gnome-mime-data>=2.4.2nb2
 BUILDLINK_PKGSRCDIR.gnome-mime-data?=	../../databases/gnome-mime-data
 
 # intltool-{extract,merge,update} are Perl scripts included in the sources
diff --git a/databases/iodbc/buildlink3.mk b/databases/iodbc/buildlink3.mk
index 29f19f77272..bf36c4009b6 100644
--- a/databases/iodbc/buildlink3.mk
+++ b/databases/iodbc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/12/30 21:03:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IODBC_BUILDLINK3_MK:=	${IODBC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Niodbc}
 BUILDLINK_PACKAGES+=	iodbc
 
 .if !empty(IODBC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.iodbc+=	iodbc>=3.52.3
+BUILDLINK_API_DEPENDS.iodbc+=	iodbc>=3.52.3
 BUILDLINK_PKGSRCDIR.iodbc?=	../../databases/iodbc
 .endif	# IODBC_BUILDLINK3_MK
 
diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk
index be06aa7c07e..1fbaafd77b9 100644
--- a/databases/libgda/buildlink3.mk
+++ b/databases/libgda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGDA_BUILDLINK3_MK:=	${LIBGDA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgda}
 BUILDLINK_PACKAGES+=	libgda
 
 .if !empty(LIBGDA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgda+=	libgda>=1.9.100
-BUILDLINK_RECOMMENDED.libgda?=	libgda>=1.9.100nb1
+BUILDLINK_API_DEPENDS.libgda+=	libgda>=1.9.100
+BUILDLINK_ABI_DEPENDS.libgda?=	libgda>=1.9.100nb1
 BUILDLINK_PKGSRCDIR.libgda?=	../../databases/libgda
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/libgda-1.9\/providers$$/ \
diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk
index 777763eb225..73d5ec4cf19 100644
--- a/databases/libgnomedb/buildlink3.mk
+++ b/databases/libgnomedb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEDB_BUILDLINK3_MK:=	${LIBGNOMEDB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomedb}
 BUILDLINK_PACKAGES+=	libgnomedb
 
 .if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomedb+=		libgnomedb>=1.9.100
-BUILDLINK_RECOMMENDED.libgnomedb?=	libgnomedb>=1.9.100nb1
+BUILDLINK_API_DEPENDS.libgnomedb+=		libgnomedb>=1.9.100
+BUILDLINK_ABI_DEPENDS.libgnomedb?=	libgnomedb>=1.9.100nb1
 BUILDLINK_PKGSRCDIR.libgnomedb?=	../../databases/libgnomedb
 .endif	# LIBGNOMEDB_BUILDLINK3_MK
 
diff --git a/databases/libpqxx/buildlink3.mk b/databases/libpqxx/buildlink3.mk
index 2074e32bcac..7e758e932cb 100644
--- a/databases/libpqxx/buildlink3.mk
+++ b/databases/libpqxx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBPQXX_BUILDLINK3_MK:=	${LIBPQXX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpqxx}
 BUILDLINK_PACKAGES+=	libpqxx
 
 .if !empty(LIBPQXX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpqxx+=	libpqxx>=2.5.0
-BUILDLINK_RECOMMENDED.libpqxx?=	libpqxx>=2.5.4nb1
+BUILDLINK_API_DEPENDS.libpqxx+=	libpqxx>=2.5.0
+BUILDLINK_ABI_DEPENDS.libpqxx?=	libpqxx>=2.5.4nb1
 BUILDLINK_PKGSRCDIR.libpqxx?=	../../databases/libpqxx
 .endif	# LIBPQXX_BUILDLINK3_MK
 
diff --git a/databases/metakit-lib/buildlink3.mk b/databases/metakit-lib/buildlink3.mk
index 590d0e23ace..c65f8a90c9e 100644
--- a/databases/metakit-lib/buildlink3.mk
+++ b/databases/metakit-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:21 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 METAKIT_LIB_BUILDLINK3_MK:=	${METAKIT_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmetakit-lib}
 BUILDLINK_PACKAGES+=	metakit-lib
 
 .if !empty(METAKIT_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.metakit-lib+=	metakit-lib>=2.4.8
-BUILDLINK_RECOMMENDED.metakit-lib+=	metakit-lib>=2.4.9.3nb1
+BUILDLINK_API_DEPENDS.metakit-lib+=	metakit-lib>=2.4.8
+BUILDLINK_ABI_DEPENDS.metakit-lib+=	metakit-lib>=2.4.9.3nb1
 BUILDLINK_PKGSRCDIR.metakit-lib?=	../../databases/metakit-lib
 .endif	# METAKIT_LIB_BUILDLINK3_MK
 
diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk
index 864b939f727..e3cc260b4a7 100644
--- a/databases/mysql4-client/buildlink3.mk
+++ b/databases/mysql4-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
 BUILDLINK_PACKAGES+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=4.1.7
-BUILDLINK_RECOMMENDED.mysql-client+=	mysql-client>=4.1.15nb1
+BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=4.1.7
+BUILDLINK_ABI_DEPENDS.mysql-client+=	mysql-client>=4.1.15nb1
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql4-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=	include/mysql
diff --git a/databases/mysql5-client/buildlink3.mk b/databases/mysql5-client/buildlink3.mk
index 75ceffad5ea..99920948420 100644
--- a/databases/mysql5-client/buildlink3.mk
+++ b/databases/mysql5-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
 BUILDLINK_PACKAGES+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=5.0.15
-BUILDLINK_RECOMMENDED.mysql-client?=	mysql-client>=5.0.18nb1
+BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=5.0.15
+BUILDLINK_ABI_DEPENDS.mysql-client?=	mysql-client>=5.0.18nb1
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql5-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=	include/mysql
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index b918f81acf4..b3c678d27b3 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/01/06 15:10:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenldap}
 BUILDLINK_PACKAGES+=	openldap
 
 .if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openldap+=		openldap>=2.3.11nb2
+BUILDLINK_API_DEPENDS.openldap+=		openldap>=2.3.11nb2
 BUILDLINK_PKGSRCDIR.openldap?=		../../databases/openldap
 
 # Export the deprecated API from the openldap-2.2.x releases.
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk
index 708bb709c27..a688793fcf9 100644
--- a/databases/openldap/options.mk
+++ b/databases/openldap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2005/12/29 20:10:23 ghen Exp $
+# $NetBSD: options.mk,v 1.16 2006/04/06 06:21:41 reed Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap
 PKG_SUPPORTED_OPTIONS=	bdb kerberos sasl slp
@@ -61,7 +61,7 @@ PKG_OPTIONS+=		sasl
 ###
 .if !empty(PKG_OPTIONS:Msasl)
 CONFIGURE_ARGS+=		--with-cyrus-sasl
-BUILDLINK_DEPENDS.cyrus-sasl+=  cyrus-sasl>=2.1.15
+BUILDLINK_API_DEPENDS.cyrus-sasl+=  cyrus-sasl>=2.1.15
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=		--without-cyrus-sasl
diff --git a/databases/p5-DBD-Google/Makefile b/databases/p5-DBD-Google/Makefile
index 8568c9bce68..dfd8a1c9cf2 100644
--- a/databases/p5-DBD-Google/Makefile
+++ b/databases/p5-DBD-Google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:29:09 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:21:41 reed Exp $
 #
 
 DISTNAME=		DBD-Google-0.11
@@ -14,7 +14,7 @@ DEPENDS+=		p5-Net-Google>=0.61:../../net/p5-Net-Google
 
 PERL5_PACKLIST=		auto/DBD/Google/.packlist
 
-BUILDLINK_DEPENDS.p5-DBI?=	p5-DBI>=1.39
+BUILDLINK_API_DEPENDS.p5-DBI?=	p5-DBI>=1.39
 
 .include "../../databases/p5-DBI/buildlink3.mk"
 
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 119617121a9..b342be564ee 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/06 06:21:41 reed Exp $
 #
 
 DISTNAME=		DBD-mysql-3.0002
@@ -14,7 +14,7 @@ COMMENT=		Perl DBI/DBD driver for MySQL databases
 
 DEPENDS+=		p5-Data-ShowTable>=3.3:../../devel/p5-Data-ShowTable
 
-BUILDLINK_DEPENDS.mysql-client?=	mysql-client>=3.23.49nb1
+BUILDLINK_API_DEPENDS.mysql-client?=	mysql-client>=3.23.49nb1
 
 PERL5_PACKLIST=		auto/DBD/mysql/.packlist
 
diff --git a/databases/p5-DBI-Shell/Makefile b/databases/p5-DBI-Shell/Makefile
index 0879b4c14c1..35787d91c53 100644
--- a/databases/p5-DBI-Shell/Makefile
+++ b/databases/p5-DBI-Shell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/06 06:19:06 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/06 06:21:41 reed Exp $
 #
 
 DISTNAME=	DBI-Shell-11.93
@@ -19,7 +19,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PERL5_PACKLIST=		auto/DBI/Shell/.packlist
 
-BUILDLINK_DEPENDS.p5-DBI+=	p5-DBI>=1.37
+BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.37
 
 .include "../../databases/p5-DBI/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk
index 55b2950e722..03f09b2c525 100644
--- a/databases/p5-DBI/buildlink3.mk
+++ b/databases/p5-DBI/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/08/06 06:19:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:41 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 P5_DBI_BUILDLINK3_MK:=	${P5_DBI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-DBI}
 BUILDLINK_PACKAGES+=	p5-DBI
 
 .if !empty(P5_DBI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.p5-DBI+=	p5-DBI>=1.48nb1
+BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.48nb1
 BUILDLINK_PKGSRCDIR.p5-DBI?=	../../databases/p5-DBI
 BUILDLINK_INCDIRS.p5-DBI?=	${PERL5_SUB_INSTALLVENDORARCH}/auto/DBI
 
diff --git a/databases/p5-DBIWrapper/Makefile b/databases/p5-DBIWrapper/Makefile
index 77b737cdaff..db14ea53129 100644
--- a/databases/p5-DBIWrapper/Makefile
+++ b/databases/p5-DBIWrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:33 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:21:42 reed Exp $
 #
 
 DISTNAME=	libdbiwrapper-perl-${VERSION}
@@ -20,7 +20,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PERL5_PACKLIST=		auto/DBIWrapper/.packlist
 
-BUILDLINK_DEPENDS.p5-DBI+=	p5-DBI>=1.37
+BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.37
 
 .include "../../databases/p5-DBI/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/databases/php-pdo/buildlink3.mk b/databases/php-pdo/buildlink3.mk
index 2bb6b7799fb..1f7ecb5f931 100644
--- a/databases/php-pdo/buildlink3.mk
+++ b/databases/php-pdo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:42 reed Exp $
 
 BUILDLINK_DEPTH:=               ${BUILDLINK_DEPTH}+
 PHP_PDO_BUILDLINK3_MK:=    ${PHP_PDO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:Nphp-pdo}
 BUILDLINK_PACKAGES+=    php-pdo
 
 .if !empty(PHP_PDO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.php-pdo+=        php-pdo-5.*
-BUILDLINK_RECOMMENDED.php-pdo?=      php-pdo>=5.1.1.1.0.2nb1
+BUILDLINK_API_DEPENDS.php-pdo+=        php-pdo-5.*
+BUILDLINK_ABI_DEPENDS.php-pdo?=      php-pdo>=5.1.1.1.0.2nb1
 BUILDLINK_PKGSRCDIR.php-pdo?=      ../../databases/php-pdo
 BUILDLINK_INCDIRS.php-pdo?=        include/php/ext/pdo
 .endif  # PHP_PDO_BUILDLINK3_MK
diff --git a/databases/php-pdo_dblib/Makefile b/databases/php-pdo_dblib/Makefile
index c148225c071..6f6e6004c54 100644
--- a/databases/php-pdo_dblib/Makefile
+++ b/databases/php-pdo_dblib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:33 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:21:42 reed Exp $
 
 PDO_DRIVER=		dblib
 PDO_COMMENT=		FreeTDS/Sybase/MS SQL
@@ -10,7 +10,7 @@ PKGREVISION=		2
 CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${BUILDLINK_DIR}
 
 # requires 0.63 version to compile, doesn't compile with 0.61
-BUILDLINK_DEPENDS.freetds+=	freetds>=0.63
+BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.63
 
 .include "../../databases/freetds/buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
diff --git a/databases/postgresql73-lib/buildlink3.mk b/databases/postgresql73-lib/buildlink3.mk
index 8328331cda2..3a6902daaf5 100644
--- a/databases/postgresql73-lib/buildlink3.mk
+++ b/databases/postgresql73-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 POSTGRESQL73_LIB_BUILDLINK3_MK:=	${POSTGRESQL73_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql73-lib}
 BUILDLINK_PACKAGES+=	postgresql73-lib
 
 .if !empty(POSTGRESQL73_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql73-lib+=	postgresql73-lib>=7.3.10
-BUILDLINK_RECOMMENDED.postgresql73-lib?=	postgresql73-lib>=7.3.10nb2
+BUILDLINK_API_DEPENDS.postgresql73-lib+=	postgresql73-lib>=7.3.10
+BUILDLINK_ABI_DEPENDS.postgresql73-lib?=	postgresql73-lib>=7.3.10nb2
 BUILDLINK_PKGSRCDIR.postgresql73-lib?=	../../databases/postgresql73-lib
 BUILDLINK_INCDIRS.postgresql73-lib?=	include/postgresql
 BUILDLINK_FILES.postgresql73-lib+=	include/pgsql/*
diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common
index db8405a4b87..09b1ec54123 100644
--- a/databases/postgresql73/Makefile.common
+++ b/databases/postgresql73/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2006/03/04 21:29:10 jlam Exp $
+# $NetBSD: Makefile.common,v 1.17 2006/04/06 06:21:42 reed Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -36,8 +36,8 @@ PATCHDIR?=		${.CURDIR}/../postgresql73/patches
 DIST_VERS?=		7.3.14
 BASE_VERS?=		${DIST_VERS}
 
-BUILDLINK_DEPENDS.postgresql73-lib?=	postgresql73-lib>=${BASE_VERS}
-BUILDLINK_DEPENDS.tcl-postgresql73?=	tcl-postgresql73>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql73-lib?=	postgresql73-lib>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.tcl-postgresql73?=	tcl-postgresql73>=${BASE_VERS}
 
 USE_TOOLS+=		autoconf gmake
 GNU_CONFIGURE=		YES
diff --git a/databases/postgresql74-lib/buildlink3.mk b/databases/postgresql74-lib/buildlink3.mk
index 53ddbf94655..062a638ef18 100644
--- a/databases/postgresql74-lib/buildlink3.mk
+++ b/databases/postgresql74-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 POSTGRESQL74_LIB_BUILDLINK3_MK:=	${POSTGRESQL74_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql74-lib}
 BUILDLINK_PACKAGES+=	postgresql74-lib
 
 .if !empty(POSTGRESQL74_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql74-lib+=		postgresql{74,}-lib>=7.4.0
-BUILDLINK_RECOMMENDED.postgresql74-lib+=	postgresql74-lib>=7.4.8nb3
+BUILDLINK_API_DEPENDS.postgresql74-lib+=		postgresql{74,}-lib>=7.4.0
+BUILDLINK_ABI_DEPENDS.postgresql74-lib+=	postgresql74-lib>=7.4.8nb3
 BUILDLINK_PKGSRCDIR.postgresql74-lib?=	../../databases/postgresql74-lib
 BUILDLINK_INCDIRS.postgresql74-lib?=	include/postgresql
 
diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common
index e47cb2cf2b4..3cc55b334f0 100644
--- a/databases/postgresql74/Makefile.common
+++ b/databases/postgresql74/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2006/03/08 02:29:06 grant Exp $
+# $NetBSD: Makefile.common,v 1.33 2006/04/06 06:21:42 reed Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -38,8 +38,8 @@ PATCHDIR?=		${.CURDIR}/../postgresql74/patches
 DIST_VERS?=		7.4.12
 BASE_VERS?=		${DIST_VERS}
 
-BUILDLINK_DEPENDS.postgresql74-lib?=	postgresql74-lib>=${BASE_VERS}
-#BUILDLINK_DEPENDS.tcl-postgresql74?=	tcl-postgresq74l>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql74-lib?=	postgresql74-lib>=${BASE_VERS}
+#BUILDLINK_API_DEPENDS.tcl-postgresql74?=	tcl-postgresq74l>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
 BUILD_USES_MSGFMT=	yes
diff --git a/databases/postgresql80-client/buildlink3.mk b/databases/postgresql80-client/buildlink3.mk
index 5cd1e78bfdc..b1bec7959df 100644
--- a/databases/postgresql80-client/buildlink3.mk
+++ b/databases/postgresql80-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:42 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 POSTGRESQL80_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL80_CLIENT_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql80-client}
 BUILDLINK_PACKAGES+=	postgresql80-client
 
 .if !empty(POSTGRESQL80_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql80-client+=		postgresql80-client>=8.0.2
-BUILDLINK_RECOMMENDED.postgresql80-client?=	postgresql80-client>=8.0.5nb1
+BUILDLINK_API_DEPENDS.postgresql80-client+=		postgresql80-client>=8.0.2
+BUILDLINK_ABI_DEPENDS.postgresql80-client?=	postgresql80-client>=8.0.5nb1
 BUILDLINK_PKGSRCDIR.postgresql80-client?=	../../databases/postgresql80-client
 
 .  if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX)
diff --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common
index 4d38794d05d..71535830652 100644
--- a/databases/postgresql80/Makefile.common
+++ b/databases/postgresql80/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2006/03/14 16:23:46 joerg Exp $
+# $NetBSD: Makefile.common,v 1.20 2006/04/06 06:21:42 reed Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -35,7 +35,7 @@ PATCHDIR?=		${.CURDIR}/../postgresql80/patches
 DIST_VERS?=		8.0.7
 BASE_VERS?=		${DIST_VERS}
 
-BUILDLINK_DEPENDS.postgresql80-client+=	postgresql80-client>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql80-client+=	postgresql80-client>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
 BUILD_USES_MSGFMT=	yes
diff --git a/databases/postgresql81-client/buildlink3.mk b/databases/postgresql81-client/buildlink3.mk
index dd710dfd693..390e5df56e9 100644
--- a/databases/postgresql81-client/buildlink3.mk
+++ b/databases/postgresql81-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/21 06:39:33 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:42 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 POSTGRESQL81_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL81_CLIENT_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql81-client}
 BUILDLINK_PACKAGES+=	postgresql81-client
 
 .if !empty(POSTGRESQL81_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql81-client+=		postgresql81-client>=8.1.0
+BUILDLINK_API_DEPENDS.postgresql81-client+=		postgresql81-client>=8.1.0
 BUILDLINK_PKGSRCDIR.postgresql81-client?=	../../databases/postgresql81-client
 
 .  if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX)
diff --git a/databases/postgresql81/Makefile.common b/databases/postgresql81/Makefile.common
index b2d017e3c8a..ec2df511544 100644
--- a/databases/postgresql81/Makefile.common
+++ b/databases/postgresql81/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2006/03/28 19:48:22 joerg Exp $
+# $NetBSD: Makefile.common,v 1.4 2006/04/06 06:21:42 reed Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -35,7 +35,7 @@ PATCHDIR?=		${.CURDIR}/../postgresql81/patches
 DIST_VERS?=		8.1.3
 BASE_VERS?=		${DIST_VERS}
 
-BUILDLINK_DEPENDS.postgresql81-client+=	postgresql81-client>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql81-client+=	postgresql81-client>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
 BUILD_USES_MSGFMT=	yes
diff --git a/databases/py-ZODB/buildlink3.mk b/databases/py-ZODB/buildlink3.mk
index 62d93577e5b..a975c1b8bb7 100644
--- a/databases/py-ZODB/buildlink3.mk
+++ b/databases/py-ZODB/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:42 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_ZODB_BUILDLINK3_MK:=	${PY_ZODB_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NpyZODB}
 BUILDLINK_PACKAGES+=	pyZODB
 
 .if !empty(PY_ZODB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyZODB+=	${PYPKGPREFIX}-ZODB>=3.2nb1
-BUILDLINK_RECOMMENDED.pyZODB?=	${PYPKGPREFIX}-ZODB>=3.2.1nb2
+BUILDLINK_API_DEPENDS.pyZODB+=	${PYPKGPREFIX}-ZODB>=3.2nb1
+BUILDLINK_ABI_DEPENDS.pyZODB?=	${PYPKGPREFIX}-ZODB>=3.2.1nb2
 BUILDLINK_PKGSRCDIR.pyZODB?=	../../databases/py-ZODB
 .endif	# PY_ZODB_BUILDLINK3_MK
 
diff --git a/databases/py-bsddb3/buildlink3.mk b/databases/py-bsddb3/buildlink3.mk
index 1af1027fa7a..0568ea16416 100644
--- a/databases/py-bsddb3/buildlink3.mk
+++ b/databases/py-bsddb3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_BSDDB3_BUILDLINK3_MK:=	${PY_BSDDB3_BUILDLINK3_MK}+
@@ -17,8 +17,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-bsddb3}
 BUILDLINK_PACKAGES+=	py-bsddb3
 
 .if !empty(PY_BSDDB3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-bsddb3+=	${PYPKGPREFIX}-bsddb3>=4.3.3nb1
-BUILDLINK_RECOMMENDED.py-bsddb3?=	${PYPKGPREFIX}-bsddb3>=4.3.3nb2
+BUILDLINK_API_DEPENDS.py-bsddb3+=	${PYPKGPREFIX}-bsddb3>=4.3.3nb1
+BUILDLINK_ABI_DEPENDS.py-bsddb3?=	${PYPKGPREFIX}-bsddb3>=4.3.3nb2
 BUILDLINK_PKGSRCDIR.py-bsddb3?=	../../databases/py-bsddb3
 .endif	# PY_BSDDB3_BUILDLINK3_MK
 
diff --git a/databases/py-ldap/buildlink3.mk b/databases/py-ldap/buildlink3.mk
index 7829c998db9..9054dc25935 100644
--- a/databases/py-ldap/buildlink3.mk
+++ b/databases/py-ldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_LDAP_BUILDLINK3_MK:=	${PY_LDAP_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyldap}
 BUILDLINK_PACKAGES+=	pyldap
 
 .if !empty(PY_LDAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyldap+=	${PYPKGPREFIX}-ldap>=2.0.10nb1
-BUILDLINK_RECOMMENDED.pyldap?=	${PYPKGPREFIX}-ldap>=2.0.10nb2
+BUILDLINK_API_DEPENDS.pyldap+=	${PYPKGPREFIX}-ldap>=2.0.10nb1
+BUILDLINK_ABI_DEPENDS.pyldap?=	${PYPKGPREFIX}-ldap>=2.0.10nb2
 BUILDLINK_PKGSRCDIR.pyldap?=	../../databases/py-ldap
 .endif	# PY_LDAP_BUILDLINK3_MK
 
diff --git a/databases/py-metakit/buildlink3.mk b/databases/py-metakit/buildlink3.mk
index 39f1ee34f98..bffa4ebae08 100644
--- a/databases/py-metakit/buildlink3.mk
+++ b/databases/py-metakit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_METAKIT_BUILDLINK3_MK:=	${PY_METAKIT_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npymetakit}
 BUILDLINK_PACKAGES+=	pymetakit
 
 .if !empty(PY_METAKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pymetakit+=	${PYPKGPREFIX}-metakit-*
-BUILDLINK_RECOMMENDED.pymetakit?=	${PYPKGPREFIX}-metakit>=2.4.9.3nb2
+BUILDLINK_API_DEPENDS.pymetakit+=	${PYPKGPREFIX}-metakit-*
+BUILDLINK_ABI_DEPENDS.pymetakit?=	${PYPKGPREFIX}-metakit>=2.4.9.3nb2
 BUILDLINK_PKGSRCDIR.pymetakit?=	../../databases/py-metakit
 .endif	# PY_METAKIT_BUILDLINK3_MK
 
diff --git a/databases/py-mssql/Makefile b/databases/py-mssql/Makefile
index dfd1beff4a6..e7569ee60f9 100644
--- a/databases/py-mssql/Makefile
+++ b/databases/py-mssql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/13 12:52:03 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/06 06:21:42 reed Exp $
 #
 
 DISTNAME=		pymssql-0.7.4
@@ -10,7 +10,7 @@ MAINTAINER=		bartosz@atom.eu.org
 HOMEPAGE=		http://pymssql.sourceforge.net/
 COMMENT=		Python interface to MS SQL
 
-BUILDLINK_DEPENDS.freetds+=	freetds>=0.63
+BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.63
 
 PYTHON_VERSION_REQD=	24
 PYBINMODULE=		yes
diff --git a/databases/py-psycopg/buildlink3.mk b/databases/py-psycopg/buildlink3.mk
index 7016a00bc31..af713de3768 100644
--- a/databases/py-psycopg/buildlink3.mk
+++ b/databases/py-psycopg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_PSYCOPG_BUILDLINK3_MK:=	${PY_PSYCOPG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npsycopg}
 BUILDLINK_PACKAGES+=	psycopg
 
 .if !empty(PY_PSYCOPG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.psycopg+=	${PYPKGPREFIX}-psycopg>=1.1.21
-BUILDLINK_RECOMMENDED.psycopg?=	${PYPKGPREFIX}-psycopg>=1.1.21nb1
+BUILDLINK_API_DEPENDS.psycopg+=	${PYPKGPREFIX}-psycopg>=1.1.21
+BUILDLINK_ABI_DEPENDS.psycopg?=	${PYPKGPREFIX}-psycopg>=1.1.21nb1
 BUILDLINK_PKGSRCDIR.psycopg?=	../../databases/py-psycopg
 .endif	# PY_PSYCOPG_BUILDLINK3_MK
 
diff --git a/databases/qdbm/buildlink3.mk b/databases/qdbm/buildlink3.mk
index 76ed5e3fac6..0bda52ac75d 100644
--- a/databases/qdbm/buildlink3.mk
+++ b/databases/qdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/02 20:13:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 QDBM_BUILDLINK3_MK:=	${QDBM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqdbm}
 BUILDLINK_PACKAGES+=	qdbm
 
 .if !empty(QDBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qdbm+=	qdbm>=1.8.40
+BUILDLINK_API_DEPENDS.qdbm+=	qdbm>=1.8.40
 BUILDLINK_PKGSRCDIR.qdbm?=	../../databases/qdbm
 .endif	# QDBM_BUILDLINK3_MK
 
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index abea63762b6..51ba201c9b2 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrrdtool}
 BUILDLINK_PACKAGES+=	rrdtool
 
 .if !empty(RRDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rrdtool+=	rrdtool>=1.2.9
-BUILDLINK_RECOMMENDED.rrdtool+=	rrdtool>=1.2.12nb1
+BUILDLINK_API_DEPENDS.rrdtool+=	rrdtool>=1.2.9
+BUILDLINK_ABI_DEPENDS.rrdtool+=	rrdtool>=1.2.12nb1
 BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
 .endif	# RRDTOOL_BUILDLINK3_MK
 
diff --git a/databases/sdbm/buildlink3.mk b/databases/sdbm/buildlink3.mk
index 0f52e9e091f..bb9133aa370 100644
--- a/databases/sdbm/buildlink3.mk
+++ b/databases/sdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/05 10:24:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDBM_BUILDLINK3_MK:=	${SDBM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsdbm}
 BUILDLINK_PACKAGES+=	sdbm
 
 .if !empty(SDBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sdbm+=	sdbm>=90.12.1
+BUILDLINK_API_DEPENDS.sdbm+=	sdbm>=90.12.1
 BUILDLINK_PKGSRCDIR.sdbm?=	../../databases/sdbm
 .endif	# SDBM_BUILDLINK3_MK
 
diff --git a/databases/shared-mime-info/buildlink3.mk b/databases/shared-mime-info/buildlink3.mk
index 21eee90402e..c421e833a47 100644
--- a/databases/shared-mime-info/buildlink3.mk
+++ b/databases/shared-mime-info/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 SHARED_MIME_INFO_BUILDLINK3_MK:=	${SHARED_MIME_INFO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nshared-mime-info}
 BUILDLINK_PACKAGES+=	shared-mime-info
 
 .if !empty(SHARED_MIME_INFO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.shared-mime-info+=	shared-mime-info>=0.15
-BUILDLINK_RECOMMENDED.shared-mime-info?=	shared-mime-info>=0.16nb2
+BUILDLINK_API_DEPENDS.shared-mime-info+=	shared-mime-info>=0.15
+BUILDLINK_ABI_DEPENDS.shared-mime-info?=	shared-mime-info>=0.16nb2
 BUILDLINK_PKGSRCDIR.shared-mime-info?=	../../databases/shared-mime-info
 .endif	# SHARED_MIME_INFO_BUILDLINK3_MK
 
diff --git a/databases/sqlite/buildlink3.mk b/databases/sqlite/buildlink3.mk
index 75921a6d0d9..e9d2b8f3710 100644
--- a/databases/sqlite/buildlink3.mk
+++ b/databases/sqlite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SQLITE_BUILDLINK3_MK:=	${SQLITE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsqlite}
 BUILDLINK_PACKAGES+=	sqlite
 
 .if !empty(SQLITE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sqlite+=	sqlite>=2.8.0
-BUILDLINK_RECOMMENDED.sqlite+=	sqlite>=2.8.16nb1
+BUILDLINK_API_DEPENDS.sqlite+=	sqlite>=2.8.0
+BUILDLINK_ABI_DEPENDS.sqlite+=	sqlite>=2.8.16nb1
 BUILDLINK_PKGSRCDIR.sqlite?=	../../databases/sqlite
 .endif	# SQLITE_BUILDLINK3_MK
 
diff --git a/databases/sqlite3-tcl/Makefile b/databases/sqlite3-tcl/Makefile
index 47aa723e14e..3b08acaea0c 100644
--- a/databases/sqlite3-tcl/Makefile
+++ b/databases/sqlite3-tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/15 19:50:52 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 06:21:43 reed Exp $
 
 .include "../../databases/sqlite3/Makefile.common"
 
@@ -10,7 +10,7 @@ BUILD_TARGET=		libtclsqlite3.la
 INSTALL_TARGET=		tcl_install
 TEST_TARGET=		test
 
-BUILDLINK_DEPENDS.sqlite3+=	sqlite3>=3.2.7
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.2.7
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/databases/sqlite3/buildlink3.mk b/databases/sqlite3/buildlink3.mk
index e6796d8d811..5f1b2d8f0f6 100644
--- a/databases/sqlite3/buildlink3.mk
+++ b/databases/sqlite3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SQLITE3_BUILDLINK3_MK:=	${SQLITE3_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsqlite3}
 BUILDLINK_PACKAGES+=	sqlite3
 
 .if !empty(SQLITE3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sqlite3+=	sqlite3>=3.0.8
-BUILDLINK_RECOMMENDED.sqlite3?=	sqlite3>=3.2.7nb1
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.0.8
+BUILDLINK_ABI_DEPENDS.sqlite3?=	sqlite3>=3.2.7nb1
 BUILDLINK_PKGSRCDIR.sqlite3?=	../../databases/sqlite3
 .endif	# SQLITE3_BUILDLINK3_MK
 
diff --git a/databases/tcl-postgresql73/buildlink3.mk b/databases/tcl-postgresql73/buildlink3.mk
index ceda7a55dbd..42975cc29ed 100644
--- a/databases/tcl-postgresql73/buildlink3.mk
+++ b/databases/tcl-postgresql73/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_POSTGRESQL73_BUILDLINK3_MK:=	${TCL_POSTGRESQL73_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-postgresql73}
 BUILDLINK_PACKAGES+=	tcl-postgresql73
 
 .if !empty(TCL_POSTGRESQL73_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-postgresql73+=	tcl-postgresql73>=7.3.6
-BUILDLINK_RECOMMENDED.tcl-postgresql73?=	tcl-postgresql73>=7.3.10nb2
+BUILDLINK_API_DEPENDS.tcl-postgresql73+=	tcl-postgresql73>=7.3.6
+BUILDLINK_ABI_DEPENDS.tcl-postgresql73?=	tcl-postgresql73>=7.3.10nb2
 BUILDLINK_PKGSRCDIR.tcl-postgresql73?=	../../databases/tcl-postgresql73
 .endif	# TCL_POSTGRESQL73_BUILDLINK3_MK
 
diff --git a/databases/tcl-postgresql74/buildlink3.mk b/databases/tcl-postgresql74/buildlink3.mk
index 7a3398260da..cdd131d2cab 100644
--- a/databases/tcl-postgresql74/buildlink3.mk
+++ b/databases/tcl-postgresql74/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_POSTGRESQL73_BUILDLINK3_MK:=	${TCL_POSTGRESQL73_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-postgresql73}
 BUILDLINK_PACKAGES+=	tcl-postgresql73
 
 .if !empty(TCL_POSTGRESQL73_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-postgresql73+=	tcl-postgresql73>=7.3.6
-BUILDLINK_RECOMMENDED.tcl-postgresql73?=	tcl-postgresql74>=7.4.8nb1
+BUILDLINK_API_DEPENDS.tcl-postgresql73+=	tcl-postgresql73>=7.3.6
+BUILDLINK_ABI_DEPENDS.tcl-postgresql73?=	tcl-postgresql74>=7.4.8nb1
 BUILDLINK_PKGSRCDIR.tcl-postgresql73?=	../../databases/tcl-postgresql73
 .endif	# TCL_POSTGRESQL73_BUILDLINK3_MK
 
diff --git a/databases/tdb/buildlink3.mk b/databases/tdb/buildlink3.mk
index 5c4fd7299d7..d5701c5c41c 100644
--- a/databases/tdb/buildlink3.mk
+++ b/databases/tdb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TDB_BUILDLINK3_MK:=	${TDB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntdb}
 BUILDLINK_PACKAGES+=	tdb
 
 .if !empty(TDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tdb+=		tdb>=1.0.6
-BUILDLINK_RECOMMENDED.tdb+=	tdb>=1.0.6nb2
+BUILDLINK_API_DEPENDS.tdb+=		tdb>=1.0.6
+BUILDLINK_ABI_DEPENDS.tdb+=	tdb>=1.0.6nb2
 BUILDLINK_PKGSRCDIR.tdb?=	../../databases/tdb
 .endif	# TDB_BUILDLINK3_MK
 
diff --git a/databases/tinycdb/buildlink3.mk b/databases/tinycdb/buildlink3.mk
index 0e45f827b00..cffa7c20b38 100644
--- a/databases/tinycdb/buildlink3.mk
+++ b/databases/tinycdb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/01/19 04:40:36 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TINYCDB_BUILDLINK3_MK:=	${TINYCDB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntinycdb}
 BUILDLINK_PACKAGES+=	tinycdb
 
 .if !empty(TINYCDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tinycdb+=	tinycdb>=0.75
+BUILDLINK_API_DEPENDS.tinycdb+=	tinycdb>=0.75
 BUILDLINK_DEPMETHOD.tinycdb?=	build
 BUILDLINK_PKGSRCDIR.tinycdb?=	../../databases/tinycdb
 .endif	# TINYCDB_BUILDLINK3_MK
diff --git a/databases/unixodbc/buildlink3.mk b/databases/unixodbc/buildlink3.mk
index b6f8e0851bd..16bc234a169 100644
--- a/databases/unixodbc/buildlink3.mk
+++ b/databases/unixodbc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/15 11:54:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:43 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 UNIXODBC_BUILDLINK3_MK:=	${UNIXODBC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nunixodbc}
 BUILDLINK_PACKAGES+=	unixodbc
 
 .if !empty(UNIXODBC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.unixodbc+=	unixodbc>=2.0.11nb1
-BUILDLINK_RECOMMENDED.unixodbc+=	unixodbc>=2.0.11nb3
+BUILDLINK_API_DEPENDS.unixodbc+=	unixodbc>=2.0.11nb1
+BUILDLINK_ABI_DEPENDS.unixodbc+=	unixodbc>=2.0.11nb3
 BUILDLINK_PKGSRCDIR.unixodbc?=	../../databases/unixodbc
 .endif	# UNIXODBC_BUILDLINK3_MK