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

42 files changed, 112 insertions, 112 deletions

diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile
index 21238fd2ee6..38d48377ea2 100644
--- a/www/ap-dav/Makefile
+++ b/www/ap-dav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:52 reed Exp $
 
 DISTNAME=		mod_dav-1.0.3-1.3.6
 PKGNAME=		ap-dav-1.0.3
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.webdav.org/mod_dav/
 COMMENT=		Apache WebDAV module
 
 # Ugly mess that says apache>=1.3.9 and apache<2.0.
-BUILDLINK_DEPENDS.apache+=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}
+BUILDLINK_API_DEPENDS.apache+=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}
 
 APACHE_MODULE=		YES
 GNU_CONFIGURE=		YES
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 3e4db0832c1..1171d677728 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/04/06 06:22:53 reed Exp $
 #
 
 DISTNAME=		mod_perl-1.29
@@ -14,7 +14,7 @@ COMMENT=		Module that embeds a Perl interpreter into Apache
 
 CONFLICTS=		ap2-perl-[0-9]*
 
-DEPENDS+=		${BUILDLINK_DEPENDS.apache}:../../www/apache
+DEPENDS+=		${BUILDLINK_API_DEPENDS.apache}:../../www/apache
 DEPENDS+=		p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
 
 APACHE_MODULE=		YES
diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk
index 40952c2e5da..34f534bee02 100644
--- a/www/ap-perl/buildlink3.mk
+++ b/www/ap-perl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:53 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AP_PERL_BUILDLINK3_MK:=	${AP_PERL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nap-perl}
 BUILDLINK_PACKAGES+=	ap-perl
 
 .if !empty(AP_PERL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ap-perl+=	ap-perl>=1.29nb3
-BUILDLINK_RECOMMENDED.ap-perl?=	ap-perl>=1.29nb5
+BUILDLINK_API_DEPENDS.ap-perl+=	ap-perl>=1.29nb3
+BUILDLINK_ABI_DEPENDS.ap-perl?=	ap-perl>=1.29nb5
 BUILDLINK_PKGSRCDIR.ap-perl?=	../../www/ap-perl
 
 BUILDLINK_FILES.ap-perl+=	lib/httpd/mod_perl.*
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 87528ab20a1..fe5d27c7939 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.100 2006/04/06 06:22:53 reed Exp $
 
 DISTNAME=		mod_ssl-2.8.25-1.3.34
 PKGNAME=		ap-ssl-2.8.25
@@ -14,7 +14,7 @@ COMMENT=		SSL/TLS protocols module for Apache
 
 CONFLICTS=		apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
 
-BUILDLINK_DEPENDS.apache+=	apache>=1.3.33
+BUILDLINK_API_DEPENDS.apache+=	apache>=1.3.33
 
 APACHE_MODULE=		yes
 
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
index 753674cb7c9..b6c6cd1e6cb 100644
--- a/www/ap2-auth-ldap/Makefile
+++ b/www/ap2-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:22:53 reed Exp $
 
 DISTNAME=	mod_auth_ldap3.05
 PKGNAME=	ap2-auth-ldap-3.05
@@ -16,7 +16,7 @@ APACHE_MODULE_NAME=	mm_auth_ldap_module
 USE_LIBTOOL=		YES
 CPPFLAGS+=		-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber
 
-BUILDLINK_DEPENDS.apache+=	apache>=2.0.47
+BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.47
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap}
diff --git a/www/ap2-perl/buildlink3.mk b/www/ap2-perl/buildlink3.mk
index 6b45146768f..2e4a48921ba 100644
--- a/www/ap2-perl/buildlink3.mk
+++ b/www/ap2-perl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:53 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AP2_PERL_BUILDLINK3_MK:=	${AP2_PERL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nap2-perl}
 BUILDLINK_PACKAGES+=	ap2-perl
 
 .if !empty(AP2_PERL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ap2-perl+=	ap2-perl>=2.0.1
-BUILDLINK_RECOMMENDED.ap2-perl?=	ap2-perl>=2.0.1nb2
+BUILDLINK_API_DEPENDS.ap2-perl+=	ap2-perl>=2.0.1
+BUILDLINK_ABI_DEPENDS.ap2-perl?=	ap2-perl>=2.0.1nb2
 BUILDLINK_PKGSRCDIR.ap2-perl?=	../../www/ap2-perl
 .endif	# AP2_PERL_BUILDLINK3_MK
 
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 9a8b90139d9..23c171e8a09 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/04/05 01:42:00 epg Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:53 reed Exp $
 
 PKGNAME=	ap2-subversion-${SVNVER}
 COMMENT=	WebDAV server (Apache module) for Subversion
@@ -13,7 +13,7 @@ APACHE_MODULE=		YES
 BUILD_TARGET=		apache-mod
 INSTALL_TARGET=		install-mods-shared
 
-BUILDLINK_DEPENDS.apache?=	apache>=2.0.48
+BUILDLINK_API_DEPENDS.apache?=	apache>=2.0.48
 
 post-patch:
 	${RM} ${WRKSRC}/build-outputs.mk
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 1b4fa466fbe..3f9c940b67a 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:22:53 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napache}
 BUILDLINK_PACKAGES+=	apache
 
 .if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apache+=	apache{,6}-1.3.*
