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).

46 files changed, 121 insertions, 121 deletions

diff --git a/textproc/aiksaurus/buildlink3.mk b/textproc/aiksaurus/buildlink3.mk
index e67e99f4f22..5435ceef769 100644
--- a/textproc/aiksaurus/buildlink3.mk
+++ b/textproc/aiksaurus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/12/29 09:18:20 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:47 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AIKSAURUS_BUILDLINK3_MK:=	${AIKSAURUS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naiksaurus}
 BUILDLINK_PACKAGES+=	aiksaurus
 
 .if !empty(AIKSAURUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.aiksaurus+=	aiksaurus>=1.2.1
+BUILDLINK_API_DEPENDS.aiksaurus+=	aiksaurus>=1.2.1
 BUILDLINK_PKGSRCDIR.aiksaurus?=	../../textproc/aiksaurus
 .endif	# AIKSAURUS_BUILDLINK3_MK
 
diff --git a/textproc/aspell-czech/Makefile b/textproc/aspell-czech/Makefile
index ea8f1e7c69a..27e395bd182 100644
--- a/textproc/aspell-czech/Makefile
+++ b/textproc/aspell-czech/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:44 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/06 06:22:48 reed Exp $
 #
 
 DISTNAME=	aspell6-cs-20040614-1
@@ -13,7 +13,7 @@ HOMEPAGE=	http://aspell.net/
 COMMENT=	Czech language support for aspell
 
 # earlier versions core-dumped on the input
-BUILDLINK_DEPENDS.aspell+=	aspell>=0.60.2nb1
+BUILDLINK_API_DEPENDS.aspell+=	aspell>=0.60.2nb1
 
 HAS_CONFIGURE=	YES
 
diff --git a/textproc/aspell/buildlink3.mk b/textproc/aspell/buildlink3.mk
index 0c8913a192b..1e4f9ea73f6 100644
--- a/textproc/aspell/buildlink3.mk
+++ b/textproc/aspell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:59 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:47 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ASPELL_BUILDLINK3_MK:=	${ASPELL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naspell}
 BUILDLINK_PACKAGES+=	aspell
 
 .if !empty(ASPELL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.aspell+=	aspell>=0.50.3
-BUILDLINK_RECOMMENDED.aspell+=	aspell>=0.60.4nb1
+BUILDLINK_API_DEPENDS.aspell+=	aspell>=0.50.3
+BUILDLINK_ABI_DEPENDS.aspell+=	aspell>=0.60.4nb1
 BUILDLINK_PKGSRCDIR.aspell?=	../../textproc/aspell
 .endif	# ASPELL_BUILDLINK3_MK
 
diff --git a/textproc/btparse/buildlink3.mk b/textproc/btparse/buildlink3.mk
index d8e6acf5aa9..1aa7acfb6e0 100644
--- a/textproc/btparse/buildlink3.mk
+++ b/textproc/btparse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/09/27 12:24:06 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:49 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BTPARSE_BUILDLINK3_MK:=	${BTPARSE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbtparse}
 BUILDLINK_PACKAGES+=	btparse
 
 .if !empty(BTPARSE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.btparse+=	btparse>=0.34
+BUILDLINK_API_DEPENDS.btparse+=	btparse>=0.34
 BUILDLINK_PKGSRCDIR.btparse?=	../../textproc/btparse
 .endif	# BTPARSE_BUILDLINK3_MK
 
diff --git a/textproc/chasen-base/buildlink3.mk b/textproc/chasen-base/buildlink3.mk
index c46923f5713..7f45beced12 100644
--- a/textproc/chasen-base/buildlink3.mk
+++ b/textproc/chasen-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:19 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:49 reed Exp $
 #
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nchasen-base}
 BUILDLINK_PACKAGES+=	chasen-base
 
 .if !empty(CHASEN_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.chasen-base+=	chasen-base>=2.3.3
-BUILDLINK_RECOMMENDED.chasen-base+=	chasen-base>=2.3.3nb1
+BUILDLINK_API_DEPENDS.chasen-base+=	chasen-base>=2.3.3
+BUILDLINK_ABI_DEPENDS.chasen-base+=	chasen-base>=2.3.3nb1
 BUILDLINK_PKGSRCDIR.chasen-base?=	../../textproc/chasen-base
 .endif	# CHASEN_BASE_BUILDLINK3_MK
 
diff --git a/textproc/chasen/buildlink3.mk b/textproc/chasen/buildlink3.mk
index 4dd29740836..4dfa6b5e8da 100644
--- a/textproc/chasen/buildlink3.mk
+++ b/textproc/chasen/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 00:28:50 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:49 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CHASEN_BUILDLINK3_MK:=	${CHASEN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nchasen}
 BUILDLINK_PACKAGES+=	chasen
 
 .if !empty(CHASEN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.chasen+=	chasen>=2.0
+BUILDLINK_API_DEPENDS.chasen+=	chasen>=2.0
 BUILDLINK_PKGSRCDIR.chasen?=	../../textproc/chasen
 BUILDLINK_FILES.chasen=		include/chasen.h
 BUILDLINK_FILES.chasen+=	lib/libchasen.*
diff --git a/textproc/eb/buildlink3.mk b/textproc/eb/buildlink3.mk
index 9d6a142207f..9bc576d92da 100644
--- a/textproc/eb/buildlink3.mk
+++ b/textproc/eb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:50 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EB_BUILDLINK3_MK:=	${EB_BUILDLINK3_MK}+
@@ -26,8 +26,8 @@ PKG_SYSCONFDIR.eb=$$(						\
 	else ${ECHO}; fi )
 
 .if !empty(EB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eb+=		eb>=${_EB_REQD}
-BUILDLINK_RECOMMENDED.eb+=	eb>=4.1.3nb1
+BUILDLINK_API_DEPENDS.eb+=		eb>=${_EB_REQD}
+BUILDLINK_ABI_DEPENDS.eb+=	eb>=4.1.3nb1
 BUILDLINK_PKGSRCDIR.eb?=	../../textproc/eb
 .endif	# EB_BUILDLINK3_MK
 
diff --git a/textproc/enchant/buildlink3.mk b/textproc/enchant/buildlink3.mk
index e7e66d6366f..9d71225bed0 100644
--- a/textproc/enchant/buildlink3.mk
+++ b/textproc/enchant/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:50 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ENCHANT_BUILDLINK3_MK:=	${ENCHANT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nenchant}
 BUILDLINK_PACKAGES+=	enchant
 
 .if !empty(ENCHANT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.enchant+=	enchant>=1.1.3
-BUILDLINK_RECOMMENDED.enchant+=	enchant>=1.1.6nb1
+BUILDLINK_API_DEPENDS.enchant+=	enchant>=1.1.3
+BUILDLINK_ABI_DEPENDS.enchant+=	enchant>=1.1.6nb1
 BUILDLINK_PKGSRCDIR.enchant?=	../../textproc/enchant
 .endif	# ENCHANT_BUILDLINK3_MK
 
diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk
index a5e623da333..0388cd0f382 100644
--- a/textproc/expat/buildlink3.mk
+++ b/textproc/expat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:11:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:50 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EXPAT_BUILDLINK3_MK:=	${EXPAT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nexpat}
 BUILDLINK_PACKAGES+=	expat
 
 .if !empty(EXPAT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.expat+=	expat>=1.95.7
-BUILDLINK_RECOMMENDED.expat+=	expat>=2.0.0nb1
+BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.7
+BUILDLINK_ABI_DEPENDS.expat+=	expat>=2.0.0nb1
 BUILDLINK_PKGSRCDIR.expat?=	../../textproc/expat
 .endif	# EXPAT_BUILDLINK3_MK
 
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index 7c8e5f99a45..0007004d6e3 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:50 reed Exp $
 
 BUILTIN_PKG:=	expat
 
@@ -54,7 +54,7 @@ USE_BUILTIN.expat=	${IS_BUILTIN.expat}
 .    if defined(BUILTIN_PKG.expat) && \
         !empty(IS_BUILTIN.expat:M[yY][eE][sS])
 USE_BUILTIN.expat=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.expat}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.expat}
 .        if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
 USE_BUILTIN.expat!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then	\
@@ -77,7 +77,7 @@ CHECK_BUILTIN.expat?=	no
 .if !empty(CHECK_BUILTIN.expat:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.expat:M[nN][oO])
-BUILDLINK_DEPENDS.expat+=	expat>=1.95.4
+BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.4
 .  endif
 
 .  if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
diff --git a/textproc/gdome2/buildlink3.mk b/textproc/gdome2/buildlink3.mk
index 0f7f34146fd..d598ed646cc 100644
--- a/textproc/gdome2/buildlink3.mk
+++ b/textproc/gdome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/10 12:09:24 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:50 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GDOME2_BUILDLINK3_MK:=	${GDOME2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdome2}
 BUILDLINK_PACKAGES+=	gdome2
 
 .if !empty(GDOME2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdome2+=	gdome2>=0.8.1nb1
-BUILDLINK_RECOMMENDED.gdome2?=	gdome2>=0.8.1nb2
+BUILDLINK_API_DEPENDS.gdome2+=	gdome2>=0.8.1nb1
+BUILDLINK_ABI_DEPENDS.gdome2?=	gdome2>=0.8.1nb2
 BUILDLINK_PKGSRCDIR.gdome2?=	../../textproc/gdome2
 .endif	# GDOME2_BUILDLINK3_MK
 
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index d0e30606fd0..82c27b231fa 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/21 06:00:50 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/06 06:22:50 reed Exp $
 #
 
 DISTNAME=	gnome-doc-utils-0.6.0
@@ -30,7 +30,7 @@ PYTHON_PATCH_SCRIPTS+=	xml2po/modes/empty.py
 PYTHON_PATCH_SCRIPTS+=	xml2po/modes/gs.py
 PYTHON_PATCH_SCRIPTS+=	xml2po/xml2po.py
 
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.12
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.12
 BUILDLINK_DEPMETHOD.libxslt?=	build
 BUILDLINK_DEPMETHOD.libxml2?=	build
 
diff --git a/textproc/gnome-doc-utils/buildlink3.mk b/textproc/gnome-doc-utils/buildlink3.mk
index a71e2167a50..bb062bb78a8 100644
--- a/textproc/gnome-doc-utils/buildlink3.mk
+++ b/textproc/gnome-doc-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/03/12 22:14:09 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:50 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DOC_UTILS_BUILDLINK3_MK:=	${GNOME_DOC_UTILS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gnome-doc-utils
 
 .if !empty(GNOME_DOC_UTILS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPMETHOD.gnome-doc-utils+=	build
-BUILDLINK_DEPENDS.gnome-doc-utils+=	gnome-doc-utils>=0.6.0
+BUILDLINK_API_DEPENDS.gnome-doc-utils+=	gnome-doc-utils>=0.6.0
 BUILDLINK_PKGSRCDIR.gnome-doc-utils?=	../../textproc/gnome-doc-utils
 .endif	# GNOME_DOC_UTILS_BUILDLINK3_MK
 
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 8fc7700c3e9..e71070bf903 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/06 00:18:12 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:50 reed Exp $
 
 DISTNAME=	gnome-spell-1.0.6
 PKGREVISION=	4
@@ -16,7 +16,7 @@ USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 
-BUILDLINK_DEPENDS.libgnomeui+=	libgnomeui>=2.8.0nb3
+BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.8.0nb3
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk
index 56a40aa19b2..8be2e084ea3 100644
--- a/textproc/gnome-spell/buildlink3.mk
+++ b/textproc/gnome-spell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:50 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_SPELL_BUILDLINK3_MK:=	${GNOME_SPELL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-spell}
 BUILDLINK_PACKAGES+=	gnome-spell
 
 .if !empty(GNOME_SPELL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-spell+=		gnome-spell>=1.0.5
-BUILDLINK_RECOMMENDED.gnome-spell+=	gnome-spell>=1.0.6nb3
+BUILDLINK_API_DEPENDS.gnome-spell+=		gnome-spell>=1.0.5
+BUILDLINK_ABI_DEPENDS.gnome-spell+=	gnome-spell>=1.0.6nb3
 BUILDLINK_PKGSRCDIR.gnome-spell?=	../../textproc/gnome-spell
 .endif	# GNOME_SPELL_BUILDLINK3_MK
 
diff --git a/textproc/gtk-doc/buildlink3.mk b/textproc/gtk-doc/buildlink3.mk
index 9f9982b6d2f..9ee06eda285 100644
--- a/textproc/gtk-doc/buildlink3.mk
+++ b/textproc/gtk-doc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/02/26 10:24:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:50 reed Exp $
 
 # provided mostly for pkg-config
 
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk-doc}
 BUILDLINK_PACKAGES+=	gtk-doc
 
 .if !empty(GTK_DOC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk-doc+=	gtk-doc>=1.4nb1
+BUILDLINK_API_DEPENDS.gtk-doc+=	gtk-doc>=1.4nb1
 BUILDLINK_PKGSRCDIR.gtk-doc?=	../../textproc/gtk-doc
 .endif	# GTK_DOC_BUILDLINK3_MK
 
diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk
index 5efca7088c5..45b581c493d 100644
--- a/textproc/gtkspell/buildlink3.mk
+++ b/textproc/gtkspell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:50 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKSPELL_BUILDLINK3_MK:=	${GTKSPELL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkspell}
 BUILDLINK_PACKAGES+=	gtkspell
 
 .if !empty(GTKSPELL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkspell+=	gtkspell>=2.0.2nb6
-BUILDLINK_RECOMMENDED.gtkspell+=	gtkspell>=2.0.11nb2
+BUILDLINK_API_DEPENDS.gtkspell+=	gtkspell>=2.0.2nb6
+BUILDLINK_ABI_DEPENDS.gtkspell+=	gtkspell>=2.0.11nb2
 BUILDLINK_PKGSRCDIR.gtkspell?=	../../textproc/gtkspell
 .endif	# GTKSPELL_BUILDLINK3_MK
 
diff --git a/textproc/hre/buildlink3.mk b/textproc/hre/buildlink3.mk
index cf0ea3cad60..613e0504929 100644
--- a/textproc/hre/buildlink3.mk
+++ b/textproc/hre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:19 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:50 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HRE_BUILDLINK3_MK:=	${HRE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhre}
 BUILDLINK_PACKAGES+=	hre
 
 .if !empty(HRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hre+=		hre>=0.9.7
-BUILDLINK_RECOMMENDED.hre+=	hre>=0.9.8anb1
+BUILDLINK_API_DEPENDS.hre+=		hre>=0.9.7
+BUILDLINK_ABI_DEPENDS.hre+=	hre>=0.9.8anb1
 BUILDLINK_PKGSRCDIR.hre?=	../../textproc/hre
 .endif	# HRE_BUILDLINK3_MK
 
diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk
index 014f95232c7..96bb88b2d32 100644
--- a/textproc/icu/buildlink3.mk
+++ b/textproc/icu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICU_BUILDLINK3_MK:=	${ICU_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nicu}
 BUILDLINK_PACKAGES+=	icu
 
 .if !empty(ICU_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.icu+=	icu>=3.4
-BUILDLINK_RECOMMENDED.icu?=	icu>=3.4nb1
+BUILDLINK_API_DEPENDS.icu+=	icu>=3.4
+BUILDLINK_ABI_DEPENDS.icu?=	icu>=3.4nb1
 BUILDLINK_PKGSRCDIR.icu?=	../../textproc/icu
 .endif	# ICU_BUILDLINK3_MK
 
diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk
index c065bcf6df2..8afb5b2b6d2 100644
--- a/textproc/intltool/buildlink3.mk
+++ b/textproc/intltool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 INTLTOOL_BUILDLINK3_MK:=	${INTLTOOL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nintltool}
 BUILDLINK_PACKAGES+=	intltool
 
 .if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.intltool+=	intltool>=0.34.1
-BUILDLINK_RECOMMENDED.intltool?=	intltool>=0.34.1nb2
+BUILDLINK_API_DEPENDS.intltool+=	intltool>=0.34.1
+BUILDLINK_ABI_DEPENDS.intltool?=	intltool>=0.34.1nb2
 BUILDLINK_PKGSRCDIR.intltool?=	../../textproc/intltool
 BUILDLINK_DEPMETHOD.intltool?=	build
 .endif	# INTLTOOL_BUILDLINK3_MK
diff --git a/textproc/iso-codes/buildlink3.mk b/textproc/iso-codes/buildlink3.mk
index faecd8666cc..bf4852fe590 100644
--- a/textproc/iso-codes/buildlink3.mk
+++ b/textproc/iso-codes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/30 21:01:43 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 ISO_CODES_BUILDLINK3_MK:=	${ISO_CODES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Niso-codes}
 BUILDLINK_PACKAGES+=	iso-codes
 
 .if !empty(ISO_CODES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.iso-codes+=	iso-codes>=0.50
+BUILDLINK_API_DEPENDS.iso-codes+=	iso-codes>=0.50
 BUILDLINK_PKGSRCDIR.iso-codes?=	../../textproc/iso-codes
 .endif	# ISO_CODES_BUILDLINK3_MK
 
diff --git a/textproc/jade/buildlink3.mk b/textproc/jade/buildlink3.mk
index 866033b887d..8e42671bf52 100644
--- a/textproc/jade/buildlink3.mk
+++ b/textproc/jade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JADE_BUILDLINK3_MK:=	${JADE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njade}
 BUILDLINK_PACKAGES+=	jade
 
 .if !empty(JADE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jade+=	jade>=1.2.1nb7
-BUILDLINK_RECOMMENDED.jade+=	jade>=1.2.1nb10
+BUILDLINK_API_DEPENDS.jade+=	jade>=1.2.1nb7
+BUILDLINK_ABI_DEPENDS.jade+=	jade>=1.2.1nb10
 BUILDLINK_PKGSRCDIR.jade?=	../../textproc/jade
 .endif	# JADE_BUILDLINK3_MK
 
diff --git a/textproc/kakasi/buildlink3.mk b/textproc/kakasi/buildlink3.mk
index 92820b5e111..f367828d5f0 100644
--- a/textproc/kakasi/buildlink3.mk
+++ b/textproc/kakasi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/13 09:17:51 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KAKASI_BUILDLINK3_MK:=	${KAKASI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkakasi}
 BUILDLINK_PACKAGES+=	kakasi
 
 .if !empty(KAKASI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kakasi+=	kakasi>=2.3.0
-BUILDLINK_RECOMMENDED.kakasi+=	kakasi>=2.3.4nb4
+BUILDLINK_API_DEPENDS.kakasi+=	kakasi>=2.3.0
+BUILDLINK_ABI_DEPENDS.kakasi+=	kakasi>=2.3.4nb4
 BUILDLINK_PKGSRCDIR.kakasi?=	../../textproc/kakasi
 .endif	# KAKASI_BUILDLINK3_MK
 
diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk
index 99b912e042c..a07b29c8c84 100644
--- a/textproc/libcroco/buildlink3.mk
+++ b/textproc/libcroco/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCROCO_BUILDLINK3_MK:=	${LIBCROCO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcroco}
 BUILDLINK_PACKAGES+=	libcroco
 
 .if !empty(LIBCROCO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcroco+=	libcroco>=0.6.0
-BUILDLINK_RECOMMENDED.libcroco+=	libcroco>=0.6.0nb4
+BUILDLINK_API_DEPENDS.libcroco+=	libcroco>=0.6.0
+BUILDLINK_ABI_DEPENDS.libcroco+=	libcroco>=0.6.0nb4
 BUILDLINK_PKGSRCDIR.libcroco?=	../../textproc/libcroco
 .endif	# LIBCROCO_BUILDLINK3_MK
 
diff --git a/textproc/libpathan/buildlink3.mk b/textproc/libpathan/buildlink3.mk
index b8480de8f44..da1c639cbaf 100644
--- a/textproc/libpathan/buildlink3.mk
+++ b/textproc/libpathan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPATHAN_BUILDLINK3_MK:=	${LIBPATHAN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpathan}
 BUILDLINK_PACKAGES+=	libpathan
 
 .if !empty(LIBPATHAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpathan+=	libpathan>=1.2.2
-BUILDLINK_RECOMMENDED.libpathan+=	libpathan>=1.2.2nb2
+BUILDLINK_API_DEPENDS.libpathan+=	libpathan>=1.2.2
+BUILDLINK_ABI_DEPENDS.libpathan+=	libpathan>=1.2.2nb2
 BUILDLINK_PKGSRCDIR.libpathan?=	../../textproc/libpathan
 .endif	# LIBPATHAN_BUILDLINK3_MK
 
diff --git a/textproc/libunicode/buildlink3.mk b/textproc/libunicode/buildlink3.mk
index 9989d9f15d3..27fa2b01fd5 100644
--- a/textproc/libunicode/buildlink3.mk
+++ b/textproc/libunicode/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:20 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBUNICODE_BUILDLINK3_MK:=	${LIBUNICODE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibunicode}
 BUILDLINK_PACKAGES+=	libunicode
 
 .if !empty(LIBUNICODE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libunicode+=		libunicode>=0.4
-BUILDLINK_RECOMMENDED.libunicode+=	libunicode>=0.4nb1
+BUILDLINK_API_DEPENDS.libunicode+=		libunicode>=0.4
+BUILDLINK_ABI_DEPENDS.libunicode+=	libunicode>=0.4nb1
 BUILDLINK_PKGSRCDIR.libunicode?=	../../textproc/libunicode
 .endif	# LIBUNICODE_BUILDLINK3_MK
 
diff --git a/textproc/libxml++2/buildlink3.mk b/textproc/libxml++2/buildlink3.mk
index efad31e15cb..bc503a8e6d1 100644
--- a/textproc/libxml++2/buildlink3.mk
+++ b/textproc/libxml++2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXML++2_BUILDLINK3_MK:=	${LIBXML++2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxml++2}
 BUILDLINK_PACKAGES+=	libxml++2
 
 .if !empty(LIBXML++2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxml++2+=	libxml++2>=2.10.0
-BUILDLINK_RECOMMENDED.libxml++2?=	libxml++2>=2.10.0nb1
+BUILDLINK_API_DEPENDS.libxml++2+=	libxml++2>=2.10.0
+BUILDLINK_ABI_DEPENDS.libxml++2?=	libxml++2>=2.10.0nb1
 BUILDLINK_PKGSRCDIR.libxml++2?=	../../textproc/libxml++2
 .endif	# LIBXML++2_BUILDLINK3_MK
 
diff --git a/textproc/libxml/buildlink3.mk b/textproc/libxml/buildlink3.mk
index a1e3ef505a8..4c5261ef781 100644
--- a/textproc/libxml/buildlink3.mk
+++ b/textproc/libxml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/11/20 22:07:49 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXML_BUILDLINK3_MK:=	${LIBXML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxml}
 BUILDLINK_PACKAGES+=	libxml
 
 .if !empty(LIBXML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxml+=	libxml>=1.8.11
-BUILDLINK_RECOMMENDED.libxml+=	libxml>=1.8.17nb3
+BUILDLINK_API_DEPENDS.libxml+=	libxml>=1.8.11
+BUILDLINK_ABI_DEPENDS.libxml+=	libxml>=1.8.17nb3
 BUILDLINK_FILES.libxml+=	include/gnome-xml/libxml/*.h
 BUILDLINK_PKGSRCDIR.libxml?=	../../textproc/libxml
 .endif	# LIBXML_BUILDLINK3_MK
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index eefd2c4b751..8d30749e481 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXML2_BUILDLINK3_MK:=	${LIBXML2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxml2}
 BUILDLINK_PACKAGES+=	libxml2
 
 .if !empty(LIBXML2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.2
-BUILDLINK_RECOMMENDED.libxml2+=	libxml2>=2.6.23nb1
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.2
+BUILDLINK_ABI_DEPENDS.libxml2+=	libxml2>=2.6.23nb1
 BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
 
 BUILDLINK_FILES.libxml2+=	bin/xml2-config
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index aa3e4541593..b3800b366c4 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: Makefile,v 1.63 2006/04/06 06:22:51 reed Exp $
 
 DISTNAME=	libxslt-1.1.15
 PKGREVISION=	1
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--without-python
 
 TEST_TARGET=		check
 
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.17
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.17
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
diff --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk
index bac3aa55fc1..6a2b320a728 100644
--- a/textproc/libxslt/buildlink3.mk
+++ b/textproc/libxslt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXSLT_BUILDLINK3_MK:=	${LIBXSLT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxslt}
 BUILDLINK_PACKAGES+=	libxslt
 
 .if !empty(LIBXSLT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.8
-BUILDLINK_RECOMMENDED.libxslt+=	libxslt>=1.1.15nb1
+BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.8
+BUILDLINK_ABI_DEPENDS.libxslt+=	libxslt>=1.1.15nb1
 BUILDLINK_PKGSRCDIR.libxslt?=	../../textproc/libxslt
 .endif	# LIBXSLT_BUILDLINK3_MK
 
diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk
index 969e4c1a733..88540468f58 100644
--- a/textproc/opensp/buildlink3.mk
+++ b/textproc/opensp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:51 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSP_BUILDLINK3_MK:=	${OPENSP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopensp}
 BUILDLINK_PACKAGES+=	opensp
 
 .if !empty(OPENSP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.opensp+=	opensp>=1.5.1
-BUILDLINK_RECOMMENDED.opensp+=	opensp>=1.5.1nb3
+BUILDLINK_API_DEPENDS.opensp+=	opensp>=1.5.1
+BUILDLINK_ABI_DEPENDS.opensp+=	opensp>=1.5.1nb3
 BUILDLINK_PKGSRCDIR.opensp?=	../../textproc/opensp
 .endif	# OPENSP_BUILDLINK3_MK
 
diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile
index c4e3d04a6e8..7075fabf438 100644
--- a/textproc/p5-XML-Xerces/Makefile
+++ b/textproc/p5-XML-Xerces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:05 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/06 06:22:51 reed Exp $
 #
 
 DISTNAME=	XML-Xerces-2.3.0-4
@@ -23,7 +23,7 @@ MAKE_ENV+=	XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}" LANG=""
 # Xerces-C is built unthreaded in pkgsrc (for now).
 BUILDLINK_TRANSFORM+=	rm:-lpthread
 
-BUILDLINK_DEPENDS.xerces-c+=	xerces-c>=2.3.0
+BUILDLINK_API_DEPENDS.xerces-c+=	xerces-c>=2.3.0
 .include "../../textproc/xerces-c/buildlink3.mk"
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 695e55d2cd8..64eca297633 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/07 20:58:07 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:51 reed Exp $
 
 DISTNAME=	libxml2-2.6.23
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@ SUBST_FILES.setup=	setup.py
 SUBST_SED.setup=	-e "/ROOT/s,'/usr','${BUILDLINK_PREFIX.libxml2}',g" \
 			-e "/^\"/s,/usr/include,${BUILDLINK_PREFIX.iconv}/include,g"
 
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=${PKGVERSION}
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=${PKGVERSION}
 .include "../../textproc/libxml2/buildlink3.mk"
 
 .include "../../lang/python/extension.mk"
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index 50fb97bfa9c..1b7d68190b3 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/06 06:22:51 reed Exp $
 
 DISTNAME=	libxslt-1.1.15
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -28,7 +28,7 @@ SUBST_SED.setup=	-e "s,@LIBICONVDIR@,${BUILDLINK_PREFIX.iconv},g" \
 			-e "s,@LIBXML2DIR@,${BUILDLINK_PREFIX.libxml2},g" \
 			-e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g"
 
-BUILDLINK_DEPENDS.libxslt+=	libxslt>=${PKGVERSION}
+BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=${PKGVERSION}
 .include "../../textproc/libxslt/buildlink3.mk"
 
 .include "../../lang/python/extension.mk"
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index 4a602bf3b9d..2c796e004bb 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:52 reed Exp $
 #
 
 DISTNAME=	PyXML-0.8.4
@@ -15,7 +15,7 @@ CONFLICTS+=	PyXML-[0-9]*
 
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
-BUILDLINK_DEPENDS.expat+=	expat>=1.95.6
+BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.6
 PYSETUPBUILDARGS+=	--with-libexpat=${BUILDLINK_DIR}
 PYSETUPBUILDARGS+=	--ldflags="${EXPAT_LDFLAGS}"
 EXPAT_LDFLAGS=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib
diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk
index 6ad667edfc5..8182a5c2409 100644
--- a/textproc/py-xml/buildlink3.mk
+++ b/textproc/py-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:52 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYXML_BUILDLINK3_MK:=	${PYXML_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyxml}
 BUILDLINK_PACKAGES+=	pyxml
 
 .if !empty(PYXML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyxml+=	${PYPKGPREFIX}-xml>=0.8.3nb1
-BUILDLINK_RECOMMENDED.pyxml?=	${PYPKGPREFIX}-xml>=0.8.4nb2
+BUILDLINK_API_DEPENDS.pyxml+=	${PYPKGPREFIX}-xml>=0.8.3nb1
+BUILDLINK_ABI_DEPENDS.pyxml?=	${PYPKGPREFIX}-xml>=0.8.4nb2
 BUILDLINK_PKGSRCDIR.pyxml?=	../../textproc/py-xml
 .endif	# PYXML_BUILDLINK3_MK
 
diff --git a/textproc/raptor/buildlink3.mk b/textproc/raptor/buildlink3.mk
index 832d731d25a..4f2597d3538 100644
--- a/textproc/raptor/buildlink3.mk
+++ b/textproc/raptor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:52 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RAPTOR_BUILDLINK3_MK:=	${RAPTOR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nraptor}
 BUILDLINK_PACKAGES+=	raptor
 
 .if !empty(RAPTOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.raptor?=		raptor>=1.0.0
-BUILDLINK_RECOMMENDED.raptor+=		raptor>=1.0.0nb6
+BUILDLINK_API_DEPENDS.raptor?=		raptor>=1.0.0
+BUILDLINK_ABI_DEPENDS.raptor+=		raptor>=1.0.0nb6
 .endif	# RAPTOR_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/ruby-eruby/buildlink3.mk b/textproc/ruby-eruby/buildlink3.mk
index 09f8ff6e8e9..a5cf6841992 100644
--- a/textproc/ruby-eruby/buildlink3.mk
+++ b/textproc/ruby-eruby/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/12/11 13:33:26 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:52 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 RUBY_ERUBY_BUILDLINK3_MK:=	${RUBY_ERUBY_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-eruby}
 BUILDLINK_PACKAGES+=	${RUBY_PKGPREFIX}-eruby
 
 .if !empty(RUBY_ERUBY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ruby18-eruby+=	${RUBY_PKGPREFIX}-eruby>=0.9.7
+BUILDLINK_API_DEPENDS.ruby18-eruby+=	${RUBY_PKGPREFIX}-eruby>=0.9.7
 BUILDLINK_PKGSRCDIR.ruby18-eruby?=	../../textproc/ruby-eruby
 .endif	# RUBY_ERUBY_BUILDLINK3_MK
 
diff --git a/textproc/ruby-rdtool/buildlink3.mk b/textproc/ruby-rdtool/buildlink3.mk
index ed914c7b625..230033d17c1 100644
--- a/textproc/ruby-rdtool/buildlink3.mk
+++ b/textproc/ruby-rdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/13 15:23:28 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:52 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 
@@ -22,7 +22,7 @@ RUBY_RD_LIST=	${RUBY_VERSION_LIST:C/([1-9][0-9]*)/ruby&-rdtool/g}
 
 BUILDLINK_FILES.ruby18-rdtool+=		bin/rd2
 BUILDLINK_DEPMETHOD.ruby18-rdtool?=	build
-BUILDLINK_DEPENDS.ruby18-rdtool+=	{${RUBY_RD_LIST}}>=0.6.14
+BUILDLINK_API_DEPENDS.ruby18-rdtool+=	{${RUBY_RD_LIST}}>=0.6.14
 BUILDLINK_PKGSRCDIR.ruby18-rdtool?=	../../textproc/ruby-rdtool
 .endif
 
diff --git a/textproc/sablotron/buildlink3.mk b/textproc/sablotron/buildlink3.mk
index 82c6aa4cdfe..9081f3319c1 100644
--- a/textproc/sablotron/buildlink3.mk
+++ b/textproc/sablotron/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:52 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SABLOTRON_BUILDLINK3_MK:=	${SABLOTRON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsablotron}
 BUILDLINK_PACKAGES+=	sablotron
 
 .if !empty(SABLOTRON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sablotron+=	sablotron>=1.0
-BUILDLINK_RECOMMENDED.sablotron+=	sablotron>=1.0.2nb2
+BUILDLINK_API_DEPENDS.sablotron+=	sablotron>=1.0
+BUILDLINK_ABI_DEPENDS.sablotron+=	sablotron>=1.0.2nb2
 BUILDLINK_PKGSRCDIR.sablotron?=	../../textproc/sablotron
 .endif	# SABLOTRON_BUILDLINK3_MK
 
diff --git a/textproc/scrollkeeper/buildlink3.mk b/textproc/scrollkeeper/buildlink3.mk
index b63a57aa54b..3c6a02b449e 100644
--- a/textproc/scrollkeeper/buildlink3.mk
+++ b/textproc/scrollkeeper/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:52 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SCROLLKEEPER_BUILDLINK3_MK:=	${SCROLLKEEPER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nscrollkeeper}
 BUILDLINK_PACKAGES+=	scrollkeeper
 
 .if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.scrollkeeper+=	scrollkeeper>=0.3.12nb2
-BUILDLINK_RECOMMENDED.scrollkeeper+=	scrollkeeper>=0.3.14nb8
+BUILDLINK_API_DEPENDS.scrollkeeper+=	scrollkeeper>=0.3.12nb2
+BUILDLINK_ABI_DEPENDS.scrollkeeper+=	scrollkeeper>=0.3.14nb8
 BUILDLINK_PKGSRCDIR.scrollkeeper?=	../../textproc/scrollkeeper
 .endif	# SCROLLKEEPER_BUILDLINK3_MK
 
diff --git a/textproc/xalan-c/buildlink3.mk b/textproc/xalan-c/buildlink3.mk
index 7ffceb2d30e..521f2be6b47 100644
--- a/textproc/xalan-c/buildlink3.mk
+++ b/textproc/xalan-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:52 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XALAN_C_BUILDLINK3_MK:=	${XALAN_C_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxalan-c}
 BUILDLINK_PACKAGES+=	xalan-c
 
 .if !empty(XALAN_C_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xalan-c+=	xalan-c>=1.6nb3
-BUILDLINK_RECOMMENDED.xalan-c?=	xalan-c>=1.6nb4
+BUILDLINK_API_DEPENDS.xalan-c+=	xalan-c>=1.6nb3
+BUILDLINK_ABI_DEPENDS.xalan-c?=	xalan-c>=1.6nb4
 BUILDLINK_PKGSRCDIR.xalan-c?=	../../textproc/xalan-c
 .endif	# XALAN_C_BUILDLINK3_MK
 
diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk
index 716dc7a2e44..30a57be8490 100644
--- a/textproc/xerces-c/buildlink3.mk
+++ b/textproc/xerces-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:52 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XERCES_C_BUILDLINK3_MK:=	${XERCES_C_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxerces-c}
 BUILDLINK_PACKAGES+=	xerces-c
 
 .if !empty(XERCES_C_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xerces-c+=	xerces-c>=2.3.0
-BUILDLINK_RECOMMENDED.xerces-c?=	xerces-c>=2.3.0nb3
+BUILDLINK_API_DEPENDS.xerces-c+=	xerces-c>=2.3.0
+BUILDLINK_ABI_DEPENDS.xerces-c?=	xerces-c>=2.3.0nb3
 BUILDLINK_PKGSRCDIR.xerces-c?=	../../textproc/xerces-c
 .endif	# XERCES_C_BUILDLINK3_MK
 
diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk
index 468f5f3b5d5..5e27ab8b3ac 100644
--- a/textproc/xmlcatmgr/buildlink3.mk
+++ b/textproc/xmlcatmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/03/26 16:54:51 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:52 reed Exp $
 #
 # This Makefile fragment is included by packages that use xmlcatmgr.
 #
@@ -23,7 +23,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxmlcatmgr}
 BUILDLINK_PACKAGES+=	xmlcatmgr
 
 .if !empty(XMLCATMGR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xmlcatmgr+=		xmlcatmgr>=2.0beta1
+BUILDLINK_API_DEPENDS.xmlcatmgr+=		xmlcatmgr>=2.0beta1
 BUILDLINK_PKGSRCDIR.xmlcatmgr?=		../../textproc/xmlcatmgr
 
 # Location of the xmlcatmgr binary program.
diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile
index df4b5c3863c..58d7a6b84f4 100644
--- a/textproc/xmlstarlet/Makefile
+++ b/textproc/xmlstarlet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:52 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:52 reed Exp $
 #
 
 DISTNAME=		xmlstarlet-1.0.1
@@ -16,8 +16,8 @@ CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-libxslt-prefix=${BUILDLINK_PREFIX.libxslt}
 PTHREAD_OPTS+=		require
 
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.12
-BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.9
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.12
+BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.9
 
 TEST_TARGET=	check