-BUILDLINK_RECOMMENDED.apache?=	apache>=1.3.34nb5
+BUILDLINK_API_DEPENDS.apache+=	apache{,6}-1.3.*
+BUILDLINK_ABI_DEPENDS.apache?=	apache>=1.3.34nb5
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache
 
 .if defined(APACHE_MODULE)
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 68f24c07b79..731c27ececd 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.96 2006/04/06 06:22:53 reed Exp $
 
 .include "Makefile.common"
 
@@ -27,7 +27,7 @@ CONFIGURE_ENV+=		perlbin=${PERL5:Q}
 CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
 CONFIGURE_ARGS+=	--with-apr-util=${BUILDLINK_PREFIX.apr}
 
-BUILDLINK_DEPENDS.apr+=	apr>=0.9.7.2.0.55
+BUILDLINK_API_DEPENDS.apr+=	apr>=0.9.7.2.0.55
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../devel/apr/buildlink3.mk"
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
index be51e0b9c92..8e14ef1a39e 100644
--- a/www/apache2/buildlink3.mk
+++ b/www/apache2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:11:19 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:22:53 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napache}
 BUILDLINK_PACKAGES+=	apache
 
 .if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apache+=	apache>=2.0.51
-BUILDLINK_RECOMMENDED.apache+=	apache>=2.0.55nb7
+BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.51
+BUILDLINK_ABI_DEPENDS.apache+=	apache>=2.0.55nb7
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
 BUILDLINK_DEPMETHOD.apache?=	build
 .  if defined(APACHE_MODULE)
diff --git a/www/cgic/buildlink3.mk b/www/cgic/buildlink3.mk
index 61f8ff6336c..057134c05f1 100644
--- a/www/cgic/buildlink3.mk
+++ b/www/cgic/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/12/08 16:09:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:53 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CGIC_BUILDLINK3_MK:=	${CGIC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncgic}
 BUILDLINK_PACKAGES+=	cgic
 
 .if !empty(CGIC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cgic+=	cgic>=2.02nb1
+BUILDLINK_API_DEPENDS.cgic+=	cgic>=2.02nb1
 BUILDLINK_PKGSRCDIR.cgic?=	../../www/cgic
 .endif	# CGIC_BUILDLINK3_MK
 
diff --git a/www/cgilib/buildlink3.mk b/www/cgilib/buildlink3.mk
index c53dd712f54..a4e369eee28 100644
--- a/www/cgilib/buildlink3.mk
+++ b/www/cgilib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:25 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:53 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CGILIB_BUILDLINK3_MK:=	${CGILIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncgilib}
 BUILDLINK_PACKAGES+=	cgilib
 
 .if !empty(CGILIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cgilib+=	cgilib>=0.5nb1
-BUILDLINK_RECOMMENDED.cgilib+=	cgilib>=0.5nb2
+BUILDLINK_API_DEPENDS.cgilib+=	cgilib>=0.5nb1
+BUILDLINK_ABI_DEPENDS.cgilib+=	cgilib>=0.5nb2
 BUILDLINK_PKGSRCDIR.cgilib?=	../../www/cgilib
 .endif	# CGILIB_BUILDLINK3_MK
 
diff --git a/www/clearsilver/buildlink3.mk b/www/clearsilver/buildlink3.mk
index 04cae626b5b..a4b6542b2ad 100644
--- a/www/clearsilver/buildlink3.mk
+++ b/www/clearsilver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:53 reed Exp $
 
 BUILDLINK_DEPMETHOD.clearsilver?=	build
 
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclearsilver-base}
 BUILDLINK_PACKAGES+=	clearsilver-base
 
 .if !empty(CLEARSILVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.clearsilver+=		clearsilver-base>=0.9.0
-BUILDLINK_RECOMMENDED.clearsilver+=	clearsilver>=0.10.1
+BUILDLINK_API_DEPENDS.clearsilver+=		clearsilver-base>=0.9.0
+BUILDLINK_ABI_DEPENDS.clearsilver+=	clearsilver>=0.10.1
 BUILDLINK_PKGSRCDIR.clearsilver?=	../../www/clearsilver-base
 .endif
 
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index 6acddebe08b..7cd22f7d37a 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/03/21 21:49:47 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:53 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CURL_BUILDLINK3_MK:=	${CURL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncurl}
 BUILDLINK_PACKAGES+=	curl
 
 .if !empty(CURL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.curl+=	curl>=7.12.3
-BUILDLINK_RECOMMENDED.curl+=	curl>=7.15.3
+BUILDLINK_API_DEPENDS.curl+=	curl>=7.12.3
+BUILDLINK_ABI_DEPENDS.curl+=	curl>=7.15.3
 BUILDLINK_PKGSRCDIR.curl?=	../../www/curl
 .endif	# CURL_BUILDLINK3_MK
 
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index ceb04871c7b..1ea5a3d240f 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/21 06:00:51 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/06 06:22:53 reed Exp $
 #
 
 DISTNAME=	drivel-2.0.2
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=	YES
 
 GCONF2_SCHEMAS=		drivel.schemas
 
-BUILDLINK_DEPENDS.curl+=	curl>=7.14.0nb1
+BUILDLINK_API_DEPENDS.curl+=	curl>=7.14.0nb1
 
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf2/schemas.mk"
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 53bc0f1c968..dff1fe34c4a 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/06 00:18:26 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/06 06:22:54 reed Exp $
 #
 
 DISTNAME=	epiphany-extensions-1.8.1
@@ -36,7 +36,7 @@ CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/webbrwsr
 .endif
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 0707338b0f4..8d9865c6f1b 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/03/30 21:26:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.52 2006/04/06 06:22:53 reed Exp $
 #
 
 DISTNAME=	epiphany-2.14.0
@@ -29,7 +29,7 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.epiphany
 
 .if !empty(PKG_OPTIONS:Mfirefox)
 # Require a version that has the .pc files in it.
-BUILDLINK_DEPENDS.firefox+=	firefox>=1.5nb2
+BUILDLINK_API_DEPENDS.firefox+=	firefox>=1.5nb2
 
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/find
 CFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/find
@@ -49,9 +49,9 @@ CFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref
 GCONF2_SCHEMAS=		epiphany.schemas
 GCONF2_SCHEMAS+=	epiphany-lockdown.schemas
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.8.3
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.3
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index a3fbdeebea8..a4cde0d786d 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:11:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:22:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use epiphany.
 #
@@ -14,8 +14,8 @@ BUILDLINK_DEPENDS+=	epiphany
 
 .if !empty(EPIPHANY_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			epiphany
-BUILDLINK_DEPENDS.epiphany+=		epiphany>=1.8.2
-BUILDLINK_RECOMMENDED.epiphany?=		epiphany>=1.8.3nb2
+BUILDLINK_API_DEPENDS.epiphany+=		epiphany>=1.8.2
+BUILDLINK_ABI_DEPENDS.epiphany?=		epiphany>=1.8.3nb2
 BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/fcgi/buildlink3.mk b/www/fcgi/buildlink3.mk
index 8e6d0ae869f..9772d028a7a 100644
--- a/www/fcgi/buildlink3.mk
+++ b/www/fcgi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:25 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:54 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FCGI_BUILDLINK3_MK:=	${FCGI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfcgi}
 BUILDLINK_PACKAGES+=	fcgi
 
 .if !empty(FCGI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fcgi+=	fcgi>=2.2.2nb1
-BUILDLINK_RECOMMENDED.fcgi+=	fcgi>=2.4.0nb1
+BUILDLINK_API_DEPENDS.fcgi+=	fcgi>=2.2.2nb1
+BUILDLINK_ABI_DEPENDS.fcgi+=	fcgi>=2.4.0nb1
 BUILDLINK_PKGSRCDIR.fcgi?=	../../www/fcgi
 .endif	# FCGI_BUILDLINK3_MK
 
diff --git a/www/firefox-gtk1/buildlink3.mk b/www/firefox-gtk1/buildlink3.mk
index 2b11c5ceda7..437035ad460 100644
--- a/www/firefox-gtk1/buildlink3.mk
+++ b/www/firefox-gtk1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:54 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FIREFOX_GTK2_BUILDLINK3_MK:=	${FIREFOX_GTK2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfirefox-gtk1}
 BUILDLINK_PACKAGES+=	firefox-gtk1
 
 .if !empty(FIREFOX_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.firefox-gtk1+=	firefox-gtk1>=1.5
-BUILDLINK_RECOMMENDED.firefox-gtk1+=	firefox-gtk1>=1.5.0.1nb1
+BUILDLINK_API_DEPENDS.firefox-gtk1+=	firefox-gtk1>=1.5
+BUILDLINK_ABI_DEPENDS.firefox-gtk1+=	firefox-gtk1>=1.5.0.1nb1
 BUILDLINK_PKGSRCDIR.firefox-gtk1?=	../../www/firefox-gtk1
 .endif	# FIREFOX_GTK2_BUILDLINK3_MK
 
diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk
index 933ed7ee0d1..626fabcadcd 100644
--- a/www/firefox/buildlink3.mk
+++ b/www/firefox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/06 00:37:54 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:54 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FIREFOX_BUILDLINK3_MK:=		${FIREFOX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nfirefox}
 BUILDLINK_PACKAGES+=		firefox
 
 .if !empty(FIREFOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.firefox+=	firefox>=1.5
-BUILDLINK_RECOMMENDED.firefox+=	firefox>=1.5.0.1nb1
+BUILDLINK_API_DEPENDS.firefox+=	firefox>=1.5
+BUILDLINK_ABI_DEPENDS.firefox+=	firefox>=1.5.0.1nb1
 BUILDLINK_PKGSRCDIR.firefox?=	../../www/firefox
 .endif	# FIREFOX_BUILDLINK3_MK
 
diff --git a/www/glibwww/buildlink3.mk b/www/glibwww/buildlink3.mk
index 89d77495d5a..332c24cd6ce 100644
--- a/www/glibwww/buildlink3.mk
+++ b/www/glibwww/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:54 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIBWWW_BUILDLINK3_MK:=	${GLIBWWW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglibwww}
 BUILDLINK_PACKAGES+=	glibwww
 
 .if !empty(GLIBWWW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glibwww?=	glibwww>=0.2nb5
-BUILDLINK_RECOMMENDED.glibwww+=	glibwww>=0.2nb8
+BUILDLINK_API_DEPENDS.glibwww?=	glibwww>=0.2nb5
+BUILDLINK_ABI_DEPENDS.glibwww+=	glibwww>=0.2nb8
 BUILDLINK_PKGSRCDIR.glibwww?=	../../www/glibwww
 .endif	# GLIBWWW_BUILDLINK3_MK
 
diff --git a/www/gtkhtml/buildlink3.mk b/www/gtkhtml/buildlink3.mk
index f9fd43236b7..a0aab53fc67 100644
--- a/www/gtkhtml/buildlink3.mk
+++ b/www/gtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:55 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTKHTML_BUILDLINK3_MK:=	${GTKHTML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkhtml}
 BUILDLINK_PACKAGES+=	gtkhtml
 
 .if !empty(GTKHTML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkhtml?=	gtkhtml>=1.1.10nb5
-BUILDLINK_RECOMMENDED.gtkhtml?=	gtkhtml>=1.1.10nb7
+BUILDLINK_API_DEPENDS.gtkhtml?=	gtkhtml>=1.1.10nb5
+BUILDLINK_ABI_DEPENDS.gtkhtml?=	gtkhtml>=1.1.10nb7
 BUILDLINK_PKGSRCDIR.gtkhtml?=	../../www/gtkhtml
 .endif	# GTKHTML_BUILDLINK3_MK
 
diff --git a/www/gtkhtml38/buildlink3.mk b/www/gtkhtml38/buildlink3.mk
index 768cf677642..983bb52dbee 100644
--- a/www/gtkhtml38/buildlink3.mk
+++ b/www/gtkhtml38/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/06 00:18:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:55 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML38_BUILDLINK3_MK:=	${GTKHTML38_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkhtml38}
 BUILDLINK_PACKAGES+=	gtkhtml38
 
 .if !empty(GTKHTML38_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkhtml38+=	gtkhtml38>=3.8.0
-BUILDLINK_RECOMMENDED.gtkhtml38?=	gtkhtml38>=3.8.2
+BUILDLINK_API_DEPENDS.gtkhtml38+=	gtkhtml38>=3.8.0
+BUILDLINK_ABI_DEPENDS.gtkhtml38?=	gtkhtml38>=3.8.2
 BUILDLINK_PKGSRCDIR.gtkhtml38?=	../../www/gtkhtml38
 .endif	# GTKHTML38_BUILDLINK3_MK
 
diff --git a/www/libghttp/buildlink3.mk b/www/libghttp/buildlink3.mk
index 8adb8caeda9..a24614dab3d 100644
--- a/www/libghttp/buildlink3.mk
+++ b/www/libghttp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:26 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:55 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGHTTP_BUILDLINK3_MK:=	${LIBGHTTP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibghttp}
 BUILDLINK_PACKAGES+=	libghttp
 
 .if !empty(LIBGHTTP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libghttp+=	libghttp>=1.0.9
-BUILDLINK_RECOMMENDED.libghttp+=	libghttp>=1.0.9nb1
+BUILDLINK_API_DEPENDS.libghttp+=	libghttp>=1.0.9
+BUILDLINK_ABI_DEPENDS.libghttp+=	libghttp>=1.0.9nb1
 BUILDLINK_PKGSRCDIR.libghttp?=	../../www/libghttp
 .endif	# LIBGHTTP_BUILDLINK3_MK
 
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
index 6b85f077c22..74bcbbc2af4 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:55 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGTKHTML_BUILDLINK3_MK:=	${LIBGTKHTML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtkhtml}
 BUILDLINK_PACKAGES+=	libgtkhtml
 
 .if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgtkhtml+=		libgtkhtml>=2.6.0
-BUILDLINK_RECOMMENDED.libgtkhtml+=	libgtkhtml>=2.6.3nb3
+BUILDLINK_API_DEPENDS.libgtkhtml+=		libgtkhtml>=2.6.0
+BUILDLINK_ABI_DEPENDS.libgtkhtml+=	libgtkhtml>=2.6.3nb3
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 .endif	# LIBGTKHTML_BUILDLINK3_MK
 
diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk
index c4d8eb800e9..fd28f97861c 100644
--- a/www/libwww/buildlink3.mk
+++ b/www/libwww/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:55 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWWW_BUILDLINK3_MK:=	${LIBWWW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwww}
 BUILDLINK_PACKAGES+=	libwww
 
 .if !empty(LIBWWW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwww+=	libwww>=5.3.2nb2
-BUILDLINK_RECOMMENDED.libwww+=	libwww>=5.4.0nb5
+BUILDLINK_API_DEPENDS.libwww+=	libwww>=5.3.2nb2
+BUILDLINK_ABI_DEPENDS.libwww+=	libwww>=5.4.0nb5
 BUILDLINK_PKGSRCDIR.libwww?=	../../www/libwww
 .endif	# LIBWWW_BUILDLINK3_MK
 
diff --git a/www/mozilla-gtk2/buildlink3.mk b/www/mozilla-gtk2/buildlink3.mk
index 67caea8800e..a608996a5dd 100644
--- a/www/mozilla-gtk2/buildlink3.mk
+++ b/www/mozilla-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/06 00:25:06 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:55 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 MOZILLA_GTK2_BUILDLINK3_MK:=		${MOZILLA_GTK2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=			${BUILDLINK_PACKAGES:Nmozilla-gtk2}
 BUILDLINK_PACKAGES+=			mozilla-gtk2
 
 .if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla-gtk2+=	mozilla-gtk2>=1.7.12nb3
+BUILDLINK_API_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.7.5
+BUILDLINK_ABI_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.7.12nb3
 BUILDLINK_PKGSRCDIR.mozilla-gtk2?=	../../www/mozilla-gtk2
 .endif	# MOZILLA_GTK2_BUILDLINK3_MK
 
diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk
index cdeb556d700..fe691acd49b 100644
--- a/www/mozilla/buildlink3.mk
+++ b/www/mozilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/02/06 00:25:06 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/04/06 06:22:55 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MOZILLA_BUILDLINK3_MK:=		${MOZILLA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nmozilla}
 BUILDLINK_PACKAGES+=		mozilla
 
 .if !empty(MOZILLA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mozilla+=	mozilla>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla+=	mozilla>=1.7.12nb3
+BUILDLINK_API_DEPENDS.mozilla+=	mozilla>=1.7.5
+BUILDLINK_ABI_DEPENDS.mozilla+=	mozilla>=1.7.12nb3
 BUILDLINK_PKGSRCDIR.mozilla?=	../../www/mozilla
 .endif	# MOZILLA_BUILDLINK3_MK
 
diff --git a/www/mozilla/gecko-depends.mk b/www/mozilla/gecko-depends.mk
index cc2ac9b4a0f..42b451814df 100644
--- a/www/mozilla/gecko-depends.mk
+++ b/www/mozilla/gecko-depends.mk
@@ -1,8 +1,8 @@
-# $NetBSD: gecko-depends.mk,v 1.2 2005/09/28 12:04:29 rillig Exp $
+# $NetBSD: gecko-depends.mk,v 1.3 2006/04/06 06:22:55 reed Exp $
 
 .if !empty(PKG_OPTIONS:Mfirefox)
 # firefox didn't have a pkgconfig file before 1.0.4
-BUILDLINK_DEPENDS.firefox+= firefox>=1.0.4
+BUILDLINK_API_DEPENDS.firefox+= firefox>=1.0.4
 .include "../../www/firefox/buildlink3.mk"
 .else
 .include "../../www/mozilla-gtk2/buildlink3.mk"
diff --git a/www/neon/buildlink3.mk b/www/neon/buildlink3.mk
index 8d095f6417b..7b0bfbd6c26 100644
--- a/www/neon/buildlink3.mk
+++ b/www/neon/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:55 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NEON_BUILDLINK3_MK:=	${NEON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nneon}
 BUILDLINK_PACKAGES+=	neon
 
 .if !empty(NEON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.neon+=	neon>=0.24.4
-BUILDLINK_RECOMMENDED.neon+=	neon>=0.25.5nb2
+BUILDLINK_API_DEPENDS.neon+=	neon>=0.24.4
+BUILDLINK_ABI_DEPENDS.neon+=	neon>=0.25.5nb2
 BUILDLINK_PKGSRCDIR.neon?=	../../www/neon
 .endif	# NEON_BUILDLINK3_MK
 
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 924e8d15764..550e19a4784 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/06 06:22:55 reed Exp $
 
 DISTNAME=	libapreq2-2.07
 PKGNAME=	p5-libapreq2-2.07
@@ -12,8 +12,8 @@ COMMENT=	Lots of Apache specific httpd handling modules
 
 DEPENDS+=	p5-ExtUtils-XSBuilder>=0.23:../../devel/p5-ExtUtils-XSBuilder
 
-BUILDLINK_DEPENDS.apache+=	apache>=2.0.48
-BUILDLINK_DEPENDS.ap2-perl+=	ap2-perl>=2.0.1
+BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.48
+BUILDLINK_API_DEPENDS.ap2-perl+=	ap2-perl>=2.0.1
 
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
diff --git a/www/php4/buildlink3.mk b/www/php4/buildlink3.mk
index ac364f2025b..47d3f0f0b9e 100644
--- a/www/php4/buildlink3.mk
+++ b/www/php4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:55 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PHP_BUILDLINK3_MK:=	${PHP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nphp}
 BUILDLINK_PACKAGES+=	php
 
 .if !empty(PHP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.php+=		php-4.4.*
-BUILDLINK_RECOMMENDED.php+=	php>=4.4.1nb3
+BUILDLINK_API_DEPENDS.php+=		php-4.4.*
+BUILDLINK_ABI_DEPENDS.php+=	php>=4.4.1nb3
 BUILDLINK_PKGSRCDIR.php?=	../../www/php4
 .endif	# PHP_BUILDLINK3_MK
 
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 654cfaaedf4..4eabb3d0581 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/04/06 06:22:55 reed Exp $
 
 DISTNAME=	pycurl-7.13.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -15,7 +15,7 @@ PYBINMODULE=	# defined
 PYTHON_VERSIONS_ACCEPTED=	23 22
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
-BUILDLINK_DEPENDS.curl+=        curl>=7.12.1
+BUILDLINK_API_DEPENDS.curl+=        curl>=7.12.1
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/www/sope/buildlink3.mk b/www/sope/buildlink3.mk
index 23b7699f9c7..ea188a62178 100644
--- a/www/sope/buildlink3.mk
+++ b/www/sope/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:56 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOPE_BUILDLINK3_MK:=	${SOPE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsope}
 BUILDLINK_PACKAGES+=	sope
 
 .if !empty(SOPE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sope+=	sope>=4.5.4nb2
-BUILDLINK_RECOMMENDED.sope?=	sope>=4.5.4nb3
+BUILDLINK_API_DEPENDS.sope+=	sope>=4.5.4nb2
+BUILDLINK_ABI_DEPENDS.sope?=	sope>=4.5.4nb3
 BUILDLINK_PKGSRCDIR.sope?=	../../www/sope
 .endif	# SOPE_BUILDLINK3_MK
 
diff --git a/www/tidy/buildlink3.mk b/www/tidy/buildlink3.mk
index e7d62dea8c4..eaed912005e 100644
--- a/www/tidy/buildlink3.mk
+++ b/www/tidy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:56 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TIDY_BUILDLINK3_MK:=	${TIDY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntidy}
 BUILDLINK_PACKAGES+=	tidy
 
 .if !empty(TIDY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tidy+=	tidy>=20031002
-BUILDLINK_RECOMMENDED.tidy?=	tidy>=20050921nb1
+BUILDLINK_API_DEPENDS.tidy+=	tidy>=20031002
+BUILDLINK_ABI_DEPENDS.tidy?=	tidy>=20050921nb1
 BUILDLINK_PKGSRCDIR.tidy?=	../../www/tidy
 .endif	# TIDY_BUILDLINK3_MK
 
diff --git a/www/zope25-CMFPlone/Makefile b/www/zope25-CMFPlone/Makefile
index 1aaea8cbc3f..dd5d5a0915c 100644
--- a/www/zope25-CMFPlone/Makefile
+++ b/www/zope25-CMFPlone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:56 reed Exp $
 
 DISTNAME=	CMFPlone1.0.3
 PKGNAME=	zope25-CMFPlone-1.0.3
@@ -9,7 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.plone.org/
 COMMENT=	Content Management System
 
-BUILDLINK_DEPENDS.zope+=	zope-2.6.*
+BUILDLINK_API_DEPENDS.zope+=	zope-2.6.*
 DEPENDS+=	zope25-CMF-[0-9]*:../../www/zope25-CMF
 DEPENDS+=	zope25-Formulator-[0-9]*:../../www/zope25-Formulator
 
diff --git a/www/zope25-EasyImage/Makefile b/www/zope25-EasyImage/Makefile
index 71b6aba64de..25eab372a55 100644
--- a/www/zope25-EasyImage/Makefile
+++ b/www/zope25-EasyImage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:56 reed Exp $
 
 DISTNAME=	EasyImage15
 PKGREVISION=	3
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.zope.org/Members/regebro/easyimage/
 EXTRACT_SUFX=	.zip
 
-BUILDLINK_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/regebro/easyimage
diff --git a/www/zope25-JPicture/Makefile b/www/zope25-JPicture/Makefile
index a75dd3ad31d..bcd15998c45 100644
--- a/www/zope25-JPicture/Makefile
+++ b/www/zope25-JPicture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:56 reed Exp $
 
 DISTNAME=	JPicture-2_0
 PKGREVISION=	3
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.dataflake.org/software/jpicture/
 EXTRACT_SUFX=	.tgz
 
-BUILDLINK_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dataflake.org/software/jpicture/
diff --git a/www/zope25-PropertyFolder/Makefile b/www/zope25-PropertyFolder/Makefile
index 73c644aa9dc..424d514dce0 100644
--- a/www/zope25-PropertyFolder/Makefile
+++ b/www/zope25-PropertyFolder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/06 06:22:56 reed Exp $
 
 DISTNAME=	PropertyFolder-1.3.3
 PKGNAME=	zope25-PropertyFolder-1.3.3
@@ -9,7 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/mjablonski/PropertyFolder
 COMMENT=	The folderish friend of the PropertyObject
 
-BUILDLINK_DEPENDS.zope+=	zope>=2.6.1
+BUILDLINK_API_DEPENDS.zope+=	zope>=2.6.1
 
 .include "../../www/zope25/product.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-ZPhotoSlides/Makefile b/www/zope25-ZPhotoSlides/Makefile
index 30fdc144623..21532c7de2e 100644
--- a/www/zope25-ZPhotoSlides/Makefile
+++ b/www/zope25-ZPhotoSlides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:22:56 reed Exp $
 
 DISTNAME=	ZPhotoSlides-1.1b
 PKGNAME=	zope25-ZPhotoSlides-1.1b
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.zope.org/Members/p3b/ZPhotoSlides/
 
 DEPENDS+=	zope25-LocalFS-[0-9]*:../../www/zope25-LocalFS
-BUILDLINK_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/p3b/ZPhotoSlides
diff --git a/www/zope25/product.mk b/www/zope25/product.mk
index a0784c20b6f..788c38b0509 100644
--- a/www/zope25/product.mk
+++ b/www/zope25/product.mk
@@ -1,8 +1,8 @@
-# $NetBSD: product.mk,v 1.9 2006/03/12 17:35:05 rillig Exp $
+# $NetBSD: product.mk,v 1.10 2006/04/06 06:22:56 reed Exp $
 
 DIST_SUBDIR=	zope
-BUILDLINK_DEPENDS.zope?=	zope-2.*
-DEPENDS+=	${BUILDLINK_DEPENDS.zope}:../../www/zope25
+BUILDLINK_API_DEPENDS.zope?=	zope-2.*
+DEPENDS+=	${BUILDLINK_API_DEPENDS.zope}:../../www/zope25
 EVAL_PREFIX+=	BUILDLINK_PREFIX.zope=zope25
 BUILDLINK_PREFIX.zope_DEFAULT=	${LOCALBASE}
 WRKSRC?=	${WRKDIR